[PATCH 1/2] sh: sh7724.h: bugfix: remove unused clock index

[PATCH 1/2] sh: sh7724.h: bugfix: remove unused clock index

[Kuninori Morimoto]

Current sh clocks are using pm_runtime frame work instead of old hwblk.
So, HWBLK_UNKNOWN and HWBLK_DBG are not needed for now.

Now mstp32 clocks are registered by sh_clk_mstp32_register(),
but the clock which isn't defined by SH_CLK_MSTP32() macro
will be crash. because it doesn't have enable_reg.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 arch/sh/include/cpu-sh4/cpu/sh7724.h |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/arch/sh/include/cpu-sh4/cpu/sh7724.h b/arch/sh/include/cpu-sh4/cpu/sh7724.h
index cbc47e6..ea9ada3 100644
--- a/arch/sh/include/cpu-sh4/cpu/sh7724.h
+++ b/arch/sh/include/cpu-sh4/cpu/sh7724.h
@@ -268,10 +268,9 @@ enum {
 };
 
 enum {
-	HWBLK_UNKNOWN = 0,
 	HWBLK_TLB, HWBLK_IC, HWBLK_OC, HWBLK_RSMEM, HWBLK_ILMEM, HWBLK_L2C,
 	HWBLK_FPU, HWBLK_INTC, HWBLK_DMAC0, HWBLK_SHYWAY,
-	HWBLK_HUDI, HWBLK_DBG, HWBLK_UBC,
+	HWBLK_HUDI, HWBLK_UBC,
 	HWBLK_TMU0, HWBLK_CMT, HWBLK_RWDT, HWBLK_DMAC1, HWBLK_TMU1,
 	HWBLK_SCIF0, HWBLK_SCIF1, HWBLK_SCIF2, HWBLK_SCIF3,
 	HWBLK_SCIF4, HWBLK_SCIF5, HWBLK_MSIOF0, HWBLK_MSIOF1,
-- 
1.7.5.4

Re: [PATCH 1/2] sh: sh7724.h: bugfix: remove unused clock index

[Paul Mundt]

On Mon, Nov 21, 2011 at 06:59:54PM -0800, Kuninori Morimoto wrote:
> Current sh clocks are using pm_runtime frame work instead of old hwblk.
> So, HWBLK_UNKNOWN and HWBLK_DBG are not needed for now.
> 
> Now mstp32 clocks are registered by sh_clk_mstp32_register(),
> but the clock which isn't defined by SH_CLK_MSTP32() macro
> will be crash. because it doesn't have enable_reg.

On Mon, Nov 21, 2011 at 07:00:04PM -0800, Kuninori Morimoto wrote:
> Current sh clocks are using pm_runtime frame work instead of old hwblk.
> So, HWBLK_UNKNOWN, HWBLK_DBG and HWBLK_SUBC are not needed for now.
> 
> Now mstp32 clocks are registered by sh_clk_mstp32_register(),
> but the clock which isn't defined by SH_CLK_MSTP32() macro
> will be crash. because it doesn't have enable_reg.

On Wed, Nov 23, 2011 at 10:53:46PM +0100, Guennadi Liakhovetski wrote:
> Unused indices produce empty entries in the clock array, which then lead to
> Oopses at boot-time.

All applied to sh/hwblk, thanks.