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

Commit 59255f4d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

 into next/soc

Merge "Second Round Of Renesas ARM Based SoC Updates For v3.18" from Simon Horman:

* Move legacy INTC definitions from irqs.h to intc.h
* Remove duplicate CPUFreq bits on r8a73a0/ape6evm

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

* tag 'renesas-soc2-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Move legacy INTC definitions from irqs.h to intc.h
  ARM: shmobile: ape6evm: Remove duplicate CPUFreq bits
  ARM: shmobile: sh73a0: Remove duplicate CPUFreq bits
parents 5fdebdc9 86155b35

arch/arm/mach-shmobile/board-ape6evm-reference.c

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ static void __init ape6evm_add_standard_devices(void) 


	r8a73a4_add_dt_devices();

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

	platform_device_register_simple("cpufreq-cpu0", -1, NULL, 0);

}



static const char *ape6evm_boards_compat_dt[] __initdata = {

arch/arm/mach-shmobile/board-kzm9g.c

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include <video/sh_mobile_lcdc.h>



#include "common.h"

#include "intc.h"

#include "irqs.h"

#include "sh73a0.h"

arch/arm/mach-shmobile/board-mackerel.c

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ 
#include <asm/mach-types.h>



#include "common.h"

#include "intc.h"

#include "irqs.h"

#include "pm-rmobile.h"

#include "sh-gpio.h"

arch/arm/mach-shmobile/intc.h

+5 −0
Original line number Diff line number Diff line
@@ -287,4 +287,9 @@ static struct intc_desc p ## _desc __initdata = { \ 
			     p ## _sense_registers, NULL),		\

}



/* INTCS */

#define INTCS_VECT_BASE		0x3400

#define INTCS_VECT(n, vect)	INTC_VECT((n), INTCS_VECT_BASE + (vect))

#define intcs_evt2irq(evt)	evt2irq(INTCS_VECT_BASE + (evt))



#endif  /* __ASM_MACH_INTC_H */

arch/arm/mach-shmobile/irqs.h

+0 −6
Original line number Diff line number Diff line 
#ifndef __SHMOBILE_IRQS_H

#define __SHMOBILE_IRQS_H



#include <linux/sh_intc.h>

#include "include/mach/irqs.h"



/* GIC */

#define gic_spi(nr)		((nr) + 32)

#define gic_iid(nr)		(nr) /* ICCIAR / interrupt ID */



/* INTCS */

#define INTCS_VECT_BASE		0x3400

#define INTCS_VECT(n, vect)	INTC_VECT((n), INTCS_VECT_BASE + (vect))

#define intcs_evt2irq(evt)	evt2irq(INTCS_VECT_BASE + (evt))



/* GPIO IRQ */

#define _GPIO_IRQ_BASE		2500

#define GPIO_IRQ_BASE(x)	(_GPIO_IRQ_BASE + (32 * x))