ARM: dts: aspeed: witherspoon: Add gpio-keys-polled for fan presence

PATCH Applied Eddie James 4 participants 4 messages Aug 3, 2017 – Aug 8, 2017

Subsystems (2)

Device tree bindings Arm/Aspeed machine support

lore

Share & tools

lore

Eddie James

author

2017-08-03 18:50 UTC #0 lore raw

PATCH v7 1/1 ARM: dts: aspeed: witherspoon: Add gpio-keys-polled for fan presence

From: "Edward A. James" <[email protected]>

Add gpio-keys-polled node for pca955x fan presence lines. Change the binding of the pca9552 to remove the leds and instead define all the provided gpio pins there. Add back the leds in a 'gpio-leds' compatible entry.

Polling period of 1 second to be determined to be the max acceptable value based on discussions with Brad Bishop and Matt Spinler. Tested with gpiomon program - verified.

Patch based on Cedric's example - thanks! Tested on witherspoon.

Signed-off-by Edward A. James <[email protected]>

---
 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 152 ++++++++++++++++++-----
 1 file changed, 124 insertions(+), 28 deletions(-)

arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +124 ~~-28~~

index c0f992e..9ab8e46 100644
@@ -56,6 +56,77 @@
 		};
 	};
 
+	gpio-keys-polled {
+		compatible = "gpio-keys-polled";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		poll-interval = <1000>;
+
+		fan0-presence {
+			label = "fan0-presence";
+			gpios = <&pca0 4 GPIO_ACTIVE_LOW>;
+			linux,code = <4>;
+		};
+
+		fan1-presence {
+			label = "fan1-presence";
+			gpios = <&pca0 5 GPIO_ACTIVE_LOW>;
+			linux,code = <5>;
+		};
+
+		fan2-presence {
+			label = "fan2-presence";
+			gpios = <&pca0 6 GPIO_ACTIVE_LOW>;
+			linux,code = <6>;
+		};
+
+		fan3-presence {
+			label = "fan3-presence";
+			gpios = <&pca0 7 GPIO_ACTIVE_LOW>;
+			linux,code = <7>;
+		};
+	};
+
+	pca_leds {
+		compatible = "gpio-leds";
+
+		fan0 {
+			label = "fan0";
+			default-state = "keep";
+			gpios = <&pca0 0 GPIO_ACTIVE_LOW>;
+		};
+		fan1 {
+			label = "fan1";
+			default-state = "keep";
+			gpios = <&pca0 1 GPIO_ACTIVE_LOW>;
+		};
+		fan2 {
+			label = "fan2";
+			default-state = "keep";
+			gpios = <&pca0 2 GPIO_ACTIVE_LOW>;
+		};
+		fan3 {
+			label = "fan3";
+			default-state = "keep";
+			gpios = <&pca0 3 GPIO_ACTIVE_LOW>;
+		};
+		front_fault {
+			label = "front-fault";
+			default-state = "keep";
+			gpios = <&pca0 13 GPIO_ACTIVE_LOW>;
+		};
+		front_power {
+			label = "front-power";
+			default-state = "keep";
+			gpios = <&pca0 14 GPIO_ACTIVE_LOW>;
+		};
+		front_id {
+			label = "front-id";
+			default-state = "keep";
+			gpios = <&pca0 15 GPIO_ACTIVE_LOW>;
+		};
+	};
+
 	leds {
 		compatible = "gpio-leds";

@@ -278,47 +349,72 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		fan0: led@0 {
-			label = "fan0";
-			default-state = "keep";
+		gpio-controller;
+		#gpio-cells = <2>;
+
+		gpio@0 {
 			reg = <0>;
-			type = <PCA955X_TYPE_LED>;
+			type = <PCA955X_TYPE_GPIO>;
 		};
-		fan1: led@1 {
-			label = "fan1";
-			default-state = "keep";
+		gpio@1 {
 			reg = <1>;
-			type = <PCA955X_TYPE_LED>;
+			type = <PCA955X_TYPE_GPIO>;
 		};
-		fan2: led@2 {
-			label = "fan2";
-			default-state = "keep";
+		gpio@2 {
 			reg = <2>;
-			type = <PCA955X_TYPE_LED>;
+			type = <PCA955X_TYPE_GPIO>;
 		};
-		fan3: led@3 {
-			label = "fan3";
-			default-state = "keep";
+		gpio@3 {
 			reg = <3>;
-			type = <PCA955X_TYPE_LED>;
+			type = <PCA955X_TYPE_GPIO>;
 		};
-		front_fault: led@13 {
-			label = "front-fault";
-			default-state = "keep";
+		gpio@4 {
+			reg = <4>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+		gpio@5 {
+			reg = <5>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+		gpio@6 {
+			reg = <6>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+		gpio@7 {
+			reg = <7>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+		gpio@8 {
+			reg = <8>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+		gpio@9 {
+			reg = <9>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+		gpio@10 {
+			reg = <10>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+		gpio@11 {
+			reg = <11>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+		gpio@12 {
+			reg = <12>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+		gpio@13 {
 			reg = <13>;
-			type = <PCA955X_TYPE_LED>;
+			type = <PCA955X_TYPE_GPIO>;
 		};
-		front_power: led@14 {
-			label = "front-power";
-			default-state = "keep";
+		gpio@14 {
 			reg = <14>;
-			type = <PCA955X_TYPE_LED>;
+			type = <PCA955X_TYPE_GPIO>;
 		};
-		front_id: led@15 {
-			label = "front-id";
-			default-state = "keep";
+		gpio@15 {
 			reg = <15>;
-			type = <PCA955X_TYPE_LED>;
+			type = <PCA955X_TYPE_GPIO>;
 		};
 	};
 };

Signature · 1 line

1.8.3.1

Christopher Bostic

Reviewed-by on v7 1/1

2017-08-03 19:08 UTC #1 lore raw

Reviewed-by Christopher Bostic <[email protected]>

Quoted 200 lines · Eddie James

From: "Edward A. James" <[email protected]>

Polling period of 1 second to be determined to be the max acceptable value based on discussions with Brad Bishop and Matt Spinler. Tested with gpiomon program - verified.

Patch based on Cedric's example - thanks! Tested on witherspoon.

Signed-off-by Edward A. James <[email protected]>

---
  arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 152 ++++++++++++++++++-----
  1 file changed, 124 insertions(+), 28 deletions(-)

arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +124 ~~-28~~

index c0f992e..9ab8e46 100644
@@ -56,6 +56,77 @@
  		};
  	};
 
+	gpio-keys-polled {
+		compatible = "gpio-keys-polled";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		poll-interval = <1000>;
+
+		fan0-presence {
+			label = "fan0-presence";
+			gpios = <&pca0 4 GPIO_ACTIVE_LOW>;
+			linux,code = <4>;
+		};
+
+		fan1-presence {
+			label = "fan1-presence";
+			gpios = <&pca0 5 GPIO_ACTIVE_LOW>;
+			linux,code = <5>;
+		};
+
+		fan2-presence {
+			label = "fan2-presence";
+			gpios = <&pca0 6 GPIO_ACTIVE_LOW>;
+			linux,code = <6>;
+		};
+
+		fan3-presence {
+			label = "fan3-presence";
+			gpios = <&pca0 7 GPIO_ACTIVE_LOW>;
+			linux,code = <7>;
+		};
+	};
+
+	pca_leds {
+		compatible = "gpio-leds";
+
+		fan0 {
+			label = "fan0";
+			default-state = "keep";
+			gpios = <&pca0 0 GPIO_ACTIVE_LOW>;
+		};
+		fan1 {
+			label = "fan1";
+			default-state = "keep";
+			gpios = <&pca0 1 GPIO_ACTIVE_LOW>;
+		};
+		fan2 {
+			label = "fan2";
+			default-state = "keep";
+			gpios = <&pca0 2 GPIO_ACTIVE_LOW>;
+		};
+		fan3 {
+			label = "fan3";
+			default-state = "keep";
+			gpios = <&pca0 3 GPIO_ACTIVE_LOW>;
+		};
+		front_fault {
+			label = "front-fault";
+			default-state = "keep";
+			gpios = <&pca0 13 GPIO_ACTIVE_LOW>;
+		};
+		front_power {
+			label = "front-power";
+			default-state = "keep";
+			gpios = <&pca0 14 GPIO_ACTIVE_LOW>;
+		};
+		front_id {
+			label = "front-id";
+			default-state = "keep";
+			gpios = <&pca0 15 GPIO_ACTIVE_LOW>;
+		};
+	};
+
  	leds {
  		compatible = "gpio-leds";

@@ -278,47 +349,72 @@
  		#address-cells = <1>;
  		#size-cells = <0>;
 
-		fan0: led@0 {
-			label = "fan0";
-			default-state = "keep";
+		gpio-controller;
+		#gpio-cells = <2>;
+
+		gpio@0 {
  			reg = <0>;
-			type = <PCA955X_TYPE_LED>;
+			type = <PCA955X_TYPE_GPIO>;
  		};
-		fan1: led@1 {
-			label = "fan1";
-			default-state = "keep";
+		gpio@1 {
  			reg = <1>;
-			type = <PCA955X_TYPE_LED>;
+			type = <PCA955X_TYPE_GPIO>;
  		};
-		fan2: led@2 {
-			label = "fan2";
-			default-state = "keep";
+		gpio@2 {
  			reg = <2>;
-			type = <PCA955X_TYPE_LED>;
+			type = <PCA955X_TYPE_GPIO>;
  		};
-		fan3: led@3 {
-			label = "fan3";
-			default-state = "keep";
+		gpio@3 {
  			reg = <3>;
-			type = <PCA955X_TYPE_LED>;
+			type = <PCA955X_TYPE_GPIO>;
  		};
-		front_fault: led@13 {
-			label = "front-fault";
-			default-state = "keep";
+		gpio@4 {
+			reg = <4>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+		gpio@5 {
+			reg = <5>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+		gpio@6 {
+			reg = <6>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+		gpio@7 {
+			reg = <7>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+		gpio@8 {
+			reg = <8>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+		gpio@9 {
+			reg = <9>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+		gpio@10 {
+			reg = <10>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+		gpio@11 {
+			reg = <11>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+		gpio@12 {
+			reg = <12>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+		gpio@13 {
  			reg = <13>;
-			type = <PCA955X_TYPE_LED>;
+			type = <PCA955X_TYPE_GPIO>;
  		};
-		front_power: led@14 {
-			label = "front-power";
-			default-state = "keep";
+		gpio@14 {
  			reg = <14>;
-			type = <PCA955X_TYPE_LED>;
+			type = <PCA955X_TYPE_GPIO>;
  		};
-		front_id: led@15 {
-			label = "front-id";
-			default-state = "keep";
+		gpio@15 {
  			reg = <15>;
-			type = <PCA955X_TYPE_LED>;
+			type = <PCA955X_TYPE_GPIO>;
  		};
  	};
  };

Cédric Le Goater

Acked-by on v7 1/1

2017-08-03 22:22 UTC #2 lore raw

In reply to Eddie James

Quoted 11 lines · Eddie James

From: "Edward A. James" <[email protected]>
Add gpio-keys-polled node for pca955x fan presence lines. Change the binding of the pca9552 to remove the leds and instead define all the provided gpio pins there. Add back the leds in a 'gpio-leds' compatible entry.
Polling period of 1 second to be determined to be the max acceptable value based on discussions with Brad Bishop and Matt Spinler. Tested with gpiomon program - verified.
Patch based on Cedric's example - thanks! Tested on witherspoon.

You did the most difficult part: testing.

Acked-by Cédric Le Goater <[email protected]>

Thanks,

Quoted 190 lines

Signed-off-by Edward A. James <[email protected]>

---
 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 152 ++++++++++++++++++-----
 1 file changed, 124 insertions(+), 28 deletions(-)

arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +124 ~~-28~~

index c0f992e..9ab8e46 100644
@@ -56,6 +56,77 @@
 		};
 	};
 
+	gpio-keys-polled {
+		compatible = "gpio-keys-polled";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		poll-interval = <1000>;
+
+		fan0-presence {
+			label = "fan0-presence";
+			gpios = <&pca0 4 GPIO_ACTIVE_LOW>;
+			linux,code = <4>;
+		};
+
+		fan1-presence {
+			label = "fan1-presence";
+			gpios = <&pca0 5 GPIO_ACTIVE_LOW>;
+			linux,code = <5>;
+		};
+
+		fan2-presence {
+			label = "fan2-presence";
+			gpios = <&pca0 6 GPIO_ACTIVE_LOW>;
+			linux,code = <6>;
+		};
+
+		fan3-presence {
+			label = "fan3-presence";
+			gpios = <&pca0 7 GPIO_ACTIVE_LOW>;
+			linux,code = <7>;
+		};
+	};
+
+	pca_leds {
+		compatible = "gpio-leds";
+
+		fan0 {
+			label = "fan0";
+			default-state = "keep";
+			gpios = <&pca0 0 GPIO_ACTIVE_LOW>;
+		};
+		fan1 {
+			label = "fan1";
+			default-state = "keep";
+			gpios = <&pca0 1 GPIO_ACTIVE_LOW>;
+		};
+		fan2 {
+			label = "fan2";
+			default-state = "keep";
+			gpios = <&pca0 2 GPIO_ACTIVE_LOW>;
+		};
+		fan3 {
+			label = "fan3";
+			default-state = "keep";
+			gpios = <&pca0 3 GPIO_ACTIVE_LOW>;
+		};
+		front_fault {
+			label = "front-fault";
+			default-state = "keep";
+			gpios = <&pca0 13 GPIO_ACTIVE_LOW>;
+		};
+		front_power {
+			label = "front-power";
+			default-state = "keep";
+			gpios = <&pca0 14 GPIO_ACTIVE_LOW>;
+		};
+		front_id {
+			label = "front-id";
+			default-state = "keep";
+			gpios = <&pca0 15 GPIO_ACTIVE_LOW>;
+		};
+	};
+
 	leds {
 		compatible = "gpio-leds";

@@ -278,47 +349,72 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		fan0: led@0 {
-			label = "fan0";
-			default-state = "keep";
+		gpio-controller;
+		#gpio-cells = <2>;
+
+		gpio@0 {
 			reg = <0>;
-			type = <PCA955X_TYPE_LED>;
+			type = <PCA955X_TYPE_GPIO>;
 		};
-		fan1: led@1 {
-			label = "fan1";
-			default-state = "keep";
+		gpio@1 {
 			reg = <1>;
-			type = <PCA955X_TYPE_LED>;
+			type = <PCA955X_TYPE_GPIO>;
 		};
-		fan2: led@2 {
-			label = "fan2";
-			default-state = "keep";
+		gpio@2 {
 			reg = <2>;
-			type = <PCA955X_TYPE_LED>;
+			type = <PCA955X_TYPE_GPIO>;
 		};
-		fan3: led@3 {
-			label = "fan3";
-			default-state = "keep";
+		gpio@3 {
 			reg = <3>;
-			type = <PCA955X_TYPE_LED>;
+			type = <PCA955X_TYPE_GPIO>;
 		};
-		front_fault: led@13 {
-			label = "front-fault";
-			default-state = "keep";
+		gpio@4 {
+			reg = <4>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+		gpio@5 {
+			reg = <5>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+		gpio@6 {
+			reg = <6>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+		gpio@7 {
+			reg = <7>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+		gpio@8 {
+			reg = <8>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+		gpio@9 {
+			reg = <9>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+		gpio@10 {
+			reg = <10>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+		gpio@11 {
+			reg = <11>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+		gpio@12 {
+			reg = <12>;
+			type = <PCA955X_TYPE_GPIO>;
+		};
+		gpio@13 {
 			reg = <13>;
-			type = <PCA955X_TYPE_LED>;
+			type = <PCA955X_TYPE_GPIO>;
 		};
-		front_power: led@14 {
-			label = "front-power";
-			default-state = "keep";
+		gpio@14 {
 			reg = <14>;
-			type = <PCA955X_TYPE_LED>;
+			type = <PCA955X_TYPE_GPIO>;
 		};
-		front_id: led@15 {
-			label = "front-id";
-			default-state = "keep";
+		gpio@15 {
 			reg = <15>;
-			type = <PCA955X_TYPE_LED>;
+			type = <PCA955X_TYPE_GPIO>;
 		};
 	};
 };

Joel Stanley

maintainer Applied

2017-08-08 12:31 UTC #3 lore raw

Quoted 11 lines · Cédric Le Goater

Quoted 10 lines · Eddie James
From: "Edward A. James" <[email protected]>
Add gpio-keys-polled node for pca955x fan presence lines. Change the binding of the pca9552 to remove the leds and instead define all the provided gpio pins there. Add back the leds in a 'gpio-leds' compatible entry.
Polling period of 1 second to be determined to be the max acceptable value based on discussions with Brad Bishop and Matt Spinler. Tested with gpiomon program - verified.

Quoted 5 lines

Quoted 1 line
Patch based on Cedric's example - thanks! Tested on witherspoon.
You did the most difficult part: testing.
Acked-by Cédric Le Goater <[email protected]>

Woot, we got there in the end.

Applied to dev-4.10.

Cheers,

Joel