[6/6] DT: Convert all kirkwood boards with mv643xx that use DT

Message ID	1343661359-10150-7-git-send-email-ian.molton@codethink.co.uk (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> From: Ian Molton <ian.molton@codethink.co.uk> To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 6/6] DT: Convert all kirkwood boards with mv643xx that use DT Date: Mon, 30 Jul 2012 16:15:59 +0100 Message-Id: <1343661359-10150-7-git-send-email-ian.molton@codethink.co.uk> In-Reply-To: <1343661359-10150-1-git-send-email-ian.molton@codethink.co.uk> References: <1343661359-10150-1-git-send-email-ian.molton@codethink.co.uk> Cc: thomas.petazzoni@free-electrons.com, andrew@lunn.ch, ben.dooks@codethink.co.uk, Ian Molton <ian.molton@codethink.co.uk>, arnd@arndb.de Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org

diff --git a/arch/arm/boot/dts/kirkwood-dnskw.dtsi b/arch/arm/boot/dts/kirkwood-dnskw.dtsi index 7408655..466a7c6 100644 --- a/arch/arm/boot/dts/kirkwood-dnskw.dtsi +++ b/arch/arm/boot/dts/kirkwood-dnskw.dtsi @@ -65,5 +65,17 @@ reg = <0x7b00000 0x500000>; }; }; + + smi0: mdio@72000 { + status = "ok"; + }; + + egiga0 { + compatible = "marvell,mv643xx"; + mdio = <&smi0>; + port_number = <0>; + phy_addr = <0x88>; + interrupts = <11>; + }; }; }; diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts index 26e281f..83ada56 100644 --- a/arch/arm/boot/dts/kirkwood-dreamplug.dts +++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts @@ -53,6 +53,30 @@ status = "okay"; nr-ports = <1>; }; + + smi0: mdio@72000 { + status = "ok"; + }; + + smi1: mdio@76000 { + status = "ok"; + }; + + egiga0 { + compatible = "marvell,mv643xx"; + mdio = <&smi0>; + port_number = <0>; + phy_addr = <0x80>; + interrupts = <11>; + }; + + egiga1 { + compatible = "marvell,mv643xx"; + mdio = <&smi1>; + port_number = <0>; + phy_addr = <0x81>; + interrupts = <15>; + }; }; gpio-leds { diff --git a/arch/arm/boot/dts/kirkwood-goflexnet.dts b/arch/arm/boot/dts/kirkwood-goflexnet.dts index 7c8238f..4346303 100644 --- a/arch/arm/boot/dts/kirkwood-goflexnet.dts +++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts @@ -50,6 +50,17 @@ nr-ports = <2>; }; + smi0: mdio@72000 { + status = "ok"; + }; + + egiga0 { + compatible = "marvell,mv643xx"; + mdio = <&smi0>; + port_number = <0>; + phy_addr = <0x80>; + interrupts = <11>; + }; }; gpio-leds { compatible = "gpio-leds"; diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts index 66794ed..0d0a0e6 100644 --- a/arch/arm/boot/dts/kirkwood-ib62x0.dts +++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts @@ -45,6 +45,19 @@ }; }; + + smi0: mdio@72000 { + status = "ok"; + }; + + egiga0 { + compatible = "marvell,mv643xx"; + mdio = <&smi0>; + port_number = <0>; + phy_addr = <0x88>; + interrupts = <11>; + }; + }; gpio_keys { diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts index 52d9470..aef754d 100644 --- a/arch/arm/boot/dts/kirkwood-iconnect.dts +++ b/arch/arm/boot/dts/kirkwood-iconnect.dts @@ -30,6 +30,19 @@ clock-frequency = <200000000>; status = "ok"; }; + + smi0: mdio@72000 { + status = "ok"; + }; + + egiga0 { + compatible = "marvell,mv643xx"; + mdio = <&smi0>; + port_number = <0>; + phy_addr = <0x8b>; + interrupts = <11>; + }; + }; gpio-leds { compatible = "gpio-leds"; diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi index 8ac51c0..ae48bfb 100644 --- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi +++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi @@ -40,6 +40,29 @@ }; }; }; + smi0: mdio@72000 { + status = "ok"; + }; + + smi1: mdio@76000 { + status = "ok"; + }; + + egiga0 { + compatible = "marvell,mv643xx"; + mdio = <&smi0>; + port_number = <0>; + phy_addr = <0x80>; + interrupts = <11>; + }; + + egiga1 { + compatible = "marvell,mv643xx"; + mdio = <&smi1>; + port_number = <0>; + phy_addr = <0x88>; + interrupts = <15>; + }; }; gpio_keys { diff --git a/arch/arm/boot/dts/kirkwood-ts219-6281.dts b/arch/arm/boot/dts/kirkwood-ts219-6281.dts index ccbf327..6813321 100644 --- a/arch/arm/boot/dts/kirkwood-ts219-6281.dts +++ b/arch/arm/boot/dts/kirkwood-ts219-6281.dts @@ -3,6 +3,15 @@ /include/ "kirkwood-ts219.dtsi" / { + ocp@f1000000 { + egiga0 { + compatible = "marvell,mv643xx"; + mdio = <&smi0>; + port_number = <0>; + phy_addr = <0x88>; + interrupts = <11>; + }; + }; gpio_keys { compatible = "gpio-keys"; #address-cells = <1>; @@ -18,4 +27,4 @@ gpios = <&gpio0 16 1>; }; }; -}; \ No newline at end of file +}; diff --git a/arch/arm/boot/dts/kirkwood-ts219-6282.dts b/arch/arm/boot/dts/kirkwood-ts219-6282.dts index fbe9932..af68a71 100644 --- a/arch/arm/boot/dts/kirkwood-ts219-6282.dts +++ b/arch/arm/boot/dts/kirkwood-ts219-6282.dts @@ -3,6 +3,15 @@ /include/ "kirkwood-ts219.dtsi" / { + ocp@f1000000 { + egiga0 { + compatible = "marvell,mv643xx"; + mdio = <&smi0>; + port_number = <0>; + phy_addr = <0x80>; + interrupts = <11>; + }; + }; gpio_keys { compatible = "gpio-keys"; #address-cells = <1>; @@ -18,4 +27,4 @@ gpios = <&gpio1 5 1>; }; }; -}; \ No newline at end of file +}; diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi index 64ea27c..06caf41 100644 --- a/arch/arm/boot/dts/kirkwood-ts219.dtsi +++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi @@ -74,5 +74,8 @@ status = "okay"; nr-ports = <2>; }; + smi0: mdio@72000 { + status = "ok"; + }; }; }; diff --git a/arch/arm/mach-kirkwood/board-dnskw.c b/arch/arm/mach-kirkwood/board-dnskw.c index 4ab3506..4d8216b 100644 --- a/arch/arm/mach-kirkwood/board-dnskw.c +++ b/arch/arm/mach-kirkwood/board-dnskw.c @@ -15,7 +15,6 @@ #include <linux/init.h> #include <linux/platform_device.h> #include <linux/ata_platform.h> -#include <linux/mv643xx_eth.h> #include <linux/of.h> #include <linux/gpio.h> #include <linux/input.h> @@ -29,10 +28,6 @@ #include "common.h" #include "mpp.h" -static struct mv643xx_eth_platform_data dnskw_ge00_data = { - .phy_addr = MV643XX_ETH_PHY_ADDR(8), -}; - static unsigned int dnskw_mpp_config[] __initdata = { MPP13_UART1_TXD, /* Custom ... */ MPP14_UART1_RXD, /* ... Controller (DNS-320 only) */ @@ -112,7 +107,7 @@ void __init dnskw_init(void) kirkwood_mpp_conf(dnskw_mpp_config); kirkwood_ehci_init(); - kirkwood_ge00_init(&dnskw_ge00_data); + kirkwood_ge00_init(NULL); platform_device_register(&dnskw_fan_device); diff --git a/arch/arm/mach-kirkwood/board-dreamplug.c b/arch/arm/mach-kirkwood/board-dreamplug.c index aeb234d..b97a112 100644 --- a/arch/arm/mach-kirkwood/board-dreamplug.c +++ b/arch/arm/mach-kirkwood/board-dreamplug.c @@ -15,7 +15,6 @@ #include <linux/init.h> #include <linux/platform_device.h> #include <linux/ata_platform.h> -#include <linux/mv643xx_eth.h> #include <linux/of.h> #include <linux/of_address.h> #include <linux/of_fdt.h> @@ -34,14 +33,6 @@ #include "common.h" #include "mpp.h" -static struct mv643xx_eth_platform_data dreamplug_ge00_data = { - .phy_addr = MV643XX_ETH_PHY_ADDR(0), -}; - -static struct mv643xx_eth_platform_data dreamplug_ge01_data = { - .phy_addr = MV643XX_ETH_PHY_ADDR(1), -}; - static struct mvsdio_platform_data dreamplug_mvsdio_data = { /* unfortunately the CD signal has not been connected */ }; @@ -65,7 +56,7 @@ void __init dreamplug_init(void) kirkwood_mpp_conf(dreamplug_mpp_config); kirkwood_ehci_init(); - kirkwood_ge00_init(&dreamplug_ge00_data); - kirkwood_ge01_init(&dreamplug_ge01_data); + kirkwood_ge00_init(NULL); + kirkwood_ge01_init(NULL); kirkwood_sdio_init(&dreamplug_mvsdio_data); } diff --git a/arch/arm/mach-kirkwood/board-goflexnet.c b/arch/arm/mach-kirkwood/board-goflexnet.c index 413e2c8..be7437d 100644 --- a/arch/arm/mach-kirkwood/board-goflexnet.c +++ b/arch/arm/mach-kirkwood/board-goflexnet.c @@ -20,7 +20,6 @@ #include <linux/init.h> #include <linux/platform_device.h> #include <linux/ata_platform.h> -#include <linux/mv643xx_eth.h> #include <linux/of.h> #include <linux/of_address.h> #include <linux/of_fdt.h> @@ -36,10 +35,6 @@ #include "common.h" #include "mpp.h" -static struct mv643xx_eth_platform_data goflexnet_ge00_data = { - .phy_addr = MV643XX_ETH_PHY_ADDR(0), -}; - static unsigned int goflexnet_mpp_config[] __initdata = { MPP29_GPIO, /* USB Power Enable */ MPP47_GPIO, /* LED Orange */ @@ -67,5 +62,5 @@ void __init goflexnet_init(void) pr_err("can't setup GPIO 29 (USB Power Enable)\n"); kirkwood_ehci_init(); - kirkwood_ge00_init(&goflexnet_ge00_data); + kirkwood_ge00_init(NULL); } diff --git a/arch/arm/mach-kirkwood/board-ib62x0.c b/arch/arm/mach-kirkwood/board-ib62x0.c index cfc47f8..0a29183 100644 --- a/arch/arm/mach-kirkwood/board-ib62x0.c +++ b/arch/arm/mach-kirkwood/board-ib62x0.c @@ -16,7 +16,6 @@ #include <linux/platform_device.h> #include <linux/mtd/partitions.h> #include <linux/ata_platform.h> -#include <linux/mv643xx_eth.h> #include <linux/gpio.h> #include <linux/input.h> #include <asm/mach-types.h> @@ -27,10 +26,6 @@ #define IB62X0_GPIO_POWER_OFF 24 -static struct mv643xx_eth_platform_data ib62x0_ge00_data = { - .phy_addr = MV643XX_ETH_PHY_ADDR(8), -}; - static unsigned int ib62x0_mpp_config[] __initdata = { MPP0_NF_IO2, MPP1_NF_IO3, @@ -62,7 +57,7 @@ void __init ib62x0_init(void) kirkwood_mpp_conf(ib62x0_mpp_config); kirkwood_ehci_init(); - kirkwood_ge00_init(&ib62x0_ge00_data); + kirkwood_ge00_init(NULL); if (gpio_request(IB62X0_GPIO_POWER_OFF, "ib62x0:power:off") == 0 && gpio_direction_output(IB62X0_GPIO_POWER_OFF, 0) == 0) pm_power_off = ib62x0_power_off; diff --git a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/board-iconnect.c index d7a9198..220f0d4 100644 --- a/arch/arm/mach-kirkwood/board-iconnect.c +++ b/arch/arm/mach-kirkwood/board-iconnect.c @@ -17,7 +17,6 @@ #include <linux/of_irq.h> #include <linux/of_platform.h> #include <linux/mtd/partitions.h> -#include <linux/mv643xx_eth.h> #include <linux/gpio.h> #include <linux/input.h> #include <linux/gpio_keys.h> @@ -26,10 +25,6 @@ #include "common.h" #include "mpp.h" -static struct mv643xx_eth_platform_data iconnect_ge00_data = { - .phy_addr = MV643XX_ETH_PHY_ADDR(11), -}; - static unsigned int iconnect_mpp_config[] __initdata = { MPP12_GPIO, MPP35_GPIO, @@ -92,7 +87,7 @@ void __init iconnect_init(void) kirkwood_nand_init(ARRAY_AND_SIZE(iconnect_nand_parts), 25); kirkwood_ehci_init(); - kirkwood_ge00_init(&iconnect_ge00_data); + kirkwood_ge00_init(NULL); platform_device_register(&iconnect_button_device); } diff --git a/arch/arm/mach-kirkwood/board-lsxl.c b/arch/arm/mach-kirkwood/board-lsxl.c index 83d8975..60331d1 100644 --- a/arch/arm/mach-kirkwood/board-lsxl.c +++ b/arch/arm/mach-kirkwood/board-lsxl.c @@ -18,7 +18,6 @@ #include <linux/ata_platform.h> #include <linux/spi/flash.h> #include <linux/spi/spi.h> -#include <linux/mv643xx_eth.h> #include <linux/gpio.h> #include <linux/gpio-fan.h> #include <linux/input.h> @@ -28,14 +27,6 @@ #include "common.h" #include "mpp.h" -static struct mv643xx_eth_platform_data lsxl_ge00_data = { - .phy_addr = MV643XX_ETH_PHY_ADDR(0), -}; - -static struct mv643xx_eth_platform_data lsxl_ge01_data = { - .phy_addr = MV643XX_ETH_PHY_ADDR(8), -}; - static unsigned int lsxl_mpp_config[] __initdata = { MPP10_GPO, /* HDD Power Enable */ MPP11_GPIO, /* USB Vbus Enable */ @@ -126,8 +117,8 @@ void __init lsxl_init(void) gpio_set_value(LSXL_GPIO_HDD_POWER, 1); kirkwood_ehci_init(); - kirkwood_ge00_init(&lsxl_ge00_data); - kirkwood_ge01_init(&lsxl_ge01_data); + kirkwood_ge00_init(NULL); + kirkwood_ge01_init(NULL); platform_device_register(&lsxl_fan_device); /* register power-off method */ diff --git a/arch/arm/mach-kirkwood/board-ts219.c b/arch/arm/mach-kirkwood/board-ts219.c index 1750e68..7e7fe6c 100644 --- a/arch/arm/mach-kirkwood/board-ts219.c +++ b/arch/arm/mach-kirkwood/board-ts219.c @@ -18,7 +18,6 @@ #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h> -#include <linux/mv643xx_eth.h> #include <linux/ata_platform.h> #include <linux/gpio_keys.h> #include <linux/input.h> @@ -29,10 +28,6 @@ #include "mpp.h" #include "tsx1x-common.h" -static struct mv643xx_eth_platform_data qnap_ts219_ge00_data = { - .phy_addr = MV643XX_ETH_PHY_ADDR(8), -}; - static unsigned int qnap_ts219_mpp_config[] __initdata = { MPP0_SPI_SCn, MPP1_SPI_MOSI, @@ -62,10 +57,7 @@ void __init qnap_dt_ts219_init(void) kirkwood_mpp_conf(qnap_ts219_mpp_config); kirkwood_pcie_id(&dev, &rev); - if (dev == MV88F6282_DEV_ID) - qnap_ts219_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0); - - kirkwood_ge00_init(&qnap_ts219_ge00_data); + kirkwood_ge00_init(NULL); kirkwood_ehci_init(); pm_power_off = qnap_tsx1x_power_off;

[6/6] DT: Convert all kirkwood boards with mv643xx that use DT

Commit Message

Patch