| From d1f52e9b9408ad362c1aa5b208ba02161ca886c3 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Tue, 30 Jul 2013 00:02:24 -0700 |
| Subject: ARM: shmobile: r8a7778: cleanup registration of hspi |
| |
| sh-hspi driver which doesn't need platform data at the time of |
| registration can be registerd on SoC. |
| And, registering these drivers in the SoC code can avoid |
| unwanted device numbering issue. |
| (ex. the hspi2 device number will be spi.0 if hspi2 only registered) |
| This patch registers it on SoC code as cleanup C code |
| |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 3c7b5362323cd4b5d09a5b21ba8e74b3de05fc73) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-bockw.c | 1 - |
| arch/arm/mach-shmobile/include/mach/r8a7778.h | 1 - |
| arch/arm/mach-shmobile/setup-r8a7778.c | 5 ++++- |
| 3 files changed, 4 insertions(+), 3 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c |
| index 12b7396b..07009f5f 100644 |
| --- a/arch/arm/mach-shmobile/board-bockw.c |
| +++ b/arch/arm/mach-shmobile/board-bockw.c |
| @@ -206,7 +206,6 @@ static void __init bockw_init(void) |
| r8a7778_init_irq_extpin(1); |
| r8a7778_add_standard_devices(); |
| r8a7778_add_ether_device(ðer_platform_data); |
| - r8a7778_add_hspi_device(0); |
| |
| i2c_register_board_info(0, i2c0_devices, |
| ARRAY_SIZE(i2c0_devices)); |
| diff --git a/arch/arm/mach-shmobile/include/mach/r8a7778.h b/arch/arm/mach-shmobile/include/mach/r8a7778.h |
| index 9874511b..41fd6da2 100644 |
| --- a/arch/arm/mach-shmobile/include/mach/r8a7778.h |
| +++ b/arch/arm/mach-shmobile/include/mach/r8a7778.h |
| @@ -23,7 +23,6 @@ |
| extern void r8a7778_add_standard_devices(void); |
| extern void r8a7778_add_standard_devices_dt(void); |
| extern void r8a7778_add_ether_device(struct sh_eth_plat_data *pdata); |
| -extern void r8a7778_add_hspi_device(int id); |
| extern void r8a7778_add_dt_devices(void); |
| |
| extern void r8a7778_init_late(void); |
| diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c |
| index ce3b54df..1a154d4a 100644 |
| --- a/arch/arm/mach-shmobile/setup-r8a7778.c |
| +++ b/arch/arm/mach-shmobile/setup-r8a7778.c |
| @@ -272,7 +272,7 @@ static struct resource hspi_resources[] __initdata = { |
| DEFINE_RES_IRQ(gic_iid(0x75)), |
| }; |
| |
| -void __init r8a7778_add_hspi_device(int id) |
| +void __init r8a7778_register_hspi(int id) |
| { |
| BUG_ON(id < 0 || id > 2); |
| |
| @@ -312,6 +312,9 @@ void __init r8a7778_add_standard_devices(void) |
| r8a7778_register_i2c(1); |
| r8a7778_register_i2c(2); |
| r8a7778_register_i2c(3); |
| + r8a7778_register_hspi(0); |
| + r8a7778_register_hspi(1); |
| + r8a7778_register_hspi(2); |
| } |
| |
| void __init r8a7778_init_late(void) |
| -- |
| 1.8.4.3.gca3854a |
| |