2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 02:34:01 +08:00
linux-next/arch/arm/mach-shmobile/include/mach
Olof Johansson 677b5c48bd Second Round of Renesas ARM-based SoC updates for v3.11
* Ether device name updates for r8a7778 and r8a7779 Sergei Shtylyov
 * Extended clock and driver coverage for r8a7778 by Goda-san and Morimoto-san
 * Extended clock and coverage for r8a73a4 and r8a7790 by  Guennadi Liakhovetski
 * HSCIF support for r8a7790 by Ulrich Hecht
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABAgAGBQJRuWnoAAoJENfPZGlqN0++mkAP/iOpvtb8sND7n9g8SHE7/6W5
 sXHWSTbeGlF0ST47EsIdrmAcGAWMelg8GF0F7hBEwzb3zl+MPBnopI/RAVphVhIy
 6Z1p1wuDvV4Zj1JsHNB3Y1NjHPO3be+14TZyTTwHpV9Ri1navYNB9jMnhShJHsYq
 qfP9CryfXJgxv9YKyAv90UUvVfGNTQxRpEqkEYCDHtAJoWIcw3H4GpaxejTUp1xv
 0L2/lvfeQbm4lUsd0i3I5Lm7+IQ375/nzQc2k9wqTNsHdAoeHC2LvKKzq5NXUv+/
 4U+bmla6DxDioVzcYutCnOrbxNp0iIaNZFJqaHaxlllG45oSqOLFtwAXRLVW7YXO
 gP5ZxeX3ITaLNxia9KZvwPP77guZQ8XS1TQ+vU0noDkA3V4qKbYDvvg7FkpUL+H4
 sPhCFx2VG3WWStWas4IA9Db04z9m5bReN1BsQeTSaRrjA19ctkuOsaLDrW83ngvu
 xQ754d26Yrmy/HaUojqVqR/oI+e6h3ps8lCtAKyi7MT7DTDve5EEMdw8ukte8RY0
 v7Ad2bKFBdibYAH4Mfmmn0OX/uKZCDur0lMgUioi38Cto7SuIENnwm3vz0lg0t6x
 79L3awlkaMP/Hvt4U9sLtV4bzyo1FVNzntmu0vaQDFSk1o29YSoNhR//WL67CeFr
 grNpVRBO9g9iEx78yGHV
 =wQKf
 -----END PGP SIGNATURE-----

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

From Simon Horman:
Second Round of Renesas ARM-based SoC updates for v3.11

* Ether device name updates for r8a7778 and r8a7779 Sergei Shtylyov
* Extended clock and driver coverage for r8a7778 by Goda-san and Morimoto-san
* Extended clock and coverage for r8a73a4 and r8a7790 by  Guennadi Liakhovetski
* HSCIF support for r8a7790 by Ulrich Hecht

* tag 'renesas-soc2-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7790: add clock definitions and aliases for MMCIF and SDHI
  ARM: shmobile: r8a73a4: add clock definitions and aliases for MMCIF and SDHI
  ARM: shmobile: r8a7778: add support MMC driver
  ARM: shmobile: r8a7778: add support HSPI driver
  ARM: shmobile: r8a7778: add support I2C driver
  ARM: shmobile: r8a7778: add support MMC clock
  ARM: shmobile: r8a7778: add support HSPI clock
  ARM: shmobile: r8a7778: add support I2C clock
  ARM: shmobile: r8a7790: HSCIF support
  ARM: shmobile: r8a7778: fix Ether device name
  ARM: shmobile: r8a7779: fix Ether device name

Signed-off-by: Olof Johansson <olof@lixom.net>

Conflicts:
	arch/arm/mach-shmobile/clock-r8a7778.c
	arch/arm/mach-shmobile/include/mach/r8a7778.h
2013-06-14 18:00:00 -07:00
..
clkdev.h ARM: mach-shmobile: SH-Mobile G3 support. 2010-02-08 12:44:11 +09:00
clock.h ARM: shmobile: use do{ }while() on SH_CLK_SET_RATIO() 2013-06-07 14:24:42 +09:00
common.h ARM: arm-soc platform updates for 3.10, part 2 2013-05-07 10:57:51 -07:00
dma-register.h ARM: shmobile: add common DMAEngine definitions 2012-06-30 15:03:16 +02:00
dma.h ARM: mach-shmobile: SH-Mobile G3 support. 2010-02-08 12:44:11 +09:00
emev2.h ARM: SoC: convert shmobile SMP to SMP operations 2012-09-14 11:14:58 +02:00
hardware.h ARM: mach-shmobile: Rely on run-time IRQ handlers 2011-01-07 10:43:02 +09:00
head-ap4evb.txt ARM: mach-shmobile: ap4evb, mackerel: fixup scif initialisation for zboot 2011-05-24 12:15:20 +09:00
head-mackerel.txt ARM: mach-shmobile: ap4evb, mackerel: fixup scif initialisation for zboot 2011-05-24 12:15:20 +09:00
intc.h ARM: mach-shmobile: Introduce INTC_IRQ_PINS_16H 2012-04-11 12:11:48 +02:00
irqs.h ARM: shmobile: add GPIO IRQ macro 2013-06-04 21:03:57 +09:00
memory.h ARM: mach-shmobile: Setup consistent dma size at boot time 2011-08-22 12:00:12 +00:00
mmc-ap4eb.h mmc, ARM: Rename SuperH Mobile ARM zboot helpers 2011-03-25 01:24:57 +09:00
mmc-mackerel.h mmc, ARM: Rename SuperH Mobile ARM zboot helpers 2011-03-25 01:24:57 +09:00
mmc.h ARM: mach-shmobile: Correctly check for CONFIG_MACH_MACKEREL 2011-04-06 11:08:20 -07:00
pm-rmobile.h ARM: shmobile: Rework adding devices to PM domains on Mackerel 2012-09-04 01:45:00 +02:00
r8a73a4.h ARM: shmobile: r8a73a4: Remove all GPIO enums 2013-04-03 10:30:43 +09:00
r8a7740.h ARM: shmobile: r8a7740: Remove all GPIOs 2013-06-05 17:17:10 +09:00
r8a7778.h Second Round of Renesas ARM-based SoC updates for v3.11 2013-06-14 18:00:00 -07:00
r8a7779.h ARM: shmobile: Marzen: pass platform data to USB PHY device 2013-06-11 16:10:48 +09:00
r8a7790.h ARM: shmobile: r8a7790: Remove all GPIOs 2013-06-05 17:17:12 +09:00
sdhi-sh7372.h ARM: 6886/1: mmc, Add zboot from eSD support for SuperH Mobile ARM 2011-06-29 10:00:52 +01:00
sdhi.h ARM: 6886/1: mmc, Add zboot from eSD support for SuperH Mobile ARM 2011-06-29 10:00:52 +01:00
sh73a0.h Merge branch 'soc' into pinmux-base 2013-04-02 11:08:34 +09:00
sh7372.h ARM: shmobile: sh7372: Remove all GPIOs 2013-06-04 21:04:21 +09:00
system.h Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
timex.h ARM: mach-shmobile: SH-Mobile G3 support. 2010-02-08 12:44:11 +09:00
uncompress.h ARM: remove unused arch_decomp_wdog() 2013-01-11 10:54:03 +08:00
zboot_macros.h ARM: 6514/1: mach-shmobile: Add zboot support for SuperH Mobile ARM 2010-12-05 08:40:21 +00:00
zboot.h ARM: mach-shmobile: Correctly check for CONFIG_MACH_MACKEREL 2011-04-06 11:08:20 -07:00