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

Commit 32351a28 authored by Paul Mundt's avatar Paul Mundt Committed by Paul Mundt
Browse files

sh: Add SH7785 Highlander board support (R7785RP). 



This adds preliminary support for the SH7785-based Highlander board.
Some of the Highlander support code is reordered so that most of it
can be reused directly.

This also plugs in missing SH7785 checks in the places that need it,
as this is the first board to support the CPU.

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

arch/sh/Kconfig

+15 −32
Original line number Diff line number Diff line
@@ -197,12 +197,8 @@ config SH_RTS7751R2D 
	  Select RTS7751R2D if configuring for a Renesas Technology

	  Sales SH-Graphics board.



config SH_R7780RP

	bool "R7780RP-1"

	select CPU_SUBTYPE_SH7780

	help

	  Select R7780RP-1 if configuring for a Renesas Solutions

	  HIGHLANDER board.

config SH_HIGHLANDER

	bool "Highlander"



config SH_EDOSK7705

	bool "EDOSK7705"
@@ -262,6 +258,10 @@ config SH_UNKNOWN 


endchoice



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

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

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



source "arch/sh/mm/Kconfig"



config CF_ENABLER
@@ -412,8 +412,9 @@ config CPU_HAS_PTEA 


endmenu



menu "Timer support"

depends on !GENERIC_TIME

menu "Timer and clock configuration"



if !GENERIC_TIME



config SH_TMU

	bool "TMU timer support"
@@ -436,17 +437,11 @@ config SH_MTU2 
	help

	  This enables the use of the MTU2 as the system timer.



endmenu



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



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



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

endif



config SH_TIMER_IRQ

	int

	default "28" if CPU_SUBTYPE_SH7780

	default "28" if CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785

	default "86" if CPU_SUBTYPE_SH7619

	default "140" if CPU_SUBTYPE_SH7206

	default "16"
@@ -476,7 +471,8 @@ config SH_PCLK_FREQ 
	default "33333333" if CPU_SUBTYPE_SH7300 || CPU_SUBTYPE_SH7770 || \

			      CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7705 || \

			      CPU_SUBTYPE_SH7206

	default "50000000" if CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7780

	default "50000000" if CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7780 || \

			      CPU_SUBTYPE_SH7785

	default "60000000" if CPU_SUBTYPE_SH7751

	default "66000000" if CPU_SUBTYPE_SH4_202

	help
@@ -491,6 +487,8 @@ config SH_CLK_MD 
	help

	  MD2 - MD0 pin setting.



endmenu



menu "CPU Frequency scaling"



source "drivers/cpufreq/Kconfig"
@@ -509,21 +507,6 @@ config SH_CPU_FREQ 


endmenu



source "arch/sh/drivers/dma/Kconfig"



source "arch/sh/cchips/Kconfig"



config HEARTBEAT

	bool "Heartbeat LED"

	depends on SH_MPC1211 || SH_SH03 || \

		   SOLUTION_ENGINE || \

		   SH_RTS7751R2D || SH_SH4202_MICRODEV || SH_LANDISK || \

		   SH_R7780RP

	help

	  Use the power-on LED on your machine as a load meter.  The exact

	  behavior is platform-dependent, but normally the flash frequency is

	  a hyperbolic function of the 5-minute load average.



source "arch/sh/drivers/Kconfig"



endmenu

arch/sh/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ machdir-$(CONFIG_SH_HS7751RVOIP) := renesas/hs7751rvoip 
machdir-$(CONFIG_SH_RTS7751R2D)			:= renesas/rts7751r2d

machdir-$(CONFIG_SH_7751_SYSTEMH)		:= renesas/systemh

machdir-$(CONFIG_SH_EDOSK7705)			:= renesas/edosk7705

machdir-$(CONFIG_SH_R7780RP)			:= renesas/r7780rp

machdir-$(CONFIG_SH_HIGHLANDER)			:= renesas/r7780rp

machdir-$(CONFIG_SH_7710VOIPGW)			:= renesas/sh7710voipgw

machdir-$(CONFIG_SH_SH4202_MICRODEV)		:= superh/microdev

machdir-$(CONFIG_SH_LANDISK)			:= landisk

arch/sh/boards/renesas/r7780rp/Kconfig

+14 −4
Original line number Diff line number Diff line 
if SH_R7780RP

if SH_HIGHLANDER



menu "R7780RP options"

choice

	prompt "Highlander options"

	default SH_R7780MP



config SH_R7780RP

	bool "R7780RP-1 board support"

	select CPU_SUBTYPE_SH7780



config SH_R7780MP

	bool "R7780MP board support"

	default y

	select CPU_SUBTYPE_SH7780

	help

	  Selecting this option will enable support for the mass-production

	  version of the R7780RP. If in doubt, say Y.



endmenu

config SH_R7785RP

	bool "R7785RP board support"

	select CPU_SUBTYPE_SH7785



endchoice



endif

arch/sh/boards/renesas/r7780rp/Makefile

+3 −3
Original line number Diff line number Diff line 
#

# Makefile for the R7780RP-1 specific parts of the kernel

#



obj-y	 := setup.o irq.o



irqinit-y			:= irq-r7780rp.o

irqinit-$(CONFIG_SH_R7785RP)	:= irq-r7785rp.o

obj-$(CONFIG_PUSH_SWITCH)	+= psw.o

obj-y	 			:= setup.o irq.o $(irqinit-y)

arch/sh/boards/renesas/r7780rp/irq-r7780rp.c

0 → 100644
+21 −0
Original line number Diff line number Diff line 
/*

 * Renesas Solutions Highlander R7780RP-1 Support.

 *

 * Copyright (C) 2002  Atom Create Engineering Co., Ltd.

 * Copyright (C) 2006  Paul Mundt

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 */

#include <linux/init.h>

#include <asm/io.h>

#include <asm/r7780rp.h>



void __init highlander_init_irq(void)

{

	int i;



	for (i = 0; i < 15; i++)

		make_r7780rp_irq(i);

}