Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh
SuperH fixes for 3.3-rc5
* tag 'sh-for-linus' of git://github.com/pmundt/linux-sh:
sh: Fix sh2a build error for CONFIG_CACHE_WRITETHROUGH
sh: modify a resource of sh_eth_giga1_resources in board-sh7757lcr
arch/sh: remove references to cpu_*_map.
sh: Fix typo in pci-sh7780.c
sh: add platform_device for SPI1 in setup-sh7757
sh: modify resource for SPI0 in setup-sh7757
sh: se7724: fix compile breakage
sh: clkfwk: bugfix: use clk_reparent() for div6 clocks
sh: clock-sh7724: fixup sh_fsi clock settings
sh: sh7757lcr: update to the new MMCIF DMA configuration
sh: fix the sh_mmcif_plat_data in board-sh7757lcr
video: pvr2fb: Fix up spurious section mismatch warnings.
sh: Defer to asm-generic/device.h.
+49
-22
+9
-11
arch/sh/boards/board-sh7757lcr.c
+9
-11
arch/sh/boards/board-sh7757lcr.c
···
169
169
.end = 0xfee00fff,
170
170
.flags = IORESOURCE_MEM,
171
171
}, {
172
+
/* TSU */
173
+
.start = 0xfee01800,
174
+
.end = 0xfee01fff,
175
+
.flags = IORESOURCE_MEM,
176
+
}, {
172
177
.start = 316,
173
178
.end = 316,
174
179
.flags = IORESOURCE_IRQ,
···
215
210
},
216
211
};
217
212
218
-
static struct sh_mmcif_dma sh7757lcr_mmcif_dma = {
219
-
.chan_priv_tx = {
220
-
.slave_id = SHDMA_SLAVE_MMCIF_TX,
221
-
},
222
-
.chan_priv_rx = {
223
-
.slave_id = SHDMA_SLAVE_MMCIF_RX,
224
-
}
225
-
};
226
-
227
213
static struct sh_mmcif_plat_data sh_mmcif_plat = {
228
-
.dma = &sh7757lcr_mmcif_dma,
229
214
.sup_pclk = 0x0f,
230
-
.caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
215
+
.caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA |
216
+
MMC_CAP_NONREMOVABLE,
231
217
.ocr = MMC_VDD_32_33 | MMC_VDD_33_34,
218
+
.slave_id_tx = SHDMA_SLAVE_MMCIF_TX,
219
+
.slave_id_rx = SHDMA_SLAVE_MMCIF_RX,
232
220
};
233
221
234
222
static struct platform_device sh_mmcif_device = {
+1
arch/sh/boards/mach-ap325rxa/setup.c
+1
arch/sh/boards/mach-ap325rxa/setup.c
+2
arch/sh/boards/mach-ecovec24/setup.c
+2
arch/sh/boards/mach-ecovec24/setup.c
···
29
29
#include <linux/input.h>
30
30
#include <linux/input/sh_keysc.h>
31
31
#include <linux/sh_eth.h>
32
+
#include <linux/videodev2.h>
32
33
#include <video/sh_mobile_lcdc.h>
33
34
#include <sound/sh_fsi.h>
34
35
#include <media/sh_mobile_ceu.h>
36
+
#include <media/soc_camera.h>
35
37
#include <media/tw9910.h>
36
38
#include <media/mt9t112.h>
37
39
#include <asm/heartbeat.h>
+1
arch/sh/boards/mach-kfr2r09/setup.c
+1
arch/sh/boards/mach-kfr2r09/setup.c
+2
arch/sh/boards/mach-migor/setup.c
+2
arch/sh/boards/mach-migor/setup.c
···
21
21
#include <linux/delay.h>
22
22
#include <linux/clk.h>
23
23
#include <linux/gpio.h>
24
+
#include <linux/videodev2.h>
24
25
#include <video/sh_mobile_lcdc.h>
25
26
#include <media/sh_mobile_ceu.h>
26
27
#include <media/ov772x.h>
28
+
#include <media/soc_camera.h>
27
29
#include <media/tw9910.h>
28
30
#include <asm/clock.h>
29
31
#include <asm/machvec.h>
+1
arch/sh/boards/mach-se/7724/setup.c
+1
arch/sh/boards/mach-se/7724/setup.c
+1
-1
arch/sh/drivers/pci/pci-sh7780.c
+1
-1
arch/sh/drivers/pci/pci-sh7780.c
···
74
74
{ SH4_PCIINT_MLCK, "master lock error" },
75
75
{ SH4_PCIINT_TABT, "target-target abort" },
76
76
{ SH4_PCIINT_TRET, "target retry time out" },
77
-
{ SH4_PCIINT_MFDE, "master function disable erorr" },
77
+
{ SH4_PCIINT_MFDE, "master function disable error" },
78
78
{ SH4_PCIINT_PRTY, "address parity error" },
79
79
{ SH4_PCIINT_SERR, "SERR" },
80
80
{ SH4_PCIINT_TWDP, "data parity error for target write" },
+4
-4
arch/sh/include/asm/device.h
+4
-4
arch/sh/include/asm/device.h
···
3
3
*
4
4
* This file is released under the GPLv2
5
5
*/
6
+
#ifndef __ASM_SH_DEVICE_H
7
+
#define __ASM_SH_DEVICE_H
6
8
7
-
struct dev_archdata {
8
-
};
9
+
#include <asm-generic/device.h>
9
10
10
11
struct platform_device;
11
12
/* allocate contiguous memory chunk and fill in struct resource */
···
15
14
16
15
void plat_early_device_setup(void);
17
16
18
-
struct pdev_archdata {
19
-
};
17
+
#endif /* __ASM_SH_DEVICE_H */
+1
-1
arch/sh/kernel/cpu/sh4a/clock-sh7724.c
+1
-1
arch/sh/kernel/cpu/sh4a/clock-sh7724.c
···
343
343
CLKDEV_DEV_ID("sh_mobile_ceu.1", &mstp_clks[HWBLK_CEU1]),
344
344
CLKDEV_CON_ID("beu1", &mstp_clks[HWBLK_BEU1]),
345
345
CLKDEV_CON_ID("2ddmac0", &mstp_clks[HWBLK_2DDMAC]),
346
-
CLKDEV_CON_ID("spu0", &mstp_clks[HWBLK_SPU]),
346
+
CLKDEV_DEV_ID("sh_fsi.0", &mstp_clks[HWBLK_SPU]),
347
347
CLKDEV_CON_ID("jpu0", &mstp_clks[HWBLK_JPU]),
348
348
CLKDEV_DEV_ID("sh-vou.0", &mstp_clks[HWBLK_VOU]),
349
349
CLKDEV_CON_ID("beu0", &mstp_clks[HWBLK_BEU0]),
+21
-1
arch/sh/kernel/cpu/sh4a/setup-sh7757.c
+21
-1
arch/sh/kernel/cpu/sh4a/setup-sh7757.c
···
133
133
[0] = {
134
134
.start = 0xfe002000,
135
135
.end = 0xfe0020ff,
136
-
.flags = IORESOURCE_MEM,
136
+
.flags = IORESOURCE_MEM | IORESOURCE_MEM_32BIT,
137
137
},
138
138
[1] = {
139
139
.start = 86,
···
661
661
.resource = spi0_resources,
662
662
};
663
663
664
+
static struct resource spi1_resources[] = {
665
+
{
666
+
.start = 0xffd8ee70,
667
+
.end = 0xffd8eeff,
668
+
.flags = IORESOURCE_MEM | IORESOURCE_MEM_8BIT,
669
+
},
670
+
{
671
+
.start = 54,
672
+
.flags = IORESOURCE_IRQ,
673
+
},
674
+
};
675
+
676
+
static struct platform_device spi1_device = {
677
+
.name = "sh_spi",
678
+
.id = 1,
679
+
.num_resources = ARRAY_SIZE(spi1_resources),
680
+
.resource = spi1_resources,
681
+
};
682
+
664
683
static struct resource usb_ehci_resources[] = {
665
684
[0] = {
666
685
.start = 0xfe4f1000,
···
739
720
&dma2_device,
740
721
&dma3_device,
741
722
&spi0_device,
723
+
&spi1_device,
742
724
&usb_ehci_device,
743
725
&usb_ohci_device,
744
726
};
+1
-1
arch/sh/kernel/smp.c
+1
-1
arch/sh/kernel/smp.c
+1
-1
arch/sh/kernel/topology.c
+1
-1
arch/sh/kernel/topology.c
+2
arch/sh/mm/cache-sh2a.c
+2
arch/sh/mm/cache-sh2a.c
···
23
23
#define MAX_OCACHE_PAGES 32
24
24
#define MAX_ICACHE_PAGES 32
25
25
26
+
#ifdef CONFIG_CACHE_WRITEBACK
26
27
static void sh2a_flush_oc_line(unsigned long v, int way)
27
28
{
28
29
unsigned long addr = (v & 0x000007f0) | (way << 11);
···
35
34
__raw_writel(data, CACHE_OC_ADDRESS_ARRAY | addr);
36
35
}
37
36
}
37
+
#endif
38
38
39
39
static void sh2a_invalidate_line(unsigned long cache_addr, unsigned long v)
40
40
{
+1
-1
drivers/sh/clk/cpg.c
+1
-1
drivers/sh/clk/cpg.c