Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ddcb9aa6 authored by Peter Chen's avatar Peter Chen Committed by Shawn Guo
Browse files

ARM: imx: Move anatop related from board file to anatop driver 



Move anatop related (For USB) from board file to anatop driver

Signed-off-by: default avatarPeter Chen <peter.chen@freescale.com>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent 692c89ad

arch/arm/mach-imx/anatop.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -66,7 +66,7 @@ void imx_anatop_post_resume(void) 
	imx_anatop_enable_weak2p5(false);

	imx_anatop_enable_weak2p5(false);

}

}





void imx_anatop_usb_chrg_detect_disable(void)

static void imx_anatop_usb_chrg_detect_disable(void)

{

{

	regmap_write(anatop, ANADIG_USB1_CHRG_DETECT,

	regmap_write(anatop, ANADIG_USB1_CHRG_DETECT,

		BM_ANADIG_USB_CHRG_DETECT_EN_B

		BM_ANADIG_USB_CHRG_DETECT_EN_B
@@ -100,4 +100,6 @@ void __init imx_anatop_init(void) 
		pr_err("%s: failed to find imx6q-anatop regmap!\n", __func__);

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

		return;

		return;

	}

	}



	imx_anatop_usb_chrg_detect_disable();

}
 
}

arch/arm/mach-imx/common.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -137,7 +137,6 @@ extern void imx_gpc_restore_all(void); 
extern void imx_anatop_init(void);

extern void imx_anatop_init(void);

extern void imx_anatop_pre_suspend(void);

extern void imx_anatop_pre_suspend(void);

extern void imx_anatop_post_resume(void);

extern void imx_anatop_post_resume(void);

extern void imx_anatop_usb_chrg_detect_disable(void);

extern u32 imx_anatop_get_digprog(void);

extern u32 imx_anatop_get_digprog(void);

extern int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode);

extern int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode);

extern void imx6q_set_chicken_bit(void);

extern void imx6q_set_chicken_bit(void);

arch/arm/mach-imx/mach-imx6q.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -249,10 +249,6 @@ static void __init imx6q_1588_init(void) 
		pr_err("failed to find fsl,imx6q-iomux-gpr regmap\n");

		pr_err("failed to find fsl,imx6q-iomux-gpr regmap\n");





}

}

static void __init imx6q_usb_init(void)

{

	imx_anatop_usb_chrg_detect_disable();

}





static void __init imx6q_init_machine(void)

static void __init imx6q_init_machine(void)

{

{
@@ -268,7 +264,6 @@ static void __init imx6q_init_machine(void) 




	imx_anatop_init();

	imx_anatop_init();

	imx6q_pm_init();

	imx6q_pm_init();

	imx6q_usb_init();

	imx6q_1588_init();

	imx6q_1588_init();

}

}