diff --git a/arch/riscv/boot/dts/thead/th1520-lpi4a-console.dts b/arch/riscv/boot/dts/thead/th1520-lpi4a-console.dts index b76c3a8e0..64ae4e335 100644 --- a/arch/riscv/boot/dts/thead/th1520-lpi4a-console.dts +++ b/arch/riscv/boot/dts/thead/th1520-lpi4a-console.dts @@ -8,6 +8,7 @@ / { model = "T-HEAD Light Lichee Pi 4A configuration for LicheeConsole4A"; + compatible = "thead,light", "sipeed,th1520-laptop", "sipeed,console4a"; }; &dsi0_panel0 { diff --git a/arch/riscv/boot/dts/thead/th1520-lpi4a-laptop.dts b/arch/riscv/boot/dts/thead/th1520-lpi4a-laptop.dts index 4b9c4b225..4ba4884da 100644 --- a/arch/riscv/boot/dts/thead/th1520-lpi4a-laptop.dts +++ b/arch/riscv/boot/dts/thead/th1520-lpi4a-laptop.dts @@ -7,6 +7,7 @@ / { model = "T-HEAD Light Lichee Pi 4A configuration for 8GB DDR board use on laptop"; + compatible = "thead,light", "sipeed,th1520-laptop"; reg_sys_vcc_5v: regulator-sys-vcc-5v-en { status = "okay"; @@ -19,12 +20,15 @@ regulator-boot-on; regulator-always-on; + // suspend for lichee laptop is not ready so dont turn it off + /* regulator-state-mem { regulator-off-in-suspend; }; regulator-state-standby { regulator-off-in-suspend; }; + */ }; reg_sys_vcc_3v3: regulator-sys-vcc-3v3-en { @@ -115,7 +119,7 @@ charger: dc-charger { compatible = "gpio-charger"; charger-type = "mains"; - gpios = <&ao_gpio_porta 2 GPIO_ACTIVE_HIGH>; + gpios = <&gpio0_porta 16 GPIO_ACTIVE_HIGH>; }; }; @@ -228,6 +232,7 @@ &uart3 { clock-frequency = <100000000>; + pinctrl-0 = <&pinctrl_uart3_tx_is_gpio>; status = "okay"; }; diff --git a/arch/riscv/boot/dts/thead/th1520-lpi4a.dtsi b/arch/riscv/boot/dts/thead/th1520-lpi4a.dtsi index 624c3d645..cc10b469f 100644 --- a/arch/riscv/boot/dts/thead/th1520-lpi4a.dtsi +++ b/arch/riscv/boot/dts/thead/th1520-lpi4a.dtsi @@ -296,10 +296,10 @@ debounce-interval = <1>; gpios = <&gpio2_porta 25 0x1>; }; - key-sleep { - label = "Sleep Wake Key"; + key-wake { + label = "Wake Key"; wakeup-source; - linux,code = ; + linux,code = ; debounce-interval = <1>; gpios = <&ao_gpio_porta 2 0x1>; }; @@ -1105,6 +1105,16 @@ >; }; + + pinctrl_uart3_tx_is_gpio: uart3txisgpiogrp { + thead,pins = < + FM_UART3_TXD 0x3 0x202 + FM_UART3_RXD 0x1 0x202 + >; + }; + + + pinctrl_wifi_wake: wifi_grp { thead,pins = < FM_GPIO0_27 0x0 0x202