diff options
Diffstat (limited to 'arch/powerpc/boot')
-rw-r--r-- | arch/powerpc/boot/dts/p1010rdb.dts | 10 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/p1010si.dtsi | 10 |
2 files changed, 6 insertions, 14 deletions
diff --git a/arch/powerpc/boot/dts/p1010rdb.dts b/arch/powerpc/boot/dts/p1010rdb.dts index 6b33b73a5ba..d6c669c888e 100644 --- a/arch/powerpc/boot/dts/p1010rdb.dts +++ b/arch/powerpc/boot/dts/p1010rdb.dts | |||
@@ -23,6 +23,8 @@ | |||
23 | ethernet2 = &enet2; | 23 | ethernet2 = &enet2; |
24 | pci0 = &pci0; | 24 | pci0 = &pci0; |
25 | pci1 = &pci1; | 25 | pci1 = &pci1; |
26 | can0 = &can0; | ||
27 | can1 = &can1; | ||
26 | }; | 28 | }; |
27 | 29 | ||
28 | memory { | 30 | memory { |
@@ -169,14 +171,6 @@ | |||
169 | }; | 171 | }; |
170 | }; | 172 | }; |
171 | 173 | ||
172 | can0@1c000 { | ||
173 | fsl,flexcan-clock-source = "platform"; | ||
174 | }; | ||
175 | |||
176 | can1@1d000 { | ||
177 | fsl,flexcan-clock-source = "platform"; | ||
178 | }; | ||
179 | |||
180 | usb@22000 { | 174 | usb@22000 { |
181 | phy_type = "utmi"; | 175 | phy_type = "utmi"; |
182 | }; | 176 | }; |
diff --git a/arch/powerpc/boot/dts/p1010si.dtsi b/arch/powerpc/boot/dts/p1010si.dtsi index 7f51104f2e3..cabe0a453ae 100644 --- a/arch/powerpc/boot/dts/p1010si.dtsi +++ b/arch/powerpc/boot/dts/p1010si.dtsi | |||
@@ -140,20 +140,18 @@ | |||
140 | interrupt-parent = <&mpic>; | 140 | interrupt-parent = <&mpic>; |
141 | }; | 141 | }; |
142 | 142 | ||
143 | can0@1c000 { | 143 | can0: can@1c000 { |
144 | compatible = "fsl,flexcan-v1.0"; | 144 | compatible = "fsl,p1010-flexcan"; |
145 | reg = <0x1c000 0x1000>; | 145 | reg = <0x1c000 0x1000>; |
146 | interrupts = <48 0x2>; | 146 | interrupts = <48 0x2>; |
147 | interrupt-parent = <&mpic>; | 147 | interrupt-parent = <&mpic>; |
148 | fsl,flexcan-clock-divider = <2>; | ||
149 | }; | 148 | }; |
150 | 149 | ||
151 | can1@1d000 { | 150 | can1: can@1d000 { |
152 | compatible = "fsl,flexcan-v1.0"; | 151 | compatible = "fsl,p1010-flexcan"; |
153 | reg = <0x1d000 0x1000>; | 152 | reg = <0x1d000 0x1000>; |
154 | interrupts = <61 0x2>; | 153 | interrupts = <61 0x2>; |
155 | interrupt-parent = <&mpic>; | 154 | interrupt-parent = <&mpic>; |
156 | fsl,flexcan-clock-divider = <2>; | ||
157 | }; | 155 | }; |
158 | 156 | ||
159 | L2: l2-cache-controller@20000 { | 157 | L2: l2-cache-controller@20000 { |