Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6fff113 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-soc-for-v3.18' of... 

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: default avatarArnd 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()
parents e4e3a37d 5ac9e7f3

arch/arm/mach-shmobile/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-shmobile/dma-register.h

+2 −2
Original line number Diff line number Diff line
@@ -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)))





/*

arch/arm/mach-shmobile/irqs.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

arch/arm/mach-shmobile/setup-r7s72100.c

+1 −0
Original line number Diff line number Diff line
@@ -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 */

arch/arm/mach-shmobile/setup-r8a73a4.c

+1 −0
Original line number Diff line number Diff line
@@ -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 */