diff options
| author | Tom Rini <trini@konsulko.com> | 2020-01-22 02:10:28 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-01-22 02:10:28 +0300 |
| commit | 75dd53055a33f5bdb8ee2f53ce76c67052dfca7e (patch) | |
| tree | 2ee907d73cbd5882455cc62fc9ac5724b983112e /arch | |
| parent | ad647690b1346f57847d4c9251293293af8928a8 (diff) | |
| parent | 584a3d2622e9107d09434b05df8b6c50e25fe73f (diff) | |
| download | u-boot-75dd53055a33f5bdb8ee2f53ce76c67052dfca7e.tar.xz | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- Clearfog: Add run-time board detection with TLV EEPROM support
(Baruch)
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/armada-388-clearfog-u-boot.dtsi | 12 | ||||
| -rw-r--r-- | arch/arm/dts/armada-388-clearfog.dts | 6 | ||||
| -rw-r--r-- | arch/arm/dts/armada-38x-solidrun-microsom.dtsi | 8 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/Kconfig | 1 |
4 files changed, 27 insertions, 0 deletions
diff --git a/arch/arm/dts/armada-388-clearfog-u-boot.dtsi b/arch/arm/dts/armada-388-clearfog-u-boot.dtsi index 38e4f3d99a..20f5c8fb8c 100644 --- a/arch/arm/dts/armada-388-clearfog-u-boot.dtsi +++ b/arch/arm/dts/armada-388-clearfog-u-boot.dtsi @@ -23,3 +23,15 @@ &ahci1 { 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-clearfog.dts b/arch/arm/dts/armada-388-clearfog.dts index 4ddeaa02f1..e4164f49b2 100644 --- a/arch/arm/dts/armada-388-clearfog.dts +++ b/arch/arm/dts/armada-388-clearfog.dts @@ -259,6 +259,12 @@ compatible = "microchip,mcp3021"; reg = <0x4c>; }; + + eeprom@52 { + compatible = "atmel,24c02"; + reg = <0x52>; + pagesize = <16>; + }; }; &i2c1 { diff --git a/arch/arm/dts/armada-38x-solidrun-microsom.dtsi b/arch/arm/dts/armada-38x-solidrun-microsom.dtsi index a2627223ce..a322a28c21 100644 --- a/arch/arm/dts/armada-38x-solidrun-microsom.dtsi +++ b/arch/arm/dts/armada-38x-solidrun-microsom.dtsi @@ -99,3 +99,11 @@ status = "okay"; u-boot,dm-pre-reloc; }; + +&i2c0 { + eeprom@53 { + compatible = "atmel,24c02"; + reg = <0x53>; + pagesize = <16>; + }; +}; diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index fdd39685b7..bc5eaa5a76 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -91,6 +91,7 @@ choice config TARGET_CLEARFOG bool "Support ClearFog" select 88F6820 + select BOARD_LATE_INIT config TARGET_HELIOS4 bool "Support Helios4" |