diff --git a/arch/arm64/boot/dts/qcom/sdm660-xiaomi-clover-common.dtsi b/arch/arm64/boot/dts/qcom/sdm660-xiaomi-clover-common.dtsi index 83f80521ba3df9..68a9ce1c39e796 100644 --- a/arch/arm64/boot/dts/qcom/sdm660-xiaomi-clover-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm660-xiaomi-clover-common.dtsi @@ -98,8 +98,8 @@ }; }; -&adreno_gpu{ - status = "okay"; +&adreno_gpu { + status = "disabled"; // TODO: set to okay when display stack works zap-shader { memory-region = <&zap_shader_region>; @@ -130,7 +130,7 @@ status = "disabled"; }; -&gpucc{ +&gpucc { status = "okay"; }; @@ -143,7 +143,7 @@ }; &mdss { - status = "okay"; + //status = "okay"; // TODO: remove when panel works, but now do not probe mdss }; &mdss_dsi1 { diff --git a/arch/arm64/boot/dts/qcom/sdm660-xiaomi-clover-plus.dts b/arch/arm64/boot/dts/qcom/sdm660-xiaomi-clover-plus.dts index 9525f1299830d8..a245e29e460854 100644 --- a/arch/arm64/boot/dts/qcom/sdm660-xiaomi-clover-plus.dts +++ b/arch/arm64/boot/dts/qcom/sdm660-xiaomi-clover-plus.dts @@ -54,56 +54,41 @@ }; &blsp_i2c8 { - status = "disabled"; + status = "okay"; + i2c_backlight: backlight@2c { compatible = "ti,lp8556"; reg = <0x2c>; - bl-name = "lcd-backlight"; enable-supply = <&vreg_bl_vddio>; - rom_16h { - rom-addr = /bits/ 8 <0x16>; - rom-val = /bits/ 8 <0x0F>; - }; - rom_01h { - rom-addr = /bits/ 8 <0x01>; - rom-val = /bits/ 8 <0x86>; - }; - rom_00h { - rom-addr = /bits/ 8 <0x00>; - rom-val = /bits/ 8 <0x00>; - }; - rom_01h_2 { - rom-addr = /bits/ 8 <0x01>; - rom-val = /bits/ 8 <0x87>; - }; - rom_9Eh { - rom-addr = /bits/ 8 <0x9E>; - rom-val = /bits/ 8 <0x20>; - }; - rom_A0h { - rom-addr = /bits/ 8 <0xA0>; + bl-name = "lcd-backlight"; + dev-ctrl = /bits/ 8 <0x05>; + init-brt = /bits/ 8 <0x7f>; + + /* valid EEPROM addresses for LP8556 are from 0xA0 to 0xAF only */ + rom-a0h { + rom-addr = /bits/ 8 <0xa0>; rom-val = /bits/ 8 <0x09>; }; - rom_A1h { - rom-addr = /bits/ 8 <0xA1>; - rom-val = /bits/ 8 <0x5F>; + rom-a1h { + rom-addr = /bits/ 8 <0xa1>; + rom-val = /bits/ 8 <0x5f>; }; - rom_A3h { - rom-addr = /bits/ 8 <0xA3>; - rom-val = /bits/ 8 <0x0E>; + rom-a3h { + rom-addr = /bits/ 8 <0xa3>; + rom-val = /bits/ 8 <0x0e>; }; - rom_A5h { - rom-addr = /bits/ 8 <0xA5>; + rom-a5h { + rom-addr = /bits/ 8 <0xa5>; rom-val = /bits/ 8 <0x24>; }; - rom_A9h { - rom-addr = /bits/ 8 <0xA9>; - rom-val = /bits/ 8 <0xA0>; + rom-a9h { + rom-addr = /bits/ 8 <0xa9>; + rom-val = /bits/ 8 <0xa0>; }; - rom_AEh { - rom-addr = /bits/ 8 <0xAE>; - rom-val = /bits/ 8 <0x0E>; + rom-aeh { + rom-addr = /bits/ 8 <0xae>; + rom-val = /bits/ 8 <0x0e>; }; }; }; diff --git a/arch/arm64/boot/dts/qcom/sdm660-xiaomi-clover.dts b/arch/arm64/boot/dts/qcom/sdm660-xiaomi-clover.dts index f6c51607e65780..d37d7e33b8f79c 100644 --- a/arch/arm64/boot/dts/qcom/sdm660-xiaomi-clover.dts +++ b/arch/arm64/boot/dts/qcom/sdm660-xiaomi-clover.dts @@ -16,6 +16,7 @@ &blsp_i2c3 { status = "okay"; + touchscreen@38 { compatible = "edt,edt-ft5406", "edt,edt-ft5x06"; reg = <0x38>; diff --git a/arch/arm64/configs/sdm660_defconfig b/arch/arm64/configs/sdm660_defconfig index e2e9e0be3a27ce..b5e47f3af09511 100644 --- a/arch/arm64/configs/sdm660_defconfig +++ b/arch/arm64/configs/sdm660_defconfig @@ -352,6 +352,7 @@ CONFIG_MOUSE_SYNAPTICS_USB=m CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_TABLET=y CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_GOODIX=m CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS=m CONFIG_TOUCHSCREEN_NT36XXX=m CONFIG_TOUCHSCREEN_EDT_FT5X06=m @@ -421,6 +422,7 @@ CONFIG_DRM_FBDEV_OVERALLOC=200 CONFIG_DRM_MSM=m # CONFIG_DRM_MSM_MDP4 is not set # CONFIG_DRM_MSM_HDMI is not set +CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m CONFIG_DRM_PANEL_DSI_CM=y CONFIG_DRM_PANEL_SIMPLE=y CONFIG_DRM_PANEL_FT8716U=m @@ -433,6 +435,7 @@ CONFIG_FB_MODE_HELPERS=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_PWM=y CONFIG_BACKLIGHT_QCOM_WLED=y +CONFIG_BACKLIGHT_LP855X=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y CONFIG_LOGO=y