Commit cc7e3fb6 authored by Suman Anna's avatar Suman Anna Committed by Tony Lindgren
Browse files

ARM: OMAP2+: Cleanup omap_timer_capability_dev_attr usage 



The omap_timer_capability_dev_attr data was used to supply instance
specific capabilities (like always-on, PWM functionality or ability
to interrupt DSP cores) for legacy non-DT devices. These capabilities
are now provided through device-tree properties. The legacy device
support has been cleaned up in commit 8d39ff3d ("ARM: OMAP2+:
Remove unused legacy code for timer") and this data is therefore
no longer needed. So, cleanup the structure and all the associated
data in various hwmod data files.

While at this, remove the stale header in hwmod data files that
already do not have any timer capability data.

Cc: Keerthy <j-keerthy@ti.com>
Signed-off-by: default avatarSuman Anna <s-anna@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 5297e1d7

arch/arm/mach-omap2/omap_hwmod_2420_data.c

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <linux/i2c-omap.h>

#include <linux/platform_data/spi-omap2-mcspi.h>

#include <linux/omap-dma.h>

#include <plat/dmtimer.h>



#include "omap_hwmod.h"

#include "l3_2xxx.h"

arch/arm/mach-omap2/omap_hwmod_2430_data.c

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <linux/platform_data/hsmmc-omap.h>

#include <linux/platform_data/spi-omap2-mcspi.h>

#include <linux/omap-dma.h>

#include <plat/dmtimer.h>



#include "omap_hwmod.h"

#include "l3_2xxx.h"

arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c

+0 −37
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <linux/types.h>

#include <linux/omap-dma.h>



#include <plat/dmtimer.h>

#include <linux/platform_data/spi-omap2-mcspi.h>



#include "omap_hwmod.h"
@@ -221,23 +220,7 @@ struct omap_hwmod omap2xxx_iva_hwmod = { 
	.class		= &iva_hwmod_class,

};



/* always-on timers dev attribute */

static struct omap_timer_capability_dev_attr capability_alwon_dev_attr = {

	.timer_capability       = OMAP_TIMER_ALWON,

};



/* pwm timers dev attribute */

static struct omap_timer_capability_dev_attr capability_pwm_dev_attr = {

	.timer_capability       = OMAP_TIMER_HAS_PWM,

};



/* timers with DSP interrupt dev attribute */

static struct omap_timer_capability_dev_attr capability_dsp_dev_attr = {

	.timer_capability       = OMAP_TIMER_HAS_DSP_IRQ,

};



/* timer1 */



struct omap_hwmod omap2xxx_timer1_hwmod = {

	.name		= "timer1",

	.main_clk	= "gpt1_fck",
@@ -248,13 +231,11 @@ struct omap_hwmod omap2xxx_timer1_hwmod = { 
			.idlest_idle_bit = OMAP24XX_ST_GPT1_SHIFT,

		},

	},

	.dev_attr	= &capability_alwon_dev_attr,

	.class		= &omap2xxx_timer_hwmod_class,

	.flags          = HWMOD_SET_DEFAULT_CLOCKACT,

};



/* timer2 */



struct omap_hwmod omap2xxx_timer2_hwmod = {

	.name		= "timer2",

	.main_clk	= "gpt2_fck",
@@ -270,7 +251,6 @@ struct omap_hwmod omap2xxx_timer2_hwmod = { 
};



/* timer3 */



struct omap_hwmod omap2xxx_timer3_hwmod = {

	.name		= "timer3",

	.main_clk	= "gpt3_fck",
@@ -286,7 +266,6 @@ struct omap_hwmod omap2xxx_timer3_hwmod = { 
};



/* timer4 */



struct omap_hwmod omap2xxx_timer4_hwmod = {

	.name		= "timer4",

	.main_clk	= "gpt4_fck",
@@ -302,7 +281,6 @@ struct omap_hwmod omap2xxx_timer4_hwmod = { 
};



/* timer5 */



struct omap_hwmod omap2xxx_timer5_hwmod = {

	.name		= "timer5",

	.main_clk	= "gpt5_fck",
@@ -313,13 +291,11 @@ struct omap_hwmod omap2xxx_timer5_hwmod = { 
			.idlest_idle_bit = OMAP24XX_ST_GPT5_SHIFT,

		},

	},

	.dev_attr	= &capability_dsp_dev_attr,

	.class		= &omap2xxx_timer_hwmod_class,

