The included armada-372x.dtsi already defines these two aliases.
Signed-off-by: Andre Heider <[email protected]>
---
This goes on top of Pali's patch:
"arm64: dts: marvell: espressobin: Add ethernet switch aliases"
The resulting .dtb files are the same.
arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
index 0775c16e0ec8..3169a820558f 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
@@ -17,8 +17,6 @@ aliases {
ethernet1 = &switch0port1;
ethernet2 = &switch0port2;
ethernet3 = &switch0port3;
- serial0 = &uart0;
- serial1 = &uart1;
};
chosen {
--
2.28.0
On Monday 21 September 2020 18:48:30 Andre Heider wrote:
> The included armada-372x.dtsi already defines these two aliases.
Where? I do not see it in that file:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts/marvell/armada-372x.dtsi
>
> Signed-off-by: Andre Heider <[email protected]>
> ---
>
> This goes on top of Pali's patch:
> "arm64: dts: marvell: espressobin: Add ethernet switch aliases"
>
> The resulting .dtb files are the same.
>
> arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
> index 0775c16e0ec8..3169a820558f 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
> @@ -17,8 +17,6 @@ aliases {
> ethernet1 = &switch0port1;
> ethernet2 = &switch0port2;
> ethernet3 = &switch0port3;
> - serial0 = &uart0;
> - serial1 = &uart1;
> };
>
> chosen {
> --
> 2.28.0
>
On 21/09/2020 18:53, Pali Rohár wrote:
> On Monday 21 September 2020 18:48:30 Andre Heider wrote:
>> The included armada-372x.dtsi already defines these two aliases.
>
> Where? I do not see it in that file:
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts/marvell/armada-372x.dtsi
Oh sorry, it's in armada-37xx.dtsi:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts/marvell/armada-37xx.dtsi#n20
>
>>
>> Signed-off-by: Andre Heider <[email protected]>
>> ---
>>
>> This goes on top of Pali's patch:
>> "arm64: dts: marvell: espressobin: Add ethernet switch aliases"
>>
>> The resulting .dtb files are the same.
>>
>> arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi | 2 --
>> 1 file changed, 2 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
>> index 0775c16e0ec8..3169a820558f 100644
>> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
>> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
>> @@ -17,8 +17,6 @@ aliases {
>> ethernet1 = &switch0port1;
>> ethernet2 = &switch0port2;
>> ethernet3 = &switch0port3;
>> - serial0 = &uart0;
>> - serial1 = &uart1;
>> };
>>
>> chosen {
>> --
>> 2.28.0
>>
On Monday 21 September 2020 18:57:46 Andre Heider wrote:
> On 21/09/2020 18:53, Pali Rohár wrote:
> > On Monday 21 September 2020 18:48:30 Andre Heider wrote:
> > > The included armada-372x.dtsi already defines these two aliases.
> >
> > Where? I do not see it in that file:
> > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts/marvell/armada-372x.dtsi
>
> Oh sorry, it's in armada-37xx.dtsi:
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts/marvell/armada-37xx.dtsi#n20
Ok, with fixing file in commit message you can add my:
Reviewed-by: Pali Rohár <[email protected]>
> >
> > >
> > > Signed-off-by: Andre Heider <[email protected]>
> > > ---
> > >
> > > This goes on top of Pali's patch:
> > > "arm64: dts: marvell: espressobin: Add ethernet switch aliases"
> > >
> > > The resulting .dtb files are the same.
> > >
> > > arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi | 2 --
> > > 1 file changed, 2 deletions(-)
> > >
> > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
> > > index 0775c16e0ec8..3169a820558f 100644
> > > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
> > > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
> > > @@ -17,8 +17,6 @@ aliases {
> > > ethernet1 = &switch0port1;
> > > ethernet2 = &switch0port2;
> > > ethernet3 = &switch0port3;
> > > - serial0 = &uart0;
> > > - serial1 = &uart1;
> > > };
> > > chosen {
> > > --
> > > 2.28.0
> > >
>
The included armada-37xx.dtsi already defines these two aliases.
Signed-off-by: Andre Heider <[email protected]>
Reviewed-by: Pali Rohár <[email protected]>
---
v3: really fix filename, sorry for the spam... too early, not enough coffee
v2: fix filename in commit message
This goes on top of Pali's patch:
"arm64: dts: marvell: espressobin: Add ethernet switch aliases"
The resulting .dtb files are the same.
arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
index 0775c16e0ec8..3169a820558f 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
@@ -17,8 +17,6 @@ aliases {
ethernet1 = &switch0port1;
ethernet2 = &switch0port2;
ethernet3 = &switch0port3;
- serial0 = &uart0;
- serial1 = &uart1;
};
chosen {
--
2.28.0
The included armada-3xxx.dtsi already defines these two aliases.
Signed-off-by: Andre Heider <[email protected]>
Reviewed-by: Pali Rohár <[email protected]>
---
v2: fix filename in commit message
This goes on top of Pali's patch:
"arm64: dts: marvell: espressobin: Add ethernet switch aliases"
The resulting .dtb files are the same.
arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
index 0775c16e0ec8..3169a820558f 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
@@ -17,8 +17,6 @@ aliases {
ethernet1 = &switch0port1;
ethernet2 = &switch0port2;
ethernet3 = &switch0port3;
- serial0 = &uart0;
- serial1 = &uart1;
};
chosen {
--
2.28.0
Hi Andre,
> The included armada-372x.dtsi already defines these two aliases.
>
> Signed-off-by: Andre Heider <[email protected]>
Applied on mvebu/dt
Thanks,
Gregory
> ---
>
> This goes on top of Pali's patch:
> "arm64: dts: marvell: espressobin: Add ethernet switch aliases"
>
> The resulting .dtb files are the same.
>
> arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
> index 0775c16e0ec8..3169a820558f 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
> @@ -17,8 +17,6 @@ aliases {
> ethernet1 = &switch0port1;
> ethernet2 = &switch0port2;
> ethernet3 = &switch0port3;
> - serial0 = &uart0;
> - serial1 = &uart1;
> };
>
> chosen {
> --
> 2.28.0
>
--
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com