diff options
author | Simon Horman <horms+renesas@verge.net.au> | 2013-04-02 06:08:34 +0400 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-04-02 06:08:34 +0400 |
commit | 809609a5d8427b0025304dbb69a84a692d11c4f9 (patch) | |
tree | 95a544cda32d36e4a9ee1ce27c527406c54d91b4 /arch/arm/mach-shmobile/include/mach/sh73a0.h | |
parent | a4339a9cb46644e19278e4dd5d89b262a37cb0b0 (diff) | |
parent | 8585deb18580d04209a2986430aa0959ef38fce2 (diff) | |
download | linux-809609a5d8427b0025304dbb69a84a692d11c4f9.tar.xz |
Merge branch 'soc' into pinmux-base
Conflicts:
drivers/pinctrl/sh-pfc/pfc-r8a7740.c
This merge is to provide r8a73a4 SoC files, which are added in the
soc branch and depended on by r8a73a4 pfc-changes which are to
be added to the pinmux branch.
Diffstat (limited to 'arch/arm/mach-shmobile/include/mach/sh73a0.h')
-rw-r--r-- | arch/arm/mach-shmobile/include/mach/sh73a0.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/sh73a0.h b/arch/arm/mach-shmobile/include/mach/sh73a0.h index fbc1584d6712..eb7a4320d487 100644 --- a/arch/arm/mach-shmobile/include/mach/sh73a0.h +++ b/arch/arm/mach-shmobile/include/mach/sh73a0.h @@ -444,6 +444,21 @@ 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); +extern void sh73a0_earlytimer_init(void); +extern void sh73a0_add_early_devices(void); +extern void sh73a0_add_standard_devices(void); +extern void sh73a0_add_standard_devices_dt(void); +extern void sh73a0_clock_init(void); +extern void sh73a0_pinmux_init(void); +extern void sh73a0_pm_init(void); +extern struct clk sh73a0_extal1_clk; +extern struct clk sh73a0_extal2_clk; +extern struct clk sh73a0_extcki_clk; +extern struct clk sh73a0_extalr_clk; extern struct smp_operations sh73a0_smp_ops; #endif /* __ASM_SH73A0_H__ */ |