* [GIT PULL V5 0/7] ARM: kirkwood/dove/mvebu changes for v3.7
@ 2012-09-22 17:15 Jason Cooper
2012-09-22 17:20 ` [GIT PULL V5 1/7] ARM: kirkwood: board " Jason Cooper
` (8 more replies)
0 siblings, 9 replies; 15+ messages in thread
From: Jason Cooper @ 2012-09-22 17:15 UTC (permalink / raw)
To: linux-arm-kernel
Arnd, Olof,
Changes from V3/V4 (only one pullrq reached V4).
- split kirkwood/dt into /dt and /drivers.
- /drivers now holds pinctrl and gpio
- dropped ehci-orion dt bindings until next window
- reworked dependency matrix
Dep tree:
/--kirkwood/addr_decode--kirkwood/drivers
|
|--kirkwood/dt--kirkwood/cleanup--kirkwood/platform_data
| /
/ /-------------/
v3.6-rc5--kirkwood/boards-|
\--kirkwood/defconfig
Conflicts:
- If kirkwood/platform_data causes conflicts with other work, it can be
dropped.
- When merging /drivers and /defconfig there is a conflict in
arch/arm/Kconfig, resolution is in /drivers tag message:
- keep MIGHT_HAVE_PCI
- keep PLAT_ORION_LEGACY over PLAT_ORION
- allow add USB_ARCH_HAS_EHCI
- It should end up like so:
### start ###
config ARCH_DOVE
bool "Marvell Dove"
select CPU_V7
select ARCH_REQUIRE_GPIOLIB
select GENERIC_CLOCKEVENTS
select MIGHT_HAVE_PCI
select NEED_MACH_IO_H
select PLAT_ORION_LEGACY
select USB_ARCH_HAS_EHCI
help
Support for the Marvell Dove SoC 88AP510
### end #####
Overall changes from v3.6-rc5:
The following changes since commit 55d512e245bc7699a8800e23df1a24195dd08217:
Linux 3.6-rc5 (2012-09-08 16:43:45 -0700)
are available in the git repository at:
git://git.infradead.org/users/jcooper/linux.git tmp/merge_test
Alan M Butler (1):
ARM: Kirkwood: Iomega ix2-200 DT support
Andrew Lunn (1):
Crypto: CESA: Add support for DT based instantiation.
Arnaud Patard (2):
ARM: Kirkwood: Describe iconnect keys in DT.
ARM: Kirkwood: Describe iconnect nand in DT.
Jamie Lentin (3):
hwmon: Add devicetree bindings to gpio-fan
ARM: kirkwood: Use devicetree to define DNS-32[05] fan
ARM: kirkwood: Trim excess #includes in board-dnskw.c
Jason Cooper (7):
ARM: Kirkwood: update defconfig
ARM: Kirkwood: add DT boards to defconfig
Merge branch 'kirkwood/boards' into kirkwood/platform_data
ARM: Kirkwood: board-dockstar: use linux/platform_data/mvsdio.h instead of plat/mvsdio.h
ARM: Kirkwood: use linux/platform_data/mv643xx.h instead of linux/mv643xx.h
Merge branch 'kirkwood/defconfig' into tmp/merge_test
Merge branch 'kirkwood/platform_data' into tmp/merge_test
Russell King (1):
ARM: Dove: allow PCI to be disabled
Sebastian Hesselbarth (11):
ARM: kirkwood: DT board setup for Seagate FreeAgent Dockstar
ARM: kirkwood: DT descriptor for Seagate FreeAgent Dockstar
ARM: dove: unify clock setup
ARM: dove: add clock gating control
ARM: dove: add crypto engine
ARM: dove: add device tree based machine descriptor
ARM: dove: add device tree descriptors
ARM: dove: SolidRun CuBox DT
pinctrl: mvebu: pinctrl driver core
pinctrl: mvebu: dove pinctrl driver
pinctrl: mvebu: kirkwood pinctrl driver
Thomas Petazzoni (38):
arm: add documentation describing Marvell families of SoC
arm: mach-dove: use plus instead of or for address definitions
arm: mach-kirkwood: use plus instead of or for address definitions
arm: mach-mv78xx0: use plus instead of or for address definitions
arm: mach-orion5x: use plus instead of or for address definitions
arm: mach-dove: use IOMEM() for base address definitions
arm: mach-kirkwood: use IOMEM() for base address definitions
arm: mach-mv78xx0: use IOMEM() for base address definitions
arm: mach-orion5x: use IOMEM() for base address definitions
arm: mach-mvebu: use IOMEM() for base address definitions
arm: plat-orion: use void __iomem pointers for UART registration functions
arm: plat-orion: use void __iomem pointers for MPP functions
arm: plat-orion: use void __iomem pointers for time functions
arm: plat-orion: use void __iomem pointers for addr-map functions
arm: plat-orion: introduce PLAT_ORION_LEGACY hidden config option
arm: plat-orion: make bridge_virt_base non-const to support DT use case
arm: mvebu: add basic address decoding support to Armada 370/XP
arm: mvebu: add address decoding controller to the DT
pinctrl: mvebu: add pinctrl driver for Armada 370
pinctrl: mvebu: add pinctrl driver for Armada XP
ARM: mvebu: Add pinctrl support to Armada XP SoCs
ARM: mvebu: Add pinctrl support to Armada 370 SoC
ARM: mvebu: adjust Armada XP evaluation board DTS
arm: mvebu: split Kconfig options for Armada 370 and XP
arm: mvebu: select the pinctrl drivers for Armada 370 and Armada XP platforms
gpio: introduce gpio-mvebu driver for Marvell SoCs
Documentation: add description of DT binding for the gpio-mvebu driver
arm: mvebu: use GPIO support now that a driver is available
arm: mvebu: add DT information for GPIO banks on Armada 370 and XP
arm: mvebu: add gpio support in defconfig
sound: kirkwood: remove useless <plat/audio.h> include
sound: kirkwood: move <plat/audio.h> to <linux/platform_data/kirkwood-audio.h>
usb: ehci-orion: move <plat/ehci-orion.h> to <linux/platform_data/ehci-orion.h>
mmc: mvsdio: move <plat/mvsdio.h> to <linux/platform_data/mvsdio.h>
dma: mv_xor: move <plat/mv_xor.h> to <linux/platform_data/mv_xor.h>
mtd: orion_nand: move <plat/orion_nand.h> to <linux/platform_data/orion_nand.h>
i2c: mv643xx: move <linux/mv643xx_i2c.h> to <linux/platform_data/mv643xx_i2c.h>
net: mv643xx_eth: move <linux/mv643xx_eth.h> to <linux/platform_data/mv643xx_eth.h>
Valentin Longchamp (1):
ARM: initial DTS support for km_kirkwood
Documentation/arm/Marvell/README | 232 ++++++
.../devicetree/bindings/crypto/mv_cesa.txt | 20 +
.../devicetree/bindings/gpio/gpio-fan.txt | 25 +
.../devicetree/bindings/gpio/gpio-mvebu.txt | 53 ++
.../pinctrl/marvell,armada-370-pinctrl.txt | 95 +++
.../bindings/pinctrl/marvell,armada-xp-pinctrl.txt | 100 +++
.../bindings/pinctrl/marvell,dove-pinctrl.txt | 72 ++
.../bindings/pinctrl/marvell,kirkwood-pinctrl.txt | 279 ++++++++
.../bindings/pinctrl/marvell,mvebu-pinctrl.txt | 46 ++
arch/arm/Kconfig | 18 +-
arch/arm/boot/dts/armada-370-xp.dtsi | 5 +
arch/arm/boot/dts/armada-370.dtsi | 44 ++
arch/arm/boot/dts/armada-xp-db.dts | 4 +-
arch/arm/boot/dts/armada-xp-mv78230.dtsi | 57 ++
arch/arm/boot/dts/armada-xp-mv78260.dtsi | 70 ++
arch/arm/boot/dts/armada-xp-mv78460.dtsi | 70 ++
arch/arm/boot/dts/dove-cm-a510.dts | 38 +
arch/arm/boot/dts/dove-cubox.dts | 42 ++
arch/arm/boot/dts/dove-dove-db.dts | 38 +
arch/arm/boot/dts/dove.dtsi | 143 ++++
arch/arm/boot/dts/kirkwood-dnskw.dtsi | 10 +
arch/arm/boot/dts/kirkwood-dockstar.dts | 57 ++
arch/arm/boot/dts/kirkwood-iconnect.dts | 50 ++-
arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 105 +++
arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 29 +
arch/arm/boot/dts/kirkwood.dtsi | 12 +-
arch/arm/configs/kirkwood_defconfig | 38 +-
arch/arm/configs/mvebu_defconfig | 2 +
arch/arm/mach-dove/Kconfig | 7 +
arch/arm/mach-dove/Makefile | 4 +-
arch/arm/mach-dove/Makefile.boot | 4 +
arch/arm/mach-dove/cm-a510.c | 2 +-
arch/arm/mach-dove/common.c | 164 ++++-
arch/arm/mach-dove/common.h | 4 +
arch/arm/mach-dove/dove-db-setup.c | 2 +-
arch/arm/mach-dove/include/mach/bridge-regs.h | 16 +-
arch/arm/mach-dove/include/mach/dove.h | 130 ++--
arch/arm/mach-dove/include/mach/pm.h | 54 +-
arch/arm/mach-dove/irq.c | 10 +-
arch/arm/mach-dove/pcie.c | 6 +-
arch/arm/mach-kirkwood/Kconfig | 21 +
arch/arm/mach-kirkwood/Makefile | 3 +
arch/arm/mach-kirkwood/Makefile.boot | 3 +
arch/arm/mach-kirkwood/addr-map.c | 3 +-
arch/arm/mach-kirkwood/board-dnskw.c | 37 +-
arch/arm/mach-kirkwood/board-dockstar.c | 61 ++
arch/arm/mach-kirkwood/board-dreamplug.c | 4 +-
arch/arm/mach-kirkwood/board-dt.c | 14 +-
arch/arm/mach-kirkwood/board-goflexnet.c | 4 +-
arch/arm/mach-kirkwood/board-ib62x0.c | 2 +-
arch/arm/mach-kirkwood/board-iconnect.c | 49 +--
arch/arm/mach-kirkwood/board-iomega_ix2_200.c | 57 ++
arch/arm/mach-kirkwood/board-km_kirkwood.c | 57 ++
arch/arm/mach-kirkwood/board-lsxl.c | 2 +-
arch/arm/mach-kirkwood/board-ts219.c | 2 +-
arch/arm/mach-kirkwood/common.c | 24 +-
arch/arm/mach-kirkwood/common.h | 18 +
arch/arm/mach-kirkwood/d2net_v2-setup.c | 2 +-
arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 4 +-
arch/arm/mach-kirkwood/dockstar-setup.c | 4 +-
arch/arm/mach-kirkwood/guruplug-setup.c | 4 +-
arch/arm/mach-kirkwood/include/mach/bridge-regs.h | 20 +-
arch/arm/mach-kirkwood/include/mach/kirkwood.h | 116 ++--
arch/arm/mach-kirkwood/irq.c | 9 +-
arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c | 2 +-
arch/arm/mach-kirkwood/netspace_v2-setup.c | 2 +-
arch/arm/mach-kirkwood/netxbig_v2-setup.c | 2 +-
arch/arm/mach-kirkwood/openrd-setup.c | 4 +-
arch/arm/mach-kirkwood/pcie.c | 12 +-
arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 2 +-
arch/arm/mach-kirkwood/rd88f6281-setup.c | 4 +-
arch/arm/mach-kirkwood/sheevaplug-setup.c | 4 +-
arch/arm/mach-kirkwood/t5325-setup.c | 2 +-
arch/arm/mach-kirkwood/ts219-setup.c | 2 +-
arch/arm/mach-kirkwood/ts41x-setup.c | 5 +-
arch/arm/mach-mv78xx0/addr-map.c | 6 +-
arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | 2 +-
arch/arm/mach-mv78xx0/common.c | 10 +-
arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 2 +-
arch/arm/mach-mv78xx0/include/mach/bridge-regs.h | 12 +-
arch/arm/mach-mv78xx0/include/mach/mv78xx0.h | 88 ++--
arch/arm/mach-mv78xx0/irq.c | 9 +-
arch/arm/mach-mv78xx0/pcie.c | 12 +-
arch/arm/mach-mv78xx0/rd78x00-masa-setup.c | 2 +-
arch/arm/mach-mvebu/Kconfig | 18 +-
arch/arm/mach-mvebu/Makefile | 2 +-
arch/arm/mach-mvebu/addr-map.c | 134 ++++
arch/arm/mach-mvebu/armada-370-xp.c | 2 +-
arch/arm/mach-mvebu/include/mach/armada-370-xp.h | 2 +-
arch/arm/mach-mvebu/include/mach/gpio.h | 1 +
arch/arm/mach-orion5x/addr-map.c | 3 +-
arch/arm/mach-orion5x/common.c | 14 +-
arch/arm/mach-orion5x/d2net-setup.c | 2 +-
arch/arm/mach-orion5x/db88f5281-setup.c | 4 +-
arch/arm/mach-orion5x/dns323-setup.c | 4 +-
arch/arm/mach-orion5x/edmini_v2-setup.c | 2 +-
arch/arm/mach-orion5x/include/mach/bridge-regs.h | 20 +-
arch/arm/mach-orion5x/include/mach/orion5x.h | 60 +-
arch/arm/mach-orion5x/irq.c | 5 +-
arch/arm/mach-orion5x/kurobox_pro-setup.c | 4 +-
arch/arm/mach-orion5x/ls-chl-setup.c | 2 +-
arch/arm/mach-orion5x/ls_hgl-setup.c | 2 +-
arch/arm/mach-orion5x/lsmini-setup.c | 2 +-
arch/arm/mach-orion5x/mss2-setup.c | 2 +-
arch/arm/mach-orion5x/mv2120-setup.c | 2 +-
arch/arm/mach-orion5x/net2big-setup.c | 2 +-
arch/arm/mach-orion5x/pci.c | 6 +-
arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 2 +-
arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 2 +-
arch/arm/mach-orion5x/rd88f5182-setup.c | 2 +-
arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 2 +-
arch/arm/mach-orion5x/terastation_pro2-setup.c | 2 +-
arch/arm/mach-orion5x/ts209-setup.c | 2 +-
arch/arm/mach-orion5x/ts409-setup.c | 2 +-
arch/arm/mach-orion5x/ts78xx-setup.c | 2 +-
arch/arm/mach-orion5x/tsx09-common.c | 2 +-
arch/arm/mach-orion5x/wnr854t-setup.c | 2 +-
arch/arm/mach-orion5x/wrt350n-v2-setup.c | 2 +-
arch/arm/plat-orion/Makefile | 9 +-
arch/arm/plat-orion/addr-map.c | 11 +-
arch/arm/plat-orion/common.c | 20 +-
arch/arm/plat-orion/include/plat/addr-map.h | 4 +-
arch/arm/plat-orion/include/plat/audio.h | 7 -
arch/arm/plat-orion/include/plat/common.h | 10 +-
arch/arm/plat-orion/include/plat/mpp.h | 2 +-
arch/arm/plat-orion/include/plat/time.h | 4 +-
arch/arm/plat-orion/mpp.c | 6 +-
arch/arm/plat-orion/time.c | 8 +-
drivers/crypto/mv_cesa.c | 17 +-
drivers/dma/mv_xor.c | 2 +-
drivers/gpio/Kconfig | 6 +
drivers/gpio/Makefile | 1 +
drivers/gpio/gpio-mvebu.c | 679 ++++++++++++++++++
drivers/hwmon/gpio-fan.c | 120 ++++
drivers/i2c/busses/i2c-mv64xxx.c | 2 +-
drivers/mmc/host/mvsdio.c | 2 +-
drivers/mtd/nand/orion_nand.c | 2 +-
drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +-
drivers/pinctrl/Kconfig | 22 +
drivers/pinctrl/Makefile | 5 +
drivers/pinctrl/pinctrl-armada-370.c | 421 +++++++++++
drivers/pinctrl/pinctrl-armada-xp.c | 468 ++++++++++++
drivers/pinctrl/pinctrl-dove.c | 620 ++++++++++++++++
drivers/pinctrl/pinctrl-kirkwood.c | 472 ++++++++++++
drivers/pinctrl/pinctrl-mvebu.c | 754 ++++++++++++++++++++
drivers/pinctrl/pinctrl-mvebu.h | 192 +++++
drivers/usb/host/ehci-orion.c | 2 +-
include/linux/mv643xx.h | 4 +-
.../linux/platform_data}/ehci-orion.h | 6 +-
include/linux/platform_data/kirkwood-audio.h | 7 +
include/linux/{ => platform_data}/mv643xx_eth.h | 4 +-
include/linux/{ => platform_data}/mv643xx_i2c.h | 4 +-
.../plat => include/linux/platform_data}/mv_xor.h | 6 +-
.../plat => include/linux/platform_data}/mvsdio.h | 6 +-
.../linux/platform_data}/orion_nand.h | 6 +-
sound/soc/kirkwood/kirkwood-i2s.c | 2 +-
sound/soc/kirkwood/kirkwood-openrd.c | 1 -
sound/soc/kirkwood/kirkwood-t5325.c | 1 -
158 files changed, 6508 insertions(+), 587 deletions(-)
create mode 100644 Documentation/arm/Marvell/README
create mode 100644 Documentation/devicetree/bindings/crypto/mv_cesa.txt
create mode 100644 Documentation/devicetree/bindings/gpio/gpio-fan.txt
create mode 100644 Documentation/devicetree/bindings/gpio/gpio-mvebu.txt
create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt
create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt
create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,dove-pinctrl.txt
create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,kirkwood-pinctrl.txt
create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,mvebu-pinctrl.txt
create mode 100644 arch/arm/boot/dts/armada-xp-mv78230.dtsi
create mode 100644 arch/arm/boot/dts/armada-xp-mv78260.dtsi
create mode 100644 arch/arm/boot/dts/armada-xp-mv78460.dtsi
create mode 100644 arch/arm/boot/dts/dove-cm-a510.dts
create mode 100644 arch/arm/boot/dts/dove-cubox.dts
create mode 100644 arch/arm/boot/dts/dove-dove-db.dts
create mode 100644 arch/arm/boot/dts/dove.dtsi
create mode 100644 arch/arm/boot/dts/kirkwood-dockstar.dts
create mode 100644 arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
create mode 100644 arch/arm/boot/dts/kirkwood-km_kirkwood.dts
create mode 100644 arch/arm/mach-kirkwood/board-dockstar.c
create mode 100644 arch/arm/mach-kirkwood/board-iomega_ix2_200.c
create mode 100644 arch/arm/mach-kirkwood/board-km_kirkwood.c
create mode 100644 arch/arm/mach-mvebu/addr-map.c
create mode 100644 arch/arm/mach-mvebu/include/mach/gpio.h
delete mode 100644 arch/arm/plat-orion/include/plat/audio.h
create mode 100644 drivers/gpio/gpio-mvebu.c
create mode 100644 drivers/pinctrl/pinctrl-armada-370.c
create mode 100644 drivers/pinctrl/pinctrl-armada-xp.c
create mode 100644 drivers/pinctrl/pinctrl-dove.c
create mode 100644 drivers/pinctrl/pinctrl-kirkwood.c
create mode 100644 drivers/pinctrl/pinctrl-mvebu.c
create mode 100644 drivers/pinctrl/pinctrl-mvebu.h
rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/ehci-orion.h (78%)
create mode 100644 include/linux/platform_data/kirkwood-audio.h
rename include/linux/{ => platform_data}/mv643xx_eth.h (96%)
rename include/linux/{ => platform_data}/mv643xx_i2c.h (89%)
rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/mv_xor.h (77%)
rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/mvsdio.h (77%)
rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/orion_nand.h (82%)
^ permalink raw reply [flat|nested] 15+ messages in thread
* [GIT PULL V5 1/7] ARM: kirkwood: board changes for v3.7
2012-09-22 17:15 [GIT PULL V5 0/7] ARM: kirkwood/dove/mvebu changes for v3.7 Jason Cooper
@ 2012-09-22 17:20 ` Jason Cooper
2012-09-22 17:22 ` [GIT PULL V5 2/7] ARM: kirkwood defconfig " Jason Cooper
` (7 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Jason Cooper @ 2012-09-22 17:20 UTC (permalink / raw)
To: linux-arm-kernel
Depends:
- Based on v3.6-rc5
Add misc:
- doc describing the Marvell family of SoCs
- make PCI optional on dove
Adds kirkwood boards:
- Iomega ix2-200
- Seagate FreeAgent Dockstar
- Keymile
Add mvebu (dove) board:
- SolidRun CuBox
The following changes since commit 55d512e245bc7699a8800e23df1a24195dd08217:
Linux 3.6-rc5 (2012-09-08 16:43:45 -0700)
are available in the git repository at:
git://git.infradead.org/users/jcooper/linux.git kirkwood/boards
Alan M Butler (1):
ARM: Kirkwood: Iomega ix2-200 DT support
Russell King (1):
ARM: Dove: allow PCI to be disabled
Sebastian Hesselbarth (8):
ARM: kirkwood: DT board setup for Seagate FreeAgent Dockstar
ARM: kirkwood: DT descriptor for Seagate FreeAgent Dockstar
ARM: dove: unify clock setup
ARM: dove: add clock gating control
ARM: dove: add crypto engine
ARM: dove: add device tree based machine descriptor
ARM: dove: add device tree descriptors
ARM: dove: SolidRun CuBox DT
Thomas Petazzoni (1):
arm: add documentation describing Marvell families of SoC
Valentin Longchamp (1):
ARM: initial DTS support for km_kirkwood
Documentation/arm/Marvell/README | 232 +++++++++++++++++++++++++
arch/arm/Kconfig | 3 +-
arch/arm/boot/dts/dove-cm-a510.dts | 38 ++++
arch/arm/boot/dts/dove-cubox.dts | 42 +++++
arch/arm/boot/dts/dove-dove-db.dts | 38 ++++
arch/arm/boot/dts/dove.dtsi | 143 +++++++++++++++
arch/arm/boot/dts/kirkwood-dockstar.dts | 57 ++++++
arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 105 +++++++++++
arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 29 +++
arch/arm/mach-dove/Kconfig | 7 +
arch/arm/mach-dove/Makefile | 4 +-
arch/arm/mach-dove/Makefile.boot | 4 +
arch/arm/mach-dove/common.c | 154 +++++++++++++++--
arch/arm/mach-dove/common.h | 4 +
arch/arm/mach-dove/include/mach/pm.h | 54 ++++--
arch/arm/mach-kirkwood/Kconfig | 21 +++
arch/arm/mach-kirkwood/Makefile | 3 +
arch/arm/mach-kirkwood/Makefile.boot | 3 +
arch/arm/mach-kirkwood/board-dockstar.c | 61 +++++++
arch/arm/mach-kirkwood/board-dt.c | 12 ++
arch/arm/mach-kirkwood/board-iomega_ix2_200.c | 57 ++++++
arch/arm/mach-kirkwood/board-km_kirkwood.c | 57 ++++++
arch/arm/mach-kirkwood/common.h | 18 ++
23 files changed, 1113 insertions(+), 33 deletions(-)
create mode 100644 Documentation/arm/Marvell/README
create mode 100644 arch/arm/boot/dts/dove-cm-a510.dts
create mode 100644 arch/arm/boot/dts/dove-cubox.dts
create mode 100644 arch/arm/boot/dts/dove-dove-db.dts
create mode 100644 arch/arm/boot/dts/dove.dtsi
create mode 100644 arch/arm/boot/dts/kirkwood-dockstar.dts
create mode 100644 arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
create mode 100644 arch/arm/boot/dts/kirkwood-km_kirkwood.dts
create mode 100644 arch/arm/mach-kirkwood/board-dockstar.c
create mode 100644 arch/arm/mach-kirkwood/board-iomega_ix2_200.c
create mode 100644 arch/arm/mach-kirkwood/board-km_kirkwood.c
^ permalink raw reply [flat|nested] 15+ messages in thread
* [GIT PULL V5 2/7] ARM: kirkwood defconfig changes for v3.7
2012-09-22 17:15 [GIT PULL V5 0/7] ARM: kirkwood/dove/mvebu changes for v3.7 Jason Cooper
2012-09-22 17:20 ` [GIT PULL V5 1/7] ARM: kirkwood: board " Jason Cooper
@ 2012-09-22 17:22 ` Jason Cooper
2012-09-22 17:24 ` [GIT PULL V5 3/7] ARM: kirkwood dt " Jason Cooper
` (6 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Jason Cooper @ 2012-09-22 17:22 UTC (permalink / raw)
To: linux-arm-kernel
Depends:
- Based on v3.6-rc5
- branches:
- kirkwood/boards
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
The following changes since commit 0f81bd438bed6af47a01a97d5ecbb23a7e478de6:
ARM: Dove: allow PCI to be disabled (2012-09-21 17:07:26 +0000)
are available in the git repository at:
git://git.infradead.org/users/jcooper/linux.git kirkwood/defconfig
Jason Cooper (2):
ARM: Kirkwood: update defconfig
ARM: Kirkwood: add DT boards to defconfig
arch/arm/configs/kirkwood_defconfig | 38 +++++++++++++++++-----------------
1 files changed, 19 insertions(+), 19 deletions(-)
^ permalink raw reply [flat|nested] 15+ messages in thread
* [GIT PULL V5 3/7] ARM: kirkwood dt changes for v3.7
2012-09-22 17:15 [GIT PULL V5 0/7] ARM: kirkwood/dove/mvebu changes for v3.7 Jason Cooper
2012-09-22 17:20 ` [GIT PULL V5 1/7] ARM: kirkwood: board " Jason Cooper
2012-09-22 17:22 ` [GIT PULL V5 2/7] ARM: kirkwood defconfig " Jason Cooper
@ 2012-09-22 17:24 ` Jason Cooper
2012-09-22 17:27 ` [GIT PULL V5 4/7] ARM: kirkwood cleanup " Jason Cooper
` (5 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Jason Cooper @ 2012-09-22 17:24 UTC (permalink / raw)
To: linux-arm-kernel
Depends:
- Based on v3.6-rc5
New bindings:
- iconnect nand and keys
- mv_cesa
- gpio-fan
The following changes since commit 55d512e245bc7699a8800e23df1a24195dd08217:
Linux 3.6-rc5 (2012-09-08 16:43:45 -0700)
are available in the git repository at:
git://git.infradead.org/users/jcooper/linux.git kirkwood/dt
Andrew Lunn (1):
Crypto: CESA: Add support for DT based instantiation.
Arnaud Patard (2):
ARM: Kirkwood: Describe iconnect keys in DT.
ARM: Kirkwood: Describe iconnect nand in DT.
Jamie Lentin (2):
hwmon: Add devicetree bindings to gpio-fan
ARM: kirkwood: Use devicetree to define DNS-32[05] fan
.../devicetree/bindings/crypto/mv_cesa.txt | 20 ++++
.../devicetree/bindings/gpio/gpio-fan.txt | 25 ++++
arch/arm/boot/dts/kirkwood-dnskw.dtsi | 10 ++
arch/arm/boot/dts/kirkwood-iconnect.dts | 50 ++++++++-
arch/arm/boot/dts/kirkwood.dtsi | 12 ++-
arch/arm/mach-kirkwood/board-dnskw.c | 26 ----
arch/arm/mach-kirkwood/board-dt.c | 2 +-
arch/arm/mach-kirkwood/board-iconnect.c | 48 --------
drivers/crypto/mv_cesa.c | 17 +++-
drivers/hwmon/gpio-fan.c | 120 ++++++++++++++++++++
10 files changed, 251 insertions(+), 79 deletions(-)
create mode 100644 Documentation/devicetree/bindings/crypto/mv_cesa.txt
create mode 100644 Documentation/devicetree/bindings/gpio/gpio-fan.txt
^ permalink raw reply [flat|nested] 15+ messages in thread
* [GIT PULL V5 4/7] ARM: kirkwood cleanup changes for v3.7
2012-09-22 17:15 [GIT PULL V5 0/7] ARM: kirkwood/dove/mvebu changes for v3.7 Jason Cooper
` (2 preceding siblings ...)
2012-09-22 17:24 ` [GIT PULL V5 3/7] ARM: kirkwood dt " Jason Cooper
@ 2012-09-22 17:27 ` Jason Cooper
2012-09-22 17:31 ` [GIT PULL V5 5/7] ARM: kirkwood platform_data " Jason Cooper
` (4 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Jason Cooper @ 2012-09-22 17:27 UTC (permalink / raw)
To: linux-arm-kernel
Depends:
- Based on v3.6-rc5
- kirkwood/dt (gpio-fan bindings caused removal of includes in
board-dnskw.c)
Misc:
- trim includes for board-dnskw.c
The following changes since commit 1b90e06b14291ce3c252bd10e4ce981a08152e2e:
ARM: kirkwood: Use devicetree to define DNS-32[05] fan (2012-09-22 14:40:58 +0000)
are available in the git repository at:
git://git.infradead.org/users/jcooper/linux.git kirkwood/cleanup
Jamie Lentin (1):
ARM: kirkwood: Trim excess #includes in board-dnskw.c
arch/arm/mach-kirkwood/board-dnskw.c | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
^ permalink raw reply [flat|nested] 15+ messages in thread
* [GIT PULL V5 5/7] ARM: kirkwood platform_data changes for v3.7
2012-09-22 17:15 [GIT PULL V5 0/7] ARM: kirkwood/dove/mvebu changes for v3.7 Jason Cooper
` (3 preceding siblings ...)
2012-09-22 17:27 ` [GIT PULL V5 4/7] ARM: kirkwood cleanup " Jason Cooper
@ 2012-09-22 17:31 ` Jason Cooper
2012-09-22 21:37 ` Olof Johansson
2012-09-22 17:33 ` [GIT PULL V5 6/7] ARM: kirkwood addr_decode " Jason Cooper
` (3 subsequent siblings)
8 siblings, 1 reply; 15+ messages in thread
From: Jason Cooper @ 2012-09-22 17:31 UTC (permalink / raw)
To: linux-arm-kernel
Note: This may conflict with work Rob Herring and others are doing
regarding platform_data conversion. If so, just drop this branch.
Nothing depends on it, intentionally ;-)
Depends:
- Based on v3.6-rc5
- Depends on branches:
- kirkwood/cleanup which depends on:
- kirkwood/dt
- kirkwood/boards
Misc:
- move kirkwood/orion headers to platform_data
The following changes since commit 1265d613af1a25f44119bfb03b2bff9c665977ba:
Merge branch 'kirkwood/boards' into kirkwood/platform_data (2012-09-22 15:53:21 +0000)
are available in the git repository at:
git://git.infradead.org/users/jcooper/linux.git kirkwood/platform_data
Jason Cooper (2):
ARM: Kirkwood: board-dockstar: use linux/platform_data/mvsdio.h instead of plat/mvsdio.h
ARM: Kirkwood: use linux/platform_data/mv643xx.h instead of linux/mv643xx.h
Thomas Petazzoni (8):
sound: kirkwood: remove useless <plat/audio.h> include
sound: kirkwood: move <plat/audio.h> to <linux/platform_data/kirkwood-audio.h>
usb: ehci-orion: move <plat/ehci-orion.h> to <linux/platform_data/ehci-orion.h>
mmc: mvsdio: move <plat/mvsdio.h> to <linux/platform_data/mvsdio.h>
dma: mv_xor: move <plat/mv_xor.h> to <linux/platform_data/mv_xor.h>
mtd: orion_nand: move <plat/orion_nand.h> to <linux/platform_data/orion_nand.h>
i2c: mv643xx: move <linux/mv643xx_i2c.h> to <linux/platform_data/mv643xx_i2c.h>
net: mv643xx_eth: move <linux/mv643xx_eth.h> to <linux/platform_data/mv643xx_eth.h>
arch/arm/mach-dove/cm-a510.c | 2 +-
arch/arm/mach-dove/common.c | 2 +-
arch/arm/mach-dove/dove-db-setup.c | 2 +-
arch/arm/mach-kirkwood/board-dnskw.c | 2 +-
arch/arm/mach-kirkwood/board-dockstar.c | 4 ++--
arch/arm/mach-kirkwood/board-dreamplug.c | 4 ++--
arch/arm/mach-kirkwood/board-goflexnet.c | 4 ++--
arch/arm/mach-kirkwood/board-ib62x0.c | 2 +-
arch/arm/mach-kirkwood/board-iconnect.c | 3 ++-
arch/arm/mach-kirkwood/board-iomega_ix2_200.c | 2 +-
arch/arm/mach-kirkwood/board-km_kirkwood.c | 2 +-
arch/arm/mach-kirkwood/board-lsxl.c | 2 +-
arch/arm/mach-kirkwood/board-ts219.c | 2 +-
arch/arm/mach-kirkwood/common.c | 12 ++++++------
arch/arm/mach-kirkwood/d2net_v2-setup.c | 2 +-
arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 4 ++--
arch/arm/mach-kirkwood/dockstar-setup.c | 4 ++--
arch/arm/mach-kirkwood/guruplug-setup.c | 4 ++--
arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c | 2 +-
arch/arm/mach-kirkwood/netspace_v2-setup.c | 2 +-
arch/arm/mach-kirkwood/netxbig_v2-setup.c | 2 +-
arch/arm/mach-kirkwood/openrd-setup.c | 4 ++--
arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 2 +-
arch/arm/mach-kirkwood/rd88f6281-setup.c | 4 ++--
arch/arm/mach-kirkwood/sheevaplug-setup.c | 4 ++--
arch/arm/mach-kirkwood/t5325-setup.c | 2 +-
arch/arm/mach-kirkwood/ts219-setup.c | 2 +-
arch/arm/mach-kirkwood/ts41x-setup.c | 2 +-
arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | 2 +-
arch/arm/mach-mv78xx0/common.c | 4 ++--
arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 2 +-
arch/arm/mach-mv78xx0/rd78x00-masa-setup.c | 2 +-
arch/arm/mach-orion5x/common.c | 6 +++---
arch/arm/mach-orion5x/d2net-setup.c | 2 +-
arch/arm/mach-orion5x/db88f5281-setup.c | 4 ++--
arch/arm/mach-orion5x/dns323-setup.c | 2 +-
arch/arm/mach-orion5x/edmini_v2-setup.c | 2 +-
arch/arm/mach-orion5x/kurobox_pro-setup.c | 4 ++--
arch/arm/mach-orion5x/ls-chl-setup.c | 2 +-
arch/arm/mach-orion5x/ls_hgl-setup.c | 2 +-
arch/arm/mach-orion5x/lsmini-setup.c | 2 +-
arch/arm/mach-orion5x/mss2-setup.c | 2 +-
arch/arm/mach-orion5x/mv2120-setup.c | 2 +-
arch/arm/mach-orion5x/net2big-setup.c | 2 +-
arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 2 +-
arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 2 +-
arch/arm/mach-orion5x/rd88f5182-setup.c | 2 +-
arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 2 +-
arch/arm/mach-orion5x/terastation_pro2-setup.c | 2 +-
arch/arm/mach-orion5x/ts209-setup.c | 2 +-
arch/arm/mach-orion5x/ts409-setup.c | 2 +-
arch/arm/mach-orion5x/ts78xx-setup.c | 2 +-
arch/arm/mach-orion5x/tsx09-common.c | 2 +-
arch/arm/mach-orion5x/wnr854t-setup.c | 2 +-
arch/arm/mach-orion5x/wrt350n-v2-setup.c | 2 +-
arch/arm/plat-orion/common.c | 8 ++++----
arch/arm/plat-orion/include/plat/audio.h | 7 -------
arch/arm/plat-orion/include/plat/common.h | 2 +-
drivers/dma/mv_xor.c | 2 +-
drivers/i2c/busses/i2c-mv64xxx.c | 2 +-
drivers/mmc/host/mvsdio.c | 2 +-
drivers/mtd/nand/orion_nand.c | 2 +-
drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +-
drivers/usb/host/ehci-orion.c | 2 +-
include/linux/mv643xx.h | 4 ++--
.../linux/platform_data}/ehci-orion.h | 6 ++----
include/linux/platform_data/kirkwood-audio.h | 7 +++++++
include/linux/{ => platform_data}/mv643xx_eth.h | 4 ++--
include/linux/{ => platform_data}/mv643xx_i2c.h | 4 ++--
.../plat => include/linux/platform_data}/mv_xor.h | 6 ++----
.../plat => include/linux/platform_data}/mvsdio.h | 6 ++----
.../linux/platform_data}/orion_nand.h | 6 ++----
sound/soc/kirkwood/kirkwood-i2s.c | 2 +-
sound/soc/kirkwood/kirkwood-openrd.c | 1 -
sound/soc/kirkwood/kirkwood-t5325.c | 1 -
75 files changed, 108 insertions(+), 117 deletions(-)
delete mode 100644 arch/arm/plat-orion/include/plat/audio.h
rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/ehci-orion.h (78%)
create mode 100644 include/linux/platform_data/kirkwood-audio.h
rename include/linux/{ => platform_data}/mv643xx_eth.h (96%)
rename include/linux/{ => platform_data}/mv643xx_i2c.h (89%)
rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/mv_xor.h (77%)
rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/mvsdio.h (77%)
rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/orion_nand.h (82%)
^ permalink raw reply [flat|nested] 15+ messages in thread
* [GIT PULL V5 6/7] ARM: kirkwood addr_decode changes for v3.7
2012-09-22 17:15 [GIT PULL V5 0/7] ARM: kirkwood/dove/mvebu changes for v3.7 Jason Cooper
` (4 preceding siblings ...)
2012-09-22 17:31 ` [GIT PULL V5 5/7] ARM: kirkwood platform_data " Jason Cooper
@ 2012-09-22 17:33 ` Jason Cooper
2012-09-22 17:36 ` [GIT PULL V5 7/7] ARM: kirkwood drivers " Jason Cooper
` (2 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Jason Cooper @ 2012-09-22 17:33 UTC (permalink / raw)
To: linux-arm-kernel
Depends:
- based on v3.6-rc5
touches all plat-orion/ and mach-mvebu/ for consistent address decoding
support
The following changes since commit 55d512e245bc7699a8800e23df1a24195dd08217:
Linux 3.6-rc5 (2012-09-08 16:43:45 -0700)
are available in the git repository at:
git://git.infradead.org/users/jcooper/linux.git kirkwood/addr_decode
Thomas Petazzoni (17):
arm: mach-dove: use plus instead of or for address definitions
arm: mach-kirkwood: use plus instead of or for address definitions
arm: mach-mv78xx0: use plus instead of or for address definitions
arm: mach-orion5x: use plus instead of or for address definitions
arm: mach-dove: use IOMEM() for base address definitions
arm: mach-kirkwood: use IOMEM() for base address definitions
arm: mach-mv78xx0: use IOMEM() for base address definitions
arm: mach-orion5x: use IOMEM() for base address definitions
arm: mach-mvebu: use IOMEM() for base address definitions
arm: plat-orion: use void __iomem pointers for UART registration functions
arm: plat-orion: use void __iomem pointers for MPP functions
arm: plat-orion: use void __iomem pointers for time functions
arm: plat-orion: use void __iomem pointers for addr-map functions
arm: plat-orion: introduce PLAT_ORION_LEGACY hidden config option
arm: plat-orion: make bridge_virt_base non-const to support DT use case
arm: mvebu: add basic address decoding support to Armada 370/XP
arm: mvebu: add address decoding controller to the DT
arch/arm/Kconfig | 13 ++-
arch/arm/boot/dts/armada-370-xp.dtsi | 5 +
arch/arm/mach-dove/common.c | 8 +-
arch/arm/mach-dove/include/mach/bridge-regs.h | 16 ++--
arch/arm/mach-dove/include/mach/dove.h | 130 ++++++++++----------
arch/arm/mach-dove/irq.c | 10 +-
arch/arm/mach-dove/pcie.c | 6 +-
arch/arm/mach-kirkwood/addr-map.c | 3 +-
arch/arm/mach-kirkwood/common.c | 12 +-
arch/arm/mach-kirkwood/include/mach/bridge-regs.h | 20 ++--
arch/arm/mach-kirkwood/include/mach/kirkwood.h | 116 +++++++++---------
arch/arm/mach-kirkwood/irq.c | 9 +-
arch/arm/mach-kirkwood/pcie.c | 12 +-
arch/arm/mach-kirkwood/ts41x-setup.c | 3 +-
arch/arm/mach-mv78xx0/addr-map.c | 6 +-
arch/arm/mach-mv78xx0/common.c | 6 +-
arch/arm/mach-mv78xx0/include/mach/bridge-regs.h | 12 +-
arch/arm/mach-mv78xx0/include/mach/mv78xx0.h | 88 +++++++-------
arch/arm/mach-mv78xx0/irq.c | 9 +-
arch/arm/mach-mv78xx0/pcie.c | 12 +-
arch/arm/mach-mvebu/Makefile | 2 +-
arch/arm/mach-mvebu/addr-map.c | 134 +++++++++++++++++++++
arch/arm/mach-mvebu/armada-370-xp.c | 2 +-
arch/arm/mach-mvebu/include/mach/armada-370-xp.h | 2 +-
arch/arm/mach-orion5x/addr-map.c | 3 +-
arch/arm/mach-orion5x/common.c | 8 +-
arch/arm/mach-orion5x/dns323-setup.c | 2 +-
arch/arm/mach-orion5x/include/mach/bridge-regs.h | 20 ++--
arch/arm/mach-orion5x/include/mach/orion5x.h | 60 +++++-----
arch/arm/mach-orion5x/irq.c | 5 +-
arch/arm/mach-orion5x/pci.c | 6 +-
arch/arm/plat-orion/Makefile | 9 +-
arch/arm/plat-orion/addr-map.c | 11 +-
arch/arm/plat-orion/common.c | 12 +-
arch/arm/plat-orion/include/plat/addr-map.h | 4 +-
arch/arm/plat-orion/include/plat/common.h | 8 +-
arch/arm/plat-orion/include/plat/mpp.h | 2 +-
arch/arm/plat-orion/include/plat/time.h | 4 +-
arch/arm/plat-orion/mpp.c | 6 +-
arch/arm/plat-orion/time.c | 8 +-
40 files changed, 474 insertions(+), 330 deletions(-)
create mode 100644 arch/arm/mach-mvebu/addr-map.c
^ permalink raw reply [flat|nested] 15+ messages in thread
* [GIT PULL V5 7/7] ARM: kirkwood drivers changes for v3.7
2012-09-22 17:15 [GIT PULL V5 0/7] ARM: kirkwood/dove/mvebu changes for v3.7 Jason Cooper
` (5 preceding siblings ...)
2012-09-22 17:33 ` [GIT PULL V5 6/7] ARM: kirkwood addr_decode " Jason Cooper
@ 2012-09-22 17:36 ` Jason Cooper
2012-09-22 21:36 ` [GIT PULL V5 0/7] ARM: kirkwood/dove/mvebu " Olof Johansson
2012-09-24 5:23 ` Andrew Lunn
8 siblings, 0 replies; 15+ messages in thread
From: Jason Cooper @ 2012-09-22 17:36 UTC (permalink / raw)
To: linux-arm-kernel
Depends:
- Based on v3.6-rc5
- kirkwood/addr_decode
New drivers:
- pinctrl (dove, kirkwood, mvebu)
- gpio (mvebu)
Conflicts:
- kirkwood/boards (arch/arm/Kconfig)
- keep MIGHT_HAVE_PCI
- keep PLAT_ORION_LEGACY over PLAT_ORION
- allow add USB_ARCH_HAS_EHCI
Resolution should look like this:
config ARCH_DOVE
bool "Marvell Dove"
select CPU_V7
select ARCH_REQUIRE_GPIOLIB
select GENERIC_CLOCKEVENTS
select MIGHT_HAVE_PCI
select NEED_MACH_IO_H
select PLAT_ORION_LEGACY
select USB_ARCH_HAS_EHCI
help
Support for the Marvell Dove SoC 88AP510
The following changes since commit 5b40baee4a39d96d4d6a48a2b2383982912c429b:
arm: mvebu: add address decoding controller to the DT (2012-09-21 18:05:29 +0000)
are available in the git repository at:
git://git.infradead.org/users/jcooper/linux.git kirkwood/drivers
Sebastian Hesselbarth (3):
pinctrl: mvebu: pinctrl driver core
pinctrl: mvebu: dove pinctrl driver
pinctrl: mvebu: kirkwood pinctrl driver
Thomas Petazzoni (12):
pinctrl: mvebu: add pinctrl driver for Armada 370
pinctrl: mvebu: add pinctrl driver for Armada XP
ARM: mvebu: Add pinctrl support to Armada XP SoCs
ARM: mvebu: Add pinctrl support to Armada 370 SoC
ARM: mvebu: adjust Armada XP evaluation board DTS
arm: mvebu: split Kconfig options for Armada 370 and XP
arm: mvebu: select the pinctrl drivers for Armada 370 and Armada XP platforms
gpio: introduce gpio-mvebu driver for Marvell SoCs
Documentation: add description of DT binding for the gpio-mvebu driver
arm: mvebu: use GPIO support now that a driver is available
arm: mvebu: add DT information for GPIO banks on Armada 370 and XP
arm: mvebu: add gpio support in defconfig
.../devicetree/bindings/gpio/gpio-mvebu.txt | 53 ++
.../pinctrl/marvell,armada-370-pinctrl.txt | 95 +++
.../bindings/pinctrl/marvell,armada-xp-pinctrl.txt | 100 +++
.../bindings/pinctrl/marvell,dove-pinctrl.txt | 72 ++
.../bindings/pinctrl/marvell,kirkwood-pinctrl.txt | 279 ++++++++
.../bindings/pinctrl/marvell,mvebu-pinctrl.txt | 46 ++
arch/arm/Kconfig | 2 +
arch/arm/boot/dts/armada-370.dtsi | 44 ++
arch/arm/boot/dts/armada-xp-db.dts | 4 +-
arch/arm/boot/dts/armada-xp-mv78230.dtsi | 57 ++
arch/arm/boot/dts/armada-xp-mv78260.dtsi | 70 ++
arch/arm/boot/dts/armada-xp-mv78460.dtsi | 70 ++
arch/arm/configs/mvebu_defconfig | 2 +
arch/arm/mach-mvebu/Kconfig | 18 +-
arch/arm/mach-mvebu/include/mach/gpio.h | 1 +
drivers/gpio/Kconfig | 6 +
drivers/gpio/Makefile | 1 +
drivers/gpio/gpio-mvebu.c | 679 ++++++++++++++++++
drivers/pinctrl/Kconfig | 22 +
drivers/pinctrl/Makefile | 5 +
drivers/pinctrl/pinctrl-armada-370.c | 421 +++++++++++
drivers/pinctrl/pinctrl-armada-xp.c | 468 ++++++++++++
drivers/pinctrl/pinctrl-dove.c | 620 ++++++++++++++++
drivers/pinctrl/pinctrl-kirkwood.c | 472 ++++++++++++
drivers/pinctrl/pinctrl-mvebu.c | 754 ++++++++++++++++++++
drivers/pinctrl/pinctrl-mvebu.h | 192 +++++
26 files changed, 4548 insertions(+), 5 deletions(-)
create mode 100644 Documentation/devicetree/bindings/gpio/gpio-mvebu.txt
create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt
create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt
create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,dove-pinctrl.txt
create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,kirkwood-pinctrl.txt
create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,mvebu-pinctrl.txt
create mode 100644 arch/arm/boot/dts/armada-xp-mv78230.dtsi
create mode 100644 arch/arm/boot/dts/armada-xp-mv78260.dtsi
create mode 100644 arch/arm/boot/dts/armada-xp-mv78460.dtsi
create mode 100644 arch/arm/mach-mvebu/include/mach/gpio.h
create mode 100644 drivers/gpio/gpio-mvebu.c
create mode 100644 drivers/pinctrl/pinctrl-armada-370.c
create mode 100644 drivers/pinctrl/pinctrl-armada-xp.c
create mode 100644 drivers/pinctrl/pinctrl-dove.c
create mode 100644 drivers/pinctrl/pinctrl-kirkwood.c
create mode 100644 drivers/pinctrl/pinctrl-mvebu.c
create mode 100644 drivers/pinctrl/pinctrl-mvebu.h
^ permalink raw reply [flat|nested] 15+ messages in thread
* [GIT PULL V5 0/7] ARM: kirkwood/dove/mvebu changes for v3.7
2012-09-22 17:15 [GIT PULL V5 0/7] ARM: kirkwood/dove/mvebu changes for v3.7 Jason Cooper
` (6 preceding siblings ...)
2012-09-22 17:36 ` [GIT PULL V5 7/7] ARM: kirkwood drivers " Jason Cooper
@ 2012-09-22 21:36 ` Olof Johansson
2012-09-22 22:29 ` Jason Cooper
2012-09-24 5:23 ` Andrew Lunn
8 siblings, 1 reply; 15+ messages in thread
From: Olof Johansson @ 2012-09-22 21:36 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Sep 22, 2012 at 01:15:54PM -0400, Jason Cooper wrote:
> Arnd, Olof,
>
> Changes from V3/V4 (only one pullrq reached V4).
> - split kirkwood/dt into /dt and /drivers.
> - /drivers now holds pinctrl and gpio
> - dropped ehci-orion dt bindings until next window
> - reworked dependency matrix
>
> Dep tree:
>
> /--kirkwood/addr_decode--kirkwood/drivers
> |
> |--kirkwood/dt--kirkwood/cleanup--kirkwood/platform_data
> | /
> / /-------------/
> v3.6-rc5--kirkwood/boards-|
> \--kirkwood/defconfig
Thanks for reorganizing the branches so quickly!
If there's one thing I would request next time is to try to get
the cleanup branch closer to the base, and for example including the
annotation cleanups from the addr_decode branch in it. But it's not a big
deal this time around since I ended up doing things a little different
at our end.
So, I've done something that we normally try to avoid, and merged all
of these branches into one branch in arm-soc as late/kirkwood, that is
based on next/cleanup and next/multiplatform.
The main reason for this is that there's a bunch of minor conflicts
with the sweeping changes that went across the tree, and sorting them
all out in one place is easier than doing it in multiple places. We'll
end up merging kirkwood after the other branches but there shouldn't be
any significant risk of it not making it in since there are no external
dependencies that will hold us up.
This's not something we want to do often, since it defeats the purpose
of how we organize our tree to show common efforts across platforms.
To have avoided this, you should probably have used some of the cleanup
branches from arm-soc as starting points of your branches. For example the
cleanup pieces of addr_decode branch conflicts with the cleanup/io-pci
in arm-soc, so using the cleanup/io-pci branch as base would have
allowed you to resolve the conflicts when applying the patches.
Also, if you want to get a feel for what we will have to do at our end to
resolve merge conflicts in your branches when you send us pull requests,
feel free to do trial-merges of your branches into our for-next branch. Some
other maintainers do this as a heads up and gives us their preference of
conflict resolution.
Does that makes sense? Apologies for going back and forth a bit on this, we've
had a bit more across-all-platforms sweeping changes than usual this release
cycle so things have been a bit more complex than in a while.
I have done basic build testing of the Marvell configs to make sure that things
pass cleanly, and did one small fixup patch at the top of late/kirkwood to fix
one problem.
The one area where I'd like you to double-check my work and make sure that
things aren't broken is on the PCI stuff: There were changes in the pci
cleanup branch of how the IO is mapped, and some of the memory layouts
were modified and required fixups between that and the annotation cleanup
in the addr_decode branch.
-Olof
^ permalink raw reply [flat|nested] 15+ messages in thread
* [GIT PULL V5 5/7] ARM: kirkwood platform_data changes for v3.7
2012-09-22 17:31 ` [GIT PULL V5 5/7] ARM: kirkwood platform_data " Jason Cooper
@ 2012-09-22 21:37 ` Olof Johansson
2012-09-22 22:32 ` Jason Cooper
0 siblings, 1 reply; 15+ messages in thread
From: Olof Johansson @ 2012-09-22 21:37 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Sep 22, 2012 at 01:31:45PM -0400, Jason Cooper wrote:
> Note: This may conflict with work Rob Herring and others are doing
> regarding platform_data conversion. If so, just drop this branch.
> Nothing depends on it, intentionally ;-)
Hi,
Looks like most of this was already covered in the branch we already had, so
I didn't pull this. Names ended up being different between the two, so I stuck
with what we already had and didn't pull this branch.
Thanks,
-Olof
^ permalink raw reply [flat|nested] 15+ messages in thread
* [GIT PULL V5 0/7] ARM: kirkwood/dove/mvebu changes for v3.7
2012-09-22 21:36 ` [GIT PULL V5 0/7] ARM: kirkwood/dove/mvebu " Olof Johansson
@ 2012-09-22 22:29 ` Jason Cooper
0 siblings, 0 replies; 15+ messages in thread
From: Jason Cooper @ 2012-09-22 22:29 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Sep 22, 2012 at 02:36:42PM -0700, Olof Johansson wrote:
> On Sat, Sep 22, 2012 at 01:15:54PM -0400, Jason Cooper wrote:
> > Arnd, Olof,
> >
> > Changes from V3/V4 (only one pullrq reached V4).
> > - split kirkwood/dt into /dt and /drivers.
> > - /drivers now holds pinctrl and gpio
> > - dropped ehci-orion dt bindings until next window
> > - reworked dependency matrix
> >
> > Dep tree:
> >
> > /--kirkwood/addr_decode--kirkwood/drivers
> > |
> > |--kirkwood/dt--kirkwood/cleanup--kirkwood/platform_data
> > | /
> > / /-------------/
> > v3.6-rc5--kirkwood/boards-|
> > \--kirkwood/defconfig
>
> Thanks for reorganizing the branches so quickly!
No problem. I'm starting to get the hang of it.
> If there's one thing I would request next time is to try to get
> the cleanup branch closer to the base, and for example including the
> annotation cleanups from the addr_decode branch in it. But it's not a big
> deal this time around since I ended up doing things a little different
> at our end.
Must be a mis-understanding on my end. The one patch in /cleanup
depended on a patch in /dt. Is there a better name for a branch topic
like that? Or, should I have just included that patch in /dt? It was
just removing unneeded includes.
> So, I've done something that we normally try to avoid, and merged all
> of these branches into one branch in arm-soc as late/kirkwood, that is
> based on next/cleanup and next/multiplatform.
>
> The main reason for this is that there's a bunch of minor conflicts
> with the sweeping changes that went across the tree, and sorting them
> all out in one place is easier than doing it in multiple places. We'll
> end up merging kirkwood after the other branches but there shouldn't be
> any significant risk of it not making it in since there are no external
> dependencies that will hold us up.
I'm glad we held off on cache-l2x0. ;-)
> This's not something we want to do often, since it defeats the purpose
> of how we organize our tree to show common efforts across platforms.
>
> To have avoided this, you should probably have used some of the cleanup
> branches from arm-soc as starting points of your branches. For example the
> cleanup pieces of addr_decode branch conflicts with the cleanup/io-pci
> in arm-soc, so using the cleanup/io-pci branch as base would have
> allowed you to resolve the conflicts when applying the patches.
I was going to try doing this tonight, but you beat me to it. ;-) For
future reference, you mean:
$ git checkout -b kirkwood/addr_decode v3.6-rc5
$ git remote update arm-soc
$ git merge arm-soc/cleanup/io-pci
$ git am ...
right?
> Also, if you want to get a feel for what we will have to do at our end to
> resolve merge conflicts in your branches when you send us pull requests,
> feel free to do trial-merges of your branches into our for-next branch. Some
> other maintainers do this as a heads up and gives us their preference of
> conflict resolution.
Ahh, I merged mine together to check for conflicts, I'll take it all the
way next time.
> Does that makes sense? Apologies for going back and forth a bit on this, we've
> had a bit more across-all-platforms sweeping changes than usual this release
> cycle so things have been a bit more complex than in a while.
No problem at all, thanks for being patient with me.
> I have done basic build testing of the Marvell configs to make sure that things
> pass cleanly, and did one small fixup patch at the top of late/kirkwood to fix
> one problem.
>
> The one area where I'd like you to double-check my work and make sure that
> things aren't broken is on the PCI stuff: There were changes in the pci
> cleanup branch of how the IO is mapped, and some of the memory layouts
> were modified and required fixups between that and the annotation cleanup
> in the addr_decode branch.
Andrew, Thomas, Sebastian, do you guys have some time to test? I'll hit
Dreamplug for kirkwood, can you guys cover orion5x, dove, and mvebu?
arm-soc/late/kirkwood boots on Dreamplug, so
Tested-By: Jason Cooper <jason@lakedaemon.net>
thx,
Jason.
^ permalink raw reply [flat|nested] 15+ messages in thread
* [GIT PULL V5 5/7] ARM: kirkwood platform_data changes for v3.7
2012-09-22 21:37 ` Olof Johansson
@ 2012-09-22 22:32 ` Jason Cooper
0 siblings, 0 replies; 15+ messages in thread
From: Jason Cooper @ 2012-09-22 22:32 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Sep 22, 2012 at 02:37:45PM -0700, Olof Johansson wrote:
> On Sat, Sep 22, 2012 at 01:31:45PM -0400, Jason Cooper wrote:
> > Note: This may conflict with work Rob Herring and others are doing
> > regarding platform_data conversion. If so, just drop this branch.
> > Nothing depends on it, intentionally ;-)
>
> Looks like most of this was already covered in the branch we already had, so
> I didn't pull this. Names ended up being different between the two, so I stuck
> with what we already had and didn't pull this branch.
No problem, hopefully next round I can take some more of the load off of
you and Arnd.
thx,
Jason.
^ permalink raw reply [flat|nested] 15+ messages in thread
* [GIT PULL V5 0/7] ARM: kirkwood/dove/mvebu changes for v3.7
2012-09-22 17:15 [GIT PULL V5 0/7] ARM: kirkwood/dove/mvebu changes for v3.7 Jason Cooper
` (7 preceding siblings ...)
2012-09-22 21:36 ` [GIT PULL V5 0/7] ARM: kirkwood/dove/mvebu " Olof Johansson
@ 2012-09-24 5:23 ` Andrew Lunn
2012-09-24 5:37 ` Olof Johansson
8 siblings, 1 reply; 15+ messages in thread
From: Andrew Lunn @ 2012-09-24 5:23 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd, Olof, Jason.
I tested arm-soc/late/kirkwood on an orion5x board. There is an
unrelated problem, which i should of really seen earlier....
ERROR: 256 KiB atomic DMA coherent pool is too small!
Please increase it with coherent_pool= kernel parameter!
We had the same problem with kirkwood. I will submit a patch against
3.6-rc7. Is there still time for that? Otherwise it would be good to
have in 3.7 and cc: stable so 3.6.1 gets the fix.
When i increase the coherent pool size on the command line, it boots
O.K. I don't have any PCI devices on this board, but the two root
controllers are listed by lspci.
Tested-by: Andrew Lunn <andrew@lunn.ch>
Andrew
^ permalink raw reply [flat|nested] 15+ messages in thread
* [GIT PULL V5 0/7] ARM: kirkwood/dove/mvebu changes for v3.7
2012-09-24 5:23 ` Andrew Lunn
@ 2012-09-24 5:37 ` Olof Johansson
2012-09-24 5:58 ` Andrew Lunn
0 siblings, 1 reply; 15+ messages in thread
From: Olof Johansson @ 2012-09-24 5:37 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Sun, Sep 23, 2012 at 10:23 PM, Andrew Lunn <andrew@lunn.ch> wrote:
> Hi Arnd, Olof, Jason.
>
> I tested arm-soc/late/kirkwood on an orion5x board. There is an
> unrelated problem, which i should of really seen earlier....
>
> ERROR: 256 KiB atomic DMA coherent pool is too small!
> Please increase it with coherent_pool= kernel parameter!
>
> We had the same problem with kirkwood. I will submit a patch against
> 3.6-rc7. Is there still time for that? Otherwise it would be good to
> have in 3.7 and cc: stable so 3.6.1 gets the fix.
There's still some time, Linus just tagged -rc7 so we will have
somewhere between a few days and maybe a week until final 3.6.
> When i increase the coherent pool size on the command line, it boots
> O.K. I don't have any PCI devices on this board, but the two root
> controllers are listed by lspci.
Ok, great. It'd of course be good to see if something on the bus shows
up too, if you can.
-Olof
^ permalink raw reply [flat|nested] 15+ messages in thread
* [GIT PULL V5 0/7] ARM: kirkwood/dove/mvebu changes for v3.7
2012-09-24 5:37 ` Olof Johansson
@ 2012-09-24 5:58 ` Andrew Lunn
0 siblings, 0 replies; 15+ messages in thread
From: Andrew Lunn @ 2012-09-24 5:58 UTC (permalink / raw)
To: linux-arm-kernel
> > We had the same problem with kirkwood. I will submit a patch against
> > 3.6-rc7. Is there still time for that? Otherwise it would be good to
> > have in 3.7 and cc: stable so 3.6.1 gets the fix.
>
> There's still some time, Linus just tagged -rc7 so we will have
> somewhere between a few days and maybe a week until final 3.6.
I just sent the patch to the list. It is the same change that was made
to kirkwood.
Andrew
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2012-09-24 5:58 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-22 17:15 [GIT PULL V5 0/7] ARM: kirkwood/dove/mvebu changes for v3.7 Jason Cooper
2012-09-22 17:20 ` [GIT PULL V5 1/7] ARM: kirkwood: board " Jason Cooper
2012-09-22 17:22 ` [GIT PULL V5 2/7] ARM: kirkwood defconfig " Jason Cooper
2012-09-22 17:24 ` [GIT PULL V5 3/7] ARM: kirkwood dt " Jason Cooper
2012-09-22 17:27 ` [GIT PULL V5 4/7] ARM: kirkwood cleanup " Jason Cooper
2012-09-22 17:31 ` [GIT PULL V5 5/7] ARM: kirkwood platform_data " Jason Cooper
2012-09-22 21:37 ` Olof Johansson
2012-09-22 22:32 ` Jason Cooper
2012-09-22 17:33 ` [GIT PULL V5 6/7] ARM: kirkwood addr_decode " Jason Cooper
2012-09-22 17:36 ` [GIT PULL V5 7/7] ARM: kirkwood drivers " Jason Cooper
2012-09-22 21:36 ` [GIT PULL V5 0/7] ARM: kirkwood/dove/mvebu " Olof Johansson
2012-09-22 22:29 ` Jason Cooper
2012-09-24 5:23 ` Andrew Lunn
2012-09-24 5:37 ` Olof Johansson
2012-09-24 5:58 ` Andrew Lunn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).