ARM: dts: at91: sama7g5/sama7g5ek: sync with kernel at91 5.19

Sync with at91 maintainer tree for-5.19 branch.

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>

diff --git a/arch/arm/dts/at91-sama7g5ek.dts b/arch/arm/dts/at91-sama7g5ek.dts
index ee46112b08b0424f4dee14c30419c58cf1c59411..086ee45005ffe8d46b2294843b4539805d7f05e9 100644 (file)
--- a/arch/arm/dts/at91-sama7g5ek.dts
+++ b/arch/arm/dts/at91-sama7g5ek.dts
@@ -14,6 +14,7 @@
 #include <dt-bindings/mfd/atmel-flexcom.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/pinctrl/at91.h>
+#include <dt-bindings/sound/microchip,pdmc.h>
 
 / {
        model = "Microchip SAMA7G5-EK";
@@ -468,7 +469,7 @@
                     &pinctrl_gmac1_mdio_default
                     &pinctrl_gmac1_phy_irq>;
        phy-mode = "rmii";
-       status = "okay";
+       status = "okay"; /* Conflict with pdmc0. */
 
        ethernet-phy@0 {
                reg = <0x0>;
@@ -482,6 +483,17 @@
        pinctrl-0 = <&pinctrl_i2s0_default>;
 };
 
+&pdmc0 {
+       #sound-dai-cells = <0>;
+       microchip,mic-pos = <MCHP_PDMC_DS0 MCHP_PDMC_CLK_NEGATIVE>, /* MIC 1 */
+                           <MCHP_PDMC_DS1 MCHP_PDMC_CLK_NEGATIVE>, /* MIC 2 */
+                           <MCHP_PDMC_DS0 MCHP_PDMC_CLK_POSITIVE>, /* MIC 3 */
+                           <MCHP_PDMC_DS1 MCHP_PDMC_CLK_POSITIVE>; /* MIC 4 */
+       status = "disabled"; /* Conflict with gmac1. */
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_pdmc0_default>;
+};
+
 &pioA {
 
        pinctrl_can0_default: can0_default {
@@ -651,6 +663,13 @@
                bias-disable;
        };
 
+       pinctrl_pdmc0_default: pdmc0_default {
+               pinmux = <PIN_PD23__PDMC0_DS0>,
+                        <PIN_PD24__PDMC0_DS1>,
+                        <PIN_PD22__PDMC0_CLK>;
+               bias_disable;
+       };
+
        pinctrl_qspi: qspi {
                pinmux = <PIN_PB12__QSPI0_IO0>,
                         <PIN_PB11__QSPI0_IO1>,

diff --git a/arch/arm/dts/sama7g5.dtsi b/arch/arm/dts/sama7g5.dtsi
index 4efecdb92c7228c59854658a3a2a1f7862a0753d..97400dc18e7678121de6d016ca673f0792e43fe0 100644 (file)
--- a/arch/arm/dts/sama7g5.dtsi
+++ b/arch/arm/dts/sama7g5.dtsi
@@ -33,6 +33,7 @@
                        reg = <0x0>;
                        clocks = <&pmc PMC_TYPE_CORE 8>, <&pmc PMC_TYPE_CORE 22>, <&main_xtal>;
                        clock-names = "cpu", "master", "xtal";
+                       operating-points-v2 = <&cpu_opp_table>;
                };
        };
 
@@ -225,7 +226,7 @@
                        status = "disabled";
                };
 
-               rtt: rtt@e001d020 {
+               rtt: rtc@e001d020 {
                        compatible = "microchip,sama7g5-rtt", "microchip,sam9x60-rtt", "atmel,at91sam9260-rtt";
                        reg = <0xe001d020 0x30>;
                        interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
@@ -490,6 +491,30 @@
                        status = "disabled";
                };
 
+               pdmc0: sound@e1608000 {
+                       compatible = "microchip,sama7g5-pdmc";
+                       reg = <0xe1608000 0x1000>;
+                       interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;
+                       #sound-dai-cells = <0>;
+                       dmas = <&dma0 AT91_XDMAC_DT_PERID(37)>;
+                       dma-names = "rx";
+                       clocks = <&pmc PMC_TYPE_PERIPHERAL 68>, <&pmc PMC_TYPE_GCK 68>;
+                       clock-names = "pclk", "gclk";
+                       status = "disabled";
+               };
+
+               pdmc1: sound@e160c000 {
+                       compatible = "microchip,sama7g5-pdmc";
+                       reg = <0xe160c000 0x1000>;
+                       interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
+                       #sound-dai-cells = <0>;
+                       dmas = <&dma0 AT91_XDMAC_DT_PERID(38)>;
+                       dma-names = "rx";
+                       clocks = <&pmc PMC_TYPE_PERIPHERAL 69>, <&pmc PMC_TYPE_GCK 69>;
+                       clock-names = "pclk", "gclk";
+                       status = "disabled";
+               };
+
                spdifrx: spdifrx@e1614000 {
                        #sound-dai-cells = <0>;
                        compatible = "microchip,sama7g5-spdifrx";
@@ -628,9 +653,9 @@
                                #size-cells = <0>;
                                clocks = <&pmc PMC_TYPE_PERIPHERAL 39>;
                                atmel,fifo-size = <32>;
-                               dmas = <&dma0 AT91_XDMAC_DT_PERID(7)>,
-                                       <&dma0 AT91_XDMAC_DT_PERID(8)>;
-                               dma-names = "rx", "tx";
+                               dmas = <&dma0 AT91_XDMAC_DT_PERID(8)>,
+                                       <&dma0 AT91_XDMAC_DT_PERID(7)>;
+                               dma-names = "tx", "rx";
                                status = "disabled";
                        };
                };
@@ -814,9 +839,9 @@
                                #size-cells = <0>;
                                clocks = <&pmc PMC_TYPE_PERIPHERAL 46>;
                                atmel,fifo-size = <32>;
-                               dmas = <&dma0 AT91_XDMAC_DT_PERID(21)>,
-                                       <&dma0 AT91_XDMAC_DT_PERID(22)>;
-                               dma-names = "rx", "tx";
+                               dmas = <&dma0 AT91_XDMAC_DT_PERID(22)>,
+                                       <&dma0 AT91_XDMAC_DT_PERID(21)>;
+                               dma-names = "tx", "rx";
                                status = "disabled";
                        };
                };
@@ -838,9 +863,9 @@
                                #size-cells = <0>;
                                clocks = <&pmc PMC_TYPE_PERIPHERAL 47>;
                                atmel,fifo-size = <32>;
-                               dmas = <&dma0 AT91_XDMAC_DT_PERID(23)>,
-                                       <&dma0 AT91_XDMAC_DT_PERID(24)>;
-                               dma-names = "rx", "tx";
+                               dmas = <&dma0 AT91_XDMAC_DT_PERID(24)>,
+                                       <&dma0 AT91_XDMAC_DT_PERID(23)>;
+                               dma-names = "tx", "rx";
                                status = "disabled";
                        };
                };
@@ -885,7 +910,6 @@
                        #interrupt-cells = <3>;
                        #address-cells = <0>;
                        interrupt-controller;
-                       interrupt-parent;
                        reg = <0xe8c11000 0x1000>,
                                <0xe8c12000 0x2000>;
                };