Commit eec05449 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'gemini-dts-v5.7' of... 

Merge tag 'gemini-dts-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into arm/dt

Gemini DTS changes for v5.7:
- Rename the IDE nodes to match the YAML schema
- Add a temperature zone to the DIR-685, use hard drive
  as sensor and cool the case using the fan.

* tag 'gemini-dts-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: dts: gemini: Add thermal zone to DIR-685
  ARM: dts: gemini: Rename IDE nodes

Link: https://lore.kernel.org/r/CACRpkdbvgqCVuoMCHJrCZ0J+3NrwdrBnwBz+BJrSE=hqYh2j+Q@mail.gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 21a3c5dd 6e97f0aa

arch/arm/boot/dts/gemini-dlink-dir-685.dts

+46 −4
Original line number Diff line number Diff line
@@ -119,13 +119,11 @@ 


	/*

	 * This is a Sunon Maglev GM0502PFV2-8 cooling fan @10000 RPM.

	 * Since the platform has no temperature sensor, this is controlled

	 * from userspace by using the hard disks S.M.A.R.T. temperature

	 * sensor. It is turned on when the temperature exceeds 46 degrees

	 * and turned off when the temperatures goes below 41 degrees

	 * (celsius).

	 */

	gpio-fan {

	fan0: gpio-fan {

		compatible = "gpio-fan";

		/* Collides with IDE */

		gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
@@ -133,6 +131,40 @@ 
		#cooling-cells = <2>;

	};



	thermal-zones {

		chassis-thermal {

			/* Poll every 20 seconds */

			polling-delay = <20000>;

			/* Poll every 2nd second when cooling */

			polling-delay-passive = <2000>;

			/*  Use the thermal sensor in the hard drive */

			thermal-sensors = <&drive0>;



			/* Tripping points from the fan.script in the rootfs */

			trips {

				alert: chassis-alert {

					/* At 43 degrees turn on the fan */

					temperature = <43000>;

					hysteresis = <3000>;

					type = "active";

				};

				crit: chassis-crit {

					/* Just shut down at 60 degrees */

					temperature = <60000>;

					hysteresis = <2000>;

					type = "critical";

				};

			};



			cooling-maps {

				map0 {

					trip = <&alert>;

					cooling-device = <&fan0 1 1>;

				};

			};

		};

	};



	/*

	 * The touchpad input is connected to a GPIO bit-banged

	 * I2C bus.
@@ -443,8 +475,18 @@ 
			};

		};



		ata@63000000 {

		ide@63000000 {

			status = "okay";



			/*

			 * This drive may have a temperature sensor with a

			 * thermal zone we can use for thermal control of the

			 * chassis temperature using the fan.

			 */

			drive0: ide-port@0 {

				reg = <0>;

				#thermal-sensor-cells = <0>;

			};

		};



		display-controller@6a000000 {

arch/arm/boot/dts/gemini-dlink-dns-313.dts

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ 
			};

		};



		ata@63000000 {

		ide@63000000 {

			status = "okay";

		};

	};

arch/arm/boot/dts/gemini-nas4220b.dts

+2 −2
Original line number Diff line number Diff line
@@ -170,11 +170,11 @@ 
			};

		};



		ata@63000000 {

		ide@63000000 {

			status = "okay";

		};



		ata@63400000 {

		ide@63400000 {

			status = "okay";

		};

arch/arm/boot/dts/gemini-sl93512r.dts

+2 −2
Original line number Diff line number Diff line
@@ -293,11 +293,11 @@ 
			};

		};



		ata@63000000 {

		ide@63000000 {

			status = "okay";

		};



		ata@63400000 {

		ide@63400000 {

			status = "okay";

		};

arch/arm/boot/dts/gemini-sq201.dts

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ 
			};

		};



		ata@63000000 {

		ide@63000000 {

			status = "okay";

		};

CRA Git | Maintained and supported by SUSTech CRA and CCSE