mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

ARM: shmobile: Move common.h 

Change location for common.h so it can be used as #include "common.h"
instead of the old style #include <mach/common.h>.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
This commit is contained in:
Magnus Damm 2014-06-17 16:47:37 +09:00 committed by Simon Horman
parent b6bab1263c
commit fd44aa5e57
52 changed files with 51 additions and 51 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)
{

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

@ -33,10 +33,10 @@
#include <linux/regulator/machine.h>
#include <linux/sh_clk.h>
#include <linux/smsc911x.h>
#include <mach/common.h>
#include <mach/r8a73a4.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include "common.h"
#include "irqs.h"
/* 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

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

@ -45,7 +45,6 @@
#include <linux/mmc/sh_mobile_sdhi.h>
#include <linux/i2c-gpio.h>
#include <linux/reboot.h>
#include <mach/common.h>
#include <mach/r8a7740.h>
#include <media/mt9t112.h>
#include <media/sh_mobile_ceu.h>
@ -60,6 +59,7 @@
#include <video/sh_mobile_hdmi.h>
#include <sound/sh_fsi.h>
#include <sound/simple_card.h>
#include "common.h"
#include "irqs.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

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

@ -35,11 +35,11 @@
#include <linux/spi/flash.h>
#include <linux/usb/renesas_usbhs.h>
#include <media/soc_camera.h>
#include <mach/common.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

2
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/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

2
arch/arm/mach-shmobile/board-genmai.c
View File

@ -25,10 +25,10 @@
#include <linux/sh_eth.h>
#include <linux/spi/rspi.h>
#include <linux/spi/spi.h>
#include <mach/common.h>
#include <mach/r7s72100.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include "common.h"
#include "irqs.h"
/* Ether */

2
arch/arm/mach-shmobile/board-koelsch-reference.c
View File

@ -23,11 +23,11 @@
#include <linux/kernel.h>
#include <linux/of_platform.h>
#include <linux/platform_data/rcar-du.h>
#include <mach/common.h>
#include <mach/rcar-gen2.h>
#include <mach/r8a7791.h>
#include <asm/mach/arch.h>
#include "clock.h"
#include "common.h"
#include "irqs.h"
/* DU */

2
arch/arm/mach-shmobile/board-koelsch.c
View File

@ -45,11 +45,11 @@
#include <linux/spi/flash.h>
#include <linux/spi/rspi.h>
#include <linux/spi/spi.h>
#include <mach/common.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"
/* DU */

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)
{

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

@ -44,11 +44,11 @@
#include <sound/sh_fsi.h>
#include <sound/simple_card.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"
/*

2
arch/arm/mach-shmobile/board-lager-reference.c
View File

@ -22,11 +22,11 @@
#include <linux/init.h>
#include <linux/of_platform.h>
#include <linux/platform_data/rcar-du.h>
#include <mach/common.h>
#include <mach/rcar-gen2.h>
#include <mach/r8a7790.h>
#include <asm/mach/arch.h>
#include "clock.h"
#include "common.h"
#include "irqs.h"
/* DU */

2
arch/arm/mach-shmobile/board-lager.c
View File

@ -45,7 +45,6 @@
#include <linux/sh_eth.h>
#include <linux/usb/phy.h>
#include <linux/usb/renesas_usbhs.h>
#include <mach/common.h>
#include <mach/r8a7790.h>
#include <media/soc_camera.h>
#include <asm/mach-types.h>
@ -57,6 +56,7 @@
#include <linux/spi/spi.h>
#include <sound/rcar_snd.h>
#include <sound/simple_card.h>
#include "common.h"
#include "irqs.h"
/*

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

@ -57,10 +57,10 @@
#include <media/soc_camera_platform.h>
#include <sound/sh_fsi.h>
#include <sound/simple_card.h>
#include <mach/common.h>
#include <mach/sh7372.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include "common.h"
#include "irqs.h"
#include "sh-gpio.h"

2
arch/arm/mach-shmobile/board-marzen-reference.c
View File

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

2
arch/arm/mach-shmobile/board-marzen.c
View File

@ -43,10 +43,10 @@
#include <linux/mfd/tmio.h>
#include <media/soc_camera.h>
#include <mach/r8a7779.h>
#include <mach/common.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 */

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

2
arch/arm/mach-shmobile/clock-r8a73a4.c
View File

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

2
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/common.h>
#include <mach/r8a7740.h>
#include "clock.h"
#include "common.h"
/*
* | MDx | XTAL1/EXTAL1 | System | EXTALR |

2
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/common.h>
#include "clock.h"
#include "common.h"
#define MSTPCR0 IOMEM(0xffc80030)
#define MSTPCR1 IOMEM(0xffc80034)

2
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/common.h>
#include "clock.h"
#include "common.h"
/*
* MD1 = 1 MD1 = 0

2
arch/arm/mach-shmobile/clock-r8a7790.c
View File

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

2
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/common.h>
#include <mach/rcar-gen2.h>
#include "clock.h"
#include "common.h"
/*
* MD EXTAL PLL0 PLL1 PLL3

2
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/common.h>
#include "clock.h"
#include "common.h"
/* SH7372 registers */
#define FRQCRA IOMEM(0xe6150000)

2
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/common.h>
#include "clock.h"
#include "common.h"
#define FRQCRA IOMEM(0xe6150000)
#define FRQCRB IOMEM(0xe6150004)

2
arch/arm/mach-shmobile/clock.c
View File

@ -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/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/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)
{

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[];

2
arch/arm/mach-shmobile/pm-r8a7740.c
View File

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

2
arch/arm/mach-shmobile/pm-r8a7779.c
View File

@ -19,9 +19,9 @@
#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"
/* SYSC */
#define SYSCIER 0x0c

2
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"
/* 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)

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

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

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

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

@ -24,9 +24,9 @@
#include <linux/serial_sci.h>
#include <linux/sh_dma.h>
#include <linux/sh_timer.h>
#include <mach/common.h>
#include <mach/r8a73a4.h>
#include <asm/mach/arch.h>
#include "common.h"
#include "dma-register.h"
#include "irqs.h"

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

@ -33,11 +33,11 @@
#include <linux/platform_data/sh_ipmmu.h>
#include <mach/r8a7740.h>
#include <mach/pm-rmobile.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"

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

@ -38,9 +38,9 @@
#include <linux/usb/ohci_pdriver.h>
#include <linux/dma-mapping.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 */

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

@ -41,12 +41,12 @@
#include <linux/usb/ohci_pdriver.h>
#include <linux/pm_runtime.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 = {

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

@ -26,9 +26,9 @@
#include <linux/serial_sci.h>
#include <linux/sh_dma.h>
#include <linux/sh_timer.h>
#include <mach/common.h>
#include <mach/r8a7790.h>
#include <asm/mach/arch.h>
#include "common.h"
#include "dma-register.h"
#include "irqs.h"

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

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

2
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"
#define MODEMR 0xe6160060

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

@ -34,11 +34,11 @@
#include <linux/dma-mapping.h>
#include <linux/platform_data/sh_ipmmu.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"

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

@ -33,11 +33,11 @@
#include <linux/platform_data/sh_ipmmu.h>
#include <linux/platform_data/irq-renesas-intc-irqpin.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"

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

2
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"
#define AVECR IOMEM(0xfe700040)
#define R8A7779_SCU_BASE 0xf0000000

2
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"
#define RST 0xe6160000
#define CA15BAR 0x0020

2
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"
#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)