Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[mirror_ubuntu-bionic-kernel.git] / arch / arm / boot / dts / stih407-family.dtsi

diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi
index 0fe03cb88628e51bb29743fd163136db40ec442d..d753ac36788f9d1ea083e283c3c0b907446f4873 100644 (file)
--- a/arch/arm/boot/dts/stih407-family.dtsi
+++ b/arch/arm/boot/dts/stih407-family.dtsi
@@ -20,30 +20,15 @@
                #size-cells = <1>;
                ranges;
 
-               gp0_reserved: rproc@40000000 {
+               gp0_reserved: rproc@45000000 {
                        compatible = "shared-dma-pool";
-                       reg = <0x40000000 0x01000000>;
+                       reg = <0x45000000 0x00400000>;
                        no-map;
-                       status = "disabled";
                };
 
-               gp1_reserved: rproc@41000000 {
+               delta_reserved: rproc@44000000 {
                        compatible = "shared-dma-pool";
-                       reg = <0x41000000 0x01000000>;
-                       no-map;
-                       status = "disabled";
-               };
-
-               audio_reserved: rproc@42000000 {
-                       compatible = "shared-dma-pool";
-                       reg = <0x42000000 0x01000000>;
-                       no-map;
-                       status = "disabled";
-               };
-
-               dmu_reserved: rproc@43000000 {
-                       compatible = "shared-dma-pool";
-                       reg = <0x43000000 0x01000000>;
+                       reg = <0x44000000 0x01000000>;
                        no-map;
                };
        };
@@ -703,6 +688,7 @@
                        compatible      = "st,sti-pwm";
                        #pwm-cells      = <2>;
                        reg             = <0x9510000 0x68>;
+                       interrupts      = <GIC_SPI 131 IRQ_TYPE_NONE>;
                        pinctrl-names   = "default";
                        pinctrl-0       = <&pinctrl_pwm1_chan0_default
                                        &pinctrl_pwm1_chan1_default
@@ -823,37 +809,22 @@
                        clocks          = <&clk_s_c0_flexgen CLK_ST231_GP_0>;
                        clock-frequency = <600000000>;
                        st,syscfg       = <&syscfg_core 0x22c>;
+                       #mbox-cells = <1>;
+                       mbox-names = "vq0_rx", "vq0_tx", "vq1_rx", "vq1_tx";
+                       mboxes = <&mailbox0 0 2>, <&mailbox2 0 1>, <&mailbox0 0 3>, <&mailbox2 0 0>;
                };
 
-
-               st231_gp1: remote-processor {
+               st231_delta: remote-processor {
                        compatible      = "st,st231-rproc";
-                       memory-region   = <&gp1_reserved>;
-                       resets          = <&softreset STIH407_ST231_GP1_SOFTRESET>;
-                       reset-names     = "sw_reset";
-                       clocks          = <&clk_s_c0_flexgen CLK_ST231_GP_1>;
-                       clock-frequency = <600000000>;
-                       st,syscfg       = <&syscfg_core 0x220>;
-               };
-
-               st231_audio: remote-processor {
-                       compatible      = "st,st231-rproc";
-                       memory-region   = <&audio_reserved>;
-                       resets          = <&softreset STIH407_ST231_AUD_SOFTRESET>;
-                       reset-names     = "sw_reset";
-                       clocks          = <&clk_s_c0_flexgen CLK_ST231_AUD_0>;
-                       clock-frequency = <600000000>;
-                       st,syscfg       = <&syscfg_core 0x228>;
-               };
-
-               st231_dmu: remote-processor {
-                       compatible      = "st,st231-rproc";
-                       memory-region   = <&dmu_reserved>;
+                       memory-region   = <&delta_reserved>;
                        resets          = <&softreset STIH407_ST231_DMU_SOFTRESET>;
                        reset-names     = "sw_reset";
                        clocks          = <&clk_s_c0_flexgen CLK_ST231_DMU>;
                        clock-frequency = <600000000>;
                        st,syscfg       = <&syscfg_core 0x224>;
+                       #mbox-cells = <1>;
+                       mbox-names = "vq0_rx", "vq0_tx", "vq1_rx", "vq1_tx";
+                       mboxes = <&mailbox0 0 0>, <&mailbox3 0 1>, <&mailbox0 0 1>, <&mailbox3 0 0>;
                };
 
                /* fdma audio */
@@ -889,6 +860,8 @@
                        interrupts = <GIC_SPI 7 IRQ_TYPE_NONE>;
                        dma-channels = <16>;
                        #dma-cells = <3>;
+
+                       status = "disabled";
                };
 
                /* fdma free running */
@@ -906,6 +879,8 @@
                                <&clk_s_c0_flexgen CLK_EXT2F_A9>,
                                <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>,
                                <&clk_s_c0_flexgen CLK_EXT2F_A9>;
+
+                       status = "disabled";
                };
 
                sti_sasg_codec: sti-sasg-codec {