On Mon, Aug 27, 2012 at 03:24:43PM +0800, Dong Aisheng wrote:
> From: Dong Aisheng <dong.aish...@linaro.org>
>
> Using syscon to access anatop registers.
>
> Signed-off-by: Dong Aisheng <dong.aish...@linaro.org>
> ---
> ChangeLog v1->v2:
> * update to use generic regmap api
> ---
> arch/arm/mach-imx/Kconfig | 2 +-
> arch/arm/mach-imx/mach-imx6q.c | 43 ++++++++++++++++-----------------------
> 2 files changed, 19 insertions(+), 26 deletions(-)
>
> diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
> index afd542a..7bba253 100644
> --- a/arch/arm/mach-imx/Kconfig
> +++ b/arch/arm/mach-imx/Kconfig
> @@ -839,7 +839,7 @@ config SOC_IMX6Q
> select HAVE_IMX_MMDC
> select HAVE_IMX_SRC
> select HAVE_SMP
> - select MFD_ANATOP
> + select MFD_SYSCON
> select PINCTRL
> select PINCTRL_IMX6Q
>
> diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
> index 045b3f6..5de869a 100644
> --- a/arch/arm/mach-imx/mach-imx6q.c
> +++ b/arch/arm/mach-imx/mach-imx6q.c
> @@ -24,8 +24,9 @@
> #include <linux/of_platform.h>
> #include <linux/pinctrl/machine.h>
> #include <linux/phy.h>
> +#include <linux/regmap.h>
> #include <linux/micrel_phy.h>
> -#include <linux/mfd/anatop.h>
> +#include <linux/mfd/syscon.h>
> #include <asm/cpuidle.h>
> #include <asm/smp_twd.h>
> #include <asm/hardware/cache-l2x0.h>
> @@ -121,38 +122,30 @@ static void __init imx6q_sabrelite_init(void)
> static void __init imx6q_usb_init(void)
> {
> struct device_node *np;
> - struct platform_device *pdev = NULL;
> - struct anatop *adata = NULL;
> + struct regmap *anatop;
>
> np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-anatop");
np unused.
> - if (np)
> - pdev = of_find_device_by_node(np);
> - if (pdev)
> - adata = platform_get_drvdata(pdev);
> - if (!adata) {
> - if (np)
> - of_node_put(np);
> - return;
> - }
> -
> #define HW_ANADIG_USB1_CHRG_DETECT 0x000001b0
> #define HW_ANADIG_USB2_CHRG_DETECT 0x00000210
>
> #define BM_ANADIG_USB_CHRG_DETECT_EN_B 0x00100000
> #define BM_ANADIG_USB_CHRG_DETECT_CHK_CHRG_B 0x00080000
>
> - /*
> - * The external charger detector needs to be disabled,
> - * or the signal at DP will be poor
> - */
> - anatop_write_reg(adata, HW_ANADIG_USB1_CHRG_DETECT,
> - BM_ANADIG_USB_CHRG_DETECT_EN_B
> - | BM_ANADIG_USB_CHRG_DETECT_CHK_CHRG_B,
> - ~0);
> - anatop_write_reg(adata, HW_ANADIG_USB2_CHRG_DETECT,
> - BM_ANADIG_USB_CHRG_DETECT_EN_B |
> - BM_ANADIG_USB_CHRG_DETECT_CHK_CHRG_B,
> - ~0);
> + anatop = syscon_regmap_lookup_by_compatible("fsl,imx6q-anatop");
> + if (!IS_ERR(anatop)) {
> + /*
> + * The external charger detector needs to be disabled,
> + * or the signal at DP will be poor
> + */
> + regmap_write(anatop, HW_ANADIG_USB1_CHRG_DETECT,
> + BM_ANADIG_USB_CHRG_DETECT_EN_B
> + | BM_ANADIG_USB_CHRG_DETECT_CHK_CHRG_B);
> + regmap_write(anatop, HW_ANADIG_USB2_CHRG_DETECT,
> + BM_ANADIG_USB_CHRG_DETECT_EN_B |
> + BM_ANADIG_USB_CHRG_DETECT_CHK_CHRG_B);
> + } else {
> + pr_warn("failed to find fsl,imx6q-anatop regmap\n");
> + }
>
> of_node_put(np);
unneeded.
Thanks
Richard
> }
> --
> 1.7.0.4
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
