All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Remove checkstop GPIO from gpio-keys definitions
@ 2020-04-03 12:16 bentyner
  2020-04-06 17:35 ` Brad Bishop
  2020-04-06 18:13 ` Milton Miller II
  0 siblings, 2 replies; 5+ messages in thread
From: bentyner @ 2020-04-03 12:16 UTC (permalink / raw)
  To: openbmc

 From: Ben Tyner <ben.tyner@ibm.com>

Attention handler will monitor the checkstop gpio via the character
device interface so it needs to not be defined.

Signed-off-by: Ben Tyner <ben.tyner@ibm.com>
---

  arch/arm/boot/dts/Makefile                    |  1 +
  .../dts/aspeed-bmc-opp-witherspoon-128.dts    | 99 +++++++++++++++++++
  2 files changed, 100 insertions(+)
  create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index fcd607ffe8d9..d6dfdf73e66b 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1303,6 +1303,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
  	aspeed-bmc-opp-tacoma.dtb \
  	aspeed-bmc-opp-vesnin.dtb \
  	aspeed-bmc-opp-witherspoon.dtb \
+	aspeed-bmc-opp-witherspoon-128.dtb \
  	aspeed-bmc-opp-zaius.dtb \
  	aspeed-bmc-portwell-neptune.dtb \
  	aspeed-bmc-quanta-q71l.dtb
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts 
b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts
new file mode 100644
index 000000000000..701d58b7f0dc
--- /dev/null
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts
@@ -0,0 +1,99 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2019 IBM Corp.
+/dts-v1/;
+
+#include "aspeed-bmc-opp-witherspoon.dts"
+
+/ {
+	gpio-keys {
+		/delete-node/ checkstop;
+	};
+};
+
+&gpio {
+	gpio-line-names =
+	/*A0-A7*/	"","cfam-reset","","","","","fsi-mux","",
+	/*B0-B7*/	"","","","","","air-water","","",
+	/*C0-C7*/	"","","","","","","","",
+	/*D0-D7*/	"fsi-enable","","","","","","","",
+	/*E0-E7*/	"fsi-data","","","","","","","",
+	/*F0-F7*/	"","","","","","","","",
+	/*G0-G7*/	"","","","","","","","",
+	/*H0-H7*/	"","","","","","","","",
+	/*I0-I7*/	"","","","","","","","",
+	/*J0-J7*/	"","","","","","","","",
+	/*K0-K7*/	"","","","","","","","",
+	/*L0-L7*/	"","","","","","","","",
+	/*M0-M7*/	"","","","","","","","",
+	/*N0-N7*/	"presence-ps1","","led-rear-fault","led-rear-power",
+		        "led-rear-id","","","",
+	/*O0-O7*/	"","","","","","","","",
+	/*P0-P7*/	"","","","","","","","presence-ps0",
+	/*Q0-Q7*/	"","","","","","","","",
+	/*R0-R7*/	"","","fsi-trans","","","power-button","","",
+	/*S0-S7*/	"","","","","","","","",
+	/*T0-T7*/	"","","","","","","","",
+	/*U0-U7*/	"","","","","","","","",
+	/*V0-V7*/	"","","","","","","","",
+	/*W0-W7*/	"","","","","","","","",
+	/*X0-X7*/	"","","","","","","","",
+	/*Y0-Y7*/	"","","","","","","","",
+	/*Z0-Z7*/	"","","","","","","","",
+	/*AA0-AA7*/	"fsi-clock","","","","","","","",
+	/*AB0-AB7*/	"","","","","","","","",
+	/*AC0-AC7*/	"","","","","","","","";
+};
+
+&fmc {
+	status = "okay";
+
+	flash@0 {
+		status = "okay";
+		label = "bmc";
+		m25p,fast-read;
+		spi-max-frequency = <100000000>;
+
+		partitions {
+			#address-cells = < 1 >;
+			#size-cells = < 1 >;
+			compatible = "fixed-partitions";
+			u-boot@0 {
+				reg = < 0 0x60000 >;
+				label = "u-boot";
+			};
+			u-boot-env@60000 {
+				reg = < 0x60000 0x20000 >;
+				label = "u-boot-env";
+			};
+			obmc-ubi@80000 {
+				reg = < 0x80000 0x7F80000>;
+				label = "obmc-ubi";
+			};
+		};
+	};
+
+	flash@1 {
+		status = "okay";
+		label = "alt-bmc";
+		m25p,fast-read;
+		spi-max-frequency = <100000000>;
+
+		partitions {
+			#address-cells = < 1 >;
+			#size-cells = < 1 >;
+			compatible = "fixed-partitions";
+			u-boot@0 {
+				reg = < 0 0x60000 >;
+				label = "alt-u-boot";
+			};
+			u-boot-env@60000 {
+				reg = < 0x60000 0x20000 >;
+				label = "alt-u-boot-env";
+			};
+			obmc-ubi@80000 {
+				reg = < 0x80000 0x7F80000>;
+				label = "alt-obmc-ubi";
+			};
+		};
+	};
+};
-- 
2.20.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] Remove checkstop GPIO from gpio-keys definitions
  2020-04-03 12:16 [PATCH] Remove checkstop GPIO from gpio-keys definitions bentyner
