Commit 103fd8e7 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Use signed value for sysc register offsets 



We currently don't know if a revision register exists or not. Zero is
often a valid offset for the revision register. As we are still checking
device tree data against platform data, we will get bogus warnings with
correct device tree data because of incomplete platform data.

Let's fix the issue by using signed offsets and tag the revision registers
that don't exist with -ENODEV, and init the missing ones with the correct
revision register offset.

Cc: Paul Walmsley <paul@pwsan.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent b456d4f5

arch/arm/mach-omap2/omap_hwmod.c

+11 −10
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ static int _wait_softreset_complete(struct omap_hwmod *oh) 


	sysc = oh->class->sysc;



	if (sysc->sysc_flags & SYSS_HAS_RESET_STATUS)

	if (sysc->sysc_flags & SYSS_HAS_RESET_STATUS && sysc->syss_offs > 0)

		omap_test_timeout((omap_hwmod_read(oh, sysc->syss_offs)

				   & SYSS_RESETDONE_MASK),

				  MAX_MODULE_SOFTRESET_WAIT, c);
@@ -3171,19 +3171,19 @@ static int omap_hwmod_init_regbits(struct device *dev, 
 */

int omap_hwmod_init_reg_offs(struct device *dev,

			     const struct ti_sysc_module_data *data,

			     u32 *rev_offs, u32 *sysc_offs, u32 *syss_offs)

			     s32 *rev_offs, s32 *sysc_offs, s32 *syss_offs)

{

	*rev_offs = 0;

	*rev_offs = -ENODEV;

	*sysc_offs = 0;

	*syss_offs = 0;



	if (data->offsets[SYSC_REVISION] > 0)

	if (data->offsets[SYSC_REVISION] >= 0)

		*rev_offs = data->offsets[SYSC_REVISION];



	if (data->offsets[SYSC_SYSCONFIG] > 0)

	if (data->offsets[SYSC_SYSCONFIG] >= 0)

		*sysc_offs = data->offsets[SYSC_SYSCONFIG];



	if (data->offsets[SYSC_SYSSTATUS] > 0)

	if (data->offsets[SYSC_SYSSTATUS] >= 0)

		*syss_offs = data->offsets[SYSC_SYSSTATUS];



	return 0;
@@ -3312,8 +3312,8 @@ static int omap_hwmod_check_module(struct device *dev, 
				   struct omap_hwmod *oh,

				   const struct ti_sysc_module_data *data,

				   struct sysc_regbits *sysc_fields,

				   u32 rev_offs, u32 sysc_offs,

				   u32 syss_offs, u32 sysc_flags,

				   s32 rev_offs, s32 sysc_offs,

				   s32 syss_offs, u32 sysc_flags,

				   u32 idlemodes)

{

	if (!oh->class->sysc)
@@ -3365,7 +3365,7 @@ static int omap_hwmod_check_module(struct device *dev, 
int omap_hwmod_allocate_module(struct device *dev, struct omap_hwmod *oh,

			       const struct ti_sysc_module_data *data,

			       struct sysc_regbits *sysc_fields,

			       u32 rev_offs, u32 sysc_offs, u32 syss_offs,

			       s32 rev_offs, s32 sysc_offs, s32 syss_offs,

			       u32 sysc_flags, u32 idlemodes)

{

	struct omap_hwmod_class_sysconfig *sysc;
@@ -3425,7 +3425,8 @@ int omap_hwmod_init_module(struct device *dev, 
{

	struct omap_hwmod *oh;

	struct sysc_regbits *sysc_fields;

	u32 rev_offs, sysc_offs, syss_offs, sysc_flags, idlemodes;

	s32 rev_offs, sysc_offs, syss_offs;

	u32 sysc_flags, idlemodes;

	int error;



	if (!dev || !data)

arch/arm/mach-omap2/omap_hwmod.h

+3 −3
Original line number Diff line number Diff line
@@ -317,9 +317,9 @@ struct omap_hwmod_ocp_if { 
 * then this field has to be populated with the correct offset structure.

 */

struct omap_hwmod_class_sysconfig {

	u32 rev_offs;

	u32 sysc_offs;

	u32 syss_offs;

	s32 rev_offs;

	s32 sysc_offs;

	s32 syss_offs;

	u16 sysc_flags;

	struct sysc_regbits *sysc_fields;

	u8 srst_udelay;

arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c

+1 −0
Original line number Diff line number Diff line
@@ -629,6 +629,7 @@ struct omap_hwmod am33xx_gpmc_hwmod = { 


/* 'i2c' class */

static struct omap_hwmod_class_sysconfig am33xx_i2c_sysc = {

	.rev_offs	= 0,

	.sysc_offs	= 0x0010,

	.syss_offs	= 0x0090,

	.sysc_flags	= (SYSC_HAS_AUTOIDLE | SYSC_HAS_CLOCKACTIVITY |

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

+4 −0
Original line number Diff line number Diff line
@@ -885,6 +885,7 @@ static struct omap_hwmod omap3xxx_dma_system_hwmod = { 
 */



static struct omap_hwmod_class_sysconfig omap3xxx_mcbsp_sysc = {

	.rev_offs	= -ENODEV,

	.sysc_offs	= 0x008c,

	.sysc_flags	= (SYSC_HAS_CLOCKACTIVITY | SYSC_HAS_ENAWAKEUP |

			   SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET),
@@ -990,6 +991,7 @@ static struct omap_hwmod omap3xxx_mcbsp5_hwmod = { 


/* 'mcbsp sidetone' class */

static struct omap_hwmod_class_sysconfig omap3xxx_mcbsp_sidetone_sysc = {

	.rev_offs	= -ENODEV,

	.sysc_offs	= 0x0010,

	.sysc_flags	= SYSC_HAS_AUTOIDLE,

	.sysc_fields	= &omap_hwmod_sysc_type1,
@@ -1018,6 +1020,7 @@ static struct omap_hwmod omap3xxx_mcbsp3_sidetone_hwmod = { 


/* SR common */

static struct omap_hwmod_class_sysconfig omap34xx_sr_sysc = {

	.rev_offs	= -ENODEV,

	.sysc_offs	= 0x24,

	.sysc_flags	= (SYSC_HAS_CLOCKACTIVITY | SYSC_NO_CACHE),

	.sysc_fields	= &omap34xx_sr_sysc_fields,
@@ -1030,6 +1033,7 @@ static struct omap_hwmod_class omap34xx_smartreflex_hwmod_class = { 
};



static struct omap_hwmod_class_sysconfig omap36xx_sr_sysc = {

	.rev_offs	= -ENODEV,

	.sysc_offs	= 0x38,

	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),

	.sysc_flags	= (SYSC_HAS_SIDLEMODE | SYSC_HAS_ENAWAKEUP |

arch/arm/mach-omap2/omap_hwmod_43xx_data.c

+1 −0
Original line number Diff line number Diff line
@@ -378,6 +378,7 @@ static struct omap_hwmod am43xx_usb_otg_ss1_hwmod = { 
};



static struct omap_hwmod_class_sysconfig am43xx_qspi_sysc = {

	.rev_offs	= 0,

	.sysc_offs      = 0x0010,

	.sysc_flags     = SYSC_HAS_SIDLEMODE,

	.idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |

CRA Git | Maintained and supported by SUSTech CRA and CCSE