	.flags          = HWMOD_SET_DEFAULT_CLOCKACT,

};



/* timer6 */



struct omap_hwmod omap2xxx_timer6_hwmod = {

	.name		= "timer6",

	.main_clk	= "gpt6_fck",
@@ -330,13 +306,11 @@ struct omap_hwmod omap2xxx_timer6_hwmod = { 
			.idlest_idle_bit = OMAP24XX_ST_GPT6_SHIFT,

		},

	},

	.dev_attr	= &capability_dsp_dev_attr,

	.class		= &omap2xxx_timer_hwmod_class,

	.flags          = HWMOD_SET_DEFAULT_CLOCKACT,

};



/* timer7 */



struct omap_hwmod omap2xxx_timer7_hwmod = {

	.name		= "timer7",

	.main_clk	= "gpt7_fck",
@@ -347,13 +321,11 @@ struct omap_hwmod omap2xxx_timer7_hwmod = { 
			.idlest_idle_bit = OMAP24XX_ST_GPT7_SHIFT,

		},

	},

	.dev_attr	= &capability_dsp_dev_attr,

	.class		= &omap2xxx_timer_hwmod_class,

	.flags          = HWMOD_SET_DEFAULT_CLOCKACT,

};



/* timer8 */



struct omap_hwmod omap2xxx_timer8_hwmod = {

	.name		= "timer8",

	.main_clk	= "gpt8_fck",
@@ -364,13 +336,11 @@ struct omap_hwmod omap2xxx_timer8_hwmod = { 
			.idlest_idle_bit = OMAP24XX_ST_GPT8_SHIFT,

		},

	},

	.dev_attr	= &capability_dsp_dev_attr,

	.class		= &omap2xxx_timer_hwmod_class,

	.flags          = HWMOD_SET_DEFAULT_CLOCKACT,

};



/* timer9 */



struct omap_hwmod omap2xxx_timer9_hwmod = {

	.name		= "timer9",

	.main_clk	= "gpt9_fck",
@@ -381,13 +351,11 @@ struct omap_hwmod omap2xxx_timer9_hwmod = { 
			.idlest_idle_bit = OMAP24XX_ST_GPT9_SHIFT,

		},

	},

	.dev_attr	= &capability_pwm_dev_attr,

	.class		= &omap2xxx_timer_hwmod_class,

	.flags          = HWMOD_SET_DEFAULT_CLOCKACT,

};



/* timer10 */



struct omap_hwmod omap2xxx_timer10_hwmod = {

	.name		= "timer10",

	.main_clk	= "gpt10_fck",
@@ -398,13 +366,11 @@ struct omap_hwmod omap2xxx_timer10_hwmod = { 
			.idlest_idle_bit = OMAP24XX_ST_GPT10_SHIFT,

		},

	},

	.dev_attr	= &capability_pwm_dev_attr,

	.class		= &omap2xxx_timer_hwmod_class,

	.flags          = HWMOD_SET_DEFAULT_CLOCKACT,

};



/* timer11 */



struct omap_hwmod omap2xxx_timer11_hwmod = {

	.name		= "timer11",

	.main_clk	= "gpt11_fck",
@@ -415,13 +381,11 @@ struct omap_hwmod omap2xxx_timer11_hwmod = { 
			.idlest_idle_bit = OMAP24XX_ST_GPT11_SHIFT,

		},

	},

	.dev_attr	= &capability_pwm_dev_attr,

	.class		= &omap2xxx_timer_hwmod_class,

	.flags          = HWMOD_SET_DEFAULT_CLOCKACT,

};



/* timer12 */



struct omap_hwmod omap2xxx_timer12_hwmod = {

	.name		= "timer12",

	.main_clk	= "gpt12_fck",
@@ -432,7 +396,6 @@ struct omap_hwmod omap2xxx_timer12_hwmod = { 
			.idlest_idle_bit = OMAP24XX_ST_GPT12_SHIFT,

		},

	},

	.dev_attr	= &capability_pwm_dev_attr,

	.class		= &omap2xxx_timer_hwmod_class,

	.flags          = HWMOD_SET_DEFAULT_CLOCKACT,

};

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

+0 −36
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include "l4_3xxx.h"

#include <linux/platform_data/asoc-ti-mcbsp.h>

#include <linux/platform_data/spi-omap2-mcspi.h>

#include <plat/dmtimer.h>



#include "soc.h"

#include "omap_hwmod.h"
@@ -154,31 +153,6 @@ static struct omap_hwmod_class omap3xxx_timer_hwmod_class = { 
	.sysc = &omap3xxx_timer_sysc,

};



/* secure timers dev attribute */

static struct omap_timer_capability_dev_attr capability_secure_dev_attr = {

	.timer_capability	= OMAP_TIMER_ALWON | OMAP_TIMER_SECURE,

};



/* always-on timers dev attribute */

static struct omap_timer_capability_dev_attr capability_alwon_dev_attr = {

	.timer_capability	= OMAP_TIMER_ALWON,

};



/* pwm timers dev attribute */

static struct omap_timer_capability_dev_attr capability_pwm_dev_attr = {

	.timer_capability	= OMAP_TIMER_HAS_PWM,

};



/* timers with DSP interrupt dev attribute */

static struct omap_timer_capability_dev_attr capability_dsp_dev_attr = {

	.timer_capability       = OMAP_TIMER_HAS_DSP_IRQ,

};



/* pwm timers with DSP interrupt dev attribute */

static struct omap_timer_capability_dev_attr capability_dsp_pwm_dev_attr = {

	.timer_capability       = OMAP_TIMER_HAS_DSP_IRQ | OMAP_TIMER_HAS_PWM,

};



/* timer1 */

static struct omap_hwmod omap3xxx_timer1_hwmod = {

	.name		= "timer1",
@@ -190,7 +164,6 @@ static struct omap_hwmod omap3xxx_timer1_hwmod = { 
			.idlest_idle_bit = OMAP3430_ST_GPT1_SHIFT,

		},

	},

	.dev_attr	= &capability_alwon_dev_attr,

	.class		= &omap3xxx_timer_hwmod_class,

	.flags		= HWMOD_SET_DEFAULT_CLOCKACT,

};
@@ -251,7 +224,6 @@ static struct omap_hwmod omap3xxx_timer5_hwmod = { 
			.idlest_idle_bit = OMAP3430_ST_GPT5_SHIFT,

		},

	},

	.dev_attr	= &capability_dsp_dev_attr,

	.class		= &omap3xxx_timer_hwmod_class,

	.flags		= HWMOD_SET_DEFAULT_CLOCKACT,

};
@@ -267,7 +239,6 @@ static struct omap_hwmod omap3xxx_timer6_hwmod = { 
			.idlest_idle_bit = OMAP3430_ST_GPT6_SHIFT,

		},

	},

	.dev_attr	= &capability_dsp_dev_attr,

	.class		= &omap3xxx_timer_hwmod_class,

	.flags		= HWMOD_SET_DEFAULT_CLOCKACT,

};
@@ -283,7 +254,6 @@ static struct omap_hwmod omap3xxx_timer7_hwmod = { 
			.idlest_idle_bit = OMAP3430_ST_GPT7_SHIFT,

		},

	},

	.dev_attr	= &capability_dsp_dev_attr,

	.class		= &omap3xxx_timer_hwmod_class,

	.flags		= HWMOD_SET_DEFAULT_CLOCKACT,

};
@@ -299,7 +269,6 @@ static struct omap_hwmod omap3xxx_timer8_hwmod = { 
			.idlest_idle_bit = OMAP3430_ST_GPT8_SHIFT,

		},

	},

	.dev_attr	= &capability_dsp_pwm_dev_attr,

	.class		= &omap3xxx_timer_hwmod_class,

	.flags		= HWMOD_SET_DEFAULT_CLOCKACT,

};
@@ -315,7 +284,6 @@ static struct omap_hwmod omap3xxx_timer9_hwmod = { 
			.idlest_idle_bit = OMAP3430_ST_GPT9_SHIFT,

		},

	},

	.dev_attr	= &capability_pwm_dev_attr,

	.class		= &omap3xxx_timer_hwmod_class,

	.flags		= HWMOD_SET_DEFAULT_CLOCKACT,

};
@@ -331,7 +299,6 @@ static struct omap_hwmod omap3xxx_timer10_hwmod = { 
			.idlest_idle_bit = OMAP3430_ST_GPT10_SHIFT,

		},

	},

	.dev_attr	= &capability_pwm_dev_attr,

	.class		= &omap3xxx_timer_hwmod_class,

	.flags		= HWMOD_SET_DEFAULT_CLOCKACT,

};
@@ -347,13 +314,11 @@ static struct omap_hwmod omap3xxx_timer11_hwmod = { 
			.idlest_idle_bit = OMAP3430_ST_GPT11_SHIFT,

		},

	},

	.dev_attr	= &capability_pwm_dev_attr,

	.class		= &omap3xxx_timer_hwmod_class,

	.flags		= HWMOD_SET_DEFAULT_CLOCKACT,

};



