diff options
Diffstat (limited to 'arch/microblaze/platform')
-rw-r--r-- | arch/microblaze/platform/generic/system.dts | 28 | ||||
-rw-r--r-- | arch/microblaze/platform/platform.c | 2 |
2 files changed, 30 insertions, 0 deletions
diff --git a/arch/microblaze/platform/generic/system.dts b/arch/microblaze/platform/generic/system.dts index 29993f62b30..e00da8971c3 100644 --- a/arch/microblaze/platform/generic/system.dts +++ b/arch/microblaze/platform/generic/system.dts | |||
@@ -32,6 +32,7 @@ | |||
32 | #address-cells = <1>; | 32 | #address-cells = <1>; |
33 | #size-cells = <1>; | 33 | #size-cells = <1>; |
34 | compatible = "xlnx,microblaze"; | 34 | compatible = "xlnx,microblaze"; |
35 | hard-reset-gpios = <&LEDs_8Bit 2 1>; | ||
35 | model = "testing"; | 36 | model = "testing"; |
36 | DDR2_SDRAM: memory@90000000 { | 37 | DDR2_SDRAM: memory@90000000 { |
37 | device_type = "memory"; | 38 | device_type = "memory"; |
@@ -261,6 +262,33 @@ | |||
261 | xlnx,is-dual = <0x0>; | 262 | xlnx,is-dual = <0x0>; |
262 | xlnx,tri-default = <0xffffffff>; | 263 | xlnx,tri-default = <0xffffffff>; |
263 | xlnx,tri-default-2 = <0xffffffff>; | 264 | xlnx,tri-default-2 = <0xffffffff>; |
265 | #gpio-cells = <2>; | ||
266 | gpio-controller; | ||
267 | } ; | ||
268 | |||
269 | gpio-leds { | ||
270 | compatible = "gpio-leds"; | ||
271 | |||
272 | heartbeat { | ||
273 | label = "Heartbeat"; | ||
274 | gpios = <&LEDs_8Bit 4 1>; | ||
275 | linux,default-trigger = "heartbeat"; | ||
276 | }; | ||
277 | |||
278 | yellow { | ||
279 | label = "Yellow"; | ||
280 | gpios = <&LEDs_8Bit 5 1>; | ||
281 | }; | ||
282 | |||
283 | red { | ||
284 | label = "Red"; | ||
285 | gpios = <&LEDs_8Bit 6 1>; | ||
286 | }; | ||
287 | |||
288 | green { | ||
289 | label = "Green"; | ||
290 | gpios = <&LEDs_8Bit 7 1>; | ||
291 | }; | ||
264 | } ; | 292 | } ; |
265 | RS232_Uart_1: serial@84000000 { | 293 | RS232_Uart_1: serial@84000000 { |
266 | clock-frequency = <125000000>; | 294 | clock-frequency = <125000000>; |
diff --git a/arch/microblaze/platform/platform.c b/arch/microblaze/platform/platform.c index 56e0234fa34..5b89b58c5ae 100644 --- a/arch/microblaze/platform/platform.c +++ b/arch/microblaze/platform/platform.c | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
14 | #include <linux/of_platform.h> | 14 | #include <linux/of_platform.h> |
15 | #include <asm/prom.h> | 15 | #include <asm/prom.h> |
16 | #include <asm/setup.h> | ||
16 | 17 | ||
17 | static struct of_device_id xilinx_of_bus_ids[] __initdata = { | 18 | static struct of_device_id xilinx_of_bus_ids[] __initdata = { |
18 | { .compatible = "simple-bus", }, | 19 | { .compatible = "simple-bus", }, |
@@ -26,6 +27,7 @@ static struct of_device_id xilinx_of_bus_ids[] __initdata = { | |||
26 | static int __init microblaze_device_probe(void) | 27 | static int __init microblaze_device_probe(void) |
27 | { | 28 | { |
28 | of_platform_bus_probe(NULL, xilinx_of_bus_ids, NULL); | 29 | of_platform_bus_probe(NULL, xilinx_of_bus_ids, NULL); |
30 | of_platform_reset_gpio_probe(); | ||
29 | return 0; | 31 | return 0; |
30 | } | 32 | } |
31 | device_initcall(microblaze_device_probe); | 33 | device_initcall(microblaze_device_probe); |