Merge branch 'for-linus-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / arch / arm / boot / dts / at91sam9260.dtsi

diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index d4884dd1c24394c6e5ac630164f8940742758a6e..a3e363d79122c1a82400519735ec252883290304 100644 (file)
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -938,25 +938,21 @@
                                atmel,adc-res-names = "lowres", "highres";
                                atmel,adc-use-res = "highres";
 
-                               trigger@0 {
-                                       reg = <0>;
+                               trigger0 {
                                        trigger-name = "timer-counter-0";
                                        trigger-value = <0x1>;
                                };
-                               trigger@1 {
-                                       reg = <1>;
+                               trigger1 {
                                        trigger-name = "timer-counter-1";
                                        trigger-value = <0x3>;
                                };
 
-                               trigger@2 {
-                                       reg = <2>;
+                               trigger2 {
                                        trigger-name = "timer-counter-2";
                                        trigger-value = <0x5>;
                                };
 
-                               trigger@3 {
-                                       reg = <3>;
+                               trigger3 {
                                        trigger-name = "external";
                                        trigger-value = <0xd>;
                                        trigger-external;
@@ -1007,7 +1003,7 @@
                        status = "disabled";
                };
 
-               usb0: ohci@00500000 {
+               usb0: ohci@500000 {
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00500000 0x100000>;
                        interrupts = <20 IRQ_TYPE_LEVEL_HIGH 2>;
@@ -1017,7 +1013,7 @@
                };
        };
 
-       i2c@0 {
+       i2c-gpio-0 {
                compatible = "i2c-gpio";
                gpios = <&pioA 23 GPIO_ACTIVE_HIGH /* sda */
                         &pioA 24 GPIO_ACTIVE_HIGH /* scl */