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

Commit d224a93d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: (29 commits)
  sh: Fixup SH-2 BUG() trap handling.
  sh: Use early_param() for earlyprintk parsing.
  sh: Fix .empty_zero_page alignment for PAGE_SIZE > 4096.
  sh: Fixup .data.page_aligned.
  sh: Hook up SH7722 scif ipr interrupts.
  sh: Fixup sh_bios() trap handling.
  sh: SH-MobileR SH7722 CPU support.
  sh: Fixup dma_cache_sync() callers.
  sh: Convert remaining remap_area_pages() users to ioremap_page_range().
  sh: Fixup kernel_execve() for syscall cleanups.
  sh: Fix get_wchan().
  sh: BUG() handling through trapa vector.
  rtc: rtc-sh: alarm support.
  rtc: rtc-sh: fix rtc for out-by-one for the month.
  sh: Kill off unused SE7619 I/O ops.
  serial: sh-sci: Shut up various sci_rxd_in() gcc4 warnings.
  sh: Split out atomic ops logically.
  sh: Fix Solution Engine 7619 build.
  sh: Trivial build fixes for SH-2 support.
  sh: IPR IRQ updates for SH7619/SH7206.
  ...
parents b57bd066 e9cfc147

arch/sh/Kconfig

+1 −13
Original line number Original line Diff line number Diff line
@@ -479,7 +479,7 @@ config SH_CLK_MD 
	int "CPU Mode Pin Setting"

	int "CPU Mode Pin Setting"

	depends on CPU_SUBTYPE_SH7619 || CPU_SUBTYPE_SH7206

	depends on CPU_SUBTYPE_SH7619 || CPU_SUBTYPE_SH7206

	help

	help

	  MD2 - MD0 Setting.

	  MD2 - MD0 pin setting.





menu "CPU Frequency scaling"

menu "CPU Frequency scaling"
@@ -580,18 +580,6 @@ config NR_CPUS 




source "kernel/Kconfig.preempt"

source "kernel/Kconfig.preempt"





config CPU_HAS_SR_RB

	bool "CPU has SR.RB"

	depends on CPU_SH3 || CPU_SH4

	default y

	help

	  This will enable the use of SR.RB register bank usage. Processors

	  that are lacking this bit must have another method in place for

	  accomplishing what is taken care of by the banked registers.



	  See <file:Documentation/sh/register-banks.txt> for further

	  information on SR.RB and register banking in the kernel in general.



config NODES_SHIFT

config NODES_SHIFT

	int

	int

	default "1"

	default "1"

arch/sh/Kconfig.debug

+2 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,8 @@ config EARLY_SCIF_CONSOLE_PORT 
	hex "SCIF port for early console"

	hex "SCIF port for early console"

	depends on EARLY_SCIF_CONSOLE

	depends on EARLY_SCIF_CONSOLE

	default "0xffe00000" if CPU_SUBTYPE_SH7780

	default "0xffe00000" if CPU_SUBTYPE_SH7780

	default "0xfffe9800" if CPU_SUBTYPE_SH72060

	default "0xfffe9800" if CPU_SUBTYPE_SH7206

	default "0xf8420000" if CPU_SUBTYPE_SH7619

	default "0xffe80000" if CPU_SH4

	default "0xffe80000" if CPU_SH4





config EARLY_PRINTK

config EARLY_PRINTK

arch/sh/Makefile

+5 −2
Original line number Original line Diff line number Diff line
@@ -179,7 +179,7 @@ maketools: include/linux/version.h FORCE 




all: zImage

all: zImage





zImage: vmlinux

zImage uImage uImage.srec vmlinux.srec: vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@





compressed: zImage

compressed: zImage
@@ -190,5 +190,8 @@ archclean: 
CLEAN_FILES += include/asm-sh/machtypes.h

CLEAN_FILES += include/asm-sh/machtypes.h





define archhelp

define archhelp

	@echo '  zImage 	           - Compressed kernel image (arch/sh/boot/zImage)'

	@echo '* zImage 	           - Compressed kernel image'

	@echo '  vmlinux.srec	           - Create an ELF S-record'

	@echo '  uImage  	           - Create a bootable image for U-Boot'

	@echo '  uImage.srec  	           - Create an S-record for U-Boot'

endef
 
endef

arch/sh/boards/landisk/irq.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -16,8 +16,8 @@ 
 */

 */

#include <linux/init.h>

#include <linux/init.h>

#include <linux/irq.h>

#include <linux/irq.h>

#include <asm/io.h>

#include <linux/interrupt.h>

#include <asm/irq.h>

#include <linux/io.h>

#include <asm/landisk/iodata_landisk.h>

#include <asm/landisk/iodata_landisk.h>





static void enable_landisk_irq(unsigned int irq);

static void enable_landisk_irq(unsigned int irq);

arch/sh/boards/se/7206/irq.c

+12 −4
Original line number Original line Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/irq.h>

#include <linux/irq.h>

#include <linux/io.h>

#include <linux/io.h>

#include <linux/irq.h>

#include <linux/irq.h>

#include <linux/interrupt.h>

#include <asm/se7206.h>

#include <asm/se7206.h>





#define INTSTS0 0x31800000

#define INTSTS0 0x31800000
@@ -18,6 +19,13 @@ 
#define INTMSK1 0x31800006

#define INTMSK1 0x31800006

#define INTSEL  0x31800008

#define INTSEL  0x31800008





#define IRQ0_IRQ 64

#define IRQ1_IRQ 65

#define IRQ3_IRQ 67



#define INTC_IPR01 0xfffe0818

#define INTC_ICR1  0xfffe0802



static void disable_se7206_irq(unsigned int irq)

static void disable_se7206_irq(unsigned int irq)

{

{

	unsigned short val;

	unsigned short val;
@@ -39,7 +47,7 @@ static void disable_se7206_irq(unsigned int irq) 
	case IRQ1_IRQ:

	case IRQ1_IRQ:

		msk0 |= 0x000f;

		msk0 |= 0x000f;

		break;

		break;

	case IRQ2_IRQ:

	case IRQ3_IRQ:

		msk0 |= 0x0f00;

		msk0 |= 0x0f00;

		msk1 |= 0x00ff;

		msk1 |= 0x00ff;

		break;

		break;
@@ -70,7 +78,7 @@ static void enable_se7206_irq(unsigned int irq) 
	case IRQ1_IRQ:

	case IRQ1_IRQ:

		msk0 &= ~0x000f;

		msk0 &= ~0x000f;

		break;

		break;

	case IRQ2_IRQ:

	case IRQ3_IRQ:

		msk0 &= ~0x0f00;

		msk0 &= ~0x0f00;

		msk1 &= ~0x00ff;

		msk1 &= ~0x00ff;

		break;

		break;
@@ -96,7 +104,7 @@ static void eoi_se7206_irq(unsigned int irq) 
	case IRQ1_IRQ:

	case IRQ1_IRQ:

		sts0 &= ~0x000f;

		sts0 &= ~0x000f;

		break;

		break;

	case IRQ2_IRQ:

	case IRQ3_IRQ:

		sts0 &= ~0x0f00;

		sts0 &= ~0x0f00;

		sts1 &= ~0x00ff;

		sts1 &= ~0x00ff;

		break;

		break;
@@ -106,7 +114,7 @@ static void eoi_se7206_irq(unsigned int irq) 
}

}





static struct irq_chip se7206_irq_chip __read_mostly = {

static struct irq_chip se7206_irq_chip __read_mostly = {

	.name		= "SE7206-FPGA-IRQ",

	.name		= "SE7206-FPGA",

	.mask		= disable_se7206_irq,

	.mask		= disable_se7206_irq,

	.unmask		= enable_se7206_irq,

	.unmask		= enable_se7206_irq,

	.mask_ack	= disable_se7206_irq,

	.mask_ack	= disable_se7206_irq,