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

Commit a80b824f 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: (26 commits)
  sh: remove dead config symbols from SH code
  sh: Kill off broken snapgear ds1302 code.
  sh: Add a dummy vga.h.
  rtc: rtc-sh: Zero out tm value for invalid rtc states.
  rtc: sh-rtc: Handle rtc_device_register() failure properly.
  sh: Fix heartbeart on Solution Engine series
  sh: Remove SCI_NPORTS from sh-sci.h
  sh: Fix up PAGE_KERNEL_PCC() for nommu.
  sh: hs7751rvoip: Kill off dead IPR IRQ mappings.
  sh: hs7751rvoip: irq.c needs linux/interrupt.h.
  sh: Kill off __{copy,clear}_user_page().
  sh: Optimized copy_{to,from}_user_page() for SH-4.
  sh: Wire up clear_user_highpage().
  sh: Kill off the remaining ST40 cruft.
  superhyway: Handle device_register() retval properly.
  sh: kgdb sysrq depends on magic sysrq.
  sh: Add -Werror for clean directories.
  sh: Fix up kgdb build with modular sh-sci.
  sh: Export __{s,u}divsi3_i4i on all CPUs.
  sh: Fix up kgdb-on-NMI branch target.
  ...
parents 45ff993d 06e5fda1

arch/sh/Kconfig

+6 −4
Original line number Diff line number Diff line
@@ -211,10 +211,12 @@ config SH_SOLUTION_ENGINE 
	bool "SolutionEngine"

	select SOLUTION_ENGINE

	select CPU_HAS_IPR_IRQ

	depends on CPU_SUBTYPE_SH7709 || CPU_SUBTYPE_SH7750

	depends on CPU_SUBTYPE_SH7705 || CPU_SUBTYPE_SH7709 || CPU_SUBTYPE_SH7710 || \

	  CPU_SUBTYPE_SH7712 || CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7750S || \

	  CPU_SUBTYPE_SH7750R 

	help

	  Select SolutionEngine if configuring for a Hitachi SH7709

	  or SH7750 evaluation board.

	  Select SolutionEngine if configuring for a Hitachi SH7705, SH7709,

	  SH7710, SH7712, SH7750, SH7750S or SH7750R evaluation board.



config SH_7206_SOLUTION_ENGINE

	bool "SolutionEngine7206"
@@ -603,7 +605,7 @@ config BOOT_LINK_OFFSET 


config UBC_WAKEUP

	bool "Wakeup UBC on startup"

	depends on CPU_SH4

	depends on CPU_SH4 && !CPU_SH4A

	help

	  Selecting this option will wakeup the User Break Controller (UBC) on

	  startup. Although the UBC is left in an awake state when the processor

arch/sh/Kconfig.debug

+2 −1
Original line number Diff line number Diff line
@@ -124,12 +124,13 @@ config KGDB_NMI 


config SH_KGDB_CONSOLE

	bool "Console messages through GDB"

	depends on !SERIAL_SH_SCI_CONSOLE

	depends on !SERIAL_SH_SCI_CONSOLE && SERIAL_SH_SCI=y

	select SERIAL_CORE_CONSOLE

	default n



config KGDB_SYSRQ

	bool "Allow SysRq 'G' to enter KGDB"

	depends on MAGIC_SYSRQ

	default y



comment "Serial port setup"

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

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#include <linux/init.h>

#include <linux/irq.h>

#include <linux/interrupt.h>

#include <asm/io.h>

#include <asm/irq.h>

#include <asm/hs7751rvoip.h>

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

+2 −17
Original line number Diff line number Diff line
@@ -15,20 +15,6 @@ 
#include <asm/io.h>

#include <asm/machvec.h>



static struct ipr_data hs77501rvoip_ipr_map[] = {

#if defined(CONFIG_HS7751RVOIP_CODEC)

	{ DMTE0_IRQ, DMA_IPR_ADDR, DMA_IPR_POS, DMA_PRIORITY },

	{ DMTE1_IRQ, DMA_IPR_ADDR, DMA_IPR_POS, DMA_PRIORITY },

#endif

};



static void __init hs7751rvoip_init_irq(void)

{

	make_ipr_irq(hs77501rvoip_ipr_map, ARRAY_SIZE(hs77501rvoip_ipr_map));



	init_hs7751rvoip_IRQ();

}



static void hs7751rvoip_power_off(void)

{

	ctrl_outw(ctrl_inw(PA_OUTPORTR) & 0xffdf, PA_OUTPORTR);
@@ -75,14 +61,13 @@ static int __init hs7751rvoip_cf_init(void) 


	return 0;

}

device_initcall(hs7751rvoip_cf_init);



/*

 * Initialize the board

 */

static void __init hs7751rvoip_setup(char **cmdline_p)

{

	device_initcall(hs7751rvoip_cf_init);



	ctrl_outb(0xf0, PA_OUTPORTR);

	pm_power_off = hs7751rvoip_power_off;
@@ -115,6 +100,6 @@ static struct sh_machine_vector mv_hs7751rvoip __initmv = { 
	.mv_outsw		= hs7751rvoip_outsw,

	.mv_outsl		= hs7751rvoip_outsl,



	.mv_init_irq		= hs7751rvoip_init_irq,

	.mv_init_irq		= init_hs7751rvoip_IRQ,

	.mv_ioport_map		= hs7751rvoip_ioport_map,

};

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

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <asm/machvec.h>

#include <asm/irq.h>

#include <asm/io.h>

#include <asm/irq.h>



static struct ipr_data sh7710voipgw_ipr_map[] = {

	{ TIMER2_IRQ, TIMER2_IPR_ADDR, TIMER2_IPR_POS, TIMER2_PRIORITY },