Merge tag 'uniphier-v2020.04' of https://gitlab.denx.de/u-boot/custodians/u-boot...

UniPhier SoC updates for v2020.04

- add pinmux nodes for I2C ch5, ch6

- enable SPI driver and command

diff --git a/arch/arm/dts/uniphier-pinctrl.dtsi b/arch/arm/dts/uniphier-pinctrl.dtsi
index 1fee5ffbfb9c9e463a500d88c5965e5267e5c83e..bfdfb764b25b9ee9cb9a55add120f5fd988d7e6c 100644 (file)
--- a/arch/arm/dts/uniphier-pinctrl.dtsi
+++ b/arch/arm/dts/uniphier-pinctrl.dtsi
@@ -106,6 +106,16 @@
                function = "i2c4";
        };
 
+       pinctrl_i2c5: i2c5 {
+               groups = "i2c5";
+               function = "i2c5";
+       };
+
+       pinctrl_i2c6: i2c6 {
+               groups = "i2c6";
+               function = "i2c6";
+       };
+
        pinctrl_nand: nand {
                groups = "nand";
                function = "nand";

diff --git a/configs/uniphier_v7_defconfig b/configs/uniphier_v7_defconfig
index 112234df9fa16616426ca856d4f10638a90387fe..3a9290b7e9dfe8f478588c9d55bc73e2e8088844 100644 (file)
--- a/configs/uniphier_v7_defconfig
+++ b/configs/uniphier_v7_defconfig
@@ -23,6 +23,7 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_TFTPPUT=y
 CONFIG_CMD_CACHE=y
@@ -52,6 +53,9 @@ CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8
 CONFIG_SPL_NAND_DENALI=y
 CONFIG_DM_ETH=y
 CONFIG_SNI_AVE=y
+CONFIG_SPI=y
+CONFIG_DM_SPI=y
+CONFIG_UNIPHIER_SPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y

diff --git a/configs/uniphier_v8_defconfig b/configs/uniphier_v8_defconfig
index 5acb1437bcfbf0e7f4b8008e764fa6e8b66ad736..b8f4a4ec6a5731b35ed228d4d2ce3a2effbb077b 100644 (file)
--- a/configs/uniphier_v8_defconfig
+++ b/configs/uniphier_v8_defconfig
@@ -21,6 +21,7 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_TFTPPUT=y
 CONFIG_CMD_CACHE=y
@@ -53,6 +54,9 @@ CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8
 CONFIG_DM_ETH=y
 CONFIG_SNI_AVE=y
 CONFIG_PINCONF=y
+CONFIG_SPI=y
+CONFIG_DM_SPI=y
+CONFIG_UNIPHIER_SPI=y
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_PSCI=y
 CONFIG_USB=y