redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

Renesas ARM Based SoC Header Cleanup for v3.17

Browse source 
Move the most common shared header files for mach-shmobile
 from <mach/foobar.h> to "foobar.h"
 
 6287298 ARM: shmobile: Move rcar-gen2.h, cleanup r8a7790 case
 585c09d ARM: shmobile: Move pm-rcar.h, cleanup r8a7779 case
 6b8b0cb ARM: shmobile: Move pm-rmobile.h, cleanup sh73xx.h
 fd44aa5 ARM: shmobile: Move common.h
 b6bab12 ARM: shmobile: Move most of irqs.h, keep some for pinctl
 ad6ffa0 ARM: shmobile: Move clock.h
 74ac0de ARM: shmobile: Move dma-register.h
 6200e2c ARM: shmobile: Move intc.h, cleanup sh_intc.h usage
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTp3nTAAoJENfPZGlqN0++mhYP/iGe9QAv1fng63178VffF0KK
 e3TVaGkXVoWmZZs11zbkGu3fYkXqgFvJ1PFd/WDZN5m31XgehodZhFOHFXvN54Tc
 u+n3U0nGOAhE5SAKmQq1d1X3FqePGFnt2MoQVMvgWJ6Cj/yZ6KaMZdtKTXxXRwQ4
 S9efhT+niEMU0vnjYvtn4ru3g9HmQsJKD8N2t/e65MBPnRZlHIojeEYtLRIzT35d
 9I7j1SwrzjVjzA0COSxPEeFVRYfnqtdsKPqDPqu7VxRA7uGtT7yrf5C7l7cFp/FH
 7LVGqNuvagvY/fVLO2FW5yxCuqiII1yFT14pgyQ2m8QezZBQiWLiUXPIRBWYoxV0
 jZUWK0TBEQsg1CmuNc7x/rxL+K3HXUii8eMlD/FX8dZPfbbonEqf//CELzL05jjb
 Bz7nCRTSUkF23ahcba1tNb88n/4ILxV4CAHwoHs0i/XMWzVln4elHFb2morWEsWH
 HCTDIEGVKpxuUNutlVpwX9/OnklfsdqX6+Uvrd0w5Y0kl9EeFbtXylunzI1SY8sa
 fEP7K4QdPPPz8lBS4bDyR1KTTr9/haD8PwVJwf3pQ/oyjueDelveCxpuf4vsXW0b
 kGIROPjJRgHOW+DpKd/rV5ljBILfe9GNQPfRc1etcJi81aTTiraxE+wFUu1X9fes
 HZapAhJwv4Br9jGZS+Ff
 =BoE9
 -----END PGP SIGNATURE-----

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

Merge "Renesas ARM Based SoC Header Cleanup for v3.17" from Simon Horman:

Move the most common shared header files for mach-shmobile
from <mach/foobar.h> to "foobar.h"

* tag 'renesas-header-cleanup-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Move rcar-gen2.h, cleanup r8a7790 case
  ARM: shmobile: Move pm-rcar.h, cleanup r8a7779 case
  ARM: shmobile: Move pm-rmobile.h, cleanup sh73xx.h
  ARM: shmobile: Move common.h
  ARM: shmobile: Move most of irqs.h, keep some for pinctl
  ARM: shmobile: Move clock.h
  ARM: shmobile: Move dma-register.h
  ARM: shmobile: Move intc.h, cleanup sh_intc.h usage

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2014-07-06 17:01:57 -07:00
parent 402277e0f8 62872989bd
commit 64460c7ef2
69 changed files with 150 additions and 154 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/mach-shmobile/board-ape6evm-reference.c
View file

