OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Second Round Of Renesas ARM Based SoC Updates For v3.18 

* Move legacy INTC definitions from irqs.h to intc.h
 * Remove duplicate CPUFreq bits on r8a73a0/ape6evm
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJT+ohsAAoJENfPZGlqN0++5EkP/A6LFZHZIcchHowI1WNB+cEN
 Y8J8jNv/4It69qmZKVh4Or7oXneB+YE8SnP5+YckDqDpk0UuegZQnEwihtMzoQqq
 U7D1zYGlONqIs0CXVh+vMQL5ulFMpThttynCCtwlnlGbsXptAmeZLc+aOJlPJCHE
 gHioUxax2EnN5YjHI1lbO/JyAiysKGPZlBkkahSdEsNp3efaHSP56b6K3NEhIGlN
 cRyN6MpHrvb6/+c7BNeFMA6jOx1dTbr43XxNBR6/1YKr0rZHgP82aMW1LZAVu9ZV
 Apr2OxZ592IRFOoiHtqM54h7y1vJ2WGKuTfG2cFNXPrbi9iwvi7mbedDClK031oV
 UOMAbdR+EwygJU1Qekn3lzgGP8L7k/iiYr7uRJ7yBNJQgmOYZiHwkKSBHZtjwjU+
 i31KCfZjJuIrGW6NPZcgUgepRYOKERghbEXI7GKzC6629s+NDLXVHnX+/IXU7Zoo
 SrSmDwepf5Y+W4hP2JPDkFc0qwkfYrHiDvpAjnWJNLzNv9PVrTefpJh9zeQDw2IY
 /utnRR3cM6JpPs/FsmQ4MfmlmF/BidihFfPt9jDBER8jd1/6otsKPeRJCWY/h6Df
 43MfnnEDDTvaf8lGsxuheB5+mj6/y50O+dPWQNPJDlhm+ZicTrV5DPKxR+2buowF
 xzjJQk6PYX06HzIf/Nvq
 =DDxz
 -----END PGP SIGNATURE-----

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: Arnd 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
This commit is contained in:
Arnd Bergmann 2014-09-05 17:29:29 +02:00
parent 5fdebdc959 86155b35d1
commit 59255f4de5
7 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-shmobile/board-ape6evm-reference.c
View File

@ -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 = {

1
arch/arm/mach-shmobile/board-kzm9g.c
View File

@ -50,6 +50,7 @@
#include <video/sh_mobile_lcdc.h>
#include "common.h"
#include "intc.h"
#include "irqs.h"
#include "sh73a0.h"

1
arch/arm/mach-shmobile/board-mackerel.c
View File

@ -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"

5
arch/arm/mach-shmobile/intc.h
View File

@ -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 */

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

@ -1,18 +1,12 @@
#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))

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

@ -41,6 +41,7 @@
#include "common.h"
#include "dma-register.h"
#include "intc.h"
#include "irqs.h"
#include "pm-rmobile.h"
#include "sh7372.h"

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

@ -40,6 +40,7 @@
#include "common.h"
#include "dma-register.h"
#include "intc.h"
#include "irqs.h"
#include "sh73a0.h"
@ -775,17 +776,12 @@ void __init sh73a0_add_early_devices(void)
void __init sh73a0_add_standard_devices_dt(void)
{
struct platform_device_info devinfo = { .name = "cpufreq-cpu0", .id = -1, };
/* clocks are setup late during boot in the case of DT */
sh73a0_clock_init();
platform_add_devices(sh73a0_devices_dt,
ARRAY_SIZE(sh73a0_devices_dt));
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
/* Instantiate cpufreq-cpu0 */
platform_device_register_full(&devinfo);
}
static const char *sh73a0_boards_compat_dt[] __initdata = {