Renesas ARM based SoC boot cleanup for v3.11
Subsystems (5)
Hi Olof, Hi Arnd,
This pull request is based on renesas-pinmux-for-v3.11, which you have already pulled, in order to provide pre-requisites.
The following changes since commit 5fcf4a3c3a5bc08bf72a50ef1332501a3c1b96bb:
ARM: shmobile: marzen: Use RCAR_GP_PIN macro (2013-06-05 17:18:24 +0900)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-cleanup-boot-for-v3.11
for you to fetch changes up to 9da629661d207299ad119a6735eb2411f54fd45f:
ARM: shmobile: Remove Bonito board support (2013-06-13 14:26:04 +0900)
----------------------------------------------------------------
Renesas ARM based SoC boot cleanup for v3.11
Work by Magnus Damm and others to clean up the boot of and move things closer to supporting MULTIARCH.
As a side effect of this work it was decided to remove support for two boards, Bonito and APE4EVM. Those patches are included in this series as they depend on earlier patches in the series.
----------------------------------------------------------------
Kuninori Morimoto (1):
ARM: shmobile: Remove Bonito board support
Magnus Damm (14):
ARM: shmobile: uImage load address rework
ARM: shmobile: Let romImage rely on default ATAGS
ARM: shmobile: Remove romImage CONFIG_MEMORY_START
ARM: shmobile: Rework sh7372 sleep code to use virt_to_phys()
ARM: shmobile: Add SMP boot function and argument
ARM: shmobile: Add SCU boot function using argument
ARM: shmobile: r8a7779 SMP with SCU boot fn and args
ARM: shmobile: sh73a0 SMP with SCU boot fn and args
ARM: shmobile: EMEV2 SMP with SCU boot fn and args
ARM: shmobile: Remove old SCU boot code
ARM: shmobile: Enable ARM_PATCH_PHYS_VIRT
ARM: shmobile: Remove MEMORY_START/SIZE
ARM: shmobile: Remove mach/memory.h
ARM: shmobile: Remove AP4EVB board support
arch/arm/Kconfig | 2 +- arch/arm/boot/compressed/head-shmobile.S | 21 +- arch/arm/configs/ap4evb_defconfig | 56 - arch/arm/configs/bonito_defconfig | 72 -- arch/arm/mach-shmobile/Kconfig | 58 - arch/arm/mach-shmobile/Makefile | 2 - arch/arm/mach-shmobile/Makefile.boot | 18 +- arch/arm/mach-shmobile/board-ap4evb.c | 1310 -------------------- arch/arm/mach-shmobile/board-bonito.c | 502 -------- arch/arm/mach-shmobile/headsmp-scu.S | 29 +- arch/arm/mach-shmobile/headsmp.S | 13 +- arch/arm/mach-shmobile/include/mach/common.h | 6 +- .../arm/mach-shmobile/include/mach/head-ap4evb.txt | 93 -- arch/arm/mach-shmobile/include/mach/memory.h | 7 - arch/arm/mach-shmobile/include/mach/mmc-ap4eb.h | 29 - arch/arm/mach-shmobile/include/mach/mmc.h | 4 +- arch/arm/mach-shmobile/include/mach/sh7372.h | 2 + arch/arm/mach-shmobile/include/mach/zboot.h | 6 +- arch/arm/mach-shmobile/pm-sh7372.c | 3 + arch/arm/mach-shmobile/sleep-sh7372.S | 5 +- arch/arm/mach-shmobile/smp-emev2.c | 6 +- arch/arm/mach-shmobile/smp-r8a7779.c | 6 +- arch/arm/mach-shmobile/smp-sh73a0.c | 6 +- 23 files changed, 68 insertions(+), 2188 deletions(-) delete mode 100644 arch/arm/configs/ap4evb_defconfig delete mode 100644 arch/arm/configs/bonito_defconfig delete mode 100644 arch/arm/mach-shmobile/board-ap4evb.c delete mode 100644 arch/arm/mach-shmobile/board-bonito.c delete mode 100644 arch/arm/mach-shmobile/include/mach/head-ap4evb.txt delete mode 100644 arch/arm/mach-shmobile/include/mach/memory.h delete mode 100644 arch/arm/mach-shmobile/include/mach/mmc-ap4eb.h
PATCH 1/15 ARM: shmobile: uImage load address rework
From: Magnus Damm <[email protected]>
This is V2 of the mach-shmobile uImage load address rework patch.
Rework the mach-shmobile uImage load address calculation by storing the per-board load addresses in Makefile.boot. This removes the CONFIG_MEMORY_START dependency from Makefile.boot, and it also makes it possible to create safe kernel images that boot on multiple boards.
This is one of several series of code that reworks code not to rely on CONFIG_MEMORY_START/SIZE which in turn is needed for ARCH_MULTIPLATFORM.
Signed-off-by Magnus Damm <[email protected]>
Reviewed-by Laurent Pinchart <[email protected]>
Reviewed-by Kuninori Morimoto <[email protected]>
Signed-off-by Simon Horman <[email protected]>
--- arch/arm/mach-shmobile/Makefile.boot | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)
arch/arm/mach-shmobile/Makefile.boot +18 -2
@@ -1,6 +1,22 @@ -__ZRELADDR := $(shell /bin/bash -c 'printf "0x%08x" \ - $$[$(CONFIG_MEMORY_START) + 0x8000]') +# per-board load address for uImage +loadaddr-y := +loadaddr-$(CONFIG_MACH_AG5EVM) += 0x40008000 +loadaddr-$(CONFIG_MACH_AP4EVB) += 0x40008000 +loadaddr-$(CONFIG_MACH_APE6EVM) += 0x40008000 +loadaddr-$(CONFIG_MACH_ARMADILLO800EVA) += 0x40008000 +loadaddr-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += 0x40008000 +loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000 +loadaddr-$(CONFIG_MACH_BONITO) += 0x40008000 +loadaddr-$(CONFIG_MACH_KOTA2) += 0x41008000 +loadaddr-$(CONFIG_MACH_KZM9D) += 0x40008000 +loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000 +loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000 +loadaddr-$(CONFIG_MACH_LAGER) += 0x40008000 +loadaddr-$(CONFIG_MACH_MACKEREL) += 0x40008000 +loadaddr-$(CONFIG_MACH_MARZEN) += 0x60008000 +loadaddr-$(CONFIG_MACH_MARZEN_REFERENCE) += 0x60008000 +__ZRELADDR := $(sort $(loadaddr-y)) zreladdr-y += $(__ZRELADDR) # Unsupported legacy stuff
Signature · 1 line
1.8.2.1
PATCH 2/15 ARM: shmobile: Let romImage rely on default ATAGS
In reply to Simon HormanFrom: Magnus Damm <[email protected]>
Remove the ATAGS data structure from head-shmobile.S since a default ATAGS is already provided by the code in arch/arm/kernel/atags_parser.c. Passing a NULL as ATAGS is valid. For actual hardware specific setup the fixup callback in the board code may be used.
Signed-off-by Magnus Damm <[email protected]>
Signed-off-by Simon Horman <[email protected]>
--- arch/arm/boot/compressed/head-shmobile.S | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-)
arch/arm/boot/compressed/head-shmobile.S +1 -18
@@ -55,26 +55,9 @@ __tmp_stack: __continue: #endif /* CONFIG_ZBOOT_ROM_MMC || CONFIG_ZBOOT_ROM_SH_MOBILE_SDHI */ - b 1f -__atags:@ tag #1 - .long 12 @ tag->hdr.size = tag_size(tag_core); - .long 0x54410001 @ tag->hdr.tag = ATAG_CORE; - .long 0 @ tag->u.core.flags = 0; - .long 0 @ tag->u.core.pagesize = 0; - .long 0 @ tag->u.core.rootdev = 0; - @ tag #2 - .long 8 @ tag->hdr.size = tag_size(tag_mem32); - .long 0x54410002 @ tag->hdr.tag = ATAG_MEM; - .long CONFIG_MEMORY_SIZE @ tag->u.mem.size = CONFIG_MEMORY_SIZE; - .long CONFIG_MEMORY_START @ @ tag->u.mem.start = CONFIG_MEMORY_START; - @ tag #3 - .long 0 @ tag->hdr.size = 0 - .long 0 @ tag->hdr.tag = ATAG_NONE; -1: - /* Set board ID necessary for boot */ ldr r7, 1f @ Set machine type register - adr r8, __atags @ Set atag register + mov r8, #0 @ pass null pointer as atag b 2f 1 : .long MACH_TYPE
Signature · 1 line
1.8.2.1
PATCH 3/15 ARM: shmobile: Remove romImage CONFIG_MEMORY_START
In reply to Simon HormanFrom: Magnus Damm <[email protected]>
Instead of relying on CONFIG_MEMORY_START for memory base address, let each romImage board header file specify this information.
This is reworks code not to rely on CONFIG_MEMORY_START which in turn is needed for ARCH_MULTIPLATFORM.
Signed-off-by Magnus Damm <[email protected]>
Signed-off-by Simon Horman <[email protected]>
--- arch/arm/boot/compressed/head-shmobile.S | 2 +- arch/arm/mach-shmobile/include/mach/zboot.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
arch/arm/boot/compressed/head-shmobile.S +1 -1
@@ -46,7 +46,7 @@ __image_start: __image_end: .long _got_end __load_base: - .long CONFIG_MEMORY_START + 0x02000000 @ Load at 32Mb into SDRAM + .long MEMORY_START + 0x02000000 @ Load at 32Mb into SDRAM __loaded: .long __continue .align
arch/arm/mach-shmobile/include/mach/zboot.h +2 -0
@@ -12,9 +12,11 @@#ifdef CONFIG_MACH_AP4EVB #define MACH_TYPE MACH_TYPE_AP4EVB +#define MEMORY_START 0x40000000#include "mach/head-ap4evb.txt" #elif defined(CONFIG_MACH_MACKEREL )#define MACH_TYPE MACH_TYPE_MACKEREL +#define MEMORY_START 0x40000000#include "mach/head-mackerel.txt" #else #error "unsupported board."
Signature · 1 line
1.8.2.1
PATCH 4/15 ARM: shmobile: Rework sh7372 sleep code to use virt_to_phys()
In reply to Simon HormanFrom: Magnus Damm <[email protected]>
Instead of having a hard coded virt-to-phys address conversion code in sleep-sh7372.S, rework the code to do the conversion in C using virt_to_phys().
This removes the need for PLAT_PHYS_OFFSET which in turn is needed for ARCH_MULTIPLATFORM.
Signed-off-by Magnus Damm <[email protected]>
Signed-off-by Simon Horman <[email protected]>
--- arch/arm/mach-shmobile/include/mach/sh7372.h | 2 ++ arch/arm/mach-shmobile/pm-sh7372.c | 3 +++ arch/arm/mach-shmobile/sleep-sh7372.S | 5 ++++- 3 files changed, 9 insertions(+), 1 deletion(-)
arch/arm/mach-shmobile/include/mach/sh7372.h +2 -0
@@ -75,6 +75,8 @@ extern void sh7372_intcs_resume(void);extern void sh7372_intca_suspend (void );extern void sh7372_intca_resume (void ); +extern unsigned long sh7372_cpu_resume; +#ifdef CONFIG_PM extern void __init sh7372_init_pm_domains (void );#else
arch/arm/mach-shmobile/pm-sh7372.c +3 -0
@@ -524,6 +524,9 @@ void __init sh7372_pm_init(void)/* do not convert A3SM, A3SP, A3SG, A4R power down into A4S */ __raw_writel (0 ,PDNSEL ); +/* pass physical address of cpu_resume() to assembly resume code */ + sh7372_cpu_resume =virt_to_phys (cpu_resume); +sh7372_pm_setup_smfram ();sh7372_suspend_init ();
arch/arm/mach-shmobile/sleep-sh7372.S +4 -1
@@ -40,7 +40,10 @@ .global sh7372_resume_core_standby_sysc sh7372_resume_core_standby_sysc: ldr pc, 1f -1: .long cpu_resume - PAGE_OFFSET + PLAT_PHYS_OFFSET + + .globl sh7372_cpu_resume +sh7372_cpu_resume: +1: .space 4 #define SPDCR 0xe6180008
Signature · 1 line
1.8.2.1
PATCH 5/15 ARM: shmobile: Add SMP boot function and argument
In reply to Simon HormanFrom: Magnus Damm <[email protected]>
Add code for mach-shmobile to allow specifying boot function and argument. Will initially be used for SMP together with SCU but may in the future also be used for deep sleep resume. This patch removes one inline virtual to physical address conversion.
Signed-off-by Magnus Damm <[email protected]>
Signed-off-by Simon Horman <[email protected]>
--- arch/arm/mach-shmobile/headsmp.S | 13 ++++++++++--- arch/arm/mach-shmobile/include/mach/common.h | 4 +++- 2 files changed, 13 insertions(+), 4 deletions(-)
arch/arm/mach-shmobile/headsmp.S +10 -3
@@ -27,7 +27,14 @@ ENDPROC(shmobile_invalidate_start) * We need _long_ jump to the physical address. */ .align 12 -ENTRY(shmobile_secondary_vector) +ENTRY(shmobile_boot_vector) + ldr r0, 2f ldr pc, 1f -1: .long shmobile_invalidate_start - PAGE_OFFSET + PLAT_PHYS_OFFSET -ENDPROC(shmobile_secondary_vector) +ENDPROC(shmobile_boot_vector) + + .globl shmobile_boot_fn +shmobile_boot_fn: +1: .space 4 + .globl shmobile_boot_arg +shmobile_boot_arg: +2: .space 4
arch/arm/mach-shmobile/include/mach/common.h +3 -1
@@ -7,7 +7,9 @@ extern void shmobile_setup_delay(unsigned int max_cpu_core_mhz, unsigned int mult, unsigned int div);struct twd_local_timer ;extern void shmobile_setup_console (void ); -extern void shmobile_secondary_vector (void ); +extern void shmobile_boot_vector (void ); +extern unsigned long shmobile_boot_fn; +extern unsigned long shmobile_boot_arg;extern void shmobile_secondary_vector_scu (void );struct clk ;extern int shmobile_clk_init (void );
Signature · 1 line
1.8.2.1
PATCH 6/15 ARM: shmobile: Add SCU boot function using argument
In reply to Simon HormanFrom: Magnus Damm <[email protected]>
Add a shmoible_boot_scu function that assumes that the base address of the SCU is passed in r0. This code is free from inline virtual to physical address conversion.
Signed-off-by Magnus Damm <[email protected]>
Signed-off-by Simon Horman <[email protected]>
--- arch/arm/mach-shmobile/headsmp-scu.S | 13 +++++++++++++ arch/arm/mach-shmobile/include/mach/common.h | 1 + 2 files changed, 14 insertions(+)
arch/arm/mach-shmobile/headsmp-scu.S +13 -0
@@ -51,6 +51,19 @@ ENTRY(shmobile_secondary_vector_scu) 2: .long shmobile_scu_base - PAGE_OFFSET + PLAT_PHYS_OFFSET ENDPROC(shmobile_secondary_vector_scu) +ENTRY(shmobile_boot_scu) + @ r0 = SCU base address + mrc p15, 0, r1, c0, c0, 5 @ read MIPDR + and r1, r1, #3 @ mask out cpu ID + lsl r1, r1, #3 @ we will shift by cpu_id * 8 bits + ldr r2, [r0, #8] @ SCU Power Status Register + mov r3, #3 + bic r2, r2, r3, lsl r1 @ Clear bits of our CPU (Run Mode) + str r2, [r0, #8] @ write back + + b shmobile_invalidate_start +ENDPROC(shmobile_boot_scu) + .text .globl shmobile_scu_base shmobile_scu_base:
arch/arm/mach-shmobile/include/mach/common.h +1 -0
@@ -11,6 +11,7 @@ extern void shmobile_boot_vector(void);extern unsigned long shmobile_boot_fn;extern unsigned long shmobile_boot_arg;extern void shmobile_secondary_vector_scu (void ); +extern void shmobile_boot_scu (void );struct clk ;extern int shmobile_clk_init (void );extern void shmobile_handle_irq_intc (struct pt_regs *);
Signature · 1 line
1.8.2.1
PATCH 7/15 ARM: shmobile: r8a7779 SMP with SCU boot fn and args
In reply to Simon HormanFrom: Magnus Damm <[email protected]>
Let r8a7779 make use of shmobile_boot_fn and shmobile_boot_arg together with shmobile_boot_scu and the SCU base address.
Signed-off-by Magnus Damm <[email protected]>
Signed-off-by Simon Horman <[email protected]>
--- arch/arm/mach-shmobile/smp-r8a7779.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/arm/mach-shmobile/smp-r8a7779.c +4 -2
@@ -101,8 +101,10 @@ static void __init r8a7779_smp_prepare_cpus(unsigned int max_cpus) {scu_enable (shmobile_scu_base); -/* Map the reset vector (in headsmp-scu.S) */ -__raw_writel (__pa (shmobile_secondary_vector_scu),AVECR ); +/* Map the reset vector (in headsmp-scu.S, headsmp.S) */ +__raw_writel (__pa (shmobile_boot_vector),AVECR ); + shmobile_boot_fn =virt_to_phys (shmobile_boot_scu); + shmobile_boot_arg = (unsigned long )shmobile_scu_base;/* enable cache coherency on booting CPU */ scu_power_mode (shmobile_scu_base,SCU_PM_NORMAL );
Signature · 1 line
1.8.2.1
PATCH 8/15 ARM: shmobile: sh73a0 SMP with SCU boot fn and args
In reply to Simon HormanFrom: Magnus Damm <[email protected]>
Let sh73a0 make use of shmobile_boot_fn and shmobile_boot_arg together with shmobile_boot_scu and the SCU base address.
Signed-off-by Magnus Damm <[email protected]>
Signed-off-by Simon Horman <[email protected]>
--- arch/arm/mach-shmobile/smp-sh73a0.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/arm/mach-shmobile/smp-sh73a0.c +4 -2
@@ -64,9 +64,11 @@ static void __init sh73a0_smp_prepare_cpus(unsigned int max_cpus) {scu_enable (shmobile_scu_base); -/* Map the reset vector (in headsmp-scu.S) */ +/* Map the reset vector (in headsmp-scu.S, headsmp.S) */ __raw_writel (0 ,APARMBAREA );/* 4k */ -__raw_writel (__pa (shmobile_secondary_vector_scu),SBAR ); +__raw_writel (__pa (shmobile_boot_vector),SBAR ); + shmobile_boot_fn =virt_to_phys (shmobile_boot_scu); + shmobile_boot_arg = (unsigned long )shmobile_scu_base;/* enable cache coherency on booting CPU */ scu_power_mode (shmobile_scu_base,SCU_PM_NORMAL );
Signature · 1 line
1.8.2.1
PATCH 9/15 ARM: shmobile: EMEV2 SMP with SCU boot fn and args
In reply to Simon HormanFrom: Magnus Damm <[email protected]>
Let EMEV2 make use of shmobile_boot_fn and shmobile_boot_arg together with shmobile_boot_scu and the SCU base address.
Signed-off-by Magnus Damm <[email protected]>
Signed-off-by Simon Horman <[email protected]>
--- arch/arm/mach-shmobile/smp-emev2.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/arm/mach-shmobile/smp-emev2.c +4 -2
@@ -40,8 +40,10 @@ static void __init emev2_smp_prepare_cpus(unsigned int max_cpus) {scu_enable (shmobile_scu_base); -/* Tell ROM loader about our vector (in headsmp-scu.S) */ -emev2_set_boot_vector (__pa (shmobile_secondary_vector_scu)); +/* Tell ROM loader about our vector (in headsmp-scu.S, headsmp.S) */ +emev2_set_boot_vector (__pa (shmobile_boot_vector)); + shmobile_boot_fn =virt_to_phys (shmobile_boot_scu); + shmobile_boot_arg = (unsigned long )shmobile_scu_base;/* enable cache coherency on booting CPU */ scu_power_mode (shmobile_scu_base,SCU_PM_NORMAL );
Signature · 1 line
1.8.2.1
PATCH 10/15 ARM: shmobile: Remove old SCU boot code
In reply to Simon HormanFrom: Magnus Damm <[email protected]>
Remove shmobile_secondary_vector_scu now when all SCU enabled SMP platforms instead make use of shmobile_boot_scu. This removes two inline virtual to physical address conversions.
Signed-off-by Magnus Damm <[email protected]>
Signed-off-by Simon Horman <[email protected]>
--- arch/arm/mach-shmobile/headsmp-scu.S | 22 +--------------------- arch/arm/mach-shmobile/include/mach/common.h | 1 - 2 files changed, 1 insertion(+), 22 deletions(-)
arch/arm/mach-shmobile/headsmp-scu.S +1 -21
@@ -25,32 +25,12 @@ __CPUINIT /* - * Reset vector for secondary CPUs. + * Boot code for secondary CPUs. * * First we turn on L1 cache coherency for our CPU. Then we jump to * shmobile_invalidate_start that invalidates the cache and hands over control * to the common ARM startup code. - * This function will be mapped to address 0 by the SBAR register. - * A normal branch is out of range here so we need a long jump. We jump to - * the physical address as the MMU is still turned off. */ - .align 12 -ENTRY(shmobile_secondary_vector_scu) - mrc p15, 0, r0, c0, c0, 5 @ read MIPDR - and r0, r0, #3 @ mask out cpu ID - lsl r0, r0, #3 @ we will shift by cpu_id * 8 bits - ldr r1, 2f - ldr r1, [r1] @ SCU base address - ldr r2, [r1, #8] @ SCU Power Status Register - mov r3, #3 - bic r2, r2, r3, lsl r0 @ Clear bits of our CPU (Run Mode) - str r2, [r1, #8] @ write back - - ldr pc, 1f -1: .long shmobile_invalidate_start - PAGE_OFFSET + PLAT_PHYS_OFFSET -2: .long shmobile_scu_base - PAGE_OFFSET + PLAT_PHYS_OFFSET -ENDPROC(shmobile_secondary_vector_scu) - ENTRY(shmobile_boot_scu) @ r0 = SCU base address mrc p15, 0, r1, c0, c0, 5 @ read MIPDR
arch/arm/mach-shmobile/include/mach/common.h +0 -1
@@ -10,7 +10,6 @@ extern void shmobile_setup_console(void);extern void shmobile_boot_vector (void );extern unsigned long shmobile_boot_fn;extern unsigned long shmobile_boot_arg; -extern void shmobile_secondary_vector_scu (void );extern void shmobile_boot_scu (void );struct clk ;extern int shmobile_clk_init (void );
Signature · 1 line
1.8.2.1
PATCH 11/15 ARM: shmobile: Enable ARM_PATCH_PHYS_VIRT
In reply to Simon HormanFrom: Magnus Damm <[email protected]>
Adjust mach-shmobile to add a select for CONFIG_ARM_PATCH_PHYS_VIRT and at the same time remove NEED_MACH_MEMORY_H.
Signed-off-by Magnus Damm <[email protected]>
Signed-off-by Simon Horman <[email protected]>
--- arch/arm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/Kconfig +1 -1
@@ -634,6 +634,7 @@ config ARCH_MSM config ARCH_SHMOBILE bool "Renesas SH-Mobile / R-Mobile" + select ARM_PATCH_PHYS_VIRT select CLKDEV_LOOKUP select GENERIC_CLOCKEVENTS select HAVE_ARM_SCU if SMP
@@ -643,7 +644,6 @@ config ARCH_SHMOBILE select HAVE_SMP select MIGHT_HAVE_CACHE_L2X0 select MULTI_IRQ_HANDLER - select NEED_MACH_MEMORY_H select NO_IOPORT select PINCTRL select PM_GENERIC_DOMAINS if PM
Signature · 1 line
1.8.2.1
PATCH 12/15 ARM: shmobile: Remove MEMORY_START/SIZE
In reply to Simon HormanFrom: Magnus Damm <[email protected]>
Remove CONFIG_MEMORY_START and CONFIG_MEMORY_SIZE from mach-shmobile.
Boards should use DT to specify their memory setup. Boards that still not support DT may pass ATAGS with memory information from the boot loader. If those ATAGS turn out to be incorrect then appended DTB with memory information should be used as a workaround.
Signed-off-by Magnus Damm <[email protected]>
Signed-off-by Simon Horman <[email protected]>
--- arch/arm/mach-shmobile/Kconfig | 31 ------------------------------- 1 file changed, 31 deletions(-)
arch/arm/mach-shmobile/Kconfig +0 -31
@@ -195,37 +195,6 @@ config CPU_HAS_INTEVT bool default y -menu "Memory configuration" - -config MEMORY_START - hex "Physical memory start address" - default "0x40000000" if MACH_AP4EVB || MACH_AG5EVM || \ - MACH_MACKEREL || MACH_BONITO || \ - MACH_ARMADILLO800EVA || MACH_APE6EVM || \ - MACH_LAGER - default "0x41000000" if MACH_KOTA2 - default "0x00000000" - ---help--- - Tweak this only when porting to a new machine which does not - already have a defconfig. Changing it from the known correct - value on any of the known systems will only lead to disaster. - -config MEMORY_SIZE - hex "Physical memory size" - default "0x80000000" if MACH_LAGER - default "0x40000000" if MACH_APE6EVM - default "0x20000000" if MACH_AG5EVM || MACH_BONITO || \ - MACH_ARMADILLO800EVA - default "0x1e000000" if MACH_KOTA2 - default "0x10000000" if MACH_AP4EVB || MACH_MACKEREL - default "0x04000000" - help - This sets the default memory size assumed by your kernel. It can - be overridden as normal by the 'mem=' argument on the kernel command - line. - -endmenu - menu "Timer and clock configuration" config SHMOBILE_TIMER_HZ
Signature · 1 line
1.8.2.1
PATCH 13/15 ARM: shmobile: Remove mach/memory.h
In reply to Simon HormanFrom: Magnus Damm <[email protected]>
Remove mach-shmobile memory.h since it is no longer needed.
Signed-off-by Magnus Damm <[email protected]>
Signed-off-by Simon Horman <[email protected]>
--- arch/arm/mach-shmobile/include/mach/memory.h | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 arch/arm/mach-shmobile/include/mach/memory.h
arch/arm/mach-shmobile/include/mach/memory.h deleted +0 -7
@@ -1,7 +0,0 @@ -#ifndef __ASM_MACH_MEMORY_H -#define __ASM_MACH_MEMORY_H - -#define PLAT_PHYS_OFFSET UL(CONFIG_MEMORY_START) -#define MEM_SIZE UL(CONFIG_MEMORY_SIZE) - -#endif /* __ASM_MACH_MEMORY_H */
Signature · 1 line
1.8.2.1
PATCH 14/15 ARM: shmobile: Remove AP4EVB board support
In reply to Simon HormanFrom: Magnus Damm <[email protected]>
Remove board support for the sh7372 based AP4EVB board
The sh7372 SoC support code is still kept around since it is in use by the Mackerel board which is basically a more recent board where the design is based on AP4EVB.
Signed-off-by Magnus Damm <[email protected]>
Signed-off-by Simon Horman <[email protected]>
--- arch/arm/configs/ap4evb_defconfig | 56 - arch/arm/mach-shmobile/Kconfig | 21 - arch/arm/mach-shmobile/Makefile | 1 - arch/arm/mach-shmobile/Makefile.boot | 1 - arch/arm/mach-shmobile/board-ap4evb.c | 1310 -------------------- .../arm/mach-shmobile/include/mach/head-ap4evb.txt | 93 -- arch/arm/mach-shmobile/include/mach/mmc-ap4eb.h | 29 - arch/arm/mach-shmobile/include/mach/mmc.h | 4 +- arch/arm/mach-shmobile/include/mach/zboot.h | 6 +- 9 files changed, 2 insertions(+), 1519 deletions(-) delete mode 100644 arch/arm/configs/ap4evb_defconfig delete mode 100644 arch/arm/mach-shmobile/board-ap4evb.c delete mode 100644 arch/arm/mach-shmobile/include/mach/head-ap4evb.txt delete mode 100644 arch/arm/mach-shmobile/include/mach/mmc-ap4eb.h
arch/arm/configs/ap4evb_defconfig deleted +0 -56
@@ -1,56 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=16 -CONFIG_BLK_DEV_INITRD=y -CONFIG_SLAB=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_SHMOBILE=y -CONFIG_ARCH_SH7372=y -CONFIG_MACH_AP4EVB=y -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=sh-sci.0,115200" -CONFIG_KEXEC=y -CONFIG_PM=y -# CONFIG_SUSPEND is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_FIRMWARE_IN_KERNEL is not set -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_NAND=y -# CONFIG_BLK_DEV is not set -# CONFIG_MISC_DEVICES is not set -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_SH_SCI=y -CONFIG_SERIAL_SH_SCI_NR_UARTS=8 -CONFIG_SERIAL_SH_SCI_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -# CONFIG_HWMON is not set -# CONFIG_VGA_CONSOLE is not set -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -# CONFIG_DNOTIFY is not set -CONFIG_TMPFS=y -# CONFIG_MISC_FILESYSTEMS is not set -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_DETECT_SOFTLOCKUP is not set -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_FTRACE is not set -# CONFIG_CRC32 is not set
arch/arm/mach-shmobile/Kconfig +0 -21
@@ -69,27 +69,6 @@ config ARCH_EMEV2 comment "SH-Mobile Board Type" -config MACH_AP4EVB - bool "AP4EVB board" - depends on ARCH_SH7372 - select ARCH_REQUIRE_GPIOLIB - select REGULATOR_FIXED_VOLTAGE if REGULATOR - select SH_LCD_MIPI_DSI - select SND_SOC_AK4642 if SND_SIMPLE_CARD - -choice - prompt "AP4EVB LCD panel selection" - default AP4EVB_QHD - depends on MACH_AP4EVB - -config AP4EVB_QHD - bool "MIPI-DSI QHD (960x540)" - -config AP4EVB_WVGA - bool "Parallel WVGA (800x480)" - -endchoice - config MACH_AG5EVM bool "AG5EVM board" depends on ARCH_SH73A0
arch/arm/mach-shmobile/Makefile +0 -1
@@ -35,7 +35,6 @@ obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779.o obj-$(CONFIG_ARCH_SH73A0) += pm-sh73a0.o # Board objects -obj-$(CONFIG_MACH_AP4EVB) += board-ap4evb.o obj-$(CONFIG_MACH_AG5EVM) += board-ag5evm.o obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o
arch/arm/mach-shmobile/Makefile.boot +0 -1
@@ -1,7 +1,6 @@ # per-board load address for uImage loadaddr-y := loadaddr-$(CONFIG_MACH_AG5EVM) += 0x40008000 -loadaddr-$(CONFIG_MACH_AP4EVB) += 0x40008000 loadaddr-$(CONFIG_MACH_APE6EVM) += 0x40008000 loadaddr-$(CONFIG_MACH_ARMADILLO800EVA) += 0x40008000 loadaddr-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += 0x40008000
arch/arm/mach-shmobile/board-ap4evb.c deleted +0 -1310
1,310 lines not on this page · raw message
arch/arm/mach-shmobile/include/mach/head-ap4evb.txt deleted +0 -93
93 lines not on this page · raw message
arch/arm/mach-shmobile/include/mach/mmc-ap4eb.h deleted +0 -29
@@ -1,29 +0,0 @@ -#ifndef MMC_AP4EB_H -#define MMC_AP4EB_H - -#define PORT185CR (void __iomem *)0xe60520b9 -#define PORT186CR (void __iomem *)0xe60520ba -#define PORT187CR (void __iomem *)0xe60520bb -#define PORT188CR (void __iomem *)0xe60520bc - -#define PORTR191_160DR (void __iomem *)0xe6056014 - -static inline void mmc_init_progress (void ) -{ -/* Initialise LEDS1-4 -* registers: PORT185CR-PORT188CR (LED1-LED4 Control) -* value: 0x10 - enable output -*/ -__raw_writeb (0x10 ,PORT185CR ); -__raw_writeb (0x10 ,PORT186CR ); -__raw_writeb (0x10 ,PORT187CR ); -__raw_writeb (0x10 ,PORT188CR ); -} - -static inline void mmc_update_progress (int n) -{ -__raw_writel ((__raw_readl (PORTR191_160DR ) & ~(0xf <<25 )) | - (1 << (25 + n)),PORTR191_160DR ); -} - -#endif /* MMC_AP4EB_H */
arch/arm/mach-shmobile/include/mach/mmc.h +1 -3
@@ -7,9 +7,7 @@* **************************************************/ -#ifdef CONFIG_MACH_AP4EVB -#include "mach/mmc-ap4eb.h" -#elif defined(CONFIG_MACH_MACKEREL ) +#ifdef CONFIG_MACH_MACKEREL #include "mach/mmc-mackerel.h" #else #error "unsupported board."
arch/arm/mach-shmobile/include/mach/zboot.h +1 -5
@@ -10,11 +10,7 @@* **************************************************/ -#ifdef CONFIG_MACH_AP4EVB -#define MACH_TYPE MACH_TYPE_AP4EVB -#define MEMORY_START 0x40000000 -#include "mach/head-ap4evb.txt" -#elif defined(CONFIG_MACH_MACKEREL ) +#ifdef CONFIG_MACH_MACKEREL #define MACH_TYPE MACH_TYPE_MACKEREL#define MEMORY_START 0x40000000#include "mach/head-mackerel.txt"
Signature · 1 line
1.8.2.1
PATCH 14/15 ARM: shmobile: Remove AP4EVB board support
Hi Simon
Quoted 10 lines · Simon Horman
From: Magnus Damm <[email protected]>
Remove board support for the sh7372 based AP4EVB board
The sh7372 SoC support code is still kept around since it is in use by the Mackerel board which is basically a more recent board where the design is based on AP4EVB.
Signed-off-by Magnus Damm <[email protected]>Signed-off-by Simon Horman <[email protected]>
It would be a pity if this patch gets pulled now. We're still discussing with Magnus, I believe. My opinion is, that this board is a good testing platform for V4L2. It is the only board in the mainline, using the CSI2 interface, present on multiple Renesas SoCs, including r8a73a4 (APE6), and (probably, not 100% sure) sh73a0 (AG5), and the IMX074 camera sensor, not present on any other platform. If this board is removed, supporting both CSI2 and IMX074 will become difficult. Besides, AP4EVB is used as an example in my V4L2 clock / async probing patch series:
http://www.mail-archive.com/linux-media at vger.kernel.org/msg63174.html
If still possible, would be good to delay removing this board until we complete our discussion.
Thanks
Guennadi
Quoted 1,624 lines
--- arch/arm/configs/ap4evb_defconfig | 56 - arch/arm/mach-shmobile/Kconfig | 21 - arch/arm/mach-shmobile/Makefile | 1 - arch/arm/mach-shmobile/Makefile.boot | 1 - arch/arm/mach-shmobile/board-ap4evb.c | 1310 -------------------- .../arm/mach-shmobile/include/mach/head-ap4evb.txt | 93 -- arch/arm/mach-shmobile/include/mach/mmc-ap4eb.h | 29 - arch/arm/mach-shmobile/include/mach/mmc.h | 4 +- arch/arm/mach-shmobile/include/mach/zboot.h | 6 +- 9 files changed, 2 insertions(+), 1519 deletions(-) delete mode 100644 arch/arm/configs/ap4evb_defconfig delete mode 100644 arch/arm/mach-shmobile/board-ap4evb.c delete mode 100644 arch/arm/mach-shmobile/include/mach/head-ap4evb.txt delete mode 100644 arch/arm/mach-shmobile/include/mach/mmc-ap4eb.harch/arm/configs/ap4evb_defconfig deleted +0
-56@@ -1,56 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=16 -CONFIG_BLK_DEV_INITRD=y -CONFIG_SLAB=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_SHMOBILE=y -CONFIG_ARCH_SH7372=y -CONFIG_MACH_AP4EVB=y -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=sh-sci.0,115200" -CONFIG_KEXEC=y -CONFIG_PM=y -# CONFIG_SUSPEND is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_FIRMWARE_IN_KERNEL is not set -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_NAND=y -# CONFIG_BLK_DEV is not set -# CONFIG_MISC_DEVICES is not set -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_SH_SCI=y -CONFIG_SERIAL_SH_SCI_NR_UARTS=8 -CONFIG_SERIAL_SH_SCI_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -# CONFIG_HWMON is not set -# CONFIG_VGA_CONSOLE is not set -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -# CONFIG_DNOTIFY is not set -CONFIG_TMPFS=y -# CONFIG_MISC_FILESYSTEMS is not set -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_DETECT_SOFTLOCKUP is not set -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_FTRACE is not set -# CONFIG_CRC32 is not setarch/arm/mach-shmobile/Kconfig +0
-21@@ -69,27 +69,6 @@ config ARCH_EMEV2 comment "SH-Mobile Board Type" -config MACH_AP4EVB - bool "AP4EVB board" - depends on ARCH_SH7372 - select ARCH_REQUIRE_GPIOLIB - select REGULATOR_FIXED_VOLTAGE if REGULATOR - select SH_LCD_MIPI_DSI - select SND_SOC_AK4642 if SND_SIMPLE_CARD - -choice - prompt "AP4EVB LCD panel selection" - default AP4EVB_QHD - depends on MACH_AP4EVB - -config AP4EVB_QHD - bool "MIPI-DSI QHD (960x540)" - -config AP4EVB_WVGA - bool "Parallel WVGA (800x480)" - -endchoice - config MACH_AG5EVM bool "AG5EVM board" depends on ARCH_SH73A0arch/arm/mach-shmobile/Makefile +0
-1@@ -35,7 +35,6 @@ obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779.o obj-$(CONFIG_ARCH_SH73A0) += pm-sh73a0.o # Board objects -obj-$(CONFIG_MACH_AP4EVB) += board-ap4evb.o obj-$(CONFIG_MACH_AG5EVM) += board-ag5evm.o obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.oarch/arm/mach-shmobile/Makefile.boot +0
-1@@ -1,7 +1,6 @@ # per-board load address for uImage loadaddr-y := loadaddr-$(CONFIG_MACH_AG5EVM) += 0x40008000 -loadaddr-$(CONFIG_MACH_AP4EVB) += 0x40008000 loadaddr-$(CONFIG_MACH_APE6EVM) += 0x40008000 loadaddr-$(CONFIG_MACH_ARMADILLO800EVA) += 0x40008000 loadaddr-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += 0x40008000arch/arm/mach-shmobile/board-ap4evb.c deleted +0
-1310@@ -1,1310 +0,0 @@ -/* -* AP4EVB board support -* -* Copyright (C) 2010 Magnus Damm -* Copyright (C) 2008 Yoshihiro Shimoda -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; version 2 of the License. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -*/ -#include <linux/clk.h> -#include <linux/kernel.h> -#include <linux/init.h> -#include <linux/interrupt.h> -#include <linux/irq.h> -#include <linux/platform_device.h> -#include <linux/delay.h> -#include <linux/mfd/tmio.h> -#include <linux/mmc/host.h> -#include <linux/mmc/sh_mobile_sdhi.h> -#include <linux/mtd/mtd.h> -#include <linux/mtd/partitions.h> -#include <linux/mtd/physmap.h> -#include <linux/mmc/sh_mmcif.h> -#include <linux/i2c.h> -#include <linux/i2c/tsc2007.h> -#include <linux/io.h> -#include <linux/pinctrl/machine.h> -#include <linux/regulator/fixed.h> -#include <linux/regulator/machine.h> -#include <linux/smsc911x.h> -#include <linux/sh_intc.h> -#include <linux/sh_clk.h> -#include <linux/gpio.h> -#include <linux/input.h> -#include <linux/leds.h> -#include <linux/input/sh_keysc.h> -#include <linux/usb/r8a66597.h> -#include <linux/pm_clock.h> -#include <linux/dma-mapping.h> - -#include <media/sh_mobile_ceu.h> -#include <media/sh_mobile_csi2.h> -#include <media/soc_camera.h> - -#include <sound/sh_fsi.h> -#include <sound/simple_card.h> - -#include <video/sh_mobile_hdmi.h> -#include <video/sh_mobile_lcdc.h> -#include <video/sh_mipi_dsi.h> - -#include <mach/common.h> -#include <mach/irqs.h> -#include <mach/sh7372.h> - -#include <asm/mach-types.h> -#include <asm/mach/arch.h> -#include <asm/setup.h> - -#include "sh-gpio.h" - -/* -* Address Interface BusWidth note -* ------------------------------------------------------------------ -* 0x0000_0000 NOR Flash ROM (MCP) 16bit SW7 : bit1 = ON -* 0x0800_0000 user area - -* 0x1000_0000 NOR Flash ROM (MCP) 16bit SW7 : bit1 = OFF -* 0x1400_0000 Ether (LAN9220) 16bit -* 0x1600_0000 user area - cannot use with NAND -* 0x1800_0000 user area - -* 0x1A00_0000 - -* 0x4000_0000 LPDDR2-SDRAM (POP) 32bit -*/ - -/* -* NOR Flash ROM -* -* SW1 | SW2 | SW7 | NOR Flash ROM -* bit1 | bit1 bit2 | bit1 | Memory allocation -* ------+------------+------+------------------ -* OFF | ON OFF | ON | Area 0 -* OFF | ON OFF | OFF | Area 4 -*/ - -/* -* NAND Flash ROM -* -* SW1 | SW2 | SW7 | NAND Flash ROM -* bit1 | bit1 bit2 | bit2 | Memory allocation -* ------+------------+------+------------------ -* OFF | ON OFF | ON | FCE 0 -* OFF | ON OFF | OFF | FCE 1 -*/ - -/* -* SMSC 9220 -* -* SW1 SMSC 9220 -* ----------------------- -* ON access disable -* OFF access enable -*/ - -/* -* LCD / IRQ / KEYSC / IrDA -* -* IRQ = IRQ26 (TS), IRQ27 (VIO), IRQ28 (QHD-TouchScreen) -* LCD = 2nd LCDC (WVGA) -* -* | SW43 | -* SW3 | ON | OFF | -* -------------+-----------------------+---------------+ -* ON | KEY / IrDA | LCD | -* OFF | KEY / IrDA / IRQ | IRQ | -* -* -* QHD / WVGA display -* -* You can choice display type on menuconfig. -* Then, check above dip-switch. -*/ - -/* -* USB -* -* J7 : 1-2 MAX3355E VBUS -* 2-3 DC 5.0V -* -* S39: bit2: off -*/ - -/* -* FSI/FSMI -* -* SW41 : ON : SH-Mobile AP4 Audio Mode -* : OFF : Bluetooth Audio Mode -* -* it needs amixer settings for playing -* -* amixer set "Headphone Enable" on -*/ - -/* -* MMC0/SDHI1 (CN7) -* -* J22 : select card voltage -* 1-2 pin : 1.8v -* 2-3 pin : 3.3v -* -* SW1 | SW33 -* | bit1 | bit2 | bit3 | bit4 -* ------------+------+------+------+------- -* MMC0 OFF | OFF | ON | ON | X -* SDHI1 OFF | ON | X | OFF | ON -* -* voltage lebel -* CN7 : 1.8v -* CN12: 3.3v -*/ - -/* Dummy supplies, where voltage doesn't matter */ -static struct regulator_consumer_supply fixed1v8_power_consumers[] = -{ -/* J22 default position: 1.8V */ -REGULATOR_SUPPLY ("vmmc" ,"sh_mobile_sdhi.1" ), -REGULATOR_SUPPLY ("vqmmc" ,"sh_mobile_sdhi.1" ), -REGULATOR_SUPPLY ("vmmc" ,"sh_mmcif.0" ), -REGULATOR_SUPPLY ("vqmmc" ,"sh_mmcif.0" ), -}; - -static struct regulator_consumer_supply fixed3v3_power_consumers[] = -{ -REGULATOR_SUPPLY ("vmmc" ,"sh_mobile_sdhi.0" ), -REGULATOR_SUPPLY ("vqmmc" ,"sh_mobile_sdhi.0" ), -}; - -static struct regulator_consumer_supply dummy_supplies[] = { -REGULATOR_SUPPLY ("vddvario" ,"smsc911x" ), -REGULATOR_SUPPLY ("vdd33a" ,"smsc911x" ), -}; - -/* MTD */ -static struct mtd_partition nor_flash_partitions[] = { - { - .name ="loader" , - .offset =0x00000000 , - .size =512 *1024 , - .mask_flags =MTD_WRITEABLE , - }, - { - .name ="bootenv" , - .offset =MTDPART_OFS_APPEND , - .size =512 *1024 , - .mask_flags =MTD_WRITEABLE , - }, - { - .name ="kernel_ro" , - .offset =MTDPART_OFS_APPEND , - .size =8 *1024 *1024 , - .mask_flags =MTD_WRITEABLE , - }, - { - .name ="kernel" , - .offset =MTDPART_OFS_APPEND , - .size =8 *1024 *1024 , - }, - { - .name ="data" , - .offset =MTDPART_OFS_APPEND , - .size =MTDPART_SIZ_FULL , - }, -}; - -static struct physmap_flash_data nor_flash_data = { - .width =2 , - .parts = nor_flash_partitions, - .nr_parts =ARRAY_SIZE (nor_flash_partitions), -}; - -static struct resource nor_flash_resources[] = { - [0 ] = { - .start =0x20000000 ,/* CS0 shadow instead of regular CS0 */ - .end =0x28000000 -1 ,/* needed by USB MASK ROM boot */ - .flags =IORESOURCE_MEM , - } -}; - -static struct platform_device nor_flash_device = { - .name ="physmap-flash" , - .dev = { - .platform_data = &nor_flash_data, - }, - .num_resources =ARRAY_SIZE (nor_flash_resources), - .resource = nor_flash_resources, -}; - -/* SMSC 9220 */ -static struct resource smc911x_resources[] = { - { - .start =0x14000000 , - .end =0x16000000 -1 , - .flags =IORESOURCE_MEM , - }, { - .start =evt2irq (0x02c0 )/* IRQ6A */ , - .flags =IORESOURCE_IRQ |IORESOURCE_IRQ_LOWLEVEL , - }, -}; - -static struct smsc911x_platform_config smsc911x_info = { - .flags =SMSC911X_USE_16BIT |SMSC911X_SAVE_MAC_ADDRESS , - .irq_polarity =SMSC911X_IRQ_POLARITY_ACTIVE_LOW , - .irq_type =SMSC911X_IRQ_TYPE_PUSH_PULL , -}; - -static struct platform_device smc911x_device = { - .name ="smsc911x" , - .id =-1 , - .num_resources =ARRAY_SIZE (smc911x_resources), - .resource = smc911x_resources, - .dev = { - .platform_data = &smsc911x_info, - }, -}; - -/* -* The card detect pin of the top SD/MMC slot (CN7) is active low and is -* connected to GPIO A22 of SH7372 (GPIO 41). -*/ -static int slot_cn7_get_cd (struct platform_device *pdev) -{ -return !gpio_get_value (41 ); -} -/* MERAM */ -static struct sh_mobile_meram_info meram_info = { - .addr_mode =SH_MOBILE_MERAM_MODE1 , -}; - -static struct resource meram_resources[] = { - [0 ] = { - .name ="regs" , - .start =0xe8000000 , - .end =0xe807ffff , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .name ="meram" , - .start =0xe8080000 , - .end =0xe81fffff , - .flags =IORESOURCE_MEM , - }, -}; - -static struct platform_device meram_device = { - .name ="sh_mobile_meram" , - .id =0 , - .num_resources =ARRAY_SIZE (meram_resources), - .resource = meram_resources, - .dev = { - .platform_data = &meram_info, - }, -}; - -/* SH_MMCIF */ -static struct resource sh_mmcif_resources[] = { - [0 ] = { - .name ="MMCIF" , - .start =0xE6BD0000 , - .end =0xE6BD00FF , - .flags =IORESOURCE_MEM , - }, - [1 ] = { -/* MMC ERR */ - .start =evt2irq (0x1ac0 ), - .flags =IORESOURCE_IRQ , - }, - [2 ] = { -/* MMC NOR */ - .start =evt2irq (0x1ae0 ), - .flags =IORESOURCE_IRQ , - }, -}; - -static struct sh_mmcif_plat_data sh_mmcif_plat = { - .sup_pclk =0 , - .ocr =MMC_VDD_165_195 |MMC_VDD_32_33 |MMC_VDD_33_34 , - .caps =MMC_CAP_4_BIT_DATA | -MMC_CAP_8_BIT_DATA | -MMC_CAP_NEEDS_POLL , - .get_cd = slot_cn7_get_cd, - .slave_id_tx =SHDMA_SLAVE_MMCIF_TX , - .slave_id_rx =SHDMA_SLAVE_MMCIF_RX , -}; - -static struct platform_device sh_mmcif_device = { - .name ="sh_mmcif" , - .id =0 , - .dev = { - .dma_mask =NULL , - .coherent_dma_mask =0xffffffff , - .platform_data = &sh_mmcif_plat, - }, - .num_resources =ARRAY_SIZE (sh_mmcif_resources), - .resource = sh_mmcif_resources, -}; - -/* SDHI0 */ -static struct sh_mobile_sdhi_info sdhi0_info = { - .dma_slave_tx =SHDMA_SLAVE_SDHI0_TX , - .dma_slave_rx =SHDMA_SLAVE_SDHI0_RX , - .tmio_caps =MMC_CAP_SDIO_IRQ , -}; - -static struct resource sdhi0_resources[] = { - [0 ] = { - .name ="SDHI0" , - .start =0xe6850000 , - .end =0xe68500ff , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =evt2irq (0x0e00 )/* SDHI0_SDHI0I0 */ , - .flags =IORESOURCE_IRQ , - }, - [2 ] = { - .start =evt2irq (0x0e20 )/* SDHI0_SDHI0I1 */ , - .flags =IORESOURCE_IRQ , - }, - [3 ] = { - .start =evt2irq (0x0e40 )/* SDHI0_SDHI0I2 */ , - .flags =IORESOURCE_IRQ , - }, -}; - -static struct platform_device sdhi0_device = { - .name ="sh_mobile_sdhi" , - .num_resources =ARRAY_SIZE (sdhi0_resources), - .resource = sdhi0_resources, - .id =0 , - .dev = { - .platform_data = &sdhi0_info, - }, -}; - -/* SDHI1 */ -static struct sh_mobile_sdhi_info sdhi1_info = { - .dma_slave_tx =SHDMA_SLAVE_SDHI1_TX , - .dma_slave_rx =SHDMA_SLAVE_SDHI1_RX , - .tmio_ocr_mask =MMC_VDD_165_195 , - .tmio_flags =TMIO_MMC_WRPROTECT_DISABLE , - .tmio_caps =MMC_CAP_NEEDS_POLL |MMC_CAP_SDIO_IRQ , - .get_cd = slot_cn7_get_cd, -}; - -static struct resource sdhi1_resources[] = { - [0 ] = { - .name ="SDHI1" , - .start =0xe6860000 , - .end =0xe68600ff , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =evt2irq (0x0e80 ),/* SDHI1_SDHI1I0 */ - .flags =IORESOURCE_IRQ , - }, - [2 ] = { - .start =evt2irq (0x0ea0 ),/* SDHI1_SDHI1I1 */ - .flags =IORESOURCE_IRQ , - }, - [3 ] = { - .start =evt2irq (0x0ec0 ),/* SDHI1_SDHI1I2 */ - .flags =IORESOURCE_IRQ , - }, -}; - -static struct platform_device sdhi1_device = { - .name ="sh_mobile_sdhi" , - .num_resources =ARRAY_SIZE (sdhi1_resources), - .resource = sdhi1_resources, - .id =1 , - .dev = { - .platform_data = &sdhi1_info, - }, -}; - -/* USB1 */ -static void usb1_host_port_power (int port,int power) -{ -if (!power)/* only power-on supported for now */ -return ; - -/* set VBOUT/PWEN and EXTLP1 in DVSTCTR */ -__raw_writew (__raw_readw (IOMEM (0xE68B0008 )) |0x600 ,IOMEM (0xE68B0008 )); -} - -static struct r8a66597_platdata usb1_host_data = { - .on_chip =1 , - .port_power = usb1_host_port_power, -}; - -static struct resource usb1_host_resources[] = { - [0 ] = { - .name ="USBHS" , - .start =0xE68B0000 , - .end =0xE68B00E6 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =evt2irq (0x1ce0 )/* USB1_USB1I0 */ , - .flags =IORESOURCE_IRQ , - }, -}; - -static struct platform_device usb1_host_device = { - .name ="r8a66597_hcd" , - .id =1 , - .dev = { - .dma_mask =NULL ,/* not use dma */ - .coherent_dma_mask =0xffffffff , - .platform_data = &usb1_host_data, - }, - .num_resources =ARRAY_SIZE (usb1_host_resources), - .resource = usb1_host_resources, -}; - -/* -* QHD display -*/ -#ifdef CONFIG_AP4EVB_QHD - -/* KEYSC (Needs SW43 set to ON) */ -static struct sh_keysc_info keysc_info = { - .mode =SH_KEYSC_MODE_1 , - .scan_timing =3 , - .delay =2500 , - .keycodes = { -KEY_0 ,KEY_1 ,KEY_2 ,KEY_3 ,KEY_4 , -KEY_5 ,KEY_6 ,KEY_7 ,KEY_8 ,KEY_9 , -KEY_A ,KEY_B ,KEY_C ,KEY_D ,KEY_E , -KEY_F ,KEY_G ,KEY_H ,KEY_I ,KEY_J , -KEY_K ,KEY_L ,KEY_M ,KEY_N ,KEY_O , - }, -}; - -static struct resource keysc_resources[] = { - [0 ] = { - .name ="KEYSC" , - .start =0xe61b0000 , - .end =0xe61b0063 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =evt2irq (0x0be0 ),/* KEYSC_KEY */ - .flags =IORESOURCE_IRQ , - }, -}; - -static struct platform_device keysc_device = { - .name ="sh_keysc" , - .id =0 ,/* "keysc0" clock */ - .num_resources =ARRAY_SIZE (keysc_resources), - .resource = keysc_resources, - .dev = { - .platform_data = &keysc_info, - }, -}; - -/* MIPI-DSI */ -static int sh_mipi_set_dot_clock (struct platform_device *pdev, -void __iomem *base, -int enable) -{ -struct clk *pck =clk_get (&pdev->dev,"dsip_clk" ); - -if (IS_ERR (pck)) -return PTR_ERR (pck); - -if (enable) { -/* -* DSIPCLK = 24MHz -* D-PHY = DSIPCLK * ((0x6*2)+1) = 312MHz (see .phyctrl) -* HsByteCLK = D-PHY/8 = 39MHz -* -* X * Y * FPS = -* (544+72+600+16) * (961+8+8+2) * 30 = 36.1MHz -*/ -clk_set_rate (pck,clk_round_rate (pck,24000000 )); -clk_enable (pck); - }else { -clk_disable (pck); - } - -clk_put (pck); - -return 0 ; -} - -static struct resource mipidsi0_resources[] = { - [0 ] = { - .start =0xffc60000 , - .end =0xffc63073 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =0xffc68000 , - .end =0xffc680ef , - .flags =IORESOURCE_MEM , - }, -}; - -static struct sh_mipi_dsi_info mipidsi0_info = { - .data_format =MIPI_RGB888 , - .channel =LCDC_CHAN_MAINLCD , - .lane =2 , - .vsynw_offset =17 , - .phyctrl =0x6 <<8 , - .flags =SH_MIPI_DSI_SYNC_PULSES_MODE | - SH_MIPI_DSI_HSbyteCLK, - .set_dot_clock = sh_mipi_set_dot_clock, -}; - -static struct platform_device mipidsi0_device = { - .name ="sh-mipi-dsi" , - .num_resources =ARRAY_SIZE (mipidsi0_resources), - .resource = mipidsi0_resources, - .id =0 , - .dev = { - .platform_data = &mipidsi0_info, - }, -}; - -static struct platform_device *qhd_devices[]__initdata = { - &mipidsi0_device, - &keysc_device, -}; -#endif /* CONFIG_AP4EVB_QHD */ - -/* LCDC0 */ -static const struct fb_videomode ap4evb_lcdc_modes[] = { - { -#ifdef CONFIG_AP4EVB_QHD - .name ="R63302(QHD)" , - .xres =544 , - .yres =961 , - .left_margin =72 , - .right_margin =600 , - .hsync_len =16 , - .upper_margin =8 , - .lower_margin =8 , - .vsync_len =2 , - .sync =FB_SYNC_VERT_HIGH_ACT |FB_SYNC_HOR_HIGH_ACT , -#else - .name ="WVGA Panel" , - .xres =800 , - .yres =480 , - .left_margin =220 , - .right_margin =110 , - .hsync_len =70 , - .upper_margin =20 , - .lower_margin =5 , - .vsync_len =5 , - .sync =0 , -#endif - }, -}; - -static const struct sh_mobile_meram_cfg lcd_meram_cfg = { - .icb[0 ] = { - .meram_size =0x40 , - }, - .icb[1 ] = { - .meram_size =0x40 , - }, -}; - -static struct sh_mobile_lcdc_info lcdc_info = { - .meram_dev = &meram_info, - .ch[0 ] = { - .chan =LCDC_CHAN_MAINLCD , - .fourcc =V4L2_PIX_FMT_RGB565 , - .lcd_modes = ap4evb_lcdc_modes, - .num_modes =ARRAY_SIZE (ap4evb_lcdc_modes), - .meram_cfg = &lcd_meram_cfg, -#ifdef CONFIG_AP4EVB_QHD - .tx_dev = &mipidsi0_device, -#endif - } -}; - -static struct resource lcdc_resources[] = { - [0 ] = { - .name ="LCDC" , - .start =0xfe940000 ,/* P4-only space */ - .end =0xfe943fff , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =intcs_evt2irq (0x580 ), - .flags =IORESOURCE_IRQ , - }, -}; - -static struct platform_device lcdc_device = { - .name ="sh_mobile_lcdc_fb" , - .num_resources =ARRAY_SIZE (lcdc_resources), - .resource = lcdc_resources, - .dev = { - .platform_data = &lcdc_info, - .coherent_dma_mask = ~0 , - }, -}; - -/* FSI */ -#define IRQ_FSI evt2irq(0x1840) -static struct sh_fsi_platform_info fsi_info = { - .port_b = { - .flags =SH_FSI_CLK_CPG | -SH_FSI_FMT_SPDIF , - }, -}; - -static struct resource fsi_resources[] = { - [0 ] = { - .name ="FSI" , - .start =0xFE3C0000 , - .end =0xFE3C0400 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IRQ_FSI , - .flags =IORESOURCE_IRQ , - }, -}; - -static struct platform_device fsi_device = { - .name ="sh_fsi2" , - .id =-1 , - .num_resources =ARRAY_SIZE (fsi_resources), - .resource = fsi_resources, - .dev = { - .platform_data = &fsi_info, - }, -}; - -static struct asoc_simple_card_info fsi2_ak4643_info = { - .name ="AK4643" , - .card ="FSI2A-AK4643" , - .codec ="ak4642-codec.0-0013" , - .platform ="sh_fsi2" , - .daifmt =SND_SOC_DAIFMT_LEFT_J , - .cpu_dai = { - .name ="fsia-dai" , - .fmt =SND_SOC_DAIFMT_CBS_CFS , - }, - .codec_dai = { - .name ="ak4642-hifi" , - .fmt =SND_SOC_DAIFMT_CBM_CFM , - .sysclk =11289600 , - }, -}; - -static struct platform_device fsi_ak4643_device = { - .name ="asoc-simple-card" , - .dev = { - .platform_data = &fsi2_ak4643_info, - }, -}; - -/* LCDC1 */ -static long ap4evb_clk_optimize (unsigned long target,unsigned long *best_freq, -unsigned long *parent_freq); - -static struct sh_mobile_hdmi_info hdmi_info = { - .flags =HDMI_SND_SRC_SPDIF , - .clk_optimize_parent = ap4evb_clk_optimize, -}; - -static struct resource hdmi_resources[] = { - [0 ] = { - .name ="HDMI" , - .start =0xe6be0000 , - .end =0xe6be00ff , - .flags =IORESOURCE_MEM , - }, - [1 ] = { -/* There's also an HDMI interrupt on INTCS @ 0x18e0 */ - .start =evt2irq (0x17e0 ), - .flags =IORESOURCE_IRQ , - }, -}; - -static struct platform_device hdmi_device = { - .name ="sh-mobile-hdmi" , - .num_resources =ARRAY_SIZE (hdmi_resources), - .resource = hdmi_resources, - .id =-1 , - .dev = { - .platform_data = &hdmi_info, - }, -}; - -static long ap4evb_clk_optimize (unsigned long target,unsigned long *best_freq, -unsigned long *parent_freq) -{ -struct clk *hdmi_ick =clk_get (&hdmi_device.dev,"ick" ); -long error; - -if (IS_ERR (hdmi_ick)) { -int ret =PTR_ERR (hdmi_ick); -pr_err ("Cannot get HDMI ICK: %d\n" , ret); -return ret; - } - - error =clk_round_parent (hdmi_ick, target, best_freq, parent_freq,1 ,64 ); - -clk_put (hdmi_ick); - -return error; -} - -static const struct sh_mobile_meram_cfg hdmi_meram_cfg = { - .icb[0 ] = { - .meram_size =0x100 , - }, - .icb[1 ] = { - .meram_size =0x100 , - }, -}; - -static struct sh_mobile_lcdc_info sh_mobile_lcdc1_info = { - .clock_source =LCDC_CLK_EXTERNAL , - .meram_dev = &meram_info, - .ch[0 ] = { - .chan =LCDC_CHAN_MAINLCD , - .fourcc =V4L2_PIX_FMT_RGB565 , - .interface_type =RGB24 , - .clock_divider =1 , - .flags =LCDC_FLAGS_DWPOL , - .meram_cfg = &hdmi_meram_cfg, - .tx_dev = &hdmi_device, - } -}; - -static struct resource lcdc1_resources[] = { - [0 ] = { - .name ="LCDC1" , - .start =0xfe944000 , - .end =0xfe947fff , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =intcs_evt2irq (0x1780 ), - .flags =IORESOURCE_IRQ , - }, -}; - -static struct platform_device lcdc1_device = { - .name ="sh_mobile_lcdc_fb" , - .num_resources =ARRAY_SIZE (lcdc1_resources), - .resource = lcdc1_resources, - .id =1 , - .dev = { - .platform_data = &sh_mobile_lcdc1_info, - .coherent_dma_mask = ~0 , - }, -}; - -static struct asoc_simple_card_info fsi2_hdmi_info = { - .name ="HDMI" , - .card ="FSI2B-HDMI" , - .codec ="sh-mobile-hdmi" , - .platform ="sh_fsi2" , - .cpu_dai = { - .name ="fsib-dai" , - .fmt =SND_SOC_DAIFMT_CBM_CFM |SND_SOC_DAIFMT_IB_NF , - }, - .codec_dai = { - .name ="sh_mobile_hdmi-hifi" , - }, -}; - -static struct platform_device fsi_hdmi_device = { - .name ="asoc-simple-card" , - .id =1 , - .dev = { - .platform_data = &fsi2_hdmi_info, - }, -}; - -static struct gpio_led ap4evb_leds[] = { - { - .name ="led4" , - .gpio =185 , - .default_state =LEDS_GPIO_DEFSTATE_ON , - }, - { - .name ="led2" , - .gpio =186 , - .default_state =LEDS_GPIO_DEFSTATE_ON , - }, - { - .name ="led3" , - .gpio =187 , - .default_state =LEDS_GPIO_DEFSTATE_ON , - }, - { - .name ="led1" , - .gpio =188 , - .default_state =LEDS_GPIO_DEFSTATE_ON , - } -}; - -static struct gpio_led_platform_data ap4evb_leds_pdata = { - .num_leds =ARRAY_SIZE (ap4evb_leds), - .leds = ap4evb_leds, -}; - -static struct platform_device leds_device = { - .name ="leds-gpio" , - .id =0 , - .dev = { - .platform_data = &ap4evb_leds_pdata, - }, -}; - -static struct i2c_board_info imx074_info = { -I2C_BOARD_INFO ("imx074" ,0x1a ), -}; - -static struct soc_camera_link imx074_link = { - .bus_id =0 , - .board_info = &imx074_info, - .i2c_adapter_id =0 , - .module_name ="imx074" , -}; - -static struct platform_device ap4evb_camera = { - .name ="soc-camera-pdrv" , - .id =0 , - .dev = { - .platform_data = &imx074_link, - }, -}; - -static struct sh_csi2_client_config csi2_clients[] = { - { - .phy =SH_CSI2_PHY_MAIN , - .lanes =0 ,/* default: 2 lanes */ - .channel =0 , - .pdev = &ap4evb_camera, - }, -}; - -static struct sh_csi2_pdata csi2_info = { - .type =SH_CSI2C , - .clients = csi2_clients, - .num_clients =ARRAY_SIZE (csi2_clients), - .flags =SH_CSI2_ECC |SH_CSI2_CRC , -}; - -static struct resource csi2_resources[] = { - [0 ] = { - .name ="CSI2" , - .start =0xffc90000 , - .end =0xffc90fff , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =intcs_evt2irq (0x17a0 ), - .flags =IORESOURCE_IRQ , - }, -}; - -static struct sh_mobile_ceu_companion csi2 = { - .id =0 , - .num_resources =ARRAY_SIZE (csi2_resources), - .resource = csi2_resources, - .platform_data = &csi2_info, -}; - -static struct sh_mobile_ceu_info sh_mobile_ceu_info = { - .flags =SH_CEU_FLAG_USE_8BIT_BUS , - .max_width =8188 , - .max_height =8188 , - .csi2 = &csi2, -}; - -static struct resource ceu_resources[] = { - [0 ] = { - .name ="CEU" , - .start =0xfe910000 , - .end =0xfe91009f , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =intcs_evt2irq (0x880 ), - .flags =IORESOURCE_IRQ , - }, - [2 ] = { -/* place holder for contiguous memory */ - }, -}; - -static struct platform_device ceu_device = { - .name ="sh_mobile_ceu" , - .id =0 ,/* "ceu0" clock */ - .num_resources =ARRAY_SIZE (ceu_resources), - .resource = ceu_resources, - .dev = { - .platform_data = &sh_mobile_ceu_info, - .coherent_dma_mask =0xffffffff , - }, -}; - -static struct platform_device *ap4evb_devices[]__initdata = { - &leds_device, - &nor_flash_device, - &smc911x_device, - &sdhi0_device, - &sdhi1_device, - &usb1_host_device, - &fsi_device, - &fsi_ak4643_device, - &fsi_hdmi_device, - &sh_mmcif_device, - &hdmi_device, - &lcdc_device, - &lcdc1_device, - &ceu_device, - &ap4evb_camera, - &meram_device, -}; - -static void __init hdmi_init_pm_clock (void ) -{ -struct clk *hdmi_ick =clk_get (&hdmi_device.dev,"ick" ); -int ret; -long rate; - -if (IS_ERR (hdmi_ick)) { - ret =PTR_ERR (hdmi_ick); -pr_err ("Cannot get HDMI ICK: %d\n" , ret); - goto out; - } - - ret =clk_set_parent (&sh7372_pllc2_clk, &sh7372_dv_clki_div2_clk); -if (ret <0 ) { -pr_err ("Cannot set PLLC2 parent: %d, %d users\n" , ret, sh7372_pllc2_clk.usecount); - goto out; - } - -pr_debug ("PLLC2 initial frequency %lu\n" ,clk_get_rate (&sh7372_pllc2_clk)); - - rate =clk_round_rate (&sh7372_pllc2_clk,594000000 ); -if (rate <0 ) { -pr_err ("Cannot get suitable rate: %ld\n" , rate); - ret = rate; - goto out; - } - - ret =clk_set_rate (&sh7372_pllc2_clk, rate); -if (ret <0 ) { -pr_err ("Cannot set rate %ld: %d\n" , rate, ret); - goto out; - } - -pr_debug ("PLLC2 set frequency %lu\n" , rate); - - ret =clk_set_parent (hdmi_ick, &sh7372_pllc2_clk); -if (ret <0 ) -pr_err ("Cannot set HDMI parent: %d\n" , ret); - -out: -if (!IS_ERR (hdmi_ick)) -clk_put (hdmi_ick); -} - -/* TouchScreen */ -#ifdef CONFIG_AP4EVB_QHD -# define GPIO_TSC_PORT 123 -#else /* WVGA */ -# define GPIO_TSC_PORT 40 -#endif - -#define IRQ28 evt2irq(0x3380)/* IRQ28A */ -#define IRQ7 evt2irq(0x02e0)/* IRQ7A */ -static int ts_get_pendown_state (void ) -{ -return !gpio_get_value (GPIO_TSC_PORT ); -} - -static int ts_init (void ) -{ -gpio_request_one (GPIO_TSC_PORT ,GPIOF_IN ,NULL ); - -return 0 ; -} - -static struct tsc2007_platform_data tsc2007_info = { - .model =2007 , - .x_plate_ohms =180 , - .get_pendown_state = ts_get_pendown_state, - .init_platform_hw = ts_init, -}; - -static struct i2c_board_info tsc_device = { -I2C_BOARD_INFO ("tsc2007" ,0x48 ), - .type ="tsc2007" , - .platform_data = &tsc2007_info, -/*.irq is selected on ap4evb_init */ -}; - -/* I2C */ -static struct i2c_board_info i2c0_devices[] = { - { -I2C_BOARD_INFO ("ak4643" ,0x13 ), - }, -}; - -static struct i2c_board_info i2c1_devices[] = { - { -I2C_BOARD_INFO ("r2025sd" ,0x32 ), - }, -}; - - -static const struct pinctrl_map ap4evb_pinctrl_map[] = { -/* CEU */ -PIN_MAP_MUX_GROUP_DEFAULT ("sh_mobile_ceu.0" ,"pfc-sh7372" , -"ceu_clk_0" ,"ceu" ), -/* FSIA (AK4643) */ -PIN_MAP_MUX_GROUP_DEFAULT ("asoc-simple-card.0" ,"pfc-sh7372" , -"fsia_sclk_in" ,"fsia" ), -PIN_MAP_MUX_GROUP_DEFAULT ("asoc-simple-card.0" ,"pfc-sh7372" , -"fsia_data_in" ,"fsia" ), -PIN_MAP_MUX_GROUP_DEFAULT ("asoc-simple-card.0" ,"pfc-sh7372" , -"fsia_data_out" ,"fsia" ), -/* FSIB (HDMI) */ -PIN_MAP_MUX_GROUP_DEFAULT ("asoc-simple-card.1" ,"pfc-sh7372" , -"fsib_mclk_in" ,"fsib" ), -/* HDMI */ -PIN_MAP_MUX_GROUP_DEFAULT ("sh-mobile-hdmi" ,"pfc-sh7372" , -"hdmi" ,"hdmi" ), -/* KEYSC */ -PIN_MAP_MUX_GROUP_DEFAULT ("sh_keysc" ,"pfc-sh7372" , -"keysc_in04_0" ,"keysc" ), -PIN_MAP_MUX_GROUP_DEFAULT ("sh_keysc" ,"pfc-sh7372" , -"keysc_out5" ,"keysc" ), -#ifndef CONFIG_AP4EVB_QHD -/* LCDC */ -PIN_MAP_MUX_GROUP_DEFAULT ("sh_mobile_lcdc_fb.0" ,"pfc-sh7372" , -"lcd_data18" ,"lcd" ), -PIN_MAP_MUX_GROUP_DEFAULT ("sh_mobile_lcdc_fb.0" ,"pfc-sh7372" , -"lcd_sync" ,"lcd" ), -#endif -/* MMCIF */ -PIN_MAP_MUX_GROUP_DEFAULT ("sh_mmcif.0" ,"pfc-sh7372" , -"mmc0_data8_0" ,"mmc0" ), -PIN_MAP_MUX_GROUP_DEFAULT ("sh_mmcif.0" ,"pfc-sh7372" , -"mmc0_ctrl_0" ,"mmc0" ), -/* SCIFA0 */ -PIN_MAP_MUX_GROUP_DEFAULT ("sh-sci.0" ,"pfc-sh7372" , -"scifa0_data" ,"scifa0" ), -/* SDHI0 */ -PIN_MAP_MUX_GROUP_DEFAULT ("sh_mobile_sdhi.0" ,"pfc-sh7372" , -"sdhi0_data4" ,"sdhi0" ), -PIN_MAP_MUX_GROUP_DEFAULT ("sh_mobile_sdhi.0" ,"pfc-sh7372" , -"sdhi0_ctrl" ,"sdhi0" ), -PIN_MAP_MUX_GROUP_DEFAULT ("sh_mobile_sdhi.0" ,"pfc-sh7372" , -"sdhi0_cd" ,"sdhi0" ), -PIN_MAP_MUX_GROUP_DEFAULT ("sh_mobile_sdhi.0" ,"pfc-sh7372" , -"sdhi0_wp" ,"sdhi0" ), -/* SDHI1 */ -PIN_MAP_MUX_GROUP_DEFAULT ("sh_mobile_sdhi.1" ,"pfc-sh7372" , -"sdhi1_data4" ,"sdhi1" ), -PIN_MAP_MUX_GROUP_DEFAULT ("sh_mobile_sdhi.1" ,"pfc-sh7372" , -"sdhi1_ctrl" ,"sdhi1" ), -/* SMSC911X */ -PIN_MAP_MUX_GROUP_DEFAULT ("smsc911x" ,"pfc-sh7372" , -"bsc_cs5a" ,"bsc" ), -PIN_MAP_MUX_GROUP_DEFAULT ("smsc911x" ,"pfc-sh7372" , -"intc_irq6_0" ,"intc" ), -/* TSC2007 */ -#ifdef CONFIG_AP4EVB_QHD -PIN_MAP_MUX_GROUP_DEFAULT ("1-0048" ,"pfc-sh7372" , -"intc_irq28_0" ,"intc" ), -#else /* WVGA */ -PIN_MAP_MUX_GROUP_DEFAULT ("1-0048" ,"pfc-sh7372" , -"intc_irq7_0" ,"intc" ), -#endif -/* USBHS1 */ -PIN_MAP_MUX_GROUP_DEFAULT ("r8a66597_hcd.1" ,"pfc-sh7372" , -"usb1_vbus" ,"usb1" ), -PIN_MAP_MUX_GROUP_DEFAULT ("r8a66597_hcd.1" ,"pfc-sh7372" , -"usb1_otg_id_0" ,"usb1" ), -PIN_MAP_MUX_GROUP_DEFAULT ("r8a66597_hcd.1" ,"pfc-sh7372" , -"usb1_otg_ctrl_0" ,"usb1" ), -}; - -#define GPIO_PORT9CR IOMEM(0xE6051009) -#define GPIO_PORT10CR IOMEM(0xE605100A) -#define USCCR1 IOMEM(0xE6058144) -static void __init ap4evb_init (void ) -{ -struct pm_domain_device domain_devices[] = { - {"A4LC" , &lcdc1_device, }, - {"A4LC" , &lcdc_device, }, - {"A4MP" , &fsi_device, }, - {"A3SP" , &sh_mmcif_device, }, - {"A3SP" , &sdhi0_device, }, - {"A3SP" , &sdhi1_device, }, - {"A4R" , &ceu_device, }, - }; -u32 srcr4; -struct clk *clk; - -regulator_register_always_on (0 ,"fixed-1.8V" , fixed1v8_power_consumers, -ARRAY_SIZE (fixed1v8_power_consumers),1800000 ); -regulator_register_always_on (1 ,"fixed-3.3V" , fixed3v3_power_consumers, -ARRAY_SIZE (fixed3v3_power_consumers),3300000 ); -regulator_register_fixed (2 , dummy_supplies,ARRAY_SIZE (dummy_supplies)); - -/* External clock source */ -clk_set_rate (&sh7372_dv_clki_clk,27000000 ); - -pinctrl_register_mappings (ap4evb_pinctrl_map, -ARRAY_SIZE (ap4evb_pinctrl_map)); -sh7372_pinmux_init (); - -/* enable Debug switch (S6) */ -gpio_request_one (32 ,GPIOF_IN |GPIOF_EXPORT ,NULL ); -gpio_request_one (33 ,GPIOF_IN |GPIOF_EXPORT ,NULL ); -gpio_request_one (34 ,GPIOF_IN |GPIOF_EXPORT ,NULL ); -gpio_request_one (35 ,GPIOF_IN |GPIOF_EXPORT ,NULL ); - -/* setup USB phy */ -__raw_writew (0x8a0a ,IOMEM (0xE6058130 ));/* USBCR4 */ - -/* FSI2 port A (ak4643) */ -gpio_request_one (161 ,GPIOF_OUT_INIT_LOW ,NULL );/* slave */ - -gpio_request (9 ,NULL ); -gpio_request (10 ,NULL ); -gpio_direction_none (GPIO_PORT9CR );/* FSIAOBT needs no direction */ -gpio_direction_none (GPIO_PORT10CR );/* FSIAOLR needs no direction */ - -/* card detect pin for MMC slot (CN7) */ -gpio_request_one (41 ,GPIOF_IN ,NULL ); - -/* FSI2 port B (HDMI) */ -__raw_writew (__raw_readw (USCCR1 ) & ~(1 <<6 ),USCCR1 );/* use SPDIF */ - -/* set SPU2 clock to 119.6 MHz */ - clk =clk_get (NULL ,"spu_clk" ); -if (!IS_ERR (clk)) { -clk_set_rate (clk,clk_round_rate (clk,119600000 )); -clk_put (clk); - } - -/* -* set irq priority, to avoid sound chopping -* when NFS rootfs is used -* FSI(3) > SMSC911X(2) -*/ -intc_set_priority (IRQ_FSI ,3 ); - -i2c_register_board_info (0 , i2c0_devices, -ARRAY_SIZE (i2c0_devices)); - -i2c_register_board_info (1 , i2c1_devices, -ARRAY_SIZE (i2c1_devices)); - -#ifdef CONFIG_AP4EVB_QHD - -/* -* For QHD Panel (MIPI-DSI, CONFIG_AP4EVB_QHD=y) and -* IRQ28 for Touch Panel, set dip switches S3, S43 as OFF, ON. -*/ - -/* enable TouchScreen */ -irq_set_irq_type (IRQ28 ,IRQ_TYPE_LEVEL_LOW ); - - tsc_device.irq =IRQ28 ; -i2c_register_board_info (1 , &tsc_device,1 ); - -/* LCDC0 */ - lcdc_info.clock_source =LCDC_CLK_PERIPHERAL ; - lcdc_info.ch[0 ].interface_type =RGB24 ; - lcdc_info.ch[0 ].clock_divider =1 ; - lcdc_info.ch[0 ].flags =LCDC_FLAGS_DWPOL ; - lcdc_info.ch[0 ].panel_cfg.width =44 ; - lcdc_info.ch[0 ].panel_cfg.height =79 ; - -platform_add_devices (qhd_devices,ARRAY_SIZE (qhd_devices)); - -#else -/* -* For WVGA Panel (18-bit RGB, CONFIG_AP4EVB_WVGA=y) and -* IRQ7 for Touch Panel, set dip switches S3, S43 to ON, OFF. -*/ -gpio_request_one (189 ,GPIOF_OUT_INIT_HIGH ,NULL );/* backlight */ -gpio_request_one (151 ,GPIOF_OUT_INIT_HIGH ,NULL );/* LCDDON */ - - lcdc_info.clock_source =LCDC_CLK_BUS ; - lcdc_info.ch[0 ].interface_type =RGB18 ; - lcdc_info.ch[0 ].clock_divider =3 ; - lcdc_info.ch[0 ].flags =0 ; - lcdc_info.ch[0 ].panel_cfg.width =152 ; - lcdc_info.ch[0 ].panel_cfg.height =91 ; - -/* enable TouchScreen */ -irq_set_irq_type (IRQ7 ,IRQ_TYPE_LEVEL_LOW ); - - tsc_device.irq =IRQ7 ; -i2c_register_board_info (0 , &tsc_device,1 ); -#endif /* CONFIG_AP4EVB_QHD */ - -/* CEU */ - -/* -* TODO: reserve memory for V4L2 DMA buffers, when a suitable API -* becomes available -*/ - -/* MIPI-CSI stuff */ - clk =clk_get (NULL ,"vck1_clk" ); -if (!IS_ERR (clk)) { -clk_set_rate (clk,clk_round_rate (clk,13000000 )); -clk_enable (clk); -clk_put (clk); - } - -sh7372_add_standard_devices (); - -/* Reset HDMI, must be held at least one EXTALR (32768Hz) period */ -#define SRCR4 IOMEM(0xe61580bc) - srcr4 =__raw_readl (SRCR4 ); -__raw_writel (srcr4 | (1 <<13 ),SRCR4 ); -udelay (50 ); -__raw_writel (srcr4 & ~(1 <<13 ),SRCR4 ); - -platform_add_devices (ap4evb_devices,ARRAY_SIZE (ap4evb_devices)); - -rmobile_add_devices_to_domains (domain_devices, -ARRAY_SIZE (domain_devices)); - -hdmi_init_pm_clock (); -sh7372_pm_init (); -pm_clk_add (&fsi_device.dev,"spu2" ); -pm_clk_add (&lcdc1_device.dev,"hdmi" ); -} - -MACHINE_START (AP4EVB ,"ap4evb" ) - .map_io = sh7372_map_io, - .init_early = sh7372_add_early_devices, - .init_irq = sh7372_init_irq, - .handle_irq = shmobile_handle_irq_intc, - .init_machine = ap4evb_init, - .init_late = sh7372_pm_init_late, - .init_time = sh7372_earlytimer_init, -MACHINE_END arch/arm/mach-shmobile/include/mach/head-ap4evb.txt deleted +0
-93@@ -1,93 +0,0 @@ -LIST "partner-jet-setup.txt" -LIST "(C) Copyright 2010 Renesas Solutions Corp" -LIST "Kuninori Morimoto <[email protected]>" - -LIST "RWT Setting" -EW 0xE6020004, 0xA500 -EW 0xE6030004, 0xA500 - -LIST "GPIO Setting" -EB 0xE6051013, 0xA2 - -LIST "CPG" -ED 0xE61500C0, 0x00000002 - -WAIT 1, 0xFE40009C - -LIST "FRQCR" -ED 0xE6150000, 0x2D1305C3 -ED 0xE61500E0, 0x9E40358E -ED 0xE6150004, 0x80331050 - -WAIT 1, 0xFE40009C - -ED 0xE61500E4, 0x00002000 - -WAIT 1, 0xFE40009C - -LIST "PLL" -ED 0xE6150028, 0x00004000 - -WAIT 1, 0xFE40009C - -ED 0xE615002C, 0x93000040 - -WAIT 1, 0xFE40009C - -LIST "SUB/USBClk" -ED 0xE6150080, 0x00000180 - -LIST "BSC" -ED 0xFEC10000, 0x00E0001B - -LIST "SBSC1" -ED 0xFE400354, 0x01AD8000 -ED 0xFE400354, 0x01AD8001 - -WAIT 5, 0xFE40009C - -ED 0xFE400008, 0xBCC90151 -ED 0xFE400040, 0x41774113 -ED 0xFE400044, 0x2712E229 -ED 0xFE400048, 0x20C18505 -ED 0xFE40004C, 0x00110209 -ED 0xFE400010, 0x00000087 - -WAIT 30, 0xFE40009C - -ED 0xFE400084, 0x0000003F -EB 0xFE500000, 0x00 - -WAIT 5, 0xFE40009C - -ED 0xFE400084, 0x0000FF0A -EB 0xFE500000, 0x00 - -WAIT 1, 0xFE40009C - -ED 0xFE400084, 0x00002201 -EB 0xFE500000, 0x00 -ED 0xFE400084, 0x00000302 -EB 0xFE500000, 0x00 -EB 0xFE5C0000, 0x00 -ED 0xFE400008, 0xBCC90159 -ED 0xFE40008C, 0x88800004 -ED 0xFE400094, 0x00000004 -ED 0xFE400028, 0xA55A0032 -ED 0xFE40002C, 0xA55A000C -ED 0xFE400020, 0xA55A2048 -ED 0xFE400008, 0xBCC90959 - -LIST "Change CPGA setting" -ED 0xE61500E0, 0x9E40352E -ED 0xE6150004, 0x80331050 - -WAIT 1, 0xFE40009C - -ED 0xFE400354, 0x01AD8002 - -LIST "SCIF0 - Serial port for earlyprintk" -EB 0xE6053098, 0xe1 -EW 0xE6C40000, 0x0000 -EB 0xE6C40004, 0x19 -EW 0xE6C40008, 0x0030arch/arm/mach-shmobile/include/mach/mmc-ap4eb.h deleted +0
-29@@ -1,29 +0,0 @@ -#ifndef MMC_AP4EB_H -#define MMC_AP4EB_H - -#define PORT185CR (void __iomem *)0xe60520b9 -#define PORT186CR (void __iomem *)0xe60520ba -#define PORT187CR (void __iomem *)0xe60520bb -#define PORT188CR (void __iomem *)0xe60520bc - -#define PORTR191_160DR (void __iomem *)0xe6056014 - -static inline void mmc_init_progress (void ) -{ -/* Initialise LEDS1-4 -* registers: PORT185CR-PORT188CR (LED1-LED4 Control) -* value: 0x10 - enable output -*/ -__raw_writeb (0x10 ,PORT185CR ); -__raw_writeb (0x10 ,PORT186CR ); -__raw_writeb (0x10 ,PORT187CR ); -__raw_writeb (0x10 ,PORT188CR ); -} - -static inline void mmc_update_progress (int n) -{ -__raw_writel ((__raw_readl (PORTR191_160DR ) & ~(0xf <<25 )) | - (1 << (25 + n)),PORTR191_160DR ); -} - -#endif /* MMC_AP4EB_H */ arch/arm/mach-shmobile/include/mach/mmc.h +1
-3@@ -7,9 +7,7 @@* **************************************************/ -#ifdef CONFIG_MACH_AP4EVB -#include "mach/mmc-ap4eb.h" -#elif defined(CONFIG_MACH_MACKEREL ) +#ifdef CONFIG_MACH_MACKEREL #include "mach/mmc-mackerel.h" #else #error "unsupported board."arch/arm/mach-shmobile/include/mach/zboot.h +1
-5@@ -10,11 +10,7 @@* **************************************************/ -#ifdef CONFIG_MACH_AP4EVB -#define MACH_TYPE MACH_TYPE_AP4EVB -#define MEMORY_START 0x40000000 -#include "mach/head-ap4evb.txt" -#elif defined(CONFIG_MACH_MACKEREL ) +#ifdef CONFIG_MACH_MACKEREL #define MACH_TYPE MACH_TYPE_MACKEREL#define MEMORY_START 0x40000000#include "mach/head-mackerel.txt" Signature · 6 lines
1.8.2.1 -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
PATCH 14/15 ARM: shmobile: Remove AP4EVB board support
Quoted 24 lines · Guennadi Liakhovetski
Hi Simon
Quoted 10 lines · Simon Horman
From: Magnus Damm <[email protected]>
Remove board support for the sh7372 based AP4EVB board
The sh7372 SoC support code is still kept around since it is in use by the Mackerel board which is basically a more recent board where the design is based on AP4EVB.
Signed-off-by Magnus Damm <[email protected]>Signed-off-by Simon Horman <[email protected]>It would be a pity if this patch gets pulled now. We're still discussing with Magnus, I believe. My opinion is, that this board is a good testing platform for V4L2. It is the only board in the mainline, using the CSI2 interface, present on multiple Renesas SoCs, including r8a73a4 (APE6), and (probably, not 100% sure) sh73a0 (AG5), and the IMX074 camera sensor, not present on any other platform. If this board is removed, supporting both CSI2 and IMX074 will become difficult. Besides, AP4EVB is used as an example in my V4L2 clock / async probing patch series:
Quoted 4 lines
http://www.mail-archive.com/linux-media at vger.kernel.org/msg63174.html
If still possible, would be good to delay removing this board until we complete our discussion.
Does the board still work with the rest of this series applied?
Quoted 1,634 lines
Thanks
GuennadiQuoted 1,624 lines
--- arch/arm/configs/ap4evb_defconfig | 56 - arch/arm/mach-shmobile/Kconfig | 21 - arch/arm/mach-shmobile/Makefile | 1 - arch/arm/mach-shmobile/Makefile.boot | 1 - arch/arm/mach-shmobile/board-ap4evb.c | 1310 -------------------- .../arm/mach-shmobile/include/mach/head-ap4evb.txt | 93 -- arch/arm/mach-shmobile/include/mach/mmc-ap4eb.h | 29 - arch/arm/mach-shmobile/include/mach/mmc.h | 4 +- arch/arm/mach-shmobile/include/mach/zboot.h | 6 +- 9 files changed, 2 insertions(+), 1519 deletions(-) delete mode 100644 arch/arm/configs/ap4evb_defconfig delete mode 100644 arch/arm/mach-shmobile/board-ap4evb.c delete mode 100644 arch/arm/mach-shmobile/include/mach/head-ap4evb.txt delete mode 100644 arch/arm/mach-shmobile/include/mach/mmc-ap4eb.harch/arm/configs/ap4evb_defconfig deleted +0
-56@@ -1,56 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=16 -CONFIG_BLK_DEV_INITRD=y -CONFIG_SLAB=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_SHMOBILE=y -CONFIG_ARCH_SH7372=y -CONFIG_MACH_AP4EVB=y -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=sh-sci.0,115200" -CONFIG_KEXEC=y -CONFIG_PM=y -# CONFIG_SUSPEND is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_FIRMWARE_IN_KERNEL is not set -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_NAND=y -# CONFIG_BLK_DEV is not set -# CONFIG_MISC_DEVICES is not set -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_SH_SCI=y -CONFIG_SERIAL_SH_SCI_NR_UARTS=8 -CONFIG_SERIAL_SH_SCI_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_HW_RANDOM is not set -# CONFIG_HWMON is not set -# CONFIG_VGA_CONSOLE is not set -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -# CONFIG_DNOTIFY is not set -CONFIG_TMPFS=y -# CONFIG_MISC_FILESYSTEMS is not set -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_DETECT_SOFTLOCKUP is not set -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_FTRACE is not set -# CONFIG_CRC32 is not setarch/arm/mach-shmobile/Kconfig +0
-21@@ -69,27 +69,6 @@ config ARCH_EMEV2 comment "SH-Mobile Board Type" -config MACH_AP4EVB - bool "AP4EVB board" - depends on ARCH_SH7372 - select ARCH_REQUIRE_GPIOLIB - select REGULATOR_FIXED_VOLTAGE if REGULATOR - select SH_LCD_MIPI_DSI - select SND_SOC_AK4642 if SND_SIMPLE_CARD - -choice - prompt "AP4EVB LCD panel selection" - default AP4EVB_QHD - depends on MACH_AP4EVB - -config AP4EVB_QHD - bool "MIPI-DSI QHD (960x540)" - -config AP4EVB_WVGA - bool "Parallel WVGA (800x480)" - -endchoice - config MACH_AG5EVM bool "AG5EVM board" depends on ARCH_SH73A0arch/arm/mach-shmobile/Makefile +0
-1@@ -35,7 +35,6 @@ obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779.o obj-$(CONFIG_ARCH_SH73A0) += pm-sh73a0.o # Board objects -obj-$(CONFIG_MACH_AP4EVB) += board-ap4evb.o obj-$(CONFIG_MACH_AG5EVM) += board-ag5evm.o obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.oarch/arm/mach-shmobile/Makefile.boot +0
-1@@ -1,7 +1,6 @@ # per-board load address for uImage loadaddr-y := loadaddr-$(CONFIG_MACH_AG5EVM) += 0x40008000 -loadaddr-$(CONFIG_MACH_AP4EVB) += 0x40008000 loadaddr-$(CONFIG_MACH_APE6EVM) += 0x40008000 loadaddr-$(CONFIG_MACH_ARMADILLO800EVA) += 0x40008000 loadaddr-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += 0x40008000arch/arm/mach-shmobile/board-ap4evb.c deleted +0
-1310@@ -1,1310 +0,0 @@ -/* -* AP4EVB board support -* -* Copyright (C) 2010 Magnus Damm -* Copyright (C) 2008 Yoshihiro Shimoda -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; version 2 of the License. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -*/ -#include <linux/clk.h> -#include <linux/kernel.h> -#include <linux/init.h> -#include <linux/interrupt.h> -#include <linux/irq.h> -#include <linux/platform_device.h> -#include <linux/delay.h> -#include <linux/mfd/tmio.h> -#include <linux/mmc/host.h> -#include <linux/mmc/sh_mobile_sdhi.h> -#include <linux/mtd/mtd.h> -#include <linux/mtd/partitions.h> -#include <linux/mtd/physmap.h> -#include <linux/mmc/sh_mmcif.h> -#include <linux/i2c.h> -#include <linux/i2c/tsc2007.h> -#include <linux/io.h> -#include <linux/pinctrl/machine.h> -#include <linux/regulator/fixed.h> -#include <linux/regulator/machine.h> -#include <linux/smsc911x.h> -#include <linux/sh_intc.h> -#include <linux/sh_clk.h> -#include <linux/gpio.h> -#include <linux/input.h> -#include <linux/leds.h> -#include <linux/input/sh_keysc.h> -#include <linux/usb/r8a66597.h> -#include <linux/pm_clock.h> -#include <linux/dma-mapping.h> - -#include <media/sh_mobile_ceu.h> -#include <media/sh_mobile_csi2.h> -#include <media/soc_camera.h> - -#include <sound/sh_fsi.h> -#include <sound/simple_card.h> - -#include <video/sh_mobile_hdmi.h> -#include <video/sh_mobile_lcdc.h> -#include <video/sh_mipi_dsi.h> - -#include <mach/common.h> -#include <mach/irqs.h> -#include <mach/sh7372.h> - -#include <asm/mach-types.h> -#include <asm/mach/arch.h> -#include <asm/setup.h> - -#include "sh-gpio.h" - -/* -* Address Interface BusWidth note -* ------------------------------------------------------------------ -* 0x0000_0000 NOR Flash ROM (MCP) 16bit SW7 : bit1 = ON -* 0x0800_0000 user area - -* 0x1000_0000 NOR Flash ROM (MCP) 16bit SW7 : bit1 = OFF -* 0x1400_0000 Ether (LAN9220) 16bit -* 0x1600_0000 user area - cannot use with NAND -* 0x1800_0000 user area - -* 0x1A00_0000 - -* 0x4000_0000 LPDDR2-SDRAM (POP) 32bit -*/ - -/* -* NOR Flash ROM -* -* SW1 | SW2 | SW7 | NOR Flash ROM -* bit1 | bit1 bit2 | bit1 | Memory allocation -* ------+------------+------+------------------ -* OFF | ON OFF | ON | Area 0 -* OFF | ON OFF | OFF | Area 4 -*/ - -/* -* NAND Flash ROM -* -* SW1 | SW2 | SW7 | NAND Flash ROM -* bit1 | bit1 bit2 | bit2 | Memory allocation -* ------+------------+------+------------------ -* OFF | ON OFF | ON | FCE 0 -* OFF | ON OFF | OFF | FCE 1 -*/ - -/* -* SMSC 9220 -* -* SW1 SMSC 9220 -* ----------------------- -* ON access disable -* OFF access enable -*/ - -/* -* LCD / IRQ / KEYSC / IrDA -* -* IRQ = IRQ26 (TS), IRQ27 (VIO), IRQ28 (QHD-TouchScreen) -* LCD = 2nd LCDC (WVGA) -* -* | SW43 | -* SW3 | ON | OFF | -* -------------+-----------------------+---------------+ -* ON | KEY / IrDA | LCD | -* OFF | KEY / IrDA / IRQ | IRQ | -* -* -* QHD / WVGA display -* -* You can choice display type on menuconfig. -* Then, check above dip-switch. -*/ - -/* -* USB -* -* J7 : 1-2 MAX3355E VBUS -* 2-3 DC 5.0V -* -* S39: bit2: off -*/ - -/* -* FSI/FSMI -* -* SW41 : ON : SH-Mobile AP4 Audio Mode -* : OFF : Bluetooth Audio Mode -* -* it needs amixer settings for playing -* -* amixer set "Headphone Enable" on -*/ - -/* -* MMC0/SDHI1 (CN7) -* -* J22 : select card voltage -* 1-2 pin : 1.8v -* 2-3 pin : 3.3v -* -* SW1 | SW33 -* | bit1 | bit2 | bit3 | bit4 -* ------------+------+------+------+------- -* MMC0 OFF | OFF | ON | ON | X -* SDHI1 OFF | ON | X | OFF | ON -* -* voltage lebel -* CN7 : 1.8v -* CN12: 3.3v -*/ - -/* Dummy supplies, where voltage doesn't matter */ -static struct regulator_consumer_supply fixed1v8_power_consumers[] = -{ -/* J22 default position: 1.8V */ -REGULATOR_SUPPLY ("vmmc" ,"sh_mobile_sdhi.1" ), -REGULATOR_SUPPLY ("vqmmc" ,"sh_mobile_sdhi.1" ), -REGULATOR_SUPPLY ("vmmc" ,"sh_mmcif.0" ), -REGULATOR_SUPPLY ("vqmmc" ,"sh_mmcif.0" ), -}; - -static struct regulator_consumer_supply fixed3v3_power_consumers[] = -{ -REGULATOR_SUPPLY ("vmmc" ,"sh_mobile_sdhi.0" ), -REGULATOR_SUPPLY ("vqmmc" ,"sh_mobile_sdhi.0" ), -}; - -static struct regulator_consumer_supply dummy_supplies[] = { -REGULATOR_SUPPLY ("vddvario" ,"smsc911x" ), -REGULATOR_SUPPLY ("vdd33a" ,"smsc911x" ), -}; - -/* MTD */ -static struct mtd_partition nor_flash_partitions[] = { - { - .name ="loader" , - .offset =0x00000000 , - .size =512 *1024 , - .mask_flags =MTD_WRITEABLE , - }, - { - .name ="bootenv" , - .offset =MTDPART_OFS_APPEND , - .size =512 *1024 , - .mask_flags =MTD_WRITEABLE , - }, - { - .name ="kernel_ro" , - .offset =MTDPART_OFS_APPEND , - .size =8 *1024 *1024 , - .mask_flags =MTD_WRITEABLE , - }, - { - .name ="kernel" , - .offset =MTDPART_OFS_APPEND , - .size =8 *1024 *1024 , - }, - { - .name ="data" , - .offset =MTDPART_OFS_APPEND , - .size =MTDPART_SIZ_FULL , - }, -}; - -static struct physmap_flash_data nor_flash_data = { - .width =2 , - .parts = nor_flash_partitions, - .nr_parts =ARRAY_SIZE (nor_flash_partitions), -}; - -static struct resource nor_flash_resources[] = { - [0 ] = { - .start =0x20000000 ,/* CS0 shadow instead of regular CS0 */ - .end =0x28000000 -1 ,/* needed by USB MASK ROM boot */ - .flags =IORESOURCE_MEM , - } -}; - -static struct platform_device nor_flash_device = { - .name ="physmap-flash" , - .dev = { - .platform_data = &nor_flash_data, - }, - .num_resources =ARRAY_SIZE (nor_flash_resources), - .resource = nor_flash_resources, -}; - -/* SMSC 9220 */ -static struct resource smc911x_resources[] = { - { - .start =0x14000000 , - .end =0x16000000 -1 , - .flags =IORESOURCE_MEM , - }, { - .start =evt2irq (0x02c0 )/* IRQ6A */ , - .flags =IORESOURCE_IRQ |IORESOURCE_IRQ_LOWLEVEL , - }, -}; - -static struct smsc911x_platform_config smsc911x_info = { - .flags =SMSC911X_USE_16BIT |SMSC911X_SAVE_MAC_ADDRESS , - .irq_polarity =SMSC911X_IRQ_POLARITY_ACTIVE_LOW , - .irq_type =SMSC911X_IRQ_TYPE_PUSH_PULL , -}; - -static struct platform_device smc911x_device = { - .name ="smsc911x" , - .id =-1 , - .num_resources =ARRAY_SIZE (smc911x_resources), - .resource = smc911x_resources, - .dev = { - .platform_data = &smsc911x_info, - }, -}; - -/* -* The card detect pin of the top SD/MMC slot (CN7) is active low and is -* connected to GPIO A22 of SH7372 (GPIO 41). -*/ -static int slot_cn7_get_cd (struct platform_device *pdev) -{ -return !gpio_get_value (41 ); -} -/* MERAM */ -static struct sh_mobile_meram_info meram_info = { - .addr_mode =SH_MOBILE_MERAM_MODE1 , -}; - -static struct resource meram_resources[] = { - [0 ] = { - .name ="regs" , - .start =0xe8000000 , - .end =0xe807ffff , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .name ="meram" , - .start =0xe8080000 , - .end =0xe81fffff , - .flags =IORESOURCE_MEM , - }, -}; - -static struct platform_device meram_device = { - .name ="sh_mobile_meram" , - .id =0 , - .num_resources =ARRAY_SIZE (meram_resources), - .resource = meram_resources, - .dev = { - .platform_data = &meram_info, - }, -}; - -/* SH_MMCIF */ -static struct resource sh_mmcif_resources[] = { - [0 ] = { - .name ="MMCIF" , - .start =0xE6BD0000 , - .end =0xE6BD00FF , - .flags =IORESOURCE_MEM , - }, - [1 ] = { -/* MMC ERR */ - .start =evt2irq (0x1ac0 ), - .flags =IORESOURCE_IRQ , - }, - [2 ] = { -/* MMC NOR */ - .start =evt2irq (0x1ae0 ), - .flags =IORESOURCE_IRQ , - }, -}; - -static struct sh_mmcif_plat_data sh_mmcif_plat = { - .sup_pclk =0 , - .ocr =MMC_VDD_165_195 |MMC_VDD_32_33 |MMC_VDD_33_34 , - .caps =MMC_CAP_4_BIT_DATA | -MMC_CAP_8_BIT_DATA | -MMC_CAP_NEEDS_POLL , - .get_cd = slot_cn7_get_cd, - .slave_id_tx =SHDMA_SLAVE_MMCIF_TX , - .slave_id_rx =SHDMA_SLAVE_MMCIF_RX , -}; - -static struct platform_device sh_mmcif_device = { - .name ="sh_mmcif" , - .id =0 , - .dev = { - .dma_mask =NULL , - .coherent_dma_mask =0xffffffff , - .platform_data = &sh_mmcif_plat, - }, - .num_resources =ARRAY_SIZE (sh_mmcif_resources), - .resource = sh_mmcif_resources, -}; - -/* SDHI0 */ -static struct sh_mobile_sdhi_info sdhi0_info = { - .dma_slave_tx =SHDMA_SLAVE_SDHI0_TX , - .dma_slave_rx =SHDMA_SLAVE_SDHI0_RX , - .tmio_caps =MMC_CAP_SDIO_IRQ , -}; - -static struct resource sdhi0_resources[] = { - [0 ] = { - .name ="SDHI0" , - .start =0xe6850000 , - .end =0xe68500ff , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =evt2irq (0x0e00 )/* SDHI0_SDHI0I0 */ , - .flags =IORESOURCE_IRQ , - }, - [2 ] = { - .start =evt2irq (0x0e20 )/* SDHI0_SDHI0I1 */ , - .flags =IORESOURCE_IRQ , - }, - [3 ] = { - .start =evt2irq (0x0e40 )/* SDHI0_SDHI0I2 */ , - .flags =IORESOURCE_IRQ , - }, -}; - -static struct platform_device sdhi0_device = { - .name ="sh_mobile_sdhi" , - .num_resources =ARRAY_SIZE (sdhi0_resources), - .resource = sdhi0_resources, - .id =0 , - .dev = { - .platform_data = &sdhi0_info, - }, -}; - -/* SDHI1 */ -static struct sh_mobile_sdhi_info sdhi1_info = { - .dma_slave_tx =SHDMA_SLAVE_SDHI1_TX , - .dma_slave_rx =SHDMA_SLAVE_SDHI1_RX , - .tmio_ocr_mask =MMC_VDD_165_195 , - .tmio_flags =TMIO_MMC_WRPROTECT_DISABLE , - .tmio_caps =MMC_CAP_NEEDS_POLL |MMC_CAP_SDIO_IRQ , - .get_cd = slot_cn7_get_cd, -}; - -static struct resource sdhi1_resources[] = { - [0 ] = { - .name ="SDHI1" , - .start =0xe6860000 , - .end =0xe68600ff , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =evt2irq (0x0e80 ),/* SDHI1_SDHI1I0 */ - .flags =IORESOURCE_IRQ , - }, - [2 ] = { - .start =evt2irq (0x0ea0 ),/* SDHI1_SDHI1I1 */ - .flags =IORESOURCE_IRQ , - }, - [3 ] = { - .start =evt2irq (0x0ec0 ),/* SDHI1_SDHI1I2 */ - .flags =IORESOURCE_IRQ , - }, -}; - -static struct platform_device sdhi1_device = { - .name ="sh_mobile_sdhi" , - .num_resources =ARRAY_SIZE (sdhi1_resources), - .resource = sdhi1_resources, - .id =1 , - .dev = { - .platform_data = &sdhi1_info, - }, -}; - -/* USB1 */ -static void usb1_host_port_power (int port,int power) -{ -if (!power)/* only power-on supported for now */ -return ; - -/* set VBOUT/PWEN and EXTLP1 in DVSTCTR */ -__raw_writew (__raw_readw (IOMEM (0xE68B0008 )) |0x600 ,IOMEM (0xE68B0008 )); -} - -static struct r8a66597_platdata usb1_host_data = { - .on_chip =1 , - .port_power = usb1_host_port_power, -}; - -static struct resource usb1_host_resources[] = { - [0 ] = { - .name ="USBHS" , - .start =0xE68B0000 , - .end =0xE68B00E6 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =evt2irq (0x1ce0 )/* USB1_USB1I0 */ , - .flags =IORESOURCE_IRQ , - }, -}; - -static struct platform_device usb1_host_device = { - .name ="r8a66597_hcd" , - .id =1 , - .dev = { - .dma_mask =NULL ,/* not use dma */ - .coherent_dma_mask =0xffffffff , - .platform_data = &usb1_host_data, - }, - .num_resources =ARRAY_SIZE (usb1_host_resources), - .resource = usb1_host_resources, -}; - -/* -* QHD display -*/ -#ifdef CONFIG_AP4EVB_QHD - -/* KEYSC (Needs SW43 set to ON) */ -static struct sh_keysc_info keysc_info = { - .mode =SH_KEYSC_MODE_1 , - .scan_timing =3 , - .delay =2500 , - .keycodes = { -KEY_0 ,KEY_1 ,KEY_2 ,KEY_3 ,KEY_4 , -KEY_5 ,KEY_6 ,KEY_7 ,KEY_8 ,KEY_9 , -KEY_A ,KEY_B ,KEY_C ,KEY_D ,KEY_E , -KEY_F ,KEY_G ,KEY_H ,KEY_I ,KEY_J , -KEY_K ,KEY_L ,KEY_M ,KEY_N ,KEY_O , - }, -}; - -static struct resource keysc_resources[] = { - [0 ] = { - .name ="KEYSC" , - .start =0xe61b0000 , - .end =0xe61b0063 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =evt2irq (0x0be0 ),/* KEYSC_KEY */ - .flags =IORESOURCE_IRQ , - }, -}; - -static struct platform_device keysc_device = { - .name ="sh_keysc" , - .id =0 ,/* "keysc0" clock */ - .num_resources =ARRAY_SIZE (keysc_resources), - .resource = keysc_resources, - .dev = { - .platform_data = &keysc_info, - }, -}; - -/* MIPI-DSI */ -static int sh_mipi_set_dot_clock (struct platform_device *pdev, -void __iomem *base, -int enable) -{ -struct clk *pck =clk_get (&pdev->dev,"dsip_clk" ); - -if (IS_ERR (pck)) -return PTR_ERR (pck); - -if (enable) { -/* -* DSIPCLK = 24MHz -* D-PHY = DSIPCLK * ((0x6*2)+1) = 312MHz (see .phyctrl) -* HsByteCLK = D-PHY/8 = 39MHz -* -* X * Y * FPS = -* (544+72+600+16) * (961+8+8+2) * 30 = 36.1MHz -*/ -clk_set_rate (pck,clk_round_rate (pck,24000000 )); -clk_enable (pck); - }else { -clk_disable (pck); - } - -clk_put (pck); - -return 0 ; -} - -static struct resource mipidsi0_resources[] = { - [0 ] = { - .start =0xffc60000 , - .end =0xffc63073 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =0xffc68000 , - .end =0xffc680ef , - .flags =IORESOURCE_MEM , - }, -}; - -static struct sh_mipi_dsi_info mipidsi0_info = { - .data_format =MIPI_RGB888 , - .channel =LCDC_CHAN_MAINLCD , - .lane =2 , - .vsynw_offset =17 , - .phyctrl =0x6 <<8 , - .flags =SH_MIPI_DSI_SYNC_PULSES_MODE | - SH_MIPI_DSI_HSbyteCLK, - .set_dot_clock = sh_mipi_set_dot_clock, -}; - -static struct platform_device mipidsi0_device = { - .name ="sh-mipi-dsi" , - .num_resources =ARRAY_SIZE (mipidsi0_resources), - .resource = mipidsi0_resources, - .id =0 , - .dev = { - .platform_data = &mipidsi0_info, - }, -}; - -static struct platform_device *qhd_devices[]__initdata = { - &mipidsi0_device, - &keysc_device, -}; -#endif /* CONFIG_AP4EVB_QHD */ - -/* LCDC0 */ -static const struct fb_videomode ap4evb_lcdc_modes[] = { - { -#ifdef CONFIG_AP4EVB_QHD - .name ="R63302(QHD)" , - .xres =544 , - .yres =961 , - .left_margin =72 , - .right_margin =600 , - .hsync_len =16 , - .upper_margin =8 , - .lower_margin =8 , - .vsync_len =2 , - .sync =FB_SYNC_VERT_HIGH_ACT |FB_SYNC_HOR_HIGH_ACT , -#else - .name ="WVGA Panel" , - .xres =800 , - .yres =480 , - .left_margin =220 , - .right_margin =110 , - .hsync_len =70 , - .upper_margin =20 , - .lower_margin =5 , - .vsync_len =5 , - .sync =0 , -#endif - }, -}; - -static const struct sh_mobile_meram_cfg lcd_meram_cfg = { - .icb[0 ] = { - .meram_size =0x40 , - }, - .icb[1 ] = { - .meram_size =0x40 , - }, -}; - -static struct sh_mobile_lcdc_info lcdc_info = { - .meram_dev = &meram_info, - .ch[0 ] = { - .chan =LCDC_CHAN_MAINLCD , - .fourcc =V4L2_PIX_FMT_RGB565 , - .lcd_modes = ap4evb_lcdc_modes, - .num_modes =ARRAY_SIZE (ap4evb_lcdc_modes), - .meram_cfg = &lcd_meram_cfg, -#ifdef CONFIG_AP4EVB_QHD - .tx_dev = &mipidsi0_device, -#endif - } -}; - -static struct resource lcdc_resources[] = { - [0 ] = { - .name ="LCDC" , - .start =0xfe940000 ,/* P4-only space */ - .end =0xfe943fff , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =intcs_evt2irq (0x580 ), - .flags =IORESOURCE_IRQ , - }, -}; - -static struct platform_device lcdc_device = { - .name ="sh_mobile_lcdc_fb" , - .num_resources =ARRAY_SIZE (lcdc_resources), - .resource = lcdc_resources, - .dev = { - .platform_data = &lcdc_info, - .coherent_dma_mask = ~0 , - }, -}; - -/* FSI */ -#define IRQ_FSI evt2irq(0x1840) -static struct sh_fsi_platform_info fsi_info = { - .port_b = { - .flags =SH_FSI_CLK_CPG | -SH_FSI_FMT_SPDIF , - }, -}; - -static struct resource fsi_resources[] = { - [0 ] = { - .name ="FSI" , - .start =0xFE3C0000 , - .end =0xFE3C0400 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IRQ_FSI , - .flags =IORESOURCE_IRQ , - }, -}; - -static struct platform_device fsi_device = { - .name ="sh_fsi2" , - .id =-1 , - .num_resources =ARRAY_SIZE (fsi_resources), - .resource = fsi_resources, - .dev = { - .platform_data = &fsi_info, - }, -}; - -static struct asoc_simple_card_info fsi2_ak4643_info = { - .name ="AK4643" , - .card ="FSI2A-AK4643" , - .codec ="ak4642-codec.0-0013" , - .platform ="sh_fsi2" , - .daifmt =SND_SOC_DAIFMT_LEFT_J , - .cpu_dai = { - .name ="fsia-dai" , - .fmt =SND_SOC_DAIFMT_CBS_CFS , - }, - .codec_dai = { - .name ="ak4642-hifi" , - .fmt =SND_SOC_DAIFMT_CBM_CFM , - .sysclk =11289600 , - }, -}; - -static struct platform_device fsi_ak4643_device = { - .name ="asoc-simple-card" , - .dev = { - .platform_data = &fsi2_ak4643_info, - }, -}; - -/* LCDC1 */ -static long ap4evb_clk_optimize (unsigned long target,unsigned long *best_freq, -unsigned long *parent_freq); - -static struct sh_mobile_hdmi_info hdmi_info = { - .flags =HDMI_SND_SRC_SPDIF , - .clk_optimize_parent = ap4evb_clk_optimize, -}; - -static struct resource hdmi_resources[] = { - [0 ] = { - .name ="HDMI" , - .start =0xe6be0000 , - .end =0xe6be00ff , - .flags =IORESOURCE_MEM , - }, - [1 ] = { -/* There's also an HDMI interrupt on INTCS @ 0x18e0 */ - .start =evt2irq (0x17e0 ), - .flags =IORESOURCE_IRQ , - }, -}; - -static struct platform_device hdmi_device = { - .name ="sh-mobile-hdmi" , - .num_resources =ARRAY_SIZE (hdmi_resources), - .resource = hdmi_resources, - .id =-1 , - .dev = { - .platform_data = &hdmi_info, - }, -}; - -static long ap4evb_clk_optimize (unsigned long target,unsigned long *best_freq, -unsigned long *parent_freq) -{ -struct clk *hdmi_ick =clk_get (&hdmi_device.dev,"ick" ); -long error; - -if (IS_ERR (hdmi_ick)) { -int ret =PTR_ERR (hdmi_ick); -pr_err ("Cannot get HDMI ICK: %d\n" , ret); -return ret; - } - - error =clk_round_parent (hdmi_ick, target, best_freq, parent_freq,1 ,64 ); - -clk_put (hdmi_ick); - -return error; -} - -static const struct sh_mobile_meram_cfg hdmi_meram_cfg = { - .icb[0 ] = { - .meram_size =0x100 , - }, - .icb[1 ] = { - .meram_size =0x100 , - }, -}; - -static struct sh_mobile_lcdc_info sh_mobile_lcdc1_info = { - .clock_source =LCDC_CLK_EXTERNAL , - .meram_dev = &meram_info, - .ch[0 ] = { - .chan =LCDC_CHAN_MAINLCD , - .fourcc =V4L2_PIX_FMT_RGB565 , - .interface_type =RGB24 , - .clock_divider =1 , - .flags =LCDC_FLAGS_DWPOL , - .meram_cfg = &hdmi_meram_cfg, - .tx_dev = &hdmi_device, - } -}; - -static struct resource lcdc1_resources[] = { - [0 ] = { - .name ="LCDC1" , - .start =0xfe944000 , - .end =0xfe947fff , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =intcs_evt2irq (0x1780 ), - .flags =IORESOURCE_IRQ , - }, -}; - -static struct platform_device lcdc1_device = { - .name ="sh_mobile_lcdc_fb" , - .num_resources =ARRAY_SIZE (lcdc1_resources), - .resource = lcdc1_resources, - .id =1 , - .dev = { - .platform_data = &sh_mobile_lcdc1_info, - .coherent_dma_mask = ~0 , - }, -}; - -static struct asoc_simple_card_info fsi2_hdmi_info = { - .name ="HDMI" , - .card ="FSI2B-HDMI" , - .codec ="sh-mobile-hdmi" , - .platform ="sh_fsi2" , - .cpu_dai = { - .name ="fsib-dai" , - .fmt =SND_SOC_DAIFMT_CBM_CFM |SND_SOC_DAIFMT_IB_NF , - }, - .codec_dai = { - .name ="sh_mobile_hdmi-hifi" , - }, -}; - -static struct platform_device fsi_hdmi_device = { - .name ="asoc-simple-card" , - .id =1 , - .dev = { - .platform_data = &fsi2_hdmi_info, - }, -}; - -static struct gpio_led ap4evb_leds[] = { - { - .name ="led4" , - .gpio =185 , - .default_state =LEDS_GPIO_DEFSTATE_ON , - }, - { - .name ="led2" , - .gpio =186 , - .default_state =LEDS_GPIO_DEFSTATE_ON , - }, - { - .name ="led3" , - .gpio =187 , - .default_state =LEDS_GPIO_DEFSTATE_ON , - }, - { - .name ="led1" , - .gpio =188 , - .default_state =LEDS_GPIO_DEFSTATE_ON , - } -}; - -static struct gpio_led_platform_data ap4evb_leds_pdata = { - .num_leds =ARRAY_SIZE (ap4evb_leds), - .leds = ap4evb_leds, -}; - -static struct platform_device leds_device = { - .name ="leds-gpio" , - .id =0 , - .dev = { - .platform_data = &ap4evb_leds_pdata, - }, -}; - -static struct i2c_board_info imx074_info = { -I2C_BOARD_INFO ("imx074" ,0x1a ), -}; - -static struct soc_camera_link imx074_link = { - .bus_id =0 , - .board_info = &imx074_info, - .i2c_adapter_id =0 , - .module_name ="imx074" , -}; - -static struct platform_device ap4evb_camera = { - .name ="soc-camera-pdrv" , - .id =0 , - .dev = { - .platform_data = &imx074_link, - }, -}; - -static struct sh_csi2_client_config csi2_clients[] = { - { - .phy =SH_CSI2_PHY_MAIN , - .lanes =0 ,/* default: 2 lanes */ - .channel =0 , - .pdev = &ap4evb_camera, - }, -}; - -static struct sh_csi2_pdata csi2_info = { - .type =SH_CSI2C , - .clients = csi2_clients, - .num_clients =ARRAY_SIZE (csi2_clients), - .flags =SH_CSI2_ECC |SH_CSI2_CRC , -}; - -static struct resource csi2_resources[] = { - [0 ] = { - .name ="CSI2" , - .start =0xffc90000 , - .end =0xffc90fff , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =intcs_evt2irq (0x17a0 ), - .flags =IORESOURCE_IRQ , - }, -}; - -static struct sh_mobile_ceu_companion csi2 = { - .id =0 , - .num_resources =ARRAY_SIZE (csi2_resources), - .resource = csi2_resources, - .platform_data = &csi2_info, -}; - -static struct sh_mobile_ceu_info sh_mobile_ceu_info = { - .flags =SH_CEU_FLAG_USE_8BIT_BUS , - .max_width =8188 , - .max_height =8188 , - .csi2 = &csi2, -}; - -static struct resource ceu_resources[] = { - [0 ] = { - .name ="CEU" , - .start =0xfe910000 , - .end =0xfe91009f , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =intcs_evt2irq (0x880 ), - .flags =IORESOURCE_IRQ , - }, - [2 ] = { -/* place holder for contiguous memory */ - }, -}; - -static struct platform_device ceu_device = { - .name ="sh_mobile_ceu" , - .id =0 ,/* "ceu0" clock */ - .num_resources =ARRAY_SIZE (ceu_resources), - .resource = ceu_resources, - .dev = { - .platform_data = &sh_mobile_ceu_info, - .coherent_dma_mask =0xffffffff , - }, -}; - -static struct platform_device *ap4evb_devices[]__initdata = { - &leds_device, - &nor_flash_device, - &smc911x_device, - &sdhi0_device, - &sdhi1_device, - &usb1_host_device, - &fsi_device, - &fsi_ak4643_device, - &fsi_hdmi_device, - &sh_mmcif_device, - &hdmi_device, - &lcdc_device, - &lcdc1_device, - &ceu_device, - &ap4evb_camera, - &meram_device, -}; - -static void __init hdmi_init_pm_clock (void ) -{ -struct clk *hdmi_ick =clk_get (&hdmi_device.dev,"ick" ); -int ret; -long rate; - -if (IS_ERR (hdmi_ick)) { - ret =PTR_ERR (hdmi_ick); -pr_err ("Cannot get HDMI ICK: %d\n" , ret); - goto out; - } - - ret =clk_set_parent (&sh7372_pllc2_clk, &sh7372_dv_clki_div2_clk); -if (ret <0 ) { -pr_err ("Cannot set PLLC2 parent: %d, %d users\n" , ret, sh7372_pllc2_clk.usecount); - goto out; - } - -pr_debug ("PLLC2 initial frequency %lu\n" ,clk_get_rate (&sh7372_pllc2_clk)); - - rate =clk_round_rate (&sh7372_pllc2_clk,594000000 ); -if (rate <0 ) { -pr_err ("Cannot get suitable rate: %ld\n" , rate); - ret = rate; - goto out; - } - - ret =clk_set_rate (&sh7372_pllc2_clk, rate); -if (ret <0 ) { -pr_err ("Cannot set rate %ld: %d\n" , rate, ret); - goto out; - } - -pr_debug ("PLLC2 set frequency %lu\n" , rate); - - ret =clk_set_parent (hdmi_ick, &sh7372_pllc2_clk); -if (ret <0 ) -pr_err ("Cannot set HDMI parent: %d\n" , ret); - -out: -if (!IS_ERR (hdmi_ick)) -clk_put (hdmi_ick); -} - -/* TouchScreen */ -#ifdef CONFIG_AP4EVB_QHD -# define GPIO_TSC_PORT 123 -#else /* WVGA */ -# define GPIO_TSC_PORT 40 -#endif - -#define IRQ28 evt2irq(0x3380)/* IRQ28A */ -#define IRQ7 evt2irq(0x02e0)/* IRQ7A */ -static int ts_get_pendown_state (void ) -{ -return !gpio_get_value (GPIO_TSC_PORT ); -} - -static int ts_init (void ) -{ -gpio_request_one (GPIO_TSC_PORT ,GPIOF_IN ,NULL ); - -return 0 ; -} - -static struct tsc2007_platform_data tsc2007_info = { - .model =2007 , - .x_plate_ohms =180 , - .get_pendown_state = ts_get_pendown_state, - .init_platform_hw = ts_init, -}; - -static struct i2c_board_info tsc_device = { -I2C_BOARD_INFO ("tsc2007" ,0x48 ), - .type ="tsc2007" , - .platform_data = &tsc2007_info, -/*.irq is selected on ap4evb_init */ -}; - -/* I2C */ -static struct i2c_board_info i2c0_devices[] = { - { -I2C_BOARD_INFO ("ak4643" ,0x13 ), - }, -}; - -static struct i2c_board_info i2c1_devices[] = { - { -I2C_BOARD_INFO ("r2025sd" ,0x32 ), - }, -}; - - -static const struct pinctrl_map ap4evb_pinctrl_map[] = { -/* CEU */ -PIN_MAP_MUX_GROUP_DEFAULT ("sh_mobile_ceu.0" ,"pfc-sh7372" , -"ceu_clk_0" ,"ceu" ), -/* FSIA (AK4643) */ -PIN_MAP_MUX_GROUP_DEFAULT ("asoc-simple-card.0" ,"pfc-sh7372" , -"fsia_sclk_in" ,"fsia" ), -PIN_MAP_MUX_GROUP_DEFAULT ("asoc-simple-card.0" ,"pfc-sh7372" , -"fsia_data_in" ,"fsia" ), -PIN_MAP_MUX_GROUP_DEFAULT ("asoc-simple-card.0" ,"pfc-sh7372" , -"fsia_data_out" ,"fsia" ), -/* FSIB (HDMI) */ -PIN_MAP_MUX_GROUP_DEFAULT ("asoc-simple-card.1" ,"pfc-sh7372" , -"fsib_mclk_in" ,"fsib" ), -/* HDMI */ -PIN_MAP_MUX_GROUP_DEFAULT ("sh-mobile-hdmi" ,"pfc-sh7372" , -"hdmi" ,"hdmi" ), -/* KEYSC */ -PIN_MAP_MUX_GROUP_DEFAULT ("sh_keysc" ,"pfc-sh7372" , -"keysc_in04_0" ,"keysc" ), -PIN_MAP_MUX_GROUP_DEFAULT ("sh_keysc" ,"pfc-sh7372" , -"keysc_out5" ,"keysc" ), -#ifndef CONFIG_AP4EVB_QHD -/* LCDC */ -PIN_MAP_MUX_GROUP_DEFAULT ("sh_mobile_lcdc_fb.0" ,"pfc-sh7372" , -"lcd_data18" ,"lcd" ), -PIN_MAP_MUX_GROUP_DEFAULT ("sh_mobile_lcdc_fb.0" ,"pfc-sh7372" , -"lcd_sync" ,"lcd" ), -#endif -/* MMCIF */ -PIN_MAP_MUX_GROUP_DEFAULT ("sh_mmcif.0" ,"pfc-sh7372" , -"mmc0_data8_0" ,"mmc0" ), -PIN_MAP_MUX_GROUP_DEFAULT ("sh_mmcif.0" ,"pfc-sh7372" , -"mmc0_ctrl_0" ,"mmc0" ), -/* SCIFA0 */ -PIN_MAP_MUX_GROUP_DEFAULT ("sh-sci.0" ,"pfc-sh7372" , -"scifa0_data" ,"scifa0" ), -/* SDHI0 */ -PIN_MAP_MUX_GROUP_DEFAULT ("sh_mobile_sdhi.0" ,"pfc-sh7372" , -"sdhi0_data4" ,"sdhi0" ), -PIN_MAP_MUX_GROUP_DEFAULT ("sh_mobile_sdhi.0" ,"pfc-sh7372" , -"sdhi0_ctrl" ,"sdhi0" ), -PIN_MAP_MUX_GROUP_DEFAULT ("sh_mobile_sdhi.0" ,"pfc-sh7372" , -"sdhi0_cd" ,"sdhi0" ), -PIN_MAP_MUX_GROUP_DEFAULT ("sh_mobile_sdhi.0" ,"pfc-sh7372" , -"sdhi0_wp" ,"sdhi0" ), -/* SDHI1 */ -PIN_MAP_MUX_GROUP_DEFAULT ("sh_mobile_sdhi.1" ,"pfc-sh7372" , -"sdhi1_data4" ,"sdhi1" ), -PIN_MAP_MUX_GROUP_DEFAULT ("sh_mobile_sdhi.1" ,"pfc-sh7372" , -"sdhi1_ctrl" ,"sdhi1" ), -/* SMSC911X */ -PIN_MAP_MUX_GROUP_DEFAULT ("smsc911x" ,"pfc-sh7372" , -"bsc_cs5a" ,"bsc" ), -PIN_MAP_MUX_GROUP_DEFAULT ("smsc911x" ,"pfc-sh7372" , -"intc_irq6_0" ,"intc" ), -/* TSC2007 */ -#ifdef CONFIG_AP4EVB_QHD -PIN_MAP_MUX_GROUP_DEFAULT ("1-0048" ,"pfc-sh7372" , -"intc_irq28_0" ,"intc" ), -#else /* WVGA */ -PIN_MAP_MUX_GROUP_DEFAULT ("1-0048" ,"pfc-sh7372" , -"intc_irq7_0" ,"intc" ), -#endif -/* USBHS1 */ -PIN_MAP_MUX_GROUP_DEFAULT ("r8a66597_hcd.1" ,"pfc-sh7372" , -"usb1_vbus" ,"usb1" ), -PIN_MAP_MUX_GROUP_DEFAULT ("r8a66597_hcd.1" ,"pfc-sh7372" , -"usb1_otg_id_0" ,"usb1" ), -PIN_MAP_MUX_GROUP_DEFAULT ("r8a66597_hcd.1" ,"pfc-sh7372" , -"usb1_otg_ctrl_0" ,"usb1" ), -}; - -#define GPIO_PORT9CR IOMEM(0xE6051009) -#define GPIO_PORT10CR IOMEM(0xE605100A) -#define USCCR1 IOMEM(0xE6058144) -static void __init ap4evb_init (void ) -{ -struct pm_domain_device domain_devices[] = { - {"A4LC" , &lcdc1_device, }, - {"A4LC" , &lcdc_device, }, - {"A4MP" , &fsi_device, }, - {"A3SP" , &sh_mmcif_device, }, - {"A3SP" , &sdhi0_device, }, - {"A3SP" , &sdhi1_device, }, - {"A4R" , &ceu_device, }, - }; -u32 srcr4; -struct clk *clk; - -regulator_register_always_on (0 ,"fixed-1.8V" , fixed1v8_power_consumers, -ARRAY_SIZE (fixed1v8_power_consumers),1800000 ); -regulator_register_always_on (1 ,"fixed-3.3V" , fixed3v3_power_consumers, -ARRAY_SIZE (fixed3v3_power_consumers),3300000 ); -regulator_register_fixed (2 , dummy_supplies,ARRAY_SIZE (dummy_supplies)); - -/* External clock source */ -clk_set_rate (&sh7372_dv_clki_clk,27000000 ); - -pinctrl_register_mappings (ap4evb_pinctrl_map, -ARRAY_SIZE (ap4evb_pinctrl_map)); -sh7372_pinmux_init (); - -/* enable Debug switch (S6) */ -gpio_request_one (32 ,GPIOF_IN |GPIOF_EXPORT ,NULL ); -gpio_request_one (33 ,GPIOF_IN |GPIOF_EXPORT ,NULL ); -gpio_request_one (34 ,GPIOF_IN |GPIOF_EXPORT ,NULL ); -gpio_request_one (35 ,GPIOF_IN |GPIOF_EXPORT ,NULL ); - -/* setup USB phy */ -__raw_writew (0x8a0a ,IOMEM (0xE6058130 ));/* USBCR4 */ - -/* FSI2 port A (ak4643) */ -gpio_request_one (161 ,GPIOF_OUT_INIT_LOW ,NULL );/* slave */ - -gpio_request (9 ,NULL ); -gpio_request (10 ,NULL ); -gpio_direction_none (GPIO_PORT9CR );/* FSIAOBT needs no direction */ -gpio_direction_none (GPIO_PORT10CR );/* FSIAOLR needs no direction */ - -/* card detect pin for MMC slot (CN7) */ -gpio_request_one (41 ,GPIOF_IN ,NULL ); - -/* FSI2 port B (HDMI) */ -__raw_writew (__raw_readw (USCCR1 ) & ~(1 <<6 ),USCCR1 );/* use SPDIF */ - -/* set SPU2 clock to 119.6 MHz */ - clk =clk_get (NULL ,"spu_clk" ); -if (!IS_ERR (clk)) { -clk_set_rate (clk,clk_round_rate (clk,119600000 )); -clk_put (clk); - } - -/* -* set irq priority, to avoid sound chopping -* when NFS rootfs is used -* FSI(3) > SMSC911X(2) -*/ -intc_set_priority (IRQ_FSI ,3 ); - -i2c_register_board_info (0 , i2c0_devices, -ARRAY_SIZE (i2c0_devices)); - -i2c_register_board_info (1 , i2c1_devices, -ARRAY_SIZE (i2c1_devices)); - -#ifdef CONFIG_AP4EVB_QHD - -/* -* For QHD Panel (MIPI-DSI, CONFIG_AP4EVB_QHD=y) and -* IRQ28 for Touch Panel, set dip switches S3, S43 as OFF, ON. -*/ - -/* enable TouchScreen */ -irq_set_irq_type (IRQ28 ,IRQ_TYPE_LEVEL_LOW ); - - tsc_device.irq =IRQ28 ; -i2c_register_board_info (1 , &tsc_device,1 ); - -/* LCDC0 */ - lcdc_info.clock_source =LCDC_CLK_PERIPHERAL ; - lcdc_info.ch[0 ].interface_type =RGB24 ; - lcdc_info.ch[0 ].clock_divider =1 ; - lcdc_info.ch[0 ].flags =LCDC_FLAGS_DWPOL ; - lcdc_info.ch[0 ].panel_cfg.width =44 ; - lcdc_info.ch[0 ].panel_cfg.height =79 ; - -platform_add_devices (qhd_devices,ARRAY_SIZE (qhd_devices)); - -#else -/* -* For WVGA Panel (18-bit RGB, CONFIG_AP4EVB_WVGA=y) and -* IRQ7 for Touch Panel, set dip switches S3, S43 to ON, OFF. -*/ -gpio_request_one (189 ,GPIOF_OUT_INIT_HIGH ,NULL );/* backlight */ -gpio_request_one (151 ,GPIOF_OUT_INIT_HIGH ,NULL );/* LCDDON */ - - lcdc_info.clock_source =LCDC_CLK_BUS ; - lcdc_info.ch[0 ].interface_type =RGB18 ; - lcdc_info.ch[0 ].clock_divider =3 ; - lcdc_info.ch[0 ].flags =0 ; - lcdc_info.ch[0 ].panel_cfg.width =152 ; - lcdc_info.ch[0 ].panel_cfg.height =91 ; - -/* enable TouchScreen */ -irq_set_irq_type (IRQ7 ,IRQ_TYPE_LEVEL_LOW ); - - tsc_device.irq =IRQ7 ; -i2c_register_board_info (0 , &tsc_device,1 ); -#endif /* CONFIG_AP4EVB_QHD */ - -/* CEU */ - -/* -* TODO: reserve memory for V4L2 DMA buffers, when a suitable API -* becomes available -*/ - -/* MIPI-CSI stuff */ - clk =clk_get (NULL ,"vck1_clk" ); -if (!IS_ERR (clk)) { -clk_set_rate (clk,clk_round_rate (clk,13000000 )); -clk_enable (clk); -clk_put (clk); - } - -sh7372_add_standard_devices (); - -/* Reset HDMI, must be held at least one EXTALR (32768Hz) period */ -#define SRCR4 IOMEM(0xe61580bc) - srcr4 =__raw_readl (SRCR4 ); -__raw_writel (srcr4 | (1 <<13 ),SRCR4 ); -udelay (50 ); -__raw_writel (srcr4 & ~(1 <<13 ),SRCR4 ); - -platform_add_devices (ap4evb_devices,ARRAY_SIZE (ap4evb_devices)); - -rmobile_add_devices_to_domains (domain_devices, -ARRAY_SIZE (domain_devices)); - -hdmi_init_pm_clock (); -sh7372_pm_init (); -pm_clk_add (&fsi_device.dev,"spu2" ); -pm_clk_add (&lcdc1_device.dev,"hdmi" ); -} - -MACHINE_START (AP4EVB ,"ap4evb" ) - .map_io = sh7372_map_io, - .init_early = sh7372_add_early_devices, - .init_irq = sh7372_init_irq, - .handle_irq = shmobile_handle_irq_intc, - .init_machine = ap4evb_init, - .init_late = sh7372_pm_init_late, - .init_time = sh7372_earlytimer_init, -MACHINE_END arch/arm/mach-shmobile/include/mach/head-ap4evb.txt deleted +0
-93@@ -1,93 +0,0 @@ -LIST "partner-jet-setup.txt" -LIST "(C) Copyright 2010 Renesas Solutions Corp" -LIST "Kuninori Morimoto <[email protected]>" - -LIST "RWT Setting" -EW 0xE6020004, 0xA500 -EW 0xE6030004, 0xA500 - -LIST "GPIO Setting" -EB 0xE6051013, 0xA2 - -LIST "CPG" -ED 0xE61500C0, 0x00000002 - -WAIT 1, 0xFE40009C - -LIST "FRQCR" -ED 0xE6150000, 0x2D1305C3 -ED 0xE61500E0, 0x9E40358E -ED 0xE6150004, 0x80331050 - -WAIT 1, 0xFE40009C - -ED 0xE61500E4, 0x00002000 - -WAIT 1, 0xFE40009C - -LIST "PLL" -ED 0xE6150028, 0x00004000 - -WAIT 1, 0xFE40009C - -ED 0xE615002C, 0x93000040 - -WAIT 1, 0xFE40009C - -LIST "SUB/USBClk" -ED 0xE6150080, 0x00000180 - -LIST "BSC" -ED 0xFEC10000, 0x00E0001B - -LIST "SBSC1" -ED 0xFE400354, 0x01AD8000 -ED 0xFE400354, 0x01AD8001 - -WAIT 5, 0xFE40009C - -ED 0xFE400008, 0xBCC90151 -ED 0xFE400040, 0x41774113 -ED 0xFE400044, 0x2712E229 -ED 0xFE400048, 0x20C18505 -ED 0xFE40004C, 0x00110209 -ED 0xFE400010, 0x00000087 - -WAIT 30, 0xFE40009C - -ED 0xFE400084, 0x0000003F -EB 0xFE500000, 0x00 - -WAIT 5, 0xFE40009C - -ED 0xFE400084, 0x0000FF0A -EB 0xFE500000, 0x00 - -WAIT 1, 0xFE40009C - -ED 0xFE400084, 0x00002201 -EB 0xFE500000, 0x00 -ED 0xFE400084, 0x00000302 -EB 0xFE500000, 0x00 -EB 0xFE5C0000, 0x00 -ED 0xFE400008, 0xBCC90159 -ED 0xFE40008C, 0x88800004 -ED 0xFE400094, 0x00000004 -ED 0xFE400028, 0xA55A0032 -ED 0xFE40002C, 0xA55A000C -ED 0xFE400020, 0xA55A2048 -ED 0xFE400008, 0xBCC90959 - -LIST "Change CPGA setting" -ED 0xE61500E0, 0x9E40352E -ED 0xE6150004, 0x80331050 - -WAIT 1, 0xFE40009C - -ED 0xFE400354, 0x01AD8002 - -LIST "SCIF0 - Serial port for earlyprintk" -EB 0xE6053098, 0xe1 -EW 0xE6C40000, 0x0000 -EB 0xE6C40004, 0x19 -EW 0xE6C40008, 0x0030arch/arm/mach-shmobile/include/mach/mmc-ap4eb.h deleted +0
-29@@ -1,29 +0,0 @@ -#ifndef MMC_AP4EB_H -#define MMC_AP4EB_H - -#define PORT185CR (void __iomem *)0xe60520b9 -#define PORT186CR (void __iomem *)0xe60520ba -#define PORT187CR (void __iomem *)0xe60520bb -#define PORT188CR (void __iomem *)0xe60520bc - -#define PORTR191_160DR (void __iomem *)0xe6056014 - -static inline void mmc_init_progress (void ) -{ -/* Initialise LEDS1-4 -* registers: PORT185CR-PORT188CR (LED1-LED4 Control) -* value: 0x10 - enable output -*/ -__raw_writeb (0x10 ,PORT185CR ); -__raw_writeb (0x10 ,PORT186CR ); -__raw_writeb (0x10 ,PORT187CR ); -__raw_writeb (0x10 ,PORT188CR ); -} - -static inline void mmc_update_progress (int n) -{ -__raw_writel ((__raw_readl (PORTR191_160DR ) & ~(0xf <<25 )) | - (1 << (25 + n)),PORTR191_160DR ); -} - -#endif /* MMC_AP4EB_H */ arch/arm/mach-shmobile/include/mach/mmc.h +1
-3@@ -7,9 +7,7 @@* **************************************************/ -#ifdef CONFIG_MACH_AP4EVB -#include "mach/mmc-ap4eb.h" -#elif defined(CONFIG_MACH_MACKEREL ) +#ifdef CONFIG_MACH_MACKEREL #include "mach/mmc-mackerel.h" #else #error "unsupported board."arch/arm/mach-shmobile/include/mach/zboot.h +1
-5@@ -10,11 +10,7 @@* **************************************************/ -#ifdef CONFIG_MACH_AP4EVB -#define MACH_TYPE MACH_TYPE_AP4EVB -#define MEMORY_START 0x40000000 -#include "mach/head-ap4evb.txt" -#elif defined(CONFIG_MACH_MACKEREL ) +#ifdef CONFIG_MACH_MACKEREL #define MACH_TYPE MACH_TYPE_MACKEREL#define MEMORY_START 0x40000000#include "mach/head-mackerel.txt" Signature · 6 lines
1.8.2.1 -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
PATCH 14/15 ARM: shmobile: Remove AP4EVB board support
Quoted 25 lines · Simon Horman
Quoted 24 lines · Guennadi Liakhovetski
Hi Simon
Quoted 10 lines · Simon Horman
From: Magnus Damm <[email protected]>
Remove board support for the sh7372 based AP4EVB board
The sh7372 SoC support code is still kept around since it is in use by the Mackerel board which is basically a more recent board where the design is based on AP4EVB.
Signed-off-by Magnus Damm <[email protected]>Signed-off-by Simon Horman <[email protected]>It would be a pity if this patch gets pulled now. We're still discussing with Magnus, I believe. My opinion is, that this board is a good testing platform for V4L2. It is the only board in the mainline, using the CSI2 interface, present on multiple Renesas SoCs, including r8a73a4 (APE6), and (probably, not 100% sure) sh73a0 (AG5), and the IMX074 camera sensor, not present on any other platform. If this board is removed, supporting both CSI2 and IMX074 will become difficult. Besides, AP4EVB is used as an example in my V4L2 clock / async probing patch series:
Quoted 6 lines
Quoted 4 lines
http://www.mail-archive.com/linux-media at vger.kernel.org/msg63174.html
If still possible, would be good to delay removing this board until we complete our discussion.
Does the board still work with the rest of this series applied?
Yes, it does.
Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
Magnus Damm
maintainerPATCH 14/15 ARM: shmobile: Remove AP4EVB board support
Hi Guennadi,
Quoted 27 lines · Guennadi Liakhovetski
Quoted 25 lines · Simon Horman
Quoted 24 lines · Guennadi Liakhovetski
Hi Simon
Quoted 10 lines · Simon Horman
From: Magnus Damm <[email protected]>
Remove board support for the sh7372 based AP4EVB board
The sh7372 SoC support code is still kept around since it is in use by the Mackerel board which is basically a more recent board where the design is based on AP4EVB.
Signed-off-by Magnus Damm <[email protected]>Signed-off-by Simon Horman <[email protected]>It would be a pity if this patch gets pulled now. We're still discussing with Magnus, I believe. My opinion is, that this board is a good testing platform for V4L2. It is the only board in the mainline, using the CSI2 interface, present on multiple Renesas SoCs, including r8a73a4 (APE6), and (probably, not 100% sure) sh73a0 (AG5), and the IMX074 camera sensor, not present on any other platform. If this board is removed, supporting both CSI2 and IMX074 will become difficult. Besides, AP4EVB is used as an example in my V4L2 clock / async probing patch series:
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
http://www.mail-archive.com/linux-media at vger.kernel.org/msg63174.html
If still possible, would be good to delay removing this board until we complete our discussion.
Does the board still work with the rest of this series applied?
Yes, it does.
Uhm, apparently ap4evb_defconfig is broken so I don' t think so.
I cooked up the following fix against renesas-next-20130613:
[PATCH] ARM: shmobile: sh7372 build fix for SUSPEND=n && CPU_IDLE=n
In the future, can you make sure the board is working and we're migrating towards DT? If so we can keep the board.
Thanks,
/ magnus
Magnus Damm
maintainerPATCH 14/15 ARM: shmobile: Remove AP4EVB board support
In reply to Guennadi LiakhovetskiHi Guennadi,
Quoted 24 lines · Guennadi Liakhovetski
Hi Simon
Quoted 10 lines · Simon Horman
From: Magnus Damm <[email protected]>
Remove board support for the sh7372 based AP4EVB board
The sh7372 SoC support code is still kept around since it is in use by the Mackerel board which is basically a more recent board where the design is based on AP4EVB.
Signed-off-by Magnus Damm <[email protected]>Signed-off-by Simon Horman <[email protected]>It would be a pity if this patch gets pulled now. We're still discussing with Magnus, I believe. My opinion is, that this board is a good testing platform for V4L2. It is the only board in the mainline, using the CSI2 interface, present on multiple Renesas SoCs, including r8a73a4 (APE6), and (probably, not 100% sure) sh73a0 (AG5), and the IMX074 camera sensor, not present on any other platform. If this board is removed, supporting both CSI2 and IMX074 will become difficult. Besides, AP4EVB is used as an example in my V4L2 clock / async probing patch series:
Quoted 4 lines
http://www.mail-archive.com/linux-media at vger.kernel.org/msg63174.html
If still possible, would be good to delay removing this board until we complete our discussion.
If fine with keeping the board if someone can show me progress in the area of INTC DT support. Recently I have not seen anything.
So if no one is developing DT support for this board then I can't really see how we will be able to support it in the future with ARM SoC requirements for DT and MULTIPLATFORM...
Cheers,
/ magnus
PATCH 14/15 ARM: shmobile: Remove AP4EVB board support
Quoted 33 lines · Magnus Damm
Hi Guennadi,
Quoted 24 lines · Guennadi Liakhovetski
Hi Simon
Quoted 10 lines · Simon Horman
From: Magnus Damm <[email protected]>
Remove board support for the sh7372 based AP4EVB board
The sh7372 SoC support code is still kept around since it is in use by the Mackerel board which is basically a more recent board where the design is based on AP4EVB.
Signed-off-by Magnus Damm <[email protected]>Signed-off-by Simon Horman <[email protected]>It would be a pity if this patch gets pulled now. We're still discussing with Magnus, I believe. My opinion is, that this board is a good testing platform for V4L2. It is the only board in the mainline, using the CSI2 interface, present on multiple Renesas SoCs, including r8a73a4 (APE6), and (probably, not 100% sure) sh73a0 (AG5), and the IMX074 camera sensor, not present on any other platform. If this board is removed, supporting both CSI2 and IMX074 will become difficult. Besides, AP4EVB is used as an example in my V4L2 clock / async probing patch series:
Quoted 4 lines
http://www.mail-archive.com/linux-media at vger.kernel.org/msg63174.html
If still possible, would be good to delay removing this board until we complete our discussion.
Quoted 6 lines
If fine with keeping the board if someone can show me progress in the area of INTC DT support. Recently I have not seen anything.
So if no one is developing DT support for this board then I can't really see how we will be able to support it in the future with ARM SoC requirements for DT and MULTIPLATFORM...
You seem to be keeping the other sh7372 board currently in the mainline - the mackerel, so, keeping this one as well at least as long as sh7372 is at all supported shouldn't come at an extra cost. As for INTC DT - I think, the original idea was to specify the complete INTC configuration in DT, which looked pretty horrifying. And it shouldn't be needed, since INTC config is per-SoC, not per-board. What if we keep INTC configuration in SoC files and use aux-data to supply platform data to DT device nodes? Would that be difficult to implement?
Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
Magnus Damm
maintainerPATCH 14/15 ARM: shmobile: Remove AP4EVB board support
Hi Guennadi,
Quoted 38 lines · Guennadi Liakhovetski
Quoted 36 lines · Magnus Damm
Hi Guennadi,
Quoted 24 lines · Guennadi Liakhovetski
Hi Simon
Quoted 10 lines · Simon Horman
From: Magnus Damm <[email protected]>
Remove board support for the sh7372 based AP4EVB board
The sh7372 SoC support code is still kept around since it is in use by the Mackerel board which is basically a more recent board where the design is based on AP4EVB.
Signed-off-by Magnus Damm <[email protected]>Signed-off-by Simon Horman <[email protected]>It would be a pity if this patch gets pulled now. We're still discussing with Magnus, I believe. My opinion is, that this board is a good testing platform for V4L2. It is the only board in the mainline, using the CSI2 interface, present on multiple Renesas SoCs, including r8a73a4 (APE6), and (probably, not 100% sure) sh73a0 (AG5), and the IMX074 camera sensor, not present on any other platform. If this board is removed, supporting both CSI2 and IMX074 will become difficult. Besides, AP4EVB is used as an example in my V4L2 clock / async probing patch series:
Quoted 4 lines
http://www.mail-archive.com/linux-media at vger.kernel.org/msg63174.html
If still possible, would be good to delay removing this board until we complete our discussion.
If fine with keeping the board if someone can show me progress in the area of INTC DT support. Recently I have not seen anything.
Quoted 7 lines
Quoted 3 lines
So if no one is developing DT support for this board then I can't really see how we will be able to support it in the future with ARM SoC requirements for DT and MULTIPLATFORM...
You seem to be keeping the other sh7372 board currently in the mainline - the mackerel, so, keeping this one as well at least as long as sh7372 is at all supported shouldn't come at an extra cost.
My plan is to slowly getting rid of sh7372 bit by bit. This since the sh7372 SoC never made it into mass production and it's getting old. As for AP4EVB, it's the first sh7372 board that we ran Linux on. It was soon replaced by Mackerel.
So sh7372 was something we worked on a couple of generations ago. The sh7372 SoC code has issues related to DT for INTC, but that aside, the AP4EVB board has board specific Kconfig bits and other stuff making it difficult to fit into a single kernel binary. So I'd rather say good bye to all this unless someone plans to fix it.
Quoted 3 lines
As for INTC DT - I
think, the original idea was to specify the complete INTC configuration in DT, which looked pretty horrifying.
No, that was not the original idea. The first steps included code to keep the tables in C.
http://www.spinics.net/lists/linux-sh/msg10788.html
Quoted 4 lines
And it shouldn't be needed, since INTC
config is per-SoC, not per-board. What if we keep INTC configuration in SoC files and use aux-data to supply platform data to DT device nodes? Would that be difficult to implement?
Apparently. I made a prototype ages ago. Since then several people have been requested to work on this, but unfortunately no useful output has come from any of all this.
So Guennadi, if you want to keep this board then you have to step up and fix things. If not then there is no point in keeping it.
Cheers,
/ magnus
PATCH 14/15 ARM: shmobile: Remove AP4EVB board support
On Mon, 17 Jun 2013, Magnus Damm wrote:
[snip]
Quoted 2 lines
So Guennadi, if you want to keep this board then you have to step up and fix things. If not then there is no point in keeping it.
Ok, after a private discussion we agreed to remove the board, which will also make the drivers for the Renesas sh-/r-mobile CSI2 interface and for the Sony IMX074 sensor untestable and susceptible to removal. Also multi-subdevice support in soc-camera now will lose its only use and can become broken. I will also drop CSI2 and AP4EVB patches from my V4L2 clock / async probing series.
Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
Magnus Damm
maintainerPATCH 14/15 ARM: shmobile: Remove AP4EVB board support
Quoted 7 lines · Guennadi Liakhovetski
On Mon, 17 Jun 2013, Magnus Damm wrote:
[snip]
Quoted 2 lines
So Guennadi, if you want to keep this board then you have to step up and fix things. If not then there is no point in keeping it.
Quoted 6 lines
Ok, after a private discussion we agreed to remove the board, which will also make the drivers for the Renesas sh-/r-mobile CSI2 interface and for the Sony IMX074 sensor untestable and susceptible to removal. Also multi-subdevice support in soc-camera now will lose its only use and can become broken. I will also drop CSI2 and AP4EVB patches from my V4L2 clock / async probing series.
Thanks for writing this summary. It matches my understanding.
It is unfortunate, but it seems to me that the camera sensor has to be tested on another platform. Regarding the CSI2 interface, as we discussed, this IP still exists in newer SoCs so because of that I recommend you to try to request newer hardware for future testing.
About multi-subdevice and your ongoing work with V4L2 clock / async probing, please select a more recent hardware platform.
Thanks,
/ magnus
PATCH 14/15 ARM: shmobile: Remove AP4EVB board support
In reply to Magnus DammQuoted 5 lines · Magnus Damm
Quoted 2 lines
If still possible, would be good to delay removing this board until we complete our discussion.
If fine with keeping the board if someone can show me progress in the area of INTC DT support. Recently I have not seen anything.
As mentioned the last time we discussed this, I'm fine with using the existing code and "legacy" irqdomain for the older INTC implementations, as long as all the new ones can use your new generic code.
Arnd
Magnus Damm
maintainerPATCH 14/15 ARM: shmobile: Remove AP4EVB board support
Hi Arnd,
Quoted 10 lines · Arnd Bergmann
Quoted 5 lines · Magnus Damm
Quoted 2 lines
If still possible, would be good to delay removing this board until we complete our discussion.
If fine with keeping the board if someone can show me progress in the area of INTC DT support. Recently I have not seen anything.
As mentioned the last time we discussed this, I'm fine with using the existing code and "legacy" irqdomain for the older INTC implementations, as long as all the new ones can use your new generic code.
Thanks for explaining once again. Do you have any issues with us reducing the number of supported boards and/or SoCs?
/ magnus
PATCH 14/15 ARM: shmobile: Remove AP4EVB board support
Quoted 8 lines · Magnus Damm
Quoted 7 lines · Arnd Bergmann
Quoted 5 lines · Magnus Damm
Quoted 2 lines
If still possible, would be good to delay removing this board until we complete our discussion.
If fine with keeping the board if someone can show me progress in the area of INTC DT support. Recently I have not seen anything.
Quoted 6 lines
Quoted 3 lines
As mentioned the last time we discussed this, I'm fine with using the existing code and "legacy" irqdomain for the older INTC implementations, as long as all the new ones can use your new generic code.
Thanks for explaining once again. Do you have any issues with us reducing the number of supported boards and/or SoCs?
No, I'm sure you know who the users of the board files in upstream kernels are. If someone comes up with a good reason why one of the files is needed after all, we can always revert the removal at a later point.
I'm definitely in favor of removing known unused code that gets in the way of progress and adding clean code as quickly as we can review it.
Arnd
PATCH 14/15 ARM: shmobile: Remove AP4EVB board support
Quoted 16 lines · Arnd Bergmann
Quoted 8 lines · Magnus Damm
Quoted 7 lines · Arnd Bergmann
Quoted 5 lines · Magnus Damm
Quoted 2 lines
If still possible, would be good to delay removing this board until we complete our discussion.
If fine with keeping the board if someone can show me progress in the area of INTC DT support. Recently I have not seen anything.
Quoted 6 lines
Quoted 3 lines
As mentioned the last time we discussed this, I'm fine with using the existing code and "legacy" irqdomain for the older INTC implementations, as long as all the new ones can use your new generic code.
Thanks for explaining once again. Do you have any issues with us reducing the number of supported boards and/or SoCs?
Quoted 6 lines
No, I'm sure you know who the users of the board files in upstream kernels are. If someone comes up with a good reason why one of the files is needed after all, we can always revert the removal at a later point.
I'm definitely in favor of removing known unused code that gets in the way of progress and adding clean code as quickly as we can review it.
Hi Arnd,
thanks for clarifying this. I am in complete agreement.
PATCH 15/15 ARM: shmobile: Remove Bonito board support
In reply to Simon HormanFrom: Kuninori Morimoto <[email protected]>
Remove board support for the r8a7740 based Bonito board
The r8a7740 SoC support code is still kept around since it is in use by the Armadillo800eva board which is basically a more recent board where the design is based on Bonito.
Signed-off-by Kuninori Morimoto <[email protected]>
Signed-off-by Simon Horman <[email protected]>
--- arch/arm/configs/bonito_defconfig | 72 ----- arch/arm/mach-shmobile/Kconfig | 6 - arch/arm/mach-shmobile/Makefile | 1 - arch/arm/mach-shmobile/Makefile.boot | 1 - arch/arm/mach-shmobile/board-bonito.c | 502 ---------------------------------- 5 files changed, 582 deletions(-) delete mode 100644 arch/arm/configs/bonito_defconfig delete mode 100644 arch/arm/mach-shmobile/board-bonito.c
arch/arm/configs/bonito_defconfig deleted +0 -72
@@ -1,72 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=16 -# CONFIG_UTS_NS is not set -# CONFIG_IPC_NS is not set -# CONFIG_USER_NS is not set -# CONFIG_PID_NS is not set -CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="" -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_SHMOBILE=y -CONFIG_ARCH_R8A7740=y -CONFIG_MACH_BONITO=y -# CONFIG_SH_TIMER_TMU is not set -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_FORCE_MAX_ZONEORDER=12 -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttySC5,115200 earlyprintk=sh-sci.5,115200 ignore_loglevel" -CONFIG_KEXEC=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -# CONFIG_SUSPEND is not set -CONFIG_PM_RUNTIME=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_FIRMWARE_IN_KERNEL is not set -CONFIG_MTD=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_ARM_INTEGRATOR=y -CONFIG_MTD_BLOCK2MTD=y -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -# CONFIG_SCSI_LOWLEVEL is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_LEGACY_PTYS is not set -CONFIG_SERIAL_SH_SCI=y -CONFIG_SERIAL_SH_SCI_NR_UARTS=9 -CONFIG_SERIAL_SH_SCI_CONSOLE=y -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_SH_MOBILE=y -CONFIG_GPIO_SYSFS=y -# CONFIG_HWMON is not set -# CONFIG_MFD_SUPPORT is not set -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -CONFIG_UIO=y -CONFIG_UIO_PDRV=y -CONFIG_UIO_PDRV_GENIRQ=y -# CONFIG_DNOTIFY is not set -# CONFIG_INOTIFY_USER is not set -CONFIG_TMPFS=y -# CONFIG_MISC_FILESYSTEMS is not set -# CONFIG_ENABLE_WARN_DEPRECATED is not set -# CONFIG_ENABLE_MUST_CHECK is not set -# CONFIG_ARM_UNWIND is not set
arch/arm/mach-shmobile/Kconfig +0 -6
@@ -95,12 +95,6 @@ config MACH_KOTA2 select ARCH_REQUIRE_GPIOLIB select REGULATOR_FIXED_VOLTAGE if REGULATOR -config MACH_BONITO - bool "bonito board" - depends on ARCH_R8A7740 - select ARCH_REQUIRE_GPIOLIB - select REGULATOR_FIXED_VOLTAGE if REGULATOR - config MACH_ARMADILLO800EVA bool "Armadillo-800 EVA board" depends on ARCH_R8A7740
arch/arm/mach-shmobile/Makefile +0 -1
@@ -39,7 +39,6 @@ obj-$(CONFIG_MACH_AG5EVM) += board-ag5evm.o obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o obj-$(CONFIG_MACH_KOTA2) += board-kota2.o -obj-$(CONFIG_MACH_BONITO) += board-bonito.o obj-$(CONFIG_MACH_BOCKW) += board-bockw.o obj-$(CONFIG_MACH_MARZEN) += board-marzen.o obj-$(CONFIG_MACH_MARZEN_REFERENCE) += board-marzen-reference.o
arch/arm/mach-shmobile/Makefile.boot +0 -1
@@ -5,7 +5,6 @@ loadaddr-$(CONFIG_MACH_APE6EVM) += 0x40008000 loadaddr-$(CONFIG_MACH_ARMADILLO800EVA) += 0x40008000 loadaddr-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += 0x40008000 loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000 -loadaddr-$(CONFIG_MACH_BONITO) += 0x40008000 loadaddr-$(CONFIG_MACH_KOTA2) += 0x41008000 loadaddr-$(CONFIG_MACH_KZM9D) += 0x40008000 loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000
arch/arm/mach-shmobile/board-bonito.c deleted +0 -502
502 lines not on this page · raw message
Signature · 1 line
1.8.2.1
Quoted 9 lines · Simon Horman
Hi Olof, Hi Arnd,
This pull request is based on renesas-pinmux-for-v3.11, which you have already pulled, in order to provide pre-requisites.
The following changes since commit
5fcf4a3c3a5bc08bf72a50ef1332501a3c1b96bb:ARM: shmobile: marzen: Use
RCAR_GP_PINmacro (2013-06-05 17:18:24 +0900)
Quoted 7 lines
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.gittags/renesas-cleanup-boot-for-v3.11for you to fetch changes up to
9da629661d207299ad119a6735eb2411f54fd45f:ARM: shmobile: Remove Bonito board support (2013-06-13 14:26:04 +0900)
Sorry about this but it seems that there is still some discussion, which I was not previously aware of, about the patch to remove the AP4EVB board.
Please ignore this pull-request for now.
Quoted 67 lines
----------------------------------------------------------------
Renesas ARM based SoC boot cleanup for v3.11Work by Magnus Damm and others to clean up the boot of and move things closer to supporting MULTIARCH.
As a side effect of this work it was decided to remove support for two boards, Bonito and APE4EVM. Those patches are included in this series as they depend on earlier patches in the series.
----------------------------------------------------------------
Kuninori Morimoto (1):
ARM: shmobile: Remove Bonito board supportMagnus Damm (14):
ARM: shmobile: uImage load address rework
ARM: shmobile: Let romImage rely on default ATAGS
ARM: shmobile: Remove romImageCONFIG_MEMORY_START
ARM: shmobile: Rework sh7372 sleep code to usevirt_to_phys()
ARM: shmobile: Add SMP boot function and argument
ARM: shmobile: Add SCU boot function using argument
ARM: shmobile: r8a7779 SMP with SCU boot fn and args
ARM: shmobile: sh73a0 SMP with SCU boot fn and args
ARM: shmobile: EMEV2 SMP with SCU boot fn and args
ARM: shmobile: Remove old SCU boot code
ARM: shmobile: EnableARM_PATCH_PHYS_VIRT
ARM: shmobile: Remove MEMORY_START/SIZE
ARM: shmobile: Removemach/memory.h
ARM: shmobile: Remove AP4EVB board supportarch/arm/Kconfig | 2 +- arch/arm/boot/compressed/head-shmobile.S | 21 +- arch/arm/configs/ap4evb_defconfig | 56 - arch/arm/configs/bonito_defconfig | 72 -- arch/arm/mach-shmobile/Kconfig | 58 - arch/arm/mach-shmobile/Makefile | 2 - arch/arm/mach-shmobile/Makefile.boot | 18 +- arch/arm/mach-shmobile/board-ap4evb.c | 1310 -------------------- arch/arm/mach-shmobile/board-bonito.c | 502 -------- arch/arm/mach-shmobile/headsmp-scu.S | 29 +- arch/arm/mach-shmobile/headsmp.S | 13 +- arch/arm/mach-shmobile/include/mach/common.h | 6 +- .../arm/mach-shmobile/include/mach/head-ap4evb.txt | 93 -- arch/arm/mach-shmobile/include/mach/memory.h | 7 - arch/arm/mach-shmobile/include/mach/mmc-ap4eb.h | 29 - arch/arm/mach-shmobile/include/mach/mmc.h | 4 +- arch/arm/mach-shmobile/include/mach/sh7372.h | 2 + arch/arm/mach-shmobile/include/mach/zboot.h | 6 +- arch/arm/mach-shmobile/pm-sh7372.c | 3 + arch/arm/mach-shmobile/sleep-sh7372.S | 5 +- arch/arm/mach-shmobile/smp-emev2.c | 6 +- arch/arm/mach-shmobile/smp-r8a7779.c | 6 +- arch/arm/mach-shmobile/smp-sh73a0.c | 6 +- 23 files changed, 68 insertions(+), 2188 deletions(-) delete mode 100644 arch/arm/configs/ap4evb_defconfig delete mode 100644 arch/arm/configs/bonito_defconfig delete mode 100644 arch/arm/mach-shmobile/board-ap4evb.c delete mode 100644 arch/arm/mach-shmobile/board-bonito.c delete mode 100644 arch/arm/mach-shmobile/include/mach/head-ap4evb.txt delete mode 100644 arch/arm/mach-shmobile/include/mach/memory.h delete mode 100644 arch/arm/mach-shmobile/include/mach/mmc-ap4eb.h--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html