Merge tag 'usb-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / am4372.dtsi

diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index e19068d24737b51dbd73ddf3c8203feff89f916a..b62a1cd776cd6a85a65a226937f5b8a7a87d5096 100644 (file)
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -57,6 +57,11 @@
                cache-level = <2>;
        };
 
+       am43xx_control_module: control_module@4a002000 {
+               compatible = "syscon";
+               reg = <0x44e10000 0x7f4>;
+       };
+
        am43xx_pinmux: pinmux@44e10800 {
                compatible = "ti,am437-padconf", "pinctrl-single";
                reg = <0x44e10800 0x31c>;
@@ -168,6 +173,7 @@
                        reg = <0x480C8000 0x200>;
                        interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
                        ti,hwmods = "mailbox";
+                       #mbox-cells = <1>;
                        ti,mbox-num-users = <4>;
                        ti,mbox-num-fifos = <8>;
                        mbox_wkupm3: wkup_m3 {
@@ -667,6 +673,26 @@
                        };
                };
 
+               tscadc: tscadc@44e0d000 {
+                       compatible = "ti,am3359-tscadc";
+                       reg = <0x44e0d000 0x1000>;
+                       ti,hwmods = "adc_tsc";
+                       interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&adc_tsc_fck>;
+                       clock-names = "fck";
+                       status = "disabled";
+
+                       tsc {
+                               compatible = "ti,am3359-tsc";
+                       };
+
+                       adc {
+                               #io-channel-cells = <1>;
+                               compatible = "ti,am3359-adc";
+                       };
+
+               };
+
                sham: sham@53100000 {
                        compatible = "ti,omap5-sham";
                        ti,hwmods = "sham";
@@ -900,6 +926,28 @@
                        compatible = "mmio-sram";
                        reg = <0x40300000 0x40000>; /* 256k */
                };
+
+               dcan0: can@481cc000 {
+                       compatible = "ti,am4372-d_can", "ti,am3352-d_can";
+                       ti,hwmods = "d_can0";
+                       clocks = <&dcan0_fck>;
+                       clock-names = "fck";
+                       reg = <0x481cc000 0x2000>;
+                       syscon-raminit = <&am43xx_control_module 0x644 0>;
+                       interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
+                       status = "disabled";
+               };
+
+               dcan1: can@481d0000 {
+                       compatible = "ti,am4372-d_can", "ti,am3352-d_can";
+                       ti,hwmods = "d_can1";
+                       clocks = <&dcan1_fck>;
+                       clock-names = "fck";
+                       reg = <0x481d0000 0x2000>;
+                       syscon-raminit = <&am43xx_control_module 0x644 1>;
+                       interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
+                       status = "disabled";
+               };
        };
 };