Skip to content

Commit 08907ca

Browse files
maoxiaochuanAirFortressIlikara
authored andcommitted
FROMEXT: LOONGARCH64_NOSIMD: update to de782c8951a
ls2k300_mini_dp:enhance otg compatibility Signed-off-by: maoxiaochuan <maoxiaochuan@loongson.cn> Link: https://gitee.com/open-loongarch/linux-6.12/commit/f544a6456158b48128fd634271bcab6b07f2ed6c Signed-off-by: Mingcong Bai <jeffbai@aosc.io>
1 parent 5740a6a commit 08907ca

File tree

5 files changed

+10
-15
lines changed

5 files changed

+10
-15
lines changed

arch/loongarch/boot/dts/loongson2k300.dtsi

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -859,6 +859,11 @@
859859
interrupt-names = "ls2k_mci_irq";
860860
dma-mask = <0xffffffff 0xffffffff>;
861861
clock-frequency = <0 200000000>;
862+
pinctrl-0 = <&sdio1_pins>;
863+
pinctrl-names = "default";
864+
cap-sd-highspeed;
865+
cap-mmc-highspeed;
866+
bus-width = <4>;
862867
status = "disabled";
863868
};
864869

arch/loongarch/boot/dts/ls2k300_gongkong_gbkpgk0.dts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -319,11 +319,6 @@
319319
};
320320

321321
&sdio1 {
322-
pinctrl-0 = <&sdio1_pins>;
323-
pinctrl-names = "default";
324-
cap-sd-highspeed;
325-
cap-mmc-highspeed;
326-
bus-width = <4>;
327322
//cd-gpios = <&io_expander_a 4 GPIO_ACTIVE_LOW>;
328323
status = "okay";
329324
};

arch/loongarch/boot/dts/ls2k300_mini_dp.dts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -216,11 +216,10 @@
216216
};
217217

218218
&sdio1 {
219-
pinctrl-0 = <&sdio1_pins>;
220-
pinctrl-names = "default";
221-
cap-sd-highspeed;
222-
cap-mmc-highspeed;
223-
bus-width = <4>;
224219
cd-gpios = <&gpio 81 GPIO_ACTIVE_LOW>;
225220
status = "okay";
226221
};
222+
223+
&otg {
224+
loongson,dwc2-fix = <DWC2_LOONGSON_FIX_DMA>;
225+
};

arch/loongarch/boot/dts/ls2k300_vanguard_pi_common.dtsi

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -218,11 +218,6 @@
218218
};
219219

220220
&sdio1 {
221-
pinctrl-0 = <&sdio1_pins>;
222-
pinctrl-names = "default";
223-
cap-sd-highspeed;
224-
cap-mmc-highspeed;
225-
bus-width = <4>;
226221
cd-gpios = <&gpio 82 GPIO_ACTIVE_LOW>;
227222
status = "okay";
228223
};

arch/loongarch/configs/loongson_2k300_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
CONFIG_LOCALVERSION=".lsgd"
12
# CONFIG_LOCALVERSION_AUTO is not set
23
CONFIG_SYSVIPC=y
34
CONFIG_POSIX_MQUEUE=y

0 commit comments

Comments
 (0)