redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

Renesas ARM Based SoC Soc Cleanups for v3.19

Browse source 
* Remove sh73a0_init_delay and r8a7778_init_delay wrappers
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUUGvGAAoJENfPZGlqN0++G/MP/0gIHp3/6CkiAgFs4q1WR0/c
 B2LyXiImrFygj8WJY/mSHq+M6/RDO7yr/daurY5cE3bvxqXvN3pIZPnoZ0IPHvR9
 PclgJ0Z/2fXFHAmzVFGSDTpq6I40rgvb68s9wsjc8FOZ8rE1ujnSaW/DBYVnYKXo
 cZkOYZ2rz6FtuflESm6Ce2YrFuitSu+BrowVQ3UgXxXVlgephRBhiVTGGk2x/v0I
 tfaV1akhjnihrD2q13ziDPk8UT8ntVrYc8cXUSvGEfitfkkcP8tCPxhFeRF1juz7
 JrZXy3J9cJzFZwfFHydpHepxwxvJIPbWFO9xE5Dryje0XBu/j0I5GcU243wQDrg+
 EyKb0mGT37Bt5XkqpPsYDk3Z0qeUwS1mEMa03x6Vf9shL7CvgWsaTFJnFr9N0n6Y
 q3cpHb4En2ESxt0SNkwQB/82wbMRZHBjyNDFhaMfSZWpVeH2DiiwDycmzOpf3dAo
 wKl+Iwb/dMtuG43VOFIPaKybwi1a1uraMvWBGS+dNxvLifb1zJ2oROKnCDGQsAjo
 782mBziBTnfZnZDjRteAasJb8mlLZb53oJNeDO5YDz4q/V6JO5w1gmpxYKTCnw9u
 fUumc3f04Avw5BnpbXdcgtVqOxihDPtFJqfOLTYhpvMNQzl4l0VpuhUnC2XOPGrq
 cRWzM6nswJciFU24O6Hr
 =uz1H
 -----END PGP SIGNATURE-----

Merge tag 'renesas-soc-cleanups-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup

Merge "Renesas ARM Based SoC Soc Cleanups for v3.19" from Simon Horman:

* Remove sh73a0_init_delay and r8a7778_init_delay wrappers

* tag 'renesas-soc-cleanups-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: sh73a0: Remove wrapper sh73a0_init_delay()
  ARM: shmobile: r8a7778: Remove wrapper r8a7778_init_delay()

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2014-11-04 14:39:18 -08:00
parent a26c651126 dac95365dc
commit 1d27f25030
4 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/mach-shmobile/r8a7778.h
View file

@ -71,7 +71,6 @@ extern void r8a7778_add_standard_devices_dt(void);
extern void r8a7778_add_dt_devices(void);
extern void r8a7778_init_late(void);
extern void r8a7778_init_delay(void);
extern void r8a7778_init_irq_dt(void);
extern void r8a7778_clock_init(void);
extern void r8a7778_init_irq_extpin(int irlm);

7
arch/arm/mach-shmobile/setup-r8a7778.c
View file

@ -572,11 +572,6 @@ void __init r8a7778_init_irq_extpin(int irlm)
&irqpin_platform_data, sizeof(irqpin_platform_data));
}
void __init r8a7778_init_delay(void)
{
shmobile_init_delay();
}
#ifdef CONFIG_USE_OF
#define INT2SMSKCR0 0x82288 /* 0xfe782288 */
#define INT2SMSKCR1 0x8228c /* 0xfe78228c */
@ -608,7 +603,7 @@ static const char *r8a7778_compat_dt[] __initdata = {
};
DT_MACHINE_START(R8A7778_DT, "Generic R8A7778 (Flattened Device Tree)")
.init_early = r8a7778_init_delay,
.init_early = shmobile_init_delay,
.init_irq = r8a7778_init_irq_dt,
.init_late = shmobile_init_late,
.dt_compat = r8a7778_compat_dt,

9
arch/arm/mach-shmobile/setup-sh73a0.c
View file

@ -740,17 +740,12 @@ void __init sh73a0_add_standard_devices(void)
ARRAY_SIZE(sh73a0_late_devices));
}
void __init sh73a0_init_delay(void)
{
shmobile_init_delay();
}
/* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */
void __init __weak sh73a0_register_twd(void) { }
void __init sh73a0_earlytimer_init(void)
{
sh73a0_init_delay();
shmobile_init_delay();
sh73a0_clock_init();
shmobile_earlytimer_init();
sh73a0_register_twd();
@ -783,7 +778,7 @@ static const char *sh73a0_boards_compat_dt[] __initdata = {
DT_MACHINE_START(SH73A0_DT, "Generic SH73A0 (Flattened Device Tree)")
.smp = smp_ops(sh73a0_smp_ops),
.map_io = sh73a0_map_io,
.init_early = sh73a0_init_delay,
.init_early = shmobile_init_delay,
.init_machine = sh73a0_add_standard_devices_dt,
.init_late = shmobile_init_late,
.dt_compat = sh73a0_boards_compat_dt,

1
arch/arm/mach-shmobile/sh73a0.h
View file

@ -71,7 +71,6 @@ enum {
#define SH73A0_PINT0_IRQ(irq) ((irq) + 700)
#define SH73A0_PINT1_IRQ(irq) ((irq) + 732)
extern void sh73a0_init_delay(void);
extern void sh73a0_init_irq(void);
extern void sh73a0_init_irq_dt(void);
extern void sh73a0_map_io(void);