@ 2020-04-06 17:35 ` Brad Bishop
  2020-04-06 19:22   ` bentyner
  2020-04-06 18:13 ` Milton Miller II
  1 sibling, 1 reply; 5+ messages in thread
From: Brad Bishop @ 2020-04-06 17:35 UTC (permalink / raw)
  To: bentyner; +Cc: openbmc

at 8:16 AM, bentyner <bentyner@linux.ibm.com> wrote:

> From: Ben Tyner <ben.tyner@ibm.com>

Hi Ben.  How did you invoke git format-patch?  I wasn’t expecting this  
line.  Have a read through  
https://github.com/openbmc/linux/wiki/SubmittingPatches#use-the-git-tools  
and see if that procedure gets rid of it.  Also "linux dev-5.4” is needed  
in the subject prefix so patchwork knows where to put this (when submitted  
correctly, you should be able to see your patch here:  
https://patchwork.ozlabs.org/project/linux-aspeed/list/

>
> Attention handler will monitor the checkstop gpio via the character
> device interface so it needs to not be defined.

This description doesn’t match the content - an entire device tree has been  
added.  Also I think you’ll need to rebase because I see that this DT was  
recently added with 0d8c8d99358588164430b3d89312ecea775a57f1.

>
> Signed-off-by: Ben Tyner <ben.tyner@ibm.com>
> ---
>
>  arch/arm/boot/dts/Makefile                    |  1 +
>  .../dts/aspeed-bmc-opp-witherspoon-128.dts    | 99 +++++++++++++++++++
>  2 files changed, 100 insertions(+)
>  create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index fcd607ffe8d9..d6dfdf73e66b 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -1303,6 +1303,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
>  	aspeed-bmc-opp-tacoma.dtb \
>  	aspeed-bmc-opp-vesnin.dtb \
>  	aspeed-bmc-opp-witherspoon.dtb \
> +	aspeed-bmc-opp-witherspoon-128.dtb \
>  	aspeed-bmc-opp-zaius.dtb \
>  	aspeed-bmc-portwell-neptune.dtb \
>  	aspeed-bmc-quanta-q71l.dtb
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts  
> b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts
> new file mode 100644
> index 000000000000..701d58b7f0dc
> --- /dev/null
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts
> @@ -0,0 +1,99 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +// Copyright 2019 IBM Corp.
> +/dts-v1/;
> +
> +#include "aspeed-bmc-opp-witherspoon.dts"
> +
> +/ {
> +	gpio-keys {
> +		/delete-node/ checkstop;
> +	};
> +};
> +
> +&gpio {
> +	gpio-line-names =
> +	/*A0-A7*/	"","cfam-reset","","","","","fsi-mux","",
> +	/*B0-B7*/	"","","","","","air-water","","",
> +	/*C0-C7*/	"","","","","","","","",
> +	/*D0-D7*/	"fsi-enable","","","","","","","",
> +	/*E0-E7*/	"fsi-data","","","","","","","",
> +	/*F0-F7*/	"","","","","","","","",
> +	/*G0-G7*/	"","","","","","","","",
> +	/*H0-H7*/	"","","","","","","","",
> +	/*I0-I7*/	"","","","","","","","",
> +	/*J0-J7*/	"","","","","","","","",
> +	/*K0-K7*/	"","","","","","","","",
> +	/*L0-L7*/	"","","","","","","","",
> +	/*M0-M7*/	"","","","","","","","",
> +	/*N0-N7*/	"presence-ps1","","led-rear-fault","led-rear-power",
> +		        "led-rear-id","","","",
> +	/*O0-O7*/	"","","","","","","","",
> +	/*P0-P7*/	"","","","","","","","presence-ps0",
> +	/*Q0-Q7*/	"","","","","","","","",
> +	/*R0-R7*/	"","","fsi-trans","","","power-button","","",
> +	/*S0-S7*/	"","","","","","","","",
> +	/*T0-T7*/	"","","","","","","","",
> +	/*U0-U7*/	"","","","","","","","",
> +	/*V0-V7*/	"","","","","","","","",
> +	/*W0-W7*/	"","","","","","","","",
> +	/*X0-X7*/	"","","","","","","","",
> +	/*Y0-Y7*/	"","","","","","","","",
> +	/*Z0-Z7*/	"","","","","","","","",
> +	/*AA0-AA7*/	"fsi-clock","","","","","","","",
> +	/*AB0-AB7*/	"","","","","","","","",
> +	/*AC0-AC7*/	"","","","","","","","";
> +};
> +
> +&fmc {
> +	status = "okay";
> +
> +	flash@0 {
> +		status = "okay";
> +		label = "bmc";
> +		m25p,fast-read;
> +		spi-max-frequency = <100000000>;
> +
> +		partitions {
> +			#address-cells = < 1 >;
> +			#size-cells = < 1 >;
> +			compatible = "fixed-partitions";
> +			u-boot@0 {
> +				reg = < 0 0x60000 >;
> +				label = "u-boot";
> +			};
> +			u-boot-env@60000 {
> +				reg = < 0x60000 0x20000 >;
> +				label = "u-boot-env";
> +			};
> +			obmc-ubi@80000 {
> +				reg = < 0x80000 0x7F80000>;
> +				label = "obmc-ubi";
> +			};
> +		};
> +	};
> +
> +	flash@1 {
> +		status = "okay";
> +		label = "alt-bmc";
> +		m25p,fast-read;
> +		spi-max-frequency = <100000000>;
> +
> +		partitions {
> +			#address-cells = < 1 >;
> +			#size-cells = < 1 >;
> +			compatible = "fixed-partitions";
> +			u-boot@0 {
> +				reg = < 0 0x60000 >;
> +				label = "alt-u-boot";
> +			};
> +			u-boot-env@60000 {
> +				reg = < 0x60000 0x20000 >;
> +				label = "alt-u-boot-env";
> +			};
> +			obmc-ubi@80000 {
> +				reg = < 0x80000 0x7F80000>;
> +				label = "alt-obmc-ubi";
> +			};
> +		};
> +	};
> +};
> —
> 2.20.1

^ permalink raw reply	[flat|nested] 5+ messages in thread

* RE: [PATCH] Remove checkstop GPIO from gpio-keys definitions
  2020-04-03 12:16 [PATCH] Remove checkstop GPIO from gpio-keys definitions bentyner
  2020-04-06 17:35 ` Brad Bishop
@ 2020-04-06 18:13 ` Milton Miller II
  1 sibling, 0 replies; 5+ messages in thread
From: Milton Miller II @ 2020-04-06 18:13 UTC (permalink / raw)
  To: Brad Bishop; +Cc: bentyner, openbmc



-----"openbmc" <openbmc-bounces+miltonm=us.ibm.com@lists.ozlabs.org> wrote: -----

>To: bentyner <bentyner@linux.ibm.com>
>From: Brad Bishop 
>Sent by: "openbmc" 
>Date: 04/06/2020 12:36PM
>Cc: openbmc@lists.ozlabs.org
>Subject: [EXTERNAL] Re: [PATCH] Remove checkstop GPIO from gpio-keys
>definitions
>
>at 8:16 AM, bentyner <bentyner@linux.ibm.com> wrote:
>
>> From: Ben Tyner <ben.tyner@ibm.com>
>
>Hi Ben.  How did you invoke git format-patch?  I wasn’t expecting
>this 
>line.  Have a read through  

The reason is the commit author likely doesn't match the sender, 
as the reply address is bentiner@linux.ibm.com but the commit is 
from ben.tiner@ibm.com.

If this is the case, the commit will need to be amended with the 
--reset-author flag if that is the public email address.  Some
people's workflow instead includes an additional S-o-B.

milton

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] Remove checkstop GPIO from gpio-keys definitions
  2020-04-06 17:35 ` Brad Bishop
@ 2020-04-06 19:22   ` bentyner
  2020-04-06 22:14     ` Brad Bishop
  0 siblings, 1 reply; 5+ messages in thread
From: bentyner @ 2020-04-06 19:22 UTC (permalink / raw)
  To: Brad Bishop; +Cc: openbmc

The description does not match the content because I did what was 
recommended:

"Apply the 0001-ARM-dts-Aspeed-Add-witherspoon-128-machine.patch to a 
kernel tree, make whatever edits you need to the device tree and then 
regenerate the (original) patch, and check this file back in."

The original patch added the device tree. My changes "subtract" from the 
device tree that only exists because of the original patch.


On 2020-04-06 12:35, Brad Bishop wrote:
> at 8:16 AM, bentyner <bentyner@linux.ibm.com> wrote:
> 
>> From: Ben Tyner <ben.tyner@ibm.com>
> 
> Hi Ben.  How did you invoke git format-patch?  I wasn’t expecting
> this  line.  Have a read through
> https://github.com/openbmc/linux/wiki/SubmittingPatches#use-the-git-tools
>  and see if that procedure gets rid of it.  Also "linux dev-5.4” is
> needed  in the subject prefix so patchwork knows where to put this
> (when submitted  correctly, you should be able to see your patch here:
>  https://patchwork.ozlabs.org/project/linux-aspeed/list/
> 
>> 
>> Attention handler will monitor the checkstop gpio via the character
>> device interface so it needs to not be defined.
> 
> This description doesn’t match the content - an entire device tree
> has been  added.  Also I think you’ll need to rebase because I see
> that this DT was  recently added with
> 0d8c8d99358588164430b3d89312ecea775a57f1.
> 
>> 
>> Signed-off-by: Ben Tyner <ben.tyner@ibm.com>
>> ---
>> 
>>  arch/arm/boot/dts/Makefile                    |  1 +
>>  .../dts/aspeed-bmc-opp-witherspoon-128.dts    | 99 
>> +++++++++++++++++++
>>  2 files changed, 100 insertions(+)
>>  create mode 100644 
>> arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts
>> 
>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>> index fcd607ffe8d9..d6dfdf73e66b 100644
>> --- a/arch/arm/boot/dts/Makefile
>> +++ b/arch/arm/boot/dts/Makefile
>> @@ -1303,6 +1303,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
>>  	aspeed-bmc-opp-tacoma.dtb \
>>  	aspeed-bmc-opp-vesnin.dtb \
>>  	aspeed-bmc-opp-witherspoon.dtb \
>> +	aspeed-bmc-opp-witherspoon-128.dtb \
>>  	aspeed-bmc-opp-zaius.dtb \
>>  	aspeed-bmc-portwell-neptune.dtb \
>>  	aspeed-bmc-quanta-q71l.dtb
>> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts  
>> b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts
>> new file mode 100644
>> index 000000000000..701d58b7f0dc
>> --- /dev/null
>> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts
>> @@ -0,0 +1,99 @@
>> +// SPDX-License-Identifier: GPL-2.0-or-later
>> +// Copyright 2019 IBM Corp.
>> +/dts-v1/;
>> +
>> +#include "aspeed-bmc-opp-witherspoon.dts"
>> +
>> +/ {
>> +	gpio-keys {
>> +		/delete-node/ checkstop;
>> +	};
>> +};
>> +
>> +&gpio {
>> +	gpio-line-names =
>> +	/*A0-A7*/	"","cfam-reset","","","","","fsi-mux","",
>> +	/*B0-B7*/	"","","","","","air-water","","",
>> +	/*C0-C7*/	"","","","","","","","",
>> +	/*D0-D7*/	"fsi-enable","","","","","","","",
>> +	/*E0-E7*/	"fsi-data","","","","","","","",
>> +	/*F0-F7*/	"","","","","","","","",
>> +	/*G0-G7*/	"","","","","","","","",
>> +	/*H0-H7*/	"","","","","","","","",
>> +	/*I0-I7*/	"","","","","","","","",
>> +	/*J0-J7*/	"","","","","","","","",
>> +	/*K0-K7*/	"","","","","","","","",
>> +	/*L0-L7*/	"","","","","","","","",
>> +	/*M0-M7*/	"","","","","","","","",
>> +	/*N0-N7*/	"presence-ps1","","led-rear-fault","led-rear-power",
>> +		        "led-rear-id","","","",
>> +	/*O0-O7*/	"","","","","","","","",
>> +	/*P0-P7*/	"","","","","","","","presence-ps0",
>> +	/*Q0-Q7*/	"","","","","","","","",
>> +	/*R0-R7*/	"","","fsi-trans","","","power-button","","",
>> +	/*S0-S7*/	"","","","","","","","",
>> +	/*T0-T7*/	"","","","","","","","",
>> +	/*U0-U7*/	"","","","","","","","",
>> +	/*V0-V7*/	"","","","","","","","",
>> +	/*W0-W7*/	"","","","","","","","",
>> +	/*X0-X7*/	"","","","","","","","",
>> +	/*Y0-Y7*/	"","","","","","","","",
>> +	/*Z0-Z7*/	"","","","","","","","",
>> +	/*AA0-AA7*/	"fsi-clock","","","","","","","",
>> +	/*AB0-AB7*/	"","","","","","","","",
>> +	/*AC0-AC7*/	"","","","","","","","";
>> +};
>> +
>> +&fmc {
>> +	status = "okay";
>> +
>> +	flash@0 {
>> +		status = "okay";
>> +		label = "bmc";
>> +		m25p,fast-read;
>> +		spi-max-frequency = <100000000>;
>> +
>> +		partitions {
>> +			#address-cells = < 1 >;
>> +			#size-cells = < 1 >;
>> +			compatible = "fixed-partitions";
>> +			u-boot@0 {
>> +				reg = < 0 0x60000 >;
>> +				label = "u-boot";
>> +			};
>> +			u-boot-env@60000 {
>> +				reg = < 0x60000 0x20000 >;
>> +				label = "u-boot-env";
>> +			};
>> +			obmc-ubi@80000 {
>> +				reg = < 0x80000 0x7F80000>;
>> +				label = "obmc-ubi";
>> +			};
>> +		};
>> +	};
>> +
>> +	flash@1 {
>> +		status = "okay";
>> +		label = "alt-bmc";
>> +		m25p,fast-read;
>> +		spi-max-frequency = <100000000>;
>> +
>> +		partitions {
>> +			#address-cells = < 1 >;
>> +			#size-cells = < 1 >;
>> +			compatible = "fixed-partitions";
>> +			u-boot@0 {
>> +				reg = < 0 0x60000 >;
>> +				label = "alt-u-boot";
>> +			};
>> +			u-boot-env@60000 {
>> +				reg = < 0x60000 0x20000 >;
>> +				label = "alt-u-boot-env";
>> +			};
>> +			obmc-ubi@80000 {
>> +				reg = < 0x80000 0x7F80000>;
>> +				label = "alt-obmc-ubi";
>> +			};
>> +		};
>> +	};
>> +};
>> —
>> 2.20.1

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] Remove checkstop GPIO from gpio-keys definitions
  2020-04-06 19:22   ` bentyner
@ 2020-04-06 22:14     ` Brad Bishop
  0 siblings, 0 replies; 5+ messages in thread
