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

Commit 1d27f250 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-soc-cleanups-for-v3.19' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents a26c6511 dac95365

arch/arm/mach-shmobile/r8a7778.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

arch/arm/mach-shmobile/setup-r8a7778.c

+1 −6
Original line number Diff line number Diff line
@@ -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,

arch/arm/mach-shmobile/setup-sh73a0.c

+2 −7
Original line number Diff line number Diff line
@@ -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,

arch/arm/mach-shmobile/sh73a0.h

+0 −1
Original line number Diff line number Diff line
@@ -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);