1. 04 Jul, 2014 4 commits
    • Shawn Guo's avatar
      MAINTAINERS: merge MXS entry into IMX one · ce515a6b
      Shawn Guo authored
      The mach-mxs platform is actually co-maintained by myself and
      pengutronix folks.  Also it's hosted in the same kernel tree as IMX.
      So let's merge the entry into IMX one.
      Signed-off-by: default avatarShawn Guo <shawn.guo@freescale.com>
      Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    • Olof Johansson's avatar
      Merge tag 'mvebu-fixes-3.16-2' of git://git.infradead.org/linux-mvebu into fixes · 25d11631
      Olof Johansson authored
      mvebu fixes for v3.16 (round #2)
       - mvebu
          - Fix PCIe deadlock now that SMP is enabled
          - Fix cpuidle for big-endian systems
      * tag 'mvebu-fixes-3.16-2' of git://git.infradead.org/linux-mvebu
        ARM: mvebu: fix cpuidle implementation to work on big-endian systems
        ARM: mvebu: update L2/PCIe deadlock workaround after L2CC cleanup
        ARM: mvebu: move Armada 375 external abort logic as a quirk
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    • Maxime Ripard's avatar
      ARM: sunxi: Reintroduce the restart code for A10/A20 SoCs · d767af5e
      Maxime Ripard authored
      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: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    • Olof Johansson's avatar
      Merge tag 'omap-for-v3.16/fixes-against-rc1' of... · 5acd78c5
      Olof Johansson authored
      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
  2. 30 Jun, 2014 3 commits
    • Thomas Petazzoni's avatar
      ARM: mvebu: fix cpuidle implementation to work on big-endian systems · 6509dc74
      Thomas Petazzoni authored
      On Marvell Armada XP, when a CPU comes back from deep idle state of
      cpuidle, it restarts its execution at armada_370_xp_cpu_resume(),
      which puts back the CPU into the coherency, and then calls the generic
      cpu_resume() function.
      While this works on little-endian configurations, it doesn't work on
      big-endian configurations because the CPU restarts in little-endian,
      and therefore must be switched back to big-endian to operate
      properly. To achieve this, a 'setend be' instruction must be executed
      in big-endian configurations. However, the ARM_BE8() macro that is
      used to implement nice compile-time conditional for ARM LE vs. ARM BE8
      is not easily usable in inline assembly.
      Therefore, this patch moves the armada_370_xp_cpu_resume() C function,
      which was anyway just a block of inline assembly, into a proper
      pmsu_ll.S file, and adds the appropriate ARM_BE8(setend be)
      Without this patch, an Armada XP big endian configuration with cpuidle
      enabled fails to boot, as it hangs as soon as one of the CPU hits the
      deep idle state.
      Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
      Link: https://lkml.kernel.org/r/1404130165-3593-1-git-send-email-thomas.petazzoni@free-electrons.com
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
    • Thomas Petazzoni's avatar
      ARM: mvebu: update L2/PCIe deadlock workaround after L2CC cleanup · 01178890
      Thomas Petazzoni authored
      Commit 497a9230
       ("ARM: mvebu:
      implement L2/PCIe deadlock workaround") introduced some logic in
      coherency.c to adjust the PL310 cache controller Device Tree node of
      Armada 375 and Armada 38x platform to include the 'arm,io-coherent'
      property if the system is running with hardware I/O coherency enabled.
      However, with the L2CC driver cleanup done by Russell King, the
      initialization of the L2CC driver has been moved earlier, and is now
      part of the init_IRQ() ARM function in
      arch/arm/kernel/irq.c. Therefore, calling coherency_init() in
      ->init_time() is now too late, as the Device Tree property gets added
      too late (after the L2CC driver has been initialized).
      In order to fix this, this commit removes the ->init_time() callback
      use in board-v7.c and replaces it with an ->init_irq() callback. We
      therefore no longer use the default ->init_irq() callback, but we now
      use the default ->init_time() callback.
      In this newly introduced ->init_irq() callback, we call irqchip_init()
      which is the default behavior when ->init_irq() isn't defined, and
      then do the initialization related to the coherency: SCU, coherency
      fabric, and mvebu-mbus (which is needed to start secondary CPUs).
      Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
      Link: https://lkml.kernel.org/r/1402585772-10405-4-git-send-email-thomas.petazzoni@free-electrons.com
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
    • Thomas Petazzoni's avatar
      ARM: mvebu: move Armada 375 external abort logic as a quirk · 752ef800
      Thomas Petazzoni authored
      In preparation to a small re-organization of the initialization
      sequence in board-v7.c, this commit moves the registration of the
      custom external abort handler on Armada 375 later in the boot
      sequence, and makes it more similar to the other quirks that we
      already have. There is indeed no need to register this abort handler
      particularly early, it simply needs to be registered before switching
      to userspace.
      In addition to this, this commit makes the registration of the custom
      abort handler conditional on Armada 375 Z1, because Armada 375 A0 and
      later iterations are not affected by the issue.
      This commit was tested on both Armada 375 Z1 and Armada 375 A0
      Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
      Link: https://lkml.kernel.org/r/1402585772-10405-3-git-send-email-thomas.petazzoni@free-electrons.com
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
  3. 27 Jun, 2014 1 commit
    • Olof Johansson's avatar
      ARM: bcm: Fix bcm and multi_v7 defconfigs · bfda90cb
      Olof Johansson authored
      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
      Fix by enabling the new options as needed.
      Cc: Matt Porter <matt.porter@linaro.org>
      Cc: Christian Daudt <bcm@fixthebug.org>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
  4. 25 Jun, 2014 8 commits
  5. 24 Jun, 2014 2 commits
  6. 23 Jun, 2014 2 commits
    • Sebastian Hesselbarth's avatar
      ARM: dts: kirkwood: fix phy-connection-type for Guruplug · b514fb28
      Sebastian Hesselbarth authored
      Commit eeb84545
       ("ARM: dts: kirkwood: set Guruplug phy-connection-type to rgmii-id")
      added phy-connection-type properties to ethernet PHY nodes.
      Actually, the property has to be set for the ethernet port node instead.
      Fix it by moving the corresponding properties to the correct nodes.
      Signed-off-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
      Link: https://lkml.kernel.org/r/1403555115-13111-1-git-send-email-sebastian.hesselbarth@gmail.com
      Fixes: eeb84545
      : ('ARM: dts: kirkwood: set Guruplug phy-connection-type to rgmii-id')
      Cc: <stable@vger.kernel.org> # v3.16+
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
    • Arnd Bergmann's avatar
      Merge tag 'imx-fixes-3.16' of... · f340a59f
      Arnd Bergmann authored
      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
  7. 22 Jun, 2014 1 commit
    • Arnd Bergmann's avatar
      Merge tag 'samsung-fixes-1' of... · 9cbf3d2b
      Arnd Bergmann authored
      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: default avatarArnd Bergmann <arnd@arndb.de>
  8. 21 Jun, 2014 3 commits
    • Doug Anderson's avatar
      ARM: EXYNOS: Don't rely on firmware's secondary_cpu_start for mcpm · 7cbcb9d4
      Doug Anderson authored
      On exynos mcpm systems the firmware is hardcoded to jump to an address
      in SRAM (0x02073000) when secondary CPUs come up.  By default the
      firmware puts a bunch of code at that location.  That code expects the
      kernel to fill in a few slots with addresses that it uses to jump back
      to the kernel's entry point for secondary CPUs.
      Originally (on prerelease hardware) this firmware code contained a
      bunch of workarounds to deal with boot ROM bugs.  However on all
      shipped hardware we simply use this code to redirect to a kernel
      function for bringing up the CPUs.
      Let's stop relying on the code provided by the bootloader and just
      plumb in our own (simple) code jump to the kernel.  This has the nice
      benefit of fixing problems due to the fact that older bootloaders
      (like the one shipped on the Samsung Chromebook 2) might have put
      slightly different code into this location.
      Once suspend/resume is implemented for systems using exynos-mcpm we'll
      need to make sure we reinstall our fixed up code after resume.  ...but
      that's not anything new since IRAM (and thus the address of the
      mcpm_entry_point) is lost across suspend/resume anyway.
      Signed-off-by: default avatarDoug Anderson <dianders@chromium.org>
      Acked-by: default avatarKevin Hilman <khilman@linaro.org>
      Tested-by: default avatarKevin Hilman <khilman@linaro.org>
      Acked-by: default avatarNicolas Pitre <nico@linaro.org>
      Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
    • Denis Carikli's avatar
      ARM: dts: imx51-eukrea-mbimxsd51-baseboard: unbreak esdhc. · 7d278f27
      Denis Carikli authored
      The following commit:
       mmc: sdhci-esdhc-imx: add runtime pm support
      has the effect of also disabling the hardware card detect
      in runtime pm.
      We switch to GPIO based detection to avoid this issue.
      This patch is based on:
      ARM: dts: imx51-babbage: Fix esdhc setup
      Signed-off-by: default avatarDenis Carikli <denis@eukrea.com>
      Signed-off-by: default avatarShawn Guo <shawn.guo@freescale.com>
    • Sascha Hauer's avatar
      ARM: dts: imx51-babbage: Fix esdhc setup · dacf4922
      Sascha Hauer authored
      Since commit 89d7e5c1
       (mmc: sdhci-esdhc-imx: add runtime pm
      support), controller based card detection / write protection is not
      supported anymore by esdhc driver.  Let's use GPIO for CD/WP on esdhc1
      While at it, fix cd gpio polarity for esdhc2. This is wrong and
      currently only works because the imx esdhc driver ignores the polarity.
      Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
      Signed-off-by: default avatarShawn Guo <shawn.guo@freescale.com>
  9. 20 Jun, 2014 7 commits
  10. 19 Jun, 2014 1 commit
  11. 18 Jun, 2014 2 commits
  12. 17 Jun, 2014 6 commits