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=-9.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 9198BC47089 for ; Thu, 27 May 2021 05:51:11 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 46046613DA for ; Thu, 27 May 2021 05:51:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 46046613DA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=atomide.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=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=O5xLwkiKcImYi+SA1OGl+88vgzAZcLrw7odZipgBXbY=; b=xRnKgL+1BBVOiE 4oRjo2xNCGhPW2Ut5l08T6FdVSnRqjWTqCuxvzB90GINRNYoA/sB9pnBriwPdCUvWqbegO+/sm1KK onS0ADDDxoAgGw0Pf9euQ1Fwz08btdDEHt2vRPHctRipUwBldDb2LRmFYNJnAdGcxf/LoGCMT9lZk ts6NB5edH6/CY6jy0TI5unKWWs/h4KivYmtAI1sHFvwuNmz4wlAvB7SIl0pwHpd0V9clygPd+XjCA 0zInke/APs8vC+d6ZcVMMgqd+pbCtGkqthR2I81mhfqN2uz7RCCwVavnKjBdDg71ZZPtN2lloLmvk vRXl61Q8YMnGY6bW39SA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lm8sQ-002lrP-5v; Thu, 27 May 2021 05:48:14 +0000 Received: from muru.com ([72.249.23.125]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lm8sM-002lpn-Fp for linux-arm-kernel@lists.infradead.org; Thu, 27 May 2021 05:48:12 +0000 Received: from atomide.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTPS id 51A6980AE; Thu, 27 May 2021 05:48:10 +0000 (UTC) Date: Thu, 27 May 2021 08:48:01 +0300 From: Tony Lindgren To: Gowtham Tammana Subject: Re: [PATCH v3] ARM: dts: dra7: Fix duplicate USB4 target module node Message-ID: References: <20210526213035.15448-1-g-tammana@ti.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210526213035.15448-1-g-tammana@ti.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210526_224810_603376_34F68619 X-CRM114-Status: GOOD ( 15.67 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nisanth Menon , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org, bcousson@baylibre.com, Grygorii Strashko , linux-omap@vger.kernel.org, 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 Hi, * Gowtham Tammana [210526 21:30]: > diff --git a/arch/arm/boot/dts/am5718.dtsi b/arch/arm/boot/dts/am5718.dtsi > index ebf4d3cc1cfb..6d7530a48c73 100644 > --- a/arch/arm/boot/dts/am5718.dtsi > +++ b/arch/arm/boot/dts/am5718.dtsi > @@ -17,17 +17,13 @@ / { > * VCP1, VCP2 > * MLB > * ISS > - * USB3, USB4 > + * USB3 > */ > > &usb3_tm { > status = "disabled"; > }; > > -&usb4_tm { > - status = "disabled"; > -}; > - > &atl_tm { > status = "disabled"; > }; The above makes sense as usb4 is only on dra74x and should not be even available otherwise. > diff --git a/arch/arm/boot/dts/dra7-l4.dtsi b/arch/arm/boot/dts/dra7-l4.dtsi > index 149144cdff35..648d23f7f748 100644 > --- a/arch/arm/boot/dts/dra7-l4.dtsi > +++ b/arch/arm/boot/dts/dra7-l4.dtsi > @@ -4129,28 +4129,6 @@ usb3: usb@10000 { > }; > }; > > - usb4_tm: target-module@140000 { /* 0x48940000, ap 75 3c.0 */ > - compatible = "ti,sysc-omap4", "ti,sysc"; > - reg = <0x140000 0x4>, > - <0x140010 0x4>; > - reg-names = "rev", "sysc"; > - ti,sysc-mask = ; > - ti,sysc-midle = , > - , > - , > - ; > - ti,sysc-sidle = , > - , > - , > - ; > - /* Domains (P, C): l3init_pwrdm, l3init_clkdm */ > - clocks = <&l3init_clkctrl DRA7_L3INIT_USB_OTG_SS4_CLKCTRL 0>; > - clock-names = "fck"; > - #address-cells = <1>; > - #size-cells = <1>; > - ranges = <0x0 0x140000 0x20000>; > - }; > - But let's keep the target-module@140000 here as it puts it in the right location rather than directly on the ocp. Let's mark it with status = "disabled" in dra7-l4.dtsi, and add a comment noting it's only available on dra74x. So similar to what you had in your v1 patch, except disabled. > diff --git a/arch/arm/boot/dts/dra71x.dtsi b/arch/arm/boot/dts/dra71x.dtsi > index cad0e4a2bd8d..9c270d8f75d5 100644 > --- a/arch/arm/boot/dts/dra71x.dtsi > +++ b/arch/arm/boot/dts/dra71x.dtsi > @@ -11,7 +11,3 @@ > &rtctarget { > status = "disabled"; > }; > - > -&usb4_tm { > - status = "disabled"; > -}; > diff --git a/arch/arm/boot/dts/dra72x.dtsi b/arch/arm/boot/dts/dra72x.dtsi > index d403acc754b6..f3e934ef7d3e 100644 > --- a/arch/arm/boot/dts/dra72x.dtsi > +++ b/arch/arm/boot/dts/dra72x.dtsi > @@ -108,7 +108,3 @@ &pcie1_ep { > &pcie2_rc { > compatible = "ti,dra726-pcie-rc", "ti,dra7-pcie"; > }; > - > -&usb4_tm { > - status = "disabled"; > -}; Then the above change can be kept. > diff --git a/arch/arm/boot/dts/dra74x.dtsi b/arch/arm/boot/dts/dra74x.dtsi > index e1850d6c841a..60f2ab8d34d5 100644 > --- a/arch/arm/boot/dts/dra74x.dtsi > +++ b/arch/arm/boot/dts/dra74x.dtsi > @@ -49,7 +49,7 @@ dsp2_system: dsp_system@41500000 { > reg = <0x41500000 0x100>; > }; > > - target-module@48940000 { > + usb4_tm: target-module@48940000 { > compatible = "ti,sysc-omap4", "ti,sysc"; > reg = <0x48940000 0x4>, > <0x48940010 0x4>; And in dra74x.dtsi just set it enabled then :) Other than that looks good to me. Regards, Tony _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel