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

diff --git a/arch/arm/dts/stm32mp15-pinctrl.dtsi b/arch/arm/dts/stm32mp15-pinctrl.dtsi
index 8d00391978ae8d1726a1ac8c27856f802cd238a1..c385896ebcf192424960e8bc3033f1c8ecb77a5a 100644 (file)
--- a/arch/arm/dts/stm32mp15-pinctrl.dtsi
+++ b/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 */

diff --git a/arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts b/arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts
index 1b0579c8abddb4ce6b727d9f1c7a5d62b2b8a3e2..c1cc80bcf55bc6086b7b89c04a49caacf6624761 100644 (file)
--- a/arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts
+++ b/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>;

diff --git a/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi b/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi
index ef730a83220cca7158a3c399e1c263f087f67afa..bd4c2adc3589887961fec1bf4f6fe99bf3998a9b 100644 (file)
--- a/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi
+++ b/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;
 };

diff --git a/configs/stm32mp15_dhcom_basic_defconfig b/configs/stm32mp15_dhcom_basic_defconfig
index c1c83eb4fc32467b5cf1d14eda31eff1777e3a09..6106572673513193bb903ae6544855df69ce7973 100644 (file)
--- a/configs/stm32mp15_dhcom_basic_defconfig
+++ b/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

diff --git a/configs/stm32mp15_dhcor_basic_defconfig b/configs/stm32mp15_dhcor_basic_defconfig
index 7163d0ad1b0264cf9c89bc47ce29978374cb59a7..249646c4494ba82312f6565d2da103ded2b09501 100644 (file)
--- a/configs/stm32mp15_dhcor_basic_defconfig
+++ b/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