diff options
| author | Tom Rini | 2020-01-08 15:25:13 -0500 |
|---|---|---|
| committer | Tom Rini | 2020-01-08 15:25:13 -0500 |
| commit | 21aede21b060661977fd3d11f96211bd4f254096 (patch) | |
| tree | cdf11901911eba05dccf9b0d79eb9aa9e53a6d0b | |
| parent | deb287b561233a1a9718ec87360dfa2079144e60 (diff) | |
| parent | 7b1c1f95c81c7f7e85fcfce2bfbe0ebc52984120 (diff) | |
Merge tag 'uniphier-v2020.04' of https://gitlab.denx.de/u-boot/custodians/u-boot-uniphier
UniPhier SoC updates for v2020.04
- add pinmux nodes for I2C ch5, ch6
- enable SPI driver and command
| -rw-r--r-- | arch/arm/dts/uniphier-pinctrl.dtsi | 10 | ||||
| -rw-r--r-- | configs/uniphier_v7_defconfig | 4 | ||||
| -rw-r--r-- | configs/uniphier_v8_defconfig | 4 |
3 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/dts/uniphier-pinctrl.dtsi b/arch/arm/dts/uniphier-pinctrl.dtsi index 1fee5ffbfb9..bfdfb764b25 100644 --- 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 112234df9fa..3a9290b7e9d 100644 --- 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 5acb1437bcf..b8f4a4ec6a5 100644 --- 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 |