diff options
author | Olof Johansson <olof@lixom.net> | 2015-04-01 20:58:11 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2015-04-01 20:58:11 -0400 |
commit | 58bc2d9b160e1d2ce517eb05552b5a07efa814ef (patch) | |
tree | 86f97099490c387746f02b0b1420421f22677002 /arch/arm/boot | |
parent | c0b0bb6e1490f48f2675c3557653fb554a9c8817 (diff) | |
parent | 1164f672d71ac103d85207b0453f3127c0efefb3 (diff) |
Merge tag 'at91-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/multiplatform
Merge "at91: multiplatform for 4.1 #1" from Nicolas Ferre:
This is the multi-platform support for AT91:
- reworked arch/arm/mach-at91/Kconfig and arch/arm/Kconfig to switch to
multi-platform
- updated at91_dt_defconfig
- continue the cleanup of unneeded files and code chunks
* tag 'at91-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: (61 commits)
ARM: at91: drop AT91_TIMER_HZ
ARM: at91: remove hardware.h
ARM: at91: remove SoC headers
ARM: at91: remove useless mach/cpu.h
ARM: at91: remove unused headers
ARM: at91: switch at91_dt_defconfig to multiplatform
ARM: at91: switch to multiplatform
ARM: at91: remove useless include
clocksource: atmel-st: remove mach/hardware dependency
clocksource: atmel-st: use syscon/regmap
ARM: at91: time: move the system timer driver to drivers/clocksource
ARM: at91: properly initialize timer
ARM: at91: at91rm9200: remove deprecated arm_pm_restart
watchdog: at91rm9200: implement restart handler
watchdog: at91rm9200: use the system timer syscon
mfd: syscon: Add atmel system timer registers definition
ARM: at91/dt: declare atmel,at91rm9200-st as a syscon
ARM: at91: remove old setup
ARM: at91: sama5d4: remove useless map_io
ARM: at91: sama5 use SoC detection infrastructure
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/dts/at91rm9200.dtsi | 8 | ||||
-rw-r--r-- | arch/arm/boot/dts/at91sam9260.dtsi | 9 | ||||
-rw-r--r-- | arch/arm/boot/dts/at91sam9261.dtsi | 11 | ||||
-rw-r--r-- | arch/arm/boot/dts/at91sam9263.dtsi | 7 | ||||
-rw-r--r-- | arch/arm/boot/dts/at91sam9g45.dtsi | 5 | ||||
-rw-r--r-- | arch/arm/boot/dts/at91sam9n12.dtsi | 3 | ||||
-rw-r--r-- | arch/arm/boot/dts/at91sam9rl.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/at91sam9x5.dtsi | 7 | ||||
-rw-r--r-- | arch/arm/boot/dts/sama5d3.dtsi | 5 | ||||
-rw-r--r-- | arch/arm/boot/dts/sama5d4.dtsi | 11 |
10 files changed, 34 insertions, 34 deletions
diff --git a/arch/arm/boot/dts/at91rm9200.dtsi b/arch/arm/boot/dts/at91rm9200.dtsi index 21c2b504f977..4fb333bd1f85 100644 --- a/arch/arm/boot/dts/at91rm9200.dtsi +++ b/arch/arm/boot/dts/at91rm9200.dtsi | |||
@@ -356,9 +356,13 @@ | |||
356 | }; | 356 | }; |
357 | 357 | ||
358 | st: timer@fffffd00 { | 358 | st: timer@fffffd00 { |
359 | compatible = "atmel,at91rm9200-st"; | 359 | compatible = "atmel,at91rm9200-st", "syscon", "simple-mfd"; |
360 | reg = <0xfffffd00 0x100>; | 360 | reg = <0xfffffd00 0x100>; |
361 | interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; | 361 | interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; |
362 | |||
363 | watchdog { | ||
364 | compatible = "atmel,at91rm9200-wdt"; | ||
365 | }; | ||
362 | }; | 366 | }; |
363 | 367 | ||
364 | rtc: rtc@fffffe00 { | 368 | rtc: rtc@fffffe00 { |
@@ -830,7 +834,7 @@ | |||
830 | }; | 834 | }; |
831 | 835 | ||
832 | dbgu: serial@fffff200 { | 836 | dbgu: serial@fffff200 { |
833 | compatible = "atmel,at91rm9200-usart"; | 837 | compatible = "atmel,at91rm9200-dbgu", "atmel,at91rm9200-usart"; |
834 | reg = <0xfffff200 0x200>; | 838 | reg = <0xfffff200 0x200>; |
835 | interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; | 839 | interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; |
836 | pinctrl-names = "default"; | 840 | pinctrl-names = "default"; |
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi index fff0ee69aab4..7d989a8a9cf7 100644 --- a/arch/arm/boot/dts/at91sam9260.dtsi +++ b/arch/arm/boot/dts/at91sam9260.dtsi | |||
@@ -494,12 +494,12 @@ | |||
494 | 494 | ||
495 | pinctrl_usart3_rts: usart3_rts-0 { | 495 | pinctrl_usart3_rts: usart3_rts-0 { |
496 | atmel,pins = | 496 | atmel,pins = |
497 | <AT91_PIOB 8 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC8 periph B */ | 497 | <AT91_PIOC 8 AT91_PERIPH_B AT91_PINCTRL_NONE>; |
498 | }; | 498 | }; |
499 | 499 | ||
500 | pinctrl_usart3_cts: usart3_cts-0 { | 500 | pinctrl_usart3_cts: usart3_cts-0 { |
501 | atmel,pins = | 501 | atmel,pins = |
502 | <AT91_PIOB 10 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC10 periph B */ | 502 | <AT91_PIOC 10 AT91_PERIPH_B AT91_PINCTRL_NONE>; |
503 | }; | 503 | }; |
504 | }; | 504 | }; |
505 | 505 | ||
@@ -753,7 +753,7 @@ | |||
753 | }; | 753 | }; |
754 | 754 | ||
755 | dbgu: serial@fffff200 { | 755 | dbgu: serial@fffff200 { |
756 | compatible = "atmel,at91sam9260-usart"; | 756 | compatible = "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart"; |
757 | reg = <0xfffff200 0x200>; | 757 | reg = <0xfffff200 0x200>; |
758 | interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; | 758 | interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; |
759 | pinctrl-names = "default"; | 759 | pinctrl-names = "default"; |
@@ -853,7 +853,7 @@ | |||
853 | }; | 853 | }; |
854 | 854 | ||
855 | usb1: gadget@fffa4000 { | 855 | usb1: gadget@fffa4000 { |
856 | compatible = "atmel,at91rm9200-udc"; | 856 | compatible = "atmel,at91sam9260-udc"; |
857 | reg = <0xfffa4000 0x4000>; | 857 | reg = <0xfffa4000 0x4000>; |
858 | interrupts = <10 IRQ_TYPE_LEVEL_HIGH 2>; | 858 | interrupts = <10 IRQ_TYPE_LEVEL_HIGH 2>; |
859 | clocks = <&udc_clk>, <&udpck>; | 859 | clocks = <&udc_clk>, <&udpck>; |
@@ -976,7 +976,6 @@ | |||
976 | atmel,watchdog-type = "hardware"; | 976 | atmel,watchdog-type = "hardware"; |
977 | atmel,reset-type = "all"; | 977 | atmel,reset-type = "all"; |
978 | atmel,dbg-halt; | 978 | atmel,dbg-halt; |
979 | atmel,idle-halt; | ||
980 | status = "disabled"; | 979 | status = "disabled"; |
981 | }; | 980 | }; |
982 | 981 | ||
diff --git a/arch/arm/boot/dts/at91sam9261.dtsi b/arch/arm/boot/dts/at91sam9261.dtsi index e247b0b5fdab..bf8d1856a55a 100644 --- a/arch/arm/boot/dts/at91sam9261.dtsi +++ b/arch/arm/boot/dts/at91sam9261.dtsi | |||
@@ -124,11 +124,12 @@ | |||
124 | }; | 124 | }; |
125 | 125 | ||
126 | usb1: gadget@fffa4000 { | 126 | usb1: gadget@fffa4000 { |
127 | compatible = "atmel,at91rm9200-udc"; | 127 | compatible = "atmel,at91sam9261-udc"; |
128 | reg = <0xfffa4000 0x4000>; | 128 | reg = <0xfffa4000 0x4000>; |
129 | interrupts = <10 IRQ_TYPE_LEVEL_HIGH 2>; | 129 | interrupts = <10 IRQ_TYPE_LEVEL_HIGH 2>; |
130 | clocks = <&usb>, <&udc_clk>, <&udpck>; | 130 | clocks = <&udc_clk>, <&udpck>; |
131 | clock-names = "usb_clk", "udc_clk", "udpck"; | 131 | clock-names = "pclk", "hclk"; |
132 | atmel,matrix = <&matrix>; | ||
132 | status = "disabled"; | 133 | status = "disabled"; |
133 | }; | 134 | }; |
134 | 135 | ||
@@ -262,7 +263,7 @@ | |||
262 | }; | 263 | }; |
263 | 264 | ||
264 | matrix: matrix@ffffee00 { | 265 | matrix: matrix@ffffee00 { |
265 | compatible = "atmel,at91sam9260-bus-matrix"; | 266 | compatible = "atmel,at91sam9260-bus-matrix", "syscon"; |
266 | reg = <0xffffee00 0x200>; | 267 | reg = <0xffffee00 0x200>; |
267 | }; | 268 | }; |
268 | 269 | ||
@@ -275,7 +276,7 @@ | |||
275 | }; | 276 | }; |
276 | 277 | ||
277 | dbgu: serial@fffff200 { | 278 | dbgu: serial@fffff200 { |
278 | compatible = "atmel,at91sam9260-usart"; | 279 | compatible = "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart"; |
279 | reg = <0xfffff200 0x200>; | 280 | reg = <0xfffff200 0x200>; |
280 | interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; | 281 | interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; |
281 | pinctrl-names = "default"; | 282 | pinctrl-names = "default"; |
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi index 1f67bb4c144e..e07dae75be77 100644 --- a/arch/arm/boot/dts/at91sam9263.dtsi +++ b/arch/arm/boot/dts/at91sam9263.dtsi | |||
@@ -69,7 +69,7 @@ | |||
69 | 69 | ||
70 | sram1: sram@00500000 { | 70 | sram1: sram@00500000 { |
71 | compatible = "mmio-sram"; | 71 | compatible = "mmio-sram"; |
72 | reg = <0x00300000 0x4000>; | 72 | reg = <0x00500000 0x4000>; |
73 | }; | 73 | }; |
74 | 74 | ||
75 | ahb { | 75 | ahb { |
@@ -762,7 +762,7 @@ | |||
762 | }; | 762 | }; |
763 | 763 | ||
764 | dbgu: serial@ffffee00 { | 764 | dbgu: serial@ffffee00 { |
765 | compatible = "atmel,at91sam9260-usart"; | 765 | compatible = "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart"; |
766 | reg = <0xffffee00 0x200>; | 766 | reg = <0xffffee00 0x200>; |
767 | interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; | 767 | interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; |
768 | pinctrl-names = "default"; | 768 | pinctrl-names = "default"; |
@@ -856,7 +856,7 @@ | |||
856 | }; | 856 | }; |
857 | 857 | ||
858 | usb1: gadget@fff78000 { | 858 | usb1: gadget@fff78000 { |
859 | compatible = "atmel,at91rm9200-udc"; | 859 | compatible = "atmel,at91sam9263-udc"; |
860 | reg = <0xfff78000 0x4000>; | 860 | reg = <0xfff78000 0x4000>; |
861 | interrupts = <24 IRQ_TYPE_LEVEL_HIGH 2>; | 861 | interrupts = <24 IRQ_TYPE_LEVEL_HIGH 2>; |
862 | clocks = <&udc_clk>, <&udpck>; | 862 | clocks = <&udc_clk>, <&udpck>; |
@@ -905,7 +905,6 @@ | |||
905 | atmel,watchdog-type = "hardware"; | 905 | atmel,watchdog-type = "hardware"; |
906 | atmel,reset-type = "all"; | 906 | atmel,reset-type = "all"; |
907 | atmel,dbg-halt; | 907 | atmel,dbg-halt; |
908 | atmel,idle-halt; | ||
909 | status = "disabled"; | 908 | status = "disabled"; |
910 | }; | 909 | }; |
911 | 910 | ||
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi index ee80aa9c0759..56b66a795df7 100644 --- a/arch/arm/boot/dts/at91sam9g45.dtsi +++ b/arch/arm/boot/dts/at91sam9g45.dtsi | |||
@@ -893,7 +893,7 @@ | |||
893 | }; | 893 | }; |
894 | 894 | ||
895 | dbgu: serial@ffffee00 { | 895 | dbgu: serial@ffffee00 { |
896 | compatible = "atmel,at91sam9260-usart"; | 896 | compatible = "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart"; |
897 | reg = <0xffffee00 0x200>; | 897 | reg = <0xffffee00 0x200>; |
898 | interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; | 898 | interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; |
899 | pinctrl-names = "default"; | 899 | pinctrl-names = "default"; |
@@ -1116,7 +1116,6 @@ | |||
1116 | atmel,watchdog-type = "hardware"; | 1116 | atmel,watchdog-type = "hardware"; |
1117 | atmel,reset-type = "all"; | 1117 | atmel,reset-type = "all"; |
1118 | atmel,dbg-halt; | 1118 | atmel,dbg-halt; |
1119 | atmel,idle-halt; | ||
1120 | status = "disabled"; | 1119 | status = "disabled"; |
1121 | }; | 1120 | }; |
1122 | 1121 | ||
@@ -1301,7 +1300,7 @@ | |||
1301 | compatible = "atmel,at91sam9g45-ehci", "usb-ehci"; | 1300 | compatible = "atmel,at91sam9g45-ehci", "usb-ehci"; |
1302 | reg = <0x00800000 0x100000>; | 1301 | reg = <0x00800000 0x100000>; |
1303 | interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>; | 1302 | interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>; |
1304 | clocks = <&usb>, <&uhphs_clk>, <&uhphs_clk>, <&uhpck>; | 1303 | clocks = <&utmi>, <&uhphs_clk>, <&uhphs_clk>, <&uhpck>; |
1305 | clock-names = "usb_clk", "ehci_clk", "hclk", "uhpck"; | 1304 | clock-names = "usb_clk", "ehci_clk", "hclk", "uhpck"; |
1306 | status = "disabled"; | 1305 | status = "disabled"; |
1307 | }; | 1306 | }; |
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi index c2666a7cb5b1..ea0af0f6ec7d 100644 --- a/arch/arm/boot/dts/at91sam9n12.dtsi +++ b/arch/arm/boot/dts/at91sam9n12.dtsi | |||
@@ -757,7 +757,7 @@ | |||
757 | }; | 757 | }; |
758 | 758 | ||
759 | dbgu: serial@fffff200 { | 759 | dbgu: serial@fffff200 { |
760 | compatible = "atmel,at91sam9260-usart"; | 760 | compatible = "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart"; |
761 | reg = <0xfffff200 0x200>; | 761 | reg = <0xfffff200 0x200>; |
762 | interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; | 762 | interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; |
763 | pinctrl-names = "default"; | 763 | pinctrl-names = "default"; |
@@ -894,7 +894,6 @@ | |||
894 | atmel,watchdog-type = "hardware"; | 894 | atmel,watchdog-type = "hardware"; |
895 | atmel,reset-type = "all"; | 895 | atmel,reset-type = "all"; |
896 | atmel,dbg-halt; | 896 | atmel,dbg-halt; |
897 | atmel,idle-halt; | ||
898 | status = "disabled"; | 897 | status = "disabled"; |
899 | }; | 898 | }; |
900 | 899 | ||
diff --git a/arch/arm/boot/dts/at91sam9rl.dtsi b/arch/arm/boot/dts/at91sam9rl.dtsi index 40f645b8fe25..ebfd5ce9cb38 100644 --- a/arch/arm/boot/dts/at91sam9rl.dtsi +++ b/arch/arm/boot/dts/at91sam9rl.dtsi | |||
@@ -377,7 +377,7 @@ | |||
377 | }; | 377 | }; |
378 | 378 | ||
379 | dbgu: serial@fffff200 { | 379 | dbgu: serial@fffff200 { |
380 | compatible = "atmel,at91sam9260-usart"; | 380 | compatible = "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart"; |
381 | reg = <0xfffff200 0x200>; | 381 | reg = <0xfffff200 0x200>; |
382 | interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; | 382 | interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; |
383 | pinctrl-names = "default"; | 383 | pinctrl-names = "default"; |
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi index 818dabdd8c0e..3aa56ae3410a 100644 --- a/arch/arm/boot/dts/at91sam9x5.dtsi +++ b/arch/arm/boot/dts/at91sam9x5.dtsi | |||
@@ -860,7 +860,7 @@ | |||
860 | }; | 860 | }; |
861 | 861 | ||
862 | dbgu: serial@fffff200 { | 862 | dbgu: serial@fffff200 { |
863 | compatible = "atmel,at91sam9260-usart"; | 863 | compatible = "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart"; |
864 | reg = <0xfffff200 0x200>; | 864 | reg = <0xfffff200 0x200>; |
865 | interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; | 865 | interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; |
866 | pinctrl-names = "default"; | 866 | pinctrl-names = "default"; |
@@ -1066,7 +1066,7 @@ | |||
1066 | reg = <0x00500000 0x80000 | 1066 | reg = <0x00500000 0x80000 |
1067 | 0xf803c000 0x400>; | 1067 | 0xf803c000 0x400>; |
1068 | interrupts = <23 IRQ_TYPE_LEVEL_HIGH 0>; | 1068 | interrupts = <23 IRQ_TYPE_LEVEL_HIGH 0>; |
1069 | clocks = <&usb>, <&udphs_clk>; | 1069 | clocks = <&utmi>, <&udphs_clk>; |
1070 | clock-names = "hclk", "pclk"; | 1070 | clock-names = "hclk", "pclk"; |
1071 | status = "disabled"; | 1071 | status = "disabled"; |
1072 | 1072 | ||
@@ -1130,7 +1130,6 @@ | |||
1130 | atmel,watchdog-type = "hardware"; | 1130 | atmel,watchdog-type = "hardware"; |
1131 | atmel,reset-type = "all"; | 1131 | atmel,reset-type = "all"; |
1132 | atmel,dbg-halt; | 1132 | atmel,dbg-halt; |
1133 | atmel,idle-halt; | ||
1134 | status = "disabled"; | 1133 | status = "disabled"; |
1135 | }; | 1134 | }; |
1136 | 1135 | ||
@@ -1186,7 +1185,7 @@ | |||
1186 | compatible = "atmel,at91sam9g45-ehci", "usb-ehci"; | 1185 | compatible = "atmel,at91sam9g45-ehci", "usb-ehci"; |
1187 | reg = <0x00700000 0x100000>; | 1186 | reg = <0x00700000 0x100000>; |
1188 | interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>; | 1187 | interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>; |
1189 | clocks = <&usb>, <&uhphs_clk>, <&uhpck>; | 1188 | clocks = <&utmi>, <&uhphs_clk>, <&uhpck>; |
1190 | clock-names = "usb_clk", "ehci_clk", "uhpck"; | 1189 | clock-names = "usb_clk", "ehci_clk", "uhpck"; |
1191 | status = "disabled"; | 1190 | status = "disabled"; |
1192 | }; | 1191 | }; |
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi index 261311bdf65b..c0a8dfcf8380 100644 --- a/arch/arm/boot/dts/sama5d3.dtsi +++ b/arch/arm/boot/dts/sama5d3.dtsi | |||
@@ -439,7 +439,7 @@ | |||
439 | }; | 439 | }; |
440 | 440 | ||
441 | dbgu: serial@ffffee00 { | 441 | dbgu: serial@ffffee00 { |
442 | compatible = "atmel,at91sam9260-usart"; | 442 | compatible = "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart"; |
443 | reg = <0xffffee00 0x200>; | 443 | reg = <0xffffee00 0x200>; |
444 | interrupts = <2 IRQ_TYPE_LEVEL_HIGH 7>; | 444 | interrupts = <2 IRQ_TYPE_LEVEL_HIGH 7>; |
445 | dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(13)>, | 445 | dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(13)>, |
@@ -1248,7 +1248,6 @@ | |||
1248 | atmel,watchdog-type = "hardware"; | 1248 | atmel,watchdog-type = "hardware"; |
1249 | atmel,reset-type = "all"; | 1249 | atmel,reset-type = "all"; |
1250 | atmel,dbg-halt; | 1250 | atmel,dbg-halt; |
1251 | atmel,idle-halt; | ||
1252 | status = "disabled"; | 1251 | status = "disabled"; |
1253 | }; | 1252 | }; |
1254 | 1253 | ||
@@ -1416,7 +1415,7 @@ | |||
1416 | compatible = "atmel,at91sam9g45-ehci", "usb-ehci"; | 1415 | compatible = "atmel,at91sam9g45-ehci", "usb-ehci"; |
1417 | reg = <0x00700000 0x100000>; | 1416 | reg = <0x00700000 0x100000>; |
1418 | interrupts = <32 IRQ_TYPE_LEVEL_HIGH 2>; | 1417 | interrupts = <32 IRQ_TYPE_LEVEL_HIGH 2>; |
1419 | clocks = <&usb>, <&uhphs_clk>, <&uhpck>; | 1418 | clocks = <&utmi>, <&uhphs_clk>, <&uhpck>; |
1420 | clock-names = "usb_clk", "ehci_clk", "uhpck"; | 1419 | clock-names = "usb_clk", "ehci_clk", "uhpck"; |
1421 | status = "disabled"; | 1420 | status = "disabled"; |
1422 | }; | 1421 | }; |
diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi index d986b41b9654..782587df5f3f 100644 --- a/arch/arm/boot/dts/sama5d4.dtsi +++ b/arch/arm/boot/dts/sama5d4.dtsi | |||
@@ -66,6 +66,7 @@ | |||
66 | gpio4 = &pioE; | 66 | gpio4 = &pioE; |
67 | tcb0 = &tcb0; | 67 | tcb0 = &tcb0; |
68 | tcb1 = &tcb1; | 68 | tcb1 = &tcb1; |
69 | i2c0 = &i2c0; | ||
69 | i2c2 = &i2c2; | 70 | i2c2 = &i2c2; |
70 | }; | 71 | }; |
71 | cpus { | 72 | cpus { |
@@ -259,7 +260,7 @@ | |||
259 | compatible = "atmel,at91sam9g45-ehci", "usb-ehci"; | 260 | compatible = "atmel,at91sam9g45-ehci", "usb-ehci"; |
260 | reg = <0x00600000 0x100000>; | 261 | reg = <0x00600000 0x100000>; |
261 | interrupts = <46 IRQ_TYPE_LEVEL_HIGH 2>; | 262 | interrupts = <46 IRQ_TYPE_LEVEL_HIGH 2>; |
262 | clocks = <&usb>, <&uhphs_clk>, <&uhpck>; | 263 | clocks = <&utmi>, <&uhphs_clk>, <&uhpck>; |
263 | clock-names = "usb_clk", "ehci_clk", "uhpck"; | 264 | clock-names = "usb_clk", "ehci_clk", "uhpck"; |
264 | status = "disabled"; | 265 | status = "disabled"; |
265 | }; | 266 | }; |
@@ -461,8 +462,8 @@ | |||
461 | 462 | ||
462 | lcdck: lcdck { | 463 | lcdck: lcdck { |
463 | #clock-cells = <0>; | 464 | #clock-cells = <0>; |
464 | reg = <4>; | 465 | reg = <3>; |
465 | clocks = <&smd>; | 466 | clocks = <&mck>; |
466 | }; | 467 | }; |
467 | 468 | ||
468 | smdck: smdck { | 469 | smdck: smdck { |
@@ -770,7 +771,7 @@ | |||
770 | reg = <50>; | 771 | reg = <50>; |
771 | }; | 772 | }; |
772 | 773 | ||
773 | lcd_clk: lcd_clk { | 774 | lcdc_clk: lcdc_clk { |
774 | #clock-cells = <0>; | 775 | #clock-cells = <0>; |
775 | reg = <51>; | 776 | reg = <51>; |
776 | }; | 777 | }; |
@@ -1063,7 +1064,7 @@ | |||
1063 | }; | 1064 | }; |
1064 | 1065 | ||
1065 | dbgu: serial@fc069000 { | 1066 | dbgu: serial@fc069000 { |
1066 | compatible = "atmel,at91sam9260-usart"; | 1067 | compatible = "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart"; |
1067 | reg = <0xfc069000 0x200>; | 1068 | reg = <0xfc069000 0x200>; |
1068 | interrupts = <2 IRQ_TYPE_LEVEL_HIGH 7>; | 1069 | interrupts = <2 IRQ_TYPE_LEVEL_HIGH 7>; |
1069 | pinctrl-names = "default"; | 1070 | pinctrl-names = "default"; |