[PATCH v1 0/5] Enable second flash, update gpios pin and merge adc channels

[PATCH v1 0/5] Enable second flash, update gpios pin and merge adc channels

[Quan Nguyen]

This patchset adds the second flash support, merge all ADC channels to
single iio-hwmon node and update various gpios pin name.

Link:https://github.com/openbmc/docs/blob/master/designs/device-tree-gpio-naming.md

Quan Nguyen (5):
  ARM: dts: aspeed: mtjade: Enable secondary flash
  ARM: dts: aspeed: mtjade: Update rtc-battery-voltage-read-enable pin
  ARM: dts: aspeed: mtjade: Update host0-ready pin
  ARM: dts: aspeed: mtjade: Rename GPIO hog nodes to match schema.
  ARM: dts: aspeed: mtjade: Move all adc sensors into iio-hwmon node

 .../arm/boot/dts/aspeed-bmc-ampere-mtjade.dts | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

-- 
2.28.0

[PATCH v1 1/5] ARM: dts: aspeed: mtjade: Enable secondary flash

[Quan Nguyen]

Enable the secondary flash of the Ampere's Mt. Jade's BMC.

Signed-off-by: Quan Nguyen <quan@os.amperecomputing.com>
Signed-off-by: Thang Q. Nguyen <thang@os.amperecomputing.com>
---
 arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts b/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts
index 4c3c3f1a12ea..934bb54b193a 100644
--- a/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts
@@ -362,6 +362,13 @@ flash@0 {
 		/* spi-max-frequency = <50000000>; */
 #include "openbmc-flash-layout-64.dtsi"
 	};
+
+	flash@1 {
+		status = "okay";
+		m25p,fast-read;
+		label = "alt-bmc";
+#include "openbmc-flash-layout-64-alt.dtsi"
+	};
 };
 
 &spi1 {
-- 
2.28.0

[PATCH v1 2/5] ARM: dts: aspeed: mtjade: Update rtc-battery-voltage-read-enable pin

[Quan Nguyen]

Update the output pin name that enables reading RTC battery voltage.

Link: https://github.com/openbmc/docs/blob/master/designs/device-tree-gpio-naming.md#rtc-battery-voltage-read-enable
Signed-off-by: Quan Nguyen <quan@os.amperecomputing.com>
Signed-off-by: Thang Q. Nguyen <thang@os.amperecomputing.com>
---
 arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts b/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts
index 934bb54b193a..c2b5b3dfeb85 100644
--- a/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts
@@ -876,7 +876,7 @@ &gpio {
 	/*Q0-Q7*/	"","","","","","UID_BUTTON","","",
 	/*R0-R7*/	"","","BMC_EXT_HIGHTEMP_L","OCP_AUX_PWREN",
 			"OCP_MAIN_PWREN","RESET_BUTTON","","",
-	/*S0-S7*/	"","","","","RTC_BAT_SEN_EN","","","",
+	/*S0-S7*/	"","","","","rtc-battery-voltage-read-enable","","","",
 	/*T0-T7*/	"","","","","","","","",
 	/*U0-U7*/	"","","","","","","","",
 	/*V0-V7*/	"","","","","","","","",
-- 
2.28.0

[PATCH v1 3/5] ARM: dts: aspeed: mtjade: Update host0-ready pin

[Quan Nguyen]

Update the input GPIO that indicates Host ready.

Link: https://github.com/openbmc/docs/blob/master/designs/device-tree-gpio-naming.md#host-ready
Signed-off-by: Quan Nguyen <quan@os.amperecomputing.com>
Signed-off-by: Thang Q. Nguyen <thang@os.amperecomputing.com>
---
 arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts b/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts
index c2b5b3dfeb85..a823571f8f4b 100644
--- a/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts
@@ -860,7 +860,7 @@ &gpio {
 	/*E0-E7*/	"","","","","","","","",
 	/*F0-F7*/	"","","BMC_SYS_PSON_L","S0_DDR_SAVE","PGOOD",
 			"S1_DDR_SAVE","","",
-	/*G0-G7*/	"S0_FW_BOOT_OK","SHD_REQ_L","","S0_OVERTEMP_L","","",
+	/*G0-G7*/	"host0-ready","SHD_REQ_L","","S0_OVERTEMP_L","","",
 			"","",
 	/*H0-H7*/	"","","","","PSU1_VIN_GOOD","PSU2_VIN_GOOD","","",
 	/*I0-I7*/	"PSU1_PRESENT","PSU2_PRESENT","S1_BMC_SPECIAL_BOOT",
-- 
2.28.0

[PATCH v1 4/5] ARM: dts: aspeed: mtjade: Rename GPIO hog nodes to match schema.

[Quan Nguyen]

GPIO hog nodes must have a "hog-" prefix or "-hog" suffix according to
the DT schema. Rename the node to pass dtbs_check.

Signed-off-by: Quan Nguyen <quan@os.amperecomputing.com>
---
 arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts b/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts
index a823571f8f4b..60b0e650957a 100644
--- a/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts
@@ -891,7 +891,7 @@ &gpio {
 	/*AC0-AC7*/	"SYS_PWR_GD","","","","","BMC_READY","SLAVE_PRESENT_L",
 			"BMC_OCP_PG";
 
-	i2c4_o_en {
+	i2c4-o-en-hog {
 		gpio-hog;
 		gpios = <ASPEED_GPIO(Y, 2) GPIO_ACTIVE_HIGH>;
 		output-high;
-- 
2.28.0

[PATCH v1 5/5] ARM: dts: aspeed: mtjade: Move all adc sensors into iio-hwmon node

[Quan Nguyen]

Move adc14 and adc15 (battery sensor) into single iio-hwmon node to
correct label to be read by single application for all adc sensors.

Signed-off-by: Quan Nguyen <quan@os.amperecomputing.com>
Signed-off-by: Thang Q. Nguyen <thang@os.amperecomputing.com>
---
 arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts b/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts
index 60b0e650957a..1b2e7ad37566 100644
--- a/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts
@@ -339,17 +339,8 @@ iio-hwmon {
 			<&adc10mux 0>, <&adc10mux 1>,
 			<&adc11mux 0>, <&adc11mux 1>,
 			<&adc12mux 0>, <&adc12mux 1>,
-			<&adc13mux 0>, <&adc13mux 1>;
-	};
-
-	iio-hwmon-adc14 {
-		compatible = "iio-hwmon";
-		io-channels = <&adc 14>;
-	};
-
-	iio-hwmon-battery {
-		compatible = "iio-hwmon";
-		io-channels = <&adc 15>;
+			<&adc13mux 0>, <&adc13mux 1>,
+			<&adc 14>, <&adc 15>;
 	};
 };
 
-- 
2.28.0

Re: [PATCH v1 0/5] Enable second flash, update gpios pin and merge adc channels

[Joel Stanley]

On Mon, 28 Feb 2022 at 00:03, Quan Nguyen <quan@os.amperecomputing.com> wrote:
>
> This patchset adds the second flash support, merge all ADC channels to
> single iio-hwmon node and update various gpios pin name.
>
> Link:https://github.com/openbmc/docs/blob/master/designs/device-tree-gpio-naming.md
>
> Quan Nguyen (5):
>   ARM: dts: aspeed: mtjade: Enable secondary flash
>   ARM: dts: aspeed: mtjade: Update rtc-battery-voltage-read-enable pin
>   ARM: dts: aspeed: mtjade: Update host0-ready pin
>   ARM: dts: aspeed: mtjade: Rename GPIO hog nodes to match schema.
>   ARM: dts: aspeed: mtjade: Move all adc sensors into iio-hwmon node

These look good.

Reviewed-by: Joel Stanley <joel@jms.id.au>

I'll apply them for v5.18.

>
>  .../arm/boot/dts/aspeed-bmc-ampere-mtjade.dts | 26 +++++++++----------
>  1 file changed, 12 insertions(+), 14 deletions(-)
>
> --
> 2.28.0
>

Re: [PATCH v1 0/5] Enable second flash, update gpios pin and merge adc channels

[Quan Nguyen]

On 28/02/2022 11:21, Joel Stanley wrote:
> On Mon, 28 Feb 2022 at 00:03, Quan Nguyen <quan@os.amperecomputing.com> wrote:
>>
>> This patchset adds the second flash support, merge all ADC channels to
>> single iio-hwmon node and update various gpios pin name.
>>
>> Link:https://github.com/openbmc/docs/blob/master/designs/device-tree-gpio-naming.md
>>
>> Quan Nguyen (5):
>>    ARM: dts: aspeed: mtjade: Enable secondary flash
>>    ARM: dts: aspeed: mtjade: Update rtc-battery-voltage-read-enable pin
>>    ARM: dts: aspeed: mtjade: Update host0-ready pin
>>    ARM: dts: aspeed: mtjade: Rename GPIO hog nodes to match schema.
>>    ARM: dts: aspeed: mtjade: Move all adc sensors into iio-hwmon node
> 
> These look good.
> 
> Reviewed-by: Joel Stanley <joel@jms.id.au>
> 
> I'll apply them for v5.18.
> 
Thank you, Joel
-Quan

Re: [PATCH v1 0/5] Enable second flash, update gpios pin and merge adc channels

[Quan Nguyen]

Dear Joel,

Thanks for applying this patchset for v5.18.

Would it be also possible to apply them to OpenBMC kernel dev-5.15 
branch as well?

Thanks,
- Quan

On 28/02/2022 11:21, Joel Stanley wrote:
> On Mon, 28 Feb 2022 at 00:03, Quan Nguyen <quan@os.amperecomputing.com> wrote:
>>
>> This patchset adds the second flash support, merge all ADC channels to
>> single iio-hwmon node and update various gpios pin name.
>>
>> Link:https://github.com/openbmc/docs/blob/master/designs/device-tree-gpio-naming.md
>>
>> Quan Nguyen (5):
>>    ARM: dts: aspeed: mtjade: Enable secondary flash
>>    ARM: dts: aspeed: mtjade: Update rtc-battery-voltage-read-enable pin
>>    ARM: dts: aspeed: mtjade: Update host0-ready pin
>>    ARM: dts: aspeed: mtjade: Rename GPIO hog nodes to match schema.
>>    ARM: dts: aspeed: mtjade: Move all adc sensors into iio-hwmon node
> 
> These look good.
> 
> Reviewed-by: Joel Stanley <joel@jms.id.au>
> 
> I'll apply them for v5.18.
> 
>>
>>   .../arm/boot/dts/aspeed-bmc-ampere-mtjade.dts | 26 +++++++++----------
>>   1 file changed, 12 insertions(+), 14 deletions(-)
>>
>> --
>> 2.28.0
>>

Re: [PATCH linux dev-5.15 0/5] Enable second flash, update gpios pin and merge adc channels

[Quan Nguyen]

Dear Joel,

Could you help review and backport this patch series to dev-5.15 branch?

https://lore.kernel.org/linux-arm-kernel/20220228000242.1884-1-quan@os.amperecomputing.com/

Thank you,
- Quan

On 28/02/2022 07:02, Quan Nguyen wrote:
> This patchset adds the second flash support, merge all ADC channels to
> single iio-hwmon node and update various gpios pin name.
> 
> Link:https://github.com/openbmc/docs/blob/master/designs/device-tree-gpio-naming.md
> 
> Quan Nguyen (5):
>    ARM: dts: aspeed: mtjade: Enable secondary flash
>    ARM: dts: aspeed: mtjade: Update rtc-battery-voltage-read-enable pin
>    ARM: dts: aspeed: mtjade: Update host0-ready pin
>    ARM: dts: aspeed: mtjade: Rename GPIO hog nodes to match schema.
>    ARM: dts: aspeed: mtjade: Move all adc sensors into iio-hwmon node
> 
>   .../arm/boot/dts/aspeed-bmc-ampere-mtjade.dts | 26 +++++++++----------
>   1 file changed, 12 insertions(+), 14 deletions(-)
> 

Re: [PATCH linux dev-5.15 0/5] Enable second flash, update gpios pin and merge adc channels

[Joel Stanley]

On Thu, 18 Aug 2022 at 07:33, Quan Nguyen <quan@os.amperecomputing.com> wrote:
>
> Dear Joel,
>
> Could you help review and backport this patch series to dev-5.15 branch?
>
> https://lore.kernel.org/linux-arm-kernel/20220228000242.1884-1-quan@os.amperecomputing.com/

Thanks for the reminder. That's done now.

Cheers,

Joel