diff options
| author | Samuel Holland <samuel@sholland.org> | 2022-04-27 23:31:31 +0300 |
|---|---|---|
| committer | Andre Przywara <andre.przywara@arm.com> | 2022-05-23 02:37:51 +0300 |
| commit | ce00370b873b94cdc85e3d85f55116e14e70412d (patch) | |
| tree | a5964ea073f69f368e019b004c0b90066826d621 /arch/arm/dts/sun50i-h6-orangepi.dtsi | |
| parent | 7710282334172bb0b56b4d30ed530d2b856029be (diff) | |
| download | u-boot-ce00370b873b94cdc85e3d85f55116e14e70412d.tar.xz | |
ARM: dts: sun50i: H6: Sync from Linux v5.18-rc1
Copy the devicetree source for the H6 SoC 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 189bef235dd3 and 73088dfee635.
This commit also adds the following new board devicetrees:
- sun50i-h6-pine-h64-model-b.dts
- sun50i-h6-tanix-tx6-mini.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-h6-orangepi.dtsi')
| -rw-r--r-- | arch/arm/dts/sun50i-h6-orangepi.dtsi | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/arm/dts/sun50i-h6-orangepi.dtsi b/arch/arm/dts/sun50i-h6-orangepi.dtsi index da0875bd38..a5811d55bb 100644 --- a/arch/arm/dts/sun50i-h6-orangepi.dtsi +++ b/arch/arm/dts/sun50i-h6-orangepi.dtsi @@ -112,12 +112,20 @@ vcc-pg-supply = <®_aldo1>; }; -&r_i2c { +&r_ir { + status = "okay"; +}; + +&r_pio { + vcc-pm-supply = <®_bldo3>; +}; + +&r_rsb { status = "okay"; - axp805: pmic@36 { + axp805: pmic@745 { compatible = "x-powers,axp805", "x-powers,axp806"; - reg = <0x36>; + reg = <0x745>; interrupt-parent = <&r_intc>; interrupts = <0 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; @@ -232,14 +240,6 @@ }; }; -&r_ir { - status = "okay"; -}; - -&r_pio { - vcc-pm-supply = <®_bldo3>; -}; - &rtc { clocks = <&ext_osc32k>; }; |