diff options
author | Arnd Bergmann <arnd@arndb.de> | 2024-02-29 18:22:29 +0300 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2024-02-29 18:22:29 +0300 |
commit | 34eb16dedb9eaae8d6ee955be5ca2fd5d01b8ca0 (patch) | |
tree | 765e7d0f1b23170607dd59d86c01899b322d6710 /arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a.dtsi | |
parent | 5d9f164317e6d003b4bb100d3eab959b3aca2eab (diff) | |
parent | 4622485f005aaf0f7a684b69280d0494e0ea301e (diff) | |
download | linux-34eb16dedb9eaae8d6ee955be5ca2fd5d01b8ca0.tar.xz |
Merge tag 'v6.9-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt
New boards: Powkiddy RGB10MAX3, Pine64 PineTab2, NanoPi R6C+R6S, Anbernic
RG-ARC S and RG-ARC D.
New peripherals: rs485 on Theobroma Systems boards, usb3 on Indidroid Nova,
Edgeble NCM6A (usb2, m.2, ethernet, wifi, cpu-regulator), Rock-5b rfkill
for wifi, cache information for rk3399.
Snmaller DT fixes (hdmi nodes, aliases, redundant card-detect gpios, max-
frequency for spi-flashes on rock-pi 4 boards, missing pmu-io-domains on
Ringneck)
* tag 'v6.9-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (38 commits)
arm64: dts: rockchip: Add USB3.0 to Indiedroid Nova
arm64: dts: rockchip: adjust phy-handle name on rock-pi-e
arm64: dts: rockchip: fix rk3399 hdmi ports node
arm64: dts: rockchip: fix rk3328 hdmi ports node
arm64: dts: rockchip: remove redundant cd-gpios from rk3588 sdmmc nodes
arm64: dts: rockchip: add rs485 support on uart5 of px30-ringneck-haikou
arm64: dts: rockchip: add rs485 support on uart2 of rk3399-puma-haikou
arm64: dts: rockchip: Add Powkiddy RGB10MAX3
dt-bindings: arm: rockchip: Add Powkiddy RGB10MAX3
arm64: dts: rockchip: Update powkiddy rk2023 dtsi for RGB10MAX3
arm64: dts: rockchip: Add devicetree for Pine64 PineTab2
dt-bindings: arm64: rockchip: Add Pine64 PineTab2
arm64: dts: rockchip: Add Touch to Anbernic RG-ARC D
arm64: dts: rockchip: fix nanopc-t6 sdmmc regulator
arm64: dts: rockchip: remove duplicate SPI aliases for helios64
arm64: dts: rockchip: add spi controller aliases on rk3399
arm64: dts: rockchip: Add support for NanoPi R6C
arm64: dts: rockchip: Add support for NanoPi R6S
dt-bindings: arm: rockchip: Add NanoPi R6 series boards
arm64: dts: rockchip: Increase maximum frequency of SPI flash for ROCK Pi 4A/B/C
...
Link: https://lore.kernel.org/r/3622360.hdfAi7Kttb@diego
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a.dtsi')
-rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a.dtsi | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a.dtsi index 727580aaa105..4c76a00b41eb 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a.dtsi @@ -3,29 +3,8 @@ * Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd. */ +#include "rk3588-edgeble-neu6a-common.dtsi" + / { compatible = "edgeble,neural-compute-module-6a", "rockchip,rk3588"; - - aliases { - mmc0 = &sdhci; - }; - - vcc12v_dcin: vcc12v-dcin-regulator { - compatible = "regulator-fixed"; - regulator-name = "vcc12v_dcin"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <12000000>; - regulator-max-microvolt = <12000000>; - }; -}; - -&sdhci { - bus-width = <8>; - no-sdio; - no-sd; - non-removable; - mmc-hs400-1_8v; - mmc-hs400-enhanced-strobe; - status = "okay"; }; |