diff --git a/arch/loongarch/boot/dts/loongson/ls2k1000_dp.dts b/arch/loongarch/boot/dts/loongson/ls2k1000_dp.dts index f06e61208..702dcb301 100644 --- a/arch/loongarch/boot/dts/loongson/ls2k1000_dp.dts +++ b/arch/loongarch/boot/dts/loongson/ls2k1000_dp.dts @@ -338,6 +338,10 @@ &i2c1 { status = "okay"; + // 两款芯片不能同时支持,因为用同一个GPIO + // 但可以在两个屏幕间切换 + + // 7寸触屏芯片 touchpad: gt911@5d { compatible = "goodix,gt911"; reg = <0x5d>; @@ -345,6 +349,17 @@ interrupts = <60>; irq-gpios = <&pioA 0 GPIO_ACTIVE_LOW>; }; + + // 4.3寸触屏芯片 + touchpad_1: gt9147@14 { + compatible = "goodix,gt9147"; + reg = <0x14>; + // 2K300 GPIO 支持中断控制 + // GPIO 中断号为 vhwirq-base + pinnum (210 = 128 + 82) + interrupt-parent = <&icu>; + interrupts = <60>; + irq-gpios = <&pioA 0 GPIO_ACTIVE_LOW>; + }; }; &uart1 { diff --git a/arch/loongarch/loongson64/init.c b/arch/loongarch/loongson64/init.c index 68aba3c25..a5a526e0f 100644 --- a/arch/loongarch/loongson64/init.c +++ b/arch/loongarch/loongson64/init.c @@ -243,11 +243,11 @@ static void *get_fdt_by_board_name(void) if (check_cpu_full_name_invaild(i)) __cpu_full_name[i] = cpu_ls2k500_name; #elif defined(CONFIG_LOONGSON_2K1000) - if (!strncmp(b_info.board_name, "LS2K1000-JL-MB", 14)) { + /* if (!strncmp(b_info.board_name, "LS2K1000-JL-MB", 14)) { fdt = &__dtb_ls2k1000_jl_mb_begin; } else if (!strncmp(b_info.board_name, "LS2K1000-DP", 11)) { fdt = &__dtb_ls2k1000_dp_begin; - } else { + } else */{ fdt = &__dtb_ls2k1000_dp_begin; } #elif defined(CONFIG_LOONGSON_2P500)