diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-12 20:35:40 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-12 20:35:40 +0400 |
| commit | edf4f16f2709abcce37f10ac0c64d06d540ed6b2 (patch) | |
| tree | 216a793fe9ef22a6f98586a61b2e117bdbe7f7bf /arch/arm/mach-shmobile/include | |
| parent | 3ae22f4d94e5b69b8d9b8b1ce2702043e4aca43d (diff) | |
| parent | 1b55353c9214788b0d0797a5fd4585af1557a12c (diff) | |
| download | linux-edf4f16f2709abcce37f10ac0c64d06d540ed6b2.tar.xz | |
Merge tag 'renesas-r8a7779-multiplatform2-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
Merge "Second Round of Renesas ARM Based SoC r8a7779-multiplatform
Updates for v3.17" from Simon Horman:
- Move r8a7779.h out of mach directory.
This is part of a multi-stage effort to move headers
out of that directory.
* tag 'renesas-r8a7779-multiplatform2-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: Move r8a7779.h
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile/include')
| -rw-r--r-- | arch/arm/mach-shmobile/include/mach/r8a7779.h | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7779.h b/arch/arm/mach-shmobile/include/mach/r8a7779.h deleted file mode 100644 index 5415c719dc19..000000000000 --- a/arch/arm/mach-shmobile/include/mach/r8a7779.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef __ASM_R8A7779_H__ -#define __ASM_R8A7779_H__ - -#include <linux/sh_clk.h> - -/* HPB-DMA slave IDs */ -enum { - HPBDMA_SLAVE_DUMMY, - HPBDMA_SLAVE_SDHI0_TX, - HPBDMA_SLAVE_SDHI0_RX, -}; - -extern void r8a7779_init_irq_extpin(int irlm); -extern void r8a7779_init_irq_extpin_dt(int irlm); -extern void r8a7779_init_irq_dt(void); -extern void r8a7779_map_io(void); -extern void r8a7779_earlytimer_init(void); -extern void r8a7779_add_early_devices(void); -extern void r8a7779_add_standard_devices(void); -extern void r8a7779_add_standard_devices_dt(void); -extern void r8a7779_init_late(void); -extern u32 r8a7779_read_mode_pins(void); -extern void r8a7779_clock_init(void); -extern void r8a7779_pinmux_init(void); -extern void r8a7779_pm_init(void); -extern void r8a7779_register_twd(void); - -#ifdef CONFIG_PM -extern void __init r8a7779_init_pm_domains(void); -#else -static inline void r8a7779_init_pm_domains(void) {} -#endif /* CONFIG_PM */ - -extern struct smp_operations r8a7779_smp_ops; - -#endif /* __ASM_R8A7779_H__ */ |