aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-09-22ARM: kirkwood: move new dtbs to common MakefileOlof Johansson3-8/+6
This moves a few of the newly introduced dtb targets to the common dts/Makefile instead of the per-platform file. Signed-off-by: Olof Johansson <[email protected]>
2012-09-22Merge branch 'kirkwood/drivers' of ↵Olof Johansson25-5/+4546
git://git.infradead.org/users/jcooper/linux into late/kirkwood From Jason Cooper: New drivers: - pinctrl (dove, kirkwood, mvebu) - gpio (mvebu) * 'kirkwood/drivers' of git://git.infradead.org/users/jcooper/linux: arm: mvebu: add gpio support in defconfig arm: mvebu: add DT information for GPIO banks on Armada 370 and XP arm: mvebu: use GPIO support now that a driver is available Documentation: add description of DT binding for the gpio-mvebu driver gpio: introduce gpio-mvebu driver for Marvell SoCs arm: mvebu: select the pinctrl drivers for Armada 370 and Armada XP platforms arm: mvebu: split Kconfig options for Armada 370 and XP ARM: mvebu: adjust Armada XP evaluation board DTS ARM: mvebu: Add pinctrl support to Armada 370 SoC ARM: mvebu: Add pinctrl support to Armada XP SoCs pinctrl: mvebu: add pinctrl driver for Armada XP pinctrl: mvebu: add pinctrl driver for Armada 370 pinctrl: mvebu: kirkwood pinctrl driver pinctrl: mvebu: dove pinctrl driver pinctrl: mvebu: pinctrl driver core Signed-off-by: Olof Johansson <[email protected]>
2012-09-22Merge branch 'kirkwood/addr_decode' of ↵Olof Johansson40-316/+459
git://git.infradead.org/users/jcooper/linux into late/kirkwood * 'kirkwood/addr_decode' of git://git.infradead.org/users/jcooper/linux: arm: mvebu: add address decoding controller to the DT arm: mvebu: add basic address decoding support to Armada 370/XP arm: plat-orion: make bridge_virt_base non-const to support DT use case arm: plat-orion: introduce PLAT_ORION_LEGACY hidden config option arm: plat-orion: use void __iomem pointers for addr-map functions arm: plat-orion: use void __iomem pointers for time functions arm: plat-orion: use void __iomem pointers for MPP functions arm: plat-orion: use void __iomem pointers for UART registration functions arm: mach-mvebu: use IOMEM() for base address definitions arm: mach-orion5x: use IOMEM() for base address definitions arm: mach-mv78xx0: use IOMEM() for base address definitions arm: mach-kirkwood: use IOMEM() for base address definitions arm: mach-dove: use IOMEM() for base address definitions arm: mach-orion5x: use plus instead of or for address definitions arm: mach-mv78xx0: use plus instead of or for address definitions arm: mach-kirkwood: use plus instead of or for address definitions arm: mach-dove: use plus instead of or for address definitions This branch had quite a few conflicts, in particular with the PCI static map rework from Rob Herring, and a few other context conflicts due to changes in Kconfig, etc. I fixed up conflicts in: arch/arm/Kconfig arch/arm/mach-dove/common.c arch/arm/mach-dove/include/mach/dove.h arch/arm/mach-kirkwood/common.c arch/arm/mach-kirkwood/include/mach/kirkwood.h arch/arm/mach-mv78xx0/common.c arch/arm/mach-mv78xx0/include/mach/mv78xx0.h arch/arm/mach-orion5x/common.c arch/arm/mach-orion5x/include/mach/orion5x.h Signed-off-by: Olof Johansson <[email protected]>
2012-09-22Merge branch 'kirkwood/cleanup' of ↵Olof Johansson1-9/+0
git://git.infradead.org/users/jcooper/linux into late/kirkwood From Jason Cooper: Misc: - trim includes for board-dnskw.c * 'kirkwood/cleanup' of git://git.infradead.org/users/jcooper/linux: ARM: kirkwood: Trim excess #includes in board-dnskw.c
2012-09-22Merge branch 'kirkwood/dt' of git://git.infradead.org/users/jcooper/linux ↵Olof Johansson10-79/+251
into late/kirkwood From Jason Cooper: New bindings: - iconnect nand and keys - mv_cesa - gpio-fan * 'kirkwood/dt' of git://git.infradead.org/users/jcooper/linux: ARM: kirkwood: Use devicetree to define DNS-32[05] fan hwmon: Add devicetree bindings to gpio-fan Crypto: CESA: Add support for DT based instantiation. ARM: Kirkwood: Describe iconnect nand in DT. ARM: Kirkwood: Describe iconnect keys in DT.
2012-09-22Merge branch 'kirkwood/defconfig' of ↵Olof Johansson1-19/+19
git://git.infradead.org/users/jcooper/linux into late/kirkwood From Jason Cooper: defconfig: - update kirkwood_defconfig via 'make oldconfig' - Add all Kirkwood DT boards to the defconfig - enable SERIAL_OF_PLATFORM and ORION_WATCHDOG in kirkwood_defconfig * 'kirkwood/defconfig' of git://git.infradead.org/users/jcooper/linux: ARM: Kirkwood: add DT boards to defconfig ARM: Kirkwood: update defconfig
2012-09-22Merge branch 'kirkwood/boards' of ↵Olof Johansson23-33/+1113
git://git.infradead.org/users/jcooper/linux into late/kirkwood * 'kirkwood/boards' of git://git.infradead.org/users/jcooper/linux: ARM: Dove: allow PCI to be disabled ARM: dove: SolidRun CuBox DT ARM: dove: add device tree descriptors ARM: dove: add device tree based machine descriptor ARM: dove: add crypto engine ARM: dove: add clock gating control ARM: dove: unify clock setup ARM: initial DTS support for km_kirkwood arm: add documentation describing Marvell families of SoC ARM: kirkwood: DT descriptor for Seagate FreeAgent Dockstar ARM: kirkwood: DT board setup for Seagate FreeAgent Dockstar ARM: Kirkwood: Iomega ix2-200 DT support Context conflicts in arch/arm/Kconfig and arch/arm/mach-dove/common.c. The new device trees added to arch/arm/mach-kirkwood/Makefile.boot are kept and dealt with in a separate changeset, since moving them out to the new Makefile in this merge commit doesn't work well. Signed-off-by: Olof Johansson <[email protected]>
2012-09-22Merge branch 'next/multiplatform' into late/kirkwoodOlof Johansson402-578/+577
By Arnd Bergmann (15) and David Brown (1) * next/multiplatform: ARM: msm: Move core.h contents into common.h ARM: spear: move platform_data definitions ARM: samsung: move platform_data definitions ARM: orion: move platform_data definitions ARM: nomadik: move platform_data definitions ARM: w90x900: move platform_data definitions ARM: vt8500: move platform_data definitions ARM: tegra: move sdhci platform_data definition ARM: sa1100: move platform_data definitions ARM: pxa: move platform_data definitions ARM: netx: move platform_data definitions ARM: msm: move platform_data definitions ARM: imx: move platform_data definitions ARM: ep93xx: move platform_data definitions ARM: davinci: move platform_data definitions ARM: at91: move platform_data definitions
2012-09-22Merge branch 'next/cleanup' into late/kirkwoodOlof Johansson67-400/+402
By Arnd Bergmann (21) and Wei Yongjun (1) via Olof Johansson (2) and Haojian Zhuang (1) * next/cleanup: (22 commits) ARM: mmp: using for_each_set_bit to simplify the code net: seeq: use __iomem pointers for MMIO video: da8xx-fb: use __iomem pointers for MMIO scsi: eesox: use __iomem pointers for MMIO serial: ks8695: use __iomem pointers for MMIO input: rpcmouse: use __iomem pointers for MMIO ARM: samsung: use __iomem pointers for MMIO ARM: spear13xx: use __iomem pointers for MMIO ARM: sa1100: use __iomem pointers for MMIO ARM: prima2: use __iomem pointers for MMIO ARM: nomadik: use __iomem pointers for MMIO ARM: msm: use __iomem pointers for MMIO ARM: lpc32xx: use __iomem pointers for MMIO ARM: ks8695: use __iomem pointers for MMIO ARM: ixp4xx: use __iomem pointers for MMIO ARM: iop32x: use __iomem pointers for MMIO ARM: iop13xx: use __iomem pointers for MMIO ARM: integrator: use __iomem pointers for MMIO ARM: imx: use __iomem pointers for MMIO ARM: ebsa110: use __iomem pointers for MMIO ...
2012-09-22Merge branch 'cleanup/__iomem' into next/cleanupOlof Johansson66-397/+401
__iomem annotation cleanup branch from Arnd. * cleanup/__iomem: (21 commits) net: seeq: use __iomem pointers for MMIO video: da8xx-fb: use __iomem pointers for MMIO scsi: eesox: use __iomem pointers for MMIO serial: ks8695: use __iomem pointers for MMIO input: rpcmouse: use __iomem pointers for MMIO ARM: samsung: use __iomem pointers for MMIO ARM: spear13xx: use __iomem pointers for MMIO ARM: sa1100: use __iomem pointers for MMIO ARM: prima2: use __iomem pointers for MMIO ARM: nomadik: use __iomem pointers for MMIO ARM: msm: use __iomem pointers for MMIO ARM: lpc32xx: use __iomem pointers for MMIO ARM: ks8695: use __iomem pointers for MMIO ARM: ixp4xx: use __iomem pointers for MMIO ARM: iop32x: use __iomem pointers for MMIO ARM: iop13xx: use __iomem pointers for MMIO ARM: integrator: use __iomem pointers for MMIO ARM: imx: use __iomem pointers for MMIO ARM: ebsa110: use __iomem pointers for MMIO ARM: at91: use __iomem pointers for MMIO ... Signed-off-by: Olof Johansson <[email protected]>
2012-09-22ARM: kirkwood: Trim excess #includes in board-dnskw.cJamie Lentin1-9/+0
Lots of code has now moved into the devicetree, leaving a collection of useless header files. Tidy them up. This applies cleanly atop of my previous patch, "[PATCH V2 2/2] ARM: kirkwood: Use devicetree to define DNS-32[05] fan", which also removes gpio-fan.h Signed-off-by: Jamie Lentin <[email protected]> Acked-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-22arm: mvebu: add gpio support in defconfigThomas Petazzoni1-0/+2
Signed-off-by: Thomas Petazzoni <[email protected]> Cc: Jason Cooper <[email protected]> Cc: Andrew Lunn <[email protected]> Cc: Gregory Clement <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-22arm: mvebu: add DT information for GPIO banks on Armada 370 and XPThomas Petazzoni4-0/+152
The gpioX aliases are needed so that the driver can use of_alias_get_id() to get a 0-based number of the GPIO bank, which we then use to compute the base GPIO of the bank being probed. This is similar to what gpio-mxs.c is doing. Signed-off-by: Thomas Petazzoni <[email protected]> Cc: Jason Cooper <[email protected]> Cc: Andrew Lunn <[email protected]> Cc: Gregory Clement <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-22arm: mvebu: use GPIO support now that a driver is availableThomas Petazzoni2-0/+2
Signed-off-by: Thomas Petazzoni <[email protected]> Cc: Andrew Lunn <[email protected]> Cc: Jason Cooper <[email protected]> Cc: Gregory Clement <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-22Documentation: add description of DT binding for the gpio-mvebu driverThomas Petazzoni1-0/+53
Signed-off-by: Thomas Petazzoni <[email protected]> Acked-by: Linus Walleij <[email protected]> Cc: Grant Likely <[email protected]> Cc: Linus Walleij <[email protected]> Cc: Andrew Lunn <[email protected]> Cc: Jason Cooper <[email protected]> Cc: Gregory Clement <[email protected]> Acked-by: Rob Herring <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-22gpio: introduce gpio-mvebu driver for Marvell SoCsThomas Petazzoni3-0/+686
This driver aims at replacing the arch/arm/plat-orion/gpio.c driver, and is designed to be compatible with all Marvell EBU SoCs: Orion, Kirkwood, Dove, Armada 370/XP and Discovery. It has been successfully tested on Dove and Armada XP at the moment. Compared to the plat-orion driver, this new driver has the following added benefits: *) Support for Armada 370 and Armada XP *) It is integrated with the mvebu pinctrl driver so that GPIO pins are properly muxed, and the GPIO driver knows which GPIO pins are output-only or input-only. *) Properly placed in drivers/gpio *) More extensible mechanism to support platform differences. The plat-orion driver uses a simple mask-offset DT property, which works fine for Discovery MV78200 but not for Armada XP. The new driver uses different compatible strings to identify the different variants of the GPIO controllers. Signed-off-by: Thomas Petazzoni <[email protected]> Cc: Grant Likely <[email protected]> Cc: Linus Walleij <[email protected]> Cc: Andrew Lunn <[email protected]> Cc: Jason Cooper <[email protected]> Cc: Gregory Clement <[email protected]> Tested-by: Sebastian Hesselbarth <[email protected]> Reviewed-by: Linus Walleij <[email protected]> Tested-by: Andrew Lunn <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-22arm: mvebu: select the pinctrl drivers for Armada 370 and Armada XP platformsThomas Petazzoni1-0/+2
This patch actually enables pinctrl drivers for Armada 370 and XP. Signed-off-by: Thomas Petazzoni <[email protected]> Acked-by: Thomas Petazzoni <[email protected]> Tested-by: Thomas Petazzoni <[email protected]> Reviewed-by: Stephen Warren <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-22arm: mvebu: split Kconfig options for Armada 370 and XPThomas Petazzoni1-3/+13
Until now, all the code for Armada 370 and XP was common, so we had a single Kconfig option to support all boards using both SoCs. With the addition of pinctrl drivers, this situation has changed: those two SoCs are radically different in terms of pinctrl, so they have two separate drivers. Since pinctrl drivers are typically select-ed from the SoC Kconfig option, it makes sense to split the 370/XP option into two separate options: one for Armada 370 and another for Armada XP. We keep an hidden option selected by both ARMADA_370 and ARMADA_XP in order to easily compile common code. A followup patch actually makes use of this split to select the appropriate pinctrl drivers. Signed-off-by: Thomas Petazzoni <[email protected]> Acked-by: Gregory Clement <[email protected]> Acked-by: Thomas Petazzoni <[email protected]> Tested-by: Thomas Petazzoni <[email protected]> Reviewed-by: Stephen Warren <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-22ARM: mvebu: adjust Armada XP evaluation board DTSThomas Petazzoni1-2/+2
The Armada XP evaluation board is based on the MV78460 Armava XP SoC. Now that we have separate .dtsi files for the three different SoCs of the Armada XP family, use the appropriate one as include for the Armada XP evaluation board .dts file. Signed-off-by: Thomas Petazzoni <[email protected]> Acked-by: Linus Walleij <[email protected]> Acked-by: Thomas Petazzoni <[email protected]> Tested-by: Thomas Petazzoni <[email protected]> Reviewed-by: Stephen Warren <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-22ARM: mvebu: Add pinctrl support to Armada 370 SoCThomas Petazzoni1-0/+5
This commits adds the necessary device tree information to define the compatible property for the pinctrl driver instance of Armada 370 SoC. Signed-off-by: Thomas Petazzoni <[email protected]> Acked-by: Linus Walleij <[email protected]> Acked-by: Thomas Petazzoni <[email protected]> Tested-by: Thomas Petazzoni <[email protected]> Reviewed-by: Stephen Warren <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-22ARM: mvebu: Add pinctrl support to Armada XP SoCsThomas Petazzoni3-0/+84
This commits adds the necessary device tree information to define the compatible property for the pinctrl driver instance of Armada XP SoCs. Until now, the device tree representation considered the Armada XP as a single SoC. But in fact, there are three different SoCs in the Armada XP families, with different number of CPU cores, different number of Ethernet interfaces... and different number of muxable pins or functions. We therefore introduce three armada-xp-mv78xx0.dtsi for the three SoCs of the Armada XP family. The current armada-xp-db.dts evaluation board uses the MV78460 variant of the SoC. Signed-off-by: Thomas Petazzoni <[email protected]> Acked-by: Linus Walleij <[email protected]> Acked-by: Thomas Petazzoni <[email protected]> Tested-by: Thomas Petazzoni <[email protected]> Reviewed-by: Stephen Warren <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-22pinctrl: mvebu: add pinctrl driver for Armada XPThomas Petazzoni4-0/+573
This pinctrl driver is not a full-blown pinctrl driver from scratch: it relies on the common pinctrl-mvebu driver, which is used for all Marvell EBU SoCs. Signed-off-by: Thomas Petazzoni <[email protected]> Acked-by: Linus Walleij <[email protected]> Acked-by: Thomas Petazzoni <[email protected]> Tested-by: Thomas Petazzoni <[email protected]> Reviewed-by: Stephen Warren <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-22pinctrl: mvebu: add pinctrl driver for Armada 370Thomas Petazzoni4-0/+521
This pinctrl driver is not a full-blown pinctrl driver from scratch: it relies on the common pinctrl-mvebu driver, which is used for all Marvell EBU SoCs. Signed-off-by: Thomas Petazzoni <[email protected]> Acked-by: Linus Walleij <[email protected]> Acked-by: Thomas Petazzoni <[email protected]> Tested-by: Thomas Petazzoni <[email protected]> Reviewed-by: Stephen Warren <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-22pinctrl: mvebu: kirkwood pinctrl driverSebastian Hesselbarth4-0/+756
This patch adds a SoC specific pinctrl driver for Marvell Kirkwood SoCs plus DT binding documentation. This driver will use the mvebu pinctrl driver core. Signed-off-by: Sebastian Hesselbarth <[email protected]> Acked-by: Thomas Petazzoni <[email protected]> Tested-by: Thomas Petazzoni <[email protected]> Reviewed-by: Stephen Warren <[email protected]> Tested-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-22pinctrl: mvebu: dove pinctrl driverSebastian Hesselbarth4-0/+697
This patch adds a SoC specific pinctrl driver for Marvell Dove SoCs plus DT binding documentation. This driver will use the mvebu pinctrl driver core. Signed-off-by: Sebastian Hesselbarth <[email protected]> Acked-by: Linus Walleij <[email protected]> Acked-by: Thomas Petazzoni <[email protected]> Tested-by: Thomas Petazzoni <[email protected]> Reviewed-by: Stephen Warren <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-22pinctrl: mvebu: pinctrl driver coreSebastian Hesselbarth6-0/+1000
This patch adds a pinctrl driver core for Marvell SoCs plus DT binding documentation. This core driver will be used by SoC family specific drivers, i.e. Armada XP, Armada 370, Dove, Kirkwood, aso. Signed-off-by: Sebastian Hesselbarth <[email protected]> Signed-off-by: Thomas Petazzoni <[email protected]> Acked-by: Thomas Petazzoni <[email protected]> Tested-by: Thomas Petazzoni <[email protected]> Reviewed-by: Stephen Warren <[email protected]> Signed-off-by: Jason Cooper <[email protected]> Conflicts: arch/arm/Kconfig
2012-09-22ARM: kirkwood: Use devicetree to define DNS-32[05] fanJamie Lentin2-26/+10
Remove more board-specific code by using devicetree to define the fan attached to both boards. Signed-off-by: Jamie Lentin <[email protected]> Acked-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-22hwmon: Add devicetree bindings to gpio-fanJamie Lentin2-0/+145
Allow a gpio-fan to be defined in devicetree, see binding documentation for details. Signed-off-by: Jamie Lentin <[email protected]> Acked-by: Andrew Lunn <[email protected]> Acked-by: Guenter Roeck <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-22Crypto: CESA: Add support for DT based instantiation.Andrew Lunn4-4/+47
Based on work by Michael Walle and Jason Cooper. Added support for getting the interrupt number and address of SRAM from DT. Signed-off-by: Andrew Lunn <[email protected]> Tested-by: Sebastian Hesselbarth <[email protected]> Signed-off-by: Jason Cooper <[email protected]> Conflicts: arch/arm/mach-kirkwood/board-dt.c
2012-09-22ARM: Kirkwood: Describe iconnect nand in DT.Arnaud Patard (Rtp)2-11/+31
Define the nand and its partitions in DT and remove them from cmdline Signed-off-by: Arnaud Patard <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-22ARM: Kirkwood: Describe iconnect keys in DT.Arnaud Patard (Rtp)2-38/+18
Define the 2 keys found on iconnect in DT. It's also changing the keycodes/ switches to use better ones. Signed-off-by: Arnaud Patard <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-22Merge branch 'multiplatform/platform-data' into next/multiplatformOlof Johansson397-574/+573
* multiplatform/platform-data: ARM: spear: move platform_data definitions ARM: samsung: move platform_data definitions ARM: orion: move platform_data definitions ARM: nomadik: move platform_data definitions ARM: w90x900: move platform_data definitions ARM: vt8500: move platform_data definitions ARM: tegra: move sdhci platform_data definition ARM: sa1100: move platform_data definitions ARM: pxa: move platform_data definitions ARM: netx: move platform_data definitions ARM: msm: move platform_data definitions ARM: imx: move platform_data definitions ARM: ep93xx: move platform_data definitions ARM: davinci: move platform_data definitions ARM: at91: move platform_data definitions Conflicts due to removed files: arch/arm/mach-tegra/board-harmony.c arch/arm/mach-tegra/board-trimslice.c Conflicts due to code removal: arch/arm/mach-tegra/board-paz00.c Context conflicts in: drivers/mmc/host/sdhci-tegra.c drivers/net/irda/pxaficp_ir.c Signed-off-by: Olof Johansson <[email protected]>
2012-09-22ARM: msm: Move core.h contents into common.hDavid Brown5-4/+4
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 <[email protected]> Signed-off-by: David Brown <[email protected]> Signed-off-by: Olof Johansson <[email protected]>
2012-09-22Merge branch 'multiplatform/smp_ops' into next/multiplatformOlof Johansson74-401/+535
* 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: Olof Johansson <[email protected]>
2012-09-21Merge branch 'board' of git://github.com/hzhuang1/linux into next/cleanupOlof Johansson1-3/+1
* 'board' of git://github.com/hzhuang1/linux: ARM: mmp: using for_each_set_bit to simplify the code
2012-09-21ARM: Kirkwood: add DT boards to defconfigJason Cooper1-0/+13
Also, enable SERIAL_OF_PLATFORM and ORION_WATCHDOG Signed-off-by: Jason Cooper <[email protected]>
2012-09-21ARM: Kirkwood: update defconfigJason Cooper1-19/+6
Signed-off-by: Jason Cooper <[email protected]>
2012-09-21arm: mvebu: add address decoding controller to the DTThomas Petazzoni1-0/+5
Signed-off-by: Thomas Petazzoni <[email protected]> Acked-by: Gregory CLEMENT <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Tested-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-21arm: mvebu: add basic address decoding support to Armada 370/XPThomas Petazzoni2-1/+135
This commit adds basic support for address decoding configuration for the Armada 370 and Armada XP SoCs, re-using the infrastructure provided in plat-orion. For now, only a BootROM window is configured on Armada XP, which is needed to get the non-boot CPUs started and is therefore a requirement for SMP support. Signed-off-by: Thomas Petazzoni <[email protected]> Acked-by: Gregory CLEMENT <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Tested-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-21arm: plat-orion: make bridge_virt_base non-const to support DT use caseThomas Petazzoni1-1/+1
For the Armada 370 and XP SoCs where the DT is used, we need to fill at runtime the bridge_virt_base field on the orion_addr_map_cfg. Therefore, remove the 'const' qualifier on this field. Signed-off-by: Thomas Petazzoni <[email protected]> Acked-by: Gregory CLEMENT <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Tested-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-21arm: plat-orion: introduce PLAT_ORION_LEGACY hidden config optionThomas Petazzoni2-9/+13
Until now, the PLAT_ORION configuration option was common to all the Marvell EBU SoCs, and selecting this option had the effect of enabling the MPP code, GPIO code, address decoding and PCIe code from plat-orion, as well as providing access to driver-specific header files from plat-orion/include. However, the Armada 370 and XP SoCs will not use the MPP and GPIO code (instead some proper pinctrl and gpio drivers are in preparation), and generally, we want to move away from plat-orion and instead have everything in mach-mvebu. That said, in the mean time, we want to leverage the driver-specific headers as well as the address decoding code, so we introduce PLAT_ORION_LEGACY. The older Marvell SoCs need to select PLAT_ORION_LEGACY, while the newer Marvell SoCs need to select PLAT_ORION. Of course, when PLAT_ORION_LEGACY is selected, it automatically selects PLAT_ORION. Then, with just PLAT_ORION, you have the address decoding code plus the driver-specific headers. If you add PLAT_ORION_LEGACY to this, you gain the old MPP, GPIO and PCIe code. Again, this is only a temporary solution until we make all Marvell EBU platforms converge into the mach-mvebu directory. This solution avoids duplicating the existing address decoding code into mach-mvebu. Signed-off-by: Thomas Petazzoni <[email protected]> Acked-by: Gregory CLEMENT <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Tested-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-21arm: plat-orion: use void __iomem pointers for addr-map functionsThomas Petazzoni6-16/+15
The functions for address mapping management now take void __iomem pointers, so we remove the temporary "unsigned long" casts from the mach-*/common.c files. Signed-off-by: Thomas Petazzoni <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Tested-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-21arm: plat-orion: use void __iomem pointers for time functionsThomas Petazzoni6-18/+14
The functions for time management now take void __iomem pointers, so we remove the temporary "unsigned long" casts from the mach-*/common.c files. Signed-off-by: Thomas Petazzoni <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Tested-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-21arm: plat-orion: use void __iomem pointers for MPP functionsThomas Petazzoni6-12/+8
The registration function for MPP now takes void __iomem pointers, so we remove the temporary "unsigned long" casts from the mach-*/mpp.c files. Signed-off-by: Thomas Petazzoni <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Tested-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-21arm: plat-orion: use void __iomem pointers for UART registration functionsThomas Petazzoni6-34/+22
The registration functions for UARTs now take void __iomem pointers, so we remove the temporary "unsigned long" casts from the mach-*/common.c files. Signed-off-by: Thomas Petazzoni <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Tested-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-21arm: mach-mvebu: use IOMEM() for base address definitionsThomas Petazzoni2-2/+2
We now define all virtual base address constants using IOMEM() so that those are naturally typed as void __iomem pointers, and we do the necessary adjustements in the mach-mvebu code. Signed-off-by: Thomas Petazzoni <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Tested-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-21arm: mach-orion5x: use IOMEM() for base address definitionsThomas Petazzoni7-19/+24
We now define all virtual base address constants using IOMEM() so that those are naturally typed as void __iomem pointers, and we do the necessary adjustements in the mach-orion5x code. Note that we introduce a few temporary additional "unsigned long" casts when calling into plat-orion functions. Those are removed by followup patches converting plat-orion functions to void __iomem pointers as well. Signed-off-by: Thomas Petazzoni <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Tested-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-21arm: mach-mv78xx0: use IOMEM() for base address definitionsThomas Petazzoni6-24/+31
We now define all virtual base address constants using IOMEM() so that those are naturally typed as void __iomem pointers, and we do the necessary adjustements in the mach-mv78xx0 code. Note that we introduce a few temporary additional "unsigned long" casts when calling into plat-orion functions. Those are removed by followup patches converting plat-orion functions to void __iomem pointers as well. Signed-off-by: Thomas Petazzoni <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Tested-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-21arm: mach-kirkwood: use IOMEM() for base address definitionsThomas Petazzoni7-27/+31
We now define all virtual base address constants using IOMEM() so that those are naturally typed as void __iomem pointers, and we do the necessary adjustements in the mach-kirkwood code. Note that we introduce a few temporary additional "unsigned long" casts when calling into plat-orion functions. Those are removed by followup patches converting plat-orion functions to void __iomem pointers as well. Signed-off-by: Thomas Petazzoni <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Tested-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-09-21arm: mach-dove: use IOMEM() for base address definitionsThomas Petazzoni6-26/+32
We now define all virtual base address constants using IOMEM() so that those are naturally typed as void __iomem pointers, and we do the necessary adjustements in the mach-dove code. Note that we introduce a few temporary additional "unsigned long" casts when calling into plat-orion functions. Those are removed by followup patches converting plat-orion functions to void __iomem pointers as well. Signed-off-by: Thomas Petazzoni <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Tested-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.