diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-04 10:10:54 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-02-02 09:49:08 -0500 |
commit | db8ac47cfccaafd3fa4c5c15320809d44f4fcef9 (patch) | |
tree | 34265bd60e6d082979cdc5ff5dc23e21ef0b9d9d /arch/arm/mach-omap1 | |
parent | de8696203e64f19ea26f8e096ac8a796e78216b3 (diff) |
[ARM] omap: remove VIRTUAL_CLOCK
Nothing tests the clock flags for this bit, so it serves no purpose.
Remove it.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap1')
-rw-r--r-- | arch/arm/mach-omap1/clock.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-omap1/clock.h b/arch/arm/mach-omap1/clock.h index c1dcdf18d8dd..d4ccba464b4c 100644 --- a/arch/arm/mach-omap1/clock.h +++ b/arch/arm/mach-omap1/clock.h | |||
@@ -734,7 +734,7 @@ static struct clk mmc2_ck = { | |||
734 | static struct clk virtual_ck_mpu = { | 734 | static struct clk virtual_ck_mpu = { |
735 | .name = "mpu", | 735 | .name = "mpu", |
736 | .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | | 736 | .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | |
737 | CLOCK_IN_OMAP310 | VIRTUAL_CLOCK | ALWAYS_ENABLED, | 737 | CLOCK_IN_OMAP310 | ALWAYS_ENABLED, |
738 | .parent = &arm_ck, /* Is smarter alias for */ | 738 | .parent = &arm_ck, /* Is smarter alias for */ |
739 | .recalc = &followparent_recalc, | 739 | .recalc = &followparent_recalc, |
740 | .set_rate = &omap1_select_table_rate, | 740 | .set_rate = &omap1_select_table_rate, |
@@ -749,8 +749,7 @@ static struct clk i2c_fck = { | |||
749 | .name = "i2c_fck", | 749 | .name = "i2c_fck", |
750 | .id = 1, | 750 | .id = 1, |
751 | .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | | 751 | .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | |
752 | VIRTUAL_CLOCK | CLOCK_NO_IDLE_PARENT | | 752 | CLOCK_NO_IDLE_PARENT | ALWAYS_ENABLED, |
753 | ALWAYS_ENABLED, | ||
754 | .parent = &armxor_ck.clk, | 753 | .parent = &armxor_ck.clk, |
755 | .recalc = &followparent_recalc, | 754 | .recalc = &followparent_recalc, |
756 | .enable = &omap1_clk_enable_generic, | 755 | .enable = &omap1_clk_enable_generic, |
@@ -760,8 +759,7 @@ static struct clk i2c_fck = { | |||
760 | static struct clk i2c_ick = { | 759 | static struct clk i2c_ick = { |
761 | .name = "i2c_ick", | 760 | .name = "i2c_ick", |
762 | .id = 1, | 761 | .id = 1, |
763 | .flags = CLOCK_IN_OMAP16XX | | 762 | .flags = CLOCK_IN_OMAP16XX | CLOCK_NO_IDLE_PARENT | |
764 | VIRTUAL_CLOCK | CLOCK_NO_IDLE_PARENT | | ||
765 | ALWAYS_ENABLED, | 763 | ALWAYS_ENABLED, |
766 | .parent = &armper_ck.clk, | 764 | .parent = &armper_ck.clk, |
767 | .recalc = &followparent_recalc, | 765 | .recalc = &followparent_recalc, |