1. 22 Sep, 2012 2 commits
    • David Brown's avatar
      ARM: msm: Move core.h contents into common.h · be2109e1
      David Brown authored
      No real need to have a separate core.h from the common.h file.  Fold
      these two prototypes into the common header file.
      
      Cc: Arnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarDavid Brown <davidb@codeaurora.org>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      be2109e1
    • Olof Johansson's avatar
      Merge branch 'multiplatform/smp_ops' into next/multiplatform · 25468fe8
      Olof Johansson authored
      * multiplatform/smp_ops:
        ARM: consolidate pen_release instead of having per platform definitions
        ARM: smp: Make SMP operations mandatory
        ARM: SoC: convert spear13xx to SMP operations
        ARM: SoC: convert imx6q to SMP operations
        ARM: SoC: convert highbank to SMP operations
        ARM: SoC: convert shmobile SMP to SMP operations
        ARM: SoC: convert ux500 to SMP operations
        ARM: SoC: convert MSM to SMP operations
        ARM: SoC: convert Exynos4 to SMP operations
        ARM: SoC: convert Tegra to SMP operations
        ARM: SoC: convert OMAP4 to SMP operations
        ARM: SoC: convert VExpress/RealView to SMP operations
        ARM: SoC: add per-platform SMP operations
      
      Conflicts due to file moves or removals in:
      	arch/arm/mach-msm/board-msm8960.c
      	arch/arm/mach-msm/board-msm8x60.c
      	arch/arm/mach-tegra/board-harmony.c
      	arch/arm/mach-tegra/board-trimslice.c
      
      Conflicts due to board file cleanup:
      	arch/arm/mach-tegra/board-paz00.c
      
      Conflicts due to cpu hotplug addition:
      	arch/arm/mach-tegra/hotplug.c
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      25468fe8
  2. 21 Sep, 2012 13 commits
    • Rob Herring's avatar
      ARM: highbank: call highbank_pm_init from .init_machine · a283580c
      Rob Herring authored
      Being a module_init call, highbank_pm_init will cause problem with
      multi-platform build running on other platforms.  Call it from
      .init_machine instead.
      Reported-by: default avatarShawn Guo <shawn.guo@linaro.org>
      Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      a283580c
    • Olof Johansson's avatar
      ARM: dtb: move all dtb targets to common Makefile · 85594df2
      Olof Johansson authored
      Since the dtb targets have moved to arch/arm/boot/dts/Makefile, sweep
      the platforms that have had new targets added recently and move them over.
      
      While I was at it, I also made the dtb generation more generic, i.e. if
      the platform is enabled then all dtbs for that platform will be created.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      Cc: Tony Lindgren <tony@atomide.com>
      Cc: David Brown <davidb@codeaurora.com>
      Cc: Barry Song <Baohua.Song@csr.com>
      Cc: Simon Horman <horms@verge.net.au>
      Cc: Rob Herring <rob.herring@calxeda.com>
      Cc: Stephen Warren <swarren@wwwdotorg.org>
      85594df2
    • Olof Johansson's avatar
      Merge tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux... · 5ae8d15f
      Olof Johansson authored
      Merge tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux into next/multiplatform
      
      Enable initial ARM multi-platform support for highbank, mvebu,
      socfpga, picoxcell, and vexpress.
      
      Multi-platform support is dependent on mach/gpio.h removal and
      restructuring of DEBUG_LL and dtb build rules included in this branch.
      
      This has been built for all defconfigs, and booted on highbank with
      all 5 platforms enabled.
      
      By Rob Herring (18) and Arnd Bergmann (1)
      via Rob Herring
      * tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux:
        ARM: vexpress: convert to multi-platform
        ARM: initial multiplatform support
        ARM: mvebu: move armada-370-xp.h in mach dir
        ARM: vexpress: remove dependency on mach/* headers
        ARM: picoxcell: remove dependency on mach/* headers
        ARM: move all dtb targets out of Makefile.boot
        ARM: picoxcell: move debug macros to include/debug
        ARM: socfpga: move debug macros to include/debug
        ARM: mvebu: move debug macros to include/debug
        ARM: vexpress: move debug macros to include/debug
        ARM: highbank: move debug macros to include/debug
        ARM: move debug macros to common location
        ARM: make mach/gpio.h headers optional
        ARM: orion: move custom gpio functions to orion-gpio.h
        ARM: shmobile: move custom gpio functions to sh-gpio.h
        ARM: pxa: use gpio_to_irq for sharppm_sl
        net: pxaficp_ir: add irq resources
        usb: pxa27x_udc: remove IRQ_USB define
        staging: ste_rmi4: remove gpio.h include
      
      Conflicts due to addition of bcm2835 and removal of pnx4008 in:
      	arch/arm/Kconfig
      	arch/arm/Makefile
      
      Conflicts due to new dtb targets, moved to arch/arm/boot/dts/Makefile in:
      	arch/arm/mach-imx/Makefile.boot
      	arch/arm/mach-mxs/Makefile.boot
      	arch/arm/mach-tegra/Makefile.boot
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      5ae8d15f
    • Olof Johansson's avatar
      Merge branch 'next/soc' into next/multiplatform · b612a857
      Olof Johansson authored
      * next/soc: (50 commits)
        ARM: OMAP: AM33xx hwmod: fixup SPI after platform_data move
        MAINTAINERS: add an entry for the BCM2835 ARM sub-architecture
        ARM: bcm2835: instantiate console UART
        ARM: bcm2835: add stub clock driver
        ARM: bcm2835: add system timer
        ARM: bcm2835: add interrupt controller driver
        ARM: add infra-structure for BCM2835 and Raspberry Pi
        ARM: tegra20: add CPU hotplug support
        ARM: tegra30: add CPU hotplug support
        ARM: tegra: clean up the common assembly macros into sleep.h
        ARM: tegra: replace the CPU CAR access code by tegra_cpu_car_ops
        ARM: tegra: introduce tegra_cpu_car_ops structures
        ARM: Tegra: Add smp_twd clock for Tegra20
        ARM: AM33XX: clock: Add dcan clock aliases for device-tree
        ARM: OMAP2+: dpll: Add missing soc_is_am33xx() check for common functions
        ARM: OMAP: omap_device: idle devices with no driver bound
        ARM: OMAP: omap_device: don't attempt late suspend if no driver bound
        ARM: OMAP: omap_device: keep track of driver bound status
        ARM: OMAP3+: hwmod: Add AM33XX HWMOD data
        ARM: OMAP2+: hwmod: Hook-up am33xx support in omap_hwmod framework
        ...
      
      Change/remove conflict in arch/arm/mach-ux500/clock.c resolved.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      b612a857
    • Olof Johansson's avatar
      Merge branch 'next/dt' into next/multiplatform · ea832c41
      Olof Johansson authored
      * next/dt: (182 commits)
        ARM: tegra: Add Avionic Design Tamonten Evaluation Carrier support
        ARM: tegra: Add Avionic Design Medcom-Wide support
        ARM: tegra: Add Avionic Design Plutux support
        ARM: tegra: Add Avionic Design Tamonten support
        ARM: tegra: dts: Add pwm label
        ARM: dt: tegra: whistler: configure power off
        ARM: mxs: m28evk: Disable OCOTP OUI loading
        ARM: imx6q: use pll2_pfd2_396m as the enfc_sel's parent
        ARM: dts: imx6q-sabrelite: add usbotg pinctrl support
        ARM: dts: imx23-olinuxino: Add USB host support
        ARM: dts: imx6q-sabrelite: add usbmisc device
        ARM: dts: mx23: Add USB resources
        ARM: dts: mxs: Add ethernetX to macX aliases
        ARM: msm: Remove non-DT targets from 8960
        ARM: msm: Add DT support for 8960
        ARM: msm: Move io mapping prototypes to common.h
        ARM: msm: Rename board-msm8x60 to signify its DT only status
        ARM: msm: Make 8660 a DT only target
        ARM: msm: Move 8660 to DT timer
        ARM: msm: Add DT support to msm_timer
        ...
      ea832c41
    • Olof Johansson's avatar
      Merge branch 'next/cleanup' into next/multiplatform · b74aae9a
      Olof Johansson authored
      * next/cleanup: (358 commits)
        ARM: tegra: harmony: fix ldo7 regulator-name
        ARM: OMAP2+: Make omap4-keypad.h local
        ARM: OMAP2+: Make l4_3xxx.h local
        ARM: OMAP2+: Make l4_2xxx.h local
        ARM: OMAP2+: Make l3_3xxx.h local
        ARM: OMAP2+: Make l3_2xxx.h local
        ARM: OMAP1: Move irda.h from plat to mach
        ARM: OMAP2+: Make hdq1w.h local
        ARM: OMAP2+: Make gpmc-smsc911x.h local
        ARM: OMAP2+: Make gpmc-smc91x.h local
        ARM: OMAP1: Move flash.h from plat to mach
        ARM: OMAP2+: Make debug-devices.h local
        ARM: OMAP1: Move board-voiceblue.h from plat to mach
        ARM: OMAP1: Move board-sx1.h from plat to mach
        ARM: OMAP2+: Make omap-wakeupgen.h local
        ARM: OMAP2+: Make omap-secure.h local
        ARM: OMAP2+: Make ctrl_module_wkup_44xx.h local
        ARM: OMAP2+: Make ctrl_module_pad_wkup_44xx.h local
        ARM: OMAP2+: Make ctrl_module_pad_core_44xx.h local
        ARM: OMAP2+: Make ctrl_module_core_44xx.h local
        ...
      b74aae9a
    • Olof Johansson's avatar
      Merge tag 'omap-cleanup-local-headers-for-v3.7' of... · b97ba3ab
      Olof Johansson authored
      Merge tag 'omap-cleanup-local-headers-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
      
      From Tony Lindgren:
      This branch contains mostly scripted changes to make omap
      header files local where possible to get us closer to supporting
      the ARM single zImage. After these changes mach includes are
      pretty much out of the way for omap2+, but still lots of manual
      work remains to sort through the remaining plat includes.
      
      * tag 'omap-cleanup-local-headers-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (26 commits)
        ARM: OMAP2+: Make omap4-keypad.h local
        ARM: OMAP2+: Make l4_3xxx.h local
        ARM: OMAP2+: Make l4_2xxx.h local
        ARM: OMAP2+: Make l3_3xxx.h local
        ARM: OMAP2+: Make l3_2xxx.h local
        ARM: OMAP1: Move irda.h from plat to mach
        ARM: OMAP2+: Make hdq1w.h local
        ARM: OMAP2+: Make gpmc-smsc911x.h local
        ARM: OMAP2+: Make gpmc-smc91x.h local
        ARM: OMAP1: Move flash.h from plat to mach
        ARM: OMAP2+: Make debug-devices.h local
        ARM: OMAP1: Move board-voiceblue.h from plat to mach
        ARM: OMAP1: Move board-sx1.h from plat to mach
        ARM: OMAP2+: Make omap-wakeupgen.h local
        ARM: OMAP2+: Make omap-secure.h local
        ARM: OMAP2+: Make ctrl_module_wkup_44xx.h local
        ARM: OMAP2+: Make ctrl_module_pad_wkup_44xx.h local
        ARM: OMAP2+: Make ctrl_module_pad_core_44xx.h local
        ARM: OMAP2+: Make ctrl_module_core_44xx.h local
        ARM: OMAP2+: Make board-rx51.h local
        ...
      b97ba3ab
    • Olof Johansson's avatar
      Merge tag 'imx-dt-3.7-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt · 84bae6c3
      Olof Johansson authored
      From Shawn Guo:
      This is the second round of imx-dt patches for 3.7.  It's based on
      and imx-dt-3.7 and imx-clk-dt-lookup which have already been pulled.
      
      * tag 'imx-dt-3.7-2' of git://git.linaro.org/people/shawnguo/linux-2.6:
        ARM: imx6q: use pll2_pfd2_396m as the enfc_sel's parent
        ARM: dts: imx6q-sabrelite: add usbotg pinctrl support
        ARM: dts: imx6q-sabrelite: add usbmisc device
      84bae6c3
    • Olof Johansson's avatar
      Merge tag 'mxs-dt-3.7-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt · 6ded2450
      Olof Johansson authored
      From Shawn Guo:
      This is the second round of mxs-dt patches for 3.7.  It's based on
      mxs-dt-3.7 and mxs-clk-dt-lookup which have been pulled into arm-soc.
      
      * tag 'mxs-dt-3.7-2' of git://git.linaro.org/people/shawnguo/linux-2.6:
        ARM: mxs: m28evk: Disable OCOTP OUI loading
        ARM: dts: imx23-olinuxino: Add USB host support
        ARM: dts: mx23: Add USB resources
        ARM: dts: mxs: Add ethernetX to macX aliases
      6ded2450
    • Olof Johansson's avatar
      Merge tag 'tegra-for-3.7-dmaengine' of... · 32dec753
      Olof Johansson authored
      Merge tag 'tegra-for-3.7-dmaengine' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup
      
      ARM: tegra: switch to dmaengine
      
      The Tegra code-base has contained both a legacy DMA and a dmaengine
      driver since v3.6-rcX. This series flips Tegra's defconfig to enable
      dmaengine rather than the legacy driver, and removes the legacy driver
      and all client code.
      
      * tag 'tegra-for-3.7-dmaengine' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
        ASoC: tegra: remove support of legacy DMA driver based access
        spi: tegra: remove support of legacy DMA driver based access
        ARM: tegra: apbio: remove support of legacy DMA driver based access
        ARM: tegra: dma: remove legacy APB DMA driver
        ARM: tegra: config: enable dmaengine based APB DMA driver
        + sync to 3.6-rc6
      32dec753
    • Stephen Warren's avatar
      ARM: tegra: harmony: fix ldo7 regulator-name · 740418ef
      Stephen Warren authored
      On Harmony, LDO7 does not feed vdd_fuse. Correct the regulator name.
      This issue was probably the result of copying Ventana's regulator setup
      when creating the Harmony .dts file. No other naming issues appear to
      exist.
      Reported-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
      Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      740418ef
    • Olof Johansson's avatar
      Merge tag 'tegra-for-3.7-dt2' of... · 7a5551c7
      Olof Johansson authored
      Merge tag 'tegra-for-3.7-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/dt
      
      ARM: tegra: second round of device tree changes
      
      This branch includes some late device tree changes for Tegra:
      
      A property is added to Whistler's device tree to enable the PMIC to
      act as the pm_power_off() implementation.
      
      A number of new device tree are added for boards from Avionic Design.
      
      * tag 'tegra-for-3.7-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
        ARM: tegra: Add Avionic Design Tamonten Evaluation Carrier support
        ARM: tegra: Add Avionic Design Medcom-Wide support
        ARM: tegra: Add Avionic Design Plutux support
        ARM: tegra: Add Avionic Design Tamonten support
        ARM: tegra: dts: Add pwm label
        ARM: dt: tegra: whistler: configure power off
      7a5551c7
    • Olof Johansson's avatar
      Merge tag 'rpi-for-3.7' of... · 3aec092e
      Olof Johansson authored
      Merge tag 'rpi-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi into next/soc
      
      ARM: add basic BCM2835 SoC and Raspberry Pi board support
      
      The BCM2835 is an ARM SoC from Broadcom. This patch adds very basic
      support for this SoC; enough to boot the system into an initrd with
      UART console, interrupt controller, timers, and a stub clock driver.
      
      Also provided is a similarly basic device tree for the Raspberry Pi
      Model B board.
      
      This series was written by Simon Arlott, Chris Boot, and Dom Cobley
      downstream, with reference to a Broadcom tree, and modified for upstream
      and submitted by Stephen Warren.
      
      * tag 'rpi-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi:
        MAINTAINERS: add an entry for the BCM2835 ARM sub-architecture
        ARM: bcm2835: instantiate console UART
        ARM: bcm2835: add stub clock driver
        ARM: bcm2835: add system timer
        ARM: bcm2835: add interrupt controller driver
        ARM: add infra-structure for BCM2835 and Raspberry Pi
      3aec092e
  3. 20 Sep, 2012 25 commits