diff options
author | Tom Rini <trini@konsulko.com> | 2022-05-24 23:29:00 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2022-05-24 23:29:00 -0400 |
commit | 7e0edcadb09d55d5319fdc862041fd1b874476f5 (patch) | |
tree | 3c5b591fea0c39989c580df0cdc78c6731a317eb /arch/arm/dts/sun8i-s3-pinecube.dts | |
parent | 1b04a961c6bcb9768f517198890cac680ee532e8 (diff) | |
parent | 7495051219b64ec0e8fac8930586dc10666530da (diff) | |
download | u-boot-WIP/24May2022.zip u-boot-WIP/24May2022.tar.gz u-boot-WIP/24May2022.tar.bz2 |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxiWIP/24May2022
The bulk of it is (finally!) some DT sync from the kernel. We refrained
from syncing one incompatible change, as this would spoil booting Linux
kernels before v5.13 with U-Boot's DT (via UEFI, for instance).
I test booted Linux v5.18 and v5.4 with that new DT on some boards, and
the headless peripherals (MMC, USB, Ethernet) seemed to work.
The rest are fixes:
- silencing missing clock warnings due to the new pinctrl driver
- fixing "UART0 on PortF", allowing UART access through the SD card pins
- add an F1C100s clock driver, to enable MMC support (SPI comes later)
- some cleanups for CONS_INDEX_n in Kconfig
Tested on BananaPi-M1, Pine64-LTS, Pine-H64, X96-Mate (H616) and
OrangePi-Zero.
Diffstat (limited to 'arch/arm/dts/sun8i-s3-pinecube.dts')
-rw-r--r-- | arch/arm/dts/sun8i-s3-pinecube.dts | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/arch/arm/dts/sun8i-s3-pinecube.dts b/arch/arm/dts/sun8i-s3-pinecube.dts index 9bab6b7..20966e9 100644 --- a/arch/arm/dts/sun8i-s3-pinecube.dts +++ b/arch/arm/dts/sun8i-s3-pinecube.dts @@ -10,7 +10,7 @@ / { model = "PineCube IP Camera"; - compatible = "pine64,pinecube", "allwinner,sun8i-s3"; + compatible = "pine64,pinecube", "sochip,s3", "allwinner,sun8i-v3"; aliases { serial0 = &uart2; @@ -64,9 +64,6 @@ status = "okay"; port { - #address-cells = <1>; - #size-cells = <0>; - csi1_ep: endpoint { remote-endpoint = <&ov5640_ep>; bus-width = <8>; @@ -88,13 +85,9 @@ status = "okay"; axp209: pmic@34 { - compatible = "x-powers,axp203", - "x-powers,axp209"; reg = <0x34>; - interrupt-parent = <&gic>; - interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; - interrupt-controller; - #interrupt-cells = <1>; + interrupt-parent = <&nmi_intc>; + interrupts = <0 IRQ_TYPE_LEVEL_LOW>; }; }; |