android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: Kirkwood: Use DT to configure SATA device.

Browse Source 
Convert boards using DT, but the old way of configuring SATA to now
use properties in there DT file.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Simon Baatz <gmbnomis@gmail.com>
This commit is contained in:
Andrew Lunn 2012-06-10 16:58:11 +02:00
parent be2aa95675
commit 2cef1a2853
9 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/boot/dts/kirkwood-dns320.dts
View File

@ -26,6 +26,11 @@ serial@12100 {
status = "okay"; status = "okay";
}; };
sata@80000 {
status = "okay";
nr-ports = <2>;
};
nand@3000000 { nand@3000000 {
status = "okay"; status = "okay";

5
arch/arm/boot/dts/kirkwood-dns325.dts
View File

@ -21,6 +21,11 @@ serial@12000 {
status = "okay"; status = "okay";
}; };
sata@80000 {
status = "okay";
nr-ports = <2>;
};
nand@3000000 { nand@3000000 {
status = "okay"; status = "okay";

5
arch/arm/boot/dts/kirkwood-dreamplug.dts
View File

@ -48,6 +48,11 @@ partition@180000 {
}; };
}; };
}; };
sata@80000 {
status = "okay";
nr-ports = <1>;
};
}; };
}; };

5
arch/arm/boot/dts/kirkwood-ib62x0.dts
View File

@ -21,6 +21,11 @@ serial@12000 {
status = "okay"; status = "okay";
}; };
sata@80000 {
status = "okay";
nr-ports = <2>;
};
nand@3000000 { nand@3000000 {
status = "okay"; status = "okay";

4
arch/arm/boot/dts/kirkwood-ts219.dtsi
View File

@ -70,5 +70,9 @@ partition@000c0000 {
}; };
}; };
}; };
sata@80000 {
status = "okay";
nr-ports = <2>;
};
}; };
}; };

5
arch/arm/mach-kirkwood/board-dnskw.c
View File

@ -35,10 +35,6 @@ static struct mv643xx_eth_platform_data dnskw_ge00_data = {
.phy_addr = MV643XX_ETH_PHY_ADDR(8), .phy_addr = MV643XX_ETH_PHY_ADDR(8),
}; };
static struct mv_sata_platform_data dnskw_sata_data = {
.n_ports = 2,
};
static unsigned int dnskw_mpp_config[] __initdata = { static unsigned int dnskw_mpp_config[] __initdata = {
MPP13_UART1_TXD, /* Custom ... */ MPP13_UART1_TXD, /* Custom ... */
MPP14_UART1_RXD, /* ... Controller (DNS-320 only) */ MPP14_UART1_RXD, /* ... Controller (DNS-320 only) */
@ -245,7 +241,6 @@ void __init dnskw_init(void)
kirkwood_ehci_init(); kirkwood_ehci_init();
kirkwood_ge00_init(&dnskw_ge00_data); kirkwood_ge00_init(&dnskw_ge00_data);
kirkwood_sata_init(&dnskw_sata_data);
kirkwood_i2c_init(); kirkwood_i2c_init();
platform_device_register(&dnskw_button_device); platform_device_register(&dnskw_button_device);

5
arch/arm/mach-kirkwood/board-dreamplug.c
View File

@ -43,10 +43,6 @@ static struct mv643xx_eth_platform_data dreamplug_ge01_data = {
.phy_addr = MV643XX_ETH_PHY_ADDR(1), .phy_addr = MV643XX_ETH_PHY_ADDR(1),
}; };
static struct mv_sata_platform_data dreamplug_sata_data = {
.n_ports = 1,
};
static struct mvsdio_platform_data dreamplug_mvsdio_data = { static struct mvsdio_platform_data dreamplug_mvsdio_data = {
/* unfortunately the CD signal has not been connected */ /* unfortunately the CD signal has not been connected */
}; };
@ -103,7 +99,6 @@ void __init dreamplug_init(void)
kirkwood_ehci_init(); kirkwood_ehci_init();
kirkwood_ge00_init(&dreamplug_ge00_data); kirkwood_ge00_init(&dreamplug_ge00_data);
kirkwood_ge01_init(&dreamplug_ge01_data); kirkwood_ge01_init(&dreamplug_ge01_data);
kirkwood_sata_init(&dreamplug_sata_data);
kirkwood_sdio_init(&dreamplug_mvsdio_data); kirkwood_sdio_init(&dreamplug_mvsdio_data);
platform_device_register(&dreamplug_leds); platform_device_register(&dreamplug_leds);

5
arch/arm/mach-kirkwood/board-ib62x0.c
View File

@ -33,10 +33,6 @@ static struct mv643xx_eth_platform_data ib62x0_ge00_data = {
.phy_addr = MV643XX_ETH_PHY_ADDR(8), .phy_addr = MV643XX_ETH_PHY_ADDR(8),
}; };
static struct mv_sata_platform_data ib62x0_sata_data = {
.n_ports = 2,
};
static unsigned int ib62x0_mpp_config[] __initdata = { static unsigned int ib62x0_mpp_config[] __initdata = {
MPP0_NF_IO2, MPP0_NF_IO2,
MPP1_NF_IO3, MPP1_NF_IO3,
@ -132,7 +128,6 @@ void __init ib62x0_init(void)
kirkwood_ehci_init(); kirkwood_ehci_init();
kirkwood_ge00_init(&ib62x0_ge00_data); kirkwood_ge00_init(&ib62x0_ge00_data);
kirkwood_sata_init(&ib62x0_sata_data);
platform_device_register(&ib62x0_led_device); platform_device_register(&ib62x0_led_device);
platform_device_register(&ib62x0_button_device); platform_device_register(&ib62x0_button_device);
if (gpio_request(IB62X0_GPIO_POWER_OFF, "ib62x0:power:off") == 0 && if (gpio_request(IB62X0_GPIO_POWER_OFF, "ib62x0:power:off") == 0 &&

5
arch/arm/mach-kirkwood/board-ts219.c
View File

@ -33,10 +33,6 @@ static struct mv643xx_eth_platform_data qnap_ts219_ge00_data = {
.phy_addr = MV643XX_ETH_PHY_ADDR(8), .phy_addr = MV643XX_ETH_PHY_ADDR(8),
}; };
static struct mv_sata_platform_data qnap_ts219_sata_data = {
.n_ports = 2,
};
static unsigned int qnap_ts219_mpp_config[] __initdata = { static unsigned int qnap_ts219_mpp_config[] __initdata = {
MPP0_SPI_SCn, MPP0_SPI_SCn,
MPP1_SPI_MOSI, MPP1_SPI_MOSI,
@ -70,7 +66,6 @@ void __init qnap_dt_ts219_init(void)
qnap_ts219_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0); qnap_ts219_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0);
kirkwood_ge00_init(&qnap_ts219_ge00_data); kirkwood_ge00_init(&qnap_ts219_ge00_data);
kirkwood_sata_init(&qnap_ts219_sata_data);
kirkwood_ehci_init(); kirkwood_ehci_init();
pm_power_off = qnap_tsx1x_power_off; pm_power_off = qnap_tsx1x_power_off;