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

Commit 3e862dd5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: Add in PCI bus for DMA API debugging.
  sh: Pre-allocate a reasonable number of DMA debug entries.
  sh: sh7786: modify usb setup timeout judgment bug.
  MAINTAINERS: Update sh architecture file patterns.
  sh: ap325: use edge control for ov772x camera
  sh: Plug in support for ARCH=sh64 using sh SRCARCH.
  sh: urquell: Fix up address mapping in board comments.
  sh: Add support for DMA API debugging.
  sh: Provide cpumask_of_pcibus() to fix NUMA build.
  sh: urquell: Add board comment
  sh: wire up sys_preadv/sys_pwritev() syscalls.
  sh: sh7785lcr: fix PCI address map for 32-bit mode
  sh: intc: Added resume from hibernation support to the intc
parents 2344b5b6 e588a00f

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -5313,7 +5313,9 @@ L: linux-sh@vger.kernel.org 
W:	http://www.linux-sh.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git

S:	Supported

F:	Documentation/sh/

F:	arch/sh/

F:	drivers/sh/



SUSPEND TO RAM

P:	Len Brown

Makefile

+6 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ 
				  -e s/arm.*/arm/ -e s/sa110/arm/ \

				  -e s/s390x/s390/ -e s/parisc64/parisc/ \

				  -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \

				  -e s/sh.*/sh/ )

				  -e s/sh[234].*/sh/ )



# Cross compiling and selecting different set of gcc/bin-utils

# ---------------------------------------------------------------------------
@@ -210,6 +210,11 @@ ifeq ($(ARCH),sparc64) 
       SRCARCH := sparc

endif



# Additional ARCH settings for sh

ifeq ($(ARCH),sh64)

       SRCARCH := sh

endif



# Where to locate arch specific headers

hdr-arch  := $(SRCARCH)

arch/sh/Kconfig

+16 −2
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ config SUPERH 
	select HAVE_GENERIC_DMA_COHERENT

	select HAVE_IOREMAP_PROT if MMU

	select HAVE_ARCH_TRACEHOOK

	select HAVE_DMA_API_DEBUG

	help

	  The SuperH is a RISC processor targeted for use in embedded systems

	  and consumer electronics; it was also used in the Sega Dreamcast
@@ -21,7 +22,7 @@ config SUPERH 
	  <http://www.linux-sh.org/>.



config SUPERH32

	def_bool !SUPERH64

	def_bool ARCH = "sh"

	select HAVE_KPROBES

	select HAVE_KRETPROBES

	select HAVE_FUNCTION_TRACER
@@ -31,7 +32,7 @@ config SUPERH32 
	select ARCH_HIBERNATION_POSSIBLE if MMU



config SUPERH64

	def_bool y if CPU_SH5

	def_bool ARCH = "sh64"



config ARCH_DEFCONFIG

	string
@@ -187,6 +188,8 @@ config ARCH_SHMOBILE 
	bool

	select ARCH_SUSPEND_POSSIBLE



if SUPERH32



choice

	prompt "Processor sub-type selection"
@@ -408,6 +411,15 @@ config CPU_SUBTYPE_SH7366 
	select SYS_SUPPORTS_NUMA

	select SYS_SUPPORTS_CMT



endchoice



endif



if SUPERH64



choice

	prompt "Processor sub-type selection"



# SH-5 Processor Support



config CPU_SUBTYPE_SH5_101
@@ -420,6 +432,8 @@ config CPU_SUBTYPE_SH5_103 


endchoice



endif



source "arch/sh/mm/Kconfig"

 

source "arch/sh/Kconfig.cpu"

arch/sh/boards/board-ap325rxa.c

+1 −0
Original line number Diff line number Diff line
@@ -349,6 +349,7 @@ static int ov7725_power(struct device *dev, int mode) 
static struct ov772x_camera_info ov7725_info = {

	.buswidth  = SOCAM_DATAWIDTH_8,

	.flags = OV772X_FLAG_VFLIP | OV772X_FLAG_HFLIP,

	.edgectrl = OV772X_AUTO_EDGECTRL(0xf, 0),

	.link = {

		.power  = ov7725_power,

	},

arch/sh/boards/board-urquell.c

+30 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
 * Renesas Technology Corp. SH7786 Urquell Support.

 *

 * Copyright (C) 2008  Kuninori Morimoto <morimoto.kuninori@renesas.com>

 *

 * Based on board-sh7785lcr.c

 * Copyright (C) 2008  Yoshihiro Shimoda

 *

 * This file is subject to the terms and conditions of the GNU General Public
@@ -21,6 +23,32 @@ 
#include <asm/heartbeat.h>

#include <asm/sizes.h>



/*

 * bit  1234 5678

 *----------------------------

 * SW1  0101 0010  -> Pck 33MHz version

 *     (1101 0010)    Pck 66MHz version

 * SW2  0x1x xxxx  -> little endian

 *                    29bit mode

 * SW47 0001 1000  -> CS0 : on-board flash

 *                    CS1 : SRAM, registers, LAN, PCMCIA

 *                    38400 bps for SCIF1

 *

 * Address

 * 0x00000000 - 0x04000000  (CS0)     Nor Flash

 * 0x04000000 - 0x04200000  (CS1)     SRAM

 * 0x05000000 - 0x05800000  (CS1)     on board register

 * 0x05800000 - 0x06000000  (CS1)     LAN91C111

 * 0x06000000 - 0x06400000  (CS1)     PCMCIA

 * 0x08000000 - 0x10000000  (CS2-CS3) DDR3

 * 0x10000000 - 0x14000000  (CS4)     PCIe

 * 0x14000000 - 0x14800000  (CS5)     Core0 LRAM/URAM

 * 0x14800000 - 0x15000000  (CS5)     Core1 LRAM/URAM

 * 0x18000000 - 0x1C000000  (CS6)     ATA/NAND-Flash

 * 0x1C000000 -             (CS7)     SH7786 Control register

 */



/* HeartBeat */

static struct resource heartbeat_resources[] = {

	[0] = {

		.start	= BOARDREG(SLEDR),
@@ -43,6 +71,7 @@ static struct platform_device heartbeat_device = { 
	.resource	= heartbeat_resources,

};



/* LAN91C111 */

static struct smc91x_platdata smc91x_info = {

	.flags = SMC91X_USE_16BIT | SMC91X_NOWAIT,

};
@@ -69,6 +98,7 @@ static struct platform_device smc91x_eth_device = { 
	},

};



/* Nor Flash */

static struct mtd_partition nor_flash_partitions[] = {

	{

		.name		= "loader",