From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Patrick Yavitz Date: Tue, 25 Jul 2023 13:34:18 -0400 Subject: arch: arm64: dts: amlogic: meson g12b bananapi m2s Signed-off-by: Patrick Yavitz --- arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts | 4 ++++ arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi | 9 +++++++++ arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts @@ -18,6 +18,10 @@ aliases { }; }; +&reboot { + sd-vqen = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; +}; + /* Camera (CSI) bus */ &i2c1 { status = "okay"; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi @@ -17,6 +17,15 @@ aliases { rtc1 = &vrtc; }; + reboot: meson64-reboot { + compatible = "meson64,reboot"; + sys_reset = <0x84000009>; + sys_poweroff = <0x84000008>; + + sd-vqsw = <&gpio_ao GPIOAO_9 GPIO_ACTIVE_HIGH>; + sd-vmmc = <&gpio_ao GPIOAO_8 GPIO_ACTIVE_HIGH>; + }; + chosen { stdout-path = "serial0:115200n8"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts @@ -12,3 +12,7 @@ / { compatible = "bananapi,bpi-m2s", "amlogic,s922x", "amlogic,g12b"; model = "BananaPi M2S"; }; + +&reboot { + sd-vqen = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; +}; -- Armbian From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Patrick Yavitz Date: Mon, 6 Nov 2023 08:53:24 -0500 Subject: v2: arch: arm64: dts: amlogic: meson-g12b-bananapi-m2s: fan control The fan on the unit is constantly running. So lets set thermal trip points and add the ability to control when we want it to kick on. By default it is set to power on at 60*C. Signed-off-by: Patrick Yavitz --- arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi | 17 ++++++++++ 1 file changed, 17 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi @@ -313,6 +313,23 @@ &cpu103 { clock-latency = <50000>; }; +&cpu_thermal { + trips { + cpu_active: cpu-active { + temperature = <60000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "active"; + }; + }; + + cooling-maps { + map { + trip = <&cpu_active>; + cooling-device = <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + }; +}; + ðmac { pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; pinctrl-names = "default"; -- Armbian