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

Commit 34bac238 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23:
  sh: fix defconfigs for sh7751r boards
  sh: fix cf support on r2d boards
  sh: update r2d defconfig
  sh: update snapgear defconfig.
  sh: Fix SH-X3 FPU exception handling.
  sh: Fix pgd mismatch from cached TTB in unhandled fault.
  sh: Don't include fault-nommu on SH-2/SH-2A.
  sh: Fix irqflags tracing for SH-3/4 nommu.
  sh: Fix lockdep debugging oops on SH-3/4.
parents 24728448 cc6f33db

arch/sh/boards/renesas/rts7751r2d/setup.c

+8 −1
Original line number Diff line number Diff line
@@ -140,12 +140,19 @@ static struct platform_device sm501_device = { 
static struct platform_device *rts7751r2d_devices[] __initdata = {

	&uart_device,

	&heartbeat_device,

	&cf_ide_device,

	&sm501_device,

};



static int __init rts7751r2d_devices_setup(void)

{

	int ret;



	if (ctrl_inw(PA_BVERREG) == 0x10) { /* only working on R2D-PLUS */

		ret = platform_device_register(&cf_ide_device);

		if (ret)

			return ret;

	}



	return platform_add_devices(rts7751r2d_devices,

				    ARRAY_SIZE(rts7751r2d_devices));

}

arch/sh/configs/hs7751rvoip_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ CONFIG_CPU_SH4=y 
# CONFIG_CPU_SUBTYPE_SH7091 is not set

# CONFIG_CPU_SUBTYPE_SH7750R is not set

# CONFIG_CPU_SUBTYPE_SH7750S is not set

CONFIG_CPU_SUBTYPE_SH7751=y

# CONFIG_CPU_SUBTYPE_SH7751 is not set

CONFIG_CPU_SUBTYPE_SH7751R=y

# CONFIG_CPU_SUBTYPE_SH7760 is not set

# CONFIG_CPU_SUBTYPE_SH4_202 is not set

arch/sh/configs/landisk_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ CONFIG_CPU_SH4=y 
# CONFIG_CPU_SUBTYPE_SH7091 is not set

# CONFIG_CPU_SUBTYPE_SH7750R is not set

# CONFIG_CPU_SUBTYPE_SH7750S is not set

CONFIG_CPU_SUBTYPE_SH7751=y

# CONFIG_CPU_SUBTYPE_SH7751 is not set

CONFIG_CPU_SUBTYPE_SH7751R=y

# CONFIG_CPU_SUBTYPE_SH7760 is not set

# CONFIG_CPU_SUBTYPE_SH4_202 is not set

arch/sh/configs/lboxre2_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ CONFIG_CPU_SH4=y 
# CONFIG_CPU_SUBTYPE_SH7091 is not set

# CONFIG_CPU_SUBTYPE_SH7750R is not set

# CONFIG_CPU_SUBTYPE_SH7750S is not set

CONFIG_CPU_SUBTYPE_SH7751=y

# CONFIG_CPU_SUBTYPE_SH7751 is not set

CONFIG_CPU_SUBTYPE_SH7751R=y

# CONFIG_CPU_SUBTYPE_SH7760 is not set

# CONFIG_CPU_SUBTYPE_SH4_202 is not set

arch/sh/configs/rts7751r2d_defconfig

+4 −4
Original line number Diff line number Diff line
@@ -243,8 +243,8 @@ CONFIG_SH_PCLK_FREQ=60000000 
#

# DMA support

#

CONFIG_SH_DMA=y

CONFIG_NR_ONCHIP_DMA_CHANNELS=8

# CONFIG_SH_DMA is not set

# CONFIG_NR_ONCHIP_DMA_CHANNELS is not set

# CONFIG_NR_DMA_CHANNELS_BOOL is not set



#
@@ -280,7 +280,7 @@ CONFIG_ZERO_PAGE_OFFSET=0x00010000 
CONFIG_BOOT_LINK_OFFSET=0x00800000

# CONFIG_UBC_WAKEUP is not set

CONFIG_CMDLINE_BOOL=y

CONFIG_CMDLINE="console=tty0 console=ttySC0,115200 root=/dev/sda1 earlyprintk=bios"

CONFIG_CMDLINE="console=tty0 console=ttySC0,115200 root=/dev/sda1 earlyprintk=serial"



#

# Bus options
@@ -1323,7 +1323,7 @@ CONFIG_ENABLE_MUST_CHECK=y 
# CONFIG_DEBUG_KERNEL is not set

CONFIG_LOG_BUF_SHIFT=14

# CONFIG_DEBUG_BUGVERBOSE is not set

CONFIG_SH_STANDARD_BIOS=y

# CONFIG_SH_STANDARD_BIOS is not set

CONFIG_EARLY_SCIF_CONSOLE=y

CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffe80000

CONFIG_EARLY_PRINTK=y