Skip to contentSkip to conversation

ARM: stm32: Re-enable KS8851 on DHCOM

PATCH New Marek Vasut 2 participants 13 messages May 26, 2020 – May 28, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/5 ARM: stm32: Re-enable KS8851 on DHCOM

Since the KS8851 driver is now in, enable the Kconfig entry on DHCOM to make the second ethernet available.

Cc Patrick Delaunay <[email protected]>
Cc Patrice Chotard <[email protected]>
---
 configs/stm32mp15_dhcom_basic_defconfig | 1 +
 1 file changed, 1 insertion(+)
configs/stm32mp15_dhcom_basic_defconfig +1 -0
index c1c83eb4fc..6106572673 100644
@@ -101,6 +101,7 @@ CONFIG_SPI_FLASH_MTD=y
 CONFIG_SPL_SPI_FLASH_MTD=y
 CONFIG_DM_ETH=y
 CONFIG_DWC_ETH_QOS=y
+CONFIG_KS8851_MLL=y
 CONFIG_PHY=y
 CONFIG_PHY_STM32_USBPHYC=y
 CONFIG_PINCONF=y
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/5 ARM: stm32: Hog GPIO PF7 high on DHCOR to unlock SPI NOR nWP

The SPI NOR nWP line is connected to GPIO PF7 on the SoM, pull the GPIO line high by default to clear SPI NOR WP.

Cc Patrick Delaunay <[email protected]>
Cc Patrice Chotard <[email protected]>
---
 arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi | 9 +++++++++
 configs/stm32mp15_dhcor_basic_defconfig    | 1 +
 2 files changed, 10 insertions(+)
arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi +9 -0
index ef730a8322..bd4c2adc35 100644
@@ -21,6 +21,15 @@
 	};
 };
 
+&gpiof {
+	snor-nwp {
+		gpio-hog;
+		gpios = <7 0>;
+		output-high;
+		line-name = "spi-nor-nwp";
+	};
+};
+
 &i2c4 {
 	u-boot,dm-pre-reloc;
 };
configs/stm32mp15_dhcor_basic_defconfig +1 -0
index 7163d0ad1b..249646c449 100644
@@ -71,6 +71,7 @@ CONFIG_SPL_BLOCK_CACHE=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_VIRT=y
+CONFIG_GPIO_HOG=y
 CONFIG_DM_HWSPINLOCK=y
 CONFIG_HWSPINLOCK_STM32=y
 CONFIG_DM_I2C=y
Signature · 1 line
2.25.1
#2 lore raw

PATCH 2/5 ARM: stm32: Hog GPIO PF7 high on DHCOR to unlock SPI NOR nWP

Hi Marek,

Quoted 6 lines

From: Marek Vasut <[email protected]>
Sent: mardi 26 mai 2020 04:30

The SPI NOR nWP line is connected to GPIO PF7 on the SoM, pull the GPIO line high by default to clear SPI NOR WP.

Quoted 8 lines
Cc Patrick Delaunay <[email protected]>
Cc Patrice Chotard <[email protected]>
---
 arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi | 9 +++++++++
 configs/stm32mp15_dhcor_basic_defconfig    | 1 +
 2 files changed, 10 insertions(+)

Thanks

Patrick

#3 lore raw

PATCH 3/5 ARM: dts: stm32: Add alternate pinmux for I2C2 pins

In reply to Marek Vasut

Add another mux option for I2C2 pins, this is used on AV96 board.

Cc Patrick Delaunay <[email protected]>
Cc Patrice Chotard <[email protected]>
---
 arch/arm/dts/stm32mp15-pinctrl.dtsi | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
arch/arm/dts/stm32mp15-pinctrl.dtsi +17 -0
index 8d00391978..c385896ebc 100644
@@ -357,6 +357,23 @@
 		};
 	};
 
+	i2c2_pins_c: i2c2-4 {
+		pins {
+			pinmux = <STM32_PINMUX('F', 1, AF4)>, /* I2C2_SCL */
+				 <STM32_PINMUX('H', 5, AF4)>; /* I2C2_SDA */
+			bias-disable;
+			drive-open-drain;
+			slew-rate = <0>;
+		};
+	};
+
+	i2c2_pins_sleep_c: i2c2-5 {
+		pins {
+			pinmux = <STM32_PINMUX('F', 1, ANALOG)>, /* I2C2_SCL */
+				 <STM32_PINMUX('H', 5, ANALOG)>; /* I2C2_SDA */
+		};
+	};
+
 	i2c5_pins_a: i2c5-0 {
 		pins {
 			pinmux = <STM32_PINMUX('A', 11, AF4)>, /* I2C5_SCL */
Signature · 1 line
2.25.1
#4 lore raw

PATCH 3/5 ARM: dts: stm32: Add alternate pinmux for I2C2 pins

Hi Marek,

Quoted 12 lines

From: Marek Vasut <[email protected]>
Sent: mardi 26 mai 2020 04:30

Add another mux option for I2C2 pins, this is used on AV96 board.

Cc Patrick Delaunay <[email protected]>
Cc Patrice Chotard <[email protected]>
---
 arch/arm/dts/stm32mp15-pinctrl.dtsi | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

Thanks

Patrick

#5 lore raw

PATCH 4/5 ARM: dts: stm32: Repair I2C2 operation on AV96

In reply to Marek Vasut

The I2C2 uses different pinmux on AV96, use correct pinmux and also add comments about the I2C being present on the "low-speed" expansion connector X6.

Cc Patrick Delaunay <[email protected]>
Cc Patrice Chotard <[email protected]>
---
 arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts +3 -3
index 1b0579c8ab..7f2e4b98a7 100644
@@ -107,7 +107,7 @@
 	};
 };
 
-&i2c1 {
+&i2c1 {	/* X6 I2C1 */
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c1_pins_b>;
 	i2c-scl-rising-time-ns = <185>;
@@ -117,9 +117,9 @@
 	/delete-property/dma-names;
 };
 
-&i2c2 {
+&i2c2 {	/* X6 I2C2 */
 	pinctrl-names = "default";
-	pinctrl-0 = <&i2c2_pins_b1 &i2c2_pins_b2>;
+	pinctrl-0 = <&i2c2_pins_c>;
 	i2c-scl-rising-time-ns = <185>;
 	i2c-scl-falling-time-ns = <20>;
 	status = "okay";
Signature · 1 line
2.25.1
#6 lore raw

PATCH 4/5 ARM: dts: stm32: Repair I2C2 operation on AV96

Quoted 7 lines

From: Marek Vasut <[email protected]>
Sent: mardi 26 mai 2020 04:30

The I2C2 uses different pinmux on AV96, use correct pinmux and also add comments about the I2C being present on the "low-speed" expansion connector X6.

Quoted 7 lines
Cc Patrick Delaunay <[email protected]>
Cc Patrice Chotard <[email protected]>
---
 arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Thanks

Patrick

#7 lore raw

PATCH 5/5 ARM: dts: stm32: Disable SDR104 mode on AV96

In reply to Marek Vasut

Disable SDR104 mode until we know it is really stable.

Cc Patrick Delaunay <[email protected]>
Cc Patrice Chotard <[email protected]>
---
 arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts | 1 -
 1 file changed, 1 deletion(-)
arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts +0 -1
index 7f2e4b98a7..c1cc80bcf5 100644
@@ -144,7 +144,6 @@
 	st,sig-dir;
 	st,neg-edge;
 	st,use-ckin;
-	sd-uhs-sdr104;
 	bus-width = <4>;
 	vmmc-supply = <&vdd_sd>;
 	vqmmc-supply = <&sd_switch>;
Signature · 1 line
2.25.1
#8 lore raw

PATCH 5/5 ARM: dts: stm32: Disable SDR104 mode on AV96

Hi Marek,

Quoted 12 lines

From: Marek Vasut <[email protected]>
Sent: mardi 26 mai 2020 04:30

Disable SDR104 mode until we know it is really stable.

Cc Patrick Delaunay <[email protected]>
Cc Patrice Chotard <[email protected]>
---
 arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts | 1 -
 1 file changed, 1 deletion(-)

Thanks

Patrick

#9 lore raw

PATCH 5/5 ARM: dts: stm32: Disable SDR104 mode on AV96

Quoted 1 line · Patrick DELAUNAY

Hi Marek,

Hi,

Quoted 13 lines
Quoted 12 lines

From: Marek Vasut <[email protected]>
Sent: mardi 26 mai 2020 04:30

Disable SDR104 mode until we know it is really stable.

Cc Patrick Delaunay <[email protected]>
Cc Patrice Chotard <[email protected]>
---
 arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts | 1 -
 1 file changed, 1 deletion(-)
Quoted 1 line

This is for 2020.07 , it's the remaining stuff which fell through the cracks . And then that's it :)

#10 lore raw

PATCH 5/5 ARM: dts: stm32: Disable SDR104 mode on AV96

Hi :qrekm

Quoted 21 lines

From: Marek Vasut <[email protected]>
Sent: mercredi 27 mai 2020 19:48

Quoted 1 line · Patrick DELAUNAY

Hi Marek,

Hi,

Quoted 13 lines
Quoted 12 lines

From: Marek Vasut <[email protected]>
Sent: mardi 26 mai 2020 04:30

Disable SDR104 mode until we know it is really stable.

Cc Patrick Delaunay <[email protected]>
Cc Patrice Chotard <[email protected]>
---
 arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts | 1 -
 1 file changed, 1 deletion(-)
Quoted 4 lines
Quoted 1 line

This is for 2020.07 , it's the remaining stuff which fell through the cracks . And then that's it :)

Sure.

For the serie:

Applied to u-boot-stm/master, thanks!

And I am preparing the pull request for v2020.07-rc4.

Regards

Patrick

#11 lore raw

PATCH 5/5 ARM: dts: stm32: Disable SDR104 mode on AV96

Quoted 1 line · Patrick DELAUNAY

Hi :qrekm

Hi,

Quoted 26 lines
Quoted 21 lines

From: Marek Vasut <[email protected]>
Sent: mercredi 27 mai 2020 19:48

Quoted 1 line · Patrick DELAUNAY

Hi Marek,

Hi,

Quoted 13 lines
Quoted 12 lines

From: Marek Vasut <[email protected]>
Sent: mardi 26 mai 2020 04:30

Disable SDR104 mode until we know it is really stable.

Cc Patrick Delaunay <[email protected]>
Cc Patrice Chotard <[email protected]>
---
 arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts | 1 -
 1 file changed, 1 deletion(-)
Quoted 4 lines
Quoted 1 line

This is for 2020.07 , it's the remaining stuff which fell through the cracks . And then that's it :)

Quoted 7 lines

Sure.

For the serie:

Applied to u-boot-stm/master, thanks!

And I am preparing the pull request for v2020.07-rc4.

Thanks

Signature · 2 lines
Best regards,
Marek Vasut
#12 lore raw

PATCH 1/5 ARM: stm32: Re-enable KS8851 on DHCOM

In reply to Marek Vasut

Hi Marek,

Quoted 7 lines

From: Marek Vasut <[email protected]>
Sent: mardi 26 mai 2020 04:30
To: u-boot at lists.denx.de

Since the KS8851 driver is now in, enable the Kconfig entry on DHCOM to make the second ethernet available.

Quoted 7 lines
Cc Patrick Delaunay <[email protected]>
Cc Patrice Chotard <[email protected]>
---
 configs/stm32mp15_dhcom_basic_defconfig | 1 +
 1 file changed, 1 insertion(+)

Thanks

Patrick