From patchwork Mon Feb 1 07:00:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunfeng Yun X-Patchwork-Id: 374354 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=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 808E6C433E6 for ; Mon, 1 Feb 2021 07:08:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4B14664E30 for ; Mon, 1 Feb 2021 07:08:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231796AbhBAHGs (ORCPT ); Mon, 1 Feb 2021 02:06:48 -0500 Received: from mailgw02.mediatek.com ([1.203.163.81]:18823 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S231673AbhBAHBW (ORCPT ); Mon, 1 Feb 2021 02:01:22 -0500 X-UUID: 57ef6d08346e413a83cf72af23559fe6-20210201 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=qDw4GBA9704tU+M/WrZeB3VuuWS9efZKLKktS42howg=; b=b2JD3sECeFl7e3gmu4/j9uK4kfuJd5OsIJ2QPTnGr8Gtwtm1zvtb7Hg5qm3b3l1VFw2P1v8QJ8qAxJyLTPNM3d9X1H/zPvMCwLzOE54FFBIqV0yr1FOwOFJM5T1nmWbMoVAriH4q++FPV7yJUENHTgjBgJv4FhMahV2/zdb/gjA=; X-UUID: 57ef6d08346e413a83cf72af23559fe6-20210201 Received: from mtkcas32.mediatek.inc [(172.27.4.253)] by mailgw02.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1459050727; Mon, 01 Feb 2021 15:00:33 +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; Mon, 1 Feb 2021 15:00:29 +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; Mon, 1 Feb 2021 15:00:29 +0800 From: Chunfeng Yun To: Rob Herring , Matthias Brugger CC: Chunfeng Yun , Kishon Vijay Abraham I , Vinod Koul , Greg Kroah-Hartman , Chun-Kuang Hu , Philipp Zabel , Min Guo , , , , , Subject: [PATCH next v3 11/16] arm64: dts: mediatek: mt8516: harmonize node names and compatibles Date: Mon, 1 Feb 2021 15:00:11 +0800 Message-ID: <20210201070016.41721-11-chunfeng.yun@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20210201070016.41721-1-chunfeng.yun@mediatek.com> References: <20210201070016.41721-1-chunfeng.yun@mediatek.com> MIME-Version: 1.0 X-TM-SNTS-SMTP: 3662852F8D2C464972E1EE201EE433F3D59FF052CF324EF051CCF9FBD3570A472000:8 X-MTK: N Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org This is used to fix dtbs_check warning: harmonize node names and compatibles; add property "usb-role-switch" for connector dependence. Signed-off-by: Chunfeng Yun --- v2~v3: no changes --- arch/arm64/boot/dts/mediatek/mt8516.dtsi | 9 +++++---- arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) -- 2.18.0 diff --git a/arch/arm64/boot/dts/mediatek/mt8516.dtsi b/arch/arm64/boot/dts/mediatek/mt8516.dtsi index e6e4d9d60094..70c9c7423bd4 100644 --- a/arch/arm64/boot/dts/mediatek/mt8516.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8516.dtsi @@ -450,7 +450,7 @@ }; usb0: usb@11100000 { - compatible = "mediatek,mtk-musb"; + compatible = "mediatek,mt8516-musb", "mediatek,mtk-musb"; reg = <0 0x11100000 0 0x1000>; interrupts = ; interrupt-names = "mc"; @@ -463,7 +463,7 @@ }; usb1: usb@11190000 { - compatible = "mediatek,mtk-musb"; + compatible = "mediatek,mt8516-musb", "mediatek,mtk-musb"; reg = <0 0x11190000 0 0x1000>; interrupts = ; interrupt-names = "mc"; @@ -476,8 +476,9 @@ status = "disabled"; }; - usb_phy: usb@11110000 { - compatible = "mediatek,generic-tphy-v1"; + usb_phy: t-phy@11110000 { + compatible = "mediatek,mt8516-tphy", + "mediatek,generic-tphy-v1"; reg = <0 0x11110000 0 0x800>; #address-cells = <2>; #size-cells = <2>; diff --git a/arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi b/arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi index 63fd70086bb8..7d738f01cf8d 100644 --- a/arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi +++ b/arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi @@ -188,6 +188,7 @@ &usb0 { status = "okay"; dr_mode = "peripheral"; + usb-role-switch; usb_con: connector { compatible = "usb-c-connector";