1. 05 7月, 2014 2 次提交
    • M
      ARM: sunxi: Reintroduce the restart code for A10/A20 SoCs · d767af5e
      Maxime Ripard 提交于
      This partly reverts commits 55360050 (ARM: sunxi: Remove reset code from
      the platform) and 5e669ec5 (ARM: sunxi: Remove init_machine callback) for
      the sun4i, sun5i and sun7i families.
      
      This is needed because the watchdog counterpart of these commits was dropped,
      and didn't make it into 3.16. In order to still be able to reboot the board, we
      need to reintroduce that code. Of course, the long term view is still to get
      rid of that code in mach-sunxi.
      Signed-off-by: NMaxime Ripard <maxime.ripard@free-electrons.com>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      d767af5e
    • O
      Merge tag 'omap-for-v3.16/fixes-against-rc1' of... · 5acd78c5
      Olof Johansson 提交于
      Merge tag 'omap-for-v3.16/fixes-against-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      Merge OMAP fixes from Tony Lindgren:
      
      Fixes for omaps for issues discovered during the merge window and
      enabling of a few features that had to wait for the driver
      dependencies to clear.
      
      The fixes included are:
      
      - Fix am43xx hard reset flags
      - Fix SoC detection for DRA722
      - Fix CPU OPP table for omap5
      - Fix legacy mux parser bug if requested muxname is a prefix of
        multiple mux entries
      - Fix qspi interrupt binding that relies on the irq crossbar
        that has not yet been enabled
      - Add missing phy_sel for am43x-epos-evm
      - Drop unused gic_init_irq() that is no longer needed
      
      And the enabling of features that had driver dependencies are:
      
      - Change dra7 to use Audio Tracking Logic clock instead of a fixed
        clock now that the clock driver for it has been merged
      
      - Enable off idle configuration for selected omaps as all the kernel
        dependencies for device tree based booting are finally merged as
        this is needed to get the automated PM tests working finally with
        device tree based booting
      
      - Add hwmod entry for ocp2scp3 for omap5 to get sata working as
        all the driver dependencies are now in the kernel and this patch
        fell through the cracks during the merge window
      
      * tag 'omap-for-v3.16/fixes-against-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: dts: dra7-evm: remove interrupt binding
        ARM: OMAP2+: Fix parser-bug in platform muxing code
        ARM: DTS: dra7/dra7xx-clocks: ATL related changes
        ARM: OMAP2+: drop unused function
        ARM: dts: am43x-epos-evm: Add Missing cpsw-phy-sel for am43x-epos-evm
        ARM: dts: omap5: Update CPU OPP table as per final production Manual
        ARM: DRA722: add detection of SoC information
        ARM: dts: Enable twl4030 off-idle configuration for selected omaps
        ARM: OMAP5: hwmod: Add ocp2scp3 and sata hwmods
        ARM: OMAP2+: hwmod: Change hardreset soc_ops for AM43XX
      5acd78c5
  2. 27 6月, 2014 1 次提交
    • O
      ARM: bcm: Fix bcm and multi_v7 defconfigs · bfda90cb
      Olof Johansson 提交于
      BCM (Kona/capri platform) has regressed in two ways on this release. First,
      bcm_defconfig no longer selected the appropriate MMC driver options due to
      changes in dependencies. Secondly, the new MFD and regulator drivers were not
      enabled on multi_v7_defconfig, so that caused the system to fail probing MMC
      there.
      
      Fix by enabling the new options as needed.
      
      Cc: Matt Porter <matt.porter@linaro.org>
      Cc: Christian Daudt <bcm@fixthebug.org>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      bfda90cb
  3. 26 6月, 2014 3 次提交
  4. 25 6月, 2014 5 次提交
  5. 24 6月, 2014 3 次提交
  6. 23 6月, 2014 2 次提交
    • A
      Merge tag 'imx-fixes-3.16' of... · f340a59f
      Arnd Bergmann 提交于
      Merge tag 'imx-fixes-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes
      
      Pull "i.MX fixes for 3.16" from Shawn Guo:
      
       - Use GPIO for card CD/WP on imx51-babbage and eukrea-mbimxsd51,
         because controller base CD/WP is not working in esdhc driver due to
         runtime PM support
       - A couple of random ventana gw5xxx board fixes
       - Add IMX_IPUV3_CORE back to defconfig, which gets lost when moving
         IPUv3 driver out of staging tree
       - Fix enet/fec clock selection on imx6sl
       - Fix display node on imx53-m53evk board
       - A couple of Cubox-i updates from Russell, which were omitted from
         the merge window due to dependency
      
      * tag 'imx-fixes-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
        ARM: dts: imx51-eukrea-mbimxsd51-baseboard: unbreak esdhc.
        ARM: dts: imx51-babbage: Fix esdhc setup
        ARM: dts: mx5: Move the display out of soc {} node
        ARM: dts: mx5: Fix IPU port node placement
        ARM: imx_v6_v7_defconfig: Enable CONFIG_IMX_IPUV3_CORE
        ARM: dts: hummingboard/cubox-i: move usb otg configuration to platform level
        ARM: dts: cubox-i: add support for PWM-driven front panel LED
        ARM: dts: imx6: ventana: correct gw52xx sgtl5000 clock source
        ARM: dts: imx6qdl-gw5xxx: Fix Linear Technology vendor prefix
        ARM: dts: imx6: ventana: fix include typo
        ARM: dts: imx6sl: correct the fec ipg clock source
        ARM: imx6sl: add missing enet clock for imx6sl
      f340a59f
    • A
      Merge tag 'samsung-fixes-1' of... · 9cbf3d2b
      Arnd Bergmann 提交于
      Merge tag 'samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
      
      Merge Samsung fixes for 3.16 from Kukjin Kim:
      
      - use WFI macro in platform_do_lowpower because exynos cpuhotplug
        includes a hardcoded WFI instruction and it causes compile error
        in Thumb-2 mode.
      - fix GIC reg sizes for exynos4 SoCs
      - remove reset timer counter value during boot and resume for mct
        to fix a big jump in printk timestamps
      - fix pm code to check cortex-A9 for another exynos SoCs
      - don't rely on firmware's secondary_cpu_start for mcpm
      
      * tag 'samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
        ARM: EXYNOS: Don't rely on firmware's secondary_cpu_start for mcpm
        ARM: EXYNOS: fix pm code to check for cortex A9 rather than the SoC
        clocksource: exynos_mct: Don't reset the counter during boot and resume
        ARM: dts: fix reg sizes of GIC for exynos4
        ARM: EXYNOS: Use wfi macro in platform_do_lowpower
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      9cbf3d2b
  7. 21 6月, 2014 7 次提交
  8. 20 6月, 2014 3 次提交
  9. 19 6月, 2014 1 次提交
  10. 18 6月, 2014 3 次提交
    • K
      tty: serial: msm: Fix section mismatch warning · 4cc29462
      Kumar Gala 提交于
      WARNING: drivers/tty/built-in.o(.data+0x3544): Section mismatch in
      reference from the variable msm_platform_driver to the function
      .init.text:msm_serial_probe()
      The variable msm_platform_driver references
      the function __init msm_serial_probe()
      If the reference is valid then annotate the
      variable with __init* or __refdata (see linux/init.h) or name the variable:
      *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console
      Signed-off-by: NKumar Gala <galak@codeaurora.org>
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      4cc29462
    • E
      ARM: mvebu: enable Dove SoC in mvebu_v7_defconfig · 3f620ddc
      Ezequiel Garcia 提交于
      Since commit:
      
      commit d93003e8
      Author: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
      Date:   Thu Apr 24 22:58:30 2014 +0100
      
          ARM: 8042/1: iwmmxt: allow to build iWMMXt on Marvell PJ4B
      
      fixed the error that prevented Dove SoC from being built with
      the rest of the mvebu SoCs, we can now add it to the defconfig.
      
      In addition, this commit enables SERIAL_OF_PLATFORM, which is required
      to have UART on some of the boards.
      Signed-off-by: NEzequiel Garcia <ezequiel.garcia@free-electrons.com>
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      3f620ddc
    • A
      ARM: EXYNOS: fix pm code to check for cortex A9 rather than the SoC · c0c3c359
      Abhilash Kesavan 提交于
      We have an soc check to ensure that the scu and certain A9 specific
      registers are not accessed on Exynos5250 (which is A15 based).
      Rather than adding another soc specific check for 5420 let us test
      for the Cortex A9 primary part number.
      
      This resolves the below crash seen on exynos5420 during core switching
      after the CPUIdle consolidation series was merged.
      
      [  155.975589] [<c0013174>] (scu_enable) from [<c001b0dc>] (exynos_cpu_pm_notifier+0x80/0xc4)
      [  155.983833] [<c001b0dc>] (exynos_cpu_pm_notifier) from [<c003c1b0>] (notifier_call_chain+0x44/0x84)
      [  155.992851] [<c003c1b0>] (notifier_call_chain) from [<c007a49c>] (cpu_pm_notify+0x20/0x3c)
      [  156.001089] [<c007a49c>] (cpu_pm_notify) from [<c007a564>] (cpu_pm_exit+0x20/0x38)
      [  156.008635] [<c007a564>] (cpu_pm_exit) from [<c0019e98>] (bL_switcher_thread+0x298/0x40c)
      [  156.016788] [<c0019e98>] (bL_switcher_thread) from [<c003842c>] (kthread+0xcc/0xe8)
      [  156.024426] [<c003842c>] (kthread) from [<c000e438>] (ret_from_fork+0x14/0x3c)
      [  156.031621] Code: ea017fec c0530a00 c052e3f8 c0012dcc (e5903000
      Signed-off-by: NAbhilash Kesavan <a.kesavan@samsung.com>
      Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
      c0c3c359
  11. 17 6月, 2014 10 次提交