Commit b10a8b72 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: (72 commits)
  sh: SuperH Mobile CEU and camera platform data for AP325RXA
  sh: Update smc911x platform data for AP325RXA
  sh: SuperH Mobile LCDC platform data for AP325RXA
  sh: Add SuperH Mobile CEU platform data for Migo-R
  sh: Add SuperH Mobile LCDC platform data for Migo-R
  sh: Move asid_cache() out of ifdef to fix SH-3/4 nommu build.
  sh: Workaround for __put_user_asm() bug with gcc 4.x on big-endian.
  sh: Wire up new syscalls.
  sh: fix uImage Entry Point
  sh_keysc: remove request_mem_region() and release_mem_region()
  sh: Don't miss pending signals returning to user mode after signal processing
  sh: Use clk_always_enable() on sh7366
  sh: Use clk_always_enable() on sh7343 / SE77343
  sh: Use clk_always_enable() on sh7722 / Migo-R / SE7722
  sh: Use clk_always_enable() on sh7723 / ap325rxa
  sh: Introduce clk_always_enable() function
  sh: Show all clocks and their state in /proc/clocks
  sh: Merge sh7343 and sh7722 clock code
  sh: Add SuperH Mobile MSTPCR bits to clock framework
  sh: Use arch_flags to simplify sh7722 siu clock code
  ...
parents 37eaf8c7 8b2224dc

arch/sh/Kconfig

+34 −0
Original line number Diff line number Diff line
@@ -477,6 +477,10 @@ config SH_RTS7751R2D 
	  Select RTS7751R2D if configuring for a Renesas Technology

	  Sales SH-Graphics board.



config SH_RSK7203

	bool "RSK7203"

	depends on CPU_SUBTYPE_SH7203



config SH_SDK7780

	bool "SDK7780R3"

	depends on CPU_SUBTYPE_SH7780
@@ -491,6 +495,21 @@ config SH_HIGHLANDER 
	select SYS_SUPPORTS_PCI

	select IO_TRAPPED



config SH_SH7785LCR

	bool "SH7785LCR"

	depends on CPU_SUBTYPE_SH7785

	select SYS_SUPPORTS_PCI

	select IO_TRAPPED



config SH_SH7785LCR_29BIT_PHYSMAPS

	bool "SH7785LCR 29bit physmaps"

	depends on SH_SH7785LCR

	default y

	help

	  This board has 2 physical memory maps. It can be changed with

	  DIP switch(S2-5). If you set the DIP switch for S2-5 = ON,

	  you can access all on-board device in 29bit address mode.



config SH_MIGOR

	bool "Migo-R"

	depends on CPU_SUBTYPE_SH7722
@@ -498,6 +517,20 @@ config SH_MIGOR 
	  Select Migo-R if configuring for the SH7722 Migo-R platform

          by Renesas System Solutions Asia Pte. Ltd.



config SH_AP325RXA

	bool "AP-325RXA"

	depends on CPU_SUBTYPE_SH7723

	help

	  Renesas "AP-325RXA" support.

	  Compatible with ALGO SYSTEM CO.,LTD. "AP-320A"



config SH_SH7763RDP

	bool "SH7763RDP"

	depends on CPU_SUBTYPE_SH7763

	help

	  Select SH7763RDP if configuring for a Renesas SH7763

	  evaluation board.



config SH_EDOSK7705

	bool "EDOSK7705"

	depends on CPU_SUBTYPE_SH7705
@@ -559,6 +592,7 @@ endmenu 
source "arch/sh/boards/renesas/rts7751r2d/Kconfig"

source "arch/sh/boards/renesas/r7780rp/Kconfig"

source "arch/sh/boards/renesas/sdk7780/Kconfig"

source "arch/sh/boards/renesas/migor/Kconfig"

source "arch/sh/boards/magicpanelr2/Kconfig"



menu "Timer and clock configuration"

arch/sh/Kconfig.debug

+2 −1
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ config EARLY_SCIF_CONSOLE_PORT 
	default "0xff804000" if CPU_SUBTYPE_MXG

	default "0xffc30000" if CPU_SUBTYPE_SHX3

	default "0xffe00000" if CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7763 || \

				CPU_SUBTYPE_SH7722 || CPU_SUBTYPE_SH7366

				CPU_SUBTYPE_SH7722 || CPU_SUBTYPE_SH7366 || \

				CPU_SUBTYPE_SH7343

	default "0xffe80000" if CPU_SH4

	default "0xffea0000" if CPU_SUBTYPE_SH7785

	default "0xfffe8000" if CPU_SUBTYPE_SH7203

arch/sh/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -121,6 +121,10 @@ machdir-$(CONFIG_SH_HIGHLANDER) += renesas/r7780rp 
machdir-$(CONFIG_SH_MIGOR)			+= renesas/migor

machdir-$(CONFIG_SH_SDK7780)			+= renesas/sdk7780

machdir-$(CONFIG_SH_X3PROTO)			+= renesas/x3proto

machdir-$(CONFIG_SH_RSK7203)			+= renesas/rsk7203

machdir-$(CONFIG_SH_AP325RXA)			+= renesas/ap325rxa

machdir-$(CONFIG_SH_SH7763RDP)			+= renesas/sh7763rdp

machdir-$(CONFIG_SH_SH7785LCR)			+= renesas/sh7785lcr

machdir-$(CONFIG_SH_SH4202_MICRODEV)		+= superh/microdev

machdir-$(CONFIG_SH_LANDISK)			+= landisk

machdir-$(CONFIG_SH_TITAN)			+= titan

arch/sh/boards/dreamcast/rtc.c

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
 *

 * Grabs the current RTC seconds counter and adjusts it to the Unix Epoch.

 */

void aica_rtc_gettimeofday(struct timespec *ts)

static void aica_rtc_gettimeofday(struct timespec *ts)

{

	unsigned long val1, val2;
@@ -54,7 +54,7 @@ void aica_rtc_gettimeofday(struct timespec *ts) 
 *

 * Adjusts the given @tv to the AICA Epoch and sets the RTC seconds counter.

 */

int aica_rtc_settimeofday(const time_t secs)

static int aica_rtc_settimeofday(const time_t secs)

{

	unsigned long val1, val2;

	unsigned long adj = secs + TWENTY_YEARS;

arch/sh/boards/renesas/ap325rxa/Makefile

0 → 100644
+1 −0
Original line number Diff line number Diff line 
obj-y	:= setup.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE