From patchwork Tue Feb 16 13:36:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergio Paracuellos X-Patchwork-Id: 12090015 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19C4AC433E0 for ; Tue, 16 Feb 2021 13:38:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C596E64DF5 for ; Tue, 16 Feb 2021 13:38:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230110AbhBPNhy (ORCPT ); Tue, 16 Feb 2021 08:37:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230077AbhBPNhm (ORCPT ); Tue, 16 Feb 2021 08:37:42 -0500 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B08E6C061788; Tue, 16 Feb 2021 05:36:25 -0800 (PST) Received: by mail-wr1-x430.google.com with SMTP id g6so13000072wrs.11; Tue, 16 Feb 2021 05:36:25 -0800 (PST) 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=LHPolF/4+qgvhOCrefG8j8poOWD/AjdPdfrmSOA9PFI=; b=aHVeYw7yyr78IzdC7pBIdrqBu0/Fi7fJ3b3ih+Dxco0sM2QxQ4sPvZ/ETqx1I6xVSO 4u9HiwJPeoo7UKg6c9DBAGaBPXAdwdf727rxSZgaWSWlPcx8fGUCP5boAOauWMs4y723 s1zDMMB9ZQmVxzVcIYmosS7GLSPc9sSB/LRZOWbz9lu+qANgRoiMCf7rEjhCyhE9dq9l dF7bakVlNqYKig51VCN3DI4N7G+kWqkTXsEBhW/ecXZP7olW6NjgXbuyNhtLJVVQJS2N UhDXnJOo8Y9Gsxl1wopGnnFMvFbGYmhNWPKhky9hdGOa98Q3uoKFHKupcj4Pa4IDH5jR r81A== 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=LHPolF/4+qgvhOCrefG8j8poOWD/AjdPdfrmSOA9PFI=; b=rSlhhelB2y6U6TgM5js4ikyW+zpArx5zvP9yII/TmKGq+LmDCvogMv4yitnLNbThji Y6LKsTBaYgM3aIetcB3Uygh3+lrz0DJ+a6CrTk+HezjfMODPJNxw7VvEb/gEPrpUWEOC HJQ4w87gigPGyc46jUT5CcCoCJxiluc3REVbZsnV47htI6W1jQ7dtSlo+9aQRYlwAciF wbbsunjoNK9nZvvbNeu5O7OXodeIh1PsOaMNhO2XFODvRP9Svv0Aq1hVDmKZcKzZO4pe 4wLuEt700khkuGIHucN/X2JQqeM7UaZNvfk8TsjRB4kT202s9vXZep0QpZERQTojWwOF vXFg== X-Gm-Message-State: AOAM531/GSrPyuCAIyI4R6Y5ONdcHpIJSL5n8O+LRq1jSEljT0Spi6Ef JVP5kabTfmbng04J4iZ0oHs= X-Google-Smtp-Source: ABdhPJzrxT5uY2EpvBZgJXOC7D/qVbf1DJp8Dy+nt/4sN3Kl33MogjBD4OSJ6d5jW0cwMWfOmnuSdg== X-Received: by 2002:adf:fa91:: with SMTP id h17mr23827068wrr.257.1613482584500; Tue, 16 Feb 2021 05:36:24 -0800 (PST) Received: from localhost.localdomain (67.red-83-54-30.dynamicip.rima-tde.net. [83.54.30.67]) by smtp.gmail.com with ESMTPSA id l7sm28032530wrn.11.2021.02.16.05.36.23 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Feb 2021 05:36:24 -0800 (PST) From: Sergio Paracuellos To: sboyd@kernel.org Cc: robh+dt@kernel.org, john@phrozen.org, tsbogend@alpha.franken.de, gregkh@linuxfoundation.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-mips@vger.kernel.org, devel@driverdev.osuosl.org, neil@brown.name, linux-kernel@vger.kernel.org Subject: [PATCH v6 5/6] staging: mt7621-dts: use valid vendor 'mediatek' instead of invalid 'mtk' Date: Tue, 16 Feb 2021 14:36:16 +0100 Message-Id: <20210216133617.22333-6-sergio.paracuellos@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210216133617.22333-1-sergio.paracuellos@gmail.com> References: <20210216133617.22333-1-sergio.paracuellos@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Vendor listed for mediatek in kernel vendor file 'vendor-prefixes.yaml' contains 'mediatek' as a valid vendor string. Some nodes in the device tree are using an invalid vendor string vfor 'mtk' instead. Fix all of them in dts file. Update also ralink mt7621 related code to properly match new strings. Even there are used in the device tree there are some strings that are not referred anywhere but have been also updated with new vendor name. These are 'mtk,mt7621-wdt', 'mtk,mt7621-nand', 'mtk,mt7621-mc', and 'mtk,mt7621-cpc'. Acked-by: Greg Kroah-Hartman Signed-off-by: Sergio Paracuellos --- arch/mips/ralink/mt7621.c | 6 +++--- drivers/staging/mt7621-dts/mt7621.dtsi | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/mips/ralink/mt7621.c b/arch/mips/ralink/mt7621.c index ca0ac607b0f3..5d74fc1c96ac 100644 --- a/arch/mips/ralink/mt7621.c +++ b/arch/mips/ralink/mt7621.c @@ -112,8 +112,8 @@ phys_addr_t mips_cpc_default_phys_base(void) void __init ralink_of_remap(void) { - rt_sysc_membase = plat_of_remap_node("mtk,mt7621-sysc"); - rt_memc_membase = plat_of_remap_node("mtk,mt7621-memc"); + rt_sysc_membase = plat_of_remap_node("mediatek,mt7621-sysc"); + rt_memc_membase = plat_of_remap_node("mediatek,mt7621-memc"); if (!rt_sysc_membase || !rt_memc_membase) panic("Failed to remap core resources"); @@ -181,7 +181,7 @@ void prom_soc_init(struct ralink_soc_info *soc_info) if (n0 == MT7621_CHIP_NAME0 && n1 == MT7621_CHIP_NAME1) { name = "MT7621"; - soc_info->compatible = "mtk,mt7621-soc"; + soc_info->compatible = "mediatek,mt7621-soc"; } else { panic("mt7621: unknown SoC, n0:%08x n1:%08x\n", n0, n1); } diff --git a/drivers/staging/mt7621-dts/mt7621.dtsi b/drivers/staging/mt7621-dts/mt7621.dtsi index 11d1670d4339..55784dd48dc5 100644 --- a/drivers/staging/mt7621-dts/mt7621.dtsi +++ b/drivers/staging/mt7621-dts/mt7621.dtsi @@ -56,7 +56,7 @@ palmbus: palmbus@1E000000 { #size-cells = <1>; sysc: sysc@0 { - compatible = "mtk,mt7621-sysc", "syscon"; + compatible = "mediatek,mt7621-sysc", "syscon"; reg = <0x0 0x100>; }; @@ -71,7 +71,7 @@ pll: pll { }; wdt: wdt@100 { - compatible = "mtk,mt7621-wdt"; + compatible = "mediatek,mt7621-wdt"; reg = <0x100 0x100>; }; @@ -128,17 +128,17 @@ i2s: i2s@a00 { }; memc: memc@5000 { - compatible = "mtk,mt7621-memc", "syscon"; + compatible = "mediatek,mt7621-memc", "syscon"; reg = <0x5000 0x1000>; }; cpc: cpc@1fbf0000 { - compatible = "mtk,mt7621-cpc"; + compatible = "mediatek,mt7621-cpc"; reg = <0x1fbf0000 0x8000>; }; mc: mc@1fbf8000 { - compatible = "mtk,mt7621-mc"; + compatible = "mediatek,mt7621-mc"; reg = <0x1fbf8000 0x8000>; }; @@ -366,7 +366,7 @@ timer { nand: nand@1e003000 { status = "disabled"; - compatible = "mtk,mt7621-nand"; + compatible = "mediatek,mt7621-nand"; bank-width = <2>; reg = <0x1e003000 0x800 0x1e003800 0x800>;