Merge tag 'at91-dt-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/at91...

[platform/kernel/linux-rpi.git] / arch / arm / boot / dts / at91-sama7g5ek.dts

diff --git a/arch/arm/boot/dts/at91-sama7g5ek.dts b/arch/arm/boot/dts/at91-sama7g5ek.dts
index d83f76a..1035446 100644 (file)
--- a/arch/arm/boot/dts/at91-sama7g5ek.dts
+++ b/arch/arm/boot/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";
@@ -456,7 +457,7 @@
                     &pinctrl_gmac1_mdio_default
                     &pinctrl_gmac1_phy_irq>;
        phy-mode = "rmii";
-       status = "okay";
+       status = "okay"; /* Conflict with pdmc0. */
 
        ethernet-phy@0 {
                reg = <0x0>;
@@ -470,6 +471,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 {
@@ -639,6 +651,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>,