From 4a0fb8def00a2f4a36e7e942f3cb82d79660259a Mon Sep 17 00:00:00 2001 From: loongson Date: Mon, 23 Dec 2024 10:42:41 +0800 Subject: [PATCH] Update dts --- .../boot/dts/loongson/loongson2k1000.dtsi | 7 +++++++ .../boot/dts/loongson/loongson2k300.dtsi | 16 +++++++++++++--- .../dts/loongson/ls2k300_g2k03z0_core_v10.dtsi | 4 ++++ .../boot/dts/loongson/ls2k300_pai_common.dtsi | 4 ++++ .../boot/dts/loongson/ls2k300_pai_pihat.dts | 10 +++++----- 5 files changed, 33 insertions(+), 8 deletions(-) diff --git a/arch/loongarch/boot/dts/loongson/loongson2k1000.dtsi b/arch/loongarch/boot/dts/loongson/loongson2k1000.dtsi index 080ff3cee..4e954b935 100644 --- a/arch/loongarch/boot/dts/loongson/loongson2k1000.dtsi +++ b/arch/loongarch/boot/dts/loongson/loongson2k1000.dtsi @@ -168,6 +168,13 @@ }; }; + ahci_led_as_gpio:ahci_led_as_gpio { + mux { + groups ="sata_led"; + function ="gpio"; + }; + }; + pwm0_default:pwm0 { mux { groups ="pwm0"; diff --git a/arch/loongarch/boot/dts/loongson/loongson2k300.dtsi b/arch/loongarch/boot/dts/loongson/loongson2k300.dtsi index a002aa5d7..e2442719c 100644 --- a/arch/loongarch/boot/dts/loongson/loongson2k300.dtsi +++ b/arch/loongarch/boot/dts/loongson/loongson2k300.dtsi @@ -1,4 +1,5 @@ /dts-v1/; +#include #include / { @@ -134,6 +135,10 @@ pinctrl-single,bits = <0xc 0x0000000f 0x0000000f>; }; + i2c0_G60_G61_pins: pinmux_G60_G61_as_i2c0 { + pinctrl-single,bits = <0xc 0x05000000 0x0f000000>; + }; + i2c1_pins: pinmux_G50_G51_as_i2c1 { pinctrl-single,bits = <0xc 0x000000f0 0x000000f0>; }; @@ -146,10 +151,18 @@ pinctrl-single,bits = <0xc 0x00000f00 0x00000f00>; }; + i2c2_G82_G83_pins: pinmux_G82_G83_as_i2c2 { + pinctrl-single,bits = <0x14 0x000000a0 0x000000f0>; + }; + i2c3_pins: pinmux_G54_G55_as_i2c3 { pinctrl-single,bits = <0xc 0x0000f000 0x0000f000>; }; + i2c3_G84_G85_pins: pinmux_G84_G85_as_i2c3 { + pinctrl-single,bits = <0x14 0x00000a00 0x000000f00>; + }; + spi1_pins: pinmux_G60_G63_as_spi1 { pinctrl-single,bits = <0xc 0xff000000 0xff000000>; }; @@ -692,9 +705,6 @@ clock-frequency = <0 200000000>; bus-width = <8>; cap-mmc-highspeed; -#if 0 //需要u-boot调整mmc的驱动力,蜂鸟板&先锋派使用uboot-240929之后的版本,可以开启此功能 - mmc-hs200-1_8v; -#endif no-sd; no-sdio; }; diff --git a/arch/loongarch/boot/dts/loongson/ls2k300_g2k03z0_core_v10.dtsi b/arch/loongarch/boot/dts/loongson/ls2k300_g2k03z0_core_v10.dtsi index cb3a0a0dc..0c684c28d 100644 --- a/arch/loongarch/boot/dts/loongson/ls2k300_g2k03z0_core_v10.dtsi +++ b/arch/loongarch/boot/dts/loongson/ls2k300_g2k03z0_core_v10.dtsi @@ -64,3 +64,7 @@ }; }; }; + +// &emmc { +// mmc-hs200-1_8v; +// }; diff --git a/arch/loongarch/boot/dts/loongson/ls2k300_pai_common.dtsi b/arch/loongarch/boot/dts/loongson/ls2k300_pai_common.dtsi index abd3c1ec6..4831f79ef 100644 --- a/arch/loongarch/boot/dts/loongson/ls2k300_pai_common.dtsi +++ b/arch/loongarch/boot/dts/loongson/ls2k300_pai_common.dtsi @@ -181,6 +181,10 @@ }; }; +&emmc { + mmc-hs200-1_8v; +}; + &i2c0 { status = "ok"; diff --git a/arch/loongarch/boot/dts/loongson/ls2k300_pai_pihat.dts b/arch/loongarch/boot/dts/loongson/ls2k300_pai_pihat.dts index db9996632..890dabb9f 100644 --- a/arch/loongarch/boot/dts/loongson/ls2k300_pai_pihat.dts +++ b/arch/loongarch/boot/dts/loongson/ls2k300_pai_pihat.dts @@ -13,14 +13,14 @@ }; &pinmux { - gpio_63_60_pins: pinmux_G60_G63_as_gpio { - pinctrl-single,bits = <0xc 0x00000000 0xff000000>; - }; + gpio_63_60_pins: pinmux_G60_G63_as_gpio { + pinctrl-single,bits = <0xc 0x00000000 0xff000000>; + }; }; &gpio { - pinctrl-0 = <&gpio_63_60_pins>; - pinctrl-names = "default"; + pinctrl-0 = <&gpio_63_60_pins>; + pinctrl-names = "default"; }; &uart2 {