diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile index c4d45cbb93d76..d13871fde1aee 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -388,6 +388,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nanopc-cm3588-nas.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nanopc-t6.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nanopc-t6-lts.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nanopc-t6-lts-plus.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nanopc-t6-plus.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nvr-demo-v10.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nvr-demo-v10-android.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nvr-demo-v10-ipc-4x-linux.dtb diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts-plus.dts deleted file mode 100644 index 226bcc11b0352..0000000000000 --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts-plus.dts +++ /dev/null @@ -1,77 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (c) 2025 FriendlyElec Computer Tech. Co., Ltd. - * (http://www.friendlyelec.com) - * Copyright (c) 2025 Armbian - */ - -/dts-v1/; -#include "rk3588-nanopc-t6.dts" - -/delete-node/ &rt5616; -/delete-node/ &rt5616_sound; - -/ { - model = "FriendlyElec NanoPC-T6 LTS Plus"; - compatible = "friendlyelec,nanopc-t6", "rockchip,rk3588"; - - es8389_sound: es8389-sound { - status = "okay"; - compatible = "simple-audio-card"; - pinctrl-names = "default"; - pinctrl-0 = <&hp_det>; - - simple-audio-card,name = "everest,es8389-codec"; - simple-audio-card,format = "i2s"; - simple-audio-card,mclk-fs = <256>; - - simple-audio-card,hp-det-gpios = <&gpio1 RK_PC4 GPIO_ACTIVE_LOW>; - - simple-audio-card,widgets = - "Headphone", "Headphones", - "Microphone", "Microphone Jack"; - simple-audio-card,routing = - "Headphones", "HPOL", - "Headphones", "HPOR", - "INPUT1", "Microphone Jack", - "INPUT2", "Microphone Jack"; - - simple-audio-card,cpu { - sound-dai = <&i2s0_8ch>; - }; - simple-audio-card,codec { - sound-dai = <&es8389>; - }; - }; - - vcc5v0_host_20: vcc5v0-host-20 { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&vcc5v0_host20_en>; - regulator-name = "vcc5v0_host_20"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - vin-supply = <&vcc5v0_usb>; - }; -}; - -&i2c7 { - es8389: es8389@10 { - status = "okay"; - #sound-dai-cells = <0>; - compatible = "everest,es8389"; - reg = <0x10>; - clocks = <&mclkout_i2s0>; - clock-names = "mclk"; - assigned-clocks = <&mclkout_i2s0>; - assigned-clock-rates = <12288000>; - pinctrl-names = "default"; - pinctrl-0 = <&i2s0_mclk>; - }; -}; - -&u2phy3_host { - phy-supply = <&vcc5v0_host_20>; -}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts-plus.dts new file mode 120000 index 0000000000000..973bd1d605338 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts-plus.dts @@ -0,0 +1 @@ +rk3588-nanopc-t6-plus.dts \ No newline at end of file diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-plus.dts new file mode 100644 index 0000000000000..4558f5f61e68c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-plus.dts @@ -0,0 +1,77 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2025 FriendlyElec Computer Tech. Co., Ltd. + * (http://www.friendlyelec.com) + * Copyright (c) 2025 Armbian + */ + +/dts-v1/; +#include "rk3588-nanopc-t6.dts" + +/delete-node/ &rt5616; +/delete-node/ &rt5616_sound; + +/ { + model = "FriendlyElec NanoPC-T6 Plus"; + compatible = "friendlyelec,nanopc-t6", "rockchip,rk3588"; + + es8389_sound: es8389-sound { + status = "okay"; + compatible = "simple-audio-card"; + pinctrl-names = "default"; + pinctrl-0 = <&hp_det>; + + simple-audio-card,name = "everest,es8389-codec"; + simple-audio-card,format = "i2s"; + simple-audio-card,mclk-fs = <256>; + + simple-audio-card,hp-det-gpios = <&gpio1 RK_PC4 GPIO_ACTIVE_LOW>; + + simple-audio-card,widgets = + "Headphone", "Headphones", + "Microphone", "Microphone Jack"; + simple-audio-card,routing = + "Headphones", "HPOL", + "Headphones", "HPOR", + "INPUT1", "Microphone Jack", + "INPUT2", "Microphone Jack"; + + simple-audio-card,cpu { + sound-dai = <&i2s0_8ch>; + }; + simple-audio-card,codec { + sound-dai = <&es8389>; + }; + }; + + vcc5v0_host_20: vcc5v0-host-20 { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&vcc5v0_host20_en>; + regulator-name = "vcc5v0_host_20"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <&vcc5v0_usb>; + }; +}; + +&i2c7 { + es8389: es8389@10 { + status = "okay"; + #sound-dai-cells = <0>; + compatible = "everest,es8389"; + reg = <0x10>; + clocks = <&mclkout_i2s0>; + clock-names = "mclk"; + assigned-clocks = <&mclkout_i2s0>; + assigned-clock-rates = <12288000>; + pinctrl-names = "default"; + pinctrl-0 = <&i2s0_mclk>; + }; +}; + +&u2phy3_host { + phy-supply = <&vcc5v0_host_20>; +};