Merge branches 'for-4.6/upstream-fixes', 'for-4.7/asus', 'for-4.7/hidraw' and 'for...

[karo-tx-linux.git] / arch / arm / boot / dts / bcm283x.dtsi

diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
index 971e741e5467b24337f712f5b85e8a4816cdaa4e..8aaf193711bfea9872673a4f2fe3ec4bcbfe494a 100644 (file)
--- a/arch/arm/boot/dts/bcm283x.dtsi
+++ b/arch/arm/boot/dts/bcm283x.dtsi
@@ -1,5 +1,6 @@
 #include <dt-bindings/pinctrl/bcm2835.h>
 #include <dt-bindings/clock/bcm2835.h>
+#include <dt-bindings/clock/bcm2835-aux.h>
 #include "skeleton.dtsi"
 
 /* This include file covers the common peripherals and configuration between
@@ -111,7 +112,7 @@
                        #interrupt-cells = <2>;
                };
 
-               uart0: uart@7e201000 {
+               uart0: serial@7e201000 {
                        compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";
                        reg = <0x7e201000 0x1000>;
                        interrupts = <2 25>;
@@ -159,6 +160,44 @@
                        clocks = <&clocks BCM2835_CLOCK_VPU>;
                };
 
+               uart1: serial@7e215040 {
+                       compatible = "brcm,bcm2835-aux-uart";
+                       reg = <0x7e215040 0x40>;
+                       interrupts = <1 29>;
+                       clocks = <&aux BCM2835_AUX_CLOCK_UART>;
+                       status = "disabled";
+               };
+
+               spi1: spi@7e215080 {
+                       compatible = "brcm,bcm2835-aux-spi";
+                       reg = <0x7e215080 0x40>;
+                       interrupts = <1 29>;
+                       clocks = <&aux BCM2835_AUX_CLOCK_SPI1>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
+
+               spi2: spi@7e2150c0 {
+                       compatible = "brcm,bcm2835-aux-spi";
+                       reg = <0x7e2150c0 0x40>;
+                       interrupts = <1 29>;
+                       clocks = <&aux BCM2835_AUX_CLOCK_SPI2>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
+
+               pwm: pwm@7e20c000 {
+                       compatible = "brcm,bcm2835-pwm";
+                       reg = <0x7e20c000 0x28>;
+                       clocks = <&clocks BCM2835_CLOCK_PWM>;
+                       assigned-clocks = <&clocks BCM2835_CLOCK_PWM>;
+                       assigned-clock-rates = <10000000>;
+                       #pwm-cells = <2>;
+                       status = "disabled";
+               };
+
                sdhci: sdhci@7e300000 {
                        compatible = "brcm,bcm2835-sdhci";
                        reg = <0x7e300000 0x100>;
@@ -187,7 +226,7 @@
                        status = "disabled";
                };
 
-               usb@7e980000 {
+               usb: usb@7e980000 {
                        compatible = "brcm,bcm2835-usb";
                        reg = <0x7e980000 0x10000>;
                        interrupts = <1 9>;