openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Renesas ARM Based SoC Updates for v3.18 

* Remove unnecessary nr_irqs initialisation on sh73a0, sh7372,
   and r8a7779 SoCs
 * Use defines hardcoded numbers for DMA
 * Rework multiplatform include workaround
 * Correctly use shmobile_init_late on a wider range of SoCs
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJT9p4BAAoJENfPZGlqN0++jvIP/jKnKjrW6AIPAh6y3L8pWNpr
 z9Nrg0DuEki0VlRdRgmVUYgCVN0agQCWsm4MxGXmTxR5H82IsOn7SmgcAzpPXkj+
 eRk1uDnStz8s7BvGy2CB7By8u6cIVRsppj+kEs4KRK8uJcF5Si4VKgRpoofqnCMD
 NODCKS9yHBvsj0w1wCb0w0VTlvs1ywhKwEKCMk4qX8aFAzsH0MbmxE8O+juK98ir
 06IN5NfvN+//aB65NBPeEkYmdEUlz9vFztPPy2vSaq8lHqna48H5PcgzFtWrzbu7
 gloj9toxc6INTYVkow0+jtCFtKSUTHzZPNcuIcnjs3wlb1om5jzhqkJE1aHlDJzi
 0GHUsCGZZnnqJjguAoFSuO6v0ZEOhMUOxsP50+XG2xu6RMzcvsrvMvWKS0MMrPYE
 N/BB6sx4YaZ6yLav3GTZ+K2op3FpGJBnlz+sLlHT9MT9PLpDLtJ1QL1nLMeBP/FG
 YPHwkkkuQfzIxcbxPFEQimBhbqmRLtyv39g7c4xxLBVNOxqGzVlc+OabJvQRbPQC
 o0Htj9w+t9KjHzYr+Fi4RT+f5b2HMrEH/p1zqpewRYLKYUYVmMQwtLci9/vJRL7Q
 +VmKUWBq9bgOmMAUD0oEv+3xx1QmqMB14NVI1xX8sP9j8LgKX+LFjsYZHjiygZO7
 dlJbID9JAXQpiXAXmNtb
 =ZW4M
 -----END PGP SIGNATURE-----

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

Merge "Renesas ARM Based SoC Updates for v3.18" from Simon Horman:

* Remove unnecessary nr_irqs initialisation on sh73a0, sh7372,
  and r8a7779 SoCs
* Use defines hardcoded numbers for DMA
* Rework multiplatform include workaround
* Correctly use shmobile_init_late on a wider range of SoCs

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

* tag 'renesas-soc-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: sh73a0: Remove unneeded nr_irqs initialization
  ARM: shmobile: sh7372: Remove unneeded nr_irqs initialization
  ARM: shmobile: r8a7779: Remove NR_IRQS_LEGACY
  ARM: shmobile: dma: Use defines instead of hardcoded numbers
  ARM: shmobile: Rework multiplatform include workaround
  ARM: shmobile: r7s72100: Add shmobile_init_late()
  ARM: shmobile: r8a73a4: Add shmobile_init_late()
  ARM: shmobile: r8a7778: Fix shmobile_init_late()
  ARM: shmobile: r8a7779: Fix shmobile_init_late()
  ARM: shmobile: sh73a0: Add shmobile_init_late()
  ARM: shmobile: r8a7778: Add missing call to shmobile_init_late()
This commit is contained in:
Arnd Bergmann 2014-09-05 17:08:14 +02:00
parent e4e3a37d33 5ac9e7f35d
commit a6fff11391
9 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-shmobile/Makefile
View File

@ -2,8 +2,6 @@
# Makefile for the linux kernel.
#
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/mach-shmobile/include
# Common objects
obj-y := timer.o console.o

4
arch/arm/mach-shmobile/dma-register.h
View File

