| Message ID | 1393096504-11844-4-git-send-email-andrew@lunn.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, Feb 22, 2014 at 08:14:45PM +0100, Andrew Lunn wrote: > The mv88f6281gtw_ge has a ethernet switch connected to the ethernet > port of the SoC. Convert the platform device instantiation to a DT > instantiation. > > Signed-off-by: Andrew Lunn <andrew@lunn.ch> > Acked-by: Arnd Bergmann <arnd@arndb.de> > Tested-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> > Cc: florian@openwrt.org > --- > v2 > Remove the spurius Module.symvers > Really do describe the switch in DT. > --- > arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 62 ++++++++++++++++++++++++++ > arch/arm/mach-kirkwood/Kconfig | 7 --- > arch/arm/mach-kirkwood/Makefile | 1 - > arch/arm/mach-kirkwood/board-dt.c | 3 -- > arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c | 50 --------------------- > arch/arm/mach-kirkwood/common.h | 7 --- > 6 files changed, 62 insertions(+), 68 deletions(-) > delete mode 100644 arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c You know, I think this is the last time we'll have to tie code changes and dts file changes together... :) thx, Jason. > diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts > index dc86429756d7..2cb0dc529165 100644 > --- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts > +++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts > @@ -122,4 +122,66 @@ > gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; > }; > }; > + > + dsa@0 { > + compatible = "marvell,dsa"; > + #address-cells = <2>; > + #size-cells = <0>; > + > + dsa,ethernet = <ð0>; > + dsa,mii-bus = <ðphy0>; > + > + switch@0 { > + #address-cells = <1>; > + #size-cells = <0>; > + reg = <0 0>; /* MDIO address 0, switch 0 in tree */ > + > + port@0 { > + reg = <0>; > + label = "lan1"; > + }; > + > + port@1 { > + reg = <1>; > + label = "lan2"; > + }; > + > + port@2 { > + reg = <2>; > + label = "lan3"; > + }; > + > + port@3 { > + reg = <3>; > + label = "lan4"; > + }; > + > + port@4 { > + reg = <4>; > + label = "wan"; > + }; > + > + port@5 { > + reg = <5>; > + label = "cpu"; > + }; > + }; > + }; > +}; > + > +&mdio { > + status = "okay"; > + > + ethphy0: ethernet-phy@ff { > + reg = <0xff>; /* No phy attached */ > + speed = <1000>; > + duplex = <1>; > + }; > +}; > + > +ð0 { > + status = "okay"; > + ethernet0-port@0 { > + phy-handle = <ðphy0>; > + }; > }; > diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig > index fe8319ad3158..df4b26340ae4 100644 > --- a/arch/arm/mach-kirkwood/Kconfig > +++ b/arch/arm/mach-kirkwood/Kconfig > @@ -106,13 +106,6 @@ config ARCH_KIRKWOOD_DT > Say 'Y' here if you want your kernel to support the > Marvell Kirkwood using flattened device tree. > > -config MACH_MV88F6281GTW_GE_DT > - bool "Marvell 88F6281 GTW GE Board (Flattened Device Tree)" > - depends on ARCH_KIRKWOOD_DT > - help > - Say 'Y' here if you want your kernel to support the > - Marvell 88F6281 GTW GE Board (Flattened Device Tree). > - > endmenu > > endif > diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile > index 144b51102939..dc22bf5b21ed 100644 > --- a/arch/arm/mach-kirkwood/Makefile > +++ b/arch/arm/mach-kirkwood/Makefile > @@ -13,4 +13,3 @@ obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o > obj-$(CONFIG_MACH_TS41X) += ts41x-setup.o tsx1x-common.o > > obj-$(CONFIG_ARCH_KIRKWOOD_DT) += board-dt.o > -obj-$(CONFIG_MACH_MV88F6281GTW_GE_DT) += board-mv88f6281gtw_ge.o > diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c > index ceffdc8ffbbd..e74b31aa9736 100644 > --- a/arch/arm/mach-kirkwood/board-dt.c > +++ b/arch/arm/mach-kirkwood/board-dt.c > @@ -131,9 +131,6 @@ static void __init kirkwood_dt_init(void) > kexec_reinit = kirkwood_enable_pcie; > #endif > > - if (of_machine_is_compatible("marvell,mv88f6281gtw-ge")) > - mv88f6281gtw_ge_init(); > - > of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); > } > > diff --git a/arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c b/arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c > deleted file mode 100644 > index ee5eea678c11..000000000000 > --- a/arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c > +++ /dev/null > @@ -1,50 +0,0 @@ > -/* > - * arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c > - * > - * Marvell 88F6281 GTW GE Board Setup > - * > - * 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. > - */ > - > -#include <linux/kernel.h> > -#include <linux/init.h> > -#include <linux/platform_device.h> > -#include <linux/irq.h> > -#include <linux/timer.h> > -#include <linux/mv643xx_eth.h> > -#include <linux/ethtool.h> > -#include <linux/gpio.h> > -#include <net/dsa.h> > -#include <asm/mach-types.h> > -#include <asm/mach/arch.h> > -#include <asm/mach/pci.h> > -#include <mach/kirkwood.h> > -#include "common.h" > - > -static struct mv643xx_eth_platform_data mv88f6281gtw_ge_ge00_data = { > - .phy_addr = MV643XX_ETH_PHY_NONE, > - .speed = SPEED_1000, > - .duplex = DUPLEX_FULL, > -}; > - > -static struct dsa_chip_data mv88f6281gtw_ge_switch_chip_data = { > - .port_names[0] = "lan1", > - .port_names[1] = "lan2", > - .port_names[2] = "lan3", > - .port_names[3] = "lan4", > - .port_names[4] = "wan", > - .port_names[5] = "cpu", > -}; > - > -static struct dsa_platform_data mv88f6281gtw_ge_switch_plat_data = { > - .nr_chips = 1, > - .chip = &mv88f6281gtw_ge_switch_chip_data, > -}; > - > -void __init mv88f6281gtw_ge_init(void) > -{ > - kirkwood_ge00_init(&mv88f6281gtw_ge_ge00_data); > - kirkwood_ge00_switch_init(&mv88f6281gtw_ge_switch_plat_data, NO_IRQ); > -} > diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h > index 1296de94febf..832a4e2ab8d7 100644 > --- a/arch/arm/mach-kirkwood/common.h > +++ b/arch/arm/mach-kirkwood/common.h > @@ -58,13 +58,6 @@ void kirkwood_cpufreq_init(void); > void kirkwood_restart(enum reboot_mode, const char *); > void kirkwood_clk_init(void); > > -/* board init functions for boards not fully converted to fdt */ > -#ifdef CONFIG_MACH_MV88F6281GTW_GE_DT > -void mv88f6281gtw_ge_init(void); > -#else > -static inline void mv88f6281gtw_ge_init(void) {}; > -#endif > - > /* early init functions not converted to fdt yet */ > char *kirkwood_id(void); > void kirkwood_l2_init(void); > -- > 1.8.5.3 >
On Sat, Feb 22, 2014 at 02:50:16PM -0500, Jason Cooper wrote: > On Sat, Feb 22, 2014 at 08:14:45PM +0100, Andrew Lunn wrote: > > The mv88f6281gtw_ge has a ethernet switch connected to the ethernet > > port of the SoC. Convert the platform device instantiation to a DT > > instantiation. > > > > Signed-off-by: Andrew Lunn <andrew@lunn.ch> > > Acked-by: Arnd Bergmann <arnd@arndb.de> > > Tested-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> > > Cc: florian@openwrt.org > > --- > > v2 > > Remove the spurius Module.symvers > > Really do describe the switch in DT. > > --- > > arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 62 ++++++++++++++++++++++++++ > > arch/arm/mach-kirkwood/Kconfig | 7 --- > > arch/arm/mach-kirkwood/Makefile | 1 - > > arch/arm/mach-kirkwood/board-dt.c | 3 -- > > arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c | 50 --------------------- > > arch/arm/mach-kirkwood/common.h | 7 --- > > 6 files changed, 62 insertions(+), 68 deletions(-) > > delete mode 100644 arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c > > You know, I think this is the last time we'll have to tie code changes > and dts file changes together... Humm, if we part convert T5325 and OpenRD it won't be. Andrew
On Sat, Feb 22, 2014 at 09:20:31PM +0100, Andrew Lunn wrote: > On Sat, Feb 22, 2014 at 02:50:16PM -0500, Jason Cooper wrote: > > On Sat, Feb 22, 2014 at 08:14:45PM +0100, Andrew Lunn wrote: > > > The mv88f6281gtw_ge has a ethernet switch connected to the ethernet > > > port of the SoC. Convert the platform device instantiation to a DT > > > instantiation. > > > > > > Signed-off-by: Andrew Lunn <andrew@lunn.ch> > > > Acked-by: Arnd Bergmann <arnd@arndb.de> > > > Tested-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> > > > Cc: florian@openwrt.org > > > --- > > > v2 > > > Remove the spurius Module.symvers > > > Really do describe the switch in DT. > > > --- > > > arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 62 ++++++++++++++++++++++++++ > > > arch/arm/mach-kirkwood/Kconfig | 7 --- > > > arch/arm/mach-kirkwood/Makefile | 1 - > > > arch/arm/mach-kirkwood/board-dt.c | 3 -- > > > arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c | 50 --------------------- > > > arch/arm/mach-kirkwood/common.h | 7 --- > > > 6 files changed, 62 insertions(+), 68 deletions(-) > > > delete mode 100644 arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c > > > > You know, I think this is the last time we'll have to tie code changes > > and dts file changes together... > > Humm, if we part convert T5325 and OpenRD it won't be. Depends on how critical we think audio and leds are to those boards... thx, Jason.
diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts index dc86429756d7..2cb0dc529165 100644 --- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts +++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts @@ -122,4 +122,66 @@ gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; }; }; + + dsa@0 { + compatible = "marvell,dsa"; + #address-cells = <2>; + #size-cells = <0>; + + dsa,ethernet = <ð0>; + dsa,mii-bus = <ðphy0>; + + switch@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0 0>; /* MDIO address 0, switch 0 in tree */ + + port@0 { + reg = <0>; + label = "lan1"; + }; + + port@1 { + reg = <1>; + label = "lan2"; + }; + + port@2 { + reg = <2>; + label = "lan3"; + }; + + port@3 { + reg = <3>; + label = "lan4"; + }; + + port@4 { + reg = <4>; + label = "wan"; + }; + + port@5 { + reg = <5>; + label = "cpu"; + }; + }; + }; +}; + +&mdio { + status = "okay"; + + ethphy0: ethernet-phy@ff { + reg = <0xff>; /* No phy attached */ + speed = <1000>; + duplex = <1>; + }; +}; + +ð0 { + status = "okay"; + ethernet0-port@0 { + phy-handle = <ðphy0>; + }; }; diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig index fe8319ad3158..df4b26340ae4 100644 --- a/arch/arm/mach-kirkwood/Kconfig +++ b/arch/arm/mach-kirkwood/Kconfig @@ -106,13 +106,6 @@ config ARCH_KIRKWOOD_DT Say 'Y' here if you want your kernel to support the Marvell Kirkwood using flattened device tree. -config MACH_MV88F6281GTW_GE_DT - bool "Marvell 88F6281 GTW GE Board (Flattened Device Tree)" - depends on ARCH_KIRKWOOD_DT - help - Say 'Y' here if you want your kernel to support the - Marvell 88F6281 GTW GE Board (Flattened Device Tree). - endmenu endif diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile index 144b51102939..dc22bf5b21ed 100644 --- a/arch/arm/mach-kirkwood/Makefile +++ b/arch/arm/mach-kirkwood/Makefile @@ -13,4 +13,3 @@ obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o obj-$(CONFIG_MACH_TS41X) += ts41x-setup.o tsx1x-common.o obj-$(CONFIG_ARCH_KIRKWOOD_DT) += board-dt.o -obj-$(CONFIG_MACH_MV88F6281GTW_GE_DT) += board-mv88f6281gtw_ge.o diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c index ceffdc8ffbbd..e74b31aa9736 100644 --- a/arch/arm/mach-kirkwood/board-dt.c +++ b/arch/arm/mach-kirkwood/board-dt.c @@ -131,9 +131,6 @@ static void __init kirkwood_dt_init(void) kexec_reinit = kirkwood_enable_pcie; #endif - if (of_machine_is_compatible("marvell,mv88f6281gtw-ge")) - mv88f6281gtw_ge_init(); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); } diff --git a/arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c b/arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c deleted file mode 100644 index ee5eea678c11..000000000000 --- a/arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c +++ /dev/null @@ -1,50 +0,0 @@ -/* - * arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c - * - * Marvell 88F6281 GTW GE Board Setup - * - * 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. - */ - -#include <linux/kernel.h> -#include <linux/init.h> -#include <linux/platform_device.h> -#include <linux/irq.h> -#include <linux/timer.h> -#include <linux/mv643xx_eth.h> -#include <linux/ethtool.h> -#include <linux/gpio.h> -#include <net/dsa.h> -#include <asm/mach-types.h> -#include <asm/mach/arch.h> -#include <asm/mach/pci.h> -#include <mach/kirkwood.h> -#include "common.h" - -static struct mv643xx_eth_platform_data mv88f6281gtw_ge_ge00_data = { - .phy_addr = MV643XX_ETH_PHY_NONE, - .speed = SPEED_1000, - .duplex = DUPLEX_FULL, -}; - -static struct dsa_chip_data mv88f6281gtw_ge_switch_chip_data = { - .port_names[0] = "lan1", - .port_names[1] = "lan2", - .port_names[2] = "lan3", - .port_names[3] = "lan4", - .port_names[4] = "wan", - .port_names[5] = "cpu", -}; - -static struct dsa_platform_data mv88f6281gtw_ge_switch_plat_data = { - .nr_chips = 1, - .chip = &mv88f6281gtw_ge_switch_chip_data, -}; - -void __init mv88f6281gtw_ge_init(void) -{ - kirkwood_ge00_init(&mv88f6281gtw_ge_ge00_data); - kirkwood_ge00_switch_init(&mv88f6281gtw_ge_switch_plat_data, NO_IRQ); -} diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h index 1296de94febf..832a4e2ab8d7 100644 --- a/arch/arm/mach-kirkwood/common.h +++ b/arch/arm/mach-kirkwood/common.h @@ -58,13 +58,6 @@ void kirkwood_cpufreq_init(void); void kirkwood_restart(enum reboot_mode, const char *); void kirkwood_clk_init(void); -/* board init functions for boards not fully converted to fdt */ -#ifdef CONFIG_MACH_MV88F6281GTW_GE_DT -void mv88f6281gtw_ge_init(void); -#else -static inline void mv88f6281gtw_ge_init(void) {}; -#endif - /* early init functions not converted to fdt yet */ char *kirkwood_id(void); void kirkwood_l2_init(void);