diff options
author | Luka Perkov <luka@openwrt.org> | 2013-10-02 23:06:45 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2013-10-03 08:52:47 -0400 |
commit | 148c274ea64448673c4294e32cfd0d60b524ca9a (patch) | |
tree | d556def661d931f7ac5f5260bf0e399eccd6e2de /arch/arm/boot/dts/kirkwood-ib62x0.dts | |
parent | 7045ff5a5322fa7461d7255c15ad1896bd659440 (diff) |
ARM: kirkwood: ib62x0: add u-boot environment partition
Also, add some trivial whitespace cleanup.
Signed-off-by: Luka Perkov <luka@openwrt.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/boot/dts/kirkwood-ib62x0.dts')
-rw-r--r-- | arch/arm/boot/dts/kirkwood-ib62x0.dts | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts index 066f40f99816..c5fb02f7ebc3 100644 --- a/arch/arm/boot/dts/kirkwood-ib62x0.dts +++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts | |||
@@ -5,7 +5,7 @@ | |||
5 | 5 | ||
6 | / { | 6 | / { |
7 | model = "RaidSonic ICY BOX IB-NAS62x0 (Rev B)"; | 7 | model = "RaidSonic ICY BOX IB-NAS62x0 (Rev B)"; |
8 | compatible = "raidsonic,ib-nas6210-b", "raidsonic,ib-nas6220-b", "raidsonic,ib-nas6210", "raidsonic,ib-nas6220", "raidsonic,ib-nas62x0", "marvell,kirkwood-88f6281", "marvell,kirkwood"; | 8 | compatible = "raidsonic,ib-nas6210-b", "raidsonic,ib-nas6220-b", "raidsonic,ib-nas6210", "raidsonic,ib-nas6220", "raidsonic,ib-nas62x0", "marvell,kirkwood-88f6281", "marvell,kirkwood"; |
9 | 9 | ||
10 | memory { | 10 | memory { |
11 | device_type = "memory"; | 11 | device_type = "memory"; |
@@ -43,6 +43,7 @@ | |||
43 | marvell,function = "gpio"; | 43 | marvell,function = "gpio"; |
44 | }; | 44 | }; |
45 | }; | 45 | }; |
46 | |||
46 | serial@12000 { | 47 | serial@12000 { |
47 | status = "okay"; | 48 | status = "okay"; |
48 | }; | 49 | }; |
@@ -71,6 +72,7 @@ | |||
71 | gpios = <&gpio0 28 1>; | 72 | gpios = <&gpio0 28 1>; |
72 | }; | 73 | }; |
73 | }; | 74 | }; |
75 | |||
74 | gpio-leds { | 76 | gpio-leds { |
75 | compatible = "gpio-leds"; | 77 | compatible = "gpio-leds"; |
76 | pinctrl-0 = <&pmx_led_os_red &pmx_led_os_green | 78 | pinctrl-0 = <&pmx_led_os_red &pmx_led_os_green |
@@ -91,14 +93,13 @@ | |||
91 | gpios = <&gpio0 27 0>; | 93 | gpios = <&gpio0 27 0>; |
92 | }; | 94 | }; |
93 | }; | 95 | }; |
96 | |||
94 | gpio_poweroff { | 97 | gpio_poweroff { |
95 | compatible = "gpio-poweroff"; | 98 | compatible = "gpio-poweroff"; |
96 | pinctrl-0 = <&pmx_power_off>; | 99 | pinctrl-0 = <&pmx_power_off>; |
97 | pinctrl-names = "default"; | 100 | pinctrl-names = "default"; |
98 | gpios = <&gpio0 24 0>; | 101 | gpios = <&gpio0 24 0>; |
99 | }; | 102 | }; |
100 | |||
101 | |||
102 | }; | 103 | }; |
103 | 104 | ||
104 | &nand { | 105 | &nand { |
@@ -108,7 +109,12 @@ | |||
108 | 109 | ||
109 | partition@0 { | 110 | partition@0 { |
110 | label = "u-boot"; | 111 | label = "u-boot"; |
111 | reg = <0x0000000 0x100000>; | 112 | reg = <0x0000000 0xe0000>; |
113 | }; | ||
114 | |||
115 | partition@e0000 { | ||
116 | label = "u-boot environment"; | ||
117 | reg = <0xe0000 0x100000>; | ||
112 | }; | 118 | }; |
113 | 119 | ||
114 | partition@100000 { | 120 | partition@100000 { |
@@ -134,6 +140,7 @@ | |||
134 | 140 | ||
135 | ð0 { | 141 | ð0 { |
136 | status = "okay"; | 142 | status = "okay"; |
143 | |||
137 | ethernet0-port@0 { | 144 | ethernet0-port@0 { |
138 | phy-handle = <ðphy0>; | 145 | phy-handle = <ðphy0>; |
139 | }; | 146 | }; |