| Message ID | 20230820233113.575818-1-judge.packham@gmail.com |
|---|---|
| State | Accepted |
| Commit | 6b8efc66eab2ac3ed2c258d6445a2cdbd3246c9d |
| Delegated to: | Stefan Roese |
| Headers | show |
| Series | [1/2] ARM64: dts: marvell: cn9310: Use appropriate label for spi1 pins | expand |
On 8/21/23 01:31, Chris Packham wrote: > The CN9130-DB uses the SPI1 interface but had the pinctrl node labelled > as "cp0_spi0_pins". Use the label "cp0_spi1_pins" and update the node > name to "cp0-spi-pins-1" to avoid confusion with the pinctrl options for > SPI0. > > Signed-off-by: Chris Packham <judge.packham@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de> Thanks, Stefan > --- > > arch/arm/dts/cn9130-db.dtsi | 2 +- > arch/arm/dts/cn9130.dtsi | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/dts/cn9130-db.dtsi b/arch/arm/dts/cn9130-db.dtsi > index 1b28732ee752..4b21ff46d507 100644 > --- a/arch/arm/dts/cn9130-db.dtsi > +++ b/arch/arm/dts/cn9130-db.dtsi > @@ -183,7 +183,7 @@ > /* U55 */ > &cp0_spi1 { > pinctrl-names = "default"; > - pinctrl-0 = <&cp0_spi0_pins>; > + pinctrl-0 = <&cp0_spi1_pins>; > reg = <0x700680 0x50>, /* control */ > <0x2000000 0x1000000>, /* CS0 */ > <0 0xffffffff>, /* CS1 */ > diff --git a/arch/arm/dts/cn9130.dtsi b/arch/arm/dts/cn9130.dtsi > index 68b767a70639..efcb2e906b91 100644 > --- a/arch/arm/dts/cn9130.dtsi > +++ b/arch/arm/dts/cn9130.dtsi > @@ -66,7 +66,7 @@ > marvell,pins = < 56 57 58 59 60 61 >; > marvell,function = <14>; > }; > - cp0_spi0_pins: cp0-spi-pins-0 { > + cp0_spi1_pins: cp0-spi-pins-1 { > marvell,pins = < 13 14 15 16 >; > marvell,function = <3>; > }; Viele Grüße, Stefan Roese
On 8/24/23 13:29, Stefan Roese wrote: > On 8/21/23 01:31, Chris Packham wrote: >> The CN9130-DB uses the SPI1 interface but had the pinctrl node labelled >> as "cp0_spi0_pins". Use the label "cp0_spi1_pins" and update the node >> name to "cp0-spi-pins-1" to avoid confusion with the pinctrl options for >> SPI0. >> >> Signed-off-by: Chris Packham <judge.packham@gmail.com> > > Reviewed-by: Stefan Roese <sr@denx.de> Applied to u-boot-marvell/master Thanks, Stefan > > Thanks, > Stefan > >> --- >> >> arch/arm/dts/cn9130-db.dtsi | 2 +- >> arch/arm/dts/cn9130.dtsi | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/arch/arm/dts/cn9130-db.dtsi b/arch/arm/dts/cn9130-db.dtsi >> index 1b28732ee752..4b21ff46d507 100644 >> --- a/arch/arm/dts/cn9130-db.dtsi >> +++ b/arch/arm/dts/cn9130-db.dtsi >> @@ -183,7 +183,7 @@ >> /* U55 */ >> &cp0_spi1 { >> pinctrl-names = "default"; >> - pinctrl-0 = <&cp0_spi0_pins>; >> + pinctrl-0 = <&cp0_spi1_pins>; >> reg = <0x700680 0x50>, /* control */ >> <0x2000000 0x1000000>, /* CS0 */ >> <0 0xffffffff>, /* CS1 */ >> diff --git a/arch/arm/dts/cn9130.dtsi b/arch/arm/dts/cn9130.dtsi >> index 68b767a70639..efcb2e906b91 100644 >> --- a/arch/arm/dts/cn9130.dtsi >> +++ b/arch/arm/dts/cn9130.dtsi >> @@ -66,7 +66,7 @@ >> marvell,pins = < 56 57 58 59 60 61 >; >> marvell,function = <14>; >> }; >> - cp0_spi0_pins: cp0-spi-pins-0 { >> + cp0_spi1_pins: cp0-spi-pins-1 { >> marvell,pins = < 13 14 15 16 >; >> marvell,function = <3>; >> }; > > Viele Grüße, > Stefan Roese > Viele Grüße, Stefan Roese
diff --git a/arch/arm/dts/cn9130-db.dtsi b/arch/arm/dts/cn9130-db.dtsi index 1b28732ee752..4b21ff46d507 100644 --- a/arch/arm/dts/cn9130-db.dtsi +++ b/arch/arm/dts/cn9130-db.dtsi @@ -183,7 +183,7 @@ /* U55 */ &cp0_spi1 { pinctrl-names = "default"; - pinctrl-0 = <&cp0_spi0_pins>; + pinctrl-0 = <&cp0_spi1_pins>; reg = <0x700680 0x50>, /* control */ <0x2000000 0x1000000>, /* CS0 */ <0 0xffffffff>, /* CS1 */ diff --git a/arch/arm/dts/cn9130.dtsi b/arch/arm/dts/cn9130.dtsi index 68b767a70639..efcb2e906b91 100644 --- a/arch/arm/dts/cn9130.dtsi +++ b/arch/arm/dts/cn9130.dtsi @@ -66,7 +66,7 @@ marvell,pins = < 56 57 58 59 60 61 >; marvell,function = <14>; }; - cp0_spi0_pins: cp0-spi-pins-0 { + cp0_spi1_pins: cp0-spi-pins-1 { marvell,pins = < 13 14 15 16 >; marvell,function = <3>; };
The CN9130-DB uses the SPI1 interface but had the pinctrl node labelled as "cp0_spi0_pins". Use the label "cp0_spi1_pins" and update the node name to "cp0-spi-pins-1" to avoid confusion with the pinctrl options for SPI0. Signed-off-by: Chris Packham <judge.packham@gmail.com> --- arch/arm/dts/cn9130-db.dtsi | 2 +- arch/arm/dts/cn9130.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)