* [PATCH 1/2] ARM64: dts: marvell: cn9310: Use appropriate label for spi1 pins
@ 2023-08-20 23:31 Chris Packham
2023-08-20 23:31 ` [PATCH 2/2] ARM64: dts: marvell: cn9310-crb: Remove duplicate pinctrl Chris Packham
2023-08-24 11:29 ` [PATCH 1/2] ARM64: dts: marvell: cn9310: Use appropriate label for spi1 pins Stefan Roese
0 siblings, 2 replies; 6+ messages in thread
From: Chris Packham @ 2023-08-20 23:31 UTC (permalink / raw)
To: u-boot; +Cc: Chris Packham, Stefan Roese, Tom Rini
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(-)
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>;
};
--
2.41.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] ARM64: dts: marvell: cn9310-crb: Remove duplicate pinctrl
2023-08-20 23:31 [PATCH 1/2] ARM64: dts: marvell: cn9310: Use appropriate label for spi1 pins Chris Packham
@ 2023-08-20 23:31 ` Chris Packham
2023-08-24 11:30 ` Stefan Roese
2023-08-24 11:29 ` [PATCH 1/2] ARM64: dts: marvell: cn9310: Use appropriate label for spi1 pins Stefan Roese
1 sibling, 1 reply; 6+ messages in thread
From: Chris Packham @ 2023-08-20 23:31 UTC (permalink / raw)
To: u-boot; +Cc: Chris Packham, Stefan Roese, Tom Rini
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(-)
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 */
--
2.41.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] ARM64: dts: marvell: cn9310: Use appropriate label for spi1 pins
2023-08-20 23:31 [PATCH 1/2] ARM64: dts: marvell: cn9310: Use appropriate label for spi1 pins Chris Packham
2023-08-20 23:31 ` [PATCH 2/2] ARM64: dts: marvell: cn9310-crb: Remove duplicate pinctrl Chris Packham
@ 2023-08-24 11:29 ` Stefan Roese
2023-10-16 14:41 ` Stefan Roese
1 sibling, 1 reply; 6+ messages in thread
From: Stefan Roese @ 2023-08-24 11:29 UTC (permalink / raw)
To: Chris Packham, u-boot; +Cc: Tom Rini
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
--
DENX Software Engineering GmbH, Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] ARM64: dts: marvell: cn9310-crb: Remove duplicate pinctrl
2023-08-20 23:31 ` [PATCH 2/2] ARM64: dts: marvell: cn9310-crb: Remove duplicate pinctrl Chris Packham
@ 2023-08-24 11:30 ` Stefan Roese
2023-10-16 14:41 ` Stefan Roese
0 siblings, 1 reply; 6+ messages in thread
From: Stefan Roese @ 2023-08-24 11:30 UTC (permalink / raw)
To: Chris Packham, u-boot; +Cc: Tom Rini
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
--
DENX Software Engineering GmbH, Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] ARM64: dts: marvell: cn9310: Use appropriate label for spi1 pins
2023-08-24 11:29 ` [PATCH 1/2] ARM64: dts: marvell: cn9310: Use appropriate label for spi1 pins Stefan Roese
@ 2023-10-16 14:41 ` Stefan Roese
0 siblings, 0 replies; 6+ messages in thread
From: Stefan Roese @ 2023-10-16 14:41 UTC (permalink / raw)
To: Chris Packham, u-boot; +Cc: Tom Rini
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
--
DENX Software Engineering GmbH, Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] ARM64: dts: marvell: cn9310-crb: Remove duplicate pinctrl
2023-08-24 11:30 ` Stefan Roese
@ 2023-10-16 14:41 ` Stefan Roese
0 siblings, 0 replies; 6+ messages in thread
From: Stefan Roese @ 2023-10-16 14:41 UTC (permalink / raw)
To: Chris Packham, u-boot; +Cc: Tom Rini
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
--
DENX Software Engineering GmbH, Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-10-16 14:41 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-20 23:31 [PATCH 1/2] ARM64: dts: marvell: cn9310: Use appropriate label for spi1 pins Chris Packham
2023-08-20 23:31 ` [PATCH 2/2] ARM64: dts: marvell: cn9310-crb: Remove duplicate pinctrl Chris Packham
2023-08-24 11:30 ` Stefan Roese
2023-10-16 14:41 ` Stefan Roese
2023-08-24 11:29 ` [PATCH 1/2] ARM64: dts: marvell: cn9310: Use appropriate label for spi1 pins Stefan Roese
2023-10-16 14:41 ` Stefan Roese
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox