* [PATCH 01/22] ARM: dts: stm32: Add alternate pinmux for ethernet RGMII
2020-03-28 17:11 [PATCH 00/22] ARM: dts: stm32: Repair AV96 board Marek Vasut
@ 2020-03-28 17:11 ` Marek Vasut
2020-03-28 17:11 ` [PATCH 02/22] ARM: dts: stm32: Repair ethernet operation on AV96 Marek Vasut
` (20 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Marek Vasut @ 2020-03-28 17:11 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Marek Vasut, Alexandre Torgue, Patrice Chotard, Patrick Delaunay,
Maxime Coquelin, linux-stm32
Add another mux option for DWMAC RGMII, this is used on AV96 board.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Patrick Delaunay <patrick.delaunay@st.com>
Cc: linux-stm32@st-md-mailman.stormreply.com
To: linux-arm-kernel@lists.infradead.org
---
arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 51 ++++++++++++++++++++++++
1 file changed, 51 insertions(+)
diff --git a/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi b/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
index 73c07f0dfad2..4569dc16e5a1 100644
--- a/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
@@ -196,6 +196,57 @@ pins1 {
};
};
+ ethernet0_rgmii_pins_b: rgmii-1 {
+ pins1 {
+ pinmux = <STM32_PINMUX('G', 5, AF11)>, /* ETH_RGMII_CLK125 */
+ <STM32_PINMUX('G', 4, AF11)>, /* ETH_RGMII_GTX_CLK */
+ <STM32_PINMUX('B', 12, AF11)>, /* ETH_RGMII_TXD0 */
+ <STM32_PINMUX('G', 14, AF11)>, /* ETH_RGMII_TXD1 */
+ <STM32_PINMUX('C', 2, AF11)>, /* ETH_RGMII_TXD2 */
+ <STM32_PINMUX('E', 2, AF11)>, /* ETH_RGMII_TXD3 */
+ <STM32_PINMUX('G', 11, AF11)>, /* ETH_RGMII_TX_CTL */
+ <STM32_PINMUX('C', 1, AF11)>; /* ETH_MDC */
+ bias-disable;
+ drive-push-pull;
+ slew-rate = <2>;
+ };
+ pins2 {
+ pinmux = <STM32_PINMUX('A', 2, AF11)>; /* ETH_MDIO */
+ bias-disable;
+ drive-push-pull;
+ slew-rate = <0>;
+ };
+ pins3 {
+ pinmux = <STM32_PINMUX('C', 4, AF11)>, /* ETH_RGMII_RXD0 */
+ <STM32_PINMUX('C', 5, AF11)>, /* ETH_RGMII_RXD1 */
+ <STM32_PINMUX('H', 6, AF11)>, /* ETH_RGMII_RXD2 */
+ <STM32_PINMUX('B', 1, AF11)>, /* ETH_RGMII_RXD3 */
+ <STM32_PINMUX('A', 1, AF11)>, /* ETH_RGMII_RX_CLK */
+ <STM32_PINMUX('A', 7, AF11)>; /* ETH_RGMII_RX_CTL */
+ bias-disable;
+ };
+ };
+
+ ethernet0_rgmii_pins_sleep_b: rgmii-sleep-1 {
+ pins1 {
+ pinmux = <STM32_PINMUX('G', 5, ANALOG)>, /* ETH_RGMII_CLK125 */
+ <STM32_PINMUX('G', 4, ANALOG)>, /* ETH_RGMII_GTX_CLK */
+ <STM32_PINMUX('B', 12, ANALOG)>, /* ETH_RGMII_TXD0 */
+ <STM32_PINMUX('G', 14, ANALOG)>, /* ETH_RGMII_TXD1 */
+ <STM32_PINMUX('C', 2, ANALOG)>, /* ETH_RGMII_TXD2 */
+ <STM32_PINMUX('E', 2, ANALOG)>, /* ETH_RGMII_TXD3 */
+ <STM32_PINMUX('G', 11, ANALOG)>, /* ETH_RGMII_TX_CTL */
+ <STM32_PINMUX('A', 2, ANALOG)>, /* ETH_MDIO */
+ <STM32_PINMUX('C', 1, ANALOG)>, /* ETH_MDC */
+ <STM32_PINMUX('C', 4, ANALOG)>, /* ETH_RGMII_RXD0 */
+ <STM32_PINMUX('C', 5, ANALOG)>, /* ETH_RGMII_RXD1 */
+ <STM32_PINMUX('H', 6, ANALOG)>, /* ETH_RGMII_RXD2 */
+ <STM32_PINMUX('B', 1, ANALOG)>, /* ETH_RGMII_RXD3 */
+ <STM32_PINMUX('A', 1, ANALOG)>, /* ETH_RGMII_RX_CLK */
+ <STM32_PINMUX('A', 7, ANALOG)>; /* ETH_RGMII_RX_CTL */
+ };
+ };
+
fmc_pins_a: fmc-0 {
pins1 {
pinmux = <STM32_PINMUX('D', 4, AF12)>, /* FMC_NOE */
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 02/22] ARM: dts: stm32: Repair ethernet operation on AV96
2020-03-28 17:11 [PATCH 00/22] ARM: dts: stm32: Repair AV96 board Marek Vasut
2020-03-28 17:11 ` [PATCH 01/22] ARM: dts: stm32: Add alternate pinmux for ethernet RGMII Marek Vasut
@ 2020-03-28 17:11 ` Marek Vasut
2020-03-28 17:11 ` [PATCH 03/22] ARM: dts: stm32: Add missing ethernet PHY reset " Marek Vasut
` (19 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Marek Vasut @ 2020-03-28 17:11 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Marek Vasut, Alexandre Torgue, Patrice Chotard, Patrick Delaunay,
Maxime Coquelin, linux-stm32
The AV96 RGMII uses different pinmux for ETH_RGMII_TXD0, ETH_RGMII_RXD2
and ETH_RGMII_TX_CTL. Use the correct pinmux to make ethernet operational.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Patrick Delaunay <patrick.delaunay@st.com>
Cc: linux-stm32@st-md-mailman.stormreply.com
To: linux-arm-kernel@lists.infradead.org
---
arch/arm/boot/dts/stm32mp157a-avenger96.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/stm32mp157a-avenger96.dts b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
index 425175f7d83c..1d15b745feeb 100644
--- a/arch/arm/boot/dts/stm32mp157a-avenger96.dts
+++ b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
@@ -81,8 +81,8 @@ led6 {
ðernet0 {
status = "okay";
- pinctrl-0 = <ðernet0_rgmii_pins_a>;
- pinctrl-1 = <ðernet0_rgmii_pins_sleep_a>;
+ pinctrl-0 = <ðernet0_rgmii_pins_b>;
+ pinctrl-1 = <ðernet0_rgmii_pins_sleep_b>;
pinctrl-names = "default", "sleep";
phy-mode = "rgmii";
max-speed = <1000>;
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 03/22] ARM: dts: stm32: Add missing ethernet PHY reset on AV96
2020-03-28 17:11 [PATCH 00/22] ARM: dts: stm32: Repair AV96 board Marek Vasut
2020-03-28 17:11 ` [PATCH 01/22] ARM: dts: stm32: Add alternate pinmux for ethernet RGMII Marek Vasut
2020-03-28 17:11 ` [PATCH 02/22] ARM: dts: stm32: Repair ethernet operation on AV96 Marek Vasut
@ 2020-03-28 17:11 ` Marek Vasut
2020-03-28 17:11 ` [PATCH 04/22] ARM: dts: stm32: Add missing ethernet PHY skews " Marek Vasut
` (18 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Marek Vasut @ 2020-03-28 17:11 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Marek Vasut, Alexandre Torgue, Patrice Chotard, Patrick Delaunay,
Maxime Coquelin, linux-stm32
Add PHY reset GPIO on AV96 ethernet PHY.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Patrick Delaunay <patrick.delaunay@st.com>
Cc: linux-stm32@st-md-mailman.stormreply.com
To: linux-arm-kernel@lists.infradead.org
---
arch/arm/boot/dts/stm32mp157a-avenger96.dts | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/boot/dts/stm32mp157a-avenger96.dts b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
index 1d15b745feeb..a568d3824cb0 100644
--- a/arch/arm/boot/dts/stm32mp157a-avenger96.dts
+++ b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
@@ -87,6 +87,8 @@ ðernet0 {
phy-mode = "rgmii";
max-speed = <1000>;
phy-handle = <&phy0>;
+ phy-reset-gpios = <&gpioz 2 GPIO_ACTIVE_LOW>;
+ phy-reset-duration = <100>;
mdio0 {
#address-cells = <1>;
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 04/22] ARM: dts: stm32: Add missing ethernet PHY skews on AV96
2020-03-28 17:11 [PATCH 00/22] ARM: dts: stm32: Repair AV96 board Marek Vasut
` (2 preceding siblings ...)
2020-03-28 17:11 ` [PATCH 03/22] ARM: dts: stm32: Add missing ethernet PHY reset " Marek Vasut
@ 2020-03-28 17:11 ` Marek Vasut
2020-03-28 17:11 ` [PATCH 05/22] ARM: dts: stm32: Add alternate pinmux for SDMMC1 direction pins Marek Vasut
` (17 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Marek Vasut @ 2020-03-28 17:11 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Marek Vasut, Alexandre Torgue, Patrice Chotard, Patrick Delaunay,
Maxime Coquelin, linux-stm32
The KS9031 PHY supports configurable PHY skews to compensate for
the board routing. Fill in the correct values.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Patrick Delaunay <patrick.delaunay@st.com>
Cc: linux-stm32@st-md-mailman.stormreply.com
To: linux-arm-kernel@lists.infradead.org
---
arch/arm/boot/dts/stm32mp157a-avenger96.dts | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/arch/arm/boot/dts/stm32mp157a-avenger96.dts b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
index a568d3824cb0..e58653ccb60f 100644
--- a/arch/arm/boot/dts/stm32mp157a-avenger96.dts
+++ b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
@@ -96,6 +96,20 @@ mdio0 {
compatible = "snps,dwmac-mdio";
phy0: ethernet-phy@7 {
reg = <7>;
+
+ rxc-skew-ps = <1500>;
+ rxdv-skew-ps = <540>;
+ rxd0-skew-ps = <420>;
+ rxd1-skew-ps = <420>;
+ rxd2-skew-ps = <420>;
+ rxd3-skew-ps = <420>;
+
+ txc-skew-ps = <1440>;
+ txen-skew-ps = <540>;
+ txd0-skew-ps = <420>;
+ txd1-skew-ps = <420>;
+ txd2-skew-ps = <420>;
+ txd3-skew-ps = <420>;
};
};
};
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 05/22] ARM: dts: stm32: Add alternate pinmux for SDMMC1 direction pins
2020-03-28 17:11 [PATCH 00/22] ARM: dts: stm32: Repair AV96 board Marek Vasut
` (3 preceding siblings ...)
2020-03-28 17:11 ` [PATCH 04/22] ARM: dts: stm32: Add missing ethernet PHY skews " Marek Vasut
@ 2020-03-28 17:11 ` Marek Vasut
2020-03-28 17:11 ` [PATCH 06/22] ARM: dts: stm32: Repair SDMMC1 operation on AV96 Marek Vasut
` (16 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Marek Vasut @ 2020-03-28 17:11 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Marek Vasut, Alexandre Torgue, Patrice Chotard, Patrick Delaunay,
Maxime Coquelin, linux-stm32
Add another mux option for SDMMC1 direction pins, in particular
SDMMC1_D123DIR, this is used on AV96 board.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Patrick Delaunay <patrick.delaunay@st.com>
Cc: linux-stm32@st-md-mailman.stormreply.com
To: linux-arm-kernel@lists.infradead.org
---
arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi b/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
index 4569dc16e5a1..bfd255dfe81f 100644
--- a/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
@@ -920,6 +920,30 @@ pins {
};
};
+ sdmmc1_dir_pins_b: sdmmc1-dir-1 {
+ pins1 {
+ pinmux = <STM32_PINMUX('F', 2, AF11)>, /* SDMMC1_D0DIR */
+ <STM32_PINMUX('E', 14, AF8)>, /* SDMMC1_D123DIR */
+ <STM32_PINMUX('B', 9, AF11)>; /* SDMMC1_CDIR */
+ slew-rate = <1>;
+ drive-push-pull;
+ bias-pull-up;
+ };
+ pins2{
+ pinmux = <STM32_PINMUX('E', 4, AF8)>; /* SDMMC1_CKIN */
+ bias-pull-up;
+ };
+ };
+
+ sdmmc1_dir_sleep_pins_b: sdmmc1-dir-sleep-1 {
+ pins {
+ pinmux = <STM32_PINMUX('F', 2, ANALOG)>, /* SDMMC1_D0DIR */
+ <STM32_PINMUX('E', 14, ANALOG)>, /* SDMMC1_D123DIR */
+ <STM32_PINMUX('B', 9, ANALOG)>, /* SDMMC1_CDIR */
+ <STM32_PINMUX('E', 4, ANALOG)>; /* SDMMC1_CKIN */
+ };
+ };
+
sdmmc2_b4_pins_a: sdmmc2-b4-0 {
pins1 {
pinmux = <STM32_PINMUX('B', 14, AF9)>, /* SDMMC2_D0 */
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 06/22] ARM: dts: stm32: Repair SDMMC1 operation on AV96
2020-03-28 17:11 [PATCH 00/22] ARM: dts: stm32: Repair AV96 board Marek Vasut
` (4 preceding siblings ...)
2020-03-28 17:11 ` [PATCH 05/22] ARM: dts: stm32: Add alternate pinmux for SDMMC1 direction pins Marek Vasut
@ 2020-03-28 17:11 ` Marek Vasut
2020-03-28 17:11 ` [PATCH 07/22] ARM: dts: stm32: Add alternate pinmux for SDMMC2 pins 4-7 Marek Vasut
` (15 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Marek Vasut @ 2020-03-28 17:11 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Marek Vasut, Alexandre Torgue, Patrice Chotard, Patrick Delaunay,
Maxime Coquelin, linux-stm32
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: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Patrick Delaunay <patrick.delaunay@st.com>
Cc: linux-stm32@st-md-mailman.stormreply.com
To: linux-arm-kernel@lists.infradead.org
---
arch/arm/boot/dts/stm32mp157a-avenger96.dts | 22 ++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/stm32mp157a-avenger96.dts b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
index e58653ccb60f..fe74ad68097c 100644
--- a/arch/arm/boot/dts/stm32mp157a-avenger96.dts
+++ b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
@@ -77,6 +77,20 @@ led6 {
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>;
+ };
};
ðernet0 {
@@ -305,16 +319,18 @@ &rtc {
&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>;
+ 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 | GPIO_PULL_UP)>;
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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 07/22] ARM: dts: stm32: Add alternate pinmux for SDMMC2 pins 4-7
2020-03-28 17:11 [PATCH 00/22] ARM: dts: stm32: Repair AV96 board Marek Vasut
` (5 preceding siblings ...)
2020-03-28 17:11 ` [PATCH 06/22] ARM: dts: stm32: Repair SDMMC1 operation on AV96 Marek Vasut
@ 2020-03-28 17:11 ` Marek Vasut
2020-03-30 11:11 ` Patrice CHOTARD
2020-03-28 17:11 ` [PATCH 08/22] ARM: dts: stm32: Add eMMC attached to SDMMC2 on AV96 Marek Vasut
` (14 subsequent siblings)
21 siblings, 1 reply; 33+ messages in thread
From: Marek Vasut @ 2020-03-28 17:11 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Marek Vasut, Alexandre Torgue, Patrice Chotard, Patrick Delaunay,
Maxime Coquelin, linux-stm32
Add another mux option for SDMMC2 pins 4..7, this is used on AV96 board.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Patrick Delaunay <patrick.delaunay@st.com>
Cc: linux-stm32@st-md-mailman.stormreply.com
To: linux-arm-kernel@lists.infradead.org
---
arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi b/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
index bfd255dfe81f..6a37af213eb6 100644
--- a/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
@@ -1062,6 +1062,27 @@ pins {
};
};
+ sdmmc2_d47_pins_b: sdmmc2-d47-1 {
+ pins {
+ pinmux = <STM32_PINMUX('A', 8, AF9)>, /* SDMMC2_D4 */
+ <STM32_PINMUX('A', 15, AF9)>, /* SDMMC2_D5 */
+ <STM32_PINMUX('C', 6, AF10)>, /* SDMMC2_D6 */
+ <STM32_PINMUX('C', 7, AF10)>; /* SDMMC2_D7 */
+ slew-rate = <1>;
+ drive-push-pull;
+ bias-pull-up;
+ };
+ };
+
+ sdmmc2_d47_sleep_pins_b: sdmmc2-d47-sleep-1 {
+ pins {
+ pinmux = <STM32_PINMUX('A', 8, ANALOG)>, /* SDMMC2_D4 */
+ <STM32_PINMUX('A', 15, ANALOG)>, /* SDMMC2_D5 */
+ <STM32_PINMUX('C', 6, ANALOG)>, /* SDMMC2_D6 */
+ <STM32_PINMUX('C', 7, ANALOG)>; /* SDMMC2_D7 */
+ };
+ };
+
sdmmc3_b4_pins_a: sdmmc3-b4-0 {
pins1 {
pinmux = <STM32_PINMUX('F', 0, AF9)>, /* SDMMC3_D0 */
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 33+ messages in thread* Re: [PATCH 07/22] ARM: dts: stm32: Add alternate pinmux for SDMMC2 pins 4-7
2020-03-28 17:11 ` [PATCH 07/22] ARM: dts: stm32: Add alternate pinmux for SDMMC2 pins 4-7 Marek Vasut
@ 2020-03-30 11:11 ` Patrice CHOTARD
2020-03-30 11:17 ` [Linux-stm32] " Ahmad Fatoum
0 siblings, 1 reply; 33+ messages in thread
From: Patrice CHOTARD @ 2020-03-30 11:11 UTC (permalink / raw)
To: Marek Vasut, linux-arm-kernel
Cc: Patrick DELAUNAY, Alexandre TORGUE, Maxime Coquelin, linux-stm32
Hi Marek
On 3/28/20 6:11 PM, Marek Vasut wrote:
> Add another mux option for SDMMC2 pins 4..7, this is used on AV96 board.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Alexandre Torgue <alexandre.torgue@st.com>
> Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
> Cc: Patrice Chotard <patrice.chotard@st.com>
> Cc: Patrick Delaunay <patrick.delaunay@st.com>
> Cc: linux-stm32@st-md-mailman.stormreply.com
> To: linux-arm-kernel@lists.infradead.org
> ---
> arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 21 +++++++++++++++++++++
> 1 file changed, 21 insertions(+)
>
> diff --git a/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi b/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
> index bfd255dfe81f..6a37af213eb6 100644
> --- a/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
> +++ b/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
> @@ -1062,6 +1062,27 @@ pins {
> };
> };
>
> + sdmmc2_d47_pins_b: sdmmc2-d47-1 {
> + pins {
> + pinmux = <STM32_PINMUX('A', 8, AF9)>, /* SDMMC2_D4 */
> + <STM32_PINMUX('A', 15, AF9)>, /* SDMMC2_D5 */
> + <STM32_PINMUX('C', 6, AF10)>, /* SDMMC2_D6 */
> + <STM32_PINMUX('C', 7, AF10)>; /* SDMMC2_D7 */
> + slew-rate = <1>;
> + drive-push-pull;
> + bias-pull-up;
> + };
> + };
> +
> + sdmmc2_d47_sleep_pins_b: sdmmc2-d47-sleep-1 {
> + pins {
> + pinmux = <STM32_PINMUX('A', 8, ANALOG)>, /* SDMMC2_D4 */
> + <STM32_PINMUX('A', 15, ANALOG)>, /* SDMMC2_D5 */
> + <STM32_PINMUX('C', 6, ANALOG)>, /* SDMMC2_D6 */
> + <STM32_PINMUX('C', 7, ANALOG)>; /* SDMMC2_D7 */
> + };
> + };
> +
> sdmmc3_b4_pins_a: sdmmc3-b4-0 {
> pins1 {
> pinmux = <STM32_PINMUX('F', 0, AF9)>, /* SDMMC3_D0 */
For your information, another submitted patch uses the same pinctrl sdmmc2_d47_pins_b node with different muxing (SDMMC2_D5)
see https://lore.kernel.org/patchwork/patch/1216452/
I haven't checked other muxing if there are other conflict.
Patrice
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [Linux-stm32] [PATCH 07/22] ARM: dts: stm32: Add alternate pinmux for SDMMC2 pins 4-7
2020-03-30 11:11 ` Patrice CHOTARD
@ 2020-03-30 11:17 ` Ahmad Fatoum
2020-03-30 11:22 ` Marek Vasut
0 siblings, 1 reply; 33+ messages in thread
From: Ahmad Fatoum @ 2020-03-30 11:17 UTC (permalink / raw)
To: Patrice CHOTARD, Marek Vasut, linux-arm-kernel
Cc: Maxime Coquelin, Patrick DELAUNAY, linux-stm32
Hello Patrice,
On 3/30/20 1:11 PM, Patrice CHOTARD wrote:
> For your information, another submitted patch uses the same pinctrl sdmmc2_d47_pins_b node with different muxing (SDMMC2_D5)
>
> see https://lore.kernel.org/patchwork/patch/1216452/
>
> I haven't checked other muxing if there are other conflict.
(author of linked patch here)
I don't like the central stm32mp15-pinctrl.dtsi. I'd have preferred if each
file defined the pinctrl groups it is using.
Cheers
Ahmad
>
> Patrice
> _______________________________________________
> Linux-stm32 mailing list
> Linux-stm32@st-md-mailman.stormreply.com
> https://st-md-mailman.stormreply.com/mailman/listinfo/linux-stm32
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Linux-stm32] [PATCH 07/22] ARM: dts: stm32: Add alternate pinmux for SDMMC2 pins 4-7
2020-03-30 11:17 ` [Linux-stm32] " Ahmad Fatoum
@ 2020-03-30 11:22 ` Marek Vasut
2020-03-30 11:37 ` Ahmad Fatoum
0 siblings, 1 reply; 33+ messages in thread
From: Marek Vasut @ 2020-03-30 11:22 UTC (permalink / raw)
To: Ahmad Fatoum, Patrice CHOTARD, linux-arm-kernel
Cc: Maxime Coquelin, Patrick DELAUNAY, linux-stm32
On 3/30/20 1:17 PM, Ahmad Fatoum wrote:
> Hello Patrice,
Hi,
> On 3/30/20 1:11 PM, Patrice CHOTARD wrote:
>> For your information, another submitted patch uses the same pinctrl sdmmc2_d47_pins_b node with different muxing (SDMMC2_D5)
>>
>> see https://lore.kernel.org/patchwork/patch/1216452/
>>
>> I haven't checked other muxing if there are other conflict.
>
> (author of linked patch here)
>
> I don't like the central stm32mp15-pinctrl.dtsi. I'd have preferred if each
> file defined the pinctrl groups it is using.
I'm not a big fan of that either, because this is gonna be a
combinatorial explosion of various pinmux options. But if you have each
board define it's pinmux, it's also gonna become a massive amount of
duplication (like iMX). So I cannot tell which one is better ...
So, just apply one patch or the other, let me know what got applied and
I'll rebase on top of that and resubmit if needed.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Linux-stm32] [PATCH 07/22] ARM: dts: stm32: Add alternate pinmux for SDMMC2 pins 4-7
2020-03-30 11:22 ` Marek Vasut
@ 2020-03-30 11:37 ` Ahmad Fatoum
2020-03-30 11:45 ` Marek Vasut
0 siblings, 1 reply; 33+ messages in thread
From: Ahmad Fatoum @ 2020-03-30 11:37 UTC (permalink / raw)
To: Marek Vasut, Patrice CHOTARD, linux-arm-kernel
Cc: Maxime Coquelin, Patrick DELAUNAY, linux-stm32
Hi Marek,
On 3/30/20 1:22 PM, Marek Vasut wrote:
> On 3/30/20 1:17 PM, Ahmad Fatoum wrote:
>> Hello Patrice,
>
> Hi,
>
>> On 3/30/20 1:11 PM, Patrice CHOTARD wrote:
>>> For your information, another submitted patch uses the same pinctrl sdmmc2_d47_pins_b node with different muxing (SDMMC2_D5)
>>>
>>> see https://lore.kernel.org/patchwork/patch/1216452/
>>>
>>> I haven't checked other muxing if there are other conflict.
>>
>> (author of linked patch here)
>>
>> I don't like the central stm32mp15-pinctrl.dtsi. I'd have preferred if each
>> file defined the pinctrl groups it is using.
>
> I'm not a big fan of that either, because this is gonna be a
> combinatorial explosion of various pinmux options. But if you have each
> board define it's pinmux, it's also gonna become a massive amount of
> duplication (like iMX). So I cannot tell which one is better ...
Mhm. A middle ground could be keeping stm32mp15-pinctrl, but only for the
official ST eval kits as HW designers are expected to copy off those and have
board specifics in the board/SoM device tree?
If it has to be either one or the other, I prefer duplication in the device
tree. When the HW misses pull ups or needs to adjust slew rates, you probably
don't want a new, slightly different, pinctrl group in the stm32mp15-pinctrl.dtsi
for each variant.
So you are left with doctoring around with overrides and /delete-property/,
while just duplicating the node with the correct properties would've been
better for readability IMO.
> So, just apply one patch or the other, let me know what got applied and
> I'll rebase on top of that and resubmit if needed.
Same.
Cheers
Ahmad
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Linux-stm32] [PATCH 07/22] ARM: dts: stm32: Add alternate pinmux for SDMMC2 pins 4-7
2020-03-30 11:37 ` Ahmad Fatoum
@ 2020-03-30 11:45 ` Marek Vasut
2020-03-31 8:58 ` Alexandre Torgue
0 siblings, 1 reply; 33+ messages in thread
From: Marek Vasut @ 2020-03-30 11:45 UTC (permalink / raw)
To: Ahmad Fatoum, Patrice CHOTARD, linux-arm-kernel
Cc: Maxime Coquelin, Patrick DELAUNAY, linux-stm32
On 3/30/20 1:37 PM, Ahmad Fatoum wrote:
> Hi Marek,
Hi,
> On 3/30/20 1:22 PM, Marek Vasut wrote:
>> On 3/30/20 1:17 PM, Ahmad Fatoum wrote:
>>> Hello Patrice,
>>
>> Hi,
>>
>>> On 3/30/20 1:11 PM, Patrice CHOTARD wrote:
>>>> For your information, another submitted patch uses the same pinctrl sdmmc2_d47_pins_b node with different muxing (SDMMC2_D5)
>>>>
>>>> see https://lore.kernel.org/patchwork/patch/1216452/
>>>>
>>>> I haven't checked other muxing if there are other conflict.
>>>
>>> (author of linked patch here)
>>>
>>> I don't like the central stm32mp15-pinctrl.dtsi. I'd have preferred if each
>>> file defined the pinctrl groups it is using.
>>
>> I'm not a big fan of that either, because this is gonna be a
>> combinatorial explosion of various pinmux options. But if you have each
>> board define it's pinmux, it's also gonna become a massive amount of
>> duplication (like iMX). So I cannot tell which one is better ...
>
> Mhm. A middle ground could be keeping stm32mp15-pinctrl, but only for the
> official ST eval kits as HW designers are expected to copy off those and have
> board specifics in the board/SoM device tree?
Then you should call it stm32mp1-something-st-eval-pinmux.dtsi ,
otherwise it's gonna be confusing.
> If it has to be either one or the other, I prefer duplication in the device
> tree. When the HW misses pull ups or needs to adjust slew rates, you probably
> don't want a new, slightly different, pinctrl group in the stm32mp15-pinctrl.dtsi
> for each variant.
That's a valid point, but then you can override those in the boards'
pinmux node for a specific pinmux entry too.
> So you are left with doctoring around with overrides and /delete-property/,
> while just duplicating the node with the correct properties would've been
> better for readability IMO.
That is true, but how many of such cases do we have so far ? Maybe it's
better to cross that bridge when (if) we come to it.
--
Best regards,
Marek Vasut
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Linux-stm32] [PATCH 07/22] ARM: dts: stm32: Add alternate pinmux for SDMMC2 pins 4-7
2020-03-30 11:45 ` Marek Vasut
@ 2020-03-31 8:58 ` Alexandre Torgue
2020-03-31 13:38 ` Marek Vasut
0 siblings, 1 reply; 33+ messages in thread
From: Alexandre Torgue @ 2020-03-31 8:58 UTC (permalink / raw)
To: Marek Vasut, Ahmad Fatoum, Patrice CHOTARD, linux-arm-kernel
Cc: Patrick DELAUNAY, Maxime Coquelin, linux-stm32
On 3/30/20 1:45 PM, Marek Vasut wrote:
> On 3/30/20 1:37 PM, Ahmad Fatoum wrote:
>> Hi Marek,
>
> Hi,
>
>> On 3/30/20 1:22 PM, Marek Vasut wrote:
>>> On 3/30/20 1:17 PM, Ahmad Fatoum wrote:
>>>> Hello Patrice,
>>>
>>> Hi,
>>>
>>>> On 3/30/20 1:11 PM, Patrice CHOTARD wrote:
>>>>> For your information, another submitted patch uses the same pinctrl sdmmc2_d47_pins_b node with different muxing (SDMMC2_D5)
>>>>>
>>>>> see https://lore.kernel.org/patchwork/patch/1216452/
>>>>>
>>>>> I haven't checked other muxing if there are other conflict.
>>>>
>>>> (author of linked patch here)
>>>>
>>>> I don't like the central stm32mp15-pinctrl.dtsi. I'd have preferred if each
>>>> file defined the pinctrl groups it is using.
>>>
>>> I'm not a big fan of that either, because this is gonna be a
>>> combinatorial explosion of various pinmux options. But if you have each
>>> board define it's pinmux, it's also gonna become a massive amount of
>>> duplication (like iMX). So I cannot tell which one is better ...
>>
>> Mhm. A middle ground could be keeping stm32mp15-pinctrl, but only for the
>> official ST eval kits as HW designers are expected to copy off those and have
>> board specifics in the board/SoM device tree?
>
> Then you should call it stm32mp1-something-st-eval-pinmux.dtsi ,
> otherwise it's gonna be confusing.
>
>> If it has to be either one or the other, I prefer duplication in the device
>> tree. When the HW misses pull ups or needs to adjust slew rates, you probably
>> don't want a new, slightly different, pinctrl group in the stm32mp15-pinctrl.dtsi
>> for each variant.
>
> That's a valid point, but then you can override those in the boards'
> pinmux node for a specific pinmux entry too.
>
>> So you are left with doctoring around with overrides and /delete-property/,
>> while just duplicating the node with the correct properties would've been
>> better for readability IMO.
>
> That is true, but how many of such cases do we have so far ? Maybe it's
> better to cross that bridge when (if) we come to it.
>
I agree, and I prefer to keep pins groups definition in
stm32mp15-pinctrl.dtsi file. IMO, it is easier for users to find them in
only one file. Actually, I already had this discussions with some guys
"where pins groups have to be defined ?". For me (and maybe only for
me), muxing is SOC dependent, I mean SoC provides a bunch a possible
pinmux for each IPs. If we got enough memory spaces (and time to waste
also) we could define all possible pinmux (AFx....) for each devices and
let board users chose the good one (using stm32mp15-pictrl.dtsi as a
database). In board file, you select one possible pin configuration
(provided by the SoC) for your device according to your schematic.
However you could append pin groups in board file to update bias,
slewrate ...
If your concern it to embed a bunch of not used pin configuration for a
board, we could use /omit-if-no-ref/ tag on pin groups.
regards
alex
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Linux-stm32] [PATCH 07/22] ARM: dts: stm32: Add alternate pinmux for SDMMC2 pins 4-7
2020-03-31 8:58 ` Alexandre Torgue
@ 2020-03-31 13:38 ` Marek Vasut
2020-03-31 16:39 ` Alexandre Torgue
0 siblings, 1 reply; 33+ messages in thread
From: Marek Vasut @ 2020-03-31 13:38 UTC (permalink / raw)
To: Alexandre Torgue, Ahmad Fatoum, Patrice CHOTARD, linux-arm-kernel
Cc: Patrick DELAUNAY, Maxime Coquelin, linux-stm32
On 3/31/20 10:58 AM, Alexandre Torgue wrote:
>
>
> On 3/30/20 1:45 PM, Marek Vasut wrote:
>> On 3/30/20 1:37 PM, Ahmad Fatoum wrote:
>>> Hi Marek,
>>
>> Hi,
>>
>>> On 3/30/20 1:22 PM, Marek Vasut wrote:
>>>> On 3/30/20 1:17 PM, Ahmad Fatoum wrote:
>>>>> Hello Patrice,
>>>>
>>>> Hi,
>>>>
>>>>> On 3/30/20 1:11 PM, Patrice CHOTARD wrote:
>>>>>> For your information, another submitted patch uses the same
>>>>>> pinctrl sdmmc2_d47_pins_b node with different muxing (SDMMC2_D5)
>>>>>>
>>>>>> see https://lore.kernel.org/patchwork/patch/1216452/
>>>>>>
>>>>>> I haven't checked other muxing if there are other conflict.
>>>>>
>>>>> (author of linked patch here)
>>>>>
>>>>> I don't like the central stm32mp15-pinctrl.dtsi. I'd have preferred
>>>>> if each
>>>>> file defined the pinctrl groups it is using.
>>>>
>>>> I'm not a big fan of that either, because this is gonna be a
>>>> combinatorial explosion of various pinmux options. But if you have each
>>>> board define it's pinmux, it's also gonna become a massive amount of
>>>> duplication (like iMX). So I cannot tell which one is better ...
>>>
>>> Mhm. A middle ground could be keeping stm32mp15-pinctrl, but only for
>>> the
>>> official ST eval kits as HW designers are expected to copy off those
>>> and have
>>> board specifics in the board/SoM device tree?
>>
>> Then you should call it stm32mp1-something-st-eval-pinmux.dtsi ,
>> otherwise it's gonna be confusing.
>>
>>> If it has to be either one or the other, I prefer duplication in the
>>> device
>>> tree. When the HW misses pull ups or needs to adjust slew rates, you
>>> probably
>>> don't want a new, slightly different, pinctrl group in the
>>> stm32mp15-pinctrl.dtsi
>>> for each variant.
>>
>> That's a valid point, but then you can override those in the boards'
>> pinmux node for a specific pinmux entry too.
>>
>>> So you are left with doctoring around with overrides and
>>> /delete-property/,
>>> while just duplicating the node with the correct properties would've
>>> been
>>> better for readability IMO.
>>
>> That is true, but how many of such cases do we have so far ? Maybe it's
>> better to cross that bridge when (if) we come to it.
>>
>
> I agree, and I prefer to keep pins groups definition in
> stm32mp15-pinctrl.dtsi file. IMO, it is easier for users to find them in
> only one file. Actually, I already had this discussions with some guys
> "where pins groups have to be defined ?". For me (and maybe only for
> me), muxing is SOC dependent, I mean SoC provides a bunch a possible
> pinmux for each IPs. If we got enough memory spaces (and time to waste
> also) we could define all possible pinmux (AFx....) for each devices and
> let board users chose the good one (using stm32mp15-pictrl.dtsi as a
> database). In board file, you select one possible pin configuration
> (provided by the SoC) for your device according to your schematic.
> However you could append pin groups in board file to update bias,
> slewrate ...
> If your concern it to embed a bunch of not used pin configuration for a
> board, we could use /omit-if-no-ref/ tag on pin groups.
Can we instead define pinmux the way e.g. iMX6 does , as separate pins ,
instead of pinmux groups ?
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Linux-stm32] [PATCH 07/22] ARM: dts: stm32: Add alternate pinmux for SDMMC2 pins 4-7
2020-03-31 13:38 ` Marek Vasut
@ 2020-03-31 16:39 ` Alexandre Torgue
2020-03-31 16:44 ` Marek Vasut
0 siblings, 1 reply; 33+ messages in thread
From: Alexandre Torgue @ 2020-03-31 16:39 UTC (permalink / raw)
To: Marek Vasut, Ahmad Fatoum, Patrice CHOTARD, linux-arm-kernel
Cc: Patrick DELAUNAY, Maxime Coquelin, linux-stm32
On 3/31/20 3:38 PM, Marek Vasut wrote:
> On 3/31/20 10:58 AM, Alexandre Torgue wrote:
>>
>>
>> On 3/30/20 1:45 PM, Marek Vasut wrote:
>>> On 3/30/20 1:37 PM, Ahmad Fatoum wrote:
>>>> Hi Marek,
>>>
>>> Hi,
>>>
>>>> On 3/30/20 1:22 PM, Marek Vasut wrote:
>>>>> On 3/30/20 1:17 PM, Ahmad Fatoum wrote:
>>>>>> Hello Patrice,
>>>>>
>>>>> Hi,
>>>>>
>>>>>> On 3/30/20 1:11 PM, Patrice CHOTARD wrote:
>>>>>>> For your information, another submitted patch uses the same
>>>>>>> pinctrl sdmmc2_d47_pins_b node with different muxing (SDMMC2_D5)
>>>>>>>
>>>>>>> see https://lore.kernel.org/patchwork/patch/1216452/
>>>>>>>
>>>>>>> I haven't checked other muxing if there are other conflict.
>>>>>>
>>>>>> (author of linked patch here)
>>>>>>
>>>>>> I don't like the central stm32mp15-pinctrl.dtsi. I'd have preferred
>>>>>> if each
>>>>>> file defined the pinctrl groups it is using.
>>>>>
>>>>> I'm not a big fan of that either, because this is gonna be a
>>>>> combinatorial explosion of various pinmux options. But if you have each
>>>>> board define it's pinmux, it's also gonna become a massive amount of
>>>>> duplication (like iMX). So I cannot tell which one is better ...
>>>>
>>>> Mhm. A middle ground could be keeping stm32mp15-pinctrl, but only for
>>>> the
>>>> official ST eval kits as HW designers are expected to copy off those
>>>> and have
>>>> board specifics in the board/SoM device tree?
>>>
>>> Then you should call it stm32mp1-something-st-eval-pinmux.dtsi ,
>>> otherwise it's gonna be confusing.
>>>
>>>> If it has to be either one or the other, I prefer duplication in the
>>>> device
>>>> tree. When the HW misses pull ups or needs to adjust slew rates, you
>>>> probably
>>>> don't want a new, slightly different, pinctrl group in the
>>>> stm32mp15-pinctrl.dtsi
>>>> for each variant.
>>>
>>> That's a valid point, but then you can override those in the boards'
>>> pinmux node for a specific pinmux entry too.
>>>
>>>> So you are left with doctoring around with overrides and
>>>> /delete-property/,
>>>> while just duplicating the node with the correct properties would've
>>>> been
>>>> better for readability IMO.
>>>
>>> That is true, but how many of such cases do we have so far ? Maybe it's
>>> better to cross that bridge when (if) we come to it.
>>>
>>
>> I agree, and I prefer to keep pins groups definition in
>> stm32mp15-pinctrl.dtsi file. IMO, it is easier for users to find them in
>> only one file. Actually, I already had this discussions with some guys
>> "where pins groups have to be defined ?". For me (and maybe only for
>> me), muxing is SOC dependent, I mean SoC provides a bunch a possible
>> pinmux for each IPs. If we got enough memory spaces (and time to waste
>> also) we could define all possible pinmux (AFx....) for each devices and
>> let board users chose the good one (using stm32mp15-pictrl.dtsi as a
>> database). In board file, you select one possible pin configuration
>> (provided by the SoC) for your device according to your schematic.
>> However you could append pin groups in board file to update bias,
>> slewrate ...
>> If your concern it to embed a bunch of not used pin configuration for a
>> board, we could use /omit-if-no-ref/ tag on pin groups.
>
> Can we instead define pinmux the way e.g. iMX6 does , as separate pins ,
> instead of pinmux groups ?
>
Sorry but what would the advantage to do so ?
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Linux-stm32] [PATCH 07/22] ARM: dts: stm32: Add alternate pinmux for SDMMC2 pins 4-7
2020-03-31 16:39 ` Alexandre Torgue
@ 2020-03-31 16:44 ` Marek Vasut
2020-04-01 9:49 ` Alexandre Torgue
0 siblings, 1 reply; 33+ messages in thread
From: Marek Vasut @ 2020-03-31 16:44 UTC (permalink / raw)
To: Alexandre Torgue, Ahmad Fatoum, Patrice CHOTARD, linux-arm-kernel
Cc: Patrick DELAUNAY, Maxime Coquelin, linux-stm32
On 3/31/20 6:39 PM, Alexandre Torgue wrote:
Hi,
[...]
>>> I agree, and I prefer to keep pins groups definition in
>>> stm32mp15-pinctrl.dtsi file. IMO, it is easier for users to find them in
>>> only one file. Actually, I already had this discussions with some guys
>>> "where pins groups have to be defined ?". For me (and maybe only for
>>> me), muxing is SOC dependent, I mean SoC provides a bunch a possible
>>> pinmux for each IPs. If we got enough memory spaces (and time to waste
>>> also) we could define all possible pinmux (AFx....) for each devices and
>>> let board users chose the good one (using stm32mp15-pictrl.dtsi as a
>>> database). In board file, you select one possible pin configuration
>>> (provided by the SoC) for your device according to your schematic.
>>> However you could append pin groups in board file to update bias,
>>> slewrate ...
>>> If your concern it to embed a bunch of not used pin configuration for a
>>> board, we could use /omit-if-no-ref/ tag on pin groups.
>>
>> Can we instead define pinmux the way e.g. iMX6 does , as separate pins ,
>> instead of pinmux groups ?
>>
>
> Sorry but what would the advantage to do so ?
You'd have per-board pinmux which would be perfect fit for that board,
without potentially affecting other boards with changes, without hacking
various things like drive-strengths in board files, and without having
the combinatorial explosion of the current single pinmux file.
--
Best regards,
Marek Vasut
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [Linux-stm32] [PATCH 07/22] ARM: dts: stm32: Add alternate pinmux for SDMMC2 pins 4-7
2020-03-31 16:44 ` Marek Vasut
@ 2020-04-01 9:49 ` Alexandre Torgue
0 siblings, 0 replies; 33+ messages in thread
From: Alexandre Torgue @ 2020-04-01 9:49 UTC (permalink / raw)
To: Marek Vasut, Ahmad Fatoum, Patrice CHOTARD, linux-arm-kernel
Cc: Patrick DELAUNAY, Maxime Coquelin, linux-stm32
On 3/31/20 6:44 PM, Marek Vasut wrote:
> On 3/31/20 6:39 PM, Alexandre Torgue wrote:
>
> Hi,
>
> [...]
>
>>>> I agree, and I prefer to keep pins groups definition in
>>>> stm32mp15-pinctrl.dtsi file. IMO, it is easier for users to find them in
>>>> only one file. Actually, I already had this discussions with some guys
>>>> "where pins groups have to be defined ?". For me (and maybe only for
>>>> me), muxing is SOC dependent, I mean SoC provides a bunch a possible
>>>> pinmux for each IPs. If we got enough memory spaces (and time to waste
>>>> also) we could define all possible pinmux (AFx....) for each devices and
>>>> let board users chose the good one (using stm32mp15-pictrl.dtsi as a
>>>> database). In board file, you select one possible pin configuration
>>>> (provided by the SoC) for your device according to your schematic.
>>>> However you could append pin groups in board file to update bias,
>>>> slewrate ...
>>>> If your concern it to embed a bunch of not used pin configuration for a
>>>> board, we could use /omit-if-no-ref/ tag on pin groups.
>>>
>>> Can we instead define pinmux the way e.g. iMX6 does , as separate pins ,
>>> instead of pinmux groups ?
>>>
>>
>> Sorry but what would the advantage to do so ?
>
> You'd have per-board pinmux which would be perfect fit for that board,
> without potentially affecting other boards with changes, without hacking
> various things like drive-strengths in board files, and without having
> the combinatorial explosion of the current single pinmux file.
>
It is something that we could analysis. Let's follow the way we
currently use. I'll let u know, when I have a better view on your
proposition.
thanks
alex
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 33+ messages in thread
* [PATCH 08/22] ARM: dts: stm32: Add eMMC attached to SDMMC2 on AV96
2020-03-28 17:11 [PATCH 00/22] ARM: dts: stm32: Repair AV96 board Marek Vasut
` (6 preceding siblings ...)
2020-03-28 17:11 ` [PATCH 07/22] ARM: dts: stm32: Add alternate pinmux for SDMMC2 pins 4-7 Marek Vasut
@ 2020-03-28 17:11 ` Marek Vasut
2020-03-28 17:11 ` [PATCH 09/22] ARM: dts: stm32: Repair PMIC configuration " Marek Vasut
` (13 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Marek Vasut @ 2020-03-28 17:11 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Marek Vasut, Alexandre Torgue, Patrice Chotard, Patrick Delaunay,
Maxime Coquelin, linux-stm32
Add DT node describing the eMMC attached to SDMMC2 controller
of the STM32MP1 on DHCOR SoM, which is the SoM soldered on AV96.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Patrick Delaunay <patrick.delaunay@st.com>
Cc: linux-stm32@st-md-mailman.stormreply.com
To: linux-arm-kernel@lists.infradead.org
---
arch/arm/boot/dts/stm32mp157a-avenger96.dts | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/arch/arm/boot/dts/stm32mp157a-avenger96.dts b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
index fe74ad68097c..dfd9c2863e78 100644
--- a/arch/arm/boot/dts/stm32mp157a-avenger96.dts
+++ b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
@@ -334,6 +334,21 @@ &sdmmc1 {
status = "okay";
};
+&sdmmc2 {
+ pinctrl-names = "default", "opendrain", "sleep";
+ pinctrl-0 = <&sdmmc2_b4_pins_a &sdmmc2_d47_pins_b>;
+ pinctrl-1 = <&sdmmc2_b4_od_pins_a &sdmmc2_d47_pins_b>;
+ pinctrl-2 = <&sdmmc2_b4_sleep_pins_a &sdmmc2_d47_sleep_pins_b>;
+ bus-width = <8>;
+ mmc-ddr-1_8v;
+ no-sd;
+ no-sdio;
+ non-removable;
+ st,neg-edge;
+ vmmc-supply = <&v1v8>;
+ status = "okay";
+};
+
&uart4 {
/* On Low speed expansion header */
label = "LS-UART1";
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 09/22] ARM: dts: stm32: Repair PMIC configuration on AV96
2020-03-28 17:11 [PATCH 00/22] ARM: dts: stm32: Repair AV96 board Marek Vasut
` (7 preceding siblings ...)
2020-03-28 17:11 ` [PATCH 08/22] ARM: dts: stm32: Add eMMC attached to SDMMC2 on AV96 Marek Vasut
@ 2020-03-28 17:11 ` Marek Vasut
2020-03-28 17:11 ` [PATCH 10/22] ARM: dts: stm32: Repair PMIC interrupt " Marek Vasut
` (12 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Marek Vasut @ 2020-03-28 17:11 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Marek Vasut, Alexandre Torgue, Patrice Chotard, Patrick Delaunay,
Maxime Coquelin, linux-stm32
The core and vdd PMIC buck regulators were misconfigured, which caused
instability of the board and malfunction of high-speed interfaces, like
the RGMII. Configure the PMIC correctly to repair these problems.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Patrick Delaunay <patrick.delaunay@st.com>
Cc: linux-stm32@st-md-mailman.stormreply.com
To: linux-arm-kernel@lists.infradead.org
---
arch/arm/boot/dts/stm32mp157a-avenger96.dts | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/stm32mp157a-avenger96.dts b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
index dfd9c2863e78..01ffb4c60caa 100644
--- a/arch/arm/boot/dts/stm32mp157a-avenger96.dts
+++ b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
@@ -178,7 +178,7 @@ regulators {
vddcore: buck1 {
regulator-name = "vddcore";
- regulator-min-microvolt = <1200000>;
+ regulator-min-microvolt = <800000>;
regulator-max-microvolt = <1350000>;
regulator-always-on;
regulator-initial-mode = <0>;
@@ -196,8 +196,8 @@ vdd_ddr: buck2 {
vdd: buck3 {
regulator-name = "vdd";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
+ regulator-min-microvolt = <2500000>;
+ regulator-max-microvolt = <2500000>;
regulator-always-on;
regulator-initial-mode = <0>;
regulator-over-current-protection;
@@ -275,6 +275,7 @@ vbus_otg: pwr_sw1 {
regulator-name = "vbus_otg";
interrupts = <IT_OCP_OTG 0>;
interrupt-parent = <&pmic>;
+ regulator-active-discharge = <1>;
};
vbus_sw: pwr_sw2 {
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 10/22] ARM: dts: stm32: Repair PMIC interrupt on AV96
2020-03-28 17:11 [PATCH 00/22] ARM: dts: stm32: Repair AV96 board Marek Vasut
` (8 preceding siblings ...)
2020-03-28 17:11 ` [PATCH 09/22] ARM: dts: stm32: Repair PMIC configuration " Marek Vasut
@ 2020-03-28 17:11 ` Marek Vasut
2020-03-28 17:11 ` [PATCH 11/22] ARM: dts: stm32: Add QSPI NOR " Marek Vasut
` (11 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Marek Vasut @ 2020-03-28 17:11 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Marek Vasut, Alexandre Torgue, Patrice Chotard, Patrick Delaunay,
Maxime Coquelin, linux-stm32
The PMIC interrupt line is connected to PA0 on the DHCOR SoM, fix it.
This makes the POWER button on the AV96 working, and also all the other
PMIC interrupts. Furthermore, scrub the bogus interrupt-parent props.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Patrick Delaunay <patrick.delaunay@st.com>
Cc: linux-stm32@st-md-mailman.stormreply.com
To: linux-arm-kernel@lists.infradead.org
---
arch/arm/boot/dts/stm32mp157a-avenger96.dts | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/stm32mp157a-avenger96.dts b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
index 01ffb4c60caa..01f57ba64478 100644
--- a/arch/arm/boot/dts/stm32mp157a-avenger96.dts
+++ b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
@@ -160,7 +160,7 @@ &i2c4 {
pmic: stpmic@33 {
compatible = "st,stpmic1";
reg = <0x33>;
- interrupts-extended = <&exti 55 IRQ_TYPE_EDGE_FALLING>;
+ interrupts-extended = <&gpioa 0 IRQ_TYPE_EDGE_FALLING>;
interrupt-controller;
#interrupt-cells = <2>;
status = "okay";
@@ -217,7 +217,6 @@ vdda: ldo1 {
regulator-min-microvolt = <2900000>;
regulator-max-microvolt = <2900000>;
interrupts = <IT_CURLIM_LDO1 0>;
- interrupt-parent = <&pmic>;
};
v2v8: ldo2 {
@@ -225,7 +224,6 @@ v2v8: ldo2 {
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
interrupts = <IT_CURLIM_LDO2 0>;
- interrupt-parent = <&pmic>;
};
vtt_ddr: ldo3 {
@@ -239,7 +237,6 @@ vtt_ddr: ldo3 {
vdd_usb: ldo4 {
regulator-name = "vdd_usb";
interrupts = <IT_CURLIM_LDO4 0>;
- interrupt-parent = <&pmic>;
};
vdd_sd: ldo5 {
@@ -247,7 +244,6 @@ vdd_sd: ldo5 {
regulator-min-microvolt = <2900000>;
regulator-max-microvolt = <2900000>;
interrupts = <IT_CURLIM_LDO5 0>;
- interrupt-parent = <&pmic>;
regulator-boot-on;
};
@@ -256,7 +252,6 @@ v1v8: ldo6 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
interrupts = <IT_CURLIM_LDO6 0>;
- interrupt-parent = <&pmic>;
regulator-enable-ramp-delay = <300000>;
};
@@ -268,20 +263,17 @@ vref_ddr: vref_ddr {
bst_out: boost {
regulator-name = "bst_out";
interrupts = <IT_OCP_BOOST 0>;
- interrupt-parent = <&pmic>;
};
vbus_otg: pwr_sw1 {
regulator-name = "vbus_otg";
interrupts = <IT_OCP_OTG 0>;
- interrupt-parent = <&pmic>;
regulator-active-discharge = <1>;
};
vbus_sw: pwr_sw2 {
regulator-name = "vbus_sw";
interrupts = <IT_OCP_SWOUT 0>;
- interrupt-parent = <&pmic>;
regulator-active-discharge = <1>;
};
};
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 11/22] ARM: dts: stm32: Add QSPI NOR on AV96
2020-03-28 17:11 [PATCH 00/22] ARM: dts: stm32: Repair AV96 board Marek Vasut
` (9 preceding siblings ...)
2020-03-28 17:11 ` [PATCH 10/22] ARM: dts: stm32: Repair PMIC interrupt " Marek Vasut
@ 2020-03-28 17:11 ` Marek Vasut
2020-03-28 17:11 ` [PATCH 12/22] ARM: dts: stm32: Add configuration EEPROM " Marek Vasut
` (10 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Marek Vasut @ 2020-03-28 17:11 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Marek Vasut, Alexandre Torgue, Patrice Chotard, Patrick Delaunay,
Maxime Coquelin, linux-stm32
The DH Electronics DHCOR SOM has QSPI NOR on the SoM itself, add it
into the DT.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Patrick Delaunay <patrick.delaunay@st.com>
Cc: linux-stm32@st-md-mailman.stormreply.com
To: linux-arm-kernel@lists.infradead.org
---
arch/arm/boot/dts/stm32mp157a-avenger96.dts | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/arch/arm/boot/dts/stm32mp157a-avenger96.dts b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
index 01f57ba64478..1c7a00a3cc53 100644
--- a/arch/arm/boot/dts/stm32mp157a-avenger96.dts
+++ b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
@@ -21,6 +21,7 @@ aliases {
mmc0 = &sdmmc1;
serial0 = &uart4;
serial1 = &uart7;
+ spi0 = &qspi;
};
chosen {
@@ -302,6 +303,25 @@ &pwr_regulators {
vdd_3v3_usbfs-supply = <&vdd_usb>;
};
+&qspi {
+ pinctrl-names = "default", "sleep";
+ pinctrl-0 = <&qspi_clk_pins_a &qspi_bk1_pins_a>;
+ pinctrl-1 = <&qspi_clk_sleep_pins_a &qspi_bk1_sleep_pins_a>;
+ reg = <0x58003000 0x1000>, <0x70000000 0x4000000>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "okay";
+
+ flash0: mx66l51235l@0 {
+ compatible = "jedec,spi-nor";
+ reg = <0>;
+ spi-rx-bus-width = <4>;
+ spi-max-frequency = <108000000>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+ };
+};
+
&rng1 {
status = "okay";
};
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 12/22] ARM: dts: stm32: Add configuration EEPROM on AV96
2020-03-28 17:11 [PATCH 00/22] ARM: dts: stm32: Repair AV96 board Marek Vasut
` (10 preceding siblings ...)
2020-03-28 17:11 ` [PATCH 11/22] ARM: dts: stm32: Add QSPI NOR " Marek Vasut
@ 2020-03-28 17:11 ` Marek Vasut
2020-03-28 17:11 ` [PATCH 13/22] ARM: dts: stm32: Enable GPU " Marek Vasut
` (9 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Marek Vasut @ 2020-03-28 17:11 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Marek Vasut, Alexandre Torgue, Patrice Chotard, Patrick Delaunay,
Maxime Coquelin, linux-stm32
The board has an EEPROM on the same I2C bus as PMIC, at address 0x53.
The EEPROM contains the board MAC address.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Patrick Delaunay <patrick.delaunay@st.com>
Cc: linux-stm32@st-md-mailman.stormreply.com
To: linux-arm-kernel@lists.infradead.org
---
arch/arm/boot/dts/stm32mp157a-avenger96.dts | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm/boot/dts/stm32mp157a-avenger96.dts b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
index 1c7a00a3cc53..b9e80cd7ec51 100644
--- a/arch/arm/boot/dts/stm32mp157a-avenger96.dts
+++ b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
@@ -291,6 +291,12 @@ watchdog {
status = "disabled";
};
};
+
+ eeprom@53 {
+ compatible = "atmel,24c02";
+ reg = <0x53>;
+ pagesize = <16>;
+ };
};
&iwdg2 {
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 13/22] ARM: dts: stm32: Enable GPU on AV96
2020-03-28 17:11 [PATCH 00/22] ARM: dts: stm32: Repair AV96 board Marek Vasut
` (11 preceding siblings ...)
2020-03-28 17:11 ` [PATCH 12/22] ARM: dts: stm32: Add configuration EEPROM " Marek Vasut
@ 2020-03-28 17:11 ` Marek Vasut
2020-03-28 17:11 ` [PATCH 14/22] ARM: dts: stm32: Add alternate pinmux for SDMMC3 pins Marek Vasut
` (8 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Marek Vasut @ 2020-03-28 17:11 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Marek Vasut, Alexandre Torgue, Patrice Chotard, Patrick Delaunay,
Maxime Coquelin, linux-stm32
Enable the GPU present on the STM32MP1 populated on AV96.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Patrick Delaunay <patrick.delaunay@st.com>
Cc: linux-stm32@st-md-mailman.stormreply.com
To: linux-arm-kernel@lists.infradead.org
---
arch/arm/boot/dts/stm32mp157a-avenger96.dts | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/boot/dts/stm32mp157a-avenger96.dts b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
index b9e80cd7ec51..e3b0cf34521a 100644
--- a/arch/arm/boot/dts/stm32mp157a-avenger96.dts
+++ b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
@@ -129,6 +129,10 @@ phy0: ethernet-phy@7 {
};
};
+&gpu {
+ status = "okay";
+};
+
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_b>;
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 14/22] ARM: dts: stm32: Add alternate pinmux for SDMMC3 pins
2020-03-28 17:11 [PATCH 00/22] ARM: dts: stm32: Repair AV96 board Marek Vasut
` (12 preceding siblings ...)
2020-03-28 17:11 ` [PATCH 13/22] ARM: dts: stm32: Enable GPU " Marek Vasut
@ 2020-03-28 17:11 ` Marek Vasut
2020-03-28 17:11 ` [PATCH 15/22] ARM: dts: stm32: Enable WiFi on AV96 Marek Vasut
` (7 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Marek Vasut @ 2020-03-28 17:11 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Marek Vasut, Alexandre Torgue, Patrice Chotard, Patrick Delaunay,
Maxime Coquelin, linux-stm32
Add another mux option for SDMMC3 pins, in particular PD5_SDMMC3_D2 and
PD0_SDMMC3_CMD, this is used on AV96 board.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Patrick Delaunay <patrick.delaunay@st.com>
Cc: linux-stm32@st-md-mailman.stormreply.com
To: linux-arm-kernel@lists.infradead.org
---
arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 54 ++++++++++++++++++++++++
1 file changed, 54 insertions(+)
diff --git a/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi b/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
index 6a37af213eb6..43e56c08e46b 100644
--- a/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
@@ -1137,6 +1137,60 @@ pins {
};
};
+ sdmmc3_b4_pins_b: sdmmc3-b4-1 {
+ pins1 {
+ pinmux = <STM32_PINMUX('F', 0, AF9)>, /* SDMMC3_D0 */
+ <STM32_PINMUX('F', 4, AF9)>, /* SDMMC3_D1 */
+ <STM32_PINMUX('D', 5, AF10)>, /* SDMMC3_D2 */
+ <STM32_PINMUX('D', 7, AF10)>, /* SDMMC3_D3 */
+ <STM32_PINMUX('D', 0, AF10)>; /* SDMMC3_CMD */
+ slew-rate = <1>;
+ drive-push-pull;
+ bias-pull-up;
+ };
+ pins2 {
+ pinmux = <STM32_PINMUX('G', 15, AF10)>; /* SDMMC3_CK */
+ slew-rate = <2>;
+ drive-push-pull;
+ bias-pull-up;
+ };
+ };
+
+ sdmmc3_b4_od_pins_b: sdmmc3-b4-od-1 {
+ pins1 {
+ pinmux = <STM32_PINMUX('F', 0, AF9)>, /* SDMMC3_D0 */
+ <STM32_PINMUX('F', 4, AF9)>, /* SDMMC3_D1 */
+ <STM32_PINMUX('D', 5, AF10)>, /* SDMMC3_D2 */
+ <STM32_PINMUX('D', 7, AF10)>; /* SDMMC3_D3 */
+ slew-rate = <1>;
+ drive-push-pull;
+ bias-pull-up;
+ };
+ pins2 {
+ pinmux = <STM32_PINMUX('G', 15, AF10)>; /* SDMMC3_CK */
+ slew-rate = <2>;
+ drive-push-pull;
+ bias-pull-up;
+ };
+ pins3 {
+ pinmux = <STM32_PINMUX('D', 0, AF10)>; /* SDMMC2_CMD */
+ slew-rate = <1>;
+ drive-open-drain;
+ bias-pull-up;
+ };
+ };
+
+ sdmmc3_b4_sleep_pins_b: sdmmc3-b4-sleep-1 {
+ pins {
+ pinmux = <STM32_PINMUX('F', 0, ANALOG)>, /* SDMMC3_D0 */
+ <STM32_PINMUX('F', 4, ANALOG)>, /* SDMMC3_D1 */
+ <STM32_PINMUX('D', 5, ANALOG)>, /* SDMMC3_D2 */
+ <STM32_PINMUX('D', 7, ANALOG)>, /* SDMMC3_D3 */
+ <STM32_PINMUX('G', 15, ANALOG)>, /* SDMMC3_CK */
+ <STM32_PINMUX('D', 0, ANALOG)>; /* SDMMC3_CMD */
+ };
+ };
+
spdifrx_pins_a: spdifrx-0 {
pins {
pinmux = <STM32_PINMUX('G', 12, AF8)>; /* SPDIF_IN1 */
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 15/22] ARM: dts: stm32: Enable WiFi on AV96
2020-03-28 17:11 [PATCH 00/22] ARM: dts: stm32: Repair AV96 board Marek Vasut
` (13 preceding siblings ...)
2020-03-28 17:11 ` [PATCH 14/22] ARM: dts: stm32: Add alternate pinmux for SDMMC3 pins Marek Vasut
@ 2020-03-28 17:11 ` Marek Vasut
2020-03-28 17:11 ` [PATCH 16/22] ARM: dts: stm32: Add alternate pinmux for USART2 pins Marek Vasut
` (6 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Marek Vasut @ 2020-03-28 17:11 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Marek Vasut, Alexandre Torgue, Patrice Chotard, Patrick Delaunay,
Maxime Coquelin, linux-stm32
The WiFi/Bluetooth SDIO chip is attached to SDMMC3 on AV96, describe it
in DT to make it available. Remove WiFi LED and turn it into a regulator,
because it is a GPIO controlling the WL_REG_ON input of the WiFi chip.
The LED is just an indicator connected to the same line, but not the
primary function.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Patrick Delaunay <patrick.delaunay@st.com>
Cc: linux-stm32@st-md-mailman.stormreply.com
To: linux-arm-kernel@lists.infradead.org
---
arch/arm/boot/dts/stm32mp157a-avenger96.dts | 38 +++++++++++++++++----
1 file changed, 31 insertions(+), 7 deletions(-)
diff --git a/arch/arm/boot/dts/stm32mp157a-avenger96.dts b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
index e3b0cf34521a..7b273d0c6385 100644
--- a/arch/arm/boot/dts/stm32mp157a-avenger96.dts
+++ b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
@@ -65,13 +65,6 @@ led4 {
};
led5 {
- label = "yellow:wifi";
- gpios = <&gpioz 3 GPIO_ACTIVE_HIGH>;
- linux,default-trigger = "phy0tx";
- default-state = "off";
- };
-
- led6 {
label = "blue:bt";
gpios = <&gpioz 6 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "bluetooth-power";
@@ -92,6 +85,17 @@ sd_switch: regulator-sd_switch {
states = <1800000 0x1>,
<2900000 0x0>;
};
+
+ wlan_pwr: regulator-wlan {
+ compatible = "regulator-fixed";
+
+ regulator-name = "wl-reg";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+
+ gpios = <&gpioz 3 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ };
};
ðernet0 {
@@ -372,6 +376,26 @@ &sdmmc2 {
status = "okay";
};
+&sdmmc3 {
+ pinctrl-names = "default", "opendrain", "sleep";
+ pinctrl-0 = <&sdmmc3_b4_pins_b>;
+ pinctrl-1 = <&sdmmc3_b4_od_pins_b>;
+ pinctrl-2 = <&sdmmc3_b4_sleep_pins_b>;
+ broken-cd;
+ non-removable;
+ st,neg-edge;
+ bus-width = <4>;
+ vmmc-supply = <&wlan_pwr>;
+ status = "okay";
+
+ #address-cells = <1>;
+ #size-cells = <0>;
+ brcmf: bcrmf@1 {
+ reg = <1>;
+ compatible = "brcm,bcm4329-fmac";
+ };
+};
+
&uart4 {
/* On Low speed expansion header */
label = "LS-UART1";
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 16/22] ARM: dts: stm32: Add alternate pinmux for USART2 pins
2020-03-28 17:11 [PATCH 00/22] ARM: dts: stm32: Repair AV96 board Marek Vasut
` (14 preceding siblings ...)
2020-03-28 17:11 ` [PATCH 15/22] ARM: dts: stm32: Enable WiFi on AV96 Marek Vasut
@ 2020-03-28 17:11 ` Marek Vasut
2020-03-28 17:11 ` [PATCH 17/22] ARM: dts: stm32: Enable Bluetooth on AV96 Marek Vasut
` (5 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Marek Vasut @ 2020-03-28 17:11 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Marek Vasut, Alexandre Torgue, Patrice Chotard, Patrick Delaunay,
Maxime Coquelin, linux-stm32
Add mux option for USART2 pins, this is used on AV96 board.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Patrick Delaunay <patrick.delaunay@st.com>
Cc: linux-stm32@st-md-mailman.stormreply.com
To: linux-arm-kernel@lists.infradead.org
---
arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi b/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
index 43e56c08e46b..38ebd1a94577 100644
--- a/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
@@ -1204,6 +1204,30 @@ pins {
};
};
+ usart2_pins_a: usart2-0 {
+ pins1 {
+ pinmux = <STM32_PINMUX('F', 5, AF7)>, /* USART2_TX */
+ <STM32_PINMUX('D', 4, AF7)>; /* USART2_RTS */
+ bias-disable;
+ drive-push-pull;
+ slew-rate = <0>;
+ };
+ pins2 {
+ pinmux = <STM32_PINMUX('D', 6, AF7)>, /* USART2_RX */
+ <STM32_PINMUX('D', 3, AF7)>; /* USART2_CTS_NSS */
+ bias-disable;
+ };
+ };
+
+ usart2_sleep_pins_a: usart2-sleep-0 {
+ pins {
+ pinmux = <STM32_PINMUX('F', 5, ANALOG)>, /* USART2_TX */
+ <STM32_PINMUX('D', 4, ANALOG)>, /* USART2_RTS */
+ <STM32_PINMUX('D', 6, ANALOG)>, /* USART2_RX */
+ <STM32_PINMUX('D', 3, ANALOG)>; /* USART2_CTS_NSS */
+ };
+ };
+
usart3_pins_a: usart3-0 {
pins1 {
pinmux = <STM32_PINMUX('B', 10, AF7)>; /* USART3_TX */
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 17/22] ARM: dts: stm32: Enable Bluetooth on AV96
2020-03-28 17:11 [PATCH 00/22] ARM: dts: stm32: Repair AV96 board Marek Vasut
` (15 preceding siblings ...)
2020-03-28 17:11 ` [PATCH 16/22] ARM: dts: stm32: Add alternate pinmux for USART2 pins Marek Vasut
@ 2020-03-28 17:11 ` Marek Vasut
2020-03-28 17:11 ` [PATCH 18/22] ARM: dts: stm32: Add alternate pinmux for LTDC pins Marek Vasut
` (4 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Marek Vasut @ 2020-03-28 17:11 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Marek Vasut, Alexandre Torgue, Patrice Chotard, Patrick Delaunay,
Maxime Coquelin, linux-stm32
The WiFi/Bluetooth chip is attached to USART2 on AV96 as well, describe
it in DT to make it available. Remove BT LED and turn it into a shutdown
GPIO, because the GPIO line controls the BT_REG_ON signal. The LED is just
an indicator connected to the same line, but not the primary function.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Patrick Delaunay <patrick.delaunay@st.com>
Cc: linux-stm32@st-md-mailman.stormreply.com
To: linux-arm-kernel@lists.infradead.org
---
arch/arm/boot/dts/stm32mp157a-avenger96.dts | 23 ++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/arch/arm/boot/dts/stm32mp157a-avenger96.dts b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
index 7b273d0c6385..dc1f59239042 100644
--- a/arch/arm/boot/dts/stm32mp157a-avenger96.dts
+++ b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
@@ -21,6 +21,7 @@ aliases {
mmc0 = &sdmmc1;
serial0 = &uart4;
serial1 = &uart7;
+ serial2 = &usart2;
spi0 = &qspi;
};
@@ -63,13 +64,6 @@ led4 {
default-state = "off";
panic-indicator;
};
-
- led5 {
- label = "blue:bt";
- gpios = <&gpioz 6 GPIO_ACTIVE_HIGH>;
- linux,default-trigger = "bluetooth-power";
- default-state = "off";
- };
};
sd_switch: regulator-sd_switch {
@@ -411,3 +405,18 @@ &uart7 {
pinctrl-0 = <&uart7_pins_a>;
status = "okay";
};
+
+/* Bluetooth */
+&usart2 {
+ pinctrl-names = "default", "sleep";
+ pinctrl-0 = <&usart2_pins_a>;
+ pinctrl-1 = <&usart2_sleep_pins_a>;
+ st,hw-flow-ctrl;
+ status = "okay";
+
+ bluetooth {
+ compatible = "brcm,bcm43438-bt";
+ max-speed = <3000000>;
+ shutdown-gpios = <&gpioz 6 GPIO_ACTIVE_HIGH>;
+ };
+};
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 18/22] ARM: dts: stm32: Add alternate pinmux for LTDC pins
2020-03-28 17:11 [PATCH 00/22] ARM: dts: stm32: Repair AV96 board Marek Vasut
` (16 preceding siblings ...)
2020-03-28 17:11 ` [PATCH 17/22] ARM: dts: stm32: Enable Bluetooth on AV96 Marek Vasut
@ 2020-03-28 17:11 ` Marek Vasut
2020-03-28 17:11 ` [PATCH 19/22] ARM: dts: stm32: Add bindings for HDMI video on AV96 Marek Vasut
` (3 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Marek Vasut @ 2020-03-28 17:11 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Marek Vasut, Alexandre Torgue, Patrice Chotard, Patrick Delaunay,
Maxime Coquelin, linux-stm32
Add new mux option for LTDC pins, this is used on AV96 board.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Patrick Delaunay <patrick.delaunay@st.com>
Cc: linux-stm32@st-md-mailman.stormreply.com
To: linux-arm-kernel@lists.infradead.org
---
arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 74 ++++++++++++++++++++++++
1 file changed, 74 insertions(+)
diff --git a/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi b/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
index 38ebd1a94577..66ad4f122eb1 100644
--- a/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
@@ -532,6 +532,80 @@ pins {
};
};
+ ltdc_pins_c: ltdc-c-0 {
+ pins1 {
+ pinmux = <STM32_PINMUX('G', 7, AF14)>; /* LCD_CLK */
+ bias-disable;
+ drive-push-pull;
+ slew-rate = <3>;
+ };
+ pins2 {
+ pinmux = <STM32_PINMUX('I', 10, AF14)>, /* LCD_HSYNC */
+ <STM32_PINMUX('I', 9, AF14)>, /* LCD_VSYNC */
+ <STM32_PINMUX('E', 13, AF14)>, /* LCD_DE */
+ <STM32_PINMUX('G', 13, AF14)>, /* LCD_R0 */
+ <STM32_PINMUX('H', 3, AF14)>, /* LCD_R1 */
+ <STM32_PINMUX('H', 8, AF14)>, /* LCD_R2 */
+ <STM32_PINMUX('H', 9, AF14)>, /* LCD_R3 */
+ <STM32_PINMUX('A', 5, AF14)>, /* LCD_R4 */
+ <STM32_PINMUX('H', 11, AF14)>, /* LCD_R5 */
+ <STM32_PINMUX('H', 12, AF14)>, /* LCD_R6 */
+ <STM32_PINMUX('E', 15, AF14)>, /* LCD_R7 */
+ <STM32_PINMUX('E', 5, AF14)>, /* LCD_G0 */
+ <STM32_PINMUX('B', 0, AF14)>, /* LCD_G1 */
+ <STM32_PINMUX('H', 13, AF14)>, /* LCD_G2 */
+ <STM32_PINMUX('E', 11, AF14)>, /* LCD_G3 */
+ <STM32_PINMUX('H', 15, AF14)>, /* LCD_G4 */
+ <STM32_PINMUX('H', 4, AF9)>, /* LCD_G5 */
+ <STM32_PINMUX('I', 11, AF9)>, /* LCD_G6 */
+ <STM32_PINMUX('G', 8, AF14)>, /* LCD_G7 */
+ <STM32_PINMUX('D', 9, AF14)>, /* LCD_B0 */
+ <STM32_PINMUX('G', 12, AF14)>, /* LCD_B1 */
+ <STM32_PINMUX('G', 10, AF14)>, /* LCD_B2 */
+ <STM32_PINMUX('D', 10, AF14)>, /* LCD_B3 */
+ <STM32_PINMUX('E', 12, AF14)>, /* LCD_B4 */
+ <STM32_PINMUX('A', 3, AF14)>, /* LCD_B5 */
+ <STM32_PINMUX('B', 8, AF14)>, /* LCD_B6 */
+ <STM32_PINMUX('I', 7, AF14)>; /* LCD_B7 */
+ bias-disable;
+ drive-push-pull;
+ slew-rate = <2>;
+ };
+ };
+
+ ltdc_pins_sleep_c: ltdc-c-1 {
+ pins {
+ pinmux = <STM32_PINMUX('G', 7, ANALOG)>, /* LCD_CLK */
+ <STM32_PINMUX('I', 10, ANALOG)>, /* LCD_HSYNC */
+ <STM32_PINMUX('I', 9, ANALOG)>, /* LCD_VSYNC */
+ <STM32_PINMUX('E', 13, ANALOG)>, /* LCD_DE */
+ <STM32_PINMUX('G', 13, ANALOG)>, /* LCD_R0 */
+ <STM32_PINMUX('H', 3, ANALOG)>, /* LCD_R1 */
+ <STM32_PINMUX('H', 8, ANALOG)>, /* LCD_R2 */
+ <STM32_PINMUX('H', 9, ANALOG)>, /* LCD_R3 */
+ <STM32_PINMUX('A', 5, ANALOG)>, /* LCD_R4 */
+ <STM32_PINMUX('H', 11, ANALOG)>, /* LCD_R5 */
+ <STM32_PINMUX('H', 12, ANALOG)>, /* LCD_R6 */
+ <STM32_PINMUX('E', 15, ANALOG)>, /* LCD_R7 */
+ <STM32_PINMUX('E', 5, ANALOG)>, /* LCD_G0 */
+ <STM32_PINMUX('B', 0, ANALOG)>, /* LCD_G1 */
+ <STM32_PINMUX('H', 13, ANALOG)>, /* LCD_G2 */
+ <STM32_PINMUX('E', 11, ANALOG)>, /* LCD_G3 */
+ <STM32_PINMUX('H', 15, ANALOG)>, /* LCD_G4 */
+ <STM32_PINMUX('H', 4, ANALOG)>, /* LCD_G5 */
+ <STM32_PINMUX('I', 11, ANALOG)>, /* LCD_G6 */
+ <STM32_PINMUX('G', 8, ANALOG)>, /* LCD_G7 */
+ <STM32_PINMUX('D', 9, ANALOG)>, /* LCD_B0 */
+ <STM32_PINMUX('G', 12, ANALOG)>, /* LCD_B1 */
+ <STM32_PINMUX('G', 10, ANALOG)>, /* LCD_B2 */
+ <STM32_PINMUX('D', 10, ANALOG)>, /* LCD_B3 */
+ <STM32_PINMUX('E', 12, ANALOG)>, /* LCD_B4 */
+ <STM32_PINMUX('A', 3, ANALOG)>, /* LCD_B5 */
+ <STM32_PINMUX('B', 8, ANALOG)>, /* LCD_B6 */
+ <STM32_PINMUX('I', 7, ANALOG)>; /* LCD_B7 */
+ };
+ };
+
m_can1_pins_a: m-can1-0 {
pins1 {
pinmux = <STM32_PINMUX('H', 13, AF9)>; /* CAN1_TX */
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 19/22] ARM: dts: stm32: Add bindings for HDMI video on AV96
2020-03-28 17:11 [PATCH 00/22] ARM: dts: stm32: Repair AV96 board Marek Vasut
` (17 preceding siblings ...)
2020-03-28 17:11 ` [PATCH 18/22] ARM: dts: stm32: Add alternate pinmux for LTDC pins Marek Vasut
@ 2020-03-28 17:11 ` Marek Vasut
2020-03-28 17:11 ` [PATCH 20/22] ARM: dts: stm32: Add bindings for audio " Marek Vasut
` (2 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Marek Vasut @ 2020-03-28 17:11 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Marek Vasut, Alexandre Torgue, Patrice Chotard, Patrick Delaunay,
Maxime Coquelin, linux-stm32
Fill in the HDMI video pipeline from AV96 into the DT.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Patrick Delaunay <patrick.delaunay@st.com>
Cc: linux-stm32@st-md-mailman.stormreply.com
To: linux-arm-kernel@lists.infradead.org
---
arch/arm/boot/dts/stm32mp157a-avenger96.dts | 79 +++++++++++++++++++++
1 file changed, 79 insertions(+)
diff --git a/arch/arm/boot/dts/stm32mp157a-avenger96.dts b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
index dc1f59239042..f0f723558be7 100644
--- a/arch/arm/boot/dts/stm32mp157a-avenger96.dts
+++ b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
@@ -25,10 +25,28 @@ aliases {
spi0 = &qspi;
};
+ /* XTal Q1 */
+ cec_clock: clk-cec-fixed {
+ #clock-cells = <0>;
+ compatible = "fixed-clock";
+ clock-frequency = <24000000>;
+ };
+
chosen {
stdout-path = "serial0:115200n8";
};
+ hdmi-out {
+ compatible = "hdmi-connector";
+ type = "a";
+
+ port {
+ hdmi_con: endpoint {
+ remote-endpoint = <&adv7513_out>;
+ };
+ };
+ };
+
memory@c0000000 {
device_type = "memory";
reg = <0xc0000000 0x40000000>;
@@ -294,6 +312,50 @@ watchdog {
};
};
+ hdmi-transmitter@3d {
+ compatible = "adi,adv7513";
+ reg = <0x3d>, <0x2d>, <0x4d>, <0x5d>;
+ reg-names = "main", "cec", "edid", "packet";
+ clocks = <&cec_clock>;
+ clock-names = "cec";
+
+ avdd-supply = <&v3v3>;
+ dvdd-supply = <&v3v3>;
+ pvdd-supply = <&v3v3>;
+ dvdd-3v-supply = <&v3v3>;
+ bgvdd-supply = <&v3v3>;
+
+ interrupts = <9 IRQ_TYPE_EDGE_FALLING>;
+ interrupt-parent = <&gpiog>;
+
+ status = "okay";
+
+ adi,input-depth = <8>;
+ adi,input-colorspace = "rgb";
+ adi,input-clock = "1x";
+ adi,input-style = <1>;
+ adi,input-justification = "evenly";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ adv7513_in: endpoint {
+ remote-endpoint = <<dc_ep0_out>;
+ };
+ };
+
+ port@1 {
+ reg = <1>;
+ adv7513_out: endpoint {
+ remote-endpoint = <&hdmi_con>;
+ };
+ };
+ };
+ };
+
eeprom@53 {
compatible = "atmel,24c02";
reg = <0x53>;
@@ -306,6 +368,23 @@ &iwdg2 {
status = "okay";
};
+<dc {
+ pinctrl-names = "default", "sleep";
+ pinctrl-0 = <<dc_pins_c>;
+ pinctrl-1 = <<dc_pins_sleep_c>;
+ status = "okay";
+
+ port {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ ltdc_ep0_out: endpoint@0 {
+ reg = <0>;
+ remote-endpoint = <&adv7513_in>;
+ };
+ };
+};
+
&pwr_regulators {
vdd-supply = <&vdd>;
vdd_3v3_usbfs-supply = <&vdd_usb>;
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 20/22] ARM: dts: stm32: Add bindings for audio on AV96
2020-03-28 17:11 [PATCH 00/22] ARM: dts: stm32: Repair AV96 board Marek Vasut
` (18 preceding siblings ...)
2020-03-28 17:11 ` [PATCH 19/22] ARM: dts: stm32: Add bindings for HDMI video on AV96 Marek Vasut
@ 2020-03-28 17:11 ` Marek Vasut
2020-03-28 17:11 ` [PATCH 21/22] ARM: dts: stm32: Add bindings for USB " Marek Vasut
2020-03-28 17:11 ` [PATCH 22/22] ARM: dts: stm32: Rename LEDs to match silkscreen " Marek Vasut
21 siblings, 0 replies; 33+ messages in thread
From: Marek Vasut @ 2020-03-28 17:11 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Marek Vasut, Alexandre Torgue, Patrice Chotard, Patrick Delaunay,
Maxime Coquelin, linux-stm32
Fill in the bindings for HDMI audio on AV96, this permits audio playback
via attached HDMI device if such device supports it.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Patrick Delaunay <patrick.delaunay@st.com>
Cc: linux-stm32@st-md-mailman.stormreply.com
To: linux-arm-kernel@lists.infradead.org
---
arch/arm/boot/dts/stm32mp157a-avenger96.dts | 39 +++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/arch/arm/boot/dts/stm32mp157a-avenger96.dts b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
index f0f723558be7..4a61b5263ad3 100644
--- a/arch/arm/boot/dts/stm32mp157a-avenger96.dts
+++ b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
@@ -98,6 +98,13 @@ sd_switch: regulator-sd_switch {
<2900000 0x0>;
};
+ sound {
+ compatible = "audio-graph-card";
+ label = "STM32MP1-AV96-HDMI";
+ dais = <&sai2a_port>;
+ status = "okay";
+ };
+
wlan_pwr: regulator-wlan {
compatible = "regulator-fixed";
@@ -353,6 +360,13 @@ adv7513_out: endpoint {
remote-endpoint = <&hdmi_con>;
};
};
+
+ port@2 {
+ reg = <2>;
+ adv7513_i2s0: endpoint {
+ remote-endpoint = <&sai2a_endpoint>;
+ };
+ };
};
};
@@ -417,6 +431,31 @@ &rtc {
status = "okay";
};
+&sai2 {
+ clocks = <&rcc SAI2>, <&rcc PLL3_Q>, <&rcc PLL3_R>;
+ pinctrl-names = "default", "sleep";
+ pinctrl-0 = <&sai2a_pins_c>;
+ pinctrl-1 = <&sai2a_sleep_pins_c>;
+ clock-names = "pclk", "x8k", "x11k";
+ status = "okay";
+
+ sai2a: audio-controller@4400b004 {
+ #clock-cells = <0>;
+ dma-names = "tx";
+ clocks = <&rcc SAI2_K>;
+ clock-names = "sai_ck";
+ status = "okay";
+
+ sai2a_port: port {
+ sai2a_endpoint: endpoint {
+ remote-endpoint = <&adv7513_i2s0>;
+ format = "i2s";
+ mclk-fs = <256>;
+ };
+ };
+ };
+};
+
&sdmmc1 {
pinctrl-names = "default", "opendrain", "sleep";
pinctrl-0 = <&sdmmc1_b4_pins_a &sdmmc1_dir_pins_b>;
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 21/22] ARM: dts: stm32: Add bindings for USB on AV96
2020-03-28 17:11 [PATCH 00/22] ARM: dts: stm32: Repair AV96 board Marek Vasut
` (19 preceding siblings ...)
2020-03-28 17:11 ` [PATCH 20/22] ARM: dts: stm32: Add bindings for audio " Marek Vasut
@ 2020-03-28 17:11 ` Marek Vasut
2020-03-28 17:11 ` [PATCH 22/22] ARM: dts: stm32: Rename LEDs to match silkscreen " Marek Vasut
21 siblings, 0 replies; 33+ messages in thread
From: Marek Vasut @ 2020-03-28 17:11 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Marek Vasut, Alexandre Torgue, Patrice Chotard, Patrick Delaunay,
Maxime Coquelin, linux-stm32
Fill in the bindings for USB host and gadget on AV96.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Patrick Delaunay <patrick.delaunay@st.com>
Cc: linux-stm32@st-md-mailman.stormreply.com
To: linux-arm-kernel@lists.infradead.org
---
arch/arm/boot/dts/stm32mp157a-avenger96.dts | 31 +++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/arch/arm/boot/dts/stm32mp157a-avenger96.dts b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
index 4a61b5263ad3..a779f7ea2025 100644
--- a/arch/arm/boot/dts/stm32mp157a-avenger96.dts
+++ b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
@@ -538,3 +538,34 @@ bluetooth {
shutdown-gpios = <&gpioz 6 GPIO_ACTIVE_HIGH>;
};
};
+
+&usbh_ehci {
+ phys = <&usbphyc_port0>;
+ phy-names = "usb";
+ status = "okay";
+};
+
+&usbotg_hs {
+ pinctrl-0 = <&usbotg_hs_pins_a>;
+ pinctrl-names = "default";
+ phy-names = "usb2-phy";
+ phys = <&usbphyc_port1 0>;
+ status = "okay";
+ vbus-supply = <&vbus_otg>;
+};
+
+&usbphyc {
+ status = "okay";
+};
+
+&usbphyc_port0 {
+ phy-supply = <&vdd_usb>;
+ vdda1v1-supply = <®11>;
+ vdda1v8-supply = <®18>;
+};
+
+&usbphyc_port1 {
+ phy-supply = <&vdd_usb>;
+ vdda1v1-supply = <®11>;
+ vdda1v8-supply = <®18>;
+};
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 22/22] ARM: dts: stm32: Rename LEDs to match silkscreen on AV96
2020-03-28 17:11 [PATCH 00/22] ARM: dts: stm32: Repair AV96 board Marek Vasut
` (20 preceding siblings ...)
2020-03-28 17:11 ` [PATCH 21/22] ARM: dts: stm32: Add bindings for USB " Marek Vasut
@ 2020-03-28 17:11 ` Marek Vasut
21 siblings, 0 replies; 33+ messages in thread
From: Marek Vasut @ 2020-03-28 17:11 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Marek Vasut, Alexandre Torgue, Patrice Chotard, Patrick Delaunay,
Maxime Coquelin, linux-stm32
The LED labels do not match the silkscreen on the board, fix it.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Patrick Delaunay <patrick.delaunay@st.com>
Cc: linux-stm32@st-md-mailman.stormreply.com
To: linux-arm-kernel@lists.infradead.org
---
arch/arm/boot/dts/stm32mp157a-avenger96.dts | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/stm32mp157a-avenger96.dts b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
index a779f7ea2025..63896cd9ddee 100644
--- a/arch/arm/boot/dts/stm32mp157a-avenger96.dts
+++ b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
@@ -55,21 +55,21 @@ memory@c0000000 {
led {
compatible = "gpio-leds";
led1 {
- label = "green:user1";
+ label = "green:user0";
gpios = <&gpioz 7 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";
default-state = "off";
};
led2 {
- label = "green:user2";
+ label = "green:user1";
gpios = <&gpiof 3 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "mmc0";
default-state = "off";
};
led3 {
- label = "green:user3";
+ label = "green:user2";
gpios = <&gpiog 0 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "mmc1";
default-state = "off";
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 33+ messages in thread