| Message ID | 20201225015149.1416773-1-liuxiwei@inspur.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] ARM: dts: aspeed: inspur-fp5280g2: Add GPIO line names | expand |
Hi George, On Fri, 25 Dec 2020 at 01:51, George Liu <liuxiwei1013@gmail.com> wrote: > > power-supply is compatible with Inspur's ipsps1 driver > > Signed-off-by: George Liu <liuxiwei@inspur.com> I've merged both of these patches to dev-5.8. Please ensure you submit them on the mainline mailing lists, to the addresses provided by scripts/get_maintainer.pl. Your two patches were not threaded as replies, so please ensure you use git-send-email to send them together when submitting for mainline. Cheers, Joel > --- > arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts b/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts > index efe521538d70..07593897fc9a 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts > @@ -789,12 +789,12 @@ &i2c11 { > status = "okay"; > > power-supply@58 { > - compatible = "pmbus"; > + compatible = "inspur,ipsps1"; > reg = <0x58>; > }; > > power-supply@59 { > - compatible = "pmbus"; > + compatible = "inspur,ipsps1"; > reg = <0x59>; > }; > }; > -- > 2.25.1 >
diff --git a/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts b/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts index efe521538d70..07593897fc9a 100644 --- a/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts +++ b/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts @@ -789,12 +789,12 @@ &i2c11 { status = "okay"; power-supply@58 { - compatible = "pmbus"; + compatible = "inspur,ipsps1"; reg = <0x58>; }; power-supply@59 { - compatible = "pmbus"; + compatible = "inspur,ipsps1"; reg = <0x59>; }; };
power-supply is compatible with Inspur's ipsps1 driver Signed-off-by: George Liu <liuxiwei@inspur.com> --- arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)