Skip to contentSkip to conversation

omap2: trivial cleanup patches

PATCH In review Paul Walmsley 2 participants 5 messages May 2, 2007 – May 3, 2007

Subsystems (4)
Arm (32-bit) Arm sub-architectures OMAP2+ support OMAP clock framework support
lore
Share & tools
lore

Paul Walmsley

author maintainer
#0 lore raw

cover omap2: trivial cleanup patches

Hello,

Here are three trivial cleanup patches against linux-omap git head. Patches 1 and 2 fix some formatting issues in mach-omap2/clock.h, patch 3 hoists and renames the OMAP242X_CONTROL_STATUS defines in arch-omap/omap24xx.h to indicate that the define is shared across architectures.

- Paul

author maintainer
#1 lore raw

PATCH 1/3 omap2: standardize clock.h enable_reg/enable_bit order

A few of the clock definitions in mach-omap2/clock.h list the .enable_bit member before .enable_reg. This fixes those to conform with the order used in the rest of the file.

Signed-off-by Paul Walmsley <[email protected]>
---
 arch/arm/mach-omap2/clock.h |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-omap2/clock.h +4 -4
Index: linux-omap-2.6/arch/arm/mach-omap2/clock.h
===================================================================
@@ -1318,8 +1318,8 @@ static struct clk mcbsp1_ick = {
 	.name		= "mcbsp1_ick",
 	.parent		= &l4_ck,
 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,
-	.enable_bit	= 15,
 	.enable_reg	= (void __iomem *)&CM_ICLKEN1_CORE,	 /* bit16 */
+	.enable_bit	= 15,
 	.recalc		= &omap2_followparent_recalc,
 };
 

@@ -1327,8 +1327,8 @@ static struct clk mcbsp1_fck = {
 	.name		= "mcbsp1_fck",
 	.parent		= &func_96m_ck,
 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,
-	.enable_bit	= 15,
 	.enable_reg	= (void __iomem *)&CM_FCLKEN1_CORE,
+	.enable_bit	= 15,
 	.recalc		= &omap2_followparent_recalc,
 };
 

@@ -1336,8 +1336,8 @@ static struct clk mcbsp2_ick = {
 	.name		= "mcbsp2_ick",
 	.parent		= &l4_ck,
 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,
-	.enable_bit	= 16,
 	.enable_reg	= (void __iomem *)&CM_ICLKEN1_CORE,
+	.enable_bit	= 16,
 	.recalc		= &omap2_followparent_recalc,
 };
 

@@ -1345,8 +1345,8 @@ static struct clk mcbsp2_fck = {
 	.name		= "mcbsp2_fck",
 	.parent		= &func_96m_ck,
 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,
-	.enable_bit	= 16,
 	.enable_reg	= (void __iomem *)&CM_FCLKEN1_CORE,
+	.enable_bit	= 16,
 	.recalc		= &omap2_followparent_recalc,
 };
author maintainer
#2 lore raw

PATCH 2/3 omap2: fix clock.h rate_offset whitespace

In reply to Paul Walmsley

Some of the .rate_offset lines in clock.h have whitespace problems; fix them.

Signed-off-by Paul Walmsley <[email protected]>
---
 arch/arm/mach-omap2/clock.h |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm/mach-omap2/clock.h +6 -6
