From patchwork Fri Oct 2 05:50:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 1375558 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=85.214.62.61; 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=C9JRtsCP; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4C2fH64KZpz9sSG for ; Fri, 2 Oct 2020 15:50:37 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E1FB081BF9; Fri, 2 Oct 2020 07:50:29 +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="C9JRtsCP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AC05882287; Fri, 2 Oct 2020 07:50:28 +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-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) (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 9C902801D8 for ; Fri, 2 Oct 2020 07:50:24 +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-wr1-x441.google.com with SMTP id x14so346556wrl.12 for ; Thu, 01 Oct 2020 22:50:24 -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:mime-version :content-transfer-encoding; bh=L961iTf8JgRyeXpVNlDDmnau1hLST+F/2WG9SDVW8m8=; b=C9JRtsCP3hzB3L9QTuS6C24WoN+TSvEEfazkLc1HekCw/lPW7kpJj2cz+8eX54f0lS zLMBTqE8j1fsjwz7jragoSZ6cSyaztdWLm9fVrpGw17ByaOFuxMsI1/P/9ah9zbBrJbn MNItNZ15bQUPePn+vi3fVvbokfhzXCr2lUkkZRxjUY4aEPMFgU7z5m4blrlzRzhpbLRw 9A9nkmUx3wsjLlvdcF/B7cKbQqD8SAaSvqdqcQURGur1xMiifCOQuvgGmt/xjcREjqck lJWoJiRZm1/+D00as9RsVpkJxH9OK0l4k+jXVupwIA8Qf9JVeIDjJP1dsStGkMVq0ZIj CbpQ== 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:mime-version :content-transfer-encoding; bh=L961iTf8JgRyeXpVNlDDmnau1hLST+F/2WG9SDVW8m8=; b=jdOYSxfWI3+TAi0nSoHgOaO0cv1i5wiCwMc8av7Wf8OggLM1ucFCROz5ZR2j8rDj6j KTfCeXX8KVFIhGHA/31dpUWzE0DvUVu1kfALoUevd0/T7O/g6huBilD1hRVjYK+FNX/h JOAdyoAs2kO2sBqSadFsUjxl/gZ9JX3pFJOZrLanCrQs0TmCVeL4UjKd0PW2DJRY+XVg herLC3VOafSYKeSyp+foiIlEyc82t7IhJqDPRJlFx2qcqweYLCDT1+BVUPXvuy6liznY fW7ahdQbOempEwsoyFiDnIw4+L+yfaFhjw/Xt2VKphuPpGUeNbYtYu4l1SGOIi5lklhc eH+A== X-Gm-Message-State: AOAM532mYsJ96fuffHTtuO83S9aeL1sGyjlIK4zcEKVwIyhOLFgdbeaW T5AdG49jNIO5hKrD+n20RHY= X-Google-Smtp-Source: ABdhPJwAP8RhGgM8cTASQTEyY4shduWvW9unzKaJx/yqHDKtcN/CcycVo1cvLsdiG6kqQXalkFZukw== X-Received: by 2002:a5d:4910:: with SMTP id x16mr1017975wrq.204.1601617823908; Thu, 01 Oct 2020 22:50:23 -0700 (PDT) Received: from mamamia.internal (a89-183-79-60.net-htp.de. [89.183.79.60]) by smtp.gmail.com with ESMTPSA id s26sm433916wmh.44.2020.10.01.22.50.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Oct 2020 22:50:23 -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:50:21 +0200 Message-Id: <20201002055021.8905-1-a.heider@gmail.com> X-Mailer: git-send-email 2.28.0 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 --- 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");