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

Commit 1d767cae authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh 

Pull SuperH updates from Paul Mundt:
 - New CPUs: SH7734 (SH-4A), SH7264 and SH7269 (SH-2A)
 - New boards: RSK2+SH7264, RSK2+SH7269
 - Unbreaking kgdb for SMP
 - Consolidation of _32/_64 page fault handling.
 - watchdog and legacy DMA chainsawing, part 1
 - Conversion to evt2irq() hwirq lookup, to support relocation of
   vectored IRQs for irqdomains.

* tag 'sh-for-linus' of git://github.com/pmundt/linux-sh: (98 commits)
  sh: intc: Kill off special reservation interface.
  sh: Enable PIO API for hp6xx and se770x.
  sh: Kill off machvec IRQ hinting.
  sh: dma: More legacy cpu dma chainsawing.
  sh: Kill off MAX_DMA_ADDRESS leftovers.
  sh: Tidy up some of the cpu legacy dma header mess.
  sh: Move sh4a dma header from cpu-sh4 to cpu-sh4a.
  sh64: Fix up vmalloc fault range check.
  Revert "sh: Ensure fixmap and store queue space can co-exist."
  serial: sh-sci: Fix for port types without BRI interrupts.
  sh: legacy PCI evt2irq migration.
  sh: cpu dma evt2irq migration.
  sh: sh7763rdp evt2irq migration.
  sh: sdk7780 evt2irq migration.
  sh: migor evt2irq migration.
  sh: landisk evt2irq migration.
  sh: kfr2r09 evt2irq migration.
  sh: ecovec24 evt2irq migration.
  sh: ap325rxa evt2irq migration.
  sh: urquell evt2irq migration.
  ...
parents 61011677 5f19f14f

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -6573,7 +6573,7 @@ M: Paul Mundt <lethal@linux-sh.org> 
L:	linux-sh@vger.kernel.org

W:	http://www.linux-sh.org

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

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

T:	git git://github.com/pmundt/linux-sh.git sh-latest

S:	Supported

F:	Documentation/sh/

F:	arch/sh/

arch/sh/Kconfig

+43 −2
Original line number Diff line number Diff line
@@ -155,7 +155,8 @@ config ARCH_HAS_DEFAULT_IDLE 


config NO_IOPORT

	def_bool !PCI

	depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN

	depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN && \

		   !SH_HP6XX && !SH_SOLUTION_ENGINE



config IO_TRAPPED

	bool
@@ -286,6 +287,20 @@ config CPU_SUBTYPE_SH7263 
	select SYS_SUPPORTS_CMT

	select SYS_SUPPORTS_MTU2



config CPU_SUBTYPE_SH7264

	bool "Support SH7264 processor"

	select CPU_SH2A

	select CPU_HAS_FPU

	select SYS_SUPPORTS_CMT

	select SYS_SUPPORTS_MTU2



config CPU_SUBTYPE_SH7269

	bool "Support SH7269 processor"

	select CPU_SH2A

	select CPU_HAS_FPU

	select SYS_SUPPORTS_CMT

	select SYS_SUPPORTS_MTU2



config CPU_SUBTYPE_MXG

	bool "Support MX-G processor"

	select CPU_SH2A
@@ -425,6 +440,16 @@ config CPU_SUBTYPE_SH7724 
	help

	  Select SH7724 if you have an SH-MobileR2R CPU.



config CPU_SUBTYPE_SH7734

	bool "Support SH7734 processor"

	select CPU_SH4A

	select CPU_SHX2

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select USB_ARCH_HAS_OHCI

	select USB_ARCH_HAS_EHCI

	help

	  Select SH7734 if you have a SH4A SH7734 CPU.



config CPU_SUBTYPE_SH7757

	bool "Support SH7757 processor"

	select CPU_SH4A
@@ -582,7 +607,9 @@ config SH_CLK_CPG 
config SH_CLK_CPG_LEGACY

	depends on SH_CLK_CPG

	def_bool y if !CPU_SUBTYPE_SH7785 && !ARCH_SHMOBILE && \

		      !CPU_SHX3 && !CPU_SUBTYPE_SH7757

		      !CPU_SHX3 && !CPU_SUBTYPE_SH7757 && \

		      !CPU_SUBTYPE_SH7734 && !CPU_SUBTYPE_SH7264 && \

		      !CPU_SUBTYPE_SH7269



source "kernel/time/Kconfig"
@@ -683,6 +710,20 @@ config SECCOMP 


	  If unsure, say N.



config CC_STACKPROTECTOR

	bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"

	depends on SUPERH32 && EXPERIMENTAL

	help

	  This option turns on the -fstack-protector GCC feature. This

	  feature puts, at the beginning of functions, a canary value on

	  the stack just before the return address, and validates

	  the value just before actually returning.  Stack based buffer

	  overflows (that need to overwrite this return address) now also

	  overwrite the canary, which gets detected and the attack is then

	  neutralized via a kernel panic.



	  This feature requires gcc version 4.2 or above.



config SMP

	bool "Symmetric multi-processing support"

	depends on SYS_SUPPORTS_SMP

arch/sh/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -199,6 +199,10 @@ ifeq ($(CONFIG_DWARF_UNWINDER),y) 
  KBUILD_CFLAGS += -fasynchronous-unwind-tables

endif



ifeq ($(CONFIG_CC_STACKPROTECTOR),y)

  KBUILD_CFLAGS += -fstack-protector

endif



libs-$(CONFIG_SUPERH32)		:= arch/sh/lib/	$(libs-y)

libs-$(CONFIG_SUPERH64)		:= arch/sh/lib64/ $(libs-y)

arch/sh/boards/Kconfig

+4 −3
Original line number Diff line number Diff line
@@ -133,7 +133,8 @@ config SH_RTS7751R2D 


config SH_RSK

	bool "Renesas Starter Kit"

	depends on CPU_SUBTYPE_SH7201 || CPU_SUBTYPE_SH7203

	depends on CPU_SUBTYPE_SH7201 || CPU_SUBTYPE_SH7203 || \

	  CPU_SUBTYPE_SH7264 || CPU_SUBTYPE_SH7269

	help

	 Select this option if configuring for any of the RSK+ MCU

	 evaluation platforms.
@@ -338,8 +339,6 @@ config SH_APSH4AD0A 
	help

	  Select AP-SH4AD-0A if configuring for an ALPHAPROJECT AP-SH4AD-0A.



endmenu



source "arch/sh/boards/mach-r2d/Kconfig"

source "arch/sh/boards/mach-highlander/Kconfig"

source "arch/sh/boards/mach-sdk7780/Kconfig"
@@ -359,3 +358,5 @@ config SH_MAGIC_PANEL_R2_VERSION 
endmenu



endif



endmenu

arch/sh/boards/board-edosk7705.c

+2 −2
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/platform_device.h>

#include <linux/interrupt.h>

#include <linux/smc91x.h>

#include <linux/sh_intc.h>

#include <asm/machvec.h>

#include <asm/sizes.h>
@@ -20,7 +21,7 @@ 
#define SMC_IO_OFFSET	0x300

#define SMC_IOADDR	(SMC_IOBASE + SMC_IO_OFFSET)



#define ETHERNET_IRQ	0x09

#define ETHERNET_IRQ	evt2irq(0x320)



static void __init sh_edosk7705_init_irq(void)

{
@@ -73,6 +74,5 @@ device_initcall(init_edosk7705_devices); 
 */

static struct sh_machine_vector mv_edosk7705 __initmv = {

	.mv_name		= "EDOSK7705",

	.mv_nr_irqs		= 80,

	.mv_init_irq		= sh_edosk7705_init_irq,

};