From 06a778c6ac13077db800a4d9363eaaa8a5947ff6 Mon Sep 17 00:00:00 2001 From: lizs Date: Thu, 23 May 2019 10:10:15 +0800 Subject: [PATCH] Kernel->dts: fix multiplexed i2s_sdo1/gpio6_a5 causes enable logo to not be pulled high --- kernel/arch/arm/boot/dts/firefly-rk3288-aio-3288c_lvds.dts | 6 +++++- kernel/arch/arm/boot/dts/firefly-rk3288-aio-3288j_lvds.dts | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/kernel/arch/arm/boot/dts/firefly-rk3288-aio-3288c_lvds.dts b/kernel/arch/arm/boot/dts/firefly-rk3288-aio-3288c_lvds.dts index 9247a63eba..968d30291b 100644 --- a/kernel/arch/arm/boot/dts/firefly-rk3288-aio-3288c_lvds.dts +++ b/kernel/arch/arm/boot/dts/firefly-rk3288-aio-3288c_lvds.dts @@ -493,9 +493,13 @@ status = "disabled"; }; +&i2s { + pinctrl-0 = <&i2s_mclk &i2s_sclk &i2s_lrckrx &i2s_lrcktx &i2s_sdi &i2s_sdo0 /*&i2s_sdo1*/ &i2s_sdo2 &i2s_sdo3>; +}; + &fb { rockchip,disp-mode = ; - rockchip,uboot-logo-on = <0>; + rockchip,uboot-logo-on = <1>; rockchip,disp-policy = ; }; diff --git a/kernel/arch/arm/boot/dts/firefly-rk3288-aio-3288j_lvds.dts b/kernel/arch/arm/boot/dts/firefly-rk3288-aio-3288j_lvds.dts index 2f265d6d06..89297f5fac 100644 --- a/kernel/arch/arm/boot/dts/firefly-rk3288-aio-3288j_lvds.dts +++ b/kernel/arch/arm/boot/dts/firefly-rk3288-aio-3288j_lvds.dts @@ -495,6 +495,10 @@ status = "disabled"; }; +&i2s { + pinctrl-0 = <&i2s_mclk &i2s_sclk &i2s_lrckrx &i2s_lrcktx &i2s_sdi &i2s_sdo0 /*&i2s_sdo1*/ &i2s_sdo2 &i2s_sdo3>; +}; + &fb { rockchip,disp-mode = ; rockchip,uboot-logo-on = <1>;