Commit e5723e0e authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Add support for SH7706/SH7710/SH7343 CPUs. 



This adds support for the aforementioned CPU subtypes, and cleans
up some build issues encountered as a result.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent ecd95616

arch/sh/Kconfig

+6 −6
Original line number Diff line number Diff line
@@ -324,12 +324,11 @@ config SH_FPU_EMU 


config SH_DSP

	bool "DSP support"

	depends on !CPU_SH4

	default y

	default y if SH4AL_DSP || !CPU_SH4

	default n

	help

	  Selecting this option will enable support for SH processors that

	  have DSP units (ie, SH2-DSP and SH3-DSP). It is safe to say Y here

	  by default, as the existance of the DSP will be probed at runtime.

	  have DSP units (ie, SH2-DSP, SH3-DSP, and SH4AL-DSP).



	  This option must be set in order to enable the DSP.
@@ -393,8 +392,9 @@ config SH_PCLK_FREQ 
	int "Peripheral clock frequency (in Hz)"

	default "50000000" if CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7780

	default "60000000" if CPU_SUBTYPE_SH7751

	default "33333333" if CPU_SUBTYPE_SH7300 || CPU_SUBTYPE_SH7770 || CPU_SUBTYPE_SH7760

	default "27000000" if CPU_SUBTYPE_SH73180

	default "33333333" if CPU_SUBTYPE_SH7300 || CPU_SUBTYPE_SH7770 || \

			      CPU_SUBTYPE_SH7760

	default "27000000" if CPU_SUBTYPE_SH73180 || CPU_SUBTYPE_SH7343

	default "66000000" if CPU_SUBTYPE_SH4_202

	help

	  This option is used to specify the peripheral clock frequency.

arch/sh/Makefile

+5 −2
Original line number Diff line number Diff line
@@ -18,11 +18,13 @@ cflags-y := -mb 
cflags-$(CONFIG_CPU_LITTLE_ENDIAN)	:= -ml



isa-y					:= any

isa-$(CONFIG_SH_DSP)			:= sh

isa-$(CONFIG_CPU_SH2)			:= sh2

isa-$(CONFIG_CPU_SH2A)			:= sh2a

isa-$(CONFIG_CPU_SH3)			:= sh3

isa-$(CONFIG_CPU_SH4)			:= sh4

isa-$(CONFIG_CPU_SH4A)			:= sh4a

isa-$(CONFIG_CPU_SH2A)			:= sh2a

isa-$(CONFIG_CPU_SH4AL_DSP)		:= sh4al



isa-$(CONFIG_SH_DSP)			:= $(isa-y)-dsp
@@ -30,9 +32,11 @@ ifndef CONFIG_MMU 
isa-y			:= $(isa-y)-nommu

endif



ifndef CONFIG_SH_DSP

ifndef CONFIG_SH_FPU

isa-y			:= $(isa-y)-nofpu

endif

endif



cflags-y	+= $(call as-option,-Wa$(comma)-isa=$(isa-y),)
@@ -188,4 +192,3 @@ CLEAN_FILES += include/asm-sh/machtypes.h 
define archhelp

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

endef

arch/sh/boards/hp6xx/setup.c

+3 −2
Original line number Diff line number Diff line
@@ -8,10 +8,11 @@ 
 *

 * Setup code for an HP680  (internal peripherials only)

 */



#include <linux/types.h>

#include <linux/init.h>

#include <asm/io.h>

#include <asm/hd64461.h>

#include <asm/io.h>

#include <asm/irq.h>

#include <asm/hp6xx/hp6xx.h>

#include <asm/cpu/dac.h>

arch/sh/boards/renesas/hs7751rvoip/io.c

+1 −1
Original line number Diff line number Diff line
@@ -10,10 +10,10 @@ 
 * placeholder code from io_hs7751rvoip.c left in with the

 * expectation of later SuperIO and PCMCIA access.

 */



#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/module.h>

#include <linux/pci.h>

#include <asm/io.h>

#include <asm/hs7751rvoip/hs7751rvoip.h>

#include <asm/addrspace.h>

arch/sh/kernel/cpu/irq/ipr.c

+2 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ static void mask_and_ack_ipr(unsigned int irq) 
	disable_ipr_irq(irq);



#if defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709) || \

    defined(CONFIG_CPU_SUBTYPE_SH7706) || \

    defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7705)

	/* This is needed when we use edge triggered setting */

	/* XXX: Is it really needed? */
@@ -162,6 +163,7 @@ void __init init_IRQ(void) 
#endif



#if defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709) || \

    defined(CONFIG_CPU_SUBTYPE_SH7706) || \

    defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7705)

	/*

	 * Initialize the Interrupt Controller (INTC)