@ -24,10 +24,10 @@
#include <linux/pinctrl/machine.h>
#include <linux/platform_device.h>
#include <linux/sh_clk.h>
#include <mach/common.h>
#include <mach/r8a73a4.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include "common.h"
static void __init ape6evm_add_standard_devices(void)
{

4
arch/arm/mach-shmobile/board-ape6evm.c
View file

@ -33,11 +33,11 @@
#include <linux/regulator/machine.h>
#include <linux/sh_clk.h>
#include <linux/smsc911x.h>
#include <mach/common.h>
#include <mach/irqs.h>
#include <mach/r8a73a4.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include "common.h"
#include "irqs.h"
/* LEDS */
static struct gpio_led ape6evm_leds[] = {

2
arch/arm/mach-shmobile/board-armadillo800eva-reference.c
View file

@ -24,10 +24,10 @@
#include <linux/kernel.h>
#include <linux/gpio.h>
#include <linux/io.h>
#include <mach/common.h>
#include <mach/r8a7740.h>
#include <asm/mach/arch.h>
#include <asm/hardware/cache-l2x0.h>
#include "common.h"
/*
* CON1 Camera Module

6
arch/arm/mach-shmobile/board-armadillo800eva.c
View file

@ -45,8 +45,6 @@
#include <linux/mmc/sh_mobile_sdhi.h>
#include <linux/i2c-gpio.h>
#include <linux/reboot.h>
#include <mach/common.h>
#include <mach/irqs.h>
#include <mach/r8a7740.h>
#include <media/mt9t112.h>
#include <media/sh_mobile_ceu.h>
@ -61,7 +59,9 @@
#include <video/sh_mobile_hdmi.h>
#include <sound/sh_fsi.h>
#include <sound/simple_card.h>
#include "common.h"
#include "irqs.h"
#include "pm-rmobile.h"
#include "sh-gpio.h"
/*

2
arch/arm/mach-shmobile/board-bockw-reference.c
View file

@ -19,9 +19,9 @@
*/
#include <linux/of_platform.h>
#include <mach/common.h>
#include <mach/r8a7778.h>
#include <asm/mach/arch.h>
#include "common.h"
/*
* see board-bock.c for checking detail of dip-switch

4
arch/arm/mach-shmobile/board-bockw.c
View file

@ -35,12 +35,12 @@
#include <linux/spi/flash.h>
#include <linux/usb/renesas_usbhs.h>
#include <media/soc_camera.h>
#include <mach/common.h>
#include <mach/irqs.h>
#include <mach/r8a7778.h>
#include <asm/mach/arch.h>
#include <sound/rcar_snd.h>
#include <sound/simple_card.h>
#include "common.h"
#include "irqs.h"
#define FPGA 0x18200000
#define IRQ0MR 0x30

4
arch/arm/mach-shmobile/board-genmai-reference.c
View file

@ -20,11 +20,11 @@
#include <linux/kernel.h>
#include <linux/of_platform.h>
#include <mach/clock.h>
#include <mach/common.h>
#include <mach/r7s72100.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include "clock.h"
#include "common.h"
/*
* This is a really crude hack to provide clkdev support to platform

4
arch/arm/mach-shmobile/board-genmai.c
View file

@ -25,11 +25,11 @@
#include <linux/sh_eth.h>
#include <linux/spi/rspi.h>
#include <linux/spi/spi.h>
#include <mach/common.h>
#include <mach/irqs.h>
#include <mach/r7s72100.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include "common.h"
#include "irqs.h"
/* Ether */
static const struct sh_eth_plat_data ether_pdata __initconst = {

8
arch/arm/mach-shmobile/board-koelsch-reference.c
View file

@ -23,12 +23,12 @@
#include <linux/kernel.h>
#include <linux/of_platform.h>
#include <linux/platform_data/rcar-du.h>
#include <mach/clock.h>
#include <mach/common.h>
#include <mach/irqs.h>
#include <mach/rcar-gen2.h>
#include <mach/r8a7791.h>
#include <asm/mach/arch.h>
#include "clock.h"
#include "common.h"
#include "irqs.h"
#include "rcar-gen2.h"
/* DU */
static struct rcar_du_encoder_data koelsch_du_encoders[] = {

6
arch/arm/mach-shmobile/board-koelsch.c
View file

@ -45,12 +45,12 @@
#include <linux/spi/flash.h>
#include <linux/spi/rspi.h>
#include <linux/spi/spi.h>
#include <mach/common.h>
#include <mach/irqs.h>
#include <mach/r8a7791.h>
#include <mach/rcar-gen2.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include "common.h"
#include "irqs.h"
#include "rcar-gen2.h"
/* DU */
static struct rcar_du_encoder_data koelsch_du_encoders[] = {

2
arch/arm/mach-shmobile/board-kzm9g-reference.c
View file

@ -26,10 +26,10 @@
#include <linux/input.h>
#include <linux/of_platform.h>
#include <mach/sh73a0.h>
#include <mach/common.h>
#include <asm/hardware/cache-l2x0.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include "common.h"
static void __init kzm_init(void)
{

4
arch/arm/mach-shmobile/board-kzm9g.c
View file

@ -43,13 +43,13 @@
#include <linux/videodev2.h>
#include <sound/sh_fsi.h>
#include <sound/simple_card.h>
#include <mach/irqs.h>
#include <mach/sh73a0.h>
#include <mach/common.h>
#include <asm/hardware/cache-l2x0.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <video/sh_mobile_lcdc.h>
#include "common.h"
#include "irqs.h"
/*
* external GPIO

8
arch/arm/mach-shmobile/board-lager-reference.c
View file

@ -22,12 +22,12 @@
#include <linux/init.h>
#include <linux/of_platform.h>
#include <linux/platform_data/rcar-du.h>
#include <mach/clock.h>
#include <mach/common.h>
#include <mach/irqs.h>
#include <mach/rcar-gen2.h>
#include <mach/r8a7790.h>
#include <asm/mach/arch.h>
#include "clock.h"
#include "common.h"
#include "irqs.h"
#include "rcar-gen2.h"
/* DU */
static struct rcar_du_encoder_data lager_du_encoders[] = {

5
arch/arm/mach-shmobile/board-lager.c
View file

@ -45,8 +45,6 @@
#include <linux/sh_eth.h>
#include <linux/usb/phy.h>
#include <linux/usb/renesas_usbhs.h>
#include <mach/common.h>
#include <mach/irqs.h>
#include <mach/r8a7790.h>
#include <media/soc_camera.h>
#include <asm/mach-types.h>
@ -58,6 +56,9 @@
#include <linux/spi/spi.h>
#include <sound/rcar_snd.h>
#include <sound/simple_card.h>
#include "common.h"
#include "irqs.h"
#include "rcar-gen2.h"
/*
* SSI-AK4643

10
arch/arm/mach-shmobile/board-mackerel.c
View file

@ -47,7 +47,7 @@
#include <linux/regulator/fixed.h>
#include <linux/regulator/machine.h>
#include <linux/smsc911x.h>
#include <linux/sh_intc.h>
#include <linux/sh_clk.h>
#include <linux/tca6416_keypad.h>
#include <linux/usb/renesas_usbhs.h>
#include <linux/dma-mapping.h>
@ -58,14 +58,12 @@
#include <media/soc_camera_platform.h>
#include <sound/sh_fsi.h>
#include <sound/simple_card.h>
#include <mach/common.h>
#include <mach/irqs.h>
#include <mach/sh7372.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include "common.h"
#include "irqs.h"
#include "pm-rmobile.h"
#include "sh-gpio.h"
/*

4
arch/arm/mach-shmobile/board-marzen-reference.c
View file

@ -20,10 +20,10 @@
*/
#include <mach/r8a7779.h>
#include <mach/common.h>
#include <mach/irqs.h>
#include <asm/irq.h>
#include <asm/mach/arch.h>
#include "common.h"
#include "irqs.h"
static void __init marzen_init(void)
{

4
arch/arm/mach-shmobile/board-marzen.c
View file

@ -43,11 +43,11 @@
#include <linux/mfd/tmio.h>
#include <media/soc_camera.h>
#include <mach/r8a7779.h>
#include <mach/common.h>
#include <mach/irqs.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/traps.h>
#include "common.h"
#include "irqs.h"
/* Fixed 3.3V regulator to be used by SDHI0 */
static struct regulator_consumer_supply fixed3v3_power_consumers[] = {

2
arch/arm/mach-shmobile/clock-r7s72100.c
View file

@ -19,8 +19,8 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
#include <mach/common.h>
#include <mach/r7s72100.h>
#include "common.h"
/* Frequency Control Registers */
#define FRQCR 0xfcfe0010

4
arch/arm/mach-shmobile/clock-r8a73a4.c
View file

@ -22,8 +22,8 @@
#include <linux/kernel.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
#include <mach/clock.h>
#include <mach/common.h>
#include "common.h"
#include "clock.h"
#define CPG_BASE 0xe6150000
#define CPG_LEN 0x270

4
arch/arm/mach-shmobile/clock-r8a7740.c
View file

@ -22,9 +22,9 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
#include <mach/clock.h>
#include <mach/common.h>
#include <mach/r8a7740.h>
#include "clock.h"
#include "common.h"
/*
* | MDx | XTAL1/EXTAL1 | System | EXTALR |

4
arch/arm/mach-shmobile/clock-r8a7778.c
View file

@ -39,8 +39,8 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
#include <mach/clock.h>
#include <mach/common.h>
#include "clock.h"
#include "common.h"
#define MSTPCR0 IOMEM(0xffc80030)
#define MSTPCR1 IOMEM(0xffc80034)

4
arch/arm/mach-shmobile/clock-r8a7779.c
View file

@ -23,8 +23,8 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
#include <mach/clock.h>
#include <mach/common.h>
#include "clock.h"
#include "common.h"
/*
* MD1 = 1 MD1 = 0

5
arch/arm/mach-shmobile/clock-r8a7790.c
View file

@ -22,9 +22,10 @@
#include <linux/kernel.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
#include <mach/clock.h>
#include <mach/common.h>
#include <mach/r8a7790.h>
#include "clock.h"
#include "common.h"
#include "rcar-gen2.h"
/*
* MD EXTAL PLL0 PLL1 PLL3

6
arch/arm/mach-shmobile/clock-r8a7791.c
View file

@ -23,9 +23,9 @@
#include <linux/kernel.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
#include <mach/clock.h>
#include <mach/common.h>
#include <mach/rcar-gen2.h>
#include "clock.h"
#include "common.h"
#include "rcar-gen2.h"
/*
* MD EXTAL PLL0 PLL1 PLL3

4
arch/arm/mach-shmobile/clock-sh7372.c
View file

@ -21,8 +21,8 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
#include <mach/clock.h>
#include <mach/common.h>
#include "clock.h"
#include "common.h"
/* SH7372 registers */
#define FRQCRA IOMEM(0xe6150000)

4
arch/arm/mach-shmobile/clock-sh73a0.c
View file

@ -22,8 +22,8 @@
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
#include <asm/processor.h>
#include <mach/clock.h>
#include <mach/common.h>
#include "clock.h"
#include "common.h"
#define FRQCRA IOMEM(0xe6150000)
#define FRQCRB IOMEM(0xe6150004)

6
arch/arm/mach-shmobile/clock.c
View file

@ -25,7 +25,7 @@
#ifdef CONFIG_COMMON_CLK
#include <linux/clk.h>
#include <linux/clkdev.h>
#include <mach/clock.h>
#include "clock.h"
void __init shmobile_clk_workaround(const struct clk_name *clks,
int nr_clks, bool enable)
@ -49,8 +49,8 @@ void __init shmobile_clk_workaround(const struct clk_name *clks,
#else /* CONFIG_COMMON_CLK */
#include <linux/sh_clk.h>
#include <linux/export.h>
#include <mach/clock.h>
#include <mach/common.h>
#include "clock.h"
#include "common.h"
unsigned long shmobile_fixed_ratio_clk_recalc(struct clk *clk)
{

0
arch/arm/mach-shmobile/include/mach/clock.h → arch/arm/mach-shmobile/clock.h
View file

0
arch/arm/mach-shmobile/include/mach/common.h → arch/arm/mach-shmobile/common.h
View file

2
arch/arm/mach-shmobile/console.c
View file

@ -19,8 +19,8 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
#include <mach/common.h>
#include <asm/mach/map.h>
#include "common.h"
void __init shmobile_setup_console(void)
{

0
arch/arm/mach-shmobile/include/mach/dma-register.h → arch/arm/mach-shmobile/dma-register.h
View file

16
arch/arm/mach-shmobile/include/mach/irqs.h
View file

@ -1,24 +1,10 @@
#ifndef __ASM_MACH_IRQS_H
#define __ASM_MACH_IRQS_H
#include <linux/sh_intc.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))
/* Stuck here until drivers/pinctl/sh-pfc gets rid of legacy code */
/* External IRQ pins */
#define IRQPIN_BASE 2000
#define irq_pin(nr) ((nr) + IRQPIN_BASE)
/* GPIO IRQ */
#define _GPIO_IRQ_BASE 2500
#define GPIO_IRQ_BASE(x) (_GPIO_IRQ_BASE + (32 * x))
#define GPIO_IRQ(x, y) (_GPIO_IRQ_BASE + (32 * x) + y)
#endif /* __ASM_MACH_IRQS_H */

2
arch/arm/mach-shmobile/include/mach/r8a7740.h
View file

@ -19,8 +19,6 @@
#ifndef __ASM_R8A7740_H__
#define __ASM_R8A7740_H__
#include <mach/pm-rmobile.h>
/*
* MD_CKx pin
*/

12
arch/arm/mach-shmobile/include/mach/r8a7779.h
View file

@ -2,8 +2,6 @@
#define __ASM_R8A7779_H__
#include <linux/sh_clk.h>
#include <linux/pm_domain.h>
#include <mach/pm-rcar.h>
/* HPB-DMA slave IDs */
enum {
@ -12,16 +10,6 @@ enum {
HPBDMA_SLAVE_SDHI0_RX,
};
struct r8a7779_pm_domain {
struct generic_pm_domain genpd;
struct rcar_sysc_ch ch;
};
static inline struct rcar_sysc_ch *to_r8a7779_ch(struct generic_pm_domain *d)
{
return &container_of(d, struct r8a7779_pm_domain, genpd)->ch;
}
extern void r8a7779_init_delay(void);
extern void r8a7779_init_irq_extpin(int irlm);
extern void r8a7779_init_irq_extpin_dt(int irlm);

2
arch/arm/mach-shmobile/include/mach/r8a7790.h
View file

@ -1,8 +1,6 @@
#ifndef __ASM_R8A7790_H__
#define __ASM_R8A7790_H__
#include <mach/rcar-gen2.h>
/* DMA slave IDs */
enum {
RCAR_DMA_SLAVE_INVALID,

4
arch/arm/mach-shmobile/include/mach/sh7372.h
View file

@ -11,10 +11,6 @@
#ifndef __ASM_SH7372_H__
#define __ASM_SH7372_H__
#include <linux/sh_clk.h>
#include <linux/pm_domain.h>
#include <mach/pm-rmobile.h>
/* DMA slave IDs */
enum {
SHDMA_SLAVE_INVALID,

5
arch/arm/mach-shmobile/intc-sh7372.c
View file

@ -22,11 +22,10 @@
#include <linux/module.h>
#include <linux/irq.h>
#include <linux/io.h>
#include <linux/sh_intc.h>
#include <mach/intc.h>
#include <mach/irqs.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include "intc.h"
#include "irqs.h"
enum {
UNUSED_INTCA = 0,

5
arch/arm/mach-shmobile/intc-sh73a0.c
View file

@ -22,14 +22,13 @@
#include <linux/module.h>
#include <linux/irq.h>
#include <linux/io.h>
#include <linux/sh_intc.h>
#include <linux/irqchip.h>
#include <linux/irqchip/arm-gic.h>
#include <mach/intc.h>
#include <mach/irqs.h>
#include <mach/sh73a0.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include "intc.h"
#include "irqs.h"
enum {
UNUSED = 0,

0
arch/arm/mach-shmobile/include/mach/intc.h → arch/arm/mach-shmobile/intc.h
View file

21
arch/arm/mach-shmobile/irqs.h Normal file
View file

@ -0,0 +1,21 @@
#ifndef __SHMOBILE_IRQS_H
#define __SHMOBILE_IRQS_H
#include <linux/sh_intc.h>
#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))
#define GPIO_IRQ(x, y) (_GPIO_IRQ_BASE + (32 * x) + y)
#endif /* __SHMOBILE_IRQS_H */

2
arch/arm/mach-shmobile/platsmp-apmu.c
View file

@ -16,7 +16,7 @@
#include <asm/cacheflush.h>
#include <asm/cp15.h>
#include <asm/smp_plat.h>
#include <mach/common.h>
#include "common.h"
static struct {
void __iomem *iomem;

2
arch/arm/mach-shmobile/platsmp-scu.c
View file

@ -15,7 +15,7 @@
#include <asm/cacheflush.h>
#include <asm/smp_plat.h>
#include <asm/smp_scu.h>
#include <mach/common.h>
#include "common.h"
static int shmobile_smp_scu_notifier_call(struct notifier_block *nfb,
unsigned long action, void *hcpu)

2
arch/arm/mach-shmobile/platsmp.c
View file

@ -13,7 +13,7 @@
#include <linux/init.h>
#include <asm/cacheflush.h>
#include <asm/smp_plat.h>
#include <mach/common.h>
#include "common.h"
extern unsigned long shmobile_smp_fn[];
extern unsigned long shmobile_smp_arg[];

4
arch/arm/mach-shmobile/pm-r8a7740.c
View file

@ -10,8 +10,8 @@
*/
#include <linux/console.h>
#include <linux/suspend.h>
#include <mach/pm-rmobile.h>
#include <mach/common.h>
#include "common.h"
#include "pm-rmobile.h"
#ifdef CONFIG_PM
static int r8a7740_pd_a4s_suspend(void)

15
arch/arm/mach-shmobile/pm-r8a7779.c
View file

@ -13,20 +13,31 @@
#include <linux/suspend.h>
#include <linux/err.h>
#include <linux/pm_clock.h>
#include <linux/pm_domain.h>
#include <linux/platform_device.h>
#include <linux/delay.h>
#include <linux/irq.h>
#include <linux/interrupt.h>
#include <linux/console.h>
#include <asm/io.h>
#include <mach/common.h>
#include <mach/pm-rcar.h>
#include <mach/r8a7779.h>
#include "common.h"
#include "pm-rcar.h"
/* SYSC */
#define SYSCIER 0x0c
#define SYSCIMR 0x10
struct r8a7779_pm_domain {
struct generic_pm_domain genpd;
struct rcar_sysc_ch ch;
};
static inline struct rcar_sysc_ch *to_r8a7779_ch(struct generic_pm_domain *d)
{
return &container_of(d, struct r8a7779_pm_domain, genpd)->ch;
}
#if defined(CONFIG_PM) || defined(CONFIG_SMP)
static void __init r8a7779_sysc_init(void)

2
arch/arm/mach-shmobile/pm-r8a7790.c
View file

@ -12,8 +12,8 @@
#include <linux/kernel.h>
#include <asm/io.h>
#include <mach/pm-rcar.h>
#include <mach/r8a7790.h>
#include "pm-rcar.h"
/* SYSC */
#define SYSCIER 0x0c

2
arch/arm/mach-shmobile/pm-rcar.c
View file

@ -13,7 +13,7 @@
#include <linux/mm.h>
#include <linux/spinlock.h>
#include <asm/io.h>
#include <mach/pm-rcar.h>
#include "pm-rcar.h"
/* SYSC */
#define SYSCSR 0x00

0
arch/arm/mach-shmobile/include/mach/pm-rcar.h → arch/arm/mach-shmobile/pm-rcar.h
View file

2
arch/arm/mach-shmobile/pm-rmobile.c
View file

@ -17,7 +17,7 @@
#include <linux/pm.h>
#include <linux/pm_clock.h>
#include <asm/io.h>
#include <mach/pm-rmobile.h>
#include "pm-rmobile.h"
/* SYSC */
#define SPDCR IOMEM(0xe6180008)

0
arch/arm/mach-shmobile/include/mach/pm-rmobile.h → arch/arm/mach-shmobile/pm-rmobile.h
View file

4
arch/arm/mach-shmobile/pm-sh7372.c
View file

@ -25,9 +25,9 @@
#include <asm/io.h>
#include <asm/tlbflush.h>
#include <asm/suspend.h>
#include <mach/common.h>
#include <mach/sh7372.h>
#include <mach/pm-rmobile.h>
#include "common.h"
#include "pm-rmobile.h"
/* DBG */
#define DBGREG1 IOMEM(0xe6100020)

2
arch/arm/mach-shmobile/pm-sh73a0.c
View file

@ -9,7 +9,7 @@
*/
#include <linux/suspend.h>
#include <mach/common.h>
#include "common.h"
#ifdef CONFIG_SUSPEND
static int sh73a0_enter_suspend(suspend_state_t suspend_state)

0
arch/arm/mach-shmobile/include/mach/rcar-gen2.h → arch/arm/mach-shmobile/rcar-gen2.h
View file

2
arch/arm/mach-shmobile/setup-emev2.c
View file

@ -20,10 +20,10 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/of_platform.h>
#include <mach/common.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include "common.h"
static struct map_desc emev2_io_desc[] __initdata = {
#ifdef CONFIG_SMP

4
arch/arm/mach-shmobile/setup-r7s72100.c
View file

@ -22,10 +22,10 @@
#include <linux/kernel.h>
#include <linux/of_platform.h>
#include <linux/sh_timer.h>
#include <mach/common.h>
#include <mach/irqs.h>
#include <mach/r7s72100.h>
#include <asm/mach/arch.h>
#include "common.h"
#include "irqs.h"
static struct resource mtu2_resources[] __initdata = {
DEFINE_RES_MEM(0xfcff0000, 0x400),

6
arch/arm/mach-shmobile/setup-r8a73a4.c
View file

@ -24,11 +24,11 @@
#include <linux/serial_sci.h>
#include <linux/sh_dma.h>
#include <linux/sh_timer.h>
#include <mach/common.h>
#include <mach/dma-register.h>
#include <mach/irqs.h>
#include <mach/r8a73a4.h>
#include <asm/mach/arch.h>
#include "common.h"
#include "dma-register.h"
#include "irqs.h"
static const struct resource pfc_resources[] = {
DEFINE_RES_MEM(0xe6050000, 0x9000),

8
arch/arm/mach-shmobile/setup-r8a7740.c
View file

@ -31,15 +31,15 @@
#include <linux/sh_dma.h>
#include <linux/sh_timer.h>
#include <linux/platform_data/sh_ipmmu.h>
#include <mach/dma-register.h>
#include <mach/r8a7740.h>
#include <mach/pm-rmobile.h>
#include <mach/common.h>
#include <mach/irqs.h>
#include <asm/mach-types.h>
#include <asm/mach/map.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include "common.h"
#include "dma-register.h"
#include "irqs.h"
#include "pm-rmobile.h"
static struct map_desc r8a7740_io_desc[] __initdata = {
/*

4
arch/arm/mach-shmobile/setup-r8a7778.c
View file

@ -37,11 +37,11 @@
#include <linux/usb/ehci_pdriver.h>
#include <linux/usb/ohci_pdriver.h>
#include <linux/dma-mapping.h>
#include <mach/irqs.h>
#include <mach/r8a7778.h>
#include <mach/common.h>
#include <asm/mach/arch.h>
#include <asm/hardware/cache-l2x0.h>
#include "common.h"
#include "irqs.h"
/* SCIF */
#define R8A7778_SCIF(index, baseaddr, irq) \

4
arch/arm/mach-shmobile/setup-r8a7779.c
View file

@ -40,14 +40,14 @@
#include <linux/usb/ehci_pdriver.h>
#include <linux/usb/ohci_pdriver.h>
#include <linux/pm_runtime.h>
#include <mach/irqs.h>
#include <mach/r8a7779.h>
#include <mach/common.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include <asm/mach/map.h>
#include <asm/hardware/cache-l2x0.h>
#include "common.h"
#include "irqs.h"
static struct map_desc r8a7779_io_desc[] __initdata = {
/* 2M entity map for 0xf0000000 (MPCORE) */

7
arch/arm/mach-shmobile/setup-r8a7790.c
View file

@ -26,11 +26,12 @@
#include <linux/serial_sci.h>
#include <linux/sh_dma.h>
#include <linux/sh_timer.h>
#include <mach/common.h>
#include <mach/dma-register.h>
#include <mach/irqs.h>
#include <mach/r8a7790.h>
#include <asm/mach/arch.h>
#include "common.h"
#include "dma-register.h"
#include "irqs.h"
#include "rcar-gen2.h"
/* Audio-DMAC */
#define AUDIO_DMAC_SLAVE(_id, _addr, t, r) \

6
arch/arm/mach-shmobile/setup-r8a7791.c
View file

@ -26,11 +26,11 @@
#include <linux/platform_data/irq-renesas-irqc.h>
#include <linux/serial_sci.h>
#include <linux/sh_timer.h>
#include <mach/common.h>
#include <mach/irqs.h>
#include <mach/r8a7791.h>
#include <mach/rcar-gen2.h>
#include <asm/mach/arch.h>
#include "common.h"
#include "irqs.h"
#include "rcar-gen2.h"
static const struct resource pfc_resources[] __initconst = {
DEFINE_RES_MEM(0xe6060000, 0x250),

4
arch/arm/mach-shmobile/setup-rcar-gen2.c
View file

@ -22,9 +22,9 @@
#include <linux/clocksource.h>
#include <linux/io.h>
#include <linux/kernel.h>
#include <mach/common.h>
#include <mach/rcar-gen2.h>
#include <asm/mach/arch.h>
#include "common.h"
#include "rcar-gen2.h"
#define MODEMR 0xe6160060

8
arch/arm/mach-shmobile/setup-sh7372.c
View file

@ -29,19 +29,19 @@
#include <linux/io.h>
#include <linux/serial_sci.h>
#include <linux/sh_dma.h>
#include <linux/sh_intc.h>
#include <linux/sh_timer.h>
#include <linux/pm_domain.h>
#include <linux/dma-mapping.h>
#include <linux/platform_data/sh_ipmmu.h>
#include <mach/dma-register.h>
#include <mach/irqs.h>
#include <mach/sh7372.h>
#include <mach/common.h>
#include <asm/mach/map.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include "common.h"
#include "dma-register.h"
#include "irqs.h"
#include "pm-rmobile.h"
static struct map_desc sh7372_io_desc[] __initdata = {
/* create a 1:1 entity map for 0xe6xxxxxx

7
arch/arm/mach-shmobile/setup-sh73a0.c
View file

@ -29,18 +29,17 @@
#include <linux/io.h>
#include <linux/serial_sci.h>
#include <linux/sh_dma.h>
#include <linux/sh_intc.h>
#include <linux/sh_timer.h>
#include <linux/platform_data/sh_ipmmu.h>
#include <linux/platform_data/irq-renesas-intc-irqpin.h>
#include <mach/dma-register.h>
#include <mach/irqs.h>
#include <mach/sh73a0.h>
#include <mach/common.h>
#include <asm/mach-types.h>
#include <asm/mach/map.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include "common.h"
#include "dma-register.h"
#include "irqs.h"
static struct map_desc sh73a0_io_desc[] __initdata = {
/* create a 1:1 entity map for 0xe6xxxxxx

2
arch/arm/mach-shmobile/smp-emev2.c
View file

@ -23,9 +23,9 @@
#include <linux/spinlock.h>
#include <linux/io.h>
#include <linux/delay.h>
#include <mach/common.h>
#include <asm/smp_plat.h>
#include <asm/smp_scu.h>
#include "common.h"
#define EMEV2_SCU_BASE 0x1e000000
#define EMEV2_SMU_BASE 0xe0110000

4
arch/arm/mach-shmobile/smp-r8a7779.c
View file

@ -23,13 +23,13 @@
#include <linux/spinlock.h>
#include <linux/io.h>
#include <linux/delay.h>
#include <mach/common.h>
#include <mach/pm-rcar.h>
#include <mach/r8a7779.h>
#include <asm/cacheflush.h>
#include <asm/smp_plat.h>
#include <asm/smp_scu.h>
#include <asm/smp_twd.h>
#include "common.h"
#include "pm-rcar.h"
#define AVECR IOMEM(0xfe700040)
#define R8A7779_SCU_BASE 0xf0000000

4
arch/arm/mach-shmobile/smp-r8a7790.c
View file

@ -18,9 +18,9 @@
#include <linux/smp.h>
#include <linux/io.h>
#include <asm/smp_plat.h>
#include <mach/common.h>
#include <mach/pm-rcar.h>
#include <mach/r8a7790.h>
#include "common.h"
#include "pm-rcar.h"
#define RST 0xe6160000
#define CA15BAR 0x0020

4
arch/arm/mach-shmobile/smp-r8a7791.c
View file

@ -18,9 +18,9 @@
#include <linux/smp.h>
#include <linux/io.h>
#include <asm/smp_plat.h>
#include <mach/common.h>
#include <mach/r8a7791.h>
#include <mach/rcar-gen2.h>
#include "common.h"
#include "rcar-gen2.h"
#define RST 0xe6160000
#define CA15BAR 0x0020

2
arch/arm/mach-shmobile/smp-sh73a0.c
View file

@ -22,10 +22,10 @@
#include <linux/smp.h>
#include <linux/io.h>
#include <linux/delay.h>
#include <mach/common.h>
#include <mach/sh73a0.h>
#include <asm/smp_plat.h>
#include <asm/smp_twd.h>
#include "common.h"
#define WUPCR IOMEM(0xe6151010)
#define SRESCR IOMEM(0xe6151018)