Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
ARM: mach-shmobile: mackerel: modify LCDC clock divider value
ARM: mach-shmobile: ap4evb: modify LCDC clock divider value
ARM: mach-shmobile: mackerel: fixup memory initialize for zboot
ARM: mach-shmobile: ap4evb: fixup memory initialize for zboot
ARM: mach-shmobile: Add sh73a0 MIPI-CSI and CEU clocks
ARM: mach-shmobile: AG5EVM MIPI-DSI LCD reset delay fix
+27
-15
+1
arch/arm/mach-shmobile/board-ag5evm.c
+1
arch/arm/mach-shmobile/board-ag5evm.c
+1
-1
arch/arm/mach-shmobile/board-ap4evb.c
+1
-1
arch/arm/mach-shmobile/board-ap4evb.c
···
1303
1303
1304
1304
lcdc_info.clock_source = LCDC_CLK_BUS;
1305
1305
lcdc_info.ch[0].interface_type = RGB18;
1306
-
lcdc_info.ch[0].clock_divider = 2;
1306
+
lcdc_info.ch[0].clock_divider = 3;
1307
1307
lcdc_info.ch[0].flags = 0;
1308
1308
lcdc_info.ch[0].lcd_size_cfg.width = 152;
1309
1309
lcdc_info.ch[0].lcd_size_cfg.height = 91;
+1
-1
arch/arm/mach-shmobile/board-mackerel.c
+1
-1
arch/arm/mach-shmobile/board-mackerel.c
+14
-3
arch/arm/mach-shmobile/clock-sh73a0.c
+14
-3
arch/arm/mach-shmobile/clock-sh73a0.c
···
263
263
};
264
264
265
265
enum { MSTP001,
266
-
MSTP125, MSTP118, MSTP116, MSTP100,
266
+
MSTP129, MSTP128, MSTP127, MSTP126, MSTP125, MSTP118, MSTP116, MSTP100,
267
267
MSTP219,
268
268
MSTP207, MSTP206, MSTP204, MSTP203, MSTP202, MSTP201, MSTP200,
269
269
MSTP331, MSTP329, MSTP325, MSTP323, MSTP312,
···
275
275
276
276
static struct clk mstp_clks[MSTP_NR] = {
277
277
[MSTP001] = MSTP(&div4_clks[DIV4_HP], SMSTPCR0, 1, 0), /* IIC2 */
278
+
[MSTP129] = MSTP(&div4_clks[DIV4_B], SMSTPCR1, 29, 0), /* CEU1 */
279
+
[MSTP128] = MSTP(&div4_clks[DIV4_B], SMSTPCR1, 28, 0), /* CSI2-RX1 */
280
+
[MSTP127] = MSTP(&div4_clks[DIV4_B], SMSTPCR1, 27, 0), /* CEU0 */
281
+
[MSTP126] = MSTP(&div4_clks[DIV4_B], SMSTPCR1, 26, 0), /* CSI2-RX0 */
278
282
[MSTP125] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR1, 25, 0), /* TMU0 */
279
283
[MSTP118] = MSTP(&div4_clks[DIV4_B], SMSTPCR1, 18, 0), /* DSITX0 */
280
284
[MSTP116] = MSTP(&div4_clks[DIV4_HP], SMSTPCR1, 16, 0), /* IIC0 */
···
310
306
CLKDEV_CON_ID("r_clk", &r_clk),
311
307
312
308
/* DIV6 clocks */
309
+
CLKDEV_CON_ID("vck1_clk", &div6_clks[DIV6_VCK1]),
310
+
CLKDEV_CON_ID("vck2_clk", &div6_clks[DIV6_VCK2]),
311
+
CLKDEV_CON_ID("vck3_clk", &div6_clks[DIV6_VCK3]),
313
312
CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSIT]),
314
313
CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSIT]),
315
314
CLKDEV_ICK_ID("dsi0p_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSI0P]),
···
320
313
321
314
/* MSTP32 clocks */
322
315
CLKDEV_DEV_ID("i2c-sh_mobile.2", &mstp_clks[MSTP001]), /* I2C2 */
323
-
CLKDEV_DEV_ID("sh_mobile_lcdc_fb.0", &mstp_clks[MSTP100]), /* LCDC0 */
316
+
CLKDEV_DEV_ID("sh_mobile_ceu.1", &mstp_clks[MSTP129]), /* CEU1 */
317
+
CLKDEV_DEV_ID("sh-mobile-csi2.1", &mstp_clks[MSTP128]), /* CSI2-RX1 */
318
+
CLKDEV_DEV_ID("sh_mobile_ceu.0", &mstp_clks[MSTP127]), /* CEU0 */
319
+
CLKDEV_DEV_ID("sh-mobile-csi2.0", &mstp_clks[MSTP126]), /* CSI2-RX0 */
324
320
CLKDEV_DEV_ID("sh_tmu.0", &mstp_clks[MSTP125]), /* TMU00 */
325
321
CLKDEV_DEV_ID("sh_tmu.1", &mstp_clks[MSTP125]), /* TMU01 */
326
-
CLKDEV_DEV_ID("i2c-sh_mobile.0", &mstp_clks[MSTP116]), /* I2C0 */
327
322
CLKDEV_DEV_ID("sh-mipi-dsi.0", &mstp_clks[MSTP118]), /* DSITX */
323
+
CLKDEV_DEV_ID("i2c-sh_mobile.0", &mstp_clks[MSTP116]), /* I2C0 */
324
+
CLKDEV_DEV_ID("sh_mobile_lcdc_fb.0", &mstp_clks[MSTP100]), /* LCDC0 */
328
325
CLKDEV_DEV_ID("sh-sci.7", &mstp_clks[MSTP219]), /* SCIFA7 */
329
326
CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP207]), /* SCIFA5 */
330
327
CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP206]), /* SCIFB */
+5
-5
arch/arm/mach-shmobile/include/mach/head-ap4evb.txt
+5
-5
arch/arm/mach-shmobile/include/mach/head-ap4evb.txt
···
6
6
EW 0xE6020004, 0xA500
7
7
EW 0xE6030004, 0xA500
8
8
9
-
DD 0x01001000, 0x01001000
10
-
11
9
LIST "GPIO Setting"
12
10
EB 0xE6051013, 0xA2
13
11
14
12
LIST "CPG"
15
-
ED 0xE6150080, 0x00000180
16
13
ED 0xE61500C0, 0x00000002
17
14
18
15
WAIT 1, 0xFE40009C
···
34
37
35
38
WAIT 1, 0xFE40009C
36
39
40
+
LIST "SUB/USBClk"
41
+
ED 0xE6150080, 0x00000180
42
+
37
43
LIST "BSC"
38
44
ED 0xFEC10000, 0x00E0001B
39
45
···
53
53
ED 0xFE40004C, 0x00110209
54
54
ED 0xFE400010, 0x00000087
55
55
56
-
WAIT 10, 0xFE40009C
56
+
WAIT 30, 0xFE40009C
57
57
58
58
ED 0xFE400084, 0x0000003F
59
59
EB 0xFE500000, 0x00
···
84
84
85
85
WAIT 1, 0xFE40009C
86
86
87
-
ED 0xE6150354, 0x00000002
87
+
ED 0xFE400354, 0x01AD8002
88
88
89
89
LIST "SCIF0 - Serial port for earlyprintk"
90
90
EB 0xE6053098, 0x11
+5
-5
arch/arm/mach-shmobile/include/mach/head-mackerel.txt
+5
-5
arch/arm/mach-shmobile/include/mach/head-mackerel.txt
···
6
6
EW 0xE6020004, 0xA500
7
7
EW 0xE6030004, 0xA500
8
8
9
-
DD 0x01001000, 0x01001000
10
-
11
9
LIST "GPIO Setting"
12
10
EB 0xE6051013, 0xA2
13
11
14
12
LIST "CPG"
15
-
ED 0xE6150080, 0x00000180
16
13
ED 0xE61500C0, 0x00000002
17
14
18
15
WAIT 1, 0xFE40009C
···
34
37
35
38
WAIT 1, 0xFE40009C
36
39
40
+
LIST "SUB/USBClk"
41
+
ED 0xE6150080, 0x00000180
42
+
37
43
LIST "BSC"
38
44
ED 0xFEC10000, 0x00E0001B
39
45
···
53
53
ED 0xFE40004C, 0x00110209
54
54
ED 0xFE400010, 0x00000087
55
55
56
-
WAIT 10, 0xFE40009C
56
+
WAIT 30, 0xFE40009C
57
57
58
58
ED 0xFE400084, 0x0000003F
59
59
EB 0xFE500000, 0x00
···
84
84
85
85
WAIT 1, 0xFE40009C
86
86
87
-
ED 0xE6150354, 0x00000002
87
+
ED 0xFE400354, 0x01AD8002
88
88
89
89
LIST "SCIF0 - Serial port for earlyprintk"
90
90
EB 0xE6053098, 0x11