Remove mach-kirkwood

This is an RFC patchset which removes mach-kirkwood, now that kirkwood support has been converted to DT and lives in mach-mvebu.

It is an RFC because some of the final conversion patches have not yet been accepted by maintainers, in particular:

http://www.spinics.net/lists/arm-kernel/msg328068.html

which needs to be accepted by the Sound/ASoC maintainer.

Once the real patchset is posted, without the RFC status, we would prefer that each subsystem maintainer takes the relevent patches, rather than try to take them all through arm-soc.

Thanks
Andrew

Andrew Lunn (11):
ARM: Kirkwood: Remove mach-kirkwood
sound: ASoC: kirkwood: Remove unused drivers
sound: ASoC: kirkwood: Remove ARCH_KIRKWOOD dependency
cpuidle: kirkwood: Remove ARCH_KIRKWOOD dependency
ata: Remove ARCH_KIRKWOOD dependency
thermal: Remove ARCH_KIRKWOOD dependency
leds: Remove ARCH_KIRKWOOD dependency
PCI: Remove ARCH_KIRKWOOD dependency
phy: Remove ARCH_KIRKWOOD dependency
rtc: Remove ARCH_KIRKWOOD dependency
watchdog: Remove ARCH_KIRKWOOD dependency

 arch/arm/Kconfig                                  |  18 -
 arch/arm/Kconfig.debug                            |   6 +-
 arch/arm/Makefile                                 |   1 -
 arch/arm/boot/dts/Makefile                        |   5 +-
 arch/arm/configs/kirkwood_defconfig               | 181 ------
 arch/arm/mach-kirkwood/Kconfig                    | 111 ----
 arch/arm/mach-kirkwood/Makefile                   |  14 -
 arch/arm/mach-kirkwood/Makefile.boot              |   3 -
 arch/arm/mach-kirkwood/board-dt.c                 | 223 -------
 arch/arm/mach-kirkwood/common.c                   | 746 ----------------------
 arch/arm/mach-kirkwood/common.h                   |  74 ---
 arch/arm/mach-kirkwood/d2net_v2-setup.c           | 231 -------
 arch/arm/mach-kirkwood/include/mach/bridge-regs.h |  86 ---
 arch/arm/mach-kirkwood/include/mach/entry-macro.S |  34 -
 arch/arm/mach-kirkwood/include/mach/hardware.h    |  14 -
 arch/arm/mach-kirkwood/include/mach/irqs.h        |  65 --
 arch/arm/mach-kirkwood/include/mach/kirkwood.h    | 142 ----
 arch/arm/mach-kirkwood/include/mach/uncompress.h  |  46 --
 arch/arm/mach-kirkwood/irq.c                      |  82 ---
 arch/arm/mach-kirkwood/lacie_v2-common.c          | 114 ----
 arch/arm/mach-kirkwood/lacie_v2-common.h          |  16 -
 arch/arm/mach-kirkwood/mpp.c                      |  43 --
 arch/arm/mach-kirkwood/mpp.h                      | 348 ----------
 arch/arm/mach-kirkwood/netxbig_v2-setup.c         | 422 ------------
 arch/arm/mach-kirkwood/openrd-setup.c             | 255 --------
 arch/arm/mach-kirkwood/pcie.c                     | 296 ---------
 arch/arm/mach-kirkwood/pm.c                       |  76 ---
 arch/arm/mach-kirkwood/pm.h                       |  26 -
 arch/arm/mach-kirkwood/rd88f6192-nas-setup.c      |  89 ---
 arch/arm/mach-kirkwood/rd88f6281-setup.c          | 128 ----
 arch/arm/mach-kirkwood/t5325-setup.c              | 216 -------
 arch/arm/mach-kirkwood/ts219-setup.c              | 142 ----
 arch/arm/mach-kirkwood/ts41x-setup.c              | 186 ------
 arch/arm/mach-kirkwood/tsx1x-common.c             | 113 ----
 arch/arm/mach-kirkwood/tsx1x-common.h             |   7 -
 arch/arm/mm/Kconfig                               |   2 +-
 drivers/ata/Kconfig                               |   2 +-
 drivers/cpuidle/Kconfig.arm                       |   2 +-
 drivers/leds/Kconfig                              |   4 +-
 drivers/pci/host/Kconfig                          |   2 +-
 drivers/phy/Kconfig                               |   2 +-
 drivers/rtc/Kconfig                               |   2 +-
 drivers/thermal/Kconfig                           |   2 +-
 drivers/watchdog/Kconfig                          |   2 +-
 sound/soc/kirkwood/Kconfig                        |  19 +-
 sound/soc/kirkwood/Makefile                       |   4 -
 sound/soc/kirkwood/kirkwood-openrd.c              | 109 ----
 sound/soc/kirkwood/kirkwood-t5325.c               | 129 ----
 48 files changed, 14 insertions(+), 4826 deletions(-)
 delete mode 100644 arch/arm/configs/kirkwood_defconfig
 delete mode 100644 arch/arm/mach-kirkwood/Kconfig
 delete mode 100644 arch/arm/mach-kirkwood/Makefile
 delete mode 100644 arch/arm/mach-kirkwood/Makefile.boot
 delete mode 100644 arch/arm/mach-kirkwood/board-dt.c
 delete mode 100644 arch/arm/mach-kirkwood/common.c
 delete mode 100644 arch/arm/mach-kirkwood/common.h
 delete mode 100644 arch/arm/mach-kirkwood/d2net_v2-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/bridge-regs.h
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/entry-macro.S
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/hardware.h
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/irqs.h
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/kirkwood.h
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/uncompress.h
 delete mode 100644 arch/arm/mach-kirkwood/irq.c
 delete mode 100644 arch/arm/mach-kirkwood/lacie_v2-common.c
 delete mode 100644 arch/arm/mach-kirkwood/lacie_v2-common.h
 delete mode 100644 arch/arm/mach-kirkwood/mpp.c
 delete mode 100644 arch/arm/mach-kirkwood/mpp.h
 delete mode 100644 arch/arm/mach-kirkwood/netxbig_v2-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/openrd-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/pcie.c
 delete mode 100644 arch/arm/mach-kirkwood/pm.c
 delete mode 100644 arch/arm/mach-kirkwood/pm.h
 delete mode 100644 arch/arm/mach-kirkwood/rd88f6192-nas-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/rd88f6281-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/t5325-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/ts219-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/ts41x-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/tsx1x-common.c
 delete mode 100644 arch/arm/mach-kirkwood/tsx1x-common.h
 delete mode 100644 sound/soc/kirkwood/kirkwood-openrd.c
 delete mode 100644 sound/soc/kirkwood/kirkwood-t5325.c

2.0.0.rc2

There is currently no DT binding for the CPLD which controls the LEDs on the Net 2Big and Net 5Big. So use a platform device.

---
 arch/arm/mach-mvebu/Kconfig         |   7 ++
 arch/arm/mach-mvebu/Makefile        |   1 +
 arch/arm/mach-mvebu/board-netxbig.c | 191 ++++++++++++++++++++++++++++++++++++
 arch/arm/mach-mvebu/board.h         |   5 +
 arch/arm/mach-mvebu/kirkwood.c      |   3 +
 5 files changed, 207 insertions(+)
 create mode 100644 arch/arm/mach-mvebu/board-netxbig.c

index d6b0a772a6dd..0f9a700d3b50 100644
@@ -104,6 +104,13 @@ config MACH_KIRKWOOD
 	  Say 'Y' here if you want your kernel to support boards based
 	  on the Marvell Kirkwood device tree.
 
+config MACH_NETXBIG
+	bool "LaCie 2Big and 5Big Network v2"
+	depends on MACH_KIRKWOOD
+	help
+	  Say 'Y' here if you want your kernel to support the
+	  LaCie 2Big and 5Big Network v2
+
 endmenu
 
 endif

index 2ecb828e4a8b..15580e48069a 100644
@@ -14,3 +14,4 @@ endif
 
 obj-$(CONFIG_MACH_DOVE)		 += dove.o
 obj-$(CONFIG_MACH_KIRKWOOD)	 += kirkwood.o kirkwood-pm.o
+obj-$(CONFIG_MACH_NETXBIG)	 += board-netxbig.o

index 9c7bb4386f8b..98e32cc2ef3d 100644
@@ -13,4 +13,9 @@
 #ifndef __ARCH_MVEBU_BOARD_H
 #define __ARCH_MVEBU_BOARD_H
 
+#ifdef CONFIG_MACH_NETXBIG
+void netxbig_init(void);
+#else
+static inline void netxbig_init(void) {};
+#endif
 #endif