/* timer12 */



static struct omap_hwmod omap3xxx_timer12_hwmod = {

	.name		= "timer12",

	.main_clk	= "gpt12_fck",
@@ -364,7 +329,6 @@ static struct omap_hwmod omap3xxx_timer12_hwmod = { 
			.idlest_idle_bit = OMAP3430_ST_GPT12_SHIFT,

		},

	},

	.dev_attr	= &capability_secure_dev_attr,

	.class		= &omap3xxx_timer_hwmod_class,

	.flags		= HWMOD_SET_DEFAULT_CLOCKACT,

};

arch/arm/mach-omap2/omap_hwmod_44xx_data.c

+0 −29
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 


#include <linux/platform_data/spi-omap2-mcspi.h>

#include <linux/platform_data/asoc-ti-mcbsp.h>

#include <plat/dmtimer.h>



#include "omap_hwmod.h"

#include "omap_hwmod_common_data.h"
@@ -2526,26 +2525,6 @@ static struct omap_hwmod_class omap44xx_timer_hwmod_class = { 
	.sysc	= &omap44xx_timer_sysc,

};



/* always-on timers dev attribute */

static struct omap_timer_capability_dev_attr capability_alwon_dev_attr = {

	.timer_capability	= OMAP_TIMER_ALWON,

};



/* pwm timers dev attribute */

static struct omap_timer_capability_dev_attr capability_pwm_dev_attr = {

	.timer_capability	= OMAP_TIMER_HAS_PWM,

};



/* timers with DSP interrupt dev attribute */

static struct omap_timer_capability_dev_attr capability_dsp_dev_attr = {

	.timer_capability       = OMAP_TIMER_HAS_DSP_IRQ,

};



/* pwm timers with DSP interrupt dev attribute */

static struct omap_timer_capability_dev_attr capability_dsp_pwm_dev_attr = {

	.timer_capability       = OMAP_TIMER_HAS_DSP_IRQ | OMAP_TIMER_HAS_PWM,

};



/* timer1 */

static struct omap_hwmod omap44xx_timer1_hwmod = {

	.name		= "timer1",
@@ -2560,7 +2539,6 @@ static struct omap_hwmod omap44xx_timer1_hwmod = { 
			.modulemode   = MODULEMODE_SWCTRL,

		},

	},

	.dev_attr	= &capability_alwon_dev_attr,

};



/* timer2 */
@@ -2622,7 +2600,6 @@ static struct omap_hwmod omap44xx_timer5_hwmod = { 
			.modulemode   = MODULEMODE_SWCTRL,

		},

	},

	.dev_attr	= &capability_dsp_dev_attr,

};



/* timer6 */
@@ -2638,7 +2615,6 @@ static struct omap_hwmod omap44xx_timer6_hwmod = { 
			.modulemode   = MODULEMODE_SWCTRL,

		},

	},

	.dev_attr	= &capability_dsp_dev_attr,

};



/* timer7 */
@@ -2654,7 +2630,6 @@ static struct omap_hwmod omap44xx_timer7_hwmod = { 
			.modulemode   = MODULEMODE_SWCTRL,

		},

	},

	.dev_attr	= &capability_dsp_dev_attr,

};



/* timer8 */
@@ -2670,7 +2645,6 @@ static struct omap_hwmod omap44xx_timer8_hwmod = { 
			.modulemode   = MODULEMODE_SWCTRL,

		},

	},

	.dev_attr	= &capability_dsp_pwm_dev_attr,

};



/* timer9 */
@@ -2686,7 +2660,6 @@ static struct omap_hwmod omap44xx_timer9_hwmod = { 
			.modulemode   = MODULEMODE_SWCTRL,

		},

	},

	.dev_attr	= &capability_pwm_dev_attr,

};



/* timer10 */
@@ -2703,7 +2676,6 @@ static struct omap_hwmod omap44xx_timer10_hwmod = { 
			.modulemode   = MODULEMODE_SWCTRL,

		},

	},

	.dev_attr	= &capability_pwm_dev_attr,

};



/* timer11 */
@@ -2719,7 +2691,6 @@ static struct omap_hwmod omap44xx_timer11_hwmod = { 
			.modulemode   = MODULEMODE_SWCTRL,

		},

	},

	.dev_attr	= &capability_pwm_dev_attr,

};



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE