| Message ID | 20230820233113.575818-2-judge.packham@gmail.com |
|---|---|
| State | Accepted |
| Commit | 4df539c0c59a76b14c0541a4a42687de35641bbb |
| 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.dtsi defines a pinctrl node for SPI1 (until recently it was > mislabeled as spi0). Use this instead of having a duplicate definition > with a different label. > > Signed-off-by: Chris Packham <judge.packham@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de> Thanks, Stefan > --- > > arch/arm/dts/cn9130-crb.dtsi | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > > diff --git a/arch/arm/dts/cn9130-crb.dtsi b/arch/arm/dts/cn9130-crb.dtsi > index b229725184a9..7dd36cae282b 100644 > --- a/arch/arm/dts/cn9130-crb.dtsi > +++ b/arch/arm/dts/cn9130-crb.dtsi > @@ -125,11 +125,6 @@ > marvell,function = <0>; > }; > > - cp0_spi1_pins_crb: cp0-spi-pins-crb { > - marvell,pins = < 13 14 15 16 >; > - marvell,function = <3>; > - }; > - > cp0_smi_pins_crb: cp0-smi-pins-crb { > marvell,pins = < 40 41 >; > marvell,function = <8>; > @@ -170,7 +165,7 @@ > > &cp0_spi1 { > pinctrl-names = "default"; > - pinctrl-0 = <&cp0_spi1_pins_crb>; > + pinctrl-0 = <&cp0_spi1_pins>; > reg = <0x700680 0x50>, /* control */ > <0x2000000 0x1000000>, /* CS0 */ > <0 0xffffffff>, /* CS1 */ Viele Grüße, Stefan Roese
On 8/24/23 13:30, Stefan Roese wrote: > On 8/21/23 01:31, Chris Packham wrote: >> The cn9130.dtsi defines a pinctrl node for SPI1 (until recently it was >> mislabeled as spi0). Use this instead of having a duplicate definition >> with a different label. >> >> 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-crb.dtsi | 7 +------ >> 1 file changed, 1 insertion(+), 6 deletions(-) >> >> diff --git a/arch/arm/dts/cn9130-crb.dtsi b/arch/arm/dts/cn9130-crb.dtsi >> index b229725184a9..7dd36cae282b 100644 >> --- a/arch/arm/dts/cn9130-crb.dtsi >> +++ b/arch/arm/dts/cn9130-crb.dtsi >> @@ -125,11 +125,6 @@ >> marvell,function = <0>; >> }; >> - cp0_spi1_pins_crb: cp0-spi-pins-crb { >> - marvell,pins = < 13 14 15 16 >; >> - marvell,function = <3>; >> - }; >> - >> cp0_smi_pins_crb: cp0-smi-pins-crb { >> marvell,pins = < 40 41 >; >> marvell,function = <8>; >> @@ -170,7 +165,7 @@ >> &cp0_spi1 { >> pinctrl-names = "default"; >> - pinctrl-0 = <&cp0_spi1_pins_crb>; >> + pinctrl-0 = <&cp0_spi1_pins>; >> reg = <0x700680 0x50>, /* control */ >> <0x2000000 0x1000000>, /* CS0 */ >> <0 0xffffffff>, /* CS1 */ > > Viele Grüße, > Stefan Roese > Viele Grüße, Stefan Roese
diff --git a/arch/arm/dts/cn9130-crb.dtsi b/arch/arm/dts/cn9130-crb.dtsi index b229725184a9..7dd36cae282b 100644 --- a/arch/arm/dts/cn9130-crb.dtsi +++ b/arch/arm/dts/cn9130-crb.dtsi @@ -125,11 +125,6 @@ marvell,function = <0>; }; - cp0_spi1_pins_crb: cp0-spi-pins-crb { - marvell,pins = < 13 14 15 16 >; - marvell,function = <3>; - }; - cp0_smi_pins_crb: cp0-smi-pins-crb { marvell,pins = < 40 41 >; marvell,function = <8>; @@ -170,7 +165,7 @@ &cp0_spi1 { pinctrl-names = "default"; - pinctrl-0 = <&cp0_spi1_pins_crb>; + pinctrl-0 = <&cp0_spi1_pins>; reg = <0x700680 0x50>, /* control */ <0x2000000 0x1000000>, /* CS0 */ <0 0xffffffff>, /* CS1 */
The cn9130.dtsi defines a pinctrl node for SPI1 (until recently it was mislabeled as spi0). Use this instead of having a duplicate definition with a different label. Signed-off-by: Chris Packham <judge.packham@gmail.com> --- arch/arm/dts/cn9130-crb.dtsi | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)