diff options
author | Martin Michlmayr <tbm@cyrius.com> | 2010-12-06 16:53:16 -0500 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2010-12-07 13:50:14 -0500 |
commit | ce56d169976488e888878eed5f1bc304cf116c43 (patch) | |
tree | e1952b4201074ce6eb66c911a430bfd11c256642 /arch/arm/mach-kirkwood/ts41x-setup.c | |
parent | 4bba1c34e0a70d0db2506e1b68f69d7edc8afd78 (diff) |
Kirkwood: Add support for 6282 based QNAP devices
Add support for the QNAP NAS devices based on Marvell's 6282 Kirkwood
chip (TS-119P+, TS-219P+ and TS-419P+). The differences to the 6281
based devices are:
- Ethernet PHY address
- GPIOs used for buttons (TS-119P+/TS-219P+)
Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Acked-by: Saeed Bishara <saeed.bishara@gmail.com>
Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
Diffstat (limited to 'arch/arm/mach-kirkwood/ts41x-setup.c')
-rw-r--r-- | arch/arm/mach-kirkwood/ts41x-setup.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/ts41x-setup.c b/arch/arm/mach-kirkwood/ts41x-setup.c index 3587a281d993..9a44029915e2 100644 --- a/arch/arm/mach-kirkwood/ts41x-setup.c +++ b/arch/arm/mach-kirkwood/ts41x-setup.c | |||
@@ -119,6 +119,8 @@ static unsigned int qnap_ts41x_mpp_config[] __initdata = { | |||
119 | 119 | ||
120 | static void __init qnap_ts41x_init(void) | 120 | static void __init qnap_ts41x_init(void) |
121 | { | 121 | { |
122 | u32 dev, rev; | ||
123 | |||
122 | /* | 124 | /* |
123 | * Basic setup. Needs to be called early. | 125 | * Basic setup. Needs to be called early. |
124 | */ | 126 | */ |
@@ -130,8 +132,15 @@ static void __init qnap_ts41x_init(void) | |||
130 | qnap_tsx1x_register_flash(); | 132 | qnap_tsx1x_register_flash(); |
131 | kirkwood_i2c_init(); | 133 | kirkwood_i2c_init(); |
132 | i2c_register_board_info(0, &qnap_ts41x_i2c_rtc, 1); | 134 | i2c_register_board_info(0, &qnap_ts41x_i2c_rtc, 1); |
135 | |||
136 | kirkwood_pcie_id(&dev, &rev); | ||
137 | if (dev == MV88F6282_DEV_ID) { | ||
138 | qnap_ts41x_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0); | ||
139 | qnap_ts41x_ge01_data.phy_addr = MV643XX_ETH_PHY_ADDR(1); | ||
140 | } | ||
133 | kirkwood_ge00_init(&qnap_ts41x_ge00_data); | 141 | kirkwood_ge00_init(&qnap_ts41x_ge00_data); |
134 | kirkwood_ge01_init(&qnap_ts41x_ge01_data); | 142 | kirkwood_ge01_init(&qnap_ts41x_ge01_data); |
143 | |||
135 | kirkwood_sata_init(&qnap_ts41x_sata_data); | 144 | kirkwood_sata_init(&qnap_ts41x_sata_data); |
136 | kirkwood_ehci_init(); | 145 | kirkwood_ehci_init(); |
137 | platform_device_register(&qnap_ts41x_button_device); | 146 | platform_device_register(&qnap_ts41x_button_device); |