Commit 500b9fc9 authored by Russell King's avatar Russell King
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable 

Conflicts:
	drivers/net/irda/sh_irda.c
parents f165eb77 beccb12f

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -955,8 +955,9 @@ ARM/SHMOBILE ARM ARCHITECTURE 
M:	Paul Mundt <lethal@linux-sh.org>

M:	Magnus Damm <magnus.damm@gmail.com>

L:	linux-sh@vger.kernel.org

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

W:	http://oss.renesas.com

Q:	http://patchwork.kernel.org/project/linux-sh/list/

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

S:	Supported

F:	arch/arm/mach-shmobile/

F:	drivers/sh/

arch/arm/mach-shmobile/Kconfig

+26 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ config ARCH_SH7367 
	select CPU_V6

	select HAVE_CLK

	select COMMON_CLKDEV

	select SH_CLK_CPG

	select GENERIC_CLOCKEVENTS



config ARCH_SH7377
@@ -14,6 +15,7 @@ config ARCH_SH7377 
	select CPU_V7

	select HAVE_CLK

	select COMMON_CLKDEV

	select SH_CLK_CPG

	select GENERIC_CLOCKEVENTS



config ARCH_SH7372
@@ -21,6 +23,7 @@ config ARCH_SH7372 
	select CPU_V7

	select HAVE_CLK

	select COMMON_CLKDEV

	select SH_CLK_CPG

	select GENERIC_CLOCKEVENTS



comment "SH-Mobile Board Type"
@@ -39,6 +42,20 @@ config MACH_AP4EVB 
	bool "AP4EVB board"

	depends on ARCH_SH7372

	select ARCH_REQUIRE_GPIOLIB

	select SH_LCD_MIPI_DSI



choice

	prompt "AP4EVB LCD panel selection"

	default AP4EVB_QHD

	depends on MACH_AP4EVB



config AP4EVB_QHD

	bool "MIPI-DSI QHD (960x540)"



config AP4EVB_WVGA

	bool "Parallel WVGA (800x480)"



endchoice



comment "SH-Mobile System Configuration"
@@ -88,6 +105,15 @@ config SH_TIMER_CMT 
	help

	  This enables build of the CMT timer driver.



config SH_TIMER_TMU

	bool "TMU timer driver"

	default y

	help

	  This enables build of the TMU timer driver.



endmenu



config SH_CLK_CPG

	bool



endif

arch/arm/mach-shmobile/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -3,12 +3,12 @@ 
#



# Common objects

obj-y				:= timer.o console.o

obj-y				:= timer.o console.o clock.o



# CPU objects

obj-$(CONFIG_ARCH_SH7367)	+= setup-sh7367.o clock-sh7367.o intc-sh7367.o

obj-$(CONFIG_ARCH_SH7377)	+= setup-sh7377.o clock-sh7367.o intc-sh7377.o

obj-$(CONFIG_ARCH_SH7372)	+= setup-sh7372.o clock-sh7367.o intc-sh7372.o

obj-$(CONFIG_ARCH_SH7377)	+= setup-sh7377.o clock-sh7377.o intc-sh7377.o

obj-$(CONFIG_ARCH_SH7372)	+= setup-sh7372.o clock-sh7372.o intc-sh7372.o



# Pinmux setup

pfc-$(CONFIG_ARCH_SH7367)	:= pfc-sh7367.o

arch/arm/mach-shmobile/board-ap4evb.c

+786 −31

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-shmobile/board-g3evm.c

+50 −9

File changed.

Preview size limit exceeded, changes collapsed.