- stm32mp15: fix DT on DHCOR SOM and avenger96 board

- stm32mp15: re-enable KS8851 on DHCOM
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEE56Yx6b9SnloYCWtD4rK92eCqk3UFAl7PYbcACgkQ4rK92eCq
 k3VaNAf6A5n4YBvwG6dPtZXdzUA/+dndv2iqF3Zkx+fWqgOJTLn87D/rB+BybHWV
 6JNTjEc8oc+FFF0n9Wx2soMvwIDKhqoGqx2C7dzuVkodQVQkQaSP+UU/FDoLfgLG
 J9DW0iRY36yUKl1ZsbsVuiCxcy54/nQpxbvjCtvRAz7GH45U77fD0aYIFJYQf9Nn
 1G/yISoDCac2UziizGL4VURNAG3cARmsNP2xZjW+V8Y8cHgDWauEaBMK+/snee5O
 DpsZox8WqfdMdRKs/mBwxi+3tU2qAx/GoH03d48aAL8NnkIyXxgoOdhcuDv4EF1b
 9vGO1DaMP4h6/0SggD00u0+uKO6mqw==
 =xiEp
 -----END PGP SIGNATURE-----

Merge tag 'u-boot-stm32-20200528' of https://gitlab.denx.de/u-boot/custodians/u-boot-stm

- stm32mp15: fix DT on DHCOR SOM and avenger96 board
- stm32mp15: re-enable KS8851 on DHCOM

arch/arm/dts/stm32mp15-pinctrl.dtsi

@@ -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 */

arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts

@@ -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";
@@ -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>;

arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi

@@ -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_dhcom_basic_defconfig

@@ -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

configs/stm32mp15_dhcor_basic_defconfig

@@ -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