Re: [PATCHv8 7/7] arm64: dts: rockchip: Add rock-5b board

[Heiko Stübner]

Am Dienstag, 10. Januar 2023, 15:50:17 CET schrieb Christopher Obbard:
> On Tue, 2023-01-10 at 19:30 +0530, Jagan Teki wrote:
> > On Mon, 9 Jan 2023 at 21:28, Sebastian Reichel
> > <sebastian.reichel@xxxxxxxxxxxxx> wrote:
> > > 
> > > From: Christopher Obbard <chris.obbard@xxxxxxxxxxxxx>
> > > 
> > > Add board file for the RK3588 Rock 5B board. This is a basic
> > > implementation which just brings up the eMMC and UART which is
> > > enough to successfully boot Linux.
> > > 
> > > The ethernet controller is connected via PCIe so support will
> > > come in a follow-up patch.
> > > 
> > > Signed-off-by: Christopher Obbard <chris.obbard@xxxxxxxxxxxxx>
> > > Reviewed-by: Michael Riesch <michael.riesch@xxxxxxxxxxxxxx>
> > > Signed-off-by: Sebastian Reichel <sebastian.reichel@xxxxxxxxxxxxx>
> > > ---
> > >  arch/arm64/boot/dts/rockchip/Makefile         |  1 +
> > >  .../boot/dts/rockchip/rk3588-rock-5b.dts      | 44
> > > +++++++++++++++++++
> > >  2 files changed, 45 insertions(+)
> > >  create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
> > > 
> > > diff --git a/arch/arm64/boot/dts/rockchip/Makefile
> > > b/arch/arm64/boot/dts/rockchip/Makefile
> > > index 87a853435142..c5bdd0176ce0 100644
> > > --- a/arch/arm64/boot/dts/rockchip/Makefile
> > > +++ b/arch/arm64/boot/dts/rockchip/Makefile
> > > @@ -83,4 +83,5 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-
> > > v10.dtb
> > >  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-odroid-m1.dtb
> > >  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-rock-3a.dtb
> > >  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-evb1-v10.dtb
> > > +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b.dtb
> > >  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-rock-5a.dtb
> > > diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
> > > b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
> > > new file mode 100644
> > > index 000000000000..d2f1e963ce06
> > > --- /dev/null
> > > +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
> > > @@ -0,0 +1,44 @@
> > > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> > > +
> > > +/dts-v1/;
> > > +
> > > +#include "rk3588.dtsi"
> > > +
> > > +/ {
> > > +       model = "Radxa ROCK 5 Model B";
> > > +       compatible = "radxa,rock-5b", "rockchip,rk3588";
> > > +
> > > +       aliases {
> > > +               mmc1 = &sdhci;
> > 
> > I think sdhci - emmc has to be mmc0 due to boot priority.
> 
> Hi Jagan,
> 
> We kept eMMC as mmc1 for both ROCK 5 Model A and B to keep
> compatibility with vendor kernel:
> https://github.com/radxa/kernel/blob/stable-5.10-rock5/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts#L31
> 
> But I am happy to change the alias to mmc0, @Sebastian what do you
> think?

In any case, if you decide to swap things around, please just send a follow
up patch, as I just applied this series :-)


Heiko