---

yaml
---
r: 69535
b: refs/heads/master
c: 435b6e9
h: refs/heads/master
i:
  69533: ca2727b
  69531: 70b9de4
  69527: f3a7064
  69519: e8970e9
  69503: d56e0b6
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6549e6c9575c897514b183071a2b5d839cef9469
+refs/heads/master: 435b6e94b88af96c3f5b5798c087978c3793400c

trunk/arch/arm/mach-pxa/pxa25x.c

@@ -115,8 +115,8 @@ static struct clk pxa25x_clks[] = {
 	INIT_CK("LCDCLK", LCD, &clk_pxa25x_lcd_ops, &pxa_device_fb.dev),
 	INIT_CKEN("UARTCLK", FFUART, 14745600, 1, &pxa_device_ffuart.dev),
 	INIT_CKEN("UARTCLK", BTUART, 14745600, 1, &pxa_device_btuart.dev),
-	INIT_CKEN("UARTCLK", STUART, 14745600, 1, &pxa_device_stuart.dev),
 	INIT_CKEN("UARTCLK", BTUART, 14745600, 1, &pxa_device_btuart.dev),
+	INIT_CKEN("UARTCLK", STUART, 14745600, 1, NULL),
 	INIT_CKEN("UDCCLK", USB, 47923000, 5, &pxa_device_udc.dev),
 	INIT_CKEN("MMCCLK", MMC, 19169000, 0, &pxa_device_mci.dev),
 	INIT_CKEN("I2CCLK", I2C, 31949000, 0, &pxa_device_i2c.dev),
@@ -126,8 +126,8 @@ static struct clk pxa25x_clks[] = {
 	INIT_CKEN("SSPCLK",  SSP,  3686400,  0, NULL),
 	INIT_CKEN("I2SCLK",  I2S,  14745600, 0, NULL),
 	INIT_CKEN("NSSPCLK", NSSP, 3686400,  0, NULL),
-	INIT_CKEN("FICPCLK", FICP, 47923000, 0, NULL),
 	*/
+	INIT_CKEN("FICPCLK", FICP, 47923000, 0, NULL),
 };
 
 #ifdef CONFIG_PM

trunk/arch/arm/mach-pxa/pxa27x.c

@@ -136,9 +136,9 @@ static struct clk pxa27x_clks[] = {
 	INIT_CK("LCDCLK", LCD,    &clk_pxa27x_lcd_ops, &pxa_device_fb.dev),
 	INIT_CK("CAMCLK", CAMERA, &clk_pxa27x_lcd_ops, NULL),
 
-	INIT_CKEN("UARTCLK", STUART, 14857000, 1, &pxa_device_stuart.dev),
 	INIT_CKEN("UARTCLK", FFUART, 14857000, 1, &pxa_device_ffuart.dev),
 	INIT_CKEN("UARTCLK", BTUART, 14857000, 1, &pxa_device_btuart.dev),
+	INIT_CKEN("UARTCLK", STUART, 14857000, 1, NULL),
 
 	INIT_CKEN("I2SCLK",  I2S,  14682000, 0, &pxa_device_i2s.dev),
 	INIT_CKEN("I2CCLK",  I2C,  32842000, 0, &pxa_device_i2c.dev),