Commit 7c7cbaf5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (127 commits)
  sh: update defconfigs.
  sh: Fix up the NUMA build for recent LMB changes.
  sh64: provide a stub per_cpu_trap_init() definition.
  sh: fix up CONFIG_KEXEC=n build.
  sh: fixup the docbook paths for clock framework shuffling.
  driver core: Early dev_name() depends on slab_is_available().
  sh: simplify WARN usage in SH clock driver
  sh: Check return value of clk_get on ms7724
  sh: Check return value of clk_get on ecovec24
  sh: move sh clock-cpg.c contents to drivers/sh/clk-cpg.c
  sh: move sh clock.c contents to drivers/sh/clk.
  sh: move sh asm/clock.h contents to linux/sh_clk.h V2
  sh: remove unused clock lookup
  sh: switch boards to clkdev
  sh: switch sh4-202 to clkdev
  sh: switch shx3 to clkdev
  sh: switch sh7757 to clkdev
  sh: switch sh7763 to clkdev
  sh: switch sh7780 to clkdev
  sh: switch sh7786 to clkdev
  ...
parents ba0234ec 4d0956b8

Documentation/DocBook/sh.tmpl

+7 −3
Original line number Diff line number Diff line
@@ -19,13 +19,17 @@ 
  </authorgroup>



  <copyright>

   <year>2008</year>

   <year>2008-2010</year>

   <holder>Paul Mundt</holder>

  </copyright>

  <copyright>

   <year>2008</year>

   <year>2008-2010</year>

   <holder>Renesas Technology Corp.</holder>

  </copyright>

  <copyright>

   <year>2010</year>

   <holder>Renesas Electronics Corp.</holder>

  </copyright>



  <legalnotice>

   <para>
@@ -77,7 +81,7 @@ 
  </chapter>

  <chapter id="clk">

    <title>Clock Framework Extensions</title>

!Iarch/sh/include/asm/clock.h

!Iinclude/linux/sh_clk.h

  </chapter>

  <chapter id="mach">

    <title>Machine Specific Interfaces</title>

arch/sh/Kconfig

+28 −8
Original line number Diff line number Diff line
@@ -158,7 +158,6 @@ config LOCKDEP_SUPPORT 


config HAVE_LATENCYTOP_SUPPORT

	def_bool y

	depends on !SMP



config ARCH_HAS_ILOG2_U32

	def_bool n
@@ -238,6 +237,8 @@ config CPU_SHX2 
config CPU_SHX3

	bool

	select DMA_COHERENT

	select SYS_SUPPORTS_SMP

	select SYS_SUPPORTS_NUMA



config ARCH_SHMOBILE

	bool
@@ -454,18 +455,12 @@ config CPU_SUBTYPE_SH7786 
	select CPU_SH4A

	select CPU_SHX3

	select CPU_HAS_PTEAEX

	select ARCH_SPARSEMEM_ENABLE

	select SYS_SUPPORTS_NUMA

	select SYS_SUPPORTS_SMP

	select GENERIC_CLOCKEVENTS_BROADCAST if SMP



config CPU_SUBTYPE_SHX3

	bool "Support SH-X3 processor"

	select CPU_SH4A

	select CPU_SHX3

	select ARCH_SPARSEMEM_ENABLE

	select SYS_SUPPORTS_NUMA

	select SYS_SUPPORTS_SMP

	select GENERIC_CLOCKEVENTS_BROADCAST if SMP



# SH4AL-DSP Processor Support
@@ -635,7 +630,7 @@ config KEXEC 


config CRASH_DUMP

	bool "kernel crash dumps (EXPERIMENTAL)"

	depends on SUPERH32 && EXPERIMENTAL

	depends on SUPERH32 && EXPERIMENTAL && BROKEN_ON_SMP

	help

	  Generate crash dump after being started by kexec.

	  This should be normally only set in special crash dump kernels
@@ -707,6 +702,13 @@ config NR_CPUS 
	  This is purely to save memory - each supported CPU adds

	  approximately eight kilobytes to the kernel image.



config HOTPLUG_CPU

	bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"

	depends on SMP && HOTPLUG && EXPERIMENTAL

	help

	  Say Y here to experiment with turning CPUs off and on.  CPUs

	  can be controlled through /sys/devices/system/cpu.



source "kernel/Kconfig.preempt"



config GUSA
@@ -733,6 +735,8 @@ config GUSA_RB 
	  LLSC, this should be more efficient than the other alternative of

	  disabling interrupts around the atomic sequence.



source "drivers/sh/Kconfig"



endmenu



menu "Boot options"
@@ -864,4 +868,20 @@ source "security/Kconfig" 


source "crypto/Kconfig"



menuconfig VIRTUALIZATION

	bool "Virtualization"

	default n

	---help---

	  Say Y here to get to see options for using your Linux host to run other

	  operating systems inside virtual machines (guests).

	  This option alone does not add any kernel code.



	  If you say N, all options in this submenu will be skipped and disabled.



if VIRTUALIZATION



source drivers/virtio/Kconfig



endif # VIRTUALIZATION



source "lib/Kconfig"

arch/sh/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ defaultimage-$(CONFIG_SH_AP325RXA) := uImage 
defaultimage-$(CONFIG_SH_7724_SOLUTION_ENGINE)	:= uImage

defaultimage-$(CONFIG_SH_7206_SOLUTION_ENGINE)	:= vmlinux

defaultimage-$(CONFIG_SH_7619_SOLUTION_ENGINE)	:= vmlinux

defaultimage-$(CONFIG_SH_SDK7786)		:= vmlinux.bin



# Set some sensible Kbuild defaults

KBUILD_IMAGE		:= $(defaultimage-y)

arch/sh/boards/board-urquell.c

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <cpu/sh7786.h>

#include <asm/heartbeat.h>

#include <asm/sizes.h>

#include <asm/smp-ops.h>



/*

 * bit  1234 5678
@@ -203,6 +204,8 @@ static void __init urquell_setup(char **cmdline_p) 
	printk(KERN_INFO "Renesas Technology Corp. Urquell support.\n");



	pm_power_off = urquell_power_off;



	register_smp_ops(&shx3_smp_ops);

}



/*

arch/sh/boards/mach-ecovec24/setup.c

+15 −11
Original line number Diff line number Diff line
@@ -710,8 +710,6 @@ static struct clk_ops fsimck_clk_ops = { 
};



static struct clk fsimckb_clk = {

	.name		= "fsimckb_clk",

	.id		= -1,

	.ops		= &fsimck_clk_ops,

	.enable_reg	= (void __iomem *)FCLKBCR,

	.rate		= 0, /* unknown */
@@ -1138,16 +1136,20 @@ static int __init arch_setup(void) 


	/* set SPU2 clock to 83.4 MHz */

	clk = clk_get(NULL, "spu_clk");

	if (clk) {

		clk_set_rate(clk, clk_round_rate(clk, 83333333));

		clk_put(clk);

	}



	/* change parent of FSI B */

	clk = clk_get(NULL, "fsib_clk");

	if (clk) {

		clk_register(&fsimckb_clk);

		clk_set_parent(clk, &fsimckb_clk);

		clk_set_rate(clk, 11000);

		clk_set_rate(&fsimckb_clk, 11000);

		clk_put(clk);

	}



	gpio_request(GPIO_PTU0, NULL);

	gpio_direction_output(GPIO_PTU0, 0);
@@ -1159,8 +1161,10 @@ static int __init arch_setup(void) 


	/* set VPU clock to 166 MHz */

	clk = clk_get(NULL, "vpu_clk");

	if (clk) {

		clk_set_rate(clk, clk_round_rate(clk, 166000000));

		clk_put(clk);

	}



	/* enable IrDA */

	gpio_request(GPIO_FN_IRDA_OUT, NULL);

CRA Git | Maintained and supported by SUSTech CRA and CCSE