ARM: dts: imx23: introduce mmc0_sck_cfg

The Olimex Olinuxino board has a user led connected to SSP1_DETECT.
But since this pin is listed in mmc0_pins_fixup, it is already claimed
by MMC driver and this results in this error during boot:

[    1.390000] imx23-pinctrl 80018000.pinctrl: pin SSP1_DETECT already
  requested by 80010000.spi; cannot claim for leds
[    1.400000] imx23-pinctrl 80018000.pinctrl: pin-65 (leds) status -22
[    1.410000] imx23-pinctrl 80018000.pinctrl: could not request pin 65
   (SSP1_DETECT) from group led_gpio2_1.0  on device 80018000.pinctrl
[    1.420000] leds-gpio leds: Error applying setting, reverse things back
[    1.430000] leds-gpio: probe of leds failed with error -22

This fix it, introduce mmc0_sck_cfg and switch the Olinuxino board to it.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx23-olinuxino.dts b/arch/arm/boot/dts/imx23-olinuxino.dts
index 4c9aafe00b5da72664afe982aae6d3bef6290705..0729e72f228320d0cdc5bc63e63aa2ccc29d6a08 100644 (file)
--- a/arch/arm/boot/dts/imx23-olinuxino.dts
+++ b/arch/arm/boot/dts/imx23-olinuxino.dts
@@ -23,7 +23,7 @@
                        ssp0: spi@80010000 {
                                compatible = "fsl,imx23-mmc";
                                pinctrl-names = "default";
-                               pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>;
+                               pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_sck_cfg>;
                                bus-width = <4>;
                                broken-cd;
                                status = "okay";

diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
index eb0aeda1682ced8482b3b7ed755c03accccfd313..c5edff381213befb790d1b55c9f166212314f08f 100644 (file)
--- a/arch/arm/boot/dts/imx23.dtsi
+++ b/arch/arm/boot/dts/imx23.dtsi
@@ -267,6 +267,14 @@
                                        fsl,pull-up = <MXS_PULL_DISABLE>;
                                };
 
+                               mmc0_sck_cfg: mmc0-sck-cfg@0 {
+                                       reg = <0>;
+                                       fsl,pinmux-ids = <
+                                               MX23_PAD_SSP1_SCK__SSP1_SCK
+                                       >;
+                                       fsl,pull-up = <MXS_PULL_DISABLE>;
+                               };
+
                                mmc1_4bit_pins_a: mmc1-4bit@0 {
                                        reg = <0>;
                                        fsl,pinmux-ids = <