All of lore.kernel.org
 help / color / mirror / Atom feed
From: Marek Vasut <marex@denx.de>
To: u-boot@lists.denx.de
Subject: [PATCH V2 03/14] ARM: dts: stm32: Repair SDMMC1 operation on AV96
Date: Tue, 31 Mar 2020 02:48:40 +0200	[thread overview]
Message-ID: <20200331004851.282583-4-marex@denx.de> (raw)
In-Reply-To: <20200331004851.282583-1-marex@denx.de>

The SD uses different pinmux for the D123DIRline, use such a pinmux,
otherwise there is a pinmux collision on the AV96. Add missing SD
voltage regulator switch and enable SDR104 operation.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Patrick Delaunay <patrick.delaunay@st.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
---
V2: New patch
---
 .../arm/dts/stm32mp157a-avenger96-u-boot.dtsi |  2 +-
 arch/arm/dts/stm32mp157a-avenger96.dts        | 25 ++++++++++++++++---
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/arch/arm/dts/stm32mp157a-avenger96-u-boot.dtsi b/arch/arm/dts/stm32mp157a-avenger96-u-boot.dtsi
index 8dcd8866e8..47bfbb8d77 100644
--- a/arch/arm/dts/stm32mp157a-avenger96-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp157a-avenger96-u-boot.dtsi
@@ -150,7 +150,7 @@
 	};
 };
 
