* [GIT PULL 0/3] ARM: mvebu: changes for v3.10
@ 2013-03-17 20:15 Jason Cooper
2013-03-17 20:15 ` [GIT PULL 2/3] ARM: mvebu: drivers " Jason Cooper
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Jason Cooper @ 2013-03-17 20:15 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 92629000ed5e1db9be062409038aa36de9c91eff:
Merge branch 'next/spring-cleaning' into for-next
are available in the git repository at:
git://git.infradead.org/users/jcooper/linux.git mvebu/for-next
for you to fetch changes up to 4e38c5c665d5dc2aa702631306e46dc6aec392de:
Merge branch 'mvebu/soc' into mvebu/for-next
Jason Cooper (3):
Merge branch 'mvebu/cleanup' into mvebu/for-next
Merge branch 'mvebu/drivers' into mvebu/for-next
Merge branch 'mvebu/soc' into mvebu/for-next
.../devicetree/bindings/arm/mvebu-mbus.txt | 39 +
arch/arm/Kconfig | 4 +
arch/arm/boot/dts/armada-370-xp.dtsi | 5 -
arch/arm/boot/dts/armada-370.dtsi | 3 +
arch/arm/boot/dts/armada-xp.dtsi | 3 +
arch/arm/boot/dts/dove.dtsi | 3 +-
arch/arm/boot/dts/kirkwood.dtsi | 3 +-
arch/arm/boot/dts/orion5x-88f5182.dtsi | 18 +
.../dts/orion5x-lacie-ethernet-disk-mini-v2.dts | 2 +-
arch/arm/mach-dove/Makefile | 2 +-
arch/arm/mach-dove/addr-map.c | 125 ---
arch/arm/mach-dove/board-dt.c | 13 +-
arch/arm/mach-dove/common.c | 39 +-
arch/arm/mach-dove/common.h | 2 +-
arch/arm/mach-dove/include/mach/dove.h | 5 +
arch/arm/mach-kirkwood/Makefile | 2 +-
arch/arm/mach-kirkwood/addr-map.c | 91 --
arch/arm/mach-kirkwood/board-dt.c | 19 +-
arch/arm/mach-kirkwood/common.c | 38 +-
arch/arm/mach-kirkwood/common.h | 2 +-
arch/arm/mach-kirkwood/include/mach/kirkwood.h | 7 +-
arch/arm/mach-kirkwood/pcie.c | 1 -
arch/arm/mach-mv78xx0/Makefile | 2 +-
arch/arm/mach-mv78xx0/addr-map.c | 93 --
arch/arm/mach-mv78xx0/common.c | 10 +-
arch/arm/mach-mv78xx0/include/mach/mv78xx0.h | 8 +-
arch/arm/mach-mv78xx0/pcie.c | 21 +-
arch/arm/mach-mvebu/Kconfig | 1 +
arch/arm/mach-mvebu/Makefile | 2 +-
arch/arm/mach-mvebu/addr-map.c | 137 ---
arch/arm/mach-mvebu/armada-370-xp.c | 2 +
arch/arm/mach-mvebu/platsmp.c | 2 +
arch/arm/mach-orion5x/Makefile | 2 +-
arch/arm/mach-orion5x/addr-map.c | 155 ----
arch/arm/mach-orion5x/board-dt.c | 24 +-
arch/arm/mach-orion5x/common.c | 49 +-
arch/arm/mach-orion5x/common.h | 13 +-
arch/arm/mach-orion5x/d2net-setup.c | 4 +-
arch/arm/mach-orion5x/db88f5281-setup.c | 13 +-
arch/arm/mach-orion5x/dns323-setup.c | 3 +-
arch/arm/mach-orion5x/edmini_v2-setup.c | 4 +-
arch/arm/mach-orion5x/include/mach/orion5x.h | 6 +-
arch/arm/mach-orion5x/kurobox_pro-setup.c | 8 +-
arch/arm/mach-orion5x/ls-chl-setup.c | 4 +-
arch/arm/mach-orion5x/ls_hgl-setup.c | 4 +-
arch/arm/mach-orion5x/lsmini-setup.c | 4 +-
arch/arm/mach-orion5x/mss2-setup.c | 3 +-
arch/arm/mach-orion5x/mv2120-setup.c | 3 +-
arch/arm/mach-orion5x/net2big-setup.c | 4 +-
arch/arm/mach-orion5x/pci.c | 14 +-
arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 4 +-
arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 4 +-
arch/arm/mach-orion5x/rd88f5182-setup.c | 7 +-
arch/arm/mach-orion5x/terastation_pro2-setup.c | 4 +-
arch/arm/mach-orion5x/ts209-setup.c | 4 +-
arch/arm/mach-orion5x/ts409-setup.c | 4 +-
arch/arm/mach-orion5x/wnr854t-setup.c | 4 +-
arch/arm/mach-orion5x/wrt350n-v2-setup.c | 4 +-
arch/arm/plat-orion/Makefile | 2 -
arch/arm/plat-orion/addr-map.c | 178 ----
arch/arm/plat-orion/pcie.c | 10 +-
drivers/bus/Kconfig | 7 +
drivers/bus/Makefile | 1 +
drivers/bus/mvebu-mbus.c | 906 +++++++++++++++++++
include/linux/mbus.h | 28 +-
65 files changed, 1301 insertions(+), 887 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/mvebu-mbus.txt
create mode 100644 arch/arm/boot/dts/orion5x-88f5182.dtsi
delete mode 100644 arch/arm/mach-dove/addr-map.c
delete mode 100644 arch/arm/mach-kirkwood/addr-map.c
delete mode 100644 arch/arm/mach-mv78xx0/addr-map.c
delete mode 100644 arch/arm/mach-mvebu/addr-map.c
delete mode 100644 arch/arm/mach-orion5x/addr-map.c
delete mode 100644 arch/arm/plat-orion/addr-map.c
create mode 100644 drivers/bus/mvebu-mbus.c
^ permalink raw reply [flat|nested] 9+ messages in thread* [GIT PULL 2/3] ARM: mvebu: drivers for v3.10 2013-03-17 20:15 [GIT PULL 0/3] ARM: mvebu: changes for v3.10 Jason Cooper @ 2013-03-17 20:15 ` Jason Cooper 2013-03-17 20:15 ` [GIT PULL 1/3] ARM: mvebu: cleanup " Jason Cooper 2013-03-17 20:15 ` [GIT PULL 3/3] ARM: mvebu: soc " Jason Cooper 2 siblings, 0 replies; 9+ messages in thread From: Jason Cooper @ 2013-03-17 20:15 UTC (permalink / raw) To: linux-arm-kernel The following changes since commit f6161aa153581da4a3867a2d1a7caf4be19b6ec9: Linux 3.9-rc2 are available in the git repository at: git://git.infradead.org/users/jcooper/linux.git tags/drivers_for_v3.10 for you to fetch changes up to edba98129498c4108e5b8a48335632b17048a62b: bus: introduce an Marvell EBU MBus driver ---------------------------------------------------------------- mvebu drivers for v3.10 - mvebu: mbus driver for kirkwood, dove, orion5x, mv78xx, and armada 370/xp ---------------------------------------------------------------- Thomas Petazzoni (1): bus: introduce an Marvell EBU MBus driver .../devicetree/bindings/arm/mvebu-mbus.txt | 39 + drivers/bus/Kconfig | 7 + drivers/bus/Makefile | 1 + drivers/bus/mvebu-mbus.c | 906 +++++++++++++++++++ include/linux/mbus.h | 25 +- 5 files changed, 977 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/arm/mvebu-mbus.txt create mode 100644 drivers/bus/mvebu-mbus.c ^ permalink raw reply [flat|nested] 9+ messages in thread
* [GIT PULL 1/3] ARM: mvebu: cleanup for v3.10 2013-03-17 20:15 [GIT PULL 0/3] ARM: mvebu: changes for v3.10 Jason Cooper 2013-03-17 20:15 ` [GIT PULL 2/3] ARM: mvebu: drivers " Jason Cooper @ 2013-03-17 20:15 ` Jason Cooper 2013-03-18 14:50 ` Arnd Bergmann 2013-03-17 20:15 ` [GIT PULL 3/3] ARM: mvebu: soc " Jason Cooper 2 siblings, 1 reply; 9+ messages in thread From: Jason Cooper @ 2013-03-17 20:15 UTC (permalink / raw) To: linux-arm-kernel The following changes since commit f6161aa153581da4a3867a2d1a7caf4be19b6ec9: Linux 3.9-rc2 are available in the git repository at: git://git.infradead.org/users/jcooper/linux.git tags/cleanup_for_v3.10 for you to fetch changes up to 3e762c86b337f6990cdbd71890921b4dd9351ed9: arm: mach-orion5x: use mv_mbus_dram_info() in PCI code ---------------------------------------------------------------- mvebu cleanup for v3.10 - plat-orion: prep for mvebu-mbus driver ---------------------------------------------------------------- Thomas Petazzoni (3): arm: plat-orion: only build addr-map.c when needed arm: plat-orion: use mv_mbus_dram_info() in PCIe code arm: mach-orion5x: use mv_mbus_dram_info() in PCI code arch/arm/mach-orion5x/pci.c | 7 ++++--- arch/arm/plat-orion/Makefile | 6 +++++- arch/arm/plat-orion/pcie.c | 10 ++++++---- 3 files changed, 15 insertions(+), 8 deletions(-) ^ permalink raw reply [flat|nested] 9+ messages in thread
* [GIT PULL 1/3] ARM: mvebu: cleanup for v3.10 2013-03-17 20:15 ` [GIT PULL 1/3] ARM: mvebu: cleanup " Jason Cooper @ 2013-03-18 14:50 ` Arnd Bergmann 0 siblings, 0 replies; 9+ messages in thread From: Arnd Bergmann @ 2013-03-18 14:50 UTC (permalink / raw) To: linux-arm-kernel On Sunday 17 March 2013, Jason Cooper wrote: > The following changes since commit f6161aa153581da4a3867a2d1a7caf4be19b6ec9: > > Linux 3.9-rc2 > > are available in the git repository at: > > git://git.infradead.org/users/jcooper/linux.git tags/cleanup_for_v3.10 > Pulled into cleanup branch, thanks! Arnd ^ permalink raw reply [flat|nested] 9+ messages in thread
* [GIT PULL 3/3] ARM: mvebu: soc for v3.10 2013-03-17 20:15 [GIT PULL 0/3] ARM: mvebu: changes for v3.10 Jason Cooper 2013-03-17 20:15 ` [GIT PULL 2/3] ARM: mvebu: drivers " Jason Cooper 2013-03-17 20:15 ` [GIT PULL 1/3] ARM: mvebu: cleanup " Jason Cooper @ 2013-03-17 20:15 ` Jason Cooper 2013-03-17 22:26 ` Gregory CLEMENT 2 siblings, 1 reply; 9+ messages in thread From: Jason Cooper @ 2013-03-17 20:15 UTC (permalink / raw) To: linux-arm-kernel The following changes since commit 207b6b8da3195dafe3e0d2143262640ddace74af: Merge branch 'mvebu/drivers' into mvebu/soc are available in the git repository at: git://git.infradead.org/users/jcooper/linux.git tags/soc_changes_for_v3.10 for you to fetch changes up to c135394ade12b00be1fdd04f68ff8470207a9b32: arm: plat-orion: remove addr-map code ---------------------------------------------------------------- mvebu soc changes for v3.10 - use mvebu-mbus driver for: - kirkwood - dove - orion5x - mv78xx - mvebu - depends - tags/cleanup_for_v3.10 (mvebu/cleanup) - tags/drivers_for_v3.10 (mvebu/drivers) ---------------------------------------------------------------- Thomas Petazzoni (6): arm: mach-mvebu: convert to use mvebu-mbus driver arm: mach-kirkwood: convert to use mvebu-mbus driver arm: mach-dove: convert to use mvebu-mbus driver arm: mach-orion5x: convert to use mvebu-mbus driver arm: mach-mv78xx0: convert to use the mvebu-mbus driver arm: plat-orion: remove addr-map code arch/arm/Kconfig | 4 + arch/arm/boot/dts/armada-370-xp.dtsi | 5 - arch/arm/boot/dts/armada-370.dtsi | 3 + arch/arm/boot/dts/armada-xp.dtsi | 3 + arch/arm/boot/dts/dove.dtsi | 3 +- arch/arm/boot/dts/kirkwood.dtsi | 3 +- arch/arm/boot/dts/orion5x-88f5182.dtsi | 18 ++ .../dts/orion5x-lacie-ethernet-disk-mini-v2.dts | 2 +- arch/arm/mach-dove/Makefile | 2 +- arch/arm/mach-dove/addr-map.c | 125 ------------- arch/arm/mach-dove/board-dt.c | 13 +- arch/arm/mach-dove/common.c | 39 ++++- arch/arm/mach-dove/common.h | 2 +- arch/arm/mach-dove/include/mach/dove.h | 5 + arch/arm/mach-kirkwood/Makefile | 2 +- arch/arm/mach-kirkwood/addr-map.c | 91 ---------- arch/arm/mach-kirkwood/board-dt.c | 19 +- arch/arm/mach-kirkwood/common.c | 38 +++- arch/arm/mach-kirkwood/common.h | 2 +- arch/arm/mach-kirkwood/include/mach/kirkwood.h | 7 +- arch/arm/mach-kirkwood/pcie.c | 1 - arch/arm/mach-mv78xx0/Makefile | 2 +- arch/arm/mach-mv78xx0/addr-map.c | 93 ---------- arch/arm/mach-mv78xx0/common.c | 10 +- arch/arm/mach-mv78xx0/include/mach/mv78xx0.h | 8 +- arch/arm/mach-mv78xx0/pcie.c | 21 ++- arch/arm/mach-mvebu/Kconfig | 1 + arch/arm/mach-mvebu/Makefile | 2 +- arch/arm/mach-mvebu/addr-map.c | 137 --------------- arch/arm/mach-mvebu/armada-370-xp.c | 2 + arch/arm/mach-mvebu/platsmp.c | 2 + arch/arm/mach-orion5x/Makefile | 2 +- arch/arm/mach-orion5x/addr-map.c | 155 ---------------- arch/arm/mach-orion5x/board-dt.c | 24 ++- arch/arm/mach-orion5x/common.c | 49 +++++- arch/arm/mach-orion5x/common.h | 13 +- arch/arm/mach-orion5x/d2net-setup.c | 4 +- arch/arm/mach-orion5x/db88f5281-setup.c | 13 +- arch/arm/mach-orion5x/dns323-setup.c | 3 +- arch/arm/mach-orion5x/edmini_v2-setup.c | 4 +- arch/arm/mach-orion5x/include/mach/orion5x.h | 6 +- arch/arm/mach-orion5x/kurobox_pro-setup.c | 8 +- arch/arm/mach-orion5x/ls-chl-setup.c | 4 +- arch/arm/mach-orion5x/ls_hgl-setup.c | 4 +- arch/arm/mach-orion5x/lsmini-setup.c | 4 +- arch/arm/mach-orion5x/mss2-setup.c | 3 +- arch/arm/mach-orion5x/mv2120-setup.c | 3 +- arch/arm/mach-orion5x/net2big-setup.c | 4 +- arch/arm/mach-orion5x/pci.c | 7 +- arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 4 +- arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 4 +- arch/arm/mach-orion5x/rd88f5182-setup.c | 7 +- arch/arm/mach-orion5x/terastation_pro2-setup.c | 4 +- arch/arm/mach-orion5x/ts209-setup.c | 4 +- arch/arm/mach-orion5x/ts409-setup.c | 4 +- arch/arm/mach-orion5x/wnr854t-setup.c | 4 +- arch/arm/mach-orion5x/wrt350n-v2-setup.c | 4 +- arch/arm/plat-orion/Makefile | 6 - arch/arm/plat-orion/addr-map.c | 175 ------------------- include/linux/mbus.h | 3 + 60 files changed, 314 insertions(+), 880 deletions(-) create mode 100644 arch/arm/boot/dts/orion5x-88f5182.dtsi delete mode 100644 arch/arm/mach-dove/addr-map.c delete mode 100644 arch/arm/mach-kirkwood/addr-map.c delete mode 100644 arch/arm/mach-mv78xx0/addr-map.c delete mode 100644 arch/arm/mach-mvebu/addr-map.c delete mode 100644 arch/arm/mach-orion5x/addr-map.c delete mode 100644 arch/arm/plat-orion/addr-map.c ^ permalink raw reply [flat|nested] 9+ messages in thread
* [GIT PULL 3/3] ARM: mvebu: soc for v3.10 2013-03-17 20:15 ` [GIT PULL 3/3] ARM: mvebu: soc " Jason Cooper @ 2013-03-17 22:26 ` Gregory CLEMENT 2013-03-18 1:07 ` Jason Cooper 0 siblings, 1 reply; 9+ messages in thread From: Gregory CLEMENT @ 2013-03-17 22:26 UTC (permalink / raw) To: linux-arm-kernel Hi Jason, On 03/17/2013 09:15 PM, Jason Cooper wrote: > The following changes since commit 207b6b8da3195dafe3e0d2143262640ddace74af: > > Merge branch 'mvebu/drivers' into mvebu/soc > > are available in the git repository at: > > git://git.infradead.org/users/jcooper/linux.git tags/soc_changes_for_v3.10 > > for you to fetch changes up to c135394ade12b00be1fdd04f68ff8470207a9b32: > > arm: plat-orion: remove addr-map code > > ---------------------------------------------------------------- > mvebu soc changes for v3.10 > > - use mvebu-mbus driver for: > - kirkwood > - dove > - orion5x > - mv78xx > - mvebu > > - depends > - tags/cleanup_for_v3.10 (mvebu/cleanup) > - tags/drivers_for_v3.10 (mvebu/drivers) > ---------------------------------------------------------------- > Thomas Petazzoni (6): > arm: mach-mvebu: convert to use mvebu-mbus driver > arm: mach-kirkwood: convert to use mvebu-mbus driver > arm: mach-dove: convert to use mvebu-mbus driver > arm: mach-orion5x: convert to use mvebu-mbus driver > arm: mach-mv78xx0: convert to use the mvebu-mbus driver Could you hold on this one? I managed to test Thomas patch set for a mv78x00 based board on Friday, and I found a small bug. Thomas has a fix for it and he plans to send a V3 with this fix next week. Thanks, Gregory ^ permalink raw reply [flat|nested] 9+ messages in thread
* [GIT PULL 3/3] ARM: mvebu: soc for v3.10 2013-03-17 22:26 ` Gregory CLEMENT @ 2013-03-18 1:07 ` Jason Cooper 2013-03-18 16:18 ` Thomas Petazzoni 0 siblings, 1 reply; 9+ messages in thread From: Jason Cooper @ 2013-03-18 1:07 UTC (permalink / raw) To: linux-arm-kernel On Sun, Mar 17, 2013 at 11:26:10PM +0100, Gregory CLEMENT wrote: > I managed to test Thomas patch set for a mv78x00 based board on Friday, > and I found a small bug. Thomas has a fix for it and he plans to send > a V3 with this fix next week. A reply to the V2 patch would have been appreciated. The series has been on lakml since Mar 6th, with no comments... Please just send a new version of the mv78xx0 patch. No need for a new series. thx, Jason. ^ permalink raw reply [flat|nested] 9+ messages in thread
* [GIT PULL 3/3] ARM: mvebu: soc for v3.10 2013-03-18 1:07 ` Jason Cooper @ 2013-03-18 16:18 ` Thomas Petazzoni 2013-03-18 20:50 ` Arnd Bergmann 0 siblings, 1 reply; 9+ messages in thread From: Thomas Petazzoni @ 2013-03-18 16:18 UTC (permalink / raw) To: linux-arm-kernel Dear Jason Cooper, On Sun, 17 Mar 2013 21:07:26 -0400, Jason Cooper wrote: > On Sun, Mar 17, 2013 at 11:26:10PM +0100, Gregory CLEMENT wrote: > > I managed to test Thomas patch set for a mv78x00 based board on Friday, > > and I found a small bug. Thomas has a fix for it and he plans to send > > a V3 with this fix next week. > > A reply to the V2 patch would have been appreciated. The series has > been on lakml since Mar 6th, with no comments... Gregory managed to test the series on Friday, 15th March, and I did a quick fix on that day. I've been on WE on Saturday/Sunday, so please excuse the delay. > Please just send a new version of the mv78xx0 patch. No need for a new > series. Seeing the discussion with Arnd, it seems like a new series will be needed. Not because of mv78xx0, but because Arnd wants a non-DT driver. Best regards, Thomas -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 9+ messages in thread
* [GIT PULL 3/3] ARM: mvebu: soc for v3.10 2013-03-18 16:18 ` Thomas Petazzoni @ 2013-03-18 20:50 ` Arnd Bergmann 0 siblings, 0 replies; 9+ messages in thread From: Arnd Bergmann @ 2013-03-18 20:50 UTC (permalink / raw) To: linux-arm-kernel On Monday 18 March 2013, Thomas Petazzoni wrote: > > Please just send a new version of the mv78xx0 patch. No need for a new > > series. > > Seeing the discussion with Arnd, it seems like a new series will be > needed. Not because of mv78xx0, but because Arnd wants a non-DT driver. You could do the patch to remove the DT binding on top if that makes your life easier, as long it's gone by the time of the merge window. Arnd ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2013-03-18 20:50 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-03-17 20:15 [GIT PULL 0/3] ARM: mvebu: changes for v3.10 Jason Cooper 2013-03-17 20:15 ` [GIT PULL 2/3] ARM: mvebu: drivers " Jason Cooper 2013-03-17 20:15 ` [GIT PULL 1/3] ARM: mvebu: cleanup " Jason Cooper 2013-03-18 14:50 ` Arnd Bergmann 2013-03-17 20:15 ` [GIT PULL 3/3] ARM: mvebu: soc " Jason Cooper 2013-03-17 22:26 ` Gregory CLEMENT 2013-03-18 1:07 ` Jason Cooper 2013-03-18 16:18 ` Thomas Petazzoni 2013-03-18 20:50 ` Arnd Bergmann
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).