ARM: S3C64XX: Compress s3c6400-clock.c code

The individually named clocks are all static to the code
and thus can be compressed into a single array and then
the array can be referenced. This removes the need for
a seperate array of pointers to clocks.

Fix a minor problem of re-initialising the pointers in
s3c6400_set_clksrc() as this is also called by the cpufreq
code. Move these initialisations to the code that does the
registration.

Based on Harald Welte's original clock changes patch.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>

arch/arm/plat-s3c64xx/s3c6400-clock.c

@@ -255,7 +255,6 @@ static struct clk_sources clkset_uhost = {
 	.nr_sources	= ARRAY_SIZE(clkset_uhost_list),
 };
 
-
 /* The peripheral clocks are all controlled via clocksource followed
  * by an optional divider and gate stage. We currently roll this into
  * one clock which hides the intermediate clock from the mux.
@@ -354,7 +353,60 @@ static unsigned long s3c64xx_roundrate_clksrc(struct clk *clk,
 	return rate;
 }
 
-static struct clksrc_clk clk_mmc0 = {
+/* clocks that feed other parts of the clock source tree */
+
+static struct clk clk_iis_cd0 = {
+	.name		= "iis_cdclk0",
+	.id		= -1,
+};
+
+static struct clk clk_iis_cd1 = {
+	.name		= "iis_cdclk1",
+	.id		= -1,
+};
+
+static struct clk clk_pcm_cd = {
+	.name		= "pcm_cdclk",
+	.id		= -1,
+};
+
+static struct clk *clkset_audio0_list[] = {
+	[0] = &clk_mout_epll.clk,
+	[1] = &clk_dout_mpll,
+	[2] = &clk_fin_epll,
+	[3] = &clk_iis_cd0,
+	[4] = &clk_pcm_cd,
+};
+
+static struct clk_sources clkset_audio0 = {
+	.sources	= clkset_audio0_list,
+	.nr_sources	= ARRAY_SIZE(clkset_audio0_list),
+};
+
+static struct clk *clkset_audio1_list[] = {
+	[0] = &clk_mout_epll.clk,
+	[1] = &clk_dout_mpll,
+	[2] = &clk_fin_epll,
+	[3] = &clk_iis_cd1,
+	[4] = &clk_pcm_cd,
+};
+
+static struct clk_sources clkset_audio1 = {
+	.sources	= clkset_audio1_list,
+	.nr_sources	= ARRAY_SIZE(clkset_audio1_list),
+};
+
+static struct clk *clkset_camif_list[] = {
+	&clk_h2,
+};
+
+static struct clk_sources clkset_camif = {
+	.sources	= clkset_camif_list,
+	.nr_sources	= ARRAY_SIZE(clkset_camif_list),
+};
+
+static struct clksrc_clk clksrcs[] = {
+	{
 		.clk	= {
 			.name		= "mmc_bus",
 			.id		= 0,
@@ -366,9 +418,7 @@ static struct clksrc_clk clk_mmc0 = {
 		.sources	= &clkset_spi_mmc,
 		.divider_shift	= S3C6400_CLKDIV1_MMC0_SHIFT,
 		.reg_divider	= S3C_CLK_DIV1,
-};
-
-static struct clksrc_clk clk_mmc1 = {
+	}, {
 		.clk	= {
 			.name		= "mmc_bus",
 			.id		= 1,
@@ -380,9 +430,7 @@ static struct clksrc_clk clk_mmc1 = {
 		.sources	= &clkset_spi_mmc,
 		.divider_shift	= S3C6400_CLKDIV1_MMC1_SHIFT,
 		.reg_divider	= S3C_CLK_DIV1,
-};
-
-static struct clksrc_clk clk_mmc2 = {
+	}, {
 		.clk	= {
 			.name		= "mmc_bus",
 			.id		= 2,
@@ -394,9 +442,7 @@ static struct clksrc_clk clk_mmc2 = {
 		.sources	= &clkset_spi_mmc,
 		.divider_shift	= S3C6400_CLKDIV1_MMC2_SHIFT,
 		.reg_divider	= S3C_CLK_DIV1,
-};
-
-static struct clksrc_clk clk_usbhost = {
+	}, {
 		.clk	= {
 			.name		= "usb-bus-host",
 			.id		= -1,
@@ -408,9 +454,7 @@ static struct clksrc_clk clk_usbhost = {
 		.sources	= &clkset_uhost,
 		.divider_shift	= S3C6400_CLKDIV1_UHOST_SHIFT,
 		.reg_divider	= S3C_CLK_DIV1,
-};
-
-static struct clksrc_clk clk_uart_uclk1 = {
+	}, {
 		.clk	= {
 			.name		= "uclk1",
 			.id		= -1,
@@ -422,11 +466,8 @@ static struct clksrc_clk clk_uart_uclk1 = {
 		.sources	= &clkset_uart,
 		.divider_shift	= S3C6400_CLKDIV2_UART_SHIFT,
 		.reg_divider	= S3C_CLK_DIV2,
-};
-
+	}, {
 /* Where does UCLK0 come from? */
-
-static struct clksrc_clk clk_spi0 = {
 		.clk	= {
 			.name		= "spi-bus",
 			.id		= 0,
@@ -438,9 +479,7 @@ static struct clksrc_clk clk_spi0 = {
 		.sources	= &clkset_spi_mmc,
 		.divider_shift	= S3C6400_CLKDIV2_SPI0_SHIFT,
 		.reg_divider	= S3C_CLK_DIV2,
-};
-
-static struct clksrc_clk clk_spi1 = {
+	}, {
 		.clk	= {
 			.name		= "spi-bus",
 			.id		= 1,
@@ -452,37 +491,7 @@ static struct clksrc_clk clk_spi1 = {
 		.sources	= &clkset_spi_mmc,
 		.divider_shift	= S3C6400_CLKDIV2_SPI1_SHIFT,
 		.reg_divider	= S3C_CLK_DIV2,
-};
-
-static struct clk clk_iis_cd0 = {
-	.name		= "iis_cdclk0",
-	.id		= -1,
-};
-
-static struct clk clk_iis_cd1 = {
-	.name		= "iis_cdclk1",
-	.id		= -1,
-};
-
-static struct clk clk_pcm_cd = {
-	.name		= "pcm_cdclk",
-	.id		= -1,
-};
-
-static struct clk *clkset_audio0_list[] = {
-	[0] = &clk_mout_epll.clk,
-	[1] = &clk_dout_mpll,
-	[2] = &clk_fin_epll,
-	[3] = &clk_iis_cd0,
-	[4] = &clk_pcm_cd,
-};
-
-static struct clk_sources clkset_audio0 = {
-	.sources	= clkset_audio0_list,
-	.nr_sources	= ARRAY_SIZE(clkset_audio0_list),
-};
-
-static struct clksrc_clk clk_audio0 = {
+	}, {
 		.clk	= {
 			.name		= "audio-bus",
 			.id		= 0,
@@ -494,22 +503,7 @@ static struct clksrc_clk clk_audio0 = {
 		.sources	= &clkset_audio0,
 		.divider_shift	= S3C6400_CLKDIV2_AUDIO0_SHIFT,
 		.reg_divider	= S3C_CLK_DIV2,
-};
-
-static struct clk *clkset_audio1_list[] = {
-	[0] = &clk_mout_epll.clk,
-	[1] = &clk_dout_mpll,
-	[2] = &clk_fin_epll,
-	[3] = &clk_iis_cd1,
-	[4] = &clk_pcm_cd,
-};
-
-static struct clk_sources clkset_audio1 = {
-	.sources	= clkset_audio1_list,
-	.nr_sources	= ARRAY_SIZE(clkset_audio1_list),
-};
-
-static struct clksrc_clk clk_audio1 = {
+	}, {
 		.clk	= {
 			.name		= "audio-bus",
 			.id		= 1,
@@ -521,9 +515,7 @@ static struct clksrc_clk clk_audio1 = {
 		.sources	= &clkset_audio1,
 		.divider_shift	= S3C6400_CLKDIV2_AUDIO1_SHIFT,
 		.reg_divider	= S3C_CLK_DIV2,
-};
-
-static struct clksrc_clk clk_irda = {
+	}, {
 		.clk	= {
 			.name		= "irda-bus",
 			.id		= 0,
@@ -535,18 +527,7 @@ static struct clksrc_clk clk_irda = {
 		.sources	= &clkset_irda,
 		.divider_shift	= S3C6400_CLKDIV2_IRDA_SHIFT,
 		.reg_divider	= S3C_CLK_DIV2,
-};
-
-static struct clk *clkset_camif_list[] = {
-	&clk_h2,
-};
-
-static struct clk_sources clkset_camif = {
-	.sources	= clkset_camif_list,
-	.nr_sources	= ARRAY_SIZE(clkset_camif_list),
-};
-
-static struct clksrc_clk clk_camif = {
+	}, {
 		.clk	= {
 			.name		= "camera",
 			.id		= -1,
@@ -558,6 +539,7 @@ static struct clksrc_clk clk_camif = {
 		.sources	= &clkset_camif,
 		.divider_shift	= S3C6400_CLKDIV0_CAM_SHIFT,
 		.reg_divider	= S3C_CLK_DIV0,
+	},
 };
 
 /* Clock initialisation code */
@@ -566,17 +548,6 @@ static struct clksrc_clk *init_parents[] = {
 	&clk_mout_apll,
 	&clk_mout_epll,
 	&clk_mout_mpll,
-	&clk_mmc0,
-	&clk_mmc1,
-	&clk_mmc2,
-	&clk_usbhost,
-	&clk_uart_uclk1,
-	&clk_spi0,
-	&clk_spi1,
-	&clk_audio0,
-	&clk_audio1,
-	&clk_irda,
-	&clk_camif,
 };
 
 static void __init_or_cpufreq s3c6400_set_clksrc(struct clksrc_clk *clk)
@@ -593,11 +564,6 @@ static void __init_or_cpufreq s3c6400_set_clksrc(struct clksrc_clk *clk)
 		return;
 	}
 
-	clk->clk.get_rate = s3c64xx_getrate_clksrc;
-	clk->clk.set_rate = s3c64xx_setrate_clksrc;
-	clk->clk.set_parent = s3c64xx_setparent_clksrc;
-	clk->clk.round_rate = s3c64xx_roundrate_clksrc;
-
 	clk->clk.parent = srcs->sources[clksrc];
 
 	printk(KERN_INFO "%s: source is %s (%d), rate is %ld\n",
@@ -664,6 +630,9 @@ void __init_or_cpufreq s3c6400_setup_clocks(void)
 
 	for (ptr = 0; ptr < ARRAY_SIZE(init_parents); ptr++)
 		s3c6400_set_clksrc(init_parents[ptr]);
+
+	for (ptr = 0; ptr < ARRAY_SIZE(clksrcs); ptr++)
+		s3c6400_set_clksrc(&clksrcs[ptr]);
 }
 
 static struct clk *clks[] __initdata = {
@@ -674,17 +643,6 @@ static struct clk *clks[] __initdata = {
 	&clk_mout_epll.clk,
 	&clk_mout_mpll.clk,
 	&clk_dout_mpll,
-	&clk_mmc0.clk,
-	&clk_mmc1.clk,
-	&clk_mmc2.clk,
-	&clk_usbhost.clk,
-	&clk_uart_uclk1.clk,
-	&clk_spi0.clk,
-	&clk_spi1.clk,
-	&clk_audio0.clk,
-	&clk_audio1.clk,
-	&clk_irda.clk,
-	&clk_camif.clk,
 	&clk_arm,
 };
 
@@ -716,4 +674,20 @@ void __init s3c6400_register_clocks(unsigned armclk_divlimit)
 			       clkp->name, ret);
 		}
 	}
+
+	for (ptr = 0; ptr < ARRAY_SIZE(clksrcs); ptr++) {
+		clkp = &clksrcs[ptr].clk;
+
+		/* all clksrc clocks have these */
+		clkp->get_rate = s3c64xx_getrate_clksrc;
+		clkp->set_rate = s3c64xx_setrate_clksrc;
+		clkp->set_parent = s3c64xx_setparent_clksrc;
+		clkp->round_rate = s3c64xx_roundrate_clksrc;
+
+		ret = s3c24xx_register_clock(clkp);
+		if (ret < 0) {
+			printk(KERN_ERR "Failed to register clock %s (%d)\n",
+			       clkp->name, ret);
+		}
+	}
 }