Skip to contentSkip to conversation

ARM: OMAP1/2: clock: Remove unused mpurate cmdline option

PATCH New Andrew Murray 2 participants 2 messages Jan 23, 2017 – Jan 24, 2017

Subsystems (5)
Arm (32-bit) Arm sub-architectures OMAP2+ support OMAP1 support +1 more subsystems
lore
Share & tools
lore

Andrew Murray

author
#0 lore raw

PATCH v3 1/1 ARM: OMAP1/2: clock: Remove unused mpurate cmdline option

The 'mpurate' option, historically used for specifying an initial MPU rate at boot, no longer has any effect due to the supporting code being removed as it was 'wrong and dangerous' [1].

This patch removes the remaining dead code associated with the __setup macros to avoid confusion and reduce bloat.

[1] https://patchwork.kernel.org/patch/5954631/

Signed-off-by Andrew Murray <[email protected]>

---
Changes since v1:

* Remove related omap2_clk_print_new_rates function which is also unused (this was previously used to print clock rates after use of mpurate)

Changes since v2:

* Add missing Signed-off-by

---
 arch/arm/mach-omap1/clock.c | 20 ---------------
 arch/arm/mach-omap1/clock.h |  2 --
 arch/arm/mach-omap2/clock.c | 61 ---------------------------------------------
 arch/arm/mach-omap2/clock.h |  4 ---
 4 files changed, 87 deletions(-)
arch/arm/mach-omap1/clock.c +0 -20
index 4f5fd4a..43e3e18 100644
@@ -720,26 +720,6 @@ EXPORT_SYMBOL(clk_get_parent);
  * OMAP specific clock functions shared between omap1 and omap2
  */
 
-int __initdata mpurate;
-
-/*
- * By default we use the rate set by the bootloader.
- * You can override this with mpurate= cmdline option.
- */
-static int __init omap_clk_setup(char *str)
-{
-	get_option(&str, &mpurate);
-
-	if (!mpurate)
-		return 1;
-
-	if (mpurate < 1000)
-		mpurate *= 1000000;
-
-	return 1;
-}
-__setup("mpurate=", omap_clk_setup);
-
 /* Used for clocks that always have same value as the parent clock */
 unsigned long followparent_recalc(struct clk *clk)
 {
arch/arm/mach-omap1/clock.h +0 -2
index 1e4918a..f2d1be2 100644
@@ -173,8 +173,6 @@ struct clk_functions {
 	void		(*clk_disable_unused)(struct clk *clk);
 };
 
-extern int mpurate;
-
 extern int clk_init(struct clk_functions *custom_clocks);
 extern void clk_preinit(struct clk *clk);
 extern int clk_register(struct clk *clk);
arch/arm/mach-omap2/clock.c +0 -61

73 lines not on this page · raw message

arch/arm/mach-omap2/clock.h +0 -4
index 67da640..4e66295 100644
@@ -64,10 +64,6 @@
 #define OMAP4XXX_EN_DPLL_FRBYPASS		0x6
 #define OMAP4XXX_EN_DPLL_LOCKED			0x7
 
-void omap2_clk_print_new_rates(const char *hfclkin_ck_name,
-			       const char *core_ck_name,
-			       const char *mpu_ck_name);
-
 extern u16 cpu_mask;
 
 extern const struct clkops clkops_omap2_dflt_wait;
Signature · 1 line
2.5.0
maintainer
#1 lore raw

PATCH v3 1/1 ARM: OMAP1/2: clock: Remove unused mpurate cmdline option

Quoted 13 lines · Andrew Murray

The 'mpurate' option, historically used for specifying an initial MPU rate at boot, no longer has any effect due to the supporting code being removed as it was 'wrong and dangerous' [1].

This patch removes the remaining dead code associated with the __setup macros to avoid confusion and reduce bloat.

[1] https://patchwork.kernel.org/patch/5954631/

Signed-off-by Andrew Murray <[email protected]>

---
Changes since v1:

Quoted 6 lines

* Remove related omap2_clk_print_new_rates function which is also unused (this was previously used to print clock rates after use of mpurate)

Changes since v2:

* Add missing Signed-off-by

Applying into omap-for-v4.11/soc with Aaro's ack from the previsou version.

Thanks,

Tony