On Sat, Aug 24, 2019 at 11:31 AM Shawn Guo <shawn...@kernel.org> wrote: > > On Thu, Aug 22, 2019 at 05:33:13PM +0000, Leonard Crestez wrote: > > On 31.07.2019 21:01, Andrey Smirnov wrote: > > > With commit b5bbe2235361 ("usb: phy: mxs: Disable external charger > > > detect in mxs_phy_hw_init()") in tree all of the necessary charger > > > setup is done by the USB PHY driver which covers all of the affected > > > i.MX6 SoCs. > > > > > > NOTE: Imx_anatop_init() was also called for i.MX7D, but looking at its > > > datasheet it appears to have a different USB PHY IP block, so > > > executing i.MX6 charger disable configuration seems unnecessary. > > > > > > -void __init imx_anatop_init(void) > > > -{ > > > - anatop = syscon_regmap_lookup_by_compatible("fsl,imx6q-anatop"); > > > - if (IS_ERR(anatop)) { > > > - pr_err("%s: failed to find imx6q-anatop regmap!\n", __func__); > > > - return; > > > - } > > > > This patch breaks suspend on imx6 in linux-next because the "anatop" > > regmap is no longer initialized. This was found via bisect but > > no_console_suspend prints a helpful stack anyway: > > > > (regmap_read) from [<c01226e4>] (imx_anatop_enable_weak2p5+0x28/0x70) > > (imx_anatop_enable_weak2p5) from [<c0122744>] > > (imx_anatop_pre_suspend+0x18/0x64) > > (imx_anatop_pre_suspend) from [<c0124434>] (imx6q_pm_enter+0x60/0x16c) > > (imx6q_pm_enter) from [<c018c8a4>] (suspend_devices_and_enter+0x7d4/0xcbc) > > (suspend_devices_and_enter) from [<c018d544>] (pm_suspend+0x7b8/0x904) > > (pm_suspend) from [<c018b1b4>] (state_store+0x68/0xc8) > > I dropped it from my branch for now. Thanks for reporting! >
OK, it sounds like I can submit a v2 that only removes imx_anatop_usb_chrg_detect_disable() and keeps imx_anatop_init() intact. Thanks, Andrey Smirnov