From 79a5a1e9496179c70b4c271659e5f6013cf6153c Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Sat, 25 Jan 2025 14:48:59 +0800 Subject: [PATCH 01/31] driver: rknpu: Add kern_addr_valid() Fixes: 731451a16a7e ("mm: remove kern_addr_valid() completely") Signed-off-by: Tao Huang Change-Id: I611eed4a5c11721be3ad3c76618241793cc371fc --- drivers/rknpu/rknpu_mem.c | 53 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/drivers/rknpu/rknpu_mem.c b/drivers/rknpu/rknpu_mem.c index 8f05541c936c..222fce4d76e8 100644 --- a/drivers/rknpu/rknpu_mem.c +++ b/drivers/rknpu/rknpu_mem.c @@ -17,6 +17,59 @@ #ifdef CONFIG_ROCKCHIP_RKNPU_DMA_HEAP +#if KERNEL_VERSION(6, 1, 115) < LINUX_VERSION_CODE +#ifdef CONFIG_ARM64 +/* + * Check whether a kernel address is valid (derived from arch/x86/). + */ +static int kern_addr_valid(unsigned long addr) +{ + pgd_t *pgdp; + p4d_t *p4dp; + pud_t *pudp, pud; + pmd_t *pmdp, pmd; + pte_t *ptep, pte; + + addr = arch_kasan_reset_tag(addr); + if ((((long)addr) >> VA_BITS) != -1UL) + return 0; + + pgdp = pgd_offset_k(addr); + if (pgd_none(READ_ONCE(*pgdp))) + return 0; + + p4dp = p4d_offset(pgdp, addr); + if (p4d_none(READ_ONCE(*p4dp))) + return 0; + + pudp = pud_offset(p4dp, addr); + pud = READ_ONCE(*pudp); + if (pud_none(pud)) + return 0; + + if (pud_sect(pud)) + return pfn_valid(pud_pfn(pud)); + + pmdp = pmd_offset(pudp, addr); + pmd = READ_ONCE(*pmdp); + if (pmd_none(pmd)) + return 0; + + if (pmd_sect(pmd)) + return pfn_valid(pmd_pfn(pmd)); + + ptep = pte_offset_kernel(pmdp, addr); + pte = READ_ONCE(*ptep); + if (pte_none(pte)) + return 0; + + return pfn_valid(pte_pfn(pte)); +} +#else +#define kern_addr_valid(addr) (1) +#endif +#endif + int rknpu_mem_create_ioctl(struct rknpu_device *rknpu_dev, struct file *file, unsigned int cmd, unsigned long data) { From 3558926745c8189ca93821349bd73b0d0cdd13ca Mon Sep 17 00:00:00 2001 From: Damon Ding Date: Thu, 12 Dec 2024 11:46:18 +0800 Subject: [PATCH 02/31] drm/rockchip: logo: call drm_atomic_bridge_chain_check() bridge in mode fixup For some connector drivers, such as dw-dp, &drm_bridge_funcs.atomic_check() helps to select output_mode, color_range and so on, which will be determined in the following &drm_encoder_helper_funcs.atomic_check(). In order to get the exact display mode for the mode comparison between U-boot and Kernel, add the full bridge atomic check process in rockchip_drm_mode_fixup(). Without this patch, the mode comparison will fail if the DP logo display is enabled in YUV420 mode for RK3576, because the display mode of uboot has been fixed while the display mode of kernel has not, due to the incorrect conn_state->output_mode. The related workaround is: /* * For RK3576 YUV420 output, hden signal introduce one cycle delay, * so we need to adjust hfp and hbp to compatible with this design. */ if (vop2->version == VOP_VERSION_RK3576 && conn_state->output_mode == ROCKCHIP_OUT_MODE_YUV420) { mode->crtc_hsync_start += 2; mode->crtc_hsync_end += 2; } Fixes: c4642391b1fe ("drm/rockchip: vop2: adjust hfp and hbp for YUV420 output") Change-Id: I3193bfa2bca7c14f5c7308f94e7d23160618be0c Signed-off-by: Damon Ding --- drivers/gpu/drm/rockchip/rockchip_drm_logo.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_logo.c b/drivers/gpu/drm/rockchip/rockchip_drm_logo.c index b33fff364592..c113430ea3a2 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_logo.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_logo.c @@ -730,12 +730,23 @@ static void rockchip_drm_mode_fixup(struct drm_crtc_state *crtc_state, const struct drm_crtc_helper_funcs *crtc_funcs; struct drm_encoder *encoder = conn_state->best_encoder; struct drm_crtc *crtc = crtc_state->crtc; + struct drm_bridge *bridge; + struct drm_bridge_state *bridge_state; int ret; ret = drm_atomic_set_mode_for_crtc(crtc_state, adj_mode); if (ret) return; + bridge = drm_bridge_chain_get_first_bridge(encoder); + if (bridge) { + bridge_state = drm_atomic_get_bridge_state(crtc_state->state, bridge); + if (IS_ERR(bridge_state)) + return; + + drm_atomic_bridge_chain_check(bridge, crtc_state, conn_state); + } + encoder_funcs = encoder->helper_private; if (encoder_funcs && encoder_funcs->atomic_check) encoder_funcs->atomic_check(encoder, crtc_state, conn_state); From e9991c5bc21ef6c52832918d9b153eaf0ef58466 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Wed, 5 Feb 2025 16:12:39 +0800 Subject: [PATCH 03/31] media: i2c: imx498: Fix typo in Makefile Fixes: 0ad1b882f449 ("media: i2c: add imx498 sensor driver") Signed-off-by: Tao Huang Change-Id: I5a153b90c76eb75450f2590db03820570ab45d1d --- drivers/media/i2c/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile index 5eb953dcd841..9eca3161a7b6 100644 --- a/drivers/media/i2c/Makefile +++ b/drivers/media/i2c/Makefile @@ -99,7 +99,7 @@ obj-$(CONFIG_VIDEO_IMX412) += imx412.o obj-$(CONFIG_VIDEO_IMX415) += imx415.o obj-$(CONFIG_VIDEO_IMX464) += imx464.o obj-$(CONFIG_VIDEO_IMX492) += imx492.o -obj-$(CONFIG_VIDEO_IMX492) += imx498.o +obj-$(CONFIG_VIDEO_IMX498) += imx498.o obj-$(CONFIG_VIDEO_IMX577) += imx577.o obj-$(CONFIG_VIDEO_IMX586) += imx586.o obj-$(CONFIG_VIDEO_IR_I2C) += ir-kbd-i2c.o From be7b2f21b3ee46d59c04e49efefdd5a8b4ee0dcb Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Wed, 5 Feb 2025 16:24:19 +0800 Subject: [PATCH 04/31] drivers: rkflash: Fix Kconfig Segmentation fault Fix following error: [scripts/kconfig/Makefile:56: menuconfig] Segmentation fault (core dumped) on v6.12. Signed-off-by: Tao Huang Change-Id: Ie767e45e4ee9025efe95186e3d1a4a7f6a7d0867 --- drivers/rkflash/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/rkflash/Kconfig b/drivers/rkflash/Kconfig index 67527b25cc5f..6e0ae03cd149 100644 --- a/drivers/rkflash/Kconfig +++ b/drivers/rkflash/Kconfig @@ -22,7 +22,7 @@ comment "Rockchip Flash Devices" config RK_SFTL tristate "Rockchip Slc Nand FTL support" default y - depends on (RK_NANDC_NAND || (RK_SFC_NAND && RK_SFC_NAND_MTD !=y)) + depends on (RK_NANDC_NAND || (RK_SFC_NAND && !RK_SFC_NAND_MTD)) help This enables support for Slc Nand FTL. From c9c714620df0d0e671262cd825586bb7d9b536d2 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Sun, 26 Jan 2025 23:02:00 +0800 Subject: [PATCH 05/31] input: touchscreen: cyttsp5: use "prompt" instead of "bool" for choice prompts Change-Id: Ie5635f06817a6191be30cbb36d227bb43f7a498f Signed-off-by: Tao Huang --- drivers/input/touchscreen/cyttsp5/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/input/touchscreen/cyttsp5/Kconfig b/drivers/input/touchscreen/cyttsp5/Kconfig index 4bdeb1b8365d..6b26c8f5f78b 100644 --- a/drivers/input/touchscreen/cyttsp5/Kconfig +++ b/drivers/input/touchscreen/cyttsp5/Kconfig @@ -50,7 +50,7 @@ config TOUCHSCREEN_CYPRESS_CYTTSP5_SPI module will be called cyttsp5_spi. choice - bool "Parade TrueTouch Gen5 MultiTouch Protocol" + prompt "Parade TrueTouch Gen5 MultiTouch Protocol" depends on TOUCHSCREEN_CYPRESS_CYTTSP5 default TOUCHSCREEN_CYPRESS_CYTTSP5_MT_B help From aa258f62fbf9b14a75448c781456692b5d6162b2 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Sun, 26 Jan 2025 23:02:46 +0800 Subject: [PATCH 06/31] input: touchscreen: parade: use "prompt" instead of "bool" for choice prompts Change-Id: I0119334ded45a6431f5657b64118b14ebfe376e8 Signed-off-by: Tao Huang --- drivers/input/touchscreen/parade/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/input/touchscreen/parade/Kconfig b/drivers/input/touchscreen/parade/Kconfig index c0ffdd6ffab1..bb6e05c89fcc 100644 --- a/drivers/input/touchscreen/parade/Kconfig +++ b/drivers/input/touchscreen/parade/Kconfig @@ -68,7 +68,7 @@ config TOUCHSCREEN_PARADE_SPI module will be called pt_spi. choice - bool "Parade TrueTouch Gen5 MultiTouch Protocol" + prompt "Parade TrueTouch Gen5 MultiTouch Protocol" depends on TOUCHSCREEN_PARADE default TOUCHSCREEN_PARADE_MT_B help From a355f5a2a0e6b485e4ab599ba7092710f10f575d Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Wed, 29 Jan 2025 23:44:19 +0800 Subject: [PATCH 07/31] clk: rockchip: rk1808: Explicitly include linux/platform_device.h Change-Id: Icdd546d52a9fb37fd96e0b2a628fda41f910561b Signed-off-by: Tao Huang --- drivers/clk/rockchip/clk-rk1808.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/clk/rockchip/clk-rk1808.c b/drivers/clk/rockchip/clk-rk1808.c index e177a3dd634c..5efd90b17843 100644 --- a/drivers/clk/rockchip/clk-rk1808.c +++ b/drivers/clk/rockchip/clk-rk1808.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include "clk.h" From 643604e1500748204aef97d5985447250c70e4dc Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Wed, 29 Jan 2025 23:44:36 +0800 Subject: [PATCH 08/31] clk: rockchip: rk3328: Explicitly include linux/platform_device.h Change-Id: Idfe90228e880090a19ab944f34f13e973b84e20c Signed-off-by: Tao Huang --- drivers/clk/rockchip/clk-rk3328.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/clk/rockchip/clk-rk3328.c b/drivers/clk/rockchip/clk-rk3328.c index c9f1c3038f77..1dc1e8998a9d 100644 --- a/drivers/clk/rockchip/clk-rk3328.c +++ b/drivers/clk/rockchip/clk-rk3328.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include "clk.h" From c6443c0b466bc04d383a2a50468783b5f0a828af Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Sat, 1 Feb 2025 15:01:58 +0800 Subject: [PATCH 09/31] drm/rockchip: dsi2: Explicitly include linux/platform_device.h Change-Id: Ie4b6eb3e89618984f7fdc4aeb305b065779552d6 Signed-off-by: Tao Huang --- drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c index c56bec9c0822..f9b8632a280a 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include From b77ddffd879e79872dd396fd28d93fe45bae7f7d Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Sat, 1 Feb 2025 14:39:45 +0800 Subject: [PATCH 10/31] drm/rockchip: tve: Explicitly include linux/platform_device.h Change-Id: If99af821b63244229912fc0797d241a211a4fbea Signed-off-by: Tao Huang --- drivers/gpu/drm/rockchip/rockchip_drm_tve.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_tve.c b/drivers/gpu/drm/rockchip/rockchip_drm_tve.c index 8621f8d47baf..f42b294a28a1 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_tve.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_tve.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include From e5dac74356236b91fe5134544e01a4f388bcdb25 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Tue, 4 Feb 2025 21:23:53 +0800 Subject: [PATCH 11/31] firmware: rockchip_sip: Explicitly include vmalloc.h Change-Id: Ibdbd04178e7da485a0187b33c327c7f35c33a8a5 Signed-off-by: Tao Huang --- drivers/firmware/rockchip_sip.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/firmware/rockchip_sip.c b/drivers/firmware/rockchip_sip.c index bf214bcea209..785e25420346 100644 --- a/drivers/firmware/rockchip_sip.c +++ b/drivers/firmware/rockchip_sip.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #ifdef CONFIG_64BIT From 4f984d88900cf4056897da90a6f109591caa93cb Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Wed, 5 Feb 2025 18:23:03 +0800 Subject: [PATCH 12/31] ASoC: aw87xxx: Explicitly include vmalloc.h Signed-off-by: Tao Huang Change-Id: Id22433d505871dbaecc5fe717d11393a193bcc1c --- sound/soc/codecs/aw87xxx/aw87xxx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/aw87xxx/aw87xxx.c b/sound/soc/codecs/aw87xxx/aw87xxx.c index 7f5cc1673d29..42ae48211565 100644 --- a/sound/soc/codecs/aw87xxx/aw87xxx.c +++ b/sound/soc/codecs/aw87xxx/aw87xxx.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include From 7166d5f4bb74300d5a007b91c82adbbe5f8dca83 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Tue, 4 Feb 2025 21:33:41 +0800 Subject: [PATCH 13/31] mfd: rk806: Explicitly include linux/pinctrl/consumer.h Change-Id: I4cb4f8d7b88319100f5646b4f96fbe5b73cc96a1 Signed-off-by: Tao Huang --- drivers/mfd/rk806-core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/mfd/rk806-core.c b/drivers/mfd/rk806-core.c index eed82776374b..b0e9eb16fc00 100644 --- a/drivers/mfd/rk806-core.c +++ b/drivers/mfd/rk806-core.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #define TSD_TEMP_140 0x00 From 47102b506abc56e11fc9b261e259aa63a9bb662b Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Tue, 4 Feb 2025 21:58:45 +0800 Subject: [PATCH 14/31] regulator: rk806: Explicitly include linux/pinctrl/consumer.h Change-Id: I9b4c7b5ec442536bef78aeec3e0ea151ec670c35 Signed-off-by: Tao Huang --- drivers/regulator/rk806-regulator.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/regulator/rk806-regulator.c b/drivers/regulator/rk806-regulator.c index b8b18fd63e51..0a7a1be7cc4f 100644 --- a/drivers/regulator/rk806-regulator.c +++ b/drivers/regulator/rk806-regulator.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include "internal.h" From 35f91837231ffb19eebfc6a47aea4015bf21a037 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Tue, 4 Feb 2025 21:43:35 +0800 Subject: [PATCH 15/31] mmc: dw_mmc: Explicitly include linux/pinctrl/consumer.h for pinctrl_select_state Change-Id: I94a11f222ed5ae7ed3be1b8e69f71a19667aa381 Signed-off-by: Tao Huang --- drivers/mmc/host/dw_mmc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 5fb4133a1219..62dd5501fd2c 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include From 9e2ef257d6138e102f1cddc1d5d1489c57b6d9e8 Mon Sep 17 00:00:00 2001 From: Huang zhibao Date: Thu, 6 Feb 2025 09:23:28 +0800 Subject: [PATCH 16/31] arm64: dts: rockchip: rk3576-evb2: Remove vcc3v3_lcd_n Signed-off-by: Huang zhibao Change-Id: Ieb50556d5ed41c23005137c60153d604906f79c7 --- arch/arm64/boot/dts/rockchip/rk3576-evb2.dtsi | 9 --------- 1 file changed, 9 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3576-evb2.dtsi b/arch/arm64/boot/dts/rockchip/rk3576-evb2.dtsi index 5b546d9c35f3..1b73b3465081 100644 --- a/arch/arm64/boot/dts/rockchip/rk3576-evb2.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3576-evb2.dtsi @@ -164,15 +164,6 @@ vin-supply = <&vcc_sys>; }; - vcc3v3_lcd_n: vcc3v3-lcd0-n { - compatible = "regulator-fixed"; - regulator-name = "vcc3v3_lcd0_n"; - regulator-boot-on; - enable-active-high; - gpio = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; - vin-supply = <&vcc_3v3_s0>; - }; - vcc3v3_image_pwren: image-pwren { compatible = "regulator-fixed"; regulator-name = "vcc3v3_image_pwren"; From 5abb1bd80b82a42051318080cd3f87ba224f403f Mon Sep 17 00:00:00 2001 From: Lin Jianhua Date: Fri, 7 Feb 2025 11:21:26 +0800 Subject: [PATCH 17/31] ARM: dts: rockchip: rk3506-evb2-v10: update matrix-keypad Change-Id: I8fefeb356ae23285300b869eb4640902f1261c91 Signed-off-by: Lin Jianhua --- arch/arm/boot/dts/rk3506-evb2-v10.dtsi | 69 +++++++++++++++++--------- 1 file changed, 45 insertions(+), 24 deletions(-) diff --git a/arch/arm/boot/dts/rk3506-evb2-v10.dtsi b/arch/arm/boot/dts/rk3506-evb2-v10.dtsi index a4c1902f73b9..e4f6ca0af66a 100644 --- a/arch/arm/boot/dts/rk3506-evb2-v10.dtsi +++ b/arch/arm/boot/dts/rk3506-evb2-v10.dtsi @@ -91,31 +91,53 @@ matrix-keypad { compatible = "gpio-matrix-keypad"; - debounce-delay-ms = <5>; - col-scan-delay-us = <2>; - //linux,no-autorepeat = <1>; + debounce-delay-ms = <30>; + col-scan-delay-us = <100>; wakeup-source; pinctrl-names = "default"; pinctrl-0 = <&keypad_pins>; - col-gpios = <&gpio0 RK_PC0 GPIO_ACTIVE_LOW - &gpio0 RK_PC1 GPIO_ACTIVE_LOW - &gpio0 RK_PC2 GPIO_ACTIVE_LOW - &gpio0 RK_PC3 GPIO_ACTIVE_LOW - &gpio0 RK_PC4 GPIO_ACTIVE_LOW>; + linux,no-autorepeat; + drive-inactive-cols; - row-gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_LOW - &gpio0 RK_PB4 GPIO_ACTIVE_LOW - &gpio0 RK_PB5 GPIO_ACTIVE_LOW - &gpio0 RK_PB6 GPIO_ACTIVE_LOW - &gpio0 RK_PB7 GPIO_ACTIVE_LOW>; + col-gpios = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH + &gpio0 RK_PC1 GPIO_ACTIVE_HIGH + &gpio0 RK_PC2 GPIO_ACTIVE_HIGH + &gpio0 RK_PC3 GPIO_ACTIVE_HIGH + &gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; + + row-gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH + &gpio0 RK_PB4 GPIO_ACTIVE_HIGH + &gpio0 RK_PB5 GPIO_ACTIVE_HIGH + &gpio0 RK_PB6 GPIO_ACTIVE_HIGH + &gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; linux,keymap = < - MATRIX_KEY(0, 0, KEY_NUMERIC_1) MATRIX_KEY(0, 1, KEY_NUMERIC_2) MATRIX_KEY(0, 2, KEY_NUMERIC_3) MATRIX_KEY(0, 3, KEY_UP) MATRIX_KEY(0, 4, KEY_DOWN) - MATRIX_KEY(1, 0, KEY_NUMERIC_4) MATRIX_KEY(1, 1, KEY_NUMERIC_5) MATRIX_KEY(1, 2, KEY_NUMERIC_6) MATRIX_KEY(1, 3, KEY_LEFT) MATRIX_KEY(1, 4, KEY_RIGHT) - MATRIX_KEY(2, 0, KEY_NUMERIC_7) MATRIX_KEY(0, 1, KEY_NUMERIC_8) MATRIX_KEY(0, 2, KEY_NUMERIC_9) MATRIX_KEY(0, 3, KEY_OK) MATRIX_KEY(0, 4, KEY_MUTE) - MATRIX_KEY(3, 0, KEY_NUMERIC_STAR) MATRIX_KEY(0, 1, KEY_NUMERIC_0) MATRIX_KEY(0, 2, KEY_NUMERIC_POUND) MATRIX_KEY(0, 3, KEY_SOUND) MATRIX_KEY(0, 4, KEY_VOLUMEDOWN) - MATRIX_KEY(4, 0, KEY_F1) MATRIX_KEY(0, 1, KEY_F2) MATRIX_KEY(0, 2, KEY_F3) MATRIX_KEY(0, 3, KEY_F4) MATRIX_KEY(0, 4, KEY_VOLUMEUP) + MATRIX_KEY(0, 0, KEY_NUMERIC_1) + MATRIX_KEY(0, 1, KEY_NUMERIC_2) + MATRIX_KEY(0, 2, KEY_NUMERIC_3) + MATRIX_KEY(0, 3, KEY_UP) + MATRIX_KEY(0, 4, KEY_DOWN) + MATRIX_KEY(1, 0, KEY_NUMERIC_4) + MATRIX_KEY(1, 1, KEY_NUMERIC_5) + MATRIX_KEY(1, 2, KEY_NUMERIC_6) + MATRIX_KEY(1, 3, KEY_LEFT) + MATRIX_KEY(1, 4, KEY_RIGHT) + MATRIX_KEY(2, 0, KEY_NUMERIC_7) + MATRIX_KEY(2, 1, KEY_NUMERIC_8) + MATRIX_KEY(2, 2, KEY_NUMERIC_9) + MATRIX_KEY(2, 3, KEY_OK) + MATRIX_KEY(2, 4, KEY_MUTE) + MATRIX_KEY(3, 0, KEY_NUMERIC_STAR) + MATRIX_KEY(3, 1, KEY_NUMERIC_0) + MATRIX_KEY(3, 2, KEY_NUMERIC_POUND) + MATRIX_KEY(3, 3, KEY_SOUND) + MATRIX_KEY(3, 4, KEY_VOLUMEDOWN) + MATRIX_KEY(4, 0, KEY_F1) + MATRIX_KEY(4, 1, KEY_F2) + MATRIX_KEY(4, 2, KEY_F3) + MATRIX_KEY(4, 3, KEY_F4) + MATRIX_KEY(4, 4, KEY_VOLUMEUP) >; status = "okay"; @@ -619,13 +641,12 @@ <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_down>, <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>, <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_down>, - <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_down>, /* keyboard cols(0~4) */ - <0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_down>, - <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>, - <0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>, - <0 RK_PC3 RK_FUNC_GPIO &pcfg_pull_down>, - <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_down>; + <0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>, + <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>, + <0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>, + <0 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>, + <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>; }; }; From a76724bff47854b3930eeaa1e0f75cbea6a15641 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Fri, 7 Feb 2025 19:45:35 +0800 Subject: [PATCH 18/31] Revert "dt-bindings: Add support for AUO B101EW05 1280x800 panel" This reverts commit 92c763a6a1bb7d0ac13312b7a8f57bdd9c82ce63. Signed-off-by: Tao Huang Change-Id: I5204028bfcde0dc745f08ea6f710442b10c708e6 --- .../devicetree/bindings/display/panel/auo,b101ew05.txt | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 Documentation/devicetree/bindings/display/panel/auo,b101ew05.txt diff --git a/Documentation/devicetree/bindings/display/panel/auo,b101ew05.txt b/Documentation/devicetree/bindings/display/panel/auo,b101ew05.txt deleted file mode 100644 index 0b2244daaa4f..000000000000 --- a/Documentation/devicetree/bindings/display/panel/auo,b101ew05.txt +++ /dev/null @@ -1,7 +0,0 @@ -AU Optronics Corporation 10.1" WSVGA TFT LCD panel - -Required properties: -- compatible: should be "auo,b101ew05" - -This binding is compatible with the simple-panel binding, which is specified -in simple-panel.txt in this directory. From 66190a3935758e66fdba1fb0baa4e2b4923d6566 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Fri, 7 Feb 2025 19:46:43 +0800 Subject: [PATCH 19/31] Revert "drm/panel: simple: Add support for AUO B125HAN03.1 1920x1080 panel" This reverts commit f712e42bd15b05003b122788779edf3b5333e48b. Signed-off-by: Tao Huang Change-Id: I71101db366c3d11585944aab606db4dcfa55c849 --- .../devicetree/bindings/display/panel/auo,b125han03.txt | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 Documentation/devicetree/bindings/display/panel/auo,b125han03.txt diff --git a/Documentation/devicetree/bindings/display/panel/auo,b125han03.txt b/Documentation/devicetree/bindings/display/panel/auo,b125han03.txt deleted file mode 100644 index aef90890dca4..000000000000 --- a/Documentation/devicetree/bindings/display/panel/auo,b125han03.txt +++ /dev/null @@ -1,7 +0,0 @@ -AU Optronics Corporation 12.5" FHD TFT LCD panel - -Required properties: -- compatible: should be "auo,b125han03" - -This binding is compatible with the simple-panel binding, which is specified -in simple-panel.txt in this directory. From 90ca19f9a559737e204f136c9f8ad17a32587096 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Fri, 7 Feb 2025 19:47:46 +0800 Subject: [PATCH 20/31] Revert "drm/panel: simple: Add support for BOE MV238QUM-N20" This reverts commit 7ba25eea80693fa07d3c0150cd99eada708e1e79. Signed-off-by: Tao Huang Change-Id: I22eda1c029691e4053cd5a8b0f79fdaebcd25fdc --- .../bindings/display/panel/boe,mv238qum-n20.txt | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 Documentation/devicetree/bindings/display/panel/boe,mv238qum-n20.txt diff --git a/Documentation/devicetree/bindings/display/panel/boe,mv238qum-n20.txt b/Documentation/devicetree/bindings/display/panel/boe,mv238qum-n20.txt deleted file mode 100644 index 09f2217b87d4..000000000000 --- a/Documentation/devicetree/bindings/display/panel/boe,mv238qum-n20.txt +++ /dev/null @@ -1,9 +0,0 @@ -Boe Corporation 23.8" UHD TFT LCD panel - -It has been designed to apply eDP(HBR2, 5.4Gbps) interface. - -Required properties: -- compatible: should be "boe,mv238qum-n20" - -This binding is compatible with the simple-panel binding, which is specified -in simple-panel.txt in this directory. From d6992856f664757288e9a5b9d307d0293200af7c Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Fri, 7 Feb 2025 19:48:19 +0800 Subject: [PATCH 21/31] Revert "drm/panel: simple: Add support for BOE MV270QUM-N10" This reverts commit db8a437fd3b354f7f172cf8dc6f072577f7da9d6. Signed-off-by: Tao Huang Change-Id: Iae5175ce87b3d110cb0cd9bae6b2d0095b7e96ff --- .../bindings/display/panel/boe,mv270qum-n10.txt | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 Documentation/devicetree/bindings/display/panel/boe,mv270qum-n10.txt diff --git a/Documentation/devicetree/bindings/display/panel/boe,mv270qum-n10.txt b/Documentation/devicetree/bindings/display/panel/boe,mv270qum-n10.txt deleted file mode 100644 index a97c0791e230..000000000000 --- a/Documentation/devicetree/bindings/display/panel/boe,mv270qum-n10.txt +++ /dev/null @@ -1,9 +0,0 @@ -Boe Corporation 27" UHD TFT LCD panel - -It has been designed to apply eDP(HBR2, 5.4Gbps) interface. - -Required properties: -- compatible: should be "boe,mv270qum-n10" - -This binding is compatible with the simple-panel binding, which is specified -in simple-panel.txt in this directory. From d950bee6db07b3878e00376964a7a05ab63705a8 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Fri, 7 Feb 2025 19:48:51 +0800 Subject: [PATCH 22/31] Revert "drm/panel: simple: Add support for BOE NV124FHM-N73 1920x1080 panel" This reverts commit f67be24239e4d008f6381bcee156185569f58762. Signed-off-by: Tao Huang Change-Id: Ifd888cbb5fd9630a05528dd5639ad58a67493766 --- .../devicetree/bindings/display/panel/boe,nv125fhm-n73.txt | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 Documentation/devicetree/bindings/display/panel/boe,nv125fhm-n73.txt diff --git a/Documentation/devicetree/bindings/display/panel/boe,nv125fhm-n73.txt b/Documentation/devicetree/bindings/display/panel/boe,nv125fhm-n73.txt deleted file mode 100644 index 7eeedc8e3114..000000000000 --- a/Documentation/devicetree/bindings/display/panel/boe,nv125fhm-n73.txt +++ /dev/null @@ -1,7 +0,0 @@ -Boe Corporation 12.5" FHD TFT LCD panel - -Required properties: -- compatible: should be "boe,nv125fhm-n73" - -This binding is compatible with the simple-panel binding, which is specified -in simple-panel.txt in this directory. From fcef954628f50db9a0ab6d67041b70018e5d3d0f Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Fri, 7 Feb 2025 19:49:28 +0800 Subject: [PATCH 23/31] Revert "drm/panel: simple: Add support for INNOLUX N125HCE-GPA 1920x1080 panel" This reverts commit bc41bde50a4c034576bdb09588e241c85319902f. Signed-off-by: Tao Huang Change-Id: I5672d18405db65dd7a6f147316316720e61786f1 --- .../devicetree/bindings/display/panel/innolux,n125hce.txt | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 Documentation/devicetree/bindings/display/panel/innolux,n125hce.txt diff --git a/Documentation/devicetree/bindings/display/panel/innolux,n125hce.txt b/Documentation/devicetree/bindings/display/panel/innolux,n125hce.txt deleted file mode 100644 index 1ea26f66115b..000000000000 --- a/Documentation/devicetree/bindings/display/panel/innolux,n125hce.txt +++ /dev/null @@ -1,7 +0,0 @@ -Innolux Corporation 12.5" FHD (1920x1080) TFT LCD panel - -Required properties: -- compatible: should be "innolux,n125hce" - -This binding is compatible with the simple-panel binding, which is specified -in simple-panel.txt in this directory. From ae8ae3b771f131510e36203d9dd2b03531f418e7 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Fri, 7 Feb 2025 19:50:00 +0800 Subject: [PATCH 24/31] Revert "drm/panel: simple: Add support for LG LM238WR2-SPA1" This reverts commit 8b76818914fe0288eca39e82a90143117fb23c7c. Signed-off-by: Tao Huang Change-Id: Ie27f8f403cbe0b6636bf538bb33e90d49cbff8cb --- .../bindings/display/panel/lg,lm238wr2-spa1.txt | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 Documentation/devicetree/bindings/display/panel/lg,lm238wr2-spa1.txt diff --git a/Documentation/devicetree/bindings/display/panel/lg,lm238wr2-spa1.txt b/Documentation/devicetree/bindings/display/panel/lg,lm238wr2-spa1.txt deleted file mode 100644 index 00e5765a3735..000000000000 --- a/Documentation/devicetree/bindings/display/panel/lg,lm238wr2-spa1.txt +++ /dev/null @@ -1,9 +0,0 @@ -LG Corporation 23.8" UHD TFT LCD panel - -It has been designed to apply eDP(HBR2, 5.4Gbps) interface. - -Required properties: -- compatible: should be "lg,lm238wr2-spa1" - -This binding is compatible with the simple-panel binding, which is specified -in simple-panel.txt in this directory. From f65a051e7c2249fe5d2c8a9e4805a3c99c1fa534 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Fri, 7 Feb 2025 19:50:24 +0800 Subject: [PATCH 25/31] Revert "drm/panel: simple: Add support for LG LM270WR3-SSA1" This reverts commit a5ca275f86f8b6c05ae000e6ba069db9c241ec0d. Signed-off-by: Tao Huang Change-Id: If8b97afc79a26fbfb535327b03bc7cb3005fcaad --- .../bindings/display/panel/lg,lm270wr3-ssa1.txt | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 Documentation/devicetree/bindings/display/panel/lg,lm270wr3-ssa1.txt diff --git a/Documentation/devicetree/bindings/display/panel/lg,lm270wr3-ssa1.txt b/Documentation/devicetree/bindings/display/panel/lg,lm270wr3-ssa1.txt deleted file mode 100644 index 22ab0b8bbe26..000000000000 --- a/Documentation/devicetree/bindings/display/panel/lg,lm270wr3-ssa1.txt +++ /dev/null @@ -1,9 +0,0 @@ -LG Corporation 27" UHD TFT LCD panel - -It has been designed to apply eDP(HBR2, 5.4Gbps) interface. - -Required properties: -- compatible: should be "lg,lm270wr3-ssa1" - -This binding is compatible with the simple-panel binding, which is specified -in simple-panel.txt in this directory. From f314f932955db23984f5c6193577f93b3e328c4d Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Fri, 7 Feb 2025 19:51:51 +0800 Subject: [PATCH 26/31] Revert "drm/panel: add support for Sharp F402 2048x1536 panel" This reverts commit e8308567c1c6ee659fd464d6d27632731833f03b. Signed-off-by: Tao Huang Change-Id: Ib31ea08e072f1091149623f70c0ece3056944d4c --- .../devicetree/bindings/display/panel/sharp,lcd-f402.txt | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 Documentation/devicetree/bindings/display/panel/sharp,lcd-f402.txt diff --git a/Documentation/devicetree/bindings/display/panel/sharp,lcd-f402.txt b/Documentation/devicetree/bindings/display/panel/sharp,lcd-f402.txt deleted file mode 100644 index c51dd4a8b009..000000000000 --- a/Documentation/devicetree/bindings/display/panel/sharp,lcd-f402.txt +++ /dev/null @@ -1,7 +0,0 @@ -Sharp F402 (2048x1536 pexels) TFT LCD panel - -Required properties: -- compatible: should be "sharp,lcd-f402" - -This binding is compatible with the simple-panel binding, which is specified -in simple-panel.txt in this directory. From 4f8e410b815b85ef15a320a7c5094d2d5653d8d7 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Fri, 7 Feb 2025 19:53:23 +0800 Subject: [PATCH 27/31] Revert "ASoC: Add gva codec driver" This reverts commit 3655e45471b5ed3d018334fc5ebbbcd1c99284ec. Signed-off-by: Tao Huang Change-Id: I64fb3d8525bcf8cbed7c46b6eee9ccb73daa0ab4 --- .../devicetree/bindings/sound/gva-codec.txt | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/gva-codec.txt diff --git a/Documentation/devicetree/bindings/sound/gva-codec.txt b/Documentation/devicetree/bindings/sound/gva-codec.txt deleted file mode 100644 index 20749e42a5e5..000000000000 --- a/Documentation/devicetree/bindings/sound/gva-codec.txt +++ /dev/null @@ -1,14 +0,0 @@ - GVA audio virtual codec - -This device support generic audio link. - -Required properties: - - - compatible : "rockchip,gva-codec" - -Example: - -codec: gva_codec { - compatible = "rockchip,gva-codec"; - #sound-dai-cells = <0>; -}; From 40b645fcb2363d41a6f9d9ab37222c90647cd9f8 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Fri, 7 Feb 2025 19:54:11 +0800 Subject: [PATCH 28/31] Revert "Documentation: sound: add rt3261 codec documentation." This reverts commit 85d067dc7e8bb6ead7fbf11fc4fd0f1b6000dba1. Signed-off-by: Tao Huang Change-Id: I150018be86c69bb1182e04977bf0726a13191d2d --- .../devicetree/bindings/sound/rt3261.txt | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/rt3261.txt diff --git a/Documentation/devicetree/bindings/sound/rt3261.txt b/Documentation/devicetree/bindings/sound/rt3261.txt deleted file mode 100644 index ffeb305f542e..000000000000 --- a/Documentation/devicetree/bindings/sound/rt3261.txt +++ /dev/null @@ -1,31 +0,0 @@ -rt3261 audio CODEC - -This device supports I2C only. - -Required properties: - - - compatible : "rt3261" - - - reg : the I2C address of the device. - - - codec-en-gpio : the enable gpio of codec. - - - spk-num : the number of speaker. - - - modem-input-mode : modem input mode (DIFFERENTIAL/SINGLE_END). - - - lout-to-modem_mode : line out mode. - - - spk-amplify : Gain control for speaker. - -Example: - -rt3261: rt3261@1c { - compatible = "rt3261"; - reg = <0x1c>; - codec-en-gpio = <&gpio3 GPIO_D7 GPIO_ACTIVE_HIGH>; - spk-num= <2>; - modem-input-mode = <1>; - lout-to-modem_mode = <1>; - spk-amplify = <2>; -}; From 28235e6dc3ded5a21896d62aa95eb72b3847563d Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Fri, 7 Feb 2025 19:55:12 +0800 Subject: [PATCH 29/31] Revert "ASoC: dw-hdmi-audio: add dummy codec for DesignWare hdmi" This reverts commit 1d660dce6750f335a1810974e44bbe43b3e4c5f1. Signed-off-by: Tao Huang Change-Id: I4f1c7275b718f90dd0e6075018239c31b2bbfd2a --- Documentation/devicetree/bindings/sound/dw-hdmi-audio.txt | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/dw-hdmi-audio.txt diff --git a/Documentation/devicetree/bindings/sound/dw-hdmi-audio.txt b/Documentation/devicetree/bindings/sound/dw-hdmi-audio.txt deleted file mode 100644 index 41fdb4d1a4bf..000000000000 --- a/Documentation/devicetree/bindings/sound/dw-hdmi-audio.txt +++ /dev/null @@ -1,5 +0,0 @@ -dw hdmi audio interface - -Required properties: - -- compatible : Should be "dw-hdmi-audio". From 704255dd5acf08d91511b2037607ea4b2ab40c17 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Fri, 7 Feb 2025 19:56:24 +0800 Subject: [PATCH 30/31] Revert "Documentation: DT: ASoC: add toshiba tc358749x" This reverts commit cd8c7b5b05e74cdda5d1291ff4ae03e13bb2eee9. Signed-off-by: Tao Huang Change-Id: I45ce51c96e592657c3fa0d107ce9945dc9e02ae5 --- .../devicetree/bindings/sound/tc358749x.txt | 32 ------------------- 1 file changed, 32 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/tc358749x.txt diff --git a/Documentation/devicetree/bindings/sound/tc358749x.txt b/Documentation/devicetree/bindings/sound/tc358749x.txt deleted file mode 100644 index d78d9729c572..000000000000 --- a/Documentation/devicetree/bindings/sound/tc358749x.txt +++ /dev/null @@ -1,32 +0,0 @@ -Toshiba tc358749x audio CODEC - -Required properties: - -- compatible: "toshiba,tc358749x" -- reg: the I2C address of the device for I2C -- power-gpios: tc358749x 1.2v power control gpio -- power18-gpios: tc358749x 1.8v power control gpio -- power33-gpios: tc358749x 3.3v power control gpio -- csi-ctl-gpios: rk3399-sapphire hw csi select control -- stanby-gpios: tc358749x stanby pin control -- reset-gpios: tc358749x reset pin control -- int-gpios: tc358749x interrupt pin control gpio -- pinctrl-names: must contain a "default" entry. -- pinctrl-0: pin control group to be used for gpio. - -Example: - -tc358749x: tc358749x@0f { - compatible = "toshiba,tc358749x"; - reg = <0x0f>; - power-gpios = <&gpio2 6 GPIO_ACTIVE_HIGH>; - power18-gpios = <&gpio2 9 GPIO_ACTIVE_HIGH>; - power33-gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>; - csi-ctl-gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>; - stanby-gpios = <&gpio2 8 GPIO_ACTIVE_HIGH>; - reset-gpios = <&gpio2 7 GPIO_ACTIVE_HIGH>; - int-gpios = <&gpio2 12 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&hdmiin_gpios>; - status = "okay"; -}; From 87d2d0e0e101b0833a969a5de3d88d0e395b5b99 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Fri, 7 Feb 2025 19:56:54 +0800 Subject: [PATCH 31/31] Revert "Documentation: DT: ASoC: add for rockchip HDMIIn" This reverts commit 949f0095eb40b8734b21fdb1b6710bc5a0bc81e7. Signed-off-by: Tao Huang Change-Id: I2466644a1618e50380d54e546102680a6d0facdd --- .../bindings/sound/rockchip,rt5651-tc358749x.txt | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/rockchip,rt5651-tc358749x.txt diff --git a/Documentation/devicetree/bindings/sound/rockchip,rt5651-tc358749x.txt b/Documentation/devicetree/bindings/sound/rockchip,rt5651-tc358749x.txt deleted file mode 100644 index 086727406948..000000000000 --- a/Documentation/devicetree/bindings/sound/rockchip,rt5651-tc358749x.txt +++ /dev/null @@ -1,16 +0,0 @@ -ROCKCHIP with RT5651_TC358749X CODECS - -Required properties: -- compatible: "rockchip,rockchip-rt5651-tc358749x-sound" -- rockchip,cpu: CPU DAI, The phandle of the Rockchip I2S controller that's - connected to the CODEC -- rockchip,audio-codec: The phandle of the RT5651 TC358749x audio codec - -Example: - -sound { - compatible = "rockchip,rockchip-rt5651-tc358749x-sound"; - rockchip,cpu = <&i2s0>; - rockchip,codec = <&rt5651 &rt5651 &tc358749x>; - status = "okay"; -};