ARM: dts: stm32: Repair AV96 board
Subsystems (2)
v3 cover ARM: dts: stm32: Repair AV96 board
The AV96 board device tree is completely broken and does not match the hardware. This series fixes it up.
Marek Vasut (22):
ARM: dts: stm32: Add alternate pinmux for ethernet RGMII
ARM: dts: stm32: Repair ethernet operation on AV96
ARM: dts: stm32: Add missing ethernet PHY reset on AV96
ARM: dts: stm32: Add missing ethernet PHY skews on AV96
ARM: dts: stm32: Add alternate pinmux for SDMMC1 direction pins
ARM: dts: stm32: Repair SDMMC1 operation on AV96
ARM: dts: stm32: Repair PMIC configuration on AV96
ARM: dts: stm32: Repair PMIC interrupt on AV96
ARM: dts: stm32: Add alternate pinmux for SDMMC2 pins 4-7
ARM: dts: stm32: Add eMMC attached to SDMMC2 on AV96
ARM: dts: stm32: Add QSPI NOR on AV96
ARM: dts: stm32: Add configuration EEPROM on AV96
ARM: dts: stm32: Enable GPU on AV96
ARM: dts: stm32: Add alternate pinmux for SDMMC3 pins
ARM: dts: stm32: Enable WiFi on AV96
ARM: dts: stm32: Add alternate pinmux for USART2 pins
ARM: dts: stm32: Enable Bluetooth on AV96
ARM: dts: stm32: Add alternate pinmux for LTDC pins
ARM: dts: stm32: Add bindings for HDMI video on AV96
ARM: dts: stm32: Add bindings for audio on AV96
ARM: dts: stm32: Add bindings for USB on AV96
ARM: dts: stm32: Rename LEDs to match silkscreen on AV96
arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 248 +++++++++++++++ arch/arm/boot/dts/stm32mp157a-avenger96.dts | 328 ++++++++++++++++++-- 2 files changed, 543 insertions(+), 33 deletions(-)
Cc: Alexandre Torgue <[email protected]>
Cc: Manivannan Sadhasivam <[email protected]>
Cc: Maxime Coquelin <[email protected]>
Cc: Patrice Chotard <[email protected]>
Cc: Patrick Delaunay <[email protected]>
Cc: [email protected]
To: [email protected]
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 1/22 ARM: dts: stm32: Add alternate pinmux for ethernet RGMII
Add another mux option for DWMAC RGMII, this is used on AV96 board.
To: [email protected]
---
V2: No change
V3: No change
--- arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 51 ++++++++++++++++++++++++ 1 file changed, 51 insertions(+)
arch/arm/boot/dts/stm32mp15-pinctrl.dtsi +51 -0
@@ -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 */
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH V3 01/22] ARM: dts: stm32: Add alternate pinmux for ethernet RGMII
Hi Marek
Quoted 48 lines · Marek Vasut
Add another mux option for DWMAC RGMII, this is used on AV96 board.
Reviewed-by Manivannan Sadhasivam <[email protected]>Signed-off-by Marek Vasut <[email protected]>Cc Alexandre Torgue <[email protected]>Cc Manivannan Sadhasivam <[email protected]>Cc Maxime Coquelin <[email protected]>Cc Patrice Chotard <[email protected]>Cc Patrick Delaunay <[email protected]>To: [email protected]
---
V2: No change
V3: No change--- arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 51 ++++++++++++++++++++++++ 1 file changed, 51 insertions(+)arch/arm/boot/dts/stm32mp15-pinctrl.dtsi +22
-0@@ -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 */
arch/arm/boot/dts/stm32mp15-pinctrl.dtsi pins1 { · line 230
Quoted 10 lines
arch/arm/boot/dts/stm32mp15-pinctrl.dtsi +10
-0+ <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 {
I just merged a series from Ahmad that unify pins group name. So it should be ethernet0_rgmii_sleep_pins_b. As a lot change have been done in pinctrl dtsi diles, can you rebase on top of stm32-net please?
Quoted 13 lines
arch/arm/boot/dts/stm32mp15-pinctrl.dtsi +12
-0+ 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 */
arch/arm/boot/dts/stm32mp15-pinctrl.dtsi pins1 { · line 252
Quoted 10 lines
arch/arm/boot/dts/stm32mp15-pinctrl.dtsi +7
-0+ <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 */
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH V3 01/22] ARM: dts: stm32: Add alternate pinmux for ethernet RGMII
Quoted 1 line · Alexandre Torgue
Hi Marek
Hi,
[...]
Quoted 34 lines
Quoted 34 lines
arch/arm/boot/dts/stm32mp15-pinctrl.dtsi +2
-0@@ -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;
Quoted 8 lines
Quoted 4 lines
+ };
+ };
+
+ethernet0_rgmii_pins_sleep_b: rgmii-sleep-1 {I just merged a series from Ahmad that unify pins group name. So it should be
ethernet0_rgmii_sleep_pins_b. As a lot change have been done in pinctrl dtsi diles, can you rebase on top of stm32-net please?
Great. Do you have a link to this tree with this branch ?
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH V3 01/22] ARM: dts: stm32: Add alternate pinmux for ethernet RGMII
Quoted 50 lines · Marek Vasut
Quoted 1 line · Alexandre Torgue
Hi Marek
Hi,
[...]
Quoted 34 lines
Quoted 34 lines
arch/arm/boot/dts/stm32mp15-pinctrl.dtsi +2
-0@@ -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;Quoted 8 lines
Quoted 4 lines
+ };
+ };
+
+ethernet0_rgmii_pins_sleep_b: rgmii-sleep-1 {I just merged a series from Ahmad that unify pins group name. So it should be
ethernet0_rgmii_sleep_pins_b. As a lot change have been done in pinctrl dtsi diles, can you rebase on top of stm32-net please?
Quoted 2 lines
Great. Do you have a link to this tree with this branch ?
Sorry I mean stm32-next branch here: git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH V3 01/22] ARM: dts: stm32: Add alternate pinmux for ethernet RGMII
Quoted 54 lines · Alexandre Torgue
Quoted 51 lines · Marek Vasut
Quoted 1 line · Alexandre Torgue
Hi Marek
Hi,
[...]
Quoted 43 lines
Quoted 31 lines
arch/arm/boot/dts/stm32mp15-pinctrl.dtsi +2
-0@@ -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*/Quoted 8 lines
+ <
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 {I just merged a series from Ahmad that unify pins group name. So it should be
ethernet0_rgmii_sleep_pins_b. As a lot change have been done in pinctrl dtsi diles, can you rebase on top of stm32-net please?
Quoted 5 lines
Quoted 2 lines
Great. Do you have a link to this tree with this branch ?
Sorry I mean stm32-next branch here:
git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git
OK, thanks.
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 2/22 ARM: dts: stm32: Repair ethernet operation on AV96
In reply to Marek VasutThe 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.
To: [email protected]
---
V2: No change
V3: No change
--- arch/arm/boot/dts/stm32mp157a-avenger96.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/stm32mp157a-avenger96.dts +2 -2
@@ -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>;
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 3/22 ARM: dts: stm32: Add missing ethernet PHY reset on AV96
In reply to Marek VasutAdd PHY reset GPIO on AV96 ethernet PHY.
To: [email protected]
---
V2: No change
V3: Drop phy-reset-duration
--- arch/arm/boot/dts/stm32mp157a-avenger96.dts | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/stm32mp157a-avenger96.dts +1 -0
@@ -87,6 +87,7 @@ ðernet0 { phy-mode = "rgmii"; max-speed = <1000>; phy-handle = <&phy0>; + phy-reset-gpios = <&gpioz 2 GPIO_ACTIVE_LOW>; mdio0 { #address-cells = <1>;
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 4/22 ARM: dts: stm32: Add missing ethernet PHY skews on AV96
In reply to Marek VasutThe KS9031 PHY supports configurable PHY skews to compensate for the board routing. Fill in the correct values.
To: [email protected]
---
V2: No change
V3: No change
--- arch/arm/boot/dts/stm32mp157a-avenger96.dts | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
arch/arm/boot/dts/stm32mp157a-avenger96.dts +14 -0
@@ -95,6 +95,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>; }; }; };
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 5/22 ARM: dts: stm32: Add alternate pinmux for SDMMC1 direction pins
In reply to Marek VasutAdd another mux option for SDMMC1 direction pins, in particular SDMMC1_D123DIR, this is used on AV96 board.
To: [email protected]
---
V2: Fix SDMMC1_D123DIR AF, should be AF11
V3: No change
--- arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
arch/arm/boot/dts/stm32mp15-pinctrl.dtsi +24 -0
@@ -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, AF11)>, /* 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 */
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 6/22 ARM: dts: stm32: Repair SDMMC1 operation on AV96
In reply to Marek VasutThe 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.
To: [email protected]
---
V2: Disable SDR104, it seems unstable thus far
V3: No change
--- arch/arm/boot/dts/stm32mp157a-avenger96.dts | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-)
arch/arm/boot/dts/stm32mp157a-avenger96.dts +18 -3
@@ -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 {
@@ -304,9 +318,9 @@ &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;
@@ -314,6 +328,7 @@ &sdmmc1 { st,use-ckin; bus-width = <4>; vmmc-supply = <&vdd_sd>; + vqmmc-supply = <&sd_switch>; status = "okay"; };
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 7/22 ARM: dts: stm32: Repair PMIC configuration on AV96
In reply to Marek VasutThe 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.
To: [email protected]
---
V2: Model the Enpirion EP53A8LQI on the DHCOR SoM as a fixed regulator
V3: Move this before the SDMMC2 patch, as there is now a dependency
--- arch/arm/boot/dts/stm32mp157a-avenger96.dts | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
arch/arm/boot/dts/stm32mp157a-avenger96.dts +16 -4
@@ -91,6 +91,17 @@ sd_switch: regulator-sd_switch { states = <1800000 0x1>, <2900000 0x0>; }; + + /* Enpirion EP3A8LQI U2 on the DHCOR */ + vdd_io: regulator-buck-io { + compatible = "regulator-fixed"; + regulator-name = "buck-io"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + regulator-boot-on; + vin-supply = <&vdd>; + }; }; ðernet0 {
@@ -177,7 +188,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>;
@@ -195,8 +206,8 @@ vdd_ddr: buck2 { vdd: buck3 { regulator-name = "vdd"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; + regulator-min-microvolt = <2900000>; + regulator-max-microvolt = <2900000>; regulator-always-on; regulator-initial-mode = <0>; regulator-over-current-protection;
@@ -274,6 +285,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 {
@@ -304,7 +316,7 @@ &iwdg2 { }; &pwr_regulators { - vdd-supply = <&vdd>; + vdd-supply = <&vdd_io>; vdd_3v3_usbfs-supply = <&vdd_usb>; };
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 8/22 ARM: dts: stm32: Repair PMIC interrupt on AV96
In reply to Marek VasutThe 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.
To: [email protected]
---
V2: No change
V3: Move this before the SDMMC2 patch
--- arch/arm/boot/dts/stm32mp157a-avenger96.dts | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
arch/arm/boot/dts/stm32mp157a-avenger96.dts +1 -9
@@ -170,7 +170,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";
@@ -227,7 +227,6 @@ vdda: ldo1 { regulator-min-microvolt = <2900000>; regulator-max-microvolt = <2900000>; interrupts = <IT_CURLIM_LDO1 0>; - interrupt-parent = <&pmic>; }; v2v8: ldo2 {
@@ -235,7 +234,6 @@ v2v8: ldo2 { regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; interrupts = <IT_CURLIM_LDO2 0>; - interrupt-parent = <&pmic>; }; vtt_ddr: ldo3 {
@@ -249,7 +247,6 @@ vtt_ddr: ldo3 { vdd_usb: ldo4 { regulator-name = "vdd_usb"; interrupts = <IT_CURLIM_LDO4 0>; - interrupt-parent = <&pmic>; }; vdd_sd: ldo5 {
@@ -257,7 +254,6 @@ vdd_sd: ldo5 { regulator-min-microvolt = <2900000>; regulator-max-microvolt = <2900000>; interrupts = <IT_CURLIM_LDO5 0>; - interrupt-parent = <&pmic>; regulator-boot-on; };
@@ -266,7 +262,6 @@ v1v8: ldo6 { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; interrupts = <IT_CURLIM_LDO6 0>; - interrupt-parent = <&pmic>; regulator-enable-ramp-delay = <300000>; };
@@ -278,20 +273,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>; }; };
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 9/22 ARM: dts: stm32: Add alternate pinmux for SDMMC2 pins 4-7
In reply to Marek VasutAdd another mux option for SDMMC2 pins 4..7, this is used on AV96 board.
To: [email protected]
---
V2: No change
V3: No change
--- arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
arch/arm/boot/dts/stm32mp15-pinctrl.dtsi +21 -0
@@ -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 */
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 10/22 ARM: dts: stm32: Add eMMC attached to SDMMC2 on AV96
In reply to Marek VasutAdd DT node describing the eMMC attached to SDMMC2 controller of the STM32MP1 on DHCOR SoM, which is the SoM soldered on AV96.
To: [email protected]
---
V2: No change
V3: Connect Vcc to the enpirion output instead of 3v3 directly
Note that this patch now depends on:
mmc: mmci: Only call .post_sig_volt_switch if voltage switch happened
--- arch/arm/boot/dts/stm32mp157a-avenger96.dts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
arch/arm/boot/dts/stm32mp157a-avenger96.dts +16 -0
@@ -336,6 +336,22 @@ &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 = <&v3v3>; + vqmmc-supply = <&vdd_io>; + status = "okay"; +}; + &uart4 { /* On Low speed expansion header */ label = "LS-UART1";
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 11/22 ARM: dts: stm32: Add QSPI NOR on AV96
In reply to Marek VasutThe DH Electronics DHCOR SOM has QSPI NOR on the SoM itself, add it into the DT.
To: [email protected]
---
V2: Use spi-flash in the DT node instead of explicit model name
V3: Reduce the SPI controller window to 2 MiB, which is the flash size
--- arch/arm/boot/dts/stm32mp157a-avenger96.dts | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
arch/arm/boot/dts/stm32mp157a-avenger96.dts +20 -0
@@ -21,6 +21,7 @@ aliases { mmc0 = &sdmmc1; serial0 = &uart4; serial1 = &uart7; + spi0 = &qspi; }; chosen {
@@ -312,6 +313,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 0x200000>; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + flash0: spi-flash@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"; };
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 12/22 ARM: dts: stm32: Add configuration EEPROM on AV96
In reply to Marek VasutThe board has an EEPROM on the same I2C bus as PMIC, at address 0x53. The EEPROM contains the board MAC address.
To: [email protected]
---
V2: No change
V3: No change
--- arch/arm/boot/dts/stm32mp157a-avenger96.dts | 6 ++++++ 1 file changed, 6 insertions(+)
arch/arm/boot/dts/stm32mp157a-avenger96.dts +6 -0
@@ -301,6 +301,12 @@ watchdog { status = "disabled"; }; }; + + eeprom@53 { + compatible = "atmel,24c02"; + reg = <0x53>; + pagesize = <16>; + }; }; &iwdg2 {
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 13/22 ARM: dts: stm32: Enable GPU on AV96
In reply to Marek VasutEnable the GPU present on the STM32MP1 populated on AV96.
To: [email protected]
---
V2: No change
V3: No change
--- arch/arm/boot/dts/stm32mp157a-avenger96.dts | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/boot/dts/stm32mp157a-avenger96.dts +4 -0
@@ -139,6 +139,10 @@ phy0: ethernet-phy@7 { }; }; +&gpu { + status = "okay"; +}; + &i2c1 { pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins_b>;
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH V3 13/22] ARM: dts: stm32: Enable GPU on AV96
Hi Marek
Quoted 23 lines · Marek Vasut
Enable the GPU present on the STM32MP1 populated on AV96.
Reviewed-by Manivannan Sadhasivam <[email protected]>Signed-off-by Marek Vasut <[email protected]>Cc Alexandre Torgue <[email protected]>Cc Manivannan Sadhasivam <[email protected]>Cc Maxime Coquelin <[email protected]>Cc Patrice Chotard <[email protected]>Cc Patrick Delaunay <[email protected]>To: [email protected]
---
V2: No change
V3: No change--- arch/arm/boot/dts/stm32mp157a-avenger96.dts | 4 ++++ 1 file changed, 4 insertions(+)arch/arm/boot/dts/stm32mp157a-avenger96.dts +0
-0
arch/arm/boot/dts/stm32mp157a-avenger96.dts phy0: ethernet-phy@7 { · line 145
Quoted 7 lines
arch/arm/boot/dts/stm32mp157a-avenger96.dts +4
-0@@ -139,6 +139,10 @@ phy0: ethernet-phy@7 { }; }; +&gpu { + status = "okay"; +}; +
GPU is now enable by so you can drop this patch.
regards
alex
arch/arm/boot/dts/stm32mp157a-avenger96.dts phy0: ethernet-phy@7 { · line 148
Quoted 4 lines
arch/arm/boot/dts/stm32mp157a-avenger96.dts +0
-0&i2c1 { pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins_b>;
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH V3 13/22] ARM: dts: stm32: Enable GPU on AV96
Quoted 1 line · Alexandre Torgue
Hi Marek
Hi,
Quoted 19 lines · Marek Vasut
Quoted 18 lines
Enable the GPU present on the STM32MP1 populated on AV96.
Reviewed-by Manivannan Sadhasivam <[email protected]>Signed-off-by Marek Vasut <[email protected]>Cc Alexandre Torgue <[email protected]>Cc Manivannan Sadhasivam <[email protected]>Cc Maxime Coquelin <[email protected]>Cc Patrice Chotard <[email protected]>Cc Patrick Delaunay <[email protected]>To: [email protected]
---
V2: No change
V3: No change
---
arch/arm/boot/dts/stm32mp157a-avenger96.dts| 4 ++++1 file changed, 4 insertions(+)
Quoted 14 lines
arch/arm/boot/dts/stm32mp157a-avenger96.dts phy0: ethernet-phy@7 { · line 144
Quoted 12 lines
arch/arm/boot/dts/stm32mp157a-avenger96.dts +3
-0@@ -139,6 +139,10 @@ phy0: ethernet-phy@7 { }; }; +&gpu { + status = "okay"; +}; +GPU is now enable by so you can drop this patch.
Why is it enabled by default ? That's somewhat useless on headless systems.
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [Linux-stm32] [PATCH V3 13/22] ARM: dts: stm32: Enable GPU on AV96
Am Mittwoch, den 01.04.2020, 14:21 +0200 schrieb Marek Vasut:
Quoted 40 lines · Alexandre Torgue
Quoted 1 line
Hi Marek
Hi,
Quoted 20 lines · Marek Vasut
Quoted 19 lines
Enable the GPU present on the STM32MP1 populated on AV96.
Reviewed-by: Manivannan Sadhasivam <
[email protected]>Signed-off-by Marek Vasut <[email protected]>Cc Alexandre Torgue <[email protected]>Cc Manivannan Sadhasivam <[email protected]>Cc Maxime Coquelin <[email protected]>Cc Patrice Chotard <[email protected]>Cc Patrick Delaunay <[email protected]>To: [email protected]
---
V2: No change
V3: No change--- arch/arm/boot/dts/stm32mp157a-avenger96.dts | 4 ++++ 1 file changed, 4 insertions(+)Quoted 14 lines
arch/arm/boot/dts/stm32mp157a-avenger96.dts phy0: ethernet-phy@7 { · line 144
Quoted 12 lines
arch/arm/boot/dts/stm32mp157a-avenger96.dts +3
-0@@ -139,6 +139,10 @@ phy0: ethernet-phy@7 { }; }; +&gpu { + status = "okay"; +}; +GPU is now enable by so you can drop this patch.
Quoted 2 lines
Why is it enabled by default ? That's somewhat useless on headless systems.
The better question is: why wouldn't it be enabled by default? It's a SoC peripheral and has no external dependencies. Even on a headless system you can still do stuff like color conversion/balancing via GL in a video pipeline or something like this. There is simply no good reason to hide the existence of the GPU.
If you are really concerned about the few ms it takes to initialize the GPU on boot, you can always choose to not build the driver, or use a specific DT for your use-case.
Regards,
Lucas
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [Linux-stm32] [PATCH V3 13/22] ARM: dts: stm32: Enable GPU on AV96
On 4/1/20 2:40 PM, Lucas Stach wrote:
[...]
Quoted 13 lines
Quoted 13 lines
Quoted 12 lines
arch/arm/boot/dts/stm32mp157a-avenger96.dts phy0: ethernet-phy@7 { · line 144
Quoted 10 lines
index
27c48f988540..19a7a130b148100644arch/arm/boot/dts/stm32mp157a-avenger96.dts +3
-0@@ -139,6 +139,10 @@ phy0: ethernet-phy@7 { }; }; +&gpu { + status = "okay"; +}; +GPU is now enable by so you can drop this patch.
Quoted 8 lines
Quoted 2 lines
Why is it enabled by default ? That's somewhat useless on headless systems.
The better question is: why wouldn't it be enabled by default? It's a SoC peripheral and has no external dependencies. Even on a headless system you can still do stuff like color conversion/balancing via GL in a video pipeline or something like this. There is simply no good reason to hide the existence of the GPU.
Power saving ? Resource saving ?
Why should it be enabled if it's not used ?
[...]
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 14/22 ARM: dts: stm32: Add alternate pinmux for SDMMC3 pins
In reply to Marek VasutAdd another mux option for SDMMC3 pins, in particular PD5_SDMMC3_D2 and PD0_SDMMC3_CMD, this is used on AV96 board.
To: [email protected]
---
V2: No change
V3: No change
--- arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 54 ++++++++++++++++++++++++ 1 file changed, 54 insertions(+)
arch/arm/boot/dts/stm32mp15-pinctrl.dtsi +54 -0
@@ -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 */
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 15/22 ARM: dts: stm32: Enable WiFi on AV96
In reply to Marek VasutThe 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.
To: [email protected]
---
V2: No change
V3: No change
--- arch/arm/boot/dts/stm32mp157a-avenger96.dts | 38 +++++++++++++++++---- 1 file changed, 31 insertions(+), 7 deletions(-)
arch/arm/boot/dts/stm32mp157a-avenger96.dts +31 -7
@@ -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";
@@ -103,6 +96,17 @@ vdd_io: regulator-buck-io { regulator-boot-on; vin-supply = <&vdd>; }; + + 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 {
@@ -382,6 +386,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";
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 16/22 ARM: dts: stm32: Add alternate pinmux for USART2 pins
In reply to Marek VasutAdd mux option for USART2 pins, this is used on AV96 board.
To: [email protected]
---
V2: No change
V3: No change
--- arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
arch/arm/boot/dts/stm32mp15-pinctrl.dtsi +24 -0
@@ -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 */
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 17/22 ARM: dts: stm32: Enable Bluetooth on AV96
In reply to Marek VasutThe 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.
To: [email protected]
---
V2: No change
V3: No change
--- arch/arm/boot/dts/stm32mp157a-avenger96.dts | 23 ++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)
arch/arm/boot/dts/stm32mp157a-avenger96.dts +16 -7
@@ -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 {
@@ -421,3 +415,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>; + }; +};
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 18/22 ARM: dts: stm32: Add alternate pinmux for LTDC pins
In reply to Marek VasutAdd new mux option for LTDC pins, this is used on AV96 board.
To: [email protected]
---
V2: No change
V3: No change
--- arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 74 ++++++++++++++++++++++++ 1 file changed, 74 insertions(+)
arch/arm/boot/dts/stm32mp15-pinctrl.dtsi +74 -0
@@ -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 */
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 19/22 ARM: dts: stm32: Add bindings for HDMI video on AV96
In reply to Marek VasutFill in the HDMI video pipeline from AV96 into the DT.
To: [email protected]
---
V2: No change
V3: No change
--- arch/arm/boot/dts/stm32mp157a-avenger96.dts | 79 +++++++++++++++++++++ 1 file changed, 79 insertions(+)
arch/arm/boot/dts/stm32mp157a-avenger96.dts +79 -0
@@ -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>;
@@ -304,6 +322,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>;
@@ -316,6 +378,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_io>; vdd_3v3_usbfs-supply = <&vdd_usb>;
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 20/22 ARM: dts: stm32: Add bindings for audio on AV96
In reply to Marek VasutFill in the bindings for HDMI audio on AV96, this permits audio playback via attached HDMI device if such device supports it.
To: [email protected]
---
V2: No change
V3: No change
--- arch/arm/boot/dts/stm32mp157a-avenger96.dts | 39 +++++++++++++++++++++ 1 file changed, 39 insertions(+)
arch/arm/boot/dts/stm32mp157a-avenger96.dts +39 -0
@@ -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"; + }; + /* Enpirion EP3A8LQI U2 on the DHCOR */ vdd_io: regulator-buck-io { compatible = "regulator-fixed";
@@ -363,6 +370,13 @@ adv7513_out: endpoint { remote-endpoint = <&hdmi_con>; }; }; + + port@2 { + reg = <2>; + adv7513_i2s0: endpoint { + remote-endpoint = <&sai2a_endpoint>; + }; + }; }; };
@@ -427,6 +441,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>;
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 21/22 ARM: dts: stm32: Add bindings for USB on AV96
In reply to Marek VasutFill in the bindings for USB host and gadget on AV96.
To: [email protected]
---
V2: No change
V3: No change
--- arch/arm/boot/dts/stm32mp157a-avenger96.dts | 31 +++++++++++++++++++++ 1 file changed, 31 insertions(+)
arch/arm/boot/dts/stm32mp157a-avenger96.dts +31 -0
@@ -548,3 +548,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>; +};
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 22/22 ARM: dts: stm32: Rename LEDs to match silkscreen on AV96
In reply to Marek VasutThe LED labels do not match the silkscreen on the board, fix it.
To: [email protected]
---
V2: No change
V3: No change
--- arch/arm/boot/dts/stm32mp157a-avenger96.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/stm32mp157a-avenger96.dts +3 -3
@@ -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";
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 27 lines · Marek Vasut
The AV96 board device tree is completely broken and does not match the hardware. This series fixes it up.
Marek Vasut (22):
ARM: dts: stm32: Add alternate pinmux for ethernet RGMII
ARM: dts: stm32: Repair ethernet operation on AV96
ARM: dts: stm32: Add missing ethernet PHY reset on AV96
ARM: dts: stm32: Add missing ethernet PHY skews on AV96
ARM: dts: stm32: Add alternate pinmux for SDMMC1 direction pins
ARM: dts: stm32: Repair SDMMC1 operation on AV96
ARM: dts: stm32: Repair PMIC configuration on AV96
ARM: dts: stm32: Repair PMIC interrupt on AV96
ARM: dts: stm32: Add alternate pinmux for SDMMC2 pins 4-7
ARM: dts: stm32: Add eMMC attached to SDMMC2 on AV96
ARM: dts: stm32: Add QSPI NOR on AV96
ARM: dts: stm32: Add configuration EEPROM on AV96
ARM: dts: stm32: Enable GPU on AV96
ARM: dts: stm32: Add alternate pinmux for SDMMC3 pins
ARM: dts: stm32: Enable WiFi on AV96
ARM: dts: stm32: Add alternate pinmux for USART2 pins
ARM: dts: stm32: Enable Bluetooth on AV96
ARM: dts: stm32: Add alternate pinmux for LTDC pins
ARM: dts: stm32: Add bindings for HDMI video on AV96
ARM: dts: stm32: Add bindings for audio on AV96
ARM: dts: stm32: Add bindings for USB on AV96
ARM: dts: stm32: Rename LEDs to match silkscreen on AV96
Quoted 3 lines
arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 248 +++++++++++++++ arch/arm/boot/dts/stm32mp157a-avenger96.dts | 328 ++++++++++++++++++-- 2 files changed, 543 insertions(+), 33 deletions(-)
And so, now I will wait a few days with further iterations and wait for feedback.
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel