diff options
author | Michael Walle <michael@walle.cc> | 2012-07-17 01:25:55 -0400 |
---|---|---|
committer | Andrew Lunn <andrew@lunn.ch> | 2012-07-27 10:49:10 -0400 |
commit | 4aff38a3db1f63494812834f1fbbdb1f00579c66 (patch) | |
tree | 05b34f783f378d6e9d7c0a9ab0dfccdce6992a0b | |
parent | 5136b2aa622844fcff9fecf1f2c57670b890227f (diff) |
ARM: kirkwood: Add LS-XHL and LS-CHLv2 support
Add support for Buffalo Linkstation LS-XHL and LS-CHLv2 using the device
tree where possible.
Signed-off-by: Michael Walle <michael@walle.cc>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
-rw-r--r-- | arch/arm/boot/dts/kirkwood-lschlv2.dts | 20 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-lsxhl.dts | 20 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-lsxl.dtsi | 95 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/Kconfig | 8 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/Makefile.boot | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/board-dt.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/board-lsxl.c | 135 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/common.h | 6 |
9 files changed, 291 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/kirkwood-lschlv2.dts b/arch/arm/boot/dts/kirkwood-lschlv2.dts new file mode 100644 index 000000000000..37649b58fd91 --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-lschlv2.dts | |||
@@ -0,0 +1,20 @@ | |||
1 | /dts-v1/; | ||
2 | |||
3 | /include/ "kirkwood-lsxl.dtsi" | ||
4 | |||
5 | / { | ||
6 | model = "Buffalo Linkstation LS-CHLv2"; | ||
7 | compatible = "buffalo,lschlv2", "buffalo,lsxl", "mrvl,kirkwood-88f6281", "mrvl,kirkwood"; | ||
8 | |||
9 | memory { | ||
10 | device_type = "memory"; | ||
11 | reg = <0x00000000 0x4000000>; | ||
12 | }; | ||
13 | |||
14 | ocp@f1000000 { | ||
15 | serial@12000 { | ||
16 | clock-frequency = <166666667>; | ||
17 | status = "okay"; | ||
18 | }; | ||
19 | }; | ||
20 | }; | ||
diff --git a/arch/arm/boot/dts/kirkwood-lsxhl.dts b/arch/arm/boot/dts/kirkwood-lsxhl.dts new file mode 100644 index 000000000000..eb3c07149be1 --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-lsxhl.dts | |||
@@ -0,0 +1,20 @@ | |||
1 | /dts-v1/; | ||
2 | |||
3 | /include/ "kirkwood-lsxl.dtsi" | ||
4 | |||
5 | / { | ||
6 | model = "Buffalo Linkstation LS-XHL"; | ||
7 | compatible = "buffalo,lsxhl", "buffalo,lsxl", "mrvl,kirkwood-88f6281", "mrvl,kirkwood"; | ||
8 | |||
9 | memory { | ||
10 | device_type = "memory"; | ||
11 | reg = <0x00000000 0x10000000>; | ||
12 | }; | ||
13 | |||
14 | ocp@f1000000 { | ||
15 | serial@12000 { | ||
16 | clock-frequency = <200000000>; | ||
17 | status = "okay"; | ||
18 | }; | ||
19 | }; | ||
20 | }; | ||
diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi new file mode 100644 index 000000000000..8ac51c08269d --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi | |||
@@ -0,0 +1,95 @@ | |||
1 | /include/ "kirkwood.dtsi" | ||
2 | |||
3 | / { | ||
4 | chosen { | ||
5 | bootargs = "console=ttyS0,115200n8 earlyprintk"; | ||
6 | }; | ||
7 | |||
8 | ocp@f1000000 { | ||
9 | sata@80000 { | ||
10 | status = "okay"; | ||
11 | nr-ports = <1>; | ||
12 | }; | ||
13 | |||
14 | spi@10600 { | ||
15 | status = "okay"; | ||
16 | |||
17 | m25p40@0 { | ||
18 | #address-cells = <1>; | ||
19 | #size-cells = <1>; | ||
20 | compatible = "m25p40"; | ||
21 | reg = <0>; | ||
22 | spi-max-frequency = <25000000>; | ||
23 | mode = <0>; | ||
24 | |||
25 | partition@0 { | ||
26 | reg = <0x0 0x60000>; | ||
27 | label = "uboot"; | ||
28 | read-only; | ||
29 | }; | ||
30 | |||
31 | partition@60000 { | ||
32 | reg = <0x60000 0x10000>; | ||
33 | label = "dtb"; | ||
34 | read-only; | ||
35 | }; | ||
36 | |||
37 | partition@70000 { | ||
38 | reg = <0x70000 0x10000>; | ||
39 | label = "uboot_env"; | ||
40 | }; | ||
41 | }; | ||
42 | }; | ||
43 | }; | ||
44 | |||
45 | gpio_keys { | ||
46 | compatible = "gpio-keys"; | ||
47 | #address-cells = <1>; | ||
48 | #size-cells = <0>; | ||
49 | button@1 { | ||
50 | label = "Function Button"; | ||
51 | linux,code = <132>; | ||
52 | gpios = <&gpio1 9 1>; | ||
53 | }; | ||
54 | button@2 { | ||
55 | label = "Power-on Switch"; | ||
56 | linux,code = <116>; | ||
57 | gpios = <&gpio1 10 1>; | ||
58 | }; | ||
59 | button@3 { | ||
60 | label = "Power-auto Switch"; | ||
61 | linux,code = <142>; | ||
62 | gpios = <&gpio1 11 1>; | ||
63 | }; | ||
64 | }; | ||
65 | |||
66 | gpio_leds { | ||
67 | compatible = "gpio-leds"; | ||
68 | |||
69 | led@1 { | ||
70 | label = "lschlv2:blue:func"; | ||
71 | gpios = <&gpio1 4 1>; | ||
72 | }; | ||
73 | |||
74 | led@2 { | ||
75 | label = "lschlv2:red:alarm"; | ||
76 | gpios = <&gpio1 5 1>; | ||
77 | }; | ||
78 | |||
79 | led@3 { | ||
80 | label = "lschlv2:amber:info"; | ||
81 | gpios = <&gpio1 6 1>; | ||
82 | }; | ||
83 | |||
84 | led@4 { | ||
85 | label = "lschlv2:blue:power"; | ||
86 | gpios = <&gpio1 7 1>; | ||
87 | linux,default-trigger = "default-on"; | ||
88 | }; | ||
89 | |||
90 | led@5 { | ||
91 | label = "lschlv2:red:func"; | ||
92 | gpios = <&gpio1 16 1>; | ||
93 | }; | ||
94 | }; | ||
95 | }; | ||
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig index cb636d05f4f3..ca5c15a4e626 100644 --- a/arch/arm/mach-kirkwood/Kconfig +++ b/arch/arm/mach-kirkwood/Kconfig | |||
@@ -101,6 +101,14 @@ config MACH_GOFLEXNET_DT | |||
101 | Say 'Y' here if you want your kernel to support the | 101 | Say 'Y' here if you want your kernel to support the |
102 | Seagate GoFlex Net (Flattened Device Tree). | 102 | Seagate GoFlex Net (Flattened Device Tree). |
103 | 103 | ||
104 | config MACH_LSXL_DT | ||
105 | bool "Buffalo Linkstation LS-XHL, LS-CHLv2 (Flattened Device Tree)" | ||
106 | select ARCH_KIRKWOOD_DT | ||
107 | help | ||
108 | Say 'Y' here if you want your kernel to support the | ||
109 | Buffalo Linkstation LS-XHL & LS-CHLv2 devices, using | ||
110 | Flattened Device Tree. | ||
111 | |||
104 | config MACH_TS219 | 112 | config MACH_TS219 |
105 | bool "QNAP TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and TS-219P+ Turbo NAS" | 113 | bool "QNAP TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and TS-219P+ Turbo NAS" |
106 | help | 114 | help |
diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile index 7153a24c3024..055c85a1cc46 100644 --- a/arch/arm/mach-kirkwood/Makefile +++ b/arch/arm/mach-kirkwood/Makefile | |||
@@ -27,3 +27,4 @@ obj-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) += board-dnskw.o | |||
27 | obj-$(CONFIG_MACH_IB62X0_DT) += board-ib62x0.o | 27 | obj-$(CONFIG_MACH_IB62X0_DT) += board-ib62x0.o |
28 | obj-$(CONFIG_MACH_TS219_DT) += board-ts219.o tsx1x-common.o | 28 | obj-$(CONFIG_MACH_TS219_DT) += board-ts219.o tsx1x-common.o |
29 | obj-$(CONFIG_MACH_GOFLEXNET_DT) += board-goflexnet.o | 29 | obj-$(CONFIG_MACH_GOFLEXNET_DT) += board-goflexnet.o |
30 | obj-$(CONFIG_MACH_LSXL_DT) += board-lsxl.o | ||
diff --git a/arch/arm/mach-kirkwood/Makefile.boot b/arch/arm/mach-kirkwood/Makefile.boot index c6eba8f114a9..2a576abf409b 100644 --- a/arch/arm/mach-kirkwood/Makefile.boot +++ b/arch/arm/mach-kirkwood/Makefile.boot | |||
@@ -9,3 +9,5 @@ dtb-$(CONFIG_MACH_ICONNECT_DT) += kirkwood-iconnect.dtb | |||
9 | dtb-$(CONFIG_MACH_IB62X0_DT) += kirkwood-ib62x0.dtb | 9 | dtb-$(CONFIG_MACH_IB62X0_DT) += kirkwood-ib62x0.dtb |
10 | dtb-$(CONFIG_MACH_TS219_DT) += kirkwood-qnap-ts219.dtb | 10 | dtb-$(CONFIG_MACH_TS219_DT) += kirkwood-qnap-ts219.dtb |
11 | dtb-$(CONFIG_MACH_GOFLEXNET_DT) += kirkwood-goflexnet.dtb | 11 | dtb-$(CONFIG_MACH_GOFLEXNET_DT) += kirkwood-goflexnet.dtb |
12 | dbt-$(CONFIG_MACH_LSXL_DT) += kirkwood-lschlv2.dtb | ||
13 | dbt-$(CONFIG_MACH_LSXL_DT) += kirkwood-lsxhl.dtb | ||
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c index 87538182d3da..43142cfbb7cd 100644 --- a/arch/arm/mach-kirkwood/board-dt.c +++ b/arch/arm/mach-kirkwood/board-dt.c | |||
@@ -84,6 +84,9 @@ static void __init kirkwood_dt_init(void) | |||
84 | if (of_machine_is_compatible("seagate,goflexnet")) | 84 | if (of_machine_is_compatible("seagate,goflexnet")) |
85 | goflexnet_init(); | 85 | goflexnet_init(); |
86 | 86 | ||
87 | if (of_machine_is_compatible("buffalo,lsxl")) | ||
88 | lsxl_init(); | ||
89 | |||
87 | of_platform_populate(NULL, kirkwood_dt_match_table, | 90 | of_platform_populate(NULL, kirkwood_dt_match_table, |
88 | kirkwood_auxdata_lookup, NULL); | 91 | kirkwood_auxdata_lookup, NULL); |
89 | } | 92 | } |
@@ -96,6 +99,7 @@ static const char *kirkwood_dt_board_compat[] = { | |||
96 | "raidsonic,ib-nas62x0", | 99 | "raidsonic,ib-nas62x0", |
97 | "qnap,ts219", | 100 | "qnap,ts219", |
98 | "seagate,goflexnet", | 101 | "seagate,goflexnet", |
102 | "buffalo,lsxl", | ||
99 | NULL | 103 | NULL |
100 | }; | 104 | }; |
101 | 105 | ||
diff --git a/arch/arm/mach-kirkwood/board-lsxl.c b/arch/arm/mach-kirkwood/board-lsxl.c new file mode 100644 index 000000000000..83d8975592f8 --- /dev/null +++ b/arch/arm/mach-kirkwood/board-lsxl.c | |||
@@ -0,0 +1,135 @@ | |||
1 | /* | ||
2 | * Copyright 2012 (C), Michael Walle <michael@walle.cc> | ||
3 | * | ||
4 | * arch/arm/mach-kirkwood/board-lsxl.c | ||
5 | * | ||
6 | * Buffalo Linkstation LS-XHL and LS-CHLv2 init for drivers not | ||
7 | * converted to flattened device tree yet. | ||
8 | * | ||
9 | * This file is licensed under the terms of the GNU General Public | ||
10 | * License version 2. This program is licensed "as is" without any | ||
11 | * warranty of any kind, whether express or implied. | ||
12 | */ | ||
13 | |||
14 | #include <linux/kernel.h> | ||
15 | #include <linux/init.h> | ||
16 | #include <linux/platform_device.h> | ||
17 | #include <linux/mtd/partitions.h> | ||
18 | #include <linux/ata_platform.h> | ||
19 | #include <linux/spi/flash.h> | ||
20 | #include <linux/spi/spi.h> | ||
21 | #include <linux/mv643xx_eth.h> | ||
22 | #include <linux/gpio.h> | ||
23 | #include <linux/gpio-fan.h> | ||
24 | #include <linux/input.h> | ||
25 | #include <asm/mach-types.h> | ||
26 | #include <asm/mach/arch.h> | ||
27 | #include <mach/kirkwood.h> | ||
28 | #include "common.h" | ||
29 | #include "mpp.h" | ||
30 | |||
31 | static struct mv643xx_eth_platform_data lsxl_ge00_data = { | ||
32 | .phy_addr = MV643XX_ETH_PHY_ADDR(0), | ||
33 | }; | ||
34 | |||
35 | static struct mv643xx_eth_platform_data lsxl_ge01_data = { | ||
36 | .phy_addr = MV643XX_ETH_PHY_ADDR(8), | ||
37 | }; | ||
38 | |||
39 | static unsigned int lsxl_mpp_config[] __initdata = { | ||
40 | MPP10_GPO, /* HDD Power Enable */ | ||
41 | MPP11_GPIO, /* USB Vbus Enable */ | ||
42 | MPP18_GPO, /* FAN High Enable# */ | ||
43 | MPP19_GPO, /* FAN Low Enable# */ | ||
44 | MPP36_GPIO, /* Function Blue LED */ | ||
45 | MPP37_GPIO, /* Alarm LED */ | ||
46 | MPP38_GPIO, /* Info LED */ | ||
47 | MPP39_GPIO, /* Power LED */ | ||
48 | MPP40_GPIO, /* Fan Lock */ | ||
49 | MPP41_GPIO, /* Function Button */ | ||
50 | MPP42_GPIO, /* Power Switch */ | ||
51 | MPP43_GPIO, /* Power Auto Switch */ | ||
52 | MPP48_GPIO, /* Function Red LED */ | ||
53 | 0 | ||
54 | }; | ||
55 | |||
56 | #define LSXL_GPIO_FAN_HIGH 18 | ||
57 | #define LSXL_GPIO_FAN_LOW 19 | ||
58 | #define LSXL_GPIO_FAN_LOCK 40 | ||
59 | |||
60 | static struct gpio_fan_alarm lsxl_alarm = { | ||
61 | .gpio = LSXL_GPIO_FAN_LOCK, | ||
62 | }; | ||
63 | |||
64 | static struct gpio_fan_speed lsxl_speeds[] = { | ||
65 | { | ||
66 | .rpm = 0, | ||
67 | .ctrl_val = 3, | ||
68 | }, { | ||
69 | .rpm = 1500, | ||
70 | .ctrl_val = 1, | ||
71 | }, { | ||
72 | .rpm = 3250, | ||
73 | .ctrl_val = 2, | ||
74 | }, { | ||
75 | .rpm = 5000, | ||
76 | .ctrl_val = 0, | ||
77 | } | ||
78 | }; | ||
79 | |||
80 | static int lsxl_gpio_list[] = { | ||
81 | LSXL_GPIO_FAN_HIGH, LSXL_GPIO_FAN_LOW, | ||
82 | }; | ||
83 | |||
84 | static struct gpio_fan_platform_data lsxl_fan_data = { | ||
85 | .num_ctrl = ARRAY_SIZE(lsxl_gpio_list), | ||
86 | .ctrl = lsxl_gpio_list, | ||
87 | .alarm = &lsxl_alarm, | ||
88 | .num_speed = ARRAY_SIZE(lsxl_speeds), | ||
89 | .speed = lsxl_speeds, | ||
90 | }; | ||
91 | |||
92 | static struct platform_device lsxl_fan_device = { | ||
93 | .name = "gpio-fan", | ||
94 | .id = -1, | ||
95 | .num_resources = 0, | ||
96 | .dev = { | ||
97 | .platform_data = &lsxl_fan_data, | ||
98 | }, | ||
99 | }; | ||
100 | |||
101 | /* | ||
102 | * On the LS-XHL/LS-CHLv2, the shutdown process is following: | ||
103 | * - Userland monitors key events until the power switch goes to off position | ||
104 | * - The board reboots | ||
105 | * - U-boot starts and goes into an idle mode waiting for the user | ||
106 | * to move the switch to ON position | ||
107 | * | ||
108 | */ | ||
109 | static void lsxl_power_off(void) | ||
110 | { | ||
111 | kirkwood_restart('h', NULL); | ||
112 | } | ||
113 | |||
114 | #define LSXL_GPIO_HDD_POWER 10 | ||
115 | #define LSXL_GPIO_USB_POWER 11 | ||
116 | |||
117 | void __init lsxl_init(void) | ||
118 | { | ||
119 | /* | ||
120 | * Basic setup. Needs to be called early. | ||
121 | */ | ||
122 | kirkwood_mpp_conf(lsxl_mpp_config); | ||
123 | |||
124 | /* usb and sata power on */ | ||
125 | gpio_set_value(LSXL_GPIO_USB_POWER, 1); | ||
126 | gpio_set_value(LSXL_GPIO_HDD_POWER, 1); | ||
127 | |||
128 | kirkwood_ehci_init(); | ||
129 | kirkwood_ge00_init(&lsxl_ge00_data); | ||
130 | kirkwood_ge01_init(&lsxl_ge01_data); | ||
131 | platform_device_register(&lsxl_fan_device); | ||
132 | |||
133 | /* register power-off method */ | ||
134 | pm_power_off = lsxl_power_off; | ||
135 | } | ||
diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h index 2fd03adbd711..304dd1abfdca 100644 --- a/arch/arm/mach-kirkwood/common.h +++ b/arch/arm/mach-kirkwood/common.h | |||
@@ -88,6 +88,12 @@ void goflexnet_init(void); | |||
88 | static inline void goflexnet_init(void) {}; | 88 | static inline void goflexnet_init(void) {}; |
89 | #endif | 89 | #endif |
90 | 90 | ||
91 | #ifdef CONFIG_MACH_LSXL_DT | ||
92 | void lsxl_init(void); | ||
93 | #else | ||
94 | static inline void lsxl_init(void) {}; | ||
95 | #endif | ||
96 | |||
91 | /* early init functions not converted to fdt yet */ | 97 | /* early init functions not converted to fdt yet */ |
92 | char *kirkwood_id(void); | 98 | char *kirkwood_id(void); |
93 | void kirkwood_l2_init(void); | 99 | void kirkwood_l2_init(void); |