From f544a6456158b48128fd634271bcab6b07f2ed6c Mon Sep 17 00:00:00 2001 From: maoxiaochuan Date: Thu, 6 Mar 2025 11:01:10 +0800 Subject: [PATCH] update to de782c8951a ls2k300_mini_dp:enhance otg compatibility --- arch/loongarch/boot/dts/loongson2k300.dtsi | 5 +++++ arch/loongarch/boot/dts/ls2k300_gongkong_gbkpgk0.dts | 5 ----- arch/loongarch/boot/dts/ls2k300_mini_dp.dts | 9 ++++----- arch/loongarch/boot/dts/ls2k300_vanguard_pi_common.dtsi | 5 ----- arch/loongarch/configs/loongson_2k300_defconfig | 1 + 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/arch/loongarch/boot/dts/loongson2k300.dtsi b/arch/loongarch/boot/dts/loongson2k300.dtsi index b9994c170..bdf731fa7 100644 --- a/arch/loongarch/boot/dts/loongson2k300.dtsi +++ b/arch/loongarch/boot/dts/loongson2k300.dtsi @@ -859,6 +859,11 @@ interrupt-names = "ls2k_mci_irq"; dma-mask = <0xffffffff 0xffffffff>; clock-frequency = <0 200000000>; + pinctrl-0 = <&sdio1_pins>; + pinctrl-names = "default"; + cap-sd-highspeed; + cap-mmc-highspeed; + bus-width = <4>; status = "disabled"; }; diff --git a/arch/loongarch/boot/dts/ls2k300_gongkong_gbkpgk0.dts b/arch/loongarch/boot/dts/ls2k300_gongkong_gbkpgk0.dts index 13ebe1585..7d5d8d455 100644 --- a/arch/loongarch/boot/dts/ls2k300_gongkong_gbkpgk0.dts +++ b/arch/loongarch/boot/dts/ls2k300_gongkong_gbkpgk0.dts @@ -319,11 +319,6 @@ }; &sdio1 { - pinctrl-0 = <&sdio1_pins>; - pinctrl-names = "default"; - cap-sd-highspeed; - cap-mmc-highspeed; - bus-width = <4>; //cd-gpios = <&io_expander_a 4 GPIO_ACTIVE_LOW>; status = "okay"; }; diff --git a/arch/loongarch/boot/dts/ls2k300_mini_dp.dts b/arch/loongarch/boot/dts/ls2k300_mini_dp.dts index 41894b1d7..f37e8a5df 100644 --- a/arch/loongarch/boot/dts/ls2k300_mini_dp.dts +++ b/arch/loongarch/boot/dts/ls2k300_mini_dp.dts @@ -216,11 +216,10 @@ }; &sdio1 { - pinctrl-0 = <&sdio1_pins>; - pinctrl-names = "default"; - cap-sd-highspeed; - cap-mmc-highspeed; - bus-width = <4>; cd-gpios = <&gpio 81 GPIO_ACTIVE_LOW>; status = "okay"; }; + +&otg { + loongson,dwc2-fix = ; +}; diff --git a/arch/loongarch/boot/dts/ls2k300_vanguard_pi_common.dtsi b/arch/loongarch/boot/dts/ls2k300_vanguard_pi_common.dtsi index dbf0906f7..6ceeafaf4 100644 --- a/arch/loongarch/boot/dts/ls2k300_vanguard_pi_common.dtsi +++ b/arch/loongarch/boot/dts/ls2k300_vanguard_pi_common.dtsi @@ -218,11 +218,6 @@ }; &sdio1 { - pinctrl-0 = <&sdio1_pins>; - pinctrl-names = "default"; - cap-sd-highspeed; - cap-mmc-highspeed; - bus-width = <4>; cd-gpios = <&gpio 82 GPIO_ACTIVE_LOW>; status = "okay"; }; diff --git a/arch/loongarch/configs/loongson_2k300_defconfig b/arch/loongarch/configs/loongson_2k300_defconfig index ac0738bad..01c18b68f 100644 --- a/arch/loongarch/configs/loongson_2k300_defconfig +++ b/arch/loongarch/configs/loongson_2k300_defconfig @@ -1,3 +1,4 @@ +CONFIG_LOCALVERSION=".lsgd" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y