diff options
author | Wolfgang Grandegger <wg@grandegger.com> | 2011-11-30 18:41:21 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-12-01 13:09:32 -0500 |
commit | fa17a019c87e2ed25b653844f668f111ee059e56 (patch) | |
tree | 63c00212cd9a90496fe84f6b5d8499b202d1af7a | |
parent | e285e44d91fe5a89e0d9fe4f5dda4f9e8c8a3c7e (diff) |
powerpc: tqm8548/tqm8xx: add and update CAN device nodes
This patch enables or updates support for the CC770 and AN82527
CAN controller on the TQM8548 and TQM8xx boards.
CC: devicetree-discuss@lists.ozlabs.org
CC: linuxppc-dev@ozlabs.org
CC: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/powerpc/boot/dts/tqm8548-bigflash.dts | 19 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/tqm8548.dts | 19 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/tqm8xx.dts | 25 |
3 files changed, 53 insertions, 10 deletions
diff --git a/arch/powerpc/boot/dts/tqm8548-bigflash.dts b/arch/powerpc/boot/dts/tqm8548-bigflash.dts index 9452c3c05114..d918752b1200 100644 --- a/arch/powerpc/boot/dts/tqm8548-bigflash.dts +++ b/arch/powerpc/boot/dts/tqm8548-bigflash.dts | |||
@@ -352,7 +352,7 @@ | |||
352 | ranges = < | 352 | ranges = < |
353 | 0 0x0 0xfc000000 0x04000000 // NOR FLASH bank 1 | 353 | 0 0x0 0xfc000000 0x04000000 // NOR FLASH bank 1 |
354 | 1 0x0 0xf8000000 0x08000000 // NOR FLASH bank 0 | 354 | 1 0x0 0xf8000000 0x08000000 // NOR FLASH bank 0 |
355 | 2 0x0 0xa3000000 0x00008000 // CAN (2 x i82527) | 355 | 2 0x0 0xa3000000 0x00008000 // CAN (2 x CC770) |
356 | 3 0x0 0xa3010000 0x00008000 // NAND FLASH | 356 | 3 0x0 0xa3010000 0x00008000 // NAND FLASH |
357 | 357 | ||
358 | >; | 358 | >; |
@@ -393,18 +393,27 @@ | |||
393 | }; | 393 | }; |
394 | 394 | ||
395 | /* Note: CAN support needs be enabled in U-Boot */ | 395 | /* Note: CAN support needs be enabled in U-Boot */ |
396 | can0@2,0 { | 396 | can@2,0 { |
397 | compatible = "intel,82527"; // Bosch CC770 | 397 | compatible = "bosch,cc770"; // Bosch CC770 |
398 | reg = <2 0x0 0x100>; | 398 | reg = <2 0x0 0x100>; |
399 | interrupts = <4 1>; | 399 | interrupts = <4 1>; |
400 | interrupt-parent = <&mpic>; | 400 | interrupt-parent = <&mpic>; |
401 | bosch,external-clock-frequency = <16000000>; | ||
402 | bosch,disconnect-rx1-input; | ||
403 | bosch,disconnect-tx1-output; | ||
404 | bosch,iso-low-speed-mux; | ||
405 | bosch,clock-out-frequency = <16000000>; | ||
401 | }; | 406 | }; |
402 | 407 | ||
403 | can1@2,100 { | 408 | can@2,100 { |
404 | compatible = "intel,82527"; // Bosch CC770 | 409 | compatible = "bosch,cc770"; // Bosch CC770 |
405 | reg = <2 0x100 0x100>; | 410 | reg = <2 0x100 0x100>; |
406 | interrupts = <4 1>; | 411 | interrupts = <4 1>; |
407 | interrupt-parent = <&mpic>; | 412 | interrupt-parent = <&mpic>; |
413 | bosch,external-clock-frequency = <16000000>; | ||
414 | bosch,disconnect-rx1-input; | ||
415 | bosch,disconnect-tx1-output; | ||
416 | bosch,iso-low-speed-mux; | ||
408 | }; | 417 | }; |
409 | 418 | ||
410 | /* Note: NAND support needs to be enabled in U-Boot */ | 419 | /* Note: NAND support needs to be enabled in U-Boot */ |
diff --git a/arch/powerpc/boot/dts/tqm8548.dts b/arch/powerpc/boot/dts/tqm8548.dts index 619776f72c90..988d887c97fc 100644 --- a/arch/powerpc/boot/dts/tqm8548.dts +++ b/arch/powerpc/boot/dts/tqm8548.dts | |||
@@ -352,7 +352,7 @@ | |||
352 | ranges = < | 352 | ranges = < |
353 | 0 0x0 0xfc000000 0x04000000 // NOR FLASH bank 1 | 353 | 0 0x0 0xfc000000 0x04000000 // NOR FLASH bank 1 |
354 | 1 0x0 0xf8000000 0x08000000 // NOR FLASH bank 0 | 354 | 1 0x0 0xf8000000 0x08000000 // NOR FLASH bank 0 |
355 | 2 0x0 0xe3000000 0x00008000 // CAN (2 x i82527) | 355 | 2 0x0 0xe3000000 0x00008000 // CAN (2 x CC770) |
356 | 3 0x0 0xe3010000 0x00008000 // NAND FLASH | 356 | 3 0x0 0xe3010000 0x00008000 // NAND FLASH |
357 | 357 | ||
358 | >; | 358 | >; |
@@ -393,18 +393,27 @@ | |||
393 | }; | 393 | }; |
394 | 394 | ||
395 | /* Note: CAN support needs be enabled in U-Boot */ | 395 | /* Note: CAN support needs be enabled in U-Boot */ |
396 | can0@2,0 { | 396 | can@2,0 { |
397 | compatible = "intel,82527"; // Bosch CC770 | 397 | compatible = "bosch,cc770"; // Bosch CC770 |
398 | reg = <2 0x0 0x100>; | 398 | reg = <2 0x0 0x100>; |
399 | interrupts = <4 1>; | 399 | interrupts = <4 1>; |
400 | interrupt-parent = <&mpic>; | 400 | interrupt-parent = <&mpic>; |
401 | bosch,external-clock-frequency = <16000000>; | ||
402 | bosch,disconnect-rx1-input; | ||
403 | bosch,disconnect-tx1-output; | ||
404 | bosch,iso-low-speed-mux; | ||
405 | bosch,clock-out-frequency = <16000000>; | ||
401 | }; | 406 | }; |
402 | 407 | ||
403 | can1@2,100 { | 408 | can@2,100 { |
404 | compatible = "intel,82527"; // Bosch CC770 | 409 | compatible = "bosch,cc770"; // Bosch CC770 |
405 | reg = <2 0x100 0x100>; | 410 | reg = <2 0x100 0x100>; |
406 | interrupts = <4 1>; | 411 | interrupts = <4 1>; |
407 | interrupt-parent = <&mpic>; | 412 | interrupt-parent = <&mpic>; |
413 | bosch,external-clock-frequency = <16000000>; | ||
414 | bosch,disconnect-rx1-input; | ||
415 | bosch,disconnect-tx1-output; | ||
416 | bosch,iso-low-speed-mux; | ||
408 | }; | 417 | }; |
409 | 418 | ||
410 | /* Note: NAND support needs to be enabled in U-Boot */ | 419 | /* Note: NAND support needs to be enabled in U-Boot */ |
diff --git a/arch/powerpc/boot/dts/tqm8xx.dts b/arch/powerpc/boot/dts/tqm8xx.dts index f6da7ec49a8e..c3dba2518d8c 100644 --- a/arch/powerpc/boot/dts/tqm8xx.dts +++ b/arch/powerpc/boot/dts/tqm8xx.dts | |||
@@ -57,6 +57,7 @@ | |||
57 | 57 | ||
58 | ranges = < | 58 | ranges = < |
59 | 0x0 0x0 0x40000000 0x800000 | 59 | 0x0 0x0 0x40000000 0x800000 |
60 | 0x3 0x0 0xc0000000 0x200 | ||
60 | >; | 61 | >; |
61 | 62 | ||
62 | flash@0,0 { | 63 | flash@0,0 { |
@@ -67,6 +68,30 @@ | |||
67 | bank-width = <4>; | 68 | bank-width = <4>; |
68 | device-width = <2>; | 69 | device-width = <2>; |
69 | }; | 70 | }; |
71 | |||
72 | /* Note: CAN support needs be enabled in U-Boot */ | ||
73 | can@3,0 { | ||
74 | compatible = "intc,82527"; | ||
75 | reg = <3 0x0 0x80>; | ||
76 | interrupts = <8 1>; | ||
77 | interrupt-parent = <&PIC>; | ||
78 | bosch,external-clock-frequency = <16000000>; | ||
79 | bosch,disconnect-rx1-input; | ||
80 | bosch,disconnect-tx1-output; | ||
81 | bosch,iso-low-speed-mux; | ||
82 | bosch,clock-out-frequency = <16000000>; | ||
83 | }; | ||
84 | |||
85 | can@3,100 { | ||
86 | compatible = "intc,82527"; | ||
87 | reg = <3 0x100 0x80>; | ||
88 | interrupts = <8 1>; | ||
89 | interrupt-parent = <&PIC>; | ||
90 | bosch,external-clock-frequency = <16000000>; | ||
91 | bosch,disconnect-rx1-input; | ||
92 | bosch,disconnect-tx1-output; | ||
93 | bosch,iso-low-speed-mux; | ||
94 | }; | ||
70 | }; | 95 | }; |
71 | 96 | ||
72 | soc@fff00000 { | 97 | soc@fff00000 { |