diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile index bfd396599831..01bd27dececb 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -396,13 +396,13 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rv1126b-evb1-v11-fastboot-spi-nor.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rv1126b-evb1-v11-spi-nor.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rv1126b-evb1-v11-5x-cam.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rv1126b-evb2-v10.dtb -dtb-$(CONFIG_ARCH_ROCKCHIP) += rv1126b-evb2-v10-aov-dual-cam.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rv1126b-evb2-v10-dv.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rv1126b-evb2-v10-mcu-k350c4516t.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rv1126b-evb2-v10-rgb-Q7050ITH2641AA1T.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rv1126b-evb2-v10-sii9022-bt1120-to-hdmi.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rv1126b-evb2-v12.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rv1126b-evb2-v12-aov-dual-cam.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rv1126b-evb2-v12-aov-dual-cam-spi-nor.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rv1126b-evb2-v12-fastboot-emmc.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rv1126b-evb2-v12-fastboot-spi-nand.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rv1126b-evb2-v12-fastboot-spi-nor.dtb diff --git a/arch/arm64/boot/dts/rockchip/rv1126b-evb2-v10-aov-dual-cam.dts b/arch/arm64/boot/dts/rockchip/rv1126b-evb2-v10-aov-dual-cam.dts deleted file mode 100644 index 6cec649318d1..000000000000 --- a/arch/arm64/boot/dts/rockchip/rv1126b-evb2-v10-aov-dual-cam.dts +++ /dev/null @@ -1,182 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (c) 2025 Rockchip Electronics Co., Ltd. - */ - -/dts-v1/; -#include "rv1126b.dtsi" -#include "rv1126b-evb.dtsi" -#include "rv1126b-evb2-v10.dtsi" -#include "rv1126b-evb-dual-cam-4k.dtsi" - -/ { - model = "Rockchip RV1126B EVB2 V10 Board"; - compatible = "rockchip,rv1126b-evb2-v10", "rockchip,rv1126b"; -}; - -&rockchip_suspend { - status = "okay"; - - rockchip,sleep-pin-config = < - (0 - | RKPM_SLEEP_PIN0_EN - ) - (0 - | RKPM_SLEEP_PIN0_ACT_LOW - ) - >; - - rockchip,sleep-io-config = < - /* pmic_sleep */ - (0 - | RKPM_IO_CFG_IOMUX_GPIO - | RKPM_IO_CFG_GPIO_DIR_INPUT - | RKPM_IO_CFG_PULL_DOWN - | RKPM_IO_CFG_ID(0) - ) - /* reset */ - #if 0 - (0 - | RKPM_IO_CFG_IOMUX_GPIO - | RKPM_IO_CFG_GPIO_DIR_INPUT - | RKPM_IO_CFG_PULL_NONE - | RKPM_IO_CFG_ID(1) - ) - #endif - (0 - | RKPM_IO_CFG_IOMUX_GPIO - | RKPM_IO_CFG_GPIO_DIR_INPUT - | RKPM_IO_CFG_PULL_DOWN - | RKPM_IO_CFG_ID(2) - ) - (0 - | RKPM_IO_CFG_PULL_NONE - | RKPM_IO_CFG_ID(3) - ) - (0 - | RKPM_IO_CFG_IOMUX_GPIO - | RKPM_IO_CFG_GPIO_DIR_INPUT - | RKPM_IO_CFG_PULL_UP - | RKPM_IO_CFG_ID(4) - ) - (0 - | RKPM_IO_CFG_IOMUX_GPIO - | RKPM_IO_CFG_GPIO_DIR_INPUT - | RKPM_IO_CFG_PULL_DOWN - | RKPM_IO_CFG_ID(5) - ) - (0 - | RKPM_IO_CFG_IOMUX_GPIO - | RKPM_IO_CFG_GPIO_DIR_INPUT - | RKPM_IO_CFG_PULL_DOWN - | RKPM_IO_CFG_ID(6) - ) - (0 - | RKPM_IO_CFG_IOMUX_GPIO - | RKPM_IO_CFG_GPIO_DIR_INPUT - | RKPM_IO_CFG_PULL_UP - | RKPM_IO_CFG_ID(7) - ) - (0 - | RKPM_IO_CFG_IOMUX_GPIO - | RKPM_IO_CFG_GPIO_DIR_INPUT - | RKPM_IO_CFG_PULL_DOWN - | RKPM_IO_CFG_ID(8) - ) - (0 - | RKPM_IO_CFG_IOMUX_GPIO - | RKPM_IO_CFG_GPIO_DIR_INPUT - | RKPM_IO_CFG_PULL_DOWN - | RKPM_IO_CFG_ID(9) - ) - (0 - | RKPM_IO_CFG_IOMUX_GPIO - | RKPM_IO_CFG_GPIO_DIR_INPUT - | RKPM_IO_CFG_PULL_DOWN - | RKPM_IO_CFG_ID(10) - ) - /* uart0 tx */ - (0 - | RKPM_IO_CFG_IOMUX_GPIO - | RKPM_IO_CFG_GPIO_DIR_INPUT - | RKPM_IO_CFG_PULL_DOWN - | RKPM_IO_CFG_ID(11) - ) - (0 - | RKPM_IO_CFG_IOMUX_GPIO - | RKPM_IO_CFG_GPIO_DIR_INPUT - | RKPM_IO_CFG_PULL_DOWN - | RKPM_IO_CFG_ID(12) - ) - (0 - | RKPM_IO_CFG_IOMUX_GPIO - | RKPM_IO_CFG_GPIO_DIR_INPUT - | RKPM_IO_CFG_PULL_DOWN - | RKPM_IO_CFG_ID(16) - ) - (0 - | RKPM_IO_CFG_IOMUX_GPIO - | RKPM_IO_CFG_GPIO_DIR_INPUT - | RKPM_IO_CFG_PULL_DOWN - | RKPM_IO_CFG_ID(17) - ) - (0 - | RKPM_IO_CFG_IOMUX_GPIO - | RKPM_IO_CFG_GPIO_DIR_INPUT - | RKPM_IO_CFG_PULL_NONE - | RKPM_IO_CFG_ID(18) - ) - (0 - | RKPM_IO_CFG_IOMUX_GPIO - | RKPM_IO_CFG_GPIO_DIR_INPUT - | RKPM_IO_CFG_PULL_NONE - | RKPM_IO_CFG_ID(19) - ) - (0 - | RKPM_IO_CFG_IOMUX_GPIO - | RKPM_IO_CFG_GPIO_DIR_INPUT - | RKPM_IO_CFG_PULL_DOWN - | RKPM_IO_CFG_ID(20) - ) - (0 - | RKPM_IO_CFG_IOMUX_GPIO - | RKPM_IO_CFG_GPIO_DIR_INPUT - | RKPM_IO_CFG_PULL_DOWN - | RKPM_IO_CFG_ID(21) - ) - (0 - | RKPM_IO_CFG_IOMUX_GPIO - | RKPM_IO_CFG_GPIO_DIR_INPUT - | RKPM_IO_CFG_PULL_DOWN - | RKPM_IO_CFG_ID(22) - ) - (0 - | RKPM_IO_CFG_IOMUX_GPIO - | RKPM_IO_CFG_GPIO_DIR_INPUT - | RKPM_IO_CFG_PULL_DOWN - | RKPM_IO_CFG_ID(23) - ) - (0 - | RKPM_IO_CFG_IOMUX_GPIO - | RKPM_IO_CFG_GPIO_DIR_INPUT - | RKPM_IO_CFG_PULL_DOWN - | RKPM_IO_CFG_ID(24) - ) - (0 - | RKPM_IO_CFG_IOMUX_GPIO - | RKPM_IO_CFG_GPIO_DIR_INPUT - | RKPM_IO_CFG_PULL_DOWN - | RKPM_IO_CFG_ID(25) - ) - >; -}; - -&sc850sl_0 { - reset-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>; - rockchip,camera-module-stb = <1>; -}; - -&sc850sl_1 { - reset-gpios = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>; - rockchip,camera-module-stb = <1>; -}; diff --git a/arch/arm64/boot/dts/rockchip/rv1126b-evb2-v12-aov-dual-cam-spi-nor.dts b/arch/arm64/boot/dts/rockchip/rv1126b-evb2-v12-aov-dual-cam-spi-nor.dts new file mode 100644 index 000000000000..b113ab960ab6 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rv1126b-evb2-v12-aov-dual-cam-spi-nor.dts @@ -0,0 +1,23 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2025 Rockchip Electronics Co., Ltd. + */ + +/dts-v1/; +#include "rv1126b-evb2-v10.dts" +#include "rv1126b-evb-dual-cam-4k.dtsi" + +/ { + model = "Rockchip RV1126B EVB2 V10 Board"; + compatible = "rockchip,rv1126b-evb2-v10", "rockchip,rv1126b"; +}; + +&sc850sl_0 { + reset-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>; + rockchip,camera-module-stb = <1>; +}; + +&sc850sl_1 { + reset-gpios = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>; + rockchip,camera-module-stb = <1>; +};