From patchwork Fri Oct 2 05:51:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 1375560 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=pInsZSM9; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C2fJ2432Jz9sSG for ; Fri, 2 Oct 2020 15:51:30 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 589B281BF9; Fri, 2 Oct 2020 07:51:19 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="pInsZSM9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AE1AF82313; Fri, 2 Oct 2020 07:51:17 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id F3808801D8 for ; Fri, 2 Oct 2020 07:51:14 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=a.heider@gmail.com Received: by mail-wm1-x343.google.com with SMTP id k18so359694wmj.5 for ; Thu, 01 Oct 2020 22:51:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=L961iTf8JgRyeXpVNlDDmnau1hLST+F/2WG9SDVW8m8=; b=pInsZSM9/Y9EcxsWVakyvSlk5NmckdLxJUYZ82zh7ayYi7FHYz4qcSUwnHJh2ksQZL rP63PUB3EDk9Xrz3/j1cuRKyYN2Er/1dQMexBxPYDS6aSbedF/PQDiO5U26WShKHy/mG 4PLY6892tQgZrRw2n4vel0l8jXadF1RMVjLiaMc9/4zbpx2yy0K5DSNekJk7ib1iL2dJ WxGRDVgCr9/me3xZ91eGmWcwCbefEE8TLz3t0cDoc7SOEnspzpmcaZBEH2SwHlxUURNs VvXjS7BBaaugyuvDjsYaraJR9G5yFeYkD60Uac+BkDXZEM6VbYPU/kUXFR39EJcyFF8/ /dZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=L961iTf8JgRyeXpVNlDDmnau1hLST+F/2WG9SDVW8m8=; b=kJZZLh+ehIB25JghVjwOIjQ1Cz/QmKIOJhOqg7c69QD/JXDP66M2jTaxTSiHUmNHlj 3GR2y9b/vbJJ8Mn712Svs3aD/2zCSngLU8XhaP//B+pbEn1i6CnKlQDExUjYdOc0PnpI TdTA78lR8TNJ6d80Xd6lCZUTqz11UTY3jhlnkjVWrG/1xmO8dgl+iIUOycbFPpCmcYvH UXdb6jhH09uPW0W7FY+NS20eJI+ALW/YytiqP4uthm4PpeIJzYXKudK5tLjnMs2mdpH+ 9tcQrvovvpsBmg74uKKSOBt6s2j+OjrtYxtyXnxtDtylO9ImotNzEnKV96bRpGlj/fd6 SROg== X-Gm-Message-State: AOAM53267OEhbdic5gw0OEpZKc0MVPRwFQ7oCoBEXpQmxZLjQdlPf+OE jxApmm5/Hk8HQ9bFJX4F96Y= X-Google-Smtp-Source: ABdhPJydllVX4oKWzMZI33uAxWEIk5tpXHCXVskNdccVpR0snNjDi61tXmU1f8Ohoy3G97tkkwSwgg== X-Received: by 2002:a1c:48c3:: with SMTP id v186mr911144wma.16.1601617874533; Thu, 01 Oct 2020 22:51:14 -0700 (PDT) Received: from mamamia.internal (a89-183-79-60.net-htp.de. [89.183.79.60]) by smtp.gmail.com with ESMTPSA id f12sm438325wmf.26.2020.10.01.22.51.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Oct 2020 22:51:13 -0700 (PDT) From: Andre Heider To: Stefan Roese , Konstantin Porotchkin Cc: =?utf-8?q?Pali_Roh=C3=A1r?= , u-boot@lists.denx.de Subject: [PATCH v3] arm64: dts: armada-3720-espressobin: use Linux model/compatible strings Date: Fri, 2 Oct 2020 07:51:12 +0200 Message-Id: <20201002055112.8977-1-a.heider@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200904153354.1120958-1-a.heider@gmail.com> References: <20200904153354.1120958-1-a.heider@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean Fix the actual board vendor and ease synching dts files from Linux. Signed-off-by: Andre Heider Reviewed-by: Pali Rohár Reviewed-by: Stefan Roese --- 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");