diff options
author | Tom Rini <trini@konsulko.com> | 2021-01-27 19:39:31 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-01-27 19:39:31 +0300 |
commit | 8b195f4b716e4d802768e0e2cd63b417a4690b7f (patch) | |
tree | ee95cc34be28ab8a49b4fb9f6d99a893006c810f /arch/arm | |
parent | 290e40b2aa96e13b19292d81146063e036028931 (diff) | |
parent | 177cecdc4edcda5881cf217e21568d921b630bf5 (diff) | |
download | u-boot-8b195f4b716e4d802768e0e2cd63b417a4690b7f.tar.xz |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- Espressobin: Disable slot when emmc is not present (Pali)
- DS414; config header cleanup (Phil)
- PCI: auto-config enhancement (Phil)
- pci_mvebu: Also map IO region (Phil)
- serial: a3720: Implement pending method for output direction (Pali)
- turris_mox: Enable a few commands (Marek)
- helios4 & ClearFog changes (Dennis)
- Plus some minor misc changes
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/dts/armada-388-helios4-u-boot.dtsi | 23 | ||||
-rw-r--r-- | arch/arm/dts/armada-388-helios4.dts | 14 | ||||
-rw-r--r-- | arch/arm/mach-mvebu/Kconfig | 1 |
3 files changed, 27 insertions, 11 deletions
diff --git a/arch/arm/dts/armada-388-helios4-u-boot.dtsi b/arch/arm/dts/armada-388-helios4-u-boot.dtsi index 0753889854..1047c1af23 100644 --- a/arch/arm/dts/armada-388-helios4-u-boot.dtsi +++ b/arch/arm/dts/armada-388-helios4-u-boot.dtsi @@ -1,13 +1,5 @@ // SPDX-License-Identifier: GPL-2.0+ -/ { - aliases { - i2c0 = &i2c0; - i2c1 = &i2c1; - spi1 = &spi1; - }; -}; - ð0 { phy-reset-gpios = <&gpio0 19 GPIO_ACTIVE_LOW>; }; @@ -20,7 +12,6 @@ }; &w25q32 { - status = "okay"; u-boot,dm-spl; }; @@ -37,5 +28,17 @@ }; &sdhci { - u-boot,dm-spl; + u-boot,dm-spl; +}; + +&i2c0 { + u-boot,dm-spl; + + eeprom@52 { + u-boot,dm-spl; + }; + + eeprom@53 { + u-boot,dm-spl; + }; }; diff --git a/arch/arm/dts/armada-388-helios4.dts b/arch/arm/dts/armada-388-helios4.dts index fb49df2a3b..cbc296a46c 100644 --- a/arch/arm/dts/armada-388-helios4.dts +++ b/arch/arm/dts/armada-388-helios4.dts @@ -22,10 +22,14 @@ }; aliases { - /* So that mvebu u-boot can update the MAC addresses */ + /* So that mvebu u-boot can update the MAC address */ ethernet1 = ð0; + spi1 = &spi1; + i2c0 = &i2c0; + i2c1 = &i2c1; }; + chosen { stdout-path = "serial0:115200n8"; }; @@ -306,3 +310,11 @@ }; }; }; + +&w25q32 { + status = "okay"; +}; + +&spi1 { + status = "okay"; +}; diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 72aee8b3e5..0299611cbf 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -299,5 +299,6 @@ config SECURED_MODE_CSK_INDEX depends on SECURED_MODE_IMAGE source "board/solidrun/clearfog/Kconfig" +source "board/kobol/helios4/Kconfig" endif |