fixup! ARM: dts: add device tree for ep93xx Soc

diff --git a/arch/arm/boot/dts/ep93xx-bk3.dts b/arch/arm/boot/dts/ep93xx-bk3.dts
index c477af54ab56cac1b6b0d1b11af71d4d2c70e92b..0e215042210f017b56b9f4ebaa2c17840a85efd3 100644 (file)
--- a/arch/arm/boot/dts/ep93xx-bk3.dts
+++ b/arch/arm/boot/dts/ep93xx-bk3.dts
@@ -7,7 +7,7 @@
 
 / {
        model = "Liebherr controller BK3.1";
-       compatible = "liebherr,bk3", "cirrus,ep93xx";
+       compatible = "liebherr,bk3", "cirrus,ep9301";
 
        memory {
                device_type = "memory";
@@ -94,3 +94,8 @@
        status = "okay";
 };
 
+&i2s {
+       pinctrl-names = "default";
+       pinctrl-0 = <&i2s_on_ac97_pins>;
+       /delete-property/ status;
+};

diff --git a/arch/arm/boot/dts/ep93xx.dtsi b/arch/arm/boot/dts/ep93xx.dtsi
index 67ecfde539afe52dd31b261c5dc5f8bc2a469ac0..9b469123b1063d595c5451302efb9b1d6cc1d3b9 100644 (file)
--- a/arch/arm/boot/dts/ep93xx.dtsi
+++ b/arch/arm/boot/dts/ep93xx.dtsi
@@ -25,8 +25,6 @@
                        };
 
                        pinctrl: pinctrl {
-                               regmap = <&syscon>;
-
                                spi_default_pins: pinctrl-spi {
                                        function = "spi";
                                        groups = "ssp";
@@ -48,7 +46,7 @@
                                };
 
                                gpio1_default_pins: pinctrl-gpio1 {
-                                       function = "gpio1";
+                                       function = "gpio";
                                        groups = "gpio1agrp";
                                };
 
@@ -58,12 +56,12 @@
                                };
 
                                gpio2_default_pins: pinctrl-gpio2 {
-                                       function = "gpio2";
+                                       function = "gpio";
                                        groups = "gpio2agrp";
                                };
 
                                gpio3_default_pins: pinctrl-gpio3 {
-                                       function = "gpio3";
+                                       function = "gpio";
                                        groups = "gpio3agrp";
                                };
 
@@ -73,17 +71,17 @@
                                };
 
                                gpio4_default_pins: pinctrl-gpio4 {
-                                       function = "gpio4";
+                                       function = "gpio";
                                        groups = "gpio4agrp";
                                };
 
                                gpio6_default_pins: pinctrl-gpio6 {
-                                       function = "gpio6";
+                                       function = "gpio";
                                        groups = "gpio6agrp";
                                };
 
                                gpio7_default_pins: pinctrl-gpio7 {
-                                       function = "gpio7";
+                                       function = "gpio";
                                        groups = "gpio7agrp";
                                };