-&sdmmc1_dir_pins_a {
+&sdmmc1_dir_pins_b {
 	u-boot,dm-spl;
 	pins1 {
 		u-boot,dm-spl;
diff --git a/arch/arm/dts/stm32mp157a-avenger96.dts b/arch/arm/dts/stm32mp157a-avenger96.dts
index 3065593bf2..1e9b45b69d 100644
--- a/arch/arm/dts/stm32mp157a-avenger96.dts
+++ b/arch/arm/dts/stm32mp157a-avenger96.dts
@@ -76,6 +76,20 @@
 			default-state = "off";
 		};
 	};
+
+	sd_switch: regulator-sd_switch {
+		compatible = "regulator-gpio";
+		regulator-name = "sd_switch";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <2900000>;
+		regulator-type = "voltage";
+		regulator-always-on;
+
+		gpios = <&gpioi 5 GPIO_ACTIVE_HIGH>;
+		gpios-states = <0>;
+		states = <1800000 0x1>,
+			 <2900000 0x0>;
+	};
 };
 
 &ethernet0 {
@@ -296,15 +310,18 @@
 
 &sdmmc1 {
 	pinctrl-names = "default", "opendrain", "sleep";
-	pinctrl-0 = <&sdmmc1_b4_pins_a &sdmmc1_dir_pins_a>;
-	pinctrl-1 = <&sdmmc1_b4_od_pins_a>;
-	pinctrl-2 = <&sdmmc1_b4_sleep_pins_a>;
-	broken-cd;
+	pinctrl-0 = <&sdmmc1_b4_pins_a &sdmmc1_dir_pins_b>;
+	pinctrl-1 = <&sdmmc1_b4_od_pins_a &sdmmc1_dir_pins_b>;
+	pinctrl-2 = <&sdmmc1_b4_sleep_pins_a &sdmmc1_dir_sleep_pins_b>;
+	cd-gpios = <&gpioi 8 GPIO_ACTIVE_LOW>;
+	disable-wp;
 	st,sig-dir;
 	st,neg-edge;
 	st,use-ckin;
+	sd-uhs-sdr104;
 	bus-width = <4>;
 	vmmc-supply = <&vdd_sd>;
+	vqmmc-supply = <&sd_switch>;
 	status = "okay";
 };
 
-- 
2.25.1

  parent reply	other threads:[~2020-03-31  0:48 UTC|newest]

Thread overview: 54+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-31  0:48 [PATCH V2 00/14] ARM: stm32: Fix Avenger96 Marek Vasut
2020-03-31  0:48 ` [PATCH V2 01/14] ARM: dts: stm32: Repair SD1 pre-reloc pinmux DT node on AV96 Marek Vasut
2020-03-31  8:25   ` Patrice CHOTARD
2020-03-31 12:31   ` Patrick DELAUNAY
2020-03-31  0:48 ` [PATCH V2 02/14] ARM: dts: stm32: Add alternate pinmux for SDMMC1 direction pins Marek Vasut
2020-03-31  8:26   ` Patrice CHOTARD
2020-03-31 12:34   ` Patrick DELAUNAY
2020-03-31  0:48 ` Marek Vasut [this message]
2020-03-31  8:33   ` [PATCH V2 03/14] ARM: dts: stm32: Repair SDMMC1 operation on AV96 Patrice CHOTARD
2020-03-31 12:41   ` Patrick DELAUNAY
2020-03-31  0:48 ` [PATCH V2 04/14] ARM: dts: stm32: Add alternate pinmux for SDMMC2 pins 4-7 Marek Vasut
2020-03-31  8:27   ` Patrice CHOTARD
2020-03-31 12:42   ` Patrick DELAUNAY
2020-03-31  0:48 ` [PATCH V2 05/14] ARM: dts: stm32: Repair SDMMC2 operation Marek Vasut
2020-03-31  8:28   ` Patrice CHOTARD
2020-03-31 12:44   ` Patrick DELAUNAY
2020-03-31 13:41   ` Patrick DELAUNAY
2020-03-31  0:48 ` [PATCH V2 06/14] ARM: dts: stm32: Add QSPI NOR on AV96 Marek Vasut
2020-03-31  8:33   ` Patrice CHOTARD
2020-03-31 13:39   ` Patrick DELAUNAY
2020-03-31 16:38     ` Marek Vasut
2020-03-31  0:48 ` [PATCH V2 07/14] ARM: dts: stm32: Use DT alias for the configuration EEPROM Marek Vasut
2020-03-31  8:34   ` Patrice CHOTARD
2020-03-31 13:56   ` Patrick DELAUNAY
2020-03-31  0:48 ` [PATCH V2 08/14] ARM: dts: stm32: Add configuration EEPROM on AV96 Marek Vasut
2020-03-31  8:34   ` Patrice CHOTARD
2020-03-31 13:57   ` Patrick DELAUNAY
2020-03-31  0:48 ` [PATCH V2 09/14] ARM: dts: stm32: Add alternate pinmux for ethernet RGMII Marek Vasut
2020-03-31  8:35   ` Patrice CHOTARD
2020-03-31 13:58   ` Patrick DELAUNAY
2020-03-31  0:48 ` [PATCH V2 10/14] ARM: dts: stm32: Repair ethernet operation on AV96 Marek Vasut
2020-03-31  8:35   ` Patrice CHOTARD
2020-03-31 13:59   ` Patrick DELAUNAY
2020-03-31  0:48 ` [PATCH V2 11/14] ARM: dts: stm32: Add missing ethernet PHY reset " Marek Vasut
2020-03-31  8:35   ` Patrice CHOTARD
2020-03-31 14:06   ` Patrick DELAUNAY
2020-03-31 17:06     ` Marek Vasut
2020-04-01  8:57       ` Patrick DELAUNAY
2020-04-01 10:52         ` Marek Vasut
2020-03-31  0:48 ` [PATCH V2 12/14] ARM: dts: stm32: Repair PMIC configuration " Marek Vasut
2020-03-31  8:37   ` Patrice CHOTARD
2020-03-31  0:48 ` [PATCH V2 13/14] ARM: dts: stm32: Adjust PLL4 settings " Marek Vasut
2020-03-31  8:41   ` Patrice CHOTARD
2020-03-31 14:25   ` Patrick DELAUNAY
2020-03-31  0:48 ` [PATCH V2 14/14] ARM: dts: stm32: Split AV96 into DHCOR SoM and AV96 board Marek Vasut
2020-03-31  8:38   ` Patrice CHOTARD
2020-03-31 14:59   ` Patrick DELAUNAY
2020-03-31 16:37     ` Marek Vasut
2020-04-01  8:37       ` Patrick DELAUNAY
2020-04-01 10:53         ` Marek Vasut
2020-03-31 15:22 ` [PATCH V2 00/14] ARM: stm32: Fix Avenger96 Patrick DELAUNAY
2020-03-31 16:58   ` Marek Vasut
2020-04-01  9:15     ` Patrick DELAUNAY
2020-04-01 10:55       ` Marek Vasut

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200331004851.282583-4-marex@denx.de \
    --to=marex@denx.de \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.