[PATCH v3 3/7] OMAP2+: use control module mfd driver in omap_type
From: tony@atomide.com (Tony Lindgren)
Date: 2012-08-08 13:50:00
Also in:
linux-omap, linux-pm
* Konstantin Baydarov [off-list ref] [120627 11:09]:
quoted hunk ↗ jump to hunk
--- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c@@ -18,6 +18,7 @@ #include <linux/kernel.h> #include <linux/init.h> #include <linux/io.h> +#include <linux/mfd/omap_control.h> #include <asm/cputype.h>@@ -43,13 +44,13 @@ int omap_type(void) u32 val = 0; if (cpu_is_omap24xx()) { - val = omap_ctrl_readl(OMAP24XX_CONTROL_STATUS); + val = omap_control_status_read(OMAP24XX_CONTROL_STATUS); } else if (cpu_is_am33xx()) { - val = omap_ctrl_readl(AM33XX_CONTROL_STATUS); + val = omap_control_status_read(AM33XX_CONTROL_STATUS); } else if (cpu_is_omap34xx()) { - val = omap_ctrl_readl(OMAP343X_CONTROL_STATUS); + val = omap_control_status_read(OMAP343X_CONTROL_STATUS); } else if (cpu_is_omap44xx()) { - val = omap_ctrl_readl(OMAP4_CTRL_MODULE_CORE_STATUS); + val = omap_control_status_read(OMAP4_CTRL_MODULE_CORE_STATUS); } else { pr_err("Cannot detect omap type!\n"); goto out;
I think I already commented on this.. This needs to become just: val = omap_control_status_read(); with no need to pass the status register as a parameter. Regards, Tony