Merge tag 'drm-next-2020-12-24' of git://anongit.freedesktop.org/drm/drm

[linux-2.6-microblaze.git] / arch / arm / boot / dts / dra7.dtsi

diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 5508a7f..ce11947 100644 (file)
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -950,7 +950,7 @@
                        };
                };
 
-               sham_target: target-module@4b101000 {
+               sham1_target: target-module@4b101000 {
                        compatible = "ti,sysc-omap3-sham", "ti,sysc";
                        reg = <0x4b101100 0x4>,
                              <0x4b101110 0x4>,
@@ -969,7 +969,7 @@
                        #size-cells = <1>;
                        ranges = <0x0 0x4b101000 0x1000>;
 
-                       sham: sham@0 {
+                       sham1: sham@0 {
                                compatible = "ti,omap5-sham";
                                reg = <0 0x300>;
                                interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
@@ -980,6 +980,36 @@
                        };
                };
 
+               sham2_target: target-module@42701000 {
+                       compatible = "ti,sysc-omap3-sham", "ti,sysc";
+                       reg = <0x42701100 0x4>,
+                             <0x42701110 0x4>,
+                             <0x42701114 0x4>;
+                       reg-names = "rev", "sysc", "syss";
+                       ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET |
+                                        SYSC_OMAP2_AUTOIDLE)>;
+                       ti,sysc-sidle = <SYSC_IDLE_FORCE>,
+                                       <SYSC_IDLE_NO>,
+                                       <SYSC_IDLE_SMART>;
+                       ti,syss-mask = <1>;
+                       /* Domains (P, C): l4per_pwrdm, l4sec_clkdm */
+                       clocks = <&l4sec_clkctrl DRA7_L4SEC_SHAM2_CLKCTRL 0>;
+                       clock-names = "fck";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0x0 0x42701000 0x1000>;
+
+                       sham2: sham@0 {
+                               compatible = "ti,omap5-sham";
+                               reg = <0 0x300>;
+                               interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>;
+                               dmas = <&edma_xbar 165 0>;
+                               dma-names = "rx";
+                               clocks = <&l3_iclk_div>;
+                               clock-names = "fck";
+                       };
+               };
+
                iva_hd_target: target-module@5a000000 {
                        compatible = "ti,sysc-omap4", "ti,sysc";
                        reg = <0x5a05a400 0x4>,