index 46f105913c84..6b5310828eb2 100644
@@ -180,6 +180,9 @@ static void __init kirkwood_dt_init(void)
 	kirkwood_pm_init();
 	kirkwood_dt_eth_fixup();
 
+	if (of_machine_is_compatible("lacie,netxbig"))
+		netxbig_init();
+
 	of_platform_populate(NULL, of_default_bus_match_table, auxdata, NULL);
 }
 

2.0.0.rc2

I will rename it. Simon has said he hopes to test on real hardware soon, so once i have the results i will respin the patch set.

Adding a DT binding to the LED driver is probably a task for next cycle.

Andrew

Describe LaCie 2Big and 5Big Network v2 using device tree.

---
v1->v2
Fix size of memory
Clean up ethernet nodes
s/at/atmel/

v2->v3
gpio_poweroff->gpio-poweroff
gpio_key->gpio-key
s/ok/okay
Remove spi pinctrl properties.

---
 arch/arm/boot/dts/Makefile              |   2 +
 arch/arm/boot/dts/kirkwood-net2big.dts  |  30 ++++++
 arch/arm/boot/dts/kirkwood-net5big.dts  |  83 ++++++++++++++++
 arch/arm/boot/dts/kirkwood-netxbig.dtsi | 166 ++++++++++++++++++++++++++++++++
 4 files changed, 281 insertions(+)
 create mode 100644 arch/arm/boot/dts/kirkwood-net2big.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-net5big.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-netxbig.dtsi

index 629eee22e606..facbf0cc2fca 100644
@@ -118,6 +118,8 @@ kirkwood := \
 	kirkwood-lsxhl.dtb \
 	kirkwood-mplcec4.dtb \
 	kirkwood-mv88f6281gtw-ge.dtb \
+	kirkwood-net2big.dtb \
+	kirkwood-net5big.dtb \
 	kirkwood-netgear_readynas_duo_v2.dtb \
 	kirkwood-netgear_readynas_nv+_v2.dtb \
 	kirkwood-ns2.dtb \

new file mode 100644
index 000000000000..c3f5281a52f5
@@ -0,0 +1,30 @@
+/*
+ * Device Tree file for LaCie 2Big Network v2
+ *
+ * Copyright (C) 2014
+ *
+ * Andrew Lunn <[email protected]>
+ *
+ * Based on netxbig_v2-setup.c,
+ * Copyright (C) 2010 Simon Guinot <[email protected]>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+*/
+
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+#include "kirkwood-netxbig.dtsi"
+
+/ {
+	model = "LaCie 2Big Network v2";
+	compatible = "lacie,net2big", "lacie,netxbig", "marvell,kirkwood-88f6192", "marvell,kirkwood";
+
+	memory {
+		device_type = "memory";
+		reg = <0x00000000 0x10000000>;
+	};
+};

2.0.0.rc2

Both kirkwood-openrd and kirkwood-t5325 drivers have been replaced with DT based simple-card equivelents.

---
 sound/soc/kirkwood/Kconfig           |  17 -----
 sound/soc/kirkwood/Makefile          |   4 --
 sound/soc/kirkwood/kirkwood-openrd.c | 109 -----------------------------
 sound/soc/kirkwood/kirkwood-t5325.c  | 129 -----------------------------------
 4 files changed, 259 deletions(-)
 delete mode 100644 sound/soc/kirkwood/kirkwood-openrd.c
 delete mode 100644 sound/soc/kirkwood/kirkwood-t5325.c

index 06f4e8aa93ae..1f7c7ee3527a 100644
@@ -15,20 +15,3 @@ config SND_KIRKWOOD_SOC_ARMADA370_DB
 	  Say Y if you want to add support for SoC audio on
 	  the Armada 370 Development Board.
 
-config SND_KIRKWOOD_SOC_OPENRD
-	tristate "SoC Audio support for Kirkwood Openrd Client"
-	depends on SND_KIRKWOOD_SOC && (MACH_OPENRD_CLIENT || MACH_OPENRD_ULTIMATE || COMPILE_TEST)
-	depends on I2C
-	select SND_SOC_CS42L51
-	help
-	  Say Y if you want to add support for SoC audio on
-	  Openrd Client.
-
-config SND_KIRKWOOD_SOC_T5325
-	tristate "SoC Audio support for HP t5325"
-	depends on SND_KIRKWOOD_SOC && (MACH_T5325 || COMPILE_TEST) && I2C
-	select SND_SOC_ALC5623
-	help
-	  Say Y if you want to add support for SoC audio on
-	  the HP t5325 thin client.
-

