From mboxrd@z Thu Jan 1 00:00:00 1970 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, 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 AC4B6C433DB for ; Sat, 16 Jan 2021 09:17:36 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6E84D23A56 for ; Sat, 16 Jan 2021 09:17:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6E84D23A56 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=O4Ga+yGbxSfCdA6dkIAGFj0Ov7rIn+P6diz1Pz9JSys=; b=bjYJ7l+STu1LMAldsDN7EpsX5 0HsJtqpRuHghh2Fyo7nkaUG/az9GpT2R5rbDPWH8Y38GHQnFpxiSuY/0AeWTWt+2UQN4gGvn4jQv7 HGvt266Gz1Ri/dfTwVlYo3Uregnjh3tpREb1nNNsxg/3vgsyjdSeSt1yZ4ibLHZMp1TWRRrJhoIyO GkT+jqG4cl1O5jAvUEMmsa74mq7euQyUqtlXl8OidV6j1fS7IlfGc5fXVp0dyb/slG1Abh5eN9LR8 Mo4VvYCcfcFWyKkREScsX6/a+CHg4VSda4Omcu0X8MrwVSPMSbWjqQHbwFZtVsnIDbNCz5krxV+NY NhIUoce0w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l0hi3-0001T5-7g; Sat, 16 Jan 2021 09:17:27 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l0hhq-0001MQ-GD; Sat, 16 Jan 2021 09:17:15 +0000 X-UUID: 99008e2ba91b4ecfb1f9f60e39758672-20210116 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=uDNLP7ADdXCMr8hSuR/u2EkeXQr9wsPK4ssl9r4Wats=; b=grnf3pmDf+M+UJwpg/uACdt/zogSmk5VnoOwWvVlNPDOJmMvl4xp+/hUKM851oH3utmrQsSSSrXbOiXrFGEGLO9HXluujpYfVqZgu85OSSR177ymr0Zv21aDNykUYm2ZZOWDIAOmwyVk1h6ZzM80hxZFaizhNDwJFUyRtbeGoKQ=; X-UUID: 99008e2ba91b4ecfb1f9f60e39758672-20210116 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 382818346; Sat, 16 Jan 2021 01:17:05 -0800 Received: from MTKMBS31N2.mediatek.inc (172.27.4.87) by MTKMBS62N2.mediatek.inc (172.29.193.42) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sat, 16 Jan 2021 01:07:07 -0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by MTKMBS31N2.mediatek.inc (172.27.4.87) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sat, 16 Jan 2021 17:07:04 +0800 Received: from mtkslt301.mediatek.inc (10.21.14.114) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Sat, 16 Jan 2021 17:07:04 +0800 From: Chunfeng Yun To: Vinod Koul , Rob Herring , "Greg Kroah-Hartman" , Matthias Brugger Subject: [PATCH next 14/15] arm: dts: mt7623: harmonize node names and compatibles Date: Sat, 16 Jan 2021 17:06:55 +0800 Message-ID: <20210116090656.11752-14-chunfeng.yun@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20210116090656.11752-1-chunfeng.yun@mediatek.com> References: <20210116090656.11752-1-chunfeng.yun@mediatek.com> MIME-Version: 1.0 X-TM-SNTS-SMTP: 54C35A6C593BFAA8C54FCFEAE478818AD46520745EBBB51584EBB75785034DB32000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210116_041714_728558_55625213 X-CRM114-Status: GOOD ( 10.27 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Chun-Kuang Hu , Philipp Zabel , devicetree@vger.kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Kishon Vijay Abraham I , linux-mediatek@lists.infradead.org, Min Guo , Chunfeng Yun , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org This is used to fix dtbs_check warning Signed-off-by: Chunfeng Yun --- arch/arm/boot/dts/mt7623.dtsi | 26 ++++++++++++++------------ arch/arm/boot/dts/mt7623n.dtsi | 4 ++-- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/arch/arm/boot/dts/mt7623.dtsi b/arch/arm/boot/dts/mt7623.dtsi index aea6809500d7..3c11f7cfcc40 100644 --- a/arch/arm/boot/dts/mt7623.dtsi +++ b/arch/arm/boot/dts/mt7623.dtsi @@ -787,8 +787,9 @@ }; }; - pcie0_phy: pcie-phy@1a149000 { - compatible = "mediatek,generic-tphy-v1"; + pcie0_phy: t-phy@1a149000 { + compatible = "mediatek,mt7623-tphy", + "mediatek,generic-tphy-v1"; reg = <0 0x1a149000 0 0x0700>; #address-cells = <2>; #size-cells = <2>; @@ -804,8 +805,9 @@ }; }; - pcie1_phy: pcie-phy@1a14a000 { - compatible = "mediatek,generic-tphy-v1"; + pcie1_phy: t-phy@1a14a000 { + compatible = "mediatek,mt7623-tphy", + "mediatek,generic-tphy-v1"; reg = <0 0x1a14a000 0 0x0700>; #address-cells = <2>; #size-cells = <2>; @@ -823,7 +825,7 @@ usb1: usb@1a1c0000 { compatible = "mediatek,mt7623-xhci", - "mediatek,mt8173-xhci"; + "mediatek,mtk-xhci"; reg = <0 0x1a1c0000 0 0x1000>, <0 0x1a1c4700 0 0x0100>; reg-names = "mac", "ippc"; @@ -836,9 +838,9 @@ status = "disabled"; }; - u3phy1: usb-phy@1a1c4000 { - compatible = "mediatek,mt7623-u3phy", - "mediatek,mt2701-u3phy"; + u3phy1: t-phy@1a1c4000 { + compatible = "mediatek,mt7623-tphy", + "mediatek,generic-tphy-v1"; reg = <0 0x1a1c4000 0 0x0700>; #address-cells = <2>; #size-cells = <2>; @@ -864,7 +866,7 @@ usb2: usb@1a240000 { compatible = "mediatek,mt7623-xhci", - "mediatek,mt8173-xhci"; + "mediatek,mtk-xhci"; reg = <0 0x1a240000 0 0x1000>, <0 0x1a244700 0 0x0100>; reg-names = "mac", "ippc"; @@ -877,9 +879,9 @@ status = "disabled"; }; - u3phy2: usb-phy@1a244000 { - compatible = "mediatek,mt7623-u3phy", - "mediatek,mt2701-u3phy"; + u3phy2: t-phy@1a244000 { + compatible = "mediatek,mt7623-tphy", + "mediatek,generic-tphy-v1"; reg = <0 0x1a244000 0 0x0700>; #address-cells = <2>; #size-cells = <2>; diff --git a/arch/arm/boot/dts/mt7623n.dtsi b/arch/arm/boot/dts/mt7623n.dtsi index 1880ac9e32cf..bcb0846e29fd 100644 --- a/arch/arm/boot/dts/mt7623n.dtsi +++ b/arch/arm/boot/dts/mt7623n.dtsi @@ -246,7 +246,7 @@ status = "disabled"; }; - mipi_tx0: mipi-dphy@10010000 { + mipi_tx0: dsi-phy@10010000 { compatible = "mediatek,mt7623-mipi-tx", "mediatek,mt2701-mipi-tx"; reg = <0 0x10010000 0 0x90>; @@ -265,7 +265,7 @@ status = "disabled"; }; - hdmi_phy: phy@10209100 { + hdmi_phy: hdmi-phy@10209100 { compatible = "mediatek,mt7623-hdmi-phy", "mediatek,mt2701-hdmi-phy"; reg = <0 0x10209100 0 0x24>; -- 2.18.0 _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek From mboxrd@z Thu Jan 1 00:00:00 1970 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=-17.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MIME_BASE64_TEXT,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,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 B53ECC433E9 for ; Sat, 16 Jan 2021 09:08:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7B0D723A75 for ; Sat, 16 Jan 2021 09:08:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726894AbhAPJH5 (ORCPT ); Sat, 16 Jan 2021 04:07:57 -0500 Received: from Mailgw01.mediatek.com ([1.203.163.78]:6112 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726595AbhAPJHx (ORCPT ); Sat, 16 Jan 2021 04:07:53 -0500 X-UUID: 547eb8ad9f114c21ac9dbc17e4146e30-20210116 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=uDNLP7ADdXCMr8hSuR/u2EkeXQr9wsPK4ssl9r4Wats=; b=FO+fXLlqwKtHWU4TNdteO+/qkcuU/XBgIyyQeyzhHZm1Dgye2ys2SJEee5oZXdxkrCmnitAyqsAcFvGd36AsQxuZLvEp3ekwG3mbNFH6C+WmrH1N/Iyx5LIhLI0xp6O8C1yfijadfEVXl8MH/ntQlY2fFQAUykXbsPvuP62sYk0=; X-UUID: 547eb8ad9f114c21ac9dbc17e4146e30-20210116 Received: from mtkcas32.mediatek.inc [(172.27.4.253)] by mailgw01.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 264209683; Sat, 16 Jan 2021 17:07:05 +0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by MTKMBS31N2.mediatek.inc (172.27.4.87) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sat, 16 Jan 2021 17:07:04 +0800 Received: from mtkslt301.mediatek.inc (10.21.14.114) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Sat, 16 Jan 2021 17:07:04 +0800 From: Chunfeng Yun To: Vinod Koul , Rob Herring , Greg Kroah-Hartman , Matthias Brugger CC: Chunfeng Yun , Kishon Vijay Abraham I , Chun-Kuang Hu , Philipp Zabel , Min Guo , , , , , Subject: [PATCH next 14/15] arm: dts: mt7623: harmonize node names and compatibles Date: Sat, 16 Jan 2021 17:06:55 +0800 Message-ID: <20210116090656.11752-14-chunfeng.yun@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20210116090656.11752-1-chunfeng.yun@mediatek.com> References: <20210116090656.11752-1-chunfeng.yun@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-TM-SNTS-SMTP: 54C35A6C593BFAA8C54FCFEAE478818AD46520745EBBB51584EBB75785034DB32000:8 X-MTK: N Content-Transfer-Encoding: base64 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org VGhpcyBpcyB1c2VkIHRvIGZpeCBkdGJzX2NoZWNrIHdhcm5pbmcNCg0KU2lnbmVkLW9mZi1ieTog Q2h1bmZlbmcgWXVuIDxjaHVuZmVuZy55dW5AbWVkaWF0ZWsuY29tPg0KLS0tDQogYXJjaC9hcm0v Ym9vdC9kdHMvbXQ3NjIzLmR0c2kgIHwgMjYgKysrKysrKysrKysrKystLS0tLS0tLS0tLS0NCiBh cmNoL2FybS9ib290L2R0cy9tdDc2MjNuLmR0c2kgfCAgNCArKy0tDQogMiBmaWxlcyBjaGFuZ2Vk LCAxNiBpbnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkNCg0KZGlmZiAtLWdpdCBhL2FyY2gv YXJtL2Jvb3QvZHRzL210NzYyMy5kdHNpIGIvYXJjaC9hcm0vYm9vdC9kdHMvbXQ3NjIzLmR0c2kN CmluZGV4IGFlYTY4MDk1MDBkNy4uM2MxMWY3Y2ZjYzQwIDEwMDY0NA0KLS0tIGEvYXJjaC9hcm0v Ym9vdC9kdHMvbXQ3NjIzLmR0c2kNCisrKyBiL2FyY2gvYXJtL2Jvb3QvZHRzL210NzYyMy5kdHNp DQpAQCAtNzg3LDggKzc4Nyw5IEBADQogCQl9Ow0KIAl9Ow0KIA0KLQlwY2llMF9waHk6IHBjaWUt cGh5QDFhMTQ5MDAwIHsNCi0JCWNvbXBhdGlibGUgPSAibWVkaWF0ZWssZ2VuZXJpYy10cGh5LXYx IjsNCisJcGNpZTBfcGh5OiB0LXBoeUAxYTE0OTAwMCB7DQorCQljb21wYXRpYmxlID0gIm1lZGlh dGVrLG10NzYyMy10cGh5IiwNCisJCQkgICAgICJtZWRpYXRlayxnZW5lcmljLXRwaHktdjEiOw0K IAkJcmVnID0gPDAgMHgxYTE0OTAwMCAwIDB4MDcwMD47DQogCQkjYWRkcmVzcy1jZWxscyA9IDwy PjsNCiAJCSNzaXplLWNlbGxzID0gPDI+Ow0KQEAgLTgwNCw4ICs4MDUsOSBAQA0KIAkJfTsNCiAJ fTsNCiANCi0JcGNpZTFfcGh5OiBwY2llLXBoeUAxYTE0YTAwMCB7DQotCQljb21wYXRpYmxlID0g Im1lZGlhdGVrLGdlbmVyaWMtdHBoeS12MSI7DQorCXBjaWUxX3BoeTogdC1waHlAMWExNGEwMDAg ew0KKwkJY29tcGF0aWJsZSA9ICJtZWRpYXRlayxtdDc2MjMtdHBoeSIsDQorCQkJICAgICAibWVk aWF0ZWssZ2VuZXJpYy10cGh5LXYxIjsNCiAJCXJlZyA9IDwwIDB4MWExNGEwMDAgMCAweDA3MDA+ Ow0KIAkJI2FkZHJlc3MtY2VsbHMgPSA8Mj47DQogCQkjc2l6ZS1jZWxscyA9IDwyPjsNCkBAIC04 MjMsNyArODI1LDcgQEANCiANCiAJdXNiMTogdXNiQDFhMWMwMDAwIHsNCiAJCWNvbXBhdGlibGUg PSAibWVkaWF0ZWssbXQ3NjIzLXhoY2kiLA0KLQkJCSAgICAgIm1lZGlhdGVrLG10ODE3My14aGNp IjsNCisJCQkgICAgICJtZWRpYXRlayxtdGsteGhjaSI7DQogCQlyZWcgPSA8MCAweDFhMWMwMDAw IDAgMHgxMDAwPiwNCiAJCSAgICAgIDwwIDB4MWExYzQ3MDAgMCAweDAxMDA+Ow0KIAkJcmVnLW5h bWVzID0gIm1hYyIsICJpcHBjIjsNCkBAIC04MzYsOSArODM4LDkgQEANCiAJCXN0YXR1cyA9ICJk aXNhYmxlZCI7DQogCX07DQogDQotCXUzcGh5MTogdXNiLXBoeUAxYTFjNDAwMCB7DQotCQljb21w YXRpYmxlID0gIm1lZGlhdGVrLG10NzYyMy11M3BoeSIsDQotCQkJICAgICAibWVkaWF0ZWssbXQy NzAxLXUzcGh5IjsNCisJdTNwaHkxOiB0LXBoeUAxYTFjNDAwMCB7DQorCQljb21wYXRpYmxlID0g Im1lZGlhdGVrLG10NzYyMy10cGh5IiwNCisJCQkgICAgICJtZWRpYXRlayxnZW5lcmljLXRwaHkt djEiOw0KIAkJcmVnID0gPDAgMHgxYTFjNDAwMCAwIDB4MDcwMD47DQogCQkjYWRkcmVzcy1jZWxs cyA9IDwyPjsNCiAJCSNzaXplLWNlbGxzID0gPDI+Ow0KQEAgLTg2NCw3ICs4NjYsNyBAQA0KIA0K IAl1c2IyOiB1c2JAMWEyNDAwMDAgew0KIAkJY29tcGF0aWJsZSA9ICJtZWRpYXRlayxtdDc2MjMt eGhjaSIsDQotCQkJICAgICAibWVkaWF0ZWssbXQ4MTczLXhoY2kiOw0KKwkJCSAgICAgIm1lZGlh dGVrLG10ay14aGNpIjsNCiAJCXJlZyA9IDwwIDB4MWEyNDAwMDAgMCAweDEwMDA+LA0KIAkJICAg ICAgPDAgMHgxYTI0NDcwMCAwIDB4MDEwMD47DQogCQlyZWctbmFtZXMgPSAibWFjIiwgImlwcGMi Ow0KQEAgLTg3Nyw5ICs4NzksOSBAQA0KIAkJc3RhdHVzID0gImRpc2FibGVkIjsNCiAJfTsNCiAN Ci0JdTNwaHkyOiB1c2ItcGh5QDFhMjQ0MDAwIHsNCi0JCWNvbXBhdGlibGUgPSAibWVkaWF0ZWss bXQ3NjIzLXUzcGh5IiwNCi0JCQkgICAgICJtZWRpYXRlayxtdDI3MDEtdTNwaHkiOw0KKwl1M3Bo eTI6IHQtcGh5QDFhMjQ0MDAwIHsNCisJCWNvbXBhdGlibGUgPSAibWVkaWF0ZWssbXQ3NjIzLXRw aHkiLA0KKwkJCSAgICAgIm1lZGlhdGVrLGdlbmVyaWMtdHBoeS12MSI7DQogCQlyZWcgPSA8MCAw eDFhMjQ0MDAwIDAgMHgwNzAwPjsNCiAJCSNhZGRyZXNzLWNlbGxzID0gPDI+Ow0KIAkJI3NpemUt Y2VsbHMgPSA8Mj47DQpkaWZmIC0tZ2l0IGEvYXJjaC9hcm0vYm9vdC9kdHMvbXQ3NjIzbi5kdHNp IGIvYXJjaC9hcm0vYm9vdC9kdHMvbXQ3NjIzbi5kdHNpDQppbmRleCAxODgwYWM5ZTMyY2YuLmJj YjA4NDZlMjlmZCAxMDA2NDQNCi0tLSBhL2FyY2gvYXJtL2Jvb3QvZHRzL210NzYyM24uZHRzaQ0K KysrIGIvYXJjaC9hcm0vYm9vdC9kdHMvbXQ3NjIzbi5kdHNpDQpAQCAtMjQ2LDcgKzI0Niw3IEBA DQogCQlzdGF0dXMgPSAiZGlzYWJsZWQiOw0KIAl9Ow0KIA0KLQltaXBpX3R4MDogbWlwaS1kcGh5 QDEwMDEwMDAwIHsNCisJbWlwaV90eDA6IGRzaS1waHlAMTAwMTAwMDAgew0KIAkJY29tcGF0aWJs ZSA9ICJtZWRpYXRlayxtdDc2MjMtbWlwaS10eCIsDQogCQkJICAgICAibWVkaWF0ZWssbXQyNzAx LW1pcGktdHgiOw0KIAkJcmVnID0gPDAgMHgxMDAxMDAwMCAwIDB4OTA+Ow0KQEAgLTI2NSw3ICsy NjUsNyBAQA0KIAkJc3RhdHVzID0gImRpc2FibGVkIjsNCiAJfTsNCiANCi0JaGRtaV9waHk6IHBo eUAxMDIwOTEwMCB7DQorCWhkbWlfcGh5OiBoZG1pLXBoeUAxMDIwOTEwMCB7DQogCQljb21wYXRp YmxlID0gIm1lZGlhdGVrLG10NzYyMy1oZG1pLXBoeSIsDQogCQkJICAgICAibWVkaWF0ZWssbXQy NzAxLWhkbWktcGh5IjsNCiAJCXJlZyA9IDwwIDB4MTAyMDkxMDAgMCAweDI0PjsNCi0tIA0KMi4x OC4wDQo= From mboxrd@z Thu Jan 1 00:00:00 1970 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 A0047C433DB for ; Sat, 16 Jan 2021 09:19:07 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 672E723A56 for ; Sat, 16 Jan 2021 09:19:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 672E723A56 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=JuXVmcH+unBKoWQ8MepLLeupbE1ZTO1h6bN28U7/RIc=; b=E3waRoYYgv8FaHjes8z8PRDxP bU97ahNb/7KKNVkcGr27X/B9eElpVoLNfZ3SqS18gOYuwj2rnrMYOwkj/wA4Ig4xth/kbcPAutUcb Ela6GyXn+B5ctKOzutpWD6lBkPlSSTjOLk58w1qdQtqYaYJ1DC4uuPsNjWj2/j9AYa23yZ92tHY0F rzTEE9f02zUZ9Aai7AV1TgFjkULnPdvJQU4KLacmAEMqo1pofskbYdrAdQH/PM8L7KktTg8N+Q4Qh VeBN5GEiZhWS/sqocYbG5t+8+oIoZoqs4oJcJuYVDbEPCfDorJbjtVHe4YpxDo3xYDJ60VfY8FlUU +TXarum4A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l0hi5-0001UL-Dm; Sat, 16 Jan 2021 09:17:29 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l0hhq-0001MQ-GD; Sat, 16 Jan 2021 09:17:15 +0000 X-UUID: 99008e2ba91b4ecfb1f9f60e39758672-20210116 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=uDNLP7ADdXCMr8hSuR/u2EkeXQr9wsPK4ssl9r4Wats=; b=grnf3pmDf+M+UJwpg/uACdt/zogSmk5VnoOwWvVlNPDOJmMvl4xp+/hUKM851oH3utmrQsSSSrXbOiXrFGEGLO9HXluujpYfVqZgu85OSSR177ymr0Zv21aDNykUYm2ZZOWDIAOmwyVk1h6ZzM80hxZFaizhNDwJFUyRtbeGoKQ=; X-UUID: 99008e2ba91b4ecfb1f9f60e39758672-20210116 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 382818346; Sat, 16 Jan 2021 01:17:05 -0800 Received: from MTKMBS31N2.mediatek.inc (172.27.4.87) by MTKMBS62N2.mediatek.inc (172.29.193.42) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sat, 16 Jan 2021 01:07:07 -0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by MTKMBS31N2.mediatek.inc (172.27.4.87) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sat, 16 Jan 2021 17:07:04 +0800 Received: from mtkslt301.mediatek.inc (10.21.14.114) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Sat, 16 Jan 2021 17:07:04 +0800 From: Chunfeng Yun To: Vinod Koul , Rob Herring , "Greg Kroah-Hartman" , Matthias Brugger Subject: [PATCH next 14/15] arm: dts: mt7623: harmonize node names and compatibles Date: Sat, 16 Jan 2021 17:06:55 +0800 Message-ID: <20210116090656.11752-14-chunfeng.yun@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20210116090656.11752-1-chunfeng.yun@mediatek.com> References: <20210116090656.11752-1-chunfeng.yun@mediatek.com> MIME-Version: 1.0 X-TM-SNTS-SMTP: 54C35A6C593BFAA8C54FCFEAE478818AD46520745EBBB51584EBB75785034DB32000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210116_041714_728558_55625213 X-CRM114-Status: GOOD ( 10.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Chun-Kuang Hu , Philipp Zabel , devicetree@vger.kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Kishon Vijay Abraham I , linux-mediatek@lists.infradead.org, Min Guo , Chunfeng Yun , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This is used to fix dtbs_check warning Signed-off-by: Chunfeng Yun --- arch/arm/boot/dts/mt7623.dtsi | 26 ++++++++++++++------------ arch/arm/boot/dts/mt7623n.dtsi | 4 ++-- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/arch/arm/boot/dts/mt7623.dtsi b/arch/arm/boot/dts/mt7623.dtsi index aea6809500d7..3c11f7cfcc40 100644 --- a/arch/arm/boot/dts/mt7623.dtsi +++ b/arch/arm/boot/dts/mt7623.dtsi @@ -787,8 +787,9 @@ }; }; - pcie0_phy: pcie-phy@1a149000 { - compatible = "mediatek,generic-tphy-v1"; + pcie0_phy: t-phy@1a149000 { + compatible = "mediatek,mt7623-tphy", + "mediatek,generic-tphy-v1"; reg = <0 0x1a149000 0 0x0700>; #address-cells = <2>; #size-cells = <2>; @@ -804,8 +805,9 @@ }; }; - pcie1_phy: pcie-phy@1a14a000 { - compatible = "mediatek,generic-tphy-v1"; + pcie1_phy: t-phy@1a14a000 { + compatible = "mediatek,mt7623-tphy", + "mediatek,generic-tphy-v1"; reg = <0 0x1a14a000 0 0x0700>; #address-cells = <2>; #size-cells = <2>; @@ -823,7 +825,7 @@ usb1: usb@1a1c0000 { compatible = "mediatek,mt7623-xhci", - "mediatek,mt8173-xhci"; + "mediatek,mtk-xhci"; reg = <0 0x1a1c0000 0 0x1000>, <0 0x1a1c4700 0 0x0100>; reg-names = "mac", "ippc"; @@ -836,9 +838,9 @@ status = "disabled"; }; - u3phy1: usb-phy@1a1c4000 { - compatible = "mediatek,mt7623-u3phy", - "mediatek,mt2701-u3phy"; + u3phy1: t-phy@1a1c4000 { + compatible = "mediatek,mt7623-tphy", + "mediatek,generic-tphy-v1"; reg = <0 0x1a1c4000 0 0x0700>; #address-cells = <2>; #size-cells = <2>; @@ -864,7 +866,7 @@ usb2: usb@1a240000 { compatible = "mediatek,mt7623-xhci", - "mediatek,mt8173-xhci"; + "mediatek,mtk-xhci"; reg = <0 0x1a240000 0 0x1000>, <0 0x1a244700 0 0x0100>; reg-names = "mac", "ippc"; @@ -877,9 +879,9 @@ status = "disabled"; }; - u3phy2: usb-phy@1a244000 { - compatible = "mediatek,mt7623-u3phy", - "mediatek,mt2701-u3phy"; + u3phy2: t-phy@1a244000 { + compatible = "mediatek,mt7623-tphy", + "mediatek,generic-tphy-v1"; reg = <0 0x1a244000 0 0x0700>; #address-cells = <2>; #size-cells = <2>; diff --git a/arch/arm/boot/dts/mt7623n.dtsi b/arch/arm/boot/dts/mt7623n.dtsi index 1880ac9e32cf..bcb0846e29fd 100644 --- a/arch/arm/boot/dts/mt7623n.dtsi +++ b/arch/arm/boot/dts/mt7623n.dtsi @@ -246,7 +246,7 @@ status = "disabled"; }; - mipi_tx0: mipi-dphy@10010000 { + mipi_tx0: dsi-phy@10010000 { compatible = "mediatek,mt7623-mipi-tx", "mediatek,mt2701-mipi-tx"; reg = <0 0x10010000 0 0x90>; @@ -265,7 +265,7 @@ status = "disabled"; }; - hdmi_phy: phy@10209100 { + hdmi_phy: hdmi-phy@10209100 { compatible = "mediatek,mt7623-hdmi-phy", "mediatek,mt2701-hdmi-phy"; reg = <0 0x10209100 0 0x24>; -- 2.18.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel