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

Commit 0858d9c0 authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branch 'sh/hwblk' into sh/pm-runtime

parents 9d730229 963e04ca

arch/sh/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -10,12 +10,16 @@ config SUPERH 
	select EMBEDDED

	select HAVE_CLK

	select HAVE_IDE

	select HAVE_LMB

	select HAVE_OPROFILE

	select HAVE_GENERIC_DMA_COHERENT

	select HAVE_IOREMAP_PROT if MMU

	select HAVE_ARCH_TRACEHOOK

	select HAVE_DMA_API_DEBUG

	select HAVE_PERF_COUNTERS

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_LZMA

	select RTC_LIB

	select GENERIC_ATOMIC64

	help
@@ -31,6 +35,9 @@ config SUPERH32 
	select HAVE_FUNCTION_TRACER

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_DYNAMIC_FTRACE

	select HAVE_FUNCTION_TRACE_MCOUNT_TEST

	select HAVE_FTRACE_SYSCALLS

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_ARCH_KGDB

	select ARCH_HIBERNATION_POSSIBLE if MMU

arch/sh/Kconfig.debug

+19 −3
Original line number Diff line number Diff line
@@ -38,11 +38,12 @@ config EARLY_SCIF_CONSOLE_PORT 
	default "0xffe00000" if CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7763 || \

				CPU_SUBTYPE_SH7722 || CPU_SUBTYPE_SH7366 || \

				CPU_SUBTYPE_SH7343

	default "0xffea0000" if CPU_SUBTYPE_SH7785

	default "0xffeb0000" if CPU_SUBTYPE_SH7785

	default "0xffeb0000" if CPU_SUBTYPE_SH7786

	default "0xfffe8000" if CPU_SUBTYPE_SH7203

	default "0xfffe9800" if CPU_SUBTYPE_SH7206 || CPU_SUBTYPE_SH7263

	default "0xffe80000" if CPU_SH4

	default "0xa4000150" if CPU_SH3

	default "0x00000000"



config EARLY_PRINTK
@@ -61,12 +62,14 @@ config EARLY_PRINTK 
	  select both the EARLY_SCIF_CONSOLE and SH_STANDARD_BIOS, using

	  the kernel command line option to toggle back and forth.



config DEBUG_STACKOVERFLOW

config STACK_DEBUG

	bool "Check for stack overflows"

	depends on DEBUG_KERNEL && SUPERH32

	help

	  This option will cause messages to be printed if free stack space

	  drops below a certain limit.

	  drops below a certain limit. Saying Y here will add overhead to

	  every function call and will therefore incur a major

	  performance hit. Most users should say N.



config DEBUG_STACK_USAGE

	bool "Stack utilization instrumentation"
@@ -107,6 +110,14 @@ config DUMP_CODE 


	  Those looking for more verbose debugging output should say Y.



config DWARF_UNWINDER

	bool "Enable the DWARF unwinder for stacktraces"

	select FRAME_POINTER

	default n

	help

	  Enabling this option will make stacktraces more accurate, at

	  the cost of an increase in overall kernel size.



config SH_NO_BSS_INIT

	bool "Avoid zeroing BSS (to speed-up startup on suitable platforms)"

	depends on DEBUG_KERNEL
@@ -123,4 +134,9 @@ config SH64_SR_WATCH 
	bool "Debug: set SR.WATCH to enable hardware watchpoints and trace"

	depends on SUPERH64



config MCOUNT

	def_bool y

	depends on SUPERH32

	depends on STACK_DEBUG || FUNCTION_TRACER



endmenu

arch/sh/Makefile

+20 −5
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ machdir-$(CONFIG_SH_7751_SYSTEMH) += mach-systemh 
machdir-$(CONFIG_SH_EDOSK7705)			+= mach-edosk7705

machdir-$(CONFIG_SH_HIGHLANDER)			+= mach-highlander

machdir-$(CONFIG_SH_MIGOR)			+= mach-migor

machdir-$(CONFIG_SH_KFR2R09)			+= mach-kfr2r09

machdir-$(CONFIG_SH_SDK7780)			+= mach-sdk7780

machdir-$(CONFIG_SH_X3PROTO)			+= mach-x3proto

machdir-$(CONFIG_SH_SH7763RDP)			+= mach-sh7763rdp
@@ -186,17 +187,27 @@ KBUILD_CFLAGS += -pipe $(cflags-y) 
KBUILD_CPPFLAGS		+= $(cflags-y)

KBUILD_AFLAGS		+= $(cflags-y)



ifeq ($(CONFIG_MCOUNT),y)

  KBUILD_CFLAGS += -pg

endif



ifeq ($(CONFIG_DWARF_UNWINDER),y)

  KBUILD_CFLAGS += -fasynchronous-unwind-tables

endif



libs-$(CONFIG_SUPERH32)		:= arch/sh/lib/	$(libs-y)

libs-$(CONFIG_SUPERH64)		:= arch/sh/lib64/ $(libs-y)



PHONY += maketools FORCE

BOOT_TARGETS = uImage uImage.bz2 uImage.gz uImage.lzma uImage.srec \

	       zImage vmlinux.srec romImage

PHONY += maketools $(BOOT_TARGETS) FORCE



maketools:  include/linux/version.h FORCE

	$(Q)$(MAKE) $(build)=arch/sh/tools include/asm-sh/machtypes.h



all: $(KBUILD_IMAGE)



zImage uImage uImage.srec vmlinux.srec: vmlinux

$(BOOT_TARGETS): vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@



compressed: zImage
@@ -208,10 +219,14 @@ archclean: 
	$(Q)$(MAKE) $(clean)=arch/sh/kernel/vsyscall



define archhelp

	@echo '* zImage 	           - Compressed kernel image'

	@echo '  zImage 	           - Compressed kernel image'

	@echo '  romImage	           - Compressed ROM image, if supported'

	@echo '  vmlinux.srec	           - Create an ELF S-record'

	@echo '  uImage  	           - Create a bootable image for U-Boot'

	@echo '* uImage  	           - Alias to bootable U-Boot image'

	@echo '  uImage.srec	           - Create an S-record for U-Boot'

	@echo '* uImage.gz	           - Kernel-only image for U-Boot (gzip)'

	@echo '  uImage.bz2	           - Kernel-only image for U-Boot (bzip2)'

	@echo '  uImage.lzma	           - Kernel-only image for U-Boot (lzma)'

endef



CLEAN_FILES += include/asm-sh/machtypes.h

arch/sh/boards/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -193,6 +193,13 @@ config SH_AP325RXA 
	  Renesas "AP-325RXA" support.

	  Compatible with ALGO SYSTEM CO.,LTD. "AP-320A"



config SH_KFR2R09

	bool "KFR2R09"

	depends on CPU_SUBTYPE_SH7724

	select ARCH_REQUIRE_GPIOLIB

	help

	  "Kit For R2R for 2009" support.



config SH_SH7763RDP

	bool "SH7763RDP"

	depends on CPU_SUBTYPE_SH7763

arch/sh/boards/board-ap325rxa.c

+6 −0
Original line number Diff line number Diff line
@@ -227,6 +227,9 @@ static struct platform_device lcdc_device = { 
	.dev		= {

		.platform_data	= &lcdc_info,

	},

	.archdata = {

		.hwblk_id = HWBLK_LCDC,

	},

};



static void camera_power(int val)
@@ -377,6 +380,9 @@ static struct platform_device ceu_device = { 
	.dev		= {

		.platform_data	= &sh_mobile_ceu_info,

	},

	.archdata = {

		.hwblk_id = HWBLK_CEU,

	},

};



struct spi_gpio_platform_data sdcard_cn3_platform_data = {