index 7c1d8fe09e6b..c36b03d8006c 100644
@@ -2,10 +2,6 @@ snd-soc-kirkwood-objs := kirkwood-dma.o kirkwood-i2s.o
 
 obj-$(CONFIG_SND_KIRKWOOD_SOC) += snd-soc-kirkwood.o
 
-snd-soc-openrd-objs := kirkwood-openrd.o
-snd-soc-t5325-objs := kirkwood-t5325.o
 snd-soc-armada-370-db-objs := armada-370-db.o
 
 obj-$(CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB) += snd-soc-armada-370-db.o
-obj-$(CONFIG_SND_KIRKWOOD_SOC_OPENRD) += snd-soc-openrd.o
-obj-$(CONFIG_SND_KIRKWOOD_SOC_T5325) += snd-soc-t5325.o

2.0.0.rc2

Applied, thanks. Please do try to use subject lines matching the style
for the subsystem.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140526/65636297/attachment.sig>

Hi Mark

This is an RFC patch, as it says in the Subject line, and the cover note. It is not intended to be applied yet. Please unapply it, and the other one in the series you have applied.

O.K, i will fix this when i send the real, not RFC, to be applied, patches.

Thanks
Andrew

Eh? I thought the discussion was that everything was OK and we were
going to go ahead with this approach. Or to put it another way what's
wrong with this and what's expected to change? The only issue you
identified in the cover letter was me applying some patches I'd already
applied (BTW, please always include plain text descriptions of external
things you're referring to in mails - this applies to links as much as
it does to commit IDs).
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140527/5562d3cb/attachment.sig>

Hi Mark

What is wrong is that the merge path for the first patch, which removes the boards making use of these drivers, has already closed for patches. So we now have boards left in the tree with broken audio. We can leave it that way, because these boards are actually in the tree twice. One using DT, which will work as things are now, and old style board file boards which are broken.

That was my error. I should of also added that you need to apply those patches before arm-soc closes, so we have time to feed in these patches. arm-soc generally closes around rc6/rc7, with the mvebu maintainer closing a little before that.

Since we are past that now, i planned to send these patches next cycle, without the RFC tag.

Andrew

OK, so another part of this is that you didn't send the first patch to me so I didn't realise that the boards were still there. TBH I'd have expected that removal to just be going in independently of cleaning up the drivers.

Anyway, I dropped the patches.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140527/a5aa8568/attachment.sig>

Thanks Mark, sorry for the confusion.

thx,

Jason.

Enable building LaCie 2Big and 5Big Network v2 in the mvebu v5 kernel.

---
 arch/arm/configs/mvebu_v5_defconfig | 1 +
 1 file changed, 1 insertion(+)

index 27c732fdf21e..e999bb97be79 100644
@@ -12,6 +12,7 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_MVEBU=y
 CONFIG_MACH_KIRKWOOD=y
+CONFIG_MACH_NETXBIG=y
 # CONFIG_CPU_FEROCEON_OLD_ID is not set
 CONFIG_PCI_MVEBU=y
 CONFIG_PREEMPT=y

2.0.0.rc2

mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu.

---
 sound/soc/kirkwood/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 1f7c7ee3527a..6a0f79d2bb33 100644
@@ -1,6 +1,6 @@
 config SND_KIRKWOOD_SOC
 	tristate "SoC Audio for the Marvell Kirkwood and Dove chips"
-	depends on ARCH_KIRKWOOD || ARCH_DOVE || ARCH_MVEBU || MACH_KIRKWOOD || COMPILE_TEST
+	depends on ARCH_DOVE || ARCH_MVEBU || MACH_KIRKWOOD || COMPILE_TEST
 	help
 	  Say Y or M if you want to add support for codecs attached to
 	  the Kirkwood I2S interface. You will also need to select the

2.0.0.rc2

Most of the descriptions in the series say remove mach-kirkwood and most of the actual patches remove ARCH_KIRKWOOD and leave MACH_KIRKWOOD untouched. Patch 01/11 hasn't turned up here so I'm not certain which you meant but consistency would be good.