From: Brad Bishop @ 2020-04-06 22:14 UTC (permalink / raw)
  To: bentyner; +Cc: openbmc

at 3:22 PM, bentyner <bentyner@linux.ibm.com> wrote:

> The description does not match the content because I did what was  
> recommended:
>
> "Apply the 0001-ARM-dts-Aspeed-Add-witherspoon-128-machine.patch to a  
> kernel tree, make whatever edits you need to the device tree and then  
> regenerate the (original) patch, and check this file back in."

Yep, when I gave this recommendation we were carrying the witherspoon 128  
device tree as a patch in the bitbake metadata.

Since then, the witherspoon 128 device tree was added to the OpenBMC kernel  
tree, so we’ll have to adapt here.  Could you rebase on the latest and send  
it out again?

>
> The original patch added the device tree. My changes "subtract" from the  
> device tree that only exists because of the original patch.
>
>
> On 2020-04-06 12:35, Brad Bishop wrote:
>> at 8:16 AM, bentyner <bentyner@linux.ibm.com> wrote:
>>> From: Ben Tyner <ben.tyner@ibm.com>
>> Hi Ben.  How did you invoke git format-patch?  I wasn’t expecting
>> this  line.  Have a read through
>> https://github.com/openbmc/linux/wiki/SubmittingPatches#use-the-git-tools
>>  and see if that procedure gets rid of it.  Also "linux dev-5.4” is
>> needed  in the subject prefix so patchwork knows where to put this
>> (when submitted  correctly, you should be able to see your patch here:
>>  https://patchwork.ozlabs.org/project/linux-aspeed/list/
>>> Attention handler will monitor the checkstop gpio via the character
>>> device interface so it needs to not be defined.
>> This description doesn’t match the content - an entire device tree
>> has been  added.  Also I think you’ll need to rebase because I see
>> that this DT was  recently added with
>> 0d8c8d99358588164430b3d89312ecea775a57f1.
>>> Signed-off-by: Ben Tyner <ben.tyner@ibm.com>
>>> ---
>>>  arch/arm/boot/dts/Makefile                    |  1 +
>>>  .../dts/aspeed-bmc-opp-witherspoon-128.dts    | 99 +++++++++++++++++++
>>>  2 files changed, 100 insertions(+)
>>>  create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts
>>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>>> index fcd607ffe8d9..d6dfdf73e66b 100644
>>> --- a/arch/arm/boot/dts/Makefile
>>> +++ b/arch/arm/boot/dts/Makefile
>>> @@ -1303,6 +1303,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
>>>  	aspeed-bmc-opp-tacoma.dtb \
>>>  	aspeed-bmc-opp-vesnin.dtb \
>>>  	aspeed-bmc-opp-witherspoon.dtb \
>>> +	aspeed-bmc-opp-witherspoon-128.dtb \
>>>  	aspeed-bmc-opp-zaius.dtb \
>>>  	aspeed-bmc-portwell-neptune.dtb \
>>>  	aspeed-bmc-quanta-q71l.dtb
>>> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts   
>>> b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts
>>> new file mode 100644
>>> index 000000000000..701d58b7f0dc
>>> --- /dev/null
>>> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts
>>> @@ -0,0 +1,99 @@
>>> +// SPDX-License-Identifier: GPL-2.0-or-later
>>> +// Copyright 2019 IBM Corp.
>>> +/dts-v1/;
>>> +
>>> +#include "aspeed-bmc-opp-witherspoon.dts"
>>> +
>>> +/ {
>>> +	gpio-keys {
>>> +		/delete-node/ checkstop;
>>> +	};
>>> +};
>>> +
>>> +&gpio {
>>> +	gpio-line-names =
>>> +	/*A0-A7*/	"","cfam-reset","","","","","fsi-mux","",
>>> +	/*B0-B7*/	"","","","","","air-water","","",
>>> +	/*C0-C7*/	"","","","","","","","",
>>> +	/*D0-D7*/	"fsi-enable","","","","","","","",
>>> +	/*E0-E7*/	"fsi-data","","","","","","","",
>>> +	/*F0-F7*/	"","","","","","","","",
>>> +	/*G0-G7*/	"","","","","","","","",
>>> +	/*H0-H7*/	"","","","","","","","",
>>> +	/*I0-I7*/	"","","","","","","","",
>>> +	/*J0-J7*/	"","","","","","","","",
>>> +	/*K0-K7*/	"","","","","","","","",
>>> +	/*L0-L7*/	"","","","","","","","",
>>> +	/*M0-M7*/	"","","","","","","","",
>>> +	/*N0-N7*/	"presence-ps1","","led-rear-fault","led-rear-power",
>>> +		        "led-rear-id","","","",
>>> +	/*O0-O7*/	"","","","","","","","",
>>> +	/*P0-P7*/	"","","","","","","","presence-ps0",
>>> +	/*Q0-Q7*/	"","","","","","","","",
>>> +	/*R0-R7*/	"","","fsi-trans","","","power-button","","",
>>> +	/*S0-S7*/	"","","","","","","","",
>>> +	/*T0-T7*/	"","","","","","","","",
>>> +	/*U0-U7*/	"","","","","","","","",
>>> +	/*V0-V7*/	"","","","","","","","",
>>> +	/*W0-W7*/	"","","","","","","","",
>>> +	/*X0-X7*/	"","","","","","","","",
>>> +	/*Y0-Y7*/	"","","","","","","","",
>>> +	/*Z0-Z7*/	"","","","","","","","",
>>> +	/*AA0-AA7*/	"fsi-clock","","","","","","","",
>>> +	/*AB0-AB7*/	"","","","","","","","",
>>> +	/*AC0-AC7*/	"","","","","","","","";
>>> +};
>>> +
>>> +&fmc {
>>> +	status = "okay";
>>> +
>>> +	flash@0 {
>>> +		status = "okay";
>>> +		label = "bmc";
>>> +		m25p,fast-read;
>>> +		spi-max-frequency = <100000000>;
>>> +
>>> +		partitions {
>>> +			#address-cells = < 1 >;
>>> +			#size-cells = < 1 >;
>>> +			compatible = "fixed-partitions";
>>> +			u-boot@0 {
>>> +				reg = < 0 0x60000 >;
>>> +				label = "u-boot";
>>> +			};
>>> +			u-boot-env@60000 {
>>> +				reg = < 0x60000 0x20000 >;
>>> +				label = "u-boot-env";
>>> +			};
>>> +			obmc-ubi@80000 {
>>> +				reg = < 0x80000 0x7F80000>;
>>> +				label = "obmc-ubi";
>>> +			};
>>> +		};
>>> +	};
>>> +
>>> +	flash@1 {
>>> +		status = "okay";
>>> +		label = "alt-bmc";
>>> +		m25p,fast-read;
>>> +		spi-max-frequency = <100000000>;
>>> +
>>> +		partitions {
>>> +			#address-cells = < 1 >;
>>> +			#size-cells = < 1 >;
>>> +			compatible = "fixed-partitions";
>>> +			u-boot@0 {
>>> +				reg = < 0 0x60000 >;
>>> +				label = "alt-u-boot";
>>> +			};
>>> +			u-boot-env@60000 {
>>> +				reg = < 0x60000 0x20000 >;
>>> +				label = "alt-u-boot-env";
>>> +			};
>>> +			obmc-ubi@80000 {
>>> +				reg = < 0x80000 0x7F80000>;
>>> +				label = "alt-obmc-ubi";
>>> +			};
>>> +		};
>>> +	};
>>> +};
>>> —
>>> 2.20.1

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2020-04-06 22:14 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-03 12:16 [PATCH] Remove checkstop GPIO from gpio-keys definitions bentyner
2020-04-06 17:35 ` Brad Bishop
2020-04-06 19:22   ` bentyner
2020-04-06 22:14     ` Brad Bishop
2020-04-06 18:13 ` Milton Miller II

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.