From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: Re: [PATCH 1/4] ARM: OMAP2+: Drop mmc platform data for am330x and am43xx Date: Mon, 22 Jul 2019 00:54:12 -0700 Message-ID: <20190722075411.GM5447@atomide.com> References: <20190326181324.32140-1-tony@atomide.com> <20190326181324.32140-2-tony@atomide.com> <0af63198-5a68-2f0d-f14e-2b514580d2d5@lechnology.com> <20190722060951.GL5447@atomide.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <20190722060951.GL5447@atomide.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: David Lechner Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org List-Id: linux-omap@vger.kernel.org * Tony Lindgren [190722 06:10]: > * David Lechner [190721 02:43]: > > On 3/26/19 1:13 PM, Tony Lindgren wrote: > > > We can now drop legacy platform data one interconnect target module at > > > a time in favor of the device tree based data that has been added earlier. > > > > > > Signed-off-by: Tony Lindgren > > > --- > > > > This breaks wifi on BeagleBone Blue (found via git bisect). In dmesg, I see: > > > > platform 47810000.mmc: Cannot lookup hwmod 'mmc3' > > Thanks for letting me know and sorry for breaking it. > > > How can we fix it? > > The warning you pasted above hints that we're still trying to > probe mmc3 using platform data, and that data no longer exists. > > Looks like I've completely missed updating the dts file for > mmc3 that is directly on the l3 interconnect instead of l4 like > all the other mmc instances. The same applies for am4 too, and > I've also left some "ti,hwmods" properties around too.. > > Care to try the following patch and see if it fixes the issue > for you? Oh I just noticed this needs to be fixed in v5.2, not in v5.3-rc series. It's best to keep the "ti,hwmods" property still around as there may be dependencies to ti-sysc driver changes in v5.3-rc series for dropping it. Below is a more minimal fix to try. Regards, Tony 8< ------------- diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -234,13 +234,33 @@ interrupt-names = "edma3_tcerrint"; }; - mmc3: mmc@47810000 { - compatible = "ti,omap4-hsmmc"; + target-module@47810000 { + compatible = "ti,sysc-omap2", "ti,sysc"; ti,hwmods = "mmc3"; - ti,needs-special-reset; - interrupts = <29>; - reg = <0x47810000 0x1000>; - status = "disabled"; + reg = <0x478102fc 0x4>, + <0x47810110 0x4>, + <0x47810114 0x4>; + reg-names = "rev", "sysc", "syss"; + ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY | + SYSC_OMAP2_ENAWAKEUP | + SYSC_OMAP2_SOFTRESET | + SYSC_OMAP2_AUTOIDLE)>; + ti,sysc-sidle = , + , + ; + ti,syss-mask = <1>; + clocks = <&l3s_clkctrl AM3_L3S_MMC3_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x47810000 0x1000>; + + mmc3: mmc@0 { + compatible = "ti,omap4-hsmmc"; + ti,needs-special-reset; + interrupts = <29>; + reg = <0x0 0x1000>; + }; }; usb: usb@47400000 { diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi --- a/arch/arm/boot/dts/am4372.dtsi +++ b/arch/arm/boot/dts/am4372.dtsi @@ -228,13 +228,33 @@ interrupt-names = "edma3_tcerrint"; }; - mmc3: mmc@47810000 { - compatible = "ti,omap4-hsmmc"; - reg = <0x47810000 0x1000>; + target-module@47810000 { + compatible = "ti,sysc-omap2", "ti,sysc"; ti,hwmods = "mmc3"; - ti,needs-special-reset; - interrupts = ; - status = "disabled"; + reg = <0x478102fc 0x4>, + <0x47810110 0x4>, + <0x47810114 0x4>; + reg-names = "rev", "sysc", "syss"; + ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY | + SYSC_OMAP2_ENAWAKEUP | + SYSC_OMAP2_SOFTRESET | + SYSC_OMAP2_AUTOIDLE)>; + ti,sysc-sidle = , + , + ; + ti,syss-mask = <1>; + clocks = <&l3s_clkctrl AM4_L3S_MMC3_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x47810000 0x1000>; + + mmc3: mmc@0 { + compatible = "ti,omap4-hsmmc"; + ti,needs-special-reset; + interrupts = ; + reg = <0x0 0x1000>; + }; }; sham: sham@53100000 { -- 2.21.0 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=-8.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 E3E13C76188 for ; Mon, 22 Jul 2019 07:54:19 +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 BB8D821BE6 for ; Mon, 22 Jul 2019 07:54:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="NHZE8ZPy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BB8D821BE6 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+infradead-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.20170209; 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=AxMNN+fr5pE0O+fvwLzuwtzmDHjWNnJH/9KsMJFhHDU=; b=NHZE8ZPyrlsHPV +Bbxc4jNVJ5PnoKfd4b+zpCX/wtjZ7rweRS/2VaDV1uYgXLGeb7/dxJ/jmhPwPOg0toB40bO+Hmlt PCSmGt0pJVrJXibbmoOLgJdYhlMWCqN2CI2NKyy+vJL/2mnsQo4NJr9bOoQxLCJSa26eKqBIupXVq DCD2UpKF3mVMo+GYVz9RohdyUBDQGR3IlqWcwEJnnuHqbJ6xFsXKnEFwbpxPMZ+Q/t7Meu7wCdoPV Q0tN98kXSpFnZMjafUBvUa5JEZ2VqCWWE+5q2jztrRPRtef1PauA5n7jrfwyHE2+ZEDOG1eAs1pgL 6GAxnXHOgrQVJVxC9CAw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hpT9H-00047D-Bt; Mon, 22 Jul 2019 07:54:19 +0000 Received: from muru.com ([72.249.23.125]) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hpT9E-00046c-FE for linux-arm-kernel@lists.infradead.org; Mon, 22 Jul 2019 07:54:17 +0000 Received: from atomide.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTPS id 5425180FA; Mon, 22 Jul 2019 07:54:40 +0000 (UTC) Date: Mon, 22 Jul 2019 00:54:12 -0700 From: Tony Lindgren To: David Lechner Subject: Re: [PATCH 1/4] ARM: OMAP2+: Drop mmc platform data for am330x and am43xx Message-ID: <20190722075411.GM5447@atomide.com> References: <20190326181324.32140-1-tony@atomide.com> <20190326181324.32140-2-tony@atomide.com> <0af63198-5a68-2f0d-f14e-2b514580d2d5@lechnology.com> <20190722060951.GL5447@atomide.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190722060951.GL5447@atomide.com> User-Agent: Mutt/1.11.4 (2019-03-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190722_005416_543225_0553EFE6 X-CRM114-Status: GOOD ( 17.35 ) 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: 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+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org * Tony Lindgren [190722 06:10]: > * David Lechner [190721 02:43]: > > On 3/26/19 1:13 PM, Tony Lindgren wrote: > > > We can now drop legacy platform data one interconnect target module at > > > a time in favor of the device tree based data that has been added earlier. > > > > > > Signed-off-by: Tony Lindgren > > > --- > > > > This breaks wifi on BeagleBone Blue (found via git bisect). In dmesg, I see: > > > > platform 47810000.mmc: Cannot lookup hwmod 'mmc3' > > Thanks for letting me know and sorry for breaking it. > > > How can we fix it? > > The warning you pasted above hints that we're still trying to > probe mmc3 using platform data, and that data no longer exists. > > Looks like I've completely missed updating the dts file for > mmc3 that is directly on the l3 interconnect instead of l4 like > all the other mmc instances. The same applies for am4 too, and > I've also left some "ti,hwmods" properties around too.. > > Care to try the following patch and see if it fixes the issue > for you? Oh I just noticed this needs to be fixed in v5.2, not in v5.3-rc series. It's best to keep the "ti,hwmods" property still around as there may be dependencies to ti-sysc driver changes in v5.3-rc series for dropping it. Below is a more minimal fix to try. Regards, Tony 8< ------------- diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -234,13 +234,33 @@ interrupt-names = "edma3_tcerrint"; }; - mmc3: mmc@47810000 { - compatible = "ti,omap4-hsmmc"; + target-module@47810000 { + compatible = "ti,sysc-omap2", "ti,sysc"; ti,hwmods = "mmc3"; - ti,needs-special-reset; - interrupts = <29>; - reg = <0x47810000 0x1000>; - status = "disabled"; + reg = <0x478102fc 0x4>, + <0x47810110 0x4>, + <0x47810114 0x4>; + reg-names = "rev", "sysc", "syss"; + ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY | + SYSC_OMAP2_ENAWAKEUP | + SYSC_OMAP2_SOFTRESET | + SYSC_OMAP2_AUTOIDLE)>; + ti,sysc-sidle = , + , + ; + ti,syss-mask = <1>; + clocks = <&l3s_clkctrl AM3_L3S_MMC3_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x47810000 0x1000>; + + mmc3: mmc@0 { + compatible = "ti,omap4-hsmmc"; + ti,needs-special-reset; + interrupts = <29>; + reg = <0x0 0x1000>; + }; }; usb: usb@47400000 { diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi --- a/arch/arm/boot/dts/am4372.dtsi +++ b/arch/arm/boot/dts/am4372.dtsi @@ -228,13 +228,33 @@ interrupt-names = "edma3_tcerrint"; }; - mmc3: mmc@47810000 { - compatible = "ti,omap4-hsmmc"; - reg = <0x47810000 0x1000>; + target-module@47810000 { + compatible = "ti,sysc-omap2", "ti,sysc"; ti,hwmods = "mmc3"; - ti,needs-special-reset; - interrupts = ; - status = "disabled"; + reg = <0x478102fc 0x4>, + <0x47810110 0x4>, + <0x47810114 0x4>; + reg-names = "rev", "sysc", "syss"; + ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY | + SYSC_OMAP2_ENAWAKEUP | + SYSC_OMAP2_SOFTRESET | + SYSC_OMAP2_AUTOIDLE)>; + ti,sysc-sidle = , + , + ; + ti,syss-mask = <1>; + clocks = <&l3s_clkctrl AM4_L3S_MMC3_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x47810000 0x1000>; + + mmc3: mmc@0 { + compatible = "ti,omap4-hsmmc"; + ti,needs-special-reset; + interrupts = ; + reg = <0x0 0x1000>; + }; }; sham: sham@53100000 { -- 2.21.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel