Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e69e084 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents 371528ca 1ae911cb

arch/sh/boards/board-sh7757lcr.c

+9 −11
Original line number Diff line number Diff line
@@ -168,6 +168,11 @@ static struct resource sh_eth_giga1_resources[] = { 
		.start  = 0xfee00800,

		.end    = 0xfee00fff,

		.flags  = IORESOURCE_MEM,

	}, {

		/* TSU */

		.start  = 0xfee01800,

		.end    = 0xfee01fff,

		.flags  = IORESOURCE_MEM,

	}, {

		.start  = 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 = {

	.dma		= &sh7757lcr_mmcif_dma,

	.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,

	.slave_id_tx	= SHDMA_SLAVE_MMCIF_TX,

	.slave_id_rx	= SHDMA_SLAVE_MMCIF_RX,

};



static struct platform_device sh_mmcif_device = {

arch/sh/boards/mach-ap325rxa/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/i2c.h>

#include <linux/smsc911x.h>

#include <linux/gpio.h>

#include <linux/videodev2.h>

#include <media/ov772x.h>

#include <media/soc_camera.h>

#include <media/soc_camera_platform.h>

arch/sh/boards/mach-ecovec24/setup.c

+2 −0
Original line number Diff line number Diff line
@@ -29,9 +29,11 @@ 
#include <linux/input.h>

#include <linux/input/sh_keysc.h>

#include <linux/sh_eth.h>

#include <linux/videodev2.h>

#include <video/sh_mobile_lcdc.h>

#include <sound/sh_fsi.h>

#include <media/sh_mobile_ceu.h>

#include <media/soc_camera.h>

#include <media/tw9910.h>

#include <media/mt9t112.h>

#include <asm/heartbeat.h>

arch/sh/boards/mach-kfr2r09/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/input/sh_keysc.h>

#include <linux/i2c.h>

#include <linux/usb/r8a66597.h>

#include <linux/videodev2.h>

#include <media/rj54n1cb0c.h>

#include <media/soc_camera.h>

#include <media/sh_mobile_ceu.h>

arch/sh/boards/mach-migor/setup.c

+2 −0
Original line number Diff line number Diff line
@@ -21,9 +21,11 @@ 
#include <linux/delay.h>

#include <linux/clk.h>

#include <linux/gpio.h>

#include <linux/videodev2.h>

#include <video/sh_mobile_lcdc.h>

#include <media/sh_mobile_ceu.h>

#include <media/ov772x.h>

#include <media/soc_camera.h>

#include <media/tw9910.h>

#include <asm/clock.h>

#include <asm/machvec.h>