diff options
author | Samuel Holland <samuel@sholland.org> | 2022-04-27 15:31:27 -0500 |
---|---|---|
committer | Andre Przywara <andre.przywara@arm.com> | 2022-05-23 00:37:51 +0100 |
commit | 2c597855aa17d11520da642d03c82ff0c68042ab (patch) | |
tree | 626fe5d65103c387d7afeec408261e6d02814916 /arch/arm/dts/sun50i-h5-nanopi-r1s-h5.dts | |
parent | 2d648e6982e970755e78f9644bbfbe0efef43703 (diff) |
ARM: dts: sunxi: H2+/H3/H5: Sync from Linux v5.18-rc1
Copy the devicetree source for the H2+/H3/H5 SoCs and all existing
boards from the Linux v5.18-rc1 tag.
To maintain ABI compatibility with existing LTS kernels, one change
moving some IP blocks to the r_intc interrupt controller is excluded.
This effectively reverts Linux commits 994e5818392c and 9fdef3c3d8c2.
This commit also adds the following new board devicetree:
- sun8i-h3-nanopi-r1.dts
This update should not impact any existing U-Boot functionality.
Signed-off-by: Samuel Holland <samuel@sholland.org>
Diffstat (limited to 'arch/arm/dts/sun50i-h5-nanopi-r1s-h5.dts')
-rw-r--r-- | arch/arm/dts/sun50i-h5-nanopi-r1s-h5.dts | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/dts/sun50i-h5-nanopi-r1s-h5.dts b/arch/arm/dts/sun50i-h5-nanopi-r1s-h5.dts index 55bcdf8d1a0..55b369534a0 100644 --- a/arch/arm/dts/sun50i-h5-nanopi-r1s-h5.dts +++ b/arch/arm/dts/sun50i-h5-nanopi-r1s-h5.dts @@ -142,9 +142,16 @@ status = "okay"; eeprom@51 { - compatible = "microchip,24c02"; + compatible = "microchip,24c02", "atmel,24c02"; reg = <0x51>; pagesize = <16>; + read-only; + #address-cells = <1>; + #size-cells = <1>; + + eth_mac1: mac-address@fa { + reg = <0xfa 0x06>; + }; }; }; |