SuperH fixes for 3.3-rc5
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) iEYEABECAAYFAk9HE98ACgkQGkmNcg7/o7g4+QCfYIcWunicH7+tLMjH/h5MgHq2 S5EAoJdIKyAPfV1tsIY0ykJZQP+H4t4X =QqTI -----END PGP SIGNATURE----- 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.
This commit is contained in:
commit
0e69e08401
@ -168,6 +168,11 @@ static struct resource sh_eth_giga1_resources[] = {
|
|||||||
.start = 0xfee00800,
|
.start = 0xfee00800,
|
||||||
.end = 0xfee00fff,
|
.end = 0xfee00fff,
|
||||||
.flags = IORESOURCE_MEM,
|
.flags = IORESOURCE_MEM,
|
||||||
|
}, {
|
||||||
|
/* TSU */
|
||||||
|
.start = 0xfee01800,
|
||||||
|
.end = 0xfee01fff,
|
||||||
|
.flags = IORESOURCE_MEM,
|
||||||
}, {
|
}, {
|
||||||
.start = 316,
|
.start = 316,
|
||||||
.end = 316,
|
.end = 316,
|
||||||
@ -210,20 +215,13 @@ static struct resource sh_mmcif_resources[] = {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct sh_mmcif_dma sh7757lcr_mmcif_dma = {
|
|
||||||
.chan_priv_tx = {
|
|
||||||
.slave_id = SHDMA_SLAVE_MMCIF_TX,
|
|
||||||
},
|
|
||||||
.chan_priv_rx = {
|
|
||||||
.slave_id = SHDMA_SLAVE_MMCIF_RX,
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
static struct sh_mmcif_plat_data sh_mmcif_plat = {
|
static struct sh_mmcif_plat_data sh_mmcif_plat = {
|
||||||
.dma = &sh7757lcr_mmcif_dma,
|
|
||||||
.sup_pclk = 0x0f,
|
.sup_pclk = 0x0f,
|
||||||
.caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
|
.caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA |
|
||||||
|
MMC_CAP_NONREMOVABLE,
|
||||||
.ocr = MMC_VDD_32_33 | MMC_VDD_33_34,
|
.ocr = MMC_VDD_32_33 | MMC_VDD_33_34,
|
||||||
|
.slave_id_tx = SHDMA_SLAVE_MMCIF_TX,
|
||||||
|
.slave_id_rx = SHDMA_SLAVE_MMCIF_RX,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct platform_device sh_mmcif_device = {
|
static struct platform_device sh_mmcif_device = {
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
#include <linux/i2c.h>
|
#include <linux/i2c.h>
|
||||||
#include <linux/smsc911x.h>
|
#include <linux/smsc911x.h>
|
||||||
#include <linux/gpio.h>
|
#include <linux/gpio.h>
|
||||||
|
#include <linux/videodev2.h>
|
||||||
#include <media/ov772x.h>
|
#include <media/ov772x.h>
|
||||||
#include <media/soc_camera.h>
|
#include <media/soc_camera.h>
|
||||||
#include <media/soc_camera_platform.h>
|
#include <media/soc_camera_platform.h>
|
||||||
|
@ -29,9 +29,11 @@
|
|||||||
#include <linux/input.h>
|
#include <linux/input.h>
|
||||||
#include <linux/input/sh_keysc.h>
|
#include <linux/input/sh_keysc.h>
|
||||||
#include <linux/sh_eth.h>
|
#include <linux/sh_eth.h>
|
||||||
|
#include <linux/videodev2.h>
|
||||||
#include <video/sh_mobile_lcdc.h>
|
#include <video/sh_mobile_lcdc.h>
|
||||||
#include <sound/sh_fsi.h>
|
#include <sound/sh_fsi.h>
|
||||||
#include <media/sh_mobile_ceu.h>
|
#include <media/sh_mobile_ceu.h>
|
||||||
|
#include <media/soc_camera.h>
|
||||||
#include <media/tw9910.h>
|
#include <media/tw9910.h>
|
||||||
#include <media/mt9t112.h>
|
#include <media/mt9t112.h>
|
||||||
#include <asm/heartbeat.h>
|
#include <asm/heartbeat.h>
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
#include <linux/input/sh_keysc.h>
|
#include <linux/input/sh_keysc.h>
|
||||||
#include <linux/i2c.h>
|
#include <linux/i2c.h>
|
||||||
#include <linux/usb/r8a66597.h>
|
#include <linux/usb/r8a66597.h>
|
||||||
|
#include <linux/videodev2.h>
|
||||||
#include <media/rj54n1cb0c.h>
|
#include <media/rj54n1cb0c.h>
|
||||||
#include <media/soc_camera.h>
|
#include <media/soc_camera.h>
|
||||||
#include <media/sh_mobile_ceu.h>
|
#include <media/sh_mobile_ceu.h>
|
||||||
|
@ -21,9 +21,11 @@
|
|||||||
#include <linux/delay.h>
|
#include <linux/delay.h>
|
||||||
#include <linux/clk.h>
|
#include <linux/clk.h>
|
||||||
#include <linux/gpio.h>
|
#include <linux/gpio.h>
|
||||||
|
#include <linux/videodev2.h>
|
||||||
#include <video/sh_mobile_lcdc.h>
|
#include <video/sh_mobile_lcdc.h>
|
||||||
#include <media/sh_mobile_ceu.h>
|
#include <media/sh_mobile_ceu.h>
|
||||||
#include <media/ov772x.h>
|
#include <media/ov772x.h>
|
||||||
|
#include <media/soc_camera.h>
|
||||||
#include <media/tw9910.h>
|
#include <media/tw9910.h>
|
||||||
#include <asm/clock.h>
|
#include <asm/clock.h>
|
||||||
#include <asm/machvec.h>
|
#include <asm/machvec.h>
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
#include <linux/input/sh_keysc.h>
|
#include <linux/input/sh_keysc.h>
|
||||||
#include <linux/usb/r8a66597.h>
|
#include <linux/usb/r8a66597.h>
|
||||||
#include <linux/sh_eth.h>
|
#include <linux/sh_eth.h>
|
||||||
|
#include <linux/videodev2.h>
|
||||||
#include <video/sh_mobile_lcdc.h>
|
#include <video/sh_mobile_lcdc.h>
|
||||||
#include <media/sh_mobile_ceu.h>
|
#include <media/sh_mobile_ceu.h>
|
||||||
#include <sound/sh_fsi.h>
|
#include <sound/sh_fsi.h>
|
||||||
|
@ -74,7 +74,7 @@ struct pci_errors {
|
|||||||
{ SH4_PCIINT_MLCK, "master lock error" },
|
{ SH4_PCIINT_MLCK, "master lock error" },
|
||||||
{ SH4_PCIINT_TABT, "target-target abort" },
|
{ SH4_PCIINT_TABT, "target-target abort" },
|
||||||
{ SH4_PCIINT_TRET, "target retry time out" },
|
{ SH4_PCIINT_TRET, "target retry time out" },
|
||||||
{ SH4_PCIINT_MFDE, "master function disable erorr" },
|
{ SH4_PCIINT_MFDE, "master function disable error" },
|
||||||
{ SH4_PCIINT_PRTY, "address parity error" },
|
{ SH4_PCIINT_PRTY, "address parity error" },
|
||||||
{ SH4_PCIINT_SERR, "SERR" },
|
{ SH4_PCIINT_SERR, "SERR" },
|
||||||
{ SH4_PCIINT_TWDP, "data parity error for target write" },
|
{ SH4_PCIINT_TWDP, "data parity error for target write" },
|
||||||
|
@ -3,9 +3,10 @@
|
|||||||
*
|
*
|
||||||
* This file is released under the GPLv2
|
* This file is released under the GPLv2
|
||||||
*/
|
*/
|
||||||
|
#ifndef __ASM_SH_DEVICE_H
|
||||||
|
#define __ASM_SH_DEVICE_H
|
||||||
|
|
||||||
struct dev_archdata {
|
#include <asm-generic/device.h>
|
||||||
};
|
|
||||||
|
|
||||||
struct platform_device;
|
struct platform_device;
|
||||||
/* allocate contiguous memory chunk and fill in struct resource */
|
/* allocate contiguous memory chunk and fill in struct resource */
|
||||||
@ -14,5 +15,4 @@ int platform_resource_setup_memory(struct platform_device *pdev,
|
|||||||
|
|
||||||
void plat_early_device_setup(void);
|
void plat_early_device_setup(void);
|
||||||
|
|
||||||
struct pdev_archdata {
|
#endif /* __ASM_SH_DEVICE_H */
|
||||||
};
|
|
||||||
|
@ -343,7 +343,7 @@ static struct clk_lookup lookups[] = {
|
|||||||
CLKDEV_DEV_ID("sh_mobile_ceu.1", &mstp_clks[HWBLK_CEU1]),
|
CLKDEV_DEV_ID("sh_mobile_ceu.1", &mstp_clks[HWBLK_CEU1]),
|
||||||
CLKDEV_CON_ID("beu1", &mstp_clks[HWBLK_BEU1]),
|
CLKDEV_CON_ID("beu1", &mstp_clks[HWBLK_BEU1]),
|
||||||
CLKDEV_CON_ID("2ddmac0", &mstp_clks[HWBLK_2DDMAC]),
|
CLKDEV_CON_ID("2ddmac0", &mstp_clks[HWBLK_2DDMAC]),
|
||||||
CLKDEV_CON_ID("spu0", &mstp_clks[HWBLK_SPU]),
|
CLKDEV_DEV_ID("sh_fsi.0", &mstp_clks[HWBLK_SPU]),
|
||||||
CLKDEV_CON_ID("jpu0", &mstp_clks[HWBLK_JPU]),
|
CLKDEV_CON_ID("jpu0", &mstp_clks[HWBLK_JPU]),
|
||||||
CLKDEV_DEV_ID("sh-vou.0", &mstp_clks[HWBLK_VOU]),
|
CLKDEV_DEV_ID("sh-vou.0", &mstp_clks[HWBLK_VOU]),
|
||||||
CLKDEV_CON_ID("beu0", &mstp_clks[HWBLK_BEU0]),
|
CLKDEV_CON_ID("beu0", &mstp_clks[HWBLK_BEU0]),
|
||||||
|
@ -133,7 +133,7 @@ static struct resource spi0_resources[] = {
|
|||||||
[0] = {
|
[0] = {
|
||||||
.start = 0xfe002000,
|
.start = 0xfe002000,
|
||||||
.end = 0xfe0020ff,
|
.end = 0xfe0020ff,
|
||||||
.flags = IORESOURCE_MEM,
|
.flags = IORESOURCE_MEM | IORESOURCE_MEM_32BIT,
|
||||||
},
|
},
|
||||||
[1] = {
|
[1] = {
|
||||||
.start = 86,
|
.start = 86,
|
||||||
@ -661,6 +661,25 @@ static struct platform_device spi0_device = {
|
|||||||
.resource = spi0_resources,
|
.resource = spi0_resources,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static struct resource spi1_resources[] = {
|
||||||
|
{
|
||||||
|
.start = 0xffd8ee70,
|
||||||
|
.end = 0xffd8eeff,
|
||||||
|
.flags = IORESOURCE_MEM | IORESOURCE_MEM_8BIT,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.start = 54,
|
||||||
|
.flags = IORESOURCE_IRQ,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct platform_device spi1_device = {
|
||||||
|
.name = "sh_spi",
|
||||||
|
.id = 1,
|
||||||
|
.num_resources = ARRAY_SIZE(spi1_resources),
|
||||||
|
.resource = spi1_resources,
|
||||||
|
};
|
||||||
|
|
||||||
static struct resource usb_ehci_resources[] = {
|
static struct resource usb_ehci_resources[] = {
|
||||||
[0] = {
|
[0] = {
|
||||||
.start = 0xfe4f1000,
|
.start = 0xfe4f1000,
|
||||||
@ -720,6 +739,7 @@ static struct platform_device *sh7757_devices[] __initdata = {
|
|||||||
&dma2_device,
|
&dma2_device,
|
||||||
&dma3_device,
|
&dma3_device,
|
||||||
&spi0_device,
|
&spi0_device,
|
||||||
|
&spi1_device,
|
||||||
&usb_ehci_device,
|
&usb_ehci_device,
|
||||||
&usb_ohci_device,
|
&usb_ohci_device,
|
||||||
};
|
};
|
||||||
|
@ -63,7 +63,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
|
|||||||
mp_ops->prepare_cpus(max_cpus);
|
mp_ops->prepare_cpus(max_cpus);
|
||||||
|
|
||||||
#ifndef CONFIG_HOTPLUG_CPU
|
#ifndef CONFIG_HOTPLUG_CPU
|
||||||
init_cpu_present(&cpu_possible_map);
|
init_cpu_present(cpu_possible_mask);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@ static cpumask_t cpu_coregroup_map(unsigned int cpu)
|
|||||||
* Presently all SH-X3 SMP cores are multi-cores, so just keep it
|
* Presently all SH-X3 SMP cores are multi-cores, so just keep it
|
||||||
* simple until we have a method for determining topology..
|
* simple until we have a method for determining topology..
|
||||||
*/
|
*/
|
||||||
return cpu_possible_map;
|
return *cpu_possible_mask;
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct cpumask *cpu_coregroup_mask(unsigned int cpu)
|
const struct cpumask *cpu_coregroup_mask(unsigned int cpu)
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
#define MAX_OCACHE_PAGES 32
|
#define MAX_OCACHE_PAGES 32
|
||||||
#define MAX_ICACHE_PAGES 32
|
#define MAX_ICACHE_PAGES 32
|
||||||
|
|
||||||
|
#ifdef CONFIG_CACHE_WRITEBACK
|
||||||
static void sh2a_flush_oc_line(unsigned long v, int way)
|
static void sh2a_flush_oc_line(unsigned long v, int way)
|
||||||
{
|
{
|
||||||
unsigned long addr = (v & 0x000007f0) | (way << 11);
|
unsigned long addr = (v & 0x000007f0) | (way << 11);
|
||||||
@ -34,6 +35,7 @@ static void sh2a_flush_oc_line(unsigned long v, int way)
|
|||||||
__raw_writel(data, CACHE_OC_ADDRESS_ARRAY | addr);
|
__raw_writel(data, CACHE_OC_ADDRESS_ARRAY | addr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static void sh2a_invalidate_line(unsigned long cache_addr, unsigned long v)
|
static void sh2a_invalidate_line(unsigned long cache_addr, unsigned long v)
|
||||||
{
|
{
|
||||||
|
@ -190,7 +190,7 @@ static int __init sh_clk_init_parent(struct clk *clk)
|
|||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
clk->parent = clk->parent_table[val];
|
clk_reparent(clk, clk->parent_table[val]);
|
||||||
if (!clk->parent) {
|
if (!clk->parent) {
|
||||||
pr_err("sh_clk_init_parent: unable to set parent");
|
pr_err("sh_clk_init_parent: unable to set parent");
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
@ -1061,7 +1061,7 @@ static struct pvr2_board {
|
|||||||
int (*init)(void);
|
int (*init)(void);
|
||||||
void (*exit)(void);
|
void (*exit)(void);
|
||||||
char name[16];
|
char name[16];
|
||||||
} board_driver[] = {
|
} board_driver[] __refdata = {
|
||||||
#ifdef CONFIG_SH_DREAMCAST
|
#ifdef CONFIG_SH_DREAMCAST
|
||||||
{ pvr2fb_dc_init, pvr2fb_dc_exit, "Sega DC PVR2" },
|
{ pvr2fb_dc_init, pvr2fb_dc_exit, "Sega DC PVR2" },
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user