@ -52,8 +52,8 @@ static const unsigned int dma_ts_shift[] = {
((((i) & TS_LOW_BIT) << TS_LOW_SHIFT) |\
(((i) & TS_HI_BIT) << TS_HI_SHIFT))
#define CHCR_TX(xmit_sz) (DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL((xmit_sz)))
#define CHCR_RX(xmit_sz) (DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL((xmit_sz)))
#define CHCR_TX(xmit_sz) (DM_FIX | SM_INC | RS_ERS | TS_INDEX2VAL((xmit_sz)))
#define CHCR_RX(xmit_sz) (DM_INC | SM_FIX | RS_ERS | TS_INDEX2VAL((xmit_sz)))
/*

2
arch/arm/mach-shmobile/irqs.h
View File

@ -2,7 +2,7 @@
#define __SHMOBILE_IRQS_H
#include <linux/sh_intc.h>
#include <mach/irqs.h>
#include "include/mach/irqs.h"
/* GIC */
#define gic_spi(nr) ((nr) + 32)

1
arch/arm/mach-shmobile/setup-r7s72100.c
View File

@ -53,6 +53,7 @@ static const char *r7s72100_boards_compat_dt[] __initdata = {
DT_MACHINE_START(R7S72100_DT, "Generic R7S72100 (Flattened Device Tree)")
.init_early = shmobile_init_delay,
.init_late = shmobile_init_late,
.dt_compat = r7s72100_boards_compat_dt,
MACHINE_END
#endif /* CONFIG_USE_OF */

1
arch/arm/mach-shmobile/setup-r8a73a4.c
View File

@ -311,6 +311,7 @@ static const char *r8a73a4_boards_compat_dt[] __initdata = {
DT_MACHINE_START(R8A73A4_DT, "Generic R8A73A4 (Flattened Device Tree)")
.init_early = r8a73a4_init_early,
.init_late = shmobile_init_late,
.dt_compat = r8a73a4_boards_compat_dt,
MACHINE_END
#endif /* CONFIG_USE_OF */

3
arch/arm/mach-shmobile/setup-r8a7778.c
View File

@ -520,6 +520,7 @@ void __init r8a7778_add_standard_devices(void)
void __init r8a7778_init_late(void)
{
shmobile_init_late();
platform_device_register_full(&ehci_info);
platform_device_register_full(&ohci_info);
}
@ -609,8 +610,8 @@ static const char *r8a7778_compat_dt[] __initdata = {
DT_MACHINE_START(R8A7778_DT, "Generic R8A7778 (Flattened Device Tree)")
.init_early = r8a7778_init_delay,
.init_irq = r8a7778_init_irq_dt,
.init_late = shmobile_init_late,
.dt_compat = r8a7778_compat_dt,
.init_late = r8a7778_init_late,
MACHINE_END
#endif /* CONFIG_USE_OF */

3
arch/arm/mach-shmobile/setup-r8a7779.c
View File

@ -771,10 +771,9 @@ static const char *r8a7779_compat_dt[] __initdata = {
DT_MACHINE_START(R8A7779_DT, "Generic R8A7779 (Flattened Device Tree)")
.map_io = r8a7779_map_io,
.init_early = shmobile_init_delay,
.nr_irqs = NR_IRQS_LEGACY,
.init_irq = r8a7779_init_irq_dt,
.init_machine = r8a7779_add_standard_devices_dt,
.init_late = r8a7779_init_late,
.init_late = shmobile_init_late,
.dt_compat = r8a7779_compat_dt,
MACHINE_END
#endif /* CONFIG_USE_OF */

1
arch/arm/mach-shmobile/setup-sh7372.c
View File

@ -1008,7 +1008,6 @@ static const char *sh7372_boards_compat_dt[] __initdata = {
DT_MACHINE_START(SH7372_DT, "Generic SH7372 (Flattened Device Tree)")
.map_io = sh7372_map_io,
.init_early = sh7372_add_early_devices_dt,
.nr_irqs = NR_IRQS_LEGACY,
.init_irq = sh7372_init_irq,
.handle_irq = shmobile_handle_irq_intc,
.init_machine = sh7372_add_standard_devices_dt,

2
arch/arm/mach-shmobile/setup-sh73a0.c
View File

@ -797,8 +797,8 @@ 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,
.nr_irqs = NR_IRQS_LEGACY,
.init_machine = sh73a0_add_standard_devices_dt,
.init_late = shmobile_init_late,
.dt_compat = sh73a0_boards_compat_dt,
MACHINE_END
#endif /* CONFIG_USE_OF */