Index: linux-omap-2.6/arch/arm/mach-omap2/clock.h
===================================================================
@@ -832,7 +832,7 @@ static struct clk dsp_ick = {
 	.parent		= &dsp_fck,
 	.flags		= CLOCK_IN_OMAP242X | RATE_CKCTL | CM_DSP_SEL1 |
 				DELAYED_APP | CONFIG_PARTICIPANT,
-	.rate_offset = 5,
+	.rate_offset	= 5,
 	.enable_reg	= (void __iomem *)&CM_ICLKEN_DSP,
 	.enable_bit	= 1,		/* for ipi */
 	.recalc		= &omap2_clksel_recalc,

@@ -843,7 +843,7 @@ static struct clk iva1_ifck = {
 	.parent		= &core_ck,
 	.flags		= CLOCK_IN_OMAP242X | CM_DSP_SEL1 | RATE_CKCTL |
 			CONFIG_PARTICIPANT | RATE_PROPAGATES | DELAYED_APP,
-	.rate_offset= 8,
+	.rate_offset	= 8,
 	.enable_reg	= (void __iomem *)&CM_FCLKEN_DSP,
 	.enable_bit	= 10,
 	.recalc		= &omap2_clksel_recalc,

@@ -897,7 +897,7 @@ static struct clk usb_l4_ick = {	/* FS-U
 				CONFIG_PARTICIPANT,
 	.enable_reg	= (void __iomem *)&CM_ICLKEN2_CORE,
 	.enable_bit	= 0,
-	.rate_offset = 25,
+	.rate_offset	= 25,
 	.recalc		= &omap2_clksel_recalc,
 };
 

@@ -916,7 +916,7 @@ static struct clk ssi_ssr_sst_fck = {
 				RATE_CKCTL | CM_CORE_SEL1 | DELAYED_APP,
 	.enable_reg	= (void __iomem *)&CM_FCLKEN2_CORE,	/* bit 1 */
 	.enable_bit	= 1,
-	.rate_offset = 20,
+	.rate_offset	= 20,
 	.recalc		= &omap2_clksel_recalc,
 };
 

@@ -938,7 +938,7 @@ static struct clk gfx_3d_fck = {
 				RATE_CKCTL | CM_GFX_SEL1,
 	.enable_reg	= (void __iomem *)&CM_FCLKEN_GFX,
 	.enable_bit	= 2,
-	.rate_offset= 0,
+	.rate_offset	= 0,
 	.recalc		= &omap2_clksel_recalc,
 };
 

@@ -949,7 +949,7 @@ static struct clk gfx_2d_fck = {
 				RATE_CKCTL | CM_GFX_SEL1,
 	.enable_reg	= (void __iomem *)&CM_FCLKEN_GFX,
 	.enable_bit	= 1,
-	.rate_offset= 0,
+	.rate_offset	= 0,
 	.recalc		= &omap2_clksel_recalc,
 };
author maintainer
#3 lore raw

PATCH 3/3 omap2: merge CONTROL_STATUS defines

In reply to Paul Walmsley

The *_CONTROL_STATUS defines in include/asm-arm/arch-omap/omap24xx.h are shared between 2420 and 2430, so merge and rename those defines to reflect that.

Signed-off-by Paul Walmsley <[email protected]>
---
 arch/arm/mach-omap2/board-h4.c       |    2 +-
 include/asm-arm/arch-omap/omap24xx.h |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/board-h4.c +1 -1
Index: linux-omap-2.6/arch/arm/mach-omap2/board-h4.c
===================================================================
@@ -265,7 +265,7 @@ static struct platform_device *h4_device
 /* 2420 Sysboot setup (2430 is different) */
 static u32 get_sysboot_value(void)
 {
-	return (omap_readl(OMAP242X_CONTROL_STATUS) & 0xFFF);
+	return (omap_readl(OMAP24XX_CONTROL_STATUS) & 0xFFF);
 }
 
 /* FIXME: This function should be moved to some other file, gpmc.c? */
include/asm-arm/arch-omap/omap24xx.h +2 -2
Index: linux-omap-2.6/include/asm-arm/arch-omap/omap24xx.h
===================================================================
@@ -17,17 +17,17 @@
 #define OMAP24XX_IVA_INTC_BASE	0x40000000
 #define IRQ_SIR_IRQ		0x0040
 
+#define OMAP24XX_CONTROL_STATUS	(L4_24XX_BASE + 0x2f8)
+
 #ifdef CONFIG_ARCH_OMAP2420
 #define OMAP24XX_32KSYNCT_BASE	(L4_24XX_BASE + 0x4000)
 #define OMAP24XX_PRCM_BASE	(L4_24XX_BASE + 0x8000)
 #define OMAP24XX_SDRC_BASE	(L3_24XX_BASE + 0x9000)
-#define OMAP242X_CONTROL_STATUS	(L4_24XX_BASE + 0x2f8)
 #endif
 
 #ifdef CONFIG_ARCH_OMAP2430
 #define OMAP24XX_32KSYNCT_BASE	(L4_WK_243X_BASE + 0x20000)
 #define OMAP24XX_PRCM_BASE	(L4_WK_243X_BASE + 0x6000)
-#define OMAP242X_CONTROL_STATUS	(L4_24XX_BASE + 0x2f8)
 #define OMAP243X_SMS_BASE	0x6C000000
 #define OMAP24XX_SDRC_BASE	0x6D000000
 #define OMAP243X_GPMC_BASE	0x6E000000
maintainer
#4 lore raw
In reply to Paul Walmsley
Quoted 7 lines · Paul Walmsley

Hello,

Here are three trivial cleanup patches against linux-omap git head. Patches 1 and 2 fix some formatting issues in mach-omap2/clock.h, patch 3 hoists and renames the OMAP242X_CONTROL_STATUS defines in arch-omap/omap24xx.h to indicate that the define is shared across architectures.

Thanks, pushing these today.

Tony