01/11 is big, since it is an rm -fr arch/arm/mach-kirkwood. It is bigger than the list message size limit and so has been put to one side for the list moderator to approve.

The comment is consistent with the code, the code is however somewhat confusing. arch/arm/mach-kirkwood uses ARCH_KIRKWOOD. kirkwood in its new home inside arch/arm/mach-mvebu uses MACH_KIRKWOOD.

Andrew

Applied, thanks.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140526/de0f2067/attachment.sig>

Enable building LaCie 2Big and 5Big Network v2 in the multi v5 kernel.

---
 arch/arm/configs/multi_v5_defconfig | 1 +
 1 file changed, 1 insertion(+)

index 5ebfa8bf8509..02d4e79826d3 100644
@@ -11,6 +11,7 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_MVEBU=y
 CONFIG_MACH_KIRKWOOD=y
+CONFIG_MACH_NETXBIG=y
 CONFIG_ARCH_MXC=y
 CONFIG_MACH_IMX25_DT=y
 CONFIG_MACH_IMX27_DT=y

2.0.0.rc2

[Added arm at kernel.org so they can spot the patch more easily]

Thanks, but we're really only worried about multi_v7_defconfig. multi_v5_defconfig hasn't proven to be conflict-prone yet.

thx,

Jason.

mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu.

---
 drivers/cpuidle/Kconfig.arm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 5bb94780d377..a56c17928534 100644
@@ -27,7 +27,7 @@ config ARM_HIGHBANK_CPUIDLE
 
 config ARM_KIRKWOOD_CPUIDLE
 	bool "CPU Idle Driver for Marvell Kirkwood SoCs"
-	depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
+	depends on MACH_KIRKWOOD
 	help
 	  This adds the CPU Idle driver for Marvell Kirkwood SoCs.
 

2.0.0.rc2

mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu.

---
 drivers/ata/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 20e03a7eb8b4..771f226cf8f4 100644
@@ -281,7 +281,7 @@ config SATA_HIGHBANK
 
 config SATA_MV
 	tristate "Marvell SATA support"
-	depends on PCI || ARCH_DOVE || ARCH_KIRKWOOD || ARCH_MV78XX0 || \
+	depends on PCI || ARCH_DOVE || ARCH_MV78XX0 || \
 		   ARCH_MVEBU || ARCH_ORION5X || COMPILE_TEST
 	select GENERIC_PHY
 	help

2.0.0.rc2

Please feel free to route the patch as you see fit.

Thanks.

tejun

mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu.

---
 drivers/thermal/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 2d51912a6e40..14d15043b6f2 100644
@@ -143,7 +143,7 @@ config RCAR_THERMAL
 
 config KIRKWOOD_THERMAL
 	tristate "Temperature sensor on Marvell Kirkwood SoCs"
-	depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
+	depends on MACH_KIRKWOOD
 	depends on OF
 	help
 	  Support for the Kirkwood thermal sensor driver into the Linux thermal

2.0.0.rc2

mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu.

---
 drivers/leds/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

index 6de9dfbf61c1..01ebebfcc891 100644
@@ -421,7 +421,7 @@ config LEDS_MC13783
 config LEDS_NS2
 	tristate "LED support for Network Space v2 GPIO LEDs"
 	depends on LEDS_CLASS
-	depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
+	depends on MACH_KIRKWOOD
 	default y
 	help
 	  This option enable support for the dual-GPIO LED found on the

@@ -431,7 +431,7 @@ config LEDS_NS2
 config LEDS_NETXBIG
 	tristate "LED support for Big Network series LEDs"
 	depends on LEDS_CLASS
-	depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
+	depends on MACH_KIRKWOOD
 	default y
 	help
 	  This option enable support for LEDs found on the LaCie 2Big

2.0.0.rc2

Sorry for the delay.

Please take my Ack for merging this change.

mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu.

---
 drivers/pci/host/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index a6f67ec8882f..1b32836d435a 100644
@@ -3,7 +3,7 @@ menu "PCI host controller drivers"
 
 config PCI_MVEBU
 	bool "Marvell EBU PCIe controller"
-	depends on ARCH_MVEBU || ARCH_DOVE || ARCH_KIRKWOOD
+	depends on ARCH_MVEBU || ARCH_DOVE
 	depends on OF
 
 config PCIE_DW

2.0.0.rc2

mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu.

---
 drivers/phy/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 3bb05f17b9b4..996b11bab7c6 100644
@@ -27,7 +27,7 @@ config PHY_EXYNOS_MIPI_VIDEO
 
 config PHY_MVEBU_SATA
 	def_bool y
-	depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_DOVE || MACH_KIRKWOOD
+	depends on ARCH_DOVE || MACH_DOVE || MACH_KIRKWOOD
 	depends on OF
 	select GENERIC_PHY
 

2.0.0.rc2

mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu.

---
 drivers/rtc/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 2e565f8e5165..93be35954cee 100644
@@ -1161,7 +1161,7 @@ config RTC_DRV_TX4939
 
 config RTC_DRV_MV
 	tristate "Marvell SoC RTC"
-	depends on ARCH_KIRKWOOD || ARCH_DOVE || ARCH_MVEBU
+	depends on ARCH_DOVE || ARCH_MVEBU
 	help
 	  If you say yes here you will get support for the in-chip RTC
 	  that can be found in some of Marvell's SoC devices, such as

2.0.0.rc2

mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu.

---
 drivers/watchdog/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 74ec8fc5cc03..e68f2b9a3b31 100644
@@ -301,7 +301,7 @@ config DAVINCI_WATCHDOG
 
 config ORION_WATCHDOG
 	tristate "Orion watchdog"
-	depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE || MACH_DOVE || ARCH_MVEBU
+	depends on ARCH_ORION5X || ARCH_DOVE || MACH_DOVE || ARCH_MVEBU
 	select WATCHDOG_CORE
 	help
 	  Say Y here if to include support for the watchdog timer

2.0.0.rc2

Very nice!

We had a couple of conflicts in 3.15 between kirkwood and dove both getting moved to multiplatform. Any idea how this can be done better this time?

There are three other series that may or may not make it into 3.16 and that will have conflicts with this one:

- remove mv78xx0
- remove mach-dove
- convert orion5x to multiplatform

If we can decide which ones we should have, we can make sure the patches correctly build on top of one another or get merged into one per subsystem.

Arnd

I've not tried, but i doubt there will be conflicts between orion5x and kirkwood.

For the three removal patchsets, i guess the simple option is to pre-merge them and send it all as one big patchset.

Andrew

Yes, once the changes have matured in -next, I'll merge them into a single branch to pull instead of separately like I did before.

? I haven't seen anything on these...

I have this one already.

hmmm, yes, if only we had some people assigned to do that. ;-)

thx,

Jason.

Actually I planned to try to convert this to multiplatform through mvebu. Based on the patches I already sent a few monthes ago and on the work done by Thomas for orion5x. I have a slot to do it on Tuesday, but I don't expect it was merged in 3.16.

Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

afaict, the only current users of this were the Debian build farm. But they've moved on to better hardware thanks to a generous donation :)

Are we aware of any other users?

thx,

Jason.

afaict, the only current users of this were the Debian build farm. But they've moved on to better hardware thanks to a generous donation :)

Are we aware of any other users?

thx,

Jason.

Dear Arnd Bergmann,

The work on Orion5x is still on-going. I'd like to progressively continue the DT migration of Orion5x, moving to multiplatform, and then once it's done, move into mach-mvebu. I'd appreciate to not rush things more than necessary.

Thanks!

Thomas

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Yes, that's fine. I'd just want to be sure we all understand what is going into 3.16 and what isn't.

So your plan for now is to do DT support in 3.16 and multiplatform after 3.16? That won't have any conflicts with the kirkwood patches then, as far as I can tell.

What about dove? Are we ready to remove it or do we give it another cycle?

Arnd

I still have some pending fixes for mmc subsystem. The ARCH_DOVE/MACH_DOVE patch didn't make it in, and I wasn't able to get any mmc feedback on 2-3 pings. I'll do a proper RESEND and see what happens.

So removing legacy dove will definitely _not_ happen for v3.16.

Sebastian

Dear Arnd Bergmann,

Yes, my plan is to have what's already in the 'mvebu' branches for 3.16, i.e the migration to DT of a small number of Orion5x machines, as well as the corresponding dependencies (pinctrl support, clock support, etc.).

Then, for 3.17, I'll try to:

* convert more Orion5x boards to DT
* support PCIe through DT
* move to multiplatform

Of course, that's a purely tentative schedule, Orion5x is really a spare time effort today.

Best regards,

Thomas

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com