diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile index 7d565641641b..bff54f1abb1e 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -9,7 +9,10 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-evb-ddr3-v11-linux.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-evb-ddr4-v10.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-evb-ddr4-v10-linux.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-evb.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-evb-amic-v11.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-evb-dmic-pdm-v11.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-roc-cc.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308b-evb-amic-v10.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308b-evb-amic-v10-amp.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308bs-evb-amic-v11.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308bs-evb-ddr3-v20-rk618-rgb2dsi.dtb diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v11.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v11.dts index 90a29a903545..10c474369a0c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v11.dts +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v11.dts @@ -42,10 +42,6 @@ #sound-dai-cells = <0>; }; -&is31fl3236 { - reg = <0x3f>; -}; - &vad { status = "okay"; rockchip,audio-src = <&i2s_8ch_2>; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi b/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi index 565a734d1b62..9a905ea2b1fe 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi @@ -373,9 +373,9 @@ reset-gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_LOW>; }; - is31fl3236: led-controller@3c { + is31fl3236: led-controller@3f { compatible = "issi,is31fl3236"; - reg = <0x3c>; + reg = <0x3f>; #address-cells = <1>; #size-cells = <0>; reset-gpios = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm64/boot/dts/rockchip/rk3308b-evb-amic-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308b-evb-amic-v10.dts index d5e2d9ebd4aa..a8886d26966c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308b-evb-amic-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3308b-evb-amic-v10.dts @@ -48,10 +48,6 @@ &i2s_8ch_0_sdo2>; }; -&is31fl3236 { - reg = <0x3f>; -}; - &vad { status = "okay"; rockchip,audio-src = <&i2s_8ch_2>; diff --git a/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi index 5e51685f9978..1d000906b290 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi @@ -317,9 +317,9 @@ clock-frequency = <400000>; status = "okay"; - is31fl3236: led-controller@3c { + is31fl3236: led-controller@3f { compatible = "issi,is31fl3236"; - reg = <0x3c>; + reg = <0x3f>; #address-cells = <1>; #size-cells = <0>; reset-gpios = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>;