target/linux/mxs/patches-5.4/100-ARM-dts-imx23-introduce-mmc0_sck_cfg.patch

   1 From e4fdac5def509ffb723b49d6a91f9043009119f9 Mon Sep 17 00:00:00 2001
   2 From: Michael Heimpold <mhei@heimpold.de>
   3 Date: Sun, 8 Mar 2020 23:21:44 +0100
   4 Subject: [PATCH] ARM: dts: imx23: introduce mmc0_sck_cfg
   5
   6 The Olimex Olinuxino board has a user led connected to SSP1_DETECT.
   7 But since this pin is listed in mmc0_pins_fixup, it is already claimed
   8 by MMC driver and this results in this error during boot:
   9
  10 [    1.390000] imx23-pinctrl 80018000.pinctrl: pin SSP1_DETECT already
  11   requested by 80010000.spi; cannot claim for leds
  12 [    1.400000] imx23-pinctrl 80018000.pinctrl: pin-65 (leds) status -22
  13 [    1.410000] imx23-pinctrl 80018000.pinctrl: could not request pin 65
  14    (SSP1_DETECT) from group led_gpio2_1.0  on device 80018000.pinctrl
  15 [    1.420000] leds-gpio leds: Error applying setting, reverse things back
  16 [    1.430000] leds-gpio: probe of leds failed with error -22
  17
  18 This fix it, introduce mmc0_sck_cfg and switch the Olinuxino board to it.
  19
  20 Signed-off-by: Michael Heimpold <mhei@heimpold.de>
  21 Signed-off-by: Shawn Guo <shawnguo@kernel.org>
  22 ---
  23  arch/arm/boot/dts/imx23-olinuxino.dts | 2 +-
  24  arch/arm/boot/dts/imx23.dtsi          | 8 ++++++++
  25  2 files changed, 9 insertions(+), 1 deletion(-)
  26
  27 diff --git a/arch/arm/boot/dts/imx23-olinuxino.dts b/arch/arm/boot/dts/imx23-olinuxino.dts
  28 index 4c9aafe00b5d..0729e72f2283 100644
  29 --- a/arch/arm/boot/dts/imx23-olinuxino.dts
  30 +++ b/arch/arm/boot/dts/imx23-olinuxino.dts
  31 @@ -23,7 +23,7 @@
  32                         ssp0: spi@80010000 {
  33                                 compatible = "fsl,imx23-mmc";
  34                                 pinctrl-names = "default";
  35 -                               pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>;
  36 +                               pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_sck_cfg>;
  37                                 bus-width = <4>;
  38                                 broken-cd;
  39                                 status = "okay";
  40 diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
  41 index eb0aeda1682c..c5edff381213 100644
  42 --- a/arch/arm/boot/dts/imx23.dtsi
  43 +++ b/arch/arm/boot/dts/imx23.dtsi
  44 @@ -267,6 +267,14 @@
  45                                         fsl,pull-up = <MXS_PULL_DISABLE>;
  46                                 };
  47
  48 +                               mmc0_sck_cfg: mmc0-sck-cfg@0 {
  49 +                                       reg = <0>;
  50 +                                       fsl,pinmux-ids = <
  51 +                                               MX23_PAD_SSP1_SCK__SSP1_SCK
  52 +                                       >;
  53 +                                       fsl,pull-up = <MXS_PULL_DISABLE>;
  54 +                               };
  55 +
  56                                 mmc1_4bit_pins_a: mmc1-4bit@0 {
  57                                         reg = <0>;
  58                                         fsl,pinmux-ids = <
  59 --
  60 2.17.1
  61