From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Roese Date: Wed, 7 Oct 2020 06:57:23 +0200 Subject: [PATCH v3] arm64: dts: armada-3720-espressobin: use Linux model/compatible strings In-Reply-To: <20201002055112.8977-1-a.heider@gmail.com> References: <20200904153354.1120958-1-a.heider@gmail.com> <20201002055112.8977-1-a.heider@gmail.com> Message-ID: <3158f8e4-7ca1-23ae-36ae-61dd4966fbc0@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 02.10.20 07:51, Andre Heider wrote: > Fix the actual board vendor and ease synching dts files from Linux. > > Signed-off-by: Andre Heider Reviewed-by: Stefan Roese Thanks, Stefan > --- > v3: rebase on master > > arch/arm/dts/armada-3720-espressobin.dts | 4 ++-- > board/Marvell/mvebu_armada-37xx/board.c | 8 ++++---- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/dts/armada-3720-espressobin.dts b/arch/arm/dts/armada-3720-espressobin.dts > index 4534f5ff29..be67a45870 100644 > --- a/arch/arm/dts/armada-3720-espressobin.dts > +++ b/arch/arm/dts/armada-3720-espressobin.dts > @@ -50,8 +50,8 @@ > #include "armada-372x.dtsi" > > / { > - model = "Marvell Armada 3720 Community Board ESPRESSOBin"; > - compatible = "marvell,armada-3720-espressobin", "marvell,armada3720", "marvell,armada3710"; > + model = "Globalscale Marvell ESPRESSOBin Board"; > + compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710"; > > chosen { > stdout-path = "serial0:115200n8"; > diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c > index 2bfc7171c4..73d69e0388 100644 > --- a/board/Marvell/mvebu_armada-37xx/board.c > +++ b/board/Marvell/mvebu_armada-37xx/board.c > @@ -88,14 +88,14 @@ int board_late_init(void) > if (env_get("fdtfile")) > return 0; > > - if (!of_machine_is_compatible("marvell,armada-3720-espressobin")) > + if (!of_machine_is_compatible("globalscale,espressobin")) > return 0; > > /* If the memory controller has been configured for DDR4, we're running on v7 */ > ddr4 = ((readl(A3700_CH0_MC_CTRL2_REG) >> A3700_MC_CTRL2_SDRAM_TYPE_OFFS) > & A3700_MC_CTRL2_SDRAM_TYPE_MASK) == A3700_MC_CTRL2_SDRAM_TYPE_DDR4; > > - emmc = of_machine_is_compatible("marvell,armada-3720-espressobin-emmc"); > + emmc = of_machine_is_compatible("globalscale,espressobin-emmc"); > > if (ddr4 && emmc) > env_set("fdtfile", "marvell/armada-3720-espressobin-v7-emmc.dtb"); > @@ -248,7 +248,7 @@ static int mii_multi_chip_mode_write(struct mii_dev *bus, int dev_smi_addr, > /* Bring-up board-specific network stuff */ > int board_network_enable(struct mii_dev *bus) > { > - if (!of_machine_is_compatible("marvell,armada-3720-espressobin")) > + if (!of_machine_is_compatible("globalscale,espressobin")) > return 0; > > /* > @@ -300,7 +300,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) > int part_off; > > /* Fill SPI MTD partitions for Linux kernel on Espressobin */ > - if (!of_machine_is_compatible("marvell,armada-3720-espressobin")) > + if (!of_machine_is_compatible("globalscale,espressobin")) > return 0; > > spi_off = fdt_node_offset_by_compatible(blob, -1, "jedec,spi-nor"); > Viele Gr??e, Stefan -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de