Unverified Commit a57cbe02 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-arm64-dt-for-v5.20' of... 

Merge tag 'amlogic-arm64-dt-for-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/dt

Amlogic ARM64 DT changes for v5.20:
- adjust whitespace around '='
- add reset controller node for Meson-S4 SoC
- correct gpio-keys properties
- align gpio-key node names with dtschema
- add gpio-fan control to GS-King-X

* tag 'amlogic-arm64-dt-for-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  arm64: dts: meson: add gpio-fan control to GS-King-X
  arm64: dts: amlogic: align gpio-key node names with dtschema
  arm64: dts: amlogic: correct gpio-keys properties
  arm64: dts: meson: add reset controller for Meson-S4 SoC
  arm64: dts: amlogic: adjust whitespace around '='

Link: https://lore.kernel.org/r/9c8b8570-f20c-ce9a-8c6c-51fdadf7722c@baylibre.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d5444cc4 b7bfbbbf

arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts

+25 −2
Original line number Diff line number Diff line
@@ -20,10 +20,16 @@ aliases { 
		rtc1 = &vrtc;

	};



	gpio_fan: gpio-fan {

		compatible = "gpio-fan";

		gpios = <&gpio GPIOH_5 GPIO_ACTIVE_HIGH>;

		/* Using Dummy Speed */

		gpio-fan,speed-map = <0 0>, <1 1>;

		#cooling-cells = <2>;

	};



	gpio-keys-polled {

		compatible = "gpio-keys-polled";

		#address-cells = <1>;

		#size-cells = <0>;

		poll-interval = <100>;



		power-button {
@@ -96,6 +102,23 @@ &clkc_audio { 
	status = "okay";

};



&cpu_thermal {

	trips {

		cpu_active: cpu-active {

			temperature = <70000>; /* millicelsius */

			hysteresis = <2000>; /* millicelsius */

			type = "active";

		};

	};



	cooling-maps {

		map {

			trip = <&cpu_active>;

			cooling-device = <&gpio_fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;

		};

	};

};



&frddr_a {

	status = "okay";

};

arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dts

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ aliases { 


	gpio-keys-polled {

		compatible = "gpio-keys-polled";

		#address-cells = <1>;

		#size-cells = <0>;

		poll-interval = <100>;



		power-button {

arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts

+0 −2
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ status { 


	gpio-keys-polled {

		compatible = "gpio-keys-polled";

		#address-cells = <1>;

		#size-cells = <0>;

		poll-interval = <20>;



		button-reset {

arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts

+1 −3
Original line number Diff line number Diff line
@@ -42,11 +42,9 @@ led-blue { 


	gpio-keys-polled {

		compatible = "gpio-keys-polled";

		#address-cells = <1>;

		#size-cells = <0>;

		poll-interval = <100>;



		button@0 {

		button {

			label = "reset";

			linux,code = <KEY_RESTART>;

			gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_LOW>;

arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts

+1 −3
Original line number Diff line number Diff line
@@ -37,11 +37,9 @@ led-ethernet { 


	gpio-keys-polled {

		compatible = "gpio-keys-polled";

		#address-cells = <1>;

		#size-cells = <0>;

		poll-interval = <100>;



		button@0 {

		button {

			label = "reset";

			linux,code = <KEY_RESTART>;

			gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_LOW>;