summaryrefslogtreecommitdiff
path: root/arch/arm/mach-shmobile/include
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-04-09 14:44:07 +0200
committerArnd Bergmann <arnd@arndb.de>2013-04-09 14:44:07 +0200
commit9df00f634a44a0191dcf992a944527a220a5baad (patch)
tree3937e6dd237dd9c420d1d11d048a28286db40cc7 /arch/arm/mach-shmobile/include
parent2fce7e1106dd6dcbe3c72cec2ea81b452a50de6e (diff)
parent524219146a89aee5366326c225ccd71231419d89 (diff)
Merge tag 'renesas-soc-r8a7778-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc2
From Simon Horman <horms+renesas@verge.net.au>: Renesas ARM r8a7778 SoC update for v3.10 Update to the r8a7778 SoC: * Add SH Ethernet support * Add r8a7778_init_irq_extpin() to allow configuration of IRQ0 - IRQ3 - This is a requirement for SMSC ethernet support * Cleanup: remove PLATFORM_INFO macro This pull request is based on: git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas renesas-soc2-for-v3.10 * tag 'renesas-soc-r8a7778-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: R8A7778: add Ether support ARM: shmobile: r8a7778: add r8a7778_init_irq_extpin() ARM: shmobile: r8a7778: remove pointless PLATFORM_INFO() Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-shmobile/include')
-rw-r--r--arch/arm/mach-shmobile/include/mach/r8a7778.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7778.h b/arch/arm/mach-shmobile/include/mach/r8a7778.h
index a755dcafef4d..951149e6bcca 100644
--- a/arch/arm/mach-shmobile/include/mach/r8a7778.h
+++ b/arch/arm/mach-shmobile/include/mach/r8a7778.h
@@ -18,11 +18,15 @@
#ifndef __ASM_R8A7778_H__
#define __ASM_R8A7778_H__
+#include <linux/sh_eth.h>
+
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_init_delay(void);
extern void r8a7778_init_irq(void);
extern void r8a7778_init_irq_dt(void);
extern void r8a7778_clock_init(void);
+extern void r8a7778_init_irq_extpin(int irlm);
#endif /* __ASM_R8A7778_H__ */