5ecc0cfd6f
Changelog since 5.4.24 mentions CVE-2019-19769, CVE-2020-8648, CVE-2020-8649 and CVE-2020-8647. Removed upstreamed: generic: 507-v5.6-iio-chemical-sps30-fix-missing-triggered-buffer-depe.patch generic: 600-ipv6-addrconf-call-ipv6_mc_up-for-non-Ethernet-inter.patch bcm27xx: 950-0435-ASoC-pcm512x-Fix-unbalanced-regulator-enable-call-in.patch ipq806x: 701-stmmac-fix-notifier-registration.patch lantiq: 002-pinctrl-falcon-fix-syntax-error.patch octeontx: 0002-net-thunderx-workaround-BGX-TX-Underflow-issue.patch Run tested: apu2, qemu-x86-64, apalis, a64-olinuxino, nbg6617 Build tested: sunxi/a53, imx6, x86/64, ipq40xx Tested-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> [apu2] Signed-off-by: Petr Štetiar <ynezz@true.cz>
55 lines
1.9 KiB
Diff
55 lines
1.9 KiB
Diff
From e4fdac5def509ffb723b49d6a91f9043009119f9 Mon Sep 17 00:00:00 2001
|
|
From: Michael Heimpold <mhei@heimpold.de>
|
|
Date: Sun, 8 Mar 2020 23:21:44 +0100
|
|
Subject: [PATCH] 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>
|
|
---
|
|
arch/arm/boot/dts/imx23-olinuxino.dts | 2 +-
|
|
arch/arm/boot/dts/imx23.dtsi | 8 ++++++++
|
|
2 files changed, 9 insertions(+), 1 deletion(-)
|
|
|
|
--- 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";
|
|
--- 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 = <
|