Commit 3d34cae1 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

Merge branch 'for-v5.20/aspeed-dts-cleanup' into for-v5.20/dts-cleanup

parents 592feeea bafd5bb5

arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts

+15 −15
Original line number Diff line number Diff line
@@ -100,91 +100,91 @@ identify { 
	gpio-keys {

		compatible = "gpio-keys";



		shutdown_ack {

		event-shutdown-ack {

			label = "SHUTDOWN_ACK";

			gpios = <&gpio ASPEED_GPIO(G, 2) GPIO_ACTIVE_LOW>;

			linux,code = <ASPEED_GPIO(G, 2)>;

		};



		reboot_ack {

		event-reboot-ack {

			label = "REBOOT_ACK";

			gpios = <&gpio ASPEED_GPIO(J, 3) GPIO_ACTIVE_LOW>;

			linux,code = <ASPEED_GPIO(J, 3)>;

		};



		S0_overtemp {

		event-s0-overtemp {

			label = "S0_OVERTEMP";

			gpios = <&gpio ASPEED_GPIO(G, 3) GPIO_ACTIVE_LOW>;

			linux,code = <ASPEED_GPIO(G, 3)>;

		};



		S0_hightemp {

		event-s0-hightemp {

			label = "S0_HIGHTEMP";

			gpios = <&gpio ASPEED_GPIO(J, 0) GPIO_ACTIVE_LOW>;

			linux,code = <ASPEED_GPIO(J, 0)>;

		};



		S0_cpu_fault {

		event-s0-cpu-fault {

			label = "S0_CPU_FAULT";

			gpios = <&gpio ASPEED_GPIO(J, 1) GPIO_ACTIVE_HIGH>;

			linux,code = <ASPEED_GPIO(J, 1)>;

		};



		S0_scp_auth_fail {

		event-s0-scp-auth-fail {

			label = "S0_SCP_AUTH_FAIL";

			gpios = <&gpio ASPEED_GPIO(J, 2) GPIO_ACTIVE_LOW>;

			linux,code = <ASPEED_GPIO(J, 2)>;

		};



		S1_scp_auth_fail {

		event-s1-scp-auth-fail {

			label = "S1_SCP_AUTH_FAIL";

			gpios = <&gpio ASPEED_GPIO(Z, 5) GPIO_ACTIVE_LOW>;

			linux,code = <ASPEED_GPIO(Z, 5)>;

		};



		S1_overtemp {

		event-s1-overtemp {

			label = "S1_OVERTEMP";

			gpios = <&gpio ASPEED_GPIO(Z, 6) GPIO_ACTIVE_LOW>;

			linux,code = <ASPEED_GPIO(Z, 6)>;

		};



		S1_hightemp {

		event-s1-hightemp {

			label = "S1_HIGHTEMP";

			gpios = <&gpio ASPEED_GPIO(AB, 0) GPIO_ACTIVE_LOW>;

			linux,code = <ASPEED_GPIO(AB, 0)>;

		};



		S1_cpu_fault {

		event-s1-cpu-fault {

			label = "S1_CPU_FAULT";

			gpios = <&gpio ASPEED_GPIO(Z, 1) GPIO_ACTIVE_HIGH>;

			linux,code = <ASPEED_GPIO(Z, 1)>;

		};



		id_button {

		event-id {

			label = "ID_BUTTON";

			gpios = <&gpio ASPEED_GPIO(Q, 5) GPIO_ACTIVE_LOW>;

			linux,code = <ASPEED_GPIO(Q, 5)>;

		};



		psu1_vin_good {

		event-psu1-vin-good {

			label = "PSU1_VIN_GOOD";

			gpios = <&gpio ASPEED_GPIO(H, 4) GPIO_ACTIVE_LOW>;

			linux,code = <ASPEED_GPIO(H, 4)>;

		};



		psu2_vin_good {

		event-psu2-vin-good {

			label = "PSU2_VIN_GOOD";

			gpios = <&gpio ASPEED_GPIO(H, 5) GPIO_ACTIVE_LOW>;

			linux,code = <ASPEED_GPIO(H, 5)>;

		};



		psu1_present {

		event-psu1-present {

			label = "PSU1_PRESENT";

			gpios = <&gpio ASPEED_GPIO(I, 0) GPIO_ACTIVE_LOW>;

			linux,code = <ASPEED_GPIO(I, 0)>;

		};



		psu2_present {

		event-psu2-present {

			label = "PSU2_PRESENT";

			gpios = <&gpio ASPEED_GPIO(I, 1) GPIO_ACTIVE_LOW>;

			linux,code = <ASPEED_GPIO(I, 1)>;

arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts

+24 −24
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ bmc_alive { 


	gpio-keys {

		compatible = "gpio-keys";

		burn-in-signal {

		event-burn-in-signal {

			label = "burn-in";

			gpios = <&gpio ASPEED_GPIO(R, 5) GPIO_ACTIVE_LOW>;

			linux,code = <ASPEED_GPIO(R, 5)>;
@@ -111,139 +111,139 @@ gpio-keys-polled { 
		compatible = "gpio-keys-polled";

		poll-interval = <1000>;



		rear-riser1-presence {

		event-rear-riser1-presence {

			label = "rear-riser1-presence";

			gpios = <&pca0 1 GPIO_ACTIVE_LOW>;

			linux,code = <1>;

		};



		alrt-pvddq-cpu0 {

		event-alrt-pvddq-cpu0 {

			label = "alrt-pvddq-cpu0";

			gpios = <&pca0 8 GPIO_ACTIVE_LOW>;

			linux,code = <2>;

		};



		rear-riser0-presence {

		event-rear-riser0-presence {

			label = "rear-riser0-presence";

			gpios = <&pca0 9 GPIO_ACTIVE_LOW>;

			linux,code = <3>;

		};



		fault-pvddq-cpu0 {

		event-fault-pvddq-cpu0 {

			label = "fault-pvddq-cpu0";

			gpios = <&pca0 10 GPIO_ACTIVE_LOW>;

			linux,code = <4>;

		};



		alrt-pvddq-cpu1 {

		event-alrt-pvddq-cpu1 {

			label = "alrt-pvddq-cpu1";

			gpios = <&pca0 11 GPIO_ACTIVE_LOW>;

			linux,code = <5>;

		};



		fault-pvddq-cpu1 {

		event-fault-pvddq-cpu1 {

			label = "alrt-pvddq-cpu1";

			gpios = <&pca0 12 GPIO_ACTIVE_LOW>;

			linux,code = <6>;

		};



		fault-pvccin-cpu1 {

		event-fault-pvccin-cpu1 {

			label = "fault-pvccin-cpuq";

			gpios = <&pca0 13 GPIO_ACTIVE_LOW>;

			linux,code = <7>;

		};



		bmc-rom0-wp {

		event-bmc-rom0-wp {

			label = "bmc-rom0-wp";

			gpios = <&pca1 0 GPIO_ACTIVE_LOW>;

			linux,code = <8>;

		};



		bmc-rom1-wp {

		event-bmc-rom1-wp {

			label = "bmc-rom1-wp";

			gpios = <&pca1 1 GPIO_ACTIVE_LOW>;

			linux,code = <9>;

		};



		fan0-presence {

		event-fan0-presence {

			label = "fan0-presence";

			gpios = <&pca1 2 GPIO_ACTIVE_LOW>;

			linux,code = <10>;

		};



		fan1-presence {

		event-fan1-presence {

			label = "fan1-presence";

			gpios = <&pca1 3 GPIO_ACTIVE_LOW>;

			linux,code = <11>;

		};



		fan2-presence {

		event-fan2-presence {

			label = "fan2-presence";

			gpios = <&pca1 4 GPIO_ACTIVE_LOW>;

			linux,code = <12>;

		};



		fan3-presence {

		event-fan3-presence {

			label = "fan3-presence";

			gpios = <&pca1 5 GPIO_ACTIVE_LOW>;

			linux,code = <13>;

		};



		fan4-presence {

		event-fan4-presence {

			label = "fan4-presence";

			gpios = <&pca1 6 GPIO_ACTIVE_LOW>;

			linux,code = <14>;

		};



		fan5-presence {

		event-fan5-presence {

			label = "fan5-presence";

			gpios = <&pca1 7 GPIO_ACTIVE_LOW>;

			linux,code = <15>;

		};



		front-bp1-presence {

		event-front-bp1-presence {

			label = "front-bp1-presence";

			gpios = <&pca1 8 GPIO_ACTIVE_LOW>;

			linux,code = <16>;

		};



		rear-bp-presence {

		event-rear-bp-presence {

			label = "rear-bp-presence";

			gpios = <&pca1 9 GPIO_ACTIVE_LOW>;

			linux,code = <17>;

		};



		fault-pvccin-cpu0 {

		event-fault-pvccin-cpu0 {

			label = "fault-pvccin-cpu0";

			gpios = <&pca1 10 GPIO_ACTIVE_LOW>;

			linux,code = <18>;

		};



		alrt-p1v05-pvcc {

		event-alrt-p1v05-pvcc {

			label = "alrt-p1v05-pvcc1";

			gpios = <&pca1 11 GPIO_ACTIVE_LOW>;

			linux,code = <19>;

		};



		fault-p1v05-pvccio {

		event-fault-p1v05-pvccio {

			label = "alrt-p1v05-pvcc1";

			gpios = <&pca1 12 GPIO_ACTIVE_LOW>;

			linux,code = <20>;

		};



		alrt-p1v8-pvccio {

		event-alrt-p1v8-pvccio {

			label = "alrt-p1v8-pvccio";

			gpios = <&pca1 13 GPIO_ACTIVE_LOW>;

			linux,code = <21>;

		};



		fault-p1v8-pvccio {

		event-fault-p1v8-pvccio {

			label = "fault-p1v8-pvccio";

			gpios = <&pca1 14 GPIO_ACTIVE_LOW>;

			linux,code = <22>;

		};



		front-bp0-presence {

		event-front-bp0-presence {

			label = "front-bp0-presence";

			gpios = <&pca1 15 GPIO_ACTIVE_LOW>;

			linux,code = <23>;

arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts

+4 −6
Original line number Diff line number Diff line
@@ -189,29 +189,27 @@ vga_memory: region@bf000000 { 


	gpio-keys-polled {

		compatible = "gpio-keys-polled";

		#address-cells = <1>;

		#size-cells = <0>;

		poll-interval = <1000>;



		fan0-presence {

		event-fan0-presence {

			label = "fan0-presence";

			gpios = <&pca0 15 GPIO_ACTIVE_LOW>;

			linux,code = <15>;

		};



		fan1-presence {

		event-fan1-presence {

			label = "fan1-presence";

			gpios = <&pca0 14 GPIO_ACTIVE_LOW>;

			linux,code = <14>;

		};



		fan2-presence {

		event-fan2-presence {

			label = "fan2-presence";

			gpios = <&pca0 13 GPIO_ACTIVE_LOW>;

			linux,code = <13>;

		};



		fan3-presence {

		event-fan3-presence {

			label = "fan3-presence";

			gpios = <&pca0 12 GPIO_ACTIVE_LOW>;

			linux,code = <12>;

arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts

+6 −8
Original line number Diff line number Diff line
@@ -179,41 +179,39 @@ pcieslot-power { 


	gpio-keys-polled {

		compatible = "gpio-keys-polled";

		#address-cells = <1>;

		#size-cells = <0>;

		poll-interval = <1000>;



		fan0-presence {

		event-fan0-presence {

			label = "fan0-presence";

			gpios = <&pca0 6 GPIO_ACTIVE_LOW>;

			linux,code = <6>;

		};



		fan1-presence {

		event-fan1-presence {

			label = "fan1-presence";

			gpios = <&pca0 7 GPIO_ACTIVE_LOW>;

			linux,code = <7>;

		};



		fan2-presence {

		event-fan2-presence {

			label = "fan2-presence";

			gpios = <&pca0 8 GPIO_ACTIVE_LOW>;

			linux,code = <8>;

		};



		fan3-presence {

		event-fan3-presence {

			label = "fan3-presence";

			gpios = <&pca0 9 GPIO_ACTIVE_LOW>;

			linux,code = <9>;

		};



		fan4-presence {

		event-fan4-presence {

			label = "fan4-presence";

			gpios = <&pca0 10 GPIO_ACTIVE_LOW>;

			linux,code = <10>;

		};



		fan5-presence {

		event-fan5-presence {

			label = "fan5-presence";

			gpios = <&pca0 11 GPIO_ACTIVE_LOW>;

			linux,code = <11>;

arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts

+11 −11
Original line number Diff line number Diff line
@@ -73,19 +73,19 @@ fsi: gpio-fsi { 
	gpio-keys {

		compatible = "gpio-keys";



		checkstop {

		event-checkstop {

			label = "checkstop";

			gpios = <&gpio ASPEED_GPIO(B, 3) GPIO_ACTIVE_LOW>;

			linux,code = <ASPEED_GPIO(B, 3)>;

		};



		ps0-presence {

		event-ps0-presence {

			label = "ps0-presence";

			gpios = <&gpio ASPEED_GPIO(F, 0) GPIO_ACTIVE_LOW>;

			linux,code = <ASPEED_GPIO(F, 0)>;

		};



		ps1-presence {

		event-ps1-presence {

			label = "ps1-presence";

			gpios = <&gpio ASPEED_GPIO(F, 1) GPIO_ACTIVE_LOW>;

			linux,code = <ASPEED_GPIO(F, 1)>;
@@ -97,49 +97,49 @@ gpio-keys-polled { 
		compatible = "gpio-keys-polled";

		poll-interval = <1000>;



		fan0-presence {

		event-fan0-presence {

			label = "fan0-presence";

			gpios = <&pca1 0 GPIO_ACTIVE_LOW>;

			linux,code = <1>;

		};



		fan1-presence {

		event-fan1-presence {

			label = "fan1-presence";

			gpios = <&pca1 1 GPIO_ACTIVE_LOW>;

			linux,code = <2>;

		};



		fan2-presence {

		event-fan2-presence {

			label = "fan2-presence";

			gpios = <&pca1 2 GPIO_ACTIVE_LOW>;

			linux,code = <3>;

		};



		fan3-presence {

		event-fan3-presence {

			label = "fan3-presence";

			gpios = <&pca1 3 GPIO_ACTIVE_LOW>;

			linux,code = <4>;

		};



		fan4-presence {

		event-fan4-presence {

			label = "fan4-presence";

			gpios = <&pca1 4 GPIO_ACTIVE_LOW>;

			linux,code = <5>;

		};



		fan5-presence {

		event-fan5-presence {

			label = "fan5-presence";

			gpios = <&pca1 5 GPIO_ACTIVE_LOW>;

			linux,code = <6>;

		};



		fan6-presence {

		event-fan6-presence {

			label = "fan6-presence";

			gpios = <&pca1 6 GPIO_ACTIVE_LOW>;

			linux,code = <7>;

		};



		fan7-presence {

		event-fan7-presence {

			label = "fan7-presence";

			gpios = <&pca1 7 GPIO_ACTIVE_LOW>;

			linux,code = <8>;