From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: Re: [PATCH v3 3/7] OMAP2+: use control module mfd driver in omap_type Date: Wed, 8 Aug 2012 06:50:00 -0700 Message-ID: <20120808135000.GD11011@atomide.com> References: <4FEB4B4A.1040204@dev.rtsoft.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <4FEB4B4A.1040204@dev.rtsoft.ru> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-pm-bounces@lists.linux-foundation.org Errors-To: linux-pm-bounces@lists.linux-foundation.org To: Konstantin Baydarov Cc: amit.kucheria@linaro.org, kishon@ti.com, balbi@ti.com, linux-pm@lists.linux-foundation.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org List-Id: linux-pm@vger.kernel.org * Konstantin Baydarov [120627 11:09]: > --- a/arch/arm/mach-omap2/id.c > +++ b/arch/arm/mach-omap2/id.c > @@ -18,6 +18,7 @@ > #include > #include > #include > +#include > > #include > > @@ -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