Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 397fcaf7 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] omap: DSP registers don't need to be casted 



We're now assigning/comparing void __iomem pointers with
void __iomem pointer variables.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 0062f104

arch/arm/mach-omap1/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ static void __init omap1_clk_disable_unused(struct clk *clk) 


	/* Clocks in the DSP domain need api_ck. Just assume bootloader

	 * has not enabled any DSP clocks */

	if ((u32)clk->enable_reg == DSP_IDLECT2) {

	if (clk->enable_reg == DSP_IDLECT2) {

		printk(KERN_INFO "Skipping reset check for DSP domain "

		       "clock \"%s\"\n", clk->name);

		return;

arch/arm/mach-omap1/clock.h

+3 −3
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ static struct clk dspper_ck = { 
	.parent		= &ck_dpll1,

	.flags		= CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX |

			  RATE_CKCTL | VIRTUAL_IO_ADDRESS,

	.enable_reg	= (void __iomem *)DSP_IDLECT2,

	.enable_reg	= DSP_IDLECT2,

	.enable_bit	= EN_PERCK,

	.rate_offset	= CKCTL_PERDIV_OFFSET,

	.recalc		= &omap1_ckctl_recalc_dsp_domain,
@@ -338,7 +338,7 @@ static struct clk dspxor_ck = { 
	.parent		= &ck_ref,

	.flags		= CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX |

			  VIRTUAL_IO_ADDRESS,

	.enable_reg	= (void __iomem *)DSP_IDLECT2,

	.enable_reg	= DSP_IDLECT2,

	.enable_bit	= EN_XORPCK,

	.recalc		= &followparent_recalc,

	.enable		= &omap1_clk_enable_dsp_domain,
@@ -350,7 +350,7 @@ static struct clk dsptim_ck = { 
	.parent		= &ck_ref,

	.flags		= CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX |

			  VIRTUAL_IO_ADDRESS,

	.enable_reg	= (void __iomem *)DSP_IDLECT2,

	.enable_reg	= DSP_IDLECT2,

	.enable_bit	= EN_DSPTIMCK,

	.recalc		= &followparent_recalc,

	.enable		= &omap1_clk_enable_dsp_domain,