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

Commit d84c4124 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:
  sh: Fix stacktrace simplification fallout.
  sh: SH7760 DMABRG support.
  sh: clockevent/clocksource/hrtimers/nohz TMU support.
  sh: Truncate MAX_ACTIVE_REGIONS for the common case.
  rtc: rtc-sh: Fix rtc_dev pointer for rtc_update_irq().
  sh: Convert to common die chain.
  sh: Wire up utimensat syscall.
  sh: landisk mv_nr_irqs definition.
  sh: Fixup ndelay() xloops calculation for alternate HZ.
  sh: Add 32-bit opcode feature CPU flag.
  sh: Fix PC adjustments for varying opcode length.
  sh: Support for SH-2A 32-bit opcodes.
  sh: Kill off redundant __div64_32 symbol export.
  sh: Share exception vector table for SH-3/4.
  sh: Always define TRAPA_BUG_OPCODE.
  sh: __GFP_REPEAT for pte allocations, too.
  rtc: rtc-sh: Fix up dev_dbg() warnings.
  sh: generic quicklist support.
parents 932c37c3 a3cf4ea8

arch/sh/Kconfig

+7 −22
Original line number Diff line number Diff line
@@ -52,6 +52,9 @@ config GENERIC_IOMAP 
config GENERIC_TIME

	def_bool n



config GENERIC_CLOCKEVENTS

	def_bool n



config SYS_SUPPORTS_APM_EMULATION

	bool
@@ -436,11 +439,11 @@ endmenu 


menu "Timer and clock configuration"



if !GENERIC_TIME



config SH_TMU

	bool "TMU timer support"

	depends on CPU_SH3 || CPU_SH4

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	default y

	help

	  This enables the use of the TMU as the system timer.
@@ -459,8 +462,6 @@ config SH_MTU2 
	help

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



endif



config SH_TIMER_IRQ

	int

	default "28" if CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785
@@ -468,24 +469,6 @@ config SH_TIMER_IRQ 
	default "140" if CPU_SUBTYPE_SH7206

	default "16"



config NO_IDLE_HZ

	bool "Dynamic tick timer"

	help

	  Select this option if you want to disable continuous timer ticks

	  and have them programmed to occur as required. This option saves

	  power as the system can remain in idle state for longer.



	  By default dynamic tick is disabled during the boot, and can be

	  manually enabled with:



	    echo 1 > /sys/devices/system/timer/timer0/dyn_tick



	  Alternatively, if you want dynamic tick automatically enabled

	  during boot, pass "dyntick=enable" via the kernel command string.



	  Please note that dynamic tick may affect the accuracy of

	  timekeeping on some platforms depending on the implementation.



config SH_PCLK_FREQ

	int "Peripheral clock frequency (in Hz)"

	default "27000000" if CPU_SUBTYPE_SH73180 || CPU_SUBTYPE_SH7343
@@ -509,6 +492,8 @@ config SH_CLK_MD 
	help

	  MD2 - MD0 pin setting.



source "kernel/time/Kconfig"



endmenu



menu "CPU Frequency scaling"

arch/sh/boards/landisk/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ static void __init landisk_setup(char **cmdline_p) 
 */

struct sh_machine_vector mv_landisk __initmv = {

	.mv_name = "LANDISK",

	.mv_nr_irqs = 72,

	.mv_setup = landisk_setup,

	.mv_init_irq = init_landisk_IRQ,

};

arch/sh/drivers/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -2,8 +2,9 @@ 
# Makefile for the Linux SuperH-specific device drivers.

#



obj-y		+= dma/



obj-$(CONFIG_PCI)		+= pci/

obj-$(CONFIG_SH_DMA)		+= dma/

obj-$(CONFIG_SUPERHYWAY)	+= superhyway/

obj-$(CONFIG_PUSH_SWITCH)	+= push-switch.o

obj-$(CONFIG_HEARTBEAT)		+= heartbeat.o

arch/sh/drivers/dma/Kconfig

+14 −6
Original line number Diff line number Diff line 
menu "DMA support"



config SH_DMA

	bool "DMA controller (DMAC) support"

	help

	  Selecting this option will provide same API as PC's Direct Memory

	  Access Controller(8237A) for SuperH DMAC.

config SH_DMA_API

	bool



	  If unsure, say N.

config SH_DMA

	bool "SuperH on-chip DMA controller (DMAC) support"

	select SH_DMA_API

	default n



config NR_ONCHIP_DMA_CHANNELS

	depends on SH_DMA
@@ -53,4 +53,12 @@ config DMA_PAGE_OPS_CHANNEL 
	  in case channel 3 is unavailable. On the SH4, channels 1,2, and 3

	  are dual-address capable.



config SH_DMABRG

	bool "SH7760 DMABRG support"

	depends on CPU_SUBTYPE_SH7760

	help

	  The DMABRG does data transfers from main memory to Audio/USB units

	  of the SH7760.

	  Say Y if you want to use Audio/USB DMA on your SH7760 board.



endmenu

arch/sh/drivers/dma/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
# Makefile for the SuperH DMA specific kernel interface routines under Linux.

#



obj-y				+= dma-api.o

obj-$(CONFIG_SH_DMA_API)	+= dma-api.o dma-sysfs.o

obj-$(CONFIG_ISA_DMA_API)	+= dma-isa.o

obj-$(CONFIG_SYSFS)		+= dma-sysfs.o

obj-$(CONFIG_SH_DMA)		+= dma-sh.o

obj-$(CONFIG_SH_DREAMCAST)	+= dma-pvr2.o dma-g2.o

obj-$(CONFIG_SH_DMABRG)		+= dmabrg.o