Merge branch 'parisc-5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / at91-sama5d2_xplained.dts

diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts
index a927165..058fae1 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts
@@ -168,16 +168,6 @@
                                };
                        };
 
-                       pdmic@f8018000 {
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&pinctrl_pdmic_default>;
-                               atmel,model = "PDMIC @ sama5d2_xplained";
-                               atmel,mic-min-freq = <1000000>;
-                               atmel,mic-max-freq = <3246000>;
-                               atmel,mic-offset = <0x0>;
-                               status = "okay";
-                       };
-
                        uart1: serial@f8020000 {
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_uart1_default>;
@@ -490,14 +480,18 @@
                                        bias-pull-up;
                                };
 
-                               pinctrl_classd_default: classd_default {
+                               pinctrl_classd_default_pfets: classd_default_pfets {
                                        pinmux = <PIN_PB1__CLASSD_R0>,
-                                                <PIN_PB2__CLASSD_R1>,
-                                                <PIN_PB3__CLASSD_R2>,
-                                                <PIN_PB4__CLASSD_R3>;
+                                                <PIN_PB3__CLASSD_R2>;
                                        bias-pull-up;
                                };
 
+                               pinctrl_classd_default_nfets: classd_default_nfets {
+                                       pinmux = <PIN_PB2__CLASSD_R1>,
+                                                <PIN_PB4__CLASSD_R3>;
+                                       bias-pull-down;
+                               };
+
                                pinctrl_flx0_default: flx0_default {
                                        pinmux = <PIN_PB28__FLEXCOM0_IO0>,
                                                 <PIN_PB29__FLEXCOM0_IO1>;
@@ -595,12 +589,6 @@
                                        bias-disable;
                                };
 
-                               pinctrl_pdmic_default: pdmic_default {
-                                       pinmux = <PIN_PB26__PDMIC_DAT>,
-                                               <PIN_PB27__PDMIC_CLK>;
-                                       bias-disable;
-                               };
-
                                pinctrl_qspi0_default: qspi0_default {
                                        sck_cs {
                                                pinmux = <PIN_PA22__QSPI0_SCK>,
@@ -696,7 +684,7 @@
 
                        classd: classd@fc048000 {
                                pinctrl-names = "default";
-                               pinctrl-0 = <&pinctrl_classd_default>;
+                               pinctrl-0 = <&pinctrl_classd_default_pfets &pinctrl_classd_default_nfets>;
                                atmel,pwm-type = "diff";
                                atmel,non-overlap-time = <10>;
                                status = "okay";