Commit 427fca60 authored by Andrey Smirnov's avatar Andrey Smirnov Committed by Shawn Guo
Browse files

ARM: imx: Drop imx_anatop_usb_chrg_detect_disable() 



With commit b5bbe223 ("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_usb_chrg_detect_disable() 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.

Signed-off-by: default avatarAndrey Smirnov <andrew.smirnov@gmail.com>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: Peter Chen <peter.chen@nxp.com>
Cc: linux-imx@nxp.com
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 3d4e0158

arch/arm/mach-imx/anatop.c

+1 −19
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
#define ANADIG_REG_2P5		0x130

#define ANADIG_REG_CORE		0x140

#define ANADIG_ANA_MISC0	0x150

#define ANADIG_USB1_CHRG_DETECT	0x1b0

#define ANADIG_USB2_CHRG_DETECT	0x210

#define ANADIG_DIGPROG		0x260

#define ANADIG_DIGPROG_IMX6SL	0x280

#define ANADIG_DIGPROG_IMX7D	0x800
@@ -33,8 +31,6 @@ 
#define BM_ANADIG_ANA_MISC0_STOP_MODE_CONFIG	0x1000

/* Below MISC0_DISCON_HIGH_SNVS is only for i.MX6SL */

#define BM_ANADIG_ANA_MISC0_DISCON_HIGH_SNVS	0x2000

#define BM_ANADIG_USB_CHRG_DETECT_CHK_CHRG_B	0x80000

#define BM_ANADIG_USB_CHRG_DETECT_EN_B		0x100000



static struct regmap *anatop;
@@ -96,16 +92,6 @@ void imx_anatop_post_resume(void) 


}



static void imx_anatop_usb_chrg_detect_disable(void)

{

	regmap_write(anatop, ANADIG_USB1_CHRG_DETECT,

		BM_ANADIG_USB_CHRG_DETECT_EN_B

		| BM_ANADIG_USB_CHRG_DETECT_CHK_CHRG_B);

	regmap_write(anatop, ANADIG_USB2_CHRG_DETECT,

		BM_ANADIG_USB_CHRG_DETECT_EN_B |

		BM_ANADIG_USB_CHRG_DETECT_CHK_CHRG_B);

}



void __init imx_init_revision_from_anatop(void)

{

	struct device_node *np;
@@ -171,10 +157,6 @@ void __init imx_init_revision_from_anatop(void) 
void __init imx_anatop_init(void)

{

	anatop = syscon_regmap_lookup_by_compatible("fsl,imx6q-anatop");

	if (IS_ERR(anatop)) {

	if (IS_ERR(anatop))

		pr_err("%s: failed to find imx6q-anatop regmap!\n", __func__);

		return;

	}



	imx_anatop_usb_chrg_detect_disable();

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE