Skip to content

L
linux-davinci
Commit 7639a454 authored by Paul Mundt's avatar Paul Mundt
Browse files
Options

sh: Migrate common board headers to mach-common/. 

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent f7275650
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 42 deletions
arch/sh/Makefile
View file @ 7639a454
...@@ -125,6 +125,9 @@ core-y += $(addprefix arch/sh/boards/, \ ...@@ -125,6 +125,9 @@ core-y += $(addprefix arch/sh/boards/, \
$(filter-out ., $(patsubst %,%/,$(machdir-y)))) $(filter-out ., $(patsubst %,%/,$(machdir-y))))
endif endif
# Common machine type headers. Not part of the arch/sh/boards/ hierarchy.
machdir-y += mach-common
# Companion chips # Companion chips
core-$(CONFIG_HD6446X_SERIES) += arch/sh/cchips/hd6446x/ core-$(CONFIG_HD6446X_SERIES) += arch/sh/cchips/hd6446x/
......
arch/sh/boards/board-magicpanelr2.c
View file @ 7639a454
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/mtd/physmap.h> #include <linux/mtd/physmap.h>
#include <linux/mtd/map.h> #include <linux/mtd/map.h>
#include <asm/magicpanelr2.h> #include <mach/magicpanelr2.h>
#include <asm/heartbeat.h> #include <asm/heartbeat.h>
#include <cpu/sh7720.h> #include <cpu/sh7720.h>
......
arch/sh/boards/board-sh7785lcr.c
View file @ 7639a454
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <linux/i2c-pca-platform.h> #include <linux/i2c-pca-platform.h>
#include <linux/i2c-algo-pca.h> #include <linux/i2c-algo-pca.h>
#include <asm/heartbeat.h> #include <asm/heartbeat.h>
#include <asm/sh7785lcr.h> #include <mach/sh7785lcr.h>
/* /*
* NOTE: This board has 2 physical memory maps. * NOTE: This board has 2 physical memory maps.
......
arch/sh/boards/board-shmin.c
View file @ 7639a454
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <asm/machvec.h> #include <asm/machvec.h>
#include <asm/shmin.h> #include <mach/shmin.h>
#include <asm/clock.h> #include <asm/clock.h>
#include <asm/io.h> #include <asm/io.h>
......
arch/sh/boards/mach-edosk7705/io.c
View file @ 7639a454
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/types.h> #include <linux/types.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/edosk7705/io.h> #include <mach/edosk7705.h>
#include <asm/addrspace.h> #include <asm/addrspace.h>
#define SMC_IOADDR 0xA2000000 #define SMC_IOADDR 0xA2000000
......
arch/sh/boards/mach-edosk7705/setup.c
View file @ 7639a454
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <asm/machvec.h> #include <asm/machvec.h>
#include <asm/edosk7705/io.h> #include <mach/edosk7705.h>
static void __init sh_edosk7705_init_irq(void) static void __init sh_edosk7705_init_irq(void)
{ {
......
arch/sh/boards/mach-highlander/irq-r7780mp.c
View file @ 7639a454
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/r7780rp.h> #include <mach/highlander.h>
enum { enum {
UNUSED = 0, UNUSED = 0,
......
arch/sh/boards/mach-highlander/irq-r7780rp.c
View file @ 7639a454
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/r7780rp.h> #include <mach/highlander.h>
enum { enum {
UNUSED = 0, UNUSED = 0,
......
arch/sh/boards/mach-highlander/irq-r7785rp.c
View file @ 7639a454
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/r7780rp.h> #include <mach/highlander.h>
enum { enum {
UNUSED = 0, UNUSED = 0,
......
arch/sh/boards/mach-highlander/psw.c
View file @ 7639a454
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <asm/r7780rp.h> #include <mach/highlander.h>
#include <asm/push-switch.h> #include <asm/push-switch.h>
static irqreturn_t psw_irq_handler(int irq, void *arg) static irqreturn_t psw_irq_handler(int irq, void *arg)
......
arch/sh/boards/mach-highlander/setup.c
View file @ 7639a454
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <linux/i2c.h> #include <linux/i2c.h>
#include <net/ax88796.h> #include <net/ax88796.h>
#include <asm/machvec.h> #include <asm/machvec.h>
#include <asm/r7780rp.h> #include <mach/highlander.h>
#include <asm/clock.h> #include <asm/clock.h>
#include <asm/heartbeat.h> #include <asm/heartbeat.h>
#include <asm/io.h> #include <asm/io.h>
......
arch/sh/boards/mach-hp6xx/hp6xx_apm.c
View file @ 7639a454
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <linux/apm-emulation.h> #include <linux/apm-emulation.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/adc.h> #include <asm/adc.h>
#include <asm/hp6xx.h> #include <mach/hp6xx.h>
/* percentage values */ /* percentage values */
#define APM_CRITICAL 10 #define APM_CRITICAL 10
......
arch/sh/boards/mach-hp6xx/pm.c
View file @ 7639a454
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <linux/time.h> #include <linux/time.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/hd64461.h> #include <asm/hd64461.h>
#include <asm/hp6xx.h> #include <mach/hp6xx.h>
#include <cpu/dac.h> #include <cpu/dac.h>
#include <asm/pm.h> #include <asm/pm.h>
......
arch/sh/boards/mach-hp6xx/setup.c
View file @ 7639a454
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <asm/hd64461.h> #include <asm/hd64461.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/hp6xx.h> #include <mach/hp6xx.h>
#include <cpu/dac.h> #include <cpu/dac.h>
#define SCPCR 0xa4000116 #define SCPCR 0xa4000116
......
arch/sh/boards/mach-lboxre2/irq.c
View file @ 7639a454
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <linux/irq.h> #include <linux/irq.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/lboxre2.h> #include <mach/lboxre2.h>
/* /*
* Initialize IRQ setting * Initialize IRQ setting
......
arch/sh/boards/mach-lboxre2/setup.c
View file @ 7639a454
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <linux/ata_platform.h> #include <linux/ata_platform.h>
#include <asm/machvec.h> #include <asm/machvec.h>
#include <asm/addrspace.h> #include <asm/addrspace.h>
#include <asm/lboxre2.h> #include <mach/lboxre2.h>
#include <asm/io.h> #include <asm/io.h>
static struct resource cf_ide_resources[] = { static struct resource cf_ide_resources[] = {
......
arch/sh/boards/mach-microdev/io.c
View file @ 7639a454
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/microdev.h> #include <mach/microdev.h>
/* /*
* we need to have a 'safe' address to re-direct all I/O requests * we need to have a 'safe' address to re-direct all I/O requests
......
arch/sh/boards/mach-microdev/irq.c
View file @ 7639a454
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/microdev.h> #include <mach/microdev.h>
#define NUM_EXTERNAL_IRQS 16 /* IRL0 .. IRL15 */ #define NUM_EXTERNAL_IRQS 16 /* IRL0 .. IRL15 */
......
arch/sh/boards/mach-microdev/setup.c
View file @ 7639a454
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <video/s1d13xxxfb.h> #include <video/s1d13xxxfb.h>
#include <asm/microdev.h> #include <mach/microdev.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/machvec.h> #include <asm/machvec.h>
......
arch/sh/boards/mach-migor/lcd_qvga.c
View file @ 7639a454
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <linux/gpio.h> #include <linux/gpio.h>
#include <video/sh_mobile_lcdc.h> #include <video/sh_mobile_lcdc.h>
#include <cpu/sh7722.h> #include <cpu/sh7722.h>
#include <asm/migor.h> #include <mach/migor.h>
/* LCD Module is a PH240320T according to board schematics. This module /* LCD Module is a PH240320T according to board schematics. This module
* is made up of a 240x320 LCD hooked up to a R61505U (or HX8347-A01?) * is made up of a 240x320 LCD hooked up to a R61505U (or HX8347-A01?)
......
arch/sh/boards/mach-migor/setup.c
View file @ 7639a454
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <asm/machvec.h> #include <asm/machvec.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/sh_keysc.h> #include <asm/sh_keysc.h>
#include <asm/migor.h> #include <mach/migor.h>
#include <cpu/sh7722.h> #include <cpu/sh7722.h>
/* Address IRQ Size Bus Description /* Address IRQ Size Bus Description
......
arch/sh/boards/mach-r2d/irq.c
View file @ 7639a454
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/rts7751r2d.h> #include <mach/r2d.h>
#define R2D_NR_IRL 13 #define R2D_NR_IRL 13
......
arch/sh/boards/mach-r2d/setup.c
View file @ 7639a454
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/spi_bitbang.h> #include <linux/spi/spi_bitbang.h>
#include <asm/machvec.h> #include <asm/machvec.h>
#include <asm/rts7751r2d.h> #include <mach/r2d.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/io_trapped.h> #include <asm/io_trapped.h>
#include <asm/spi.h> #include <asm/spi.h>
......
arch/sh/boards/mach-sdk7780/irq.c
View file @ 7639a454
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/sdk7780.h> #include <mach/sdk7780.h>
enum { enum {
UNUSED = 0, UNUSED = 0,
......
arch/sh/boards/mach-sdk7780/setup.c
View file @ 7639a454
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/ata_platform.h> #include <linux/ata_platform.h>
#include <asm/machvec.h> #include <asm/machvec.h>
#include <asm/sdk7780.h> #include <mach/sdk7780.h>
#include <asm/heartbeat.h> #include <asm/heartbeat.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/addrspace.h> #include <asm/addrspace.h>
......
arch/sh/boards/mach-sh7763rdp/irq.c
View file @ 7639a454
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <linux/irq.h> #include <linux/irq.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/sh7763rdp.h> #include <mach/sh7763rdp.h>
#define INTC_BASE (0xFFD00000) #define INTC_BASE (0xFFD00000)
#define INTC_INT2PRI7 (INTC_BASE+0x4001C) #define INTC_INT2PRI7 (INTC_BASE+0x4001C)
......
arch/sh/boards/mach-sh7763rdp/setup.c
View file @ 7639a454
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include <linux/mtd/physmap.h> #include <linux/mtd/physmap.h>
#include <linux/fb.h> #include <linux/fb.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/sh7763rdp.h> #include <mach/sh7763rdp.h>
#include <asm/sh_eth.h> #include <asm/sh_eth.h>
#include <asm/sh7760fb.h> #include <asm/sh7760fb.h>
......
arch/sh/boards/mach-snapgear/setup.c
View file @ 7639a454
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <asm/machvec.h> #include <asm/machvec.h>
#include <asm/snapgear.h> #include <mach/snapgear.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/io.h> #include <asm/io.h>
#include <cpu/timer.h> #include <cpu/timer.h>
......
arch/sh/boards/mach-systemh/io.c
View file @ 7639a454
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <asm/systemh7751.h> #include <mach/systemh7751.h>
#include <asm/addrspace.h> #include <asm/addrspace.h>
#include <asm/io.h> #include <asm/io.h>
......
arch/sh/boards/mach-systemh/irq.c
View file @ 7639a454
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/systemh7751.h> #include <mach/systemh7751.h>
#include <asm/smc37c93x.h> #include <asm/smc37c93x.h>
/* address of external interrupt mask register /* address of external interrupt mask register
......
arch/sh/boards/mach-systemh/setup.c
View file @ 7639a454
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <asm/machvec.h> #include <asm/machvec.h>
#include <asm/systemh7751.h> #include <mach/systemh7751.h>
extern void make_systemh_irq(unsigned int irq); extern void make_systemh_irq(unsigned int irq);
......
arch/sh/boards/mach-titan/io.c
View file @ 7639a454
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <asm/machvec.h> #include <asm/machvec.h>
#include <asm/addrspace.h> #include <asm/addrspace.h>
#include <asm/titan.h> #include <mach/titan.h>
#include <asm/io.h> #include <asm/io.h>
static inline unsigned int port2adr(unsigned int port) static inline unsigned int port2adr(unsigned int port)
......
arch/sh/boards/mach-titan/setup.c
View file @ 7639a454
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <asm/titan.h> #include <mach/titan.h>
#include <asm/io.h> #include <asm/io.h>
static void __init init_titan_irq(void) static void __init init_titan_irq(void)
......
arch/sh/drivers/pci/ops-lboxre2.c
View file @ 7639a454
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/lboxre2.h> #include <mach/lboxre2.h>
#include "pci-sh4.h" #include "pci-sh4.h"
static char lboxre2_irq_tab[] __initdata = { static char lboxre2_irq_tab[] __initdata = {
......
arch/sh/drivers/pci/ops-r7780rp.c
View file @ 7639a454
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <asm/r7780rp.h> #include <mach/highlander.h>
#include <asm/io.h> #include <asm/io.h>
#include "pci-sh4.h" #include "pci-sh4.h"
......
arch/sh/drivers/pci/ops-rts7751r2d.c
View file @ 7639a454
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/rts7751r2d.h> #include <mach/r2d.h>
#include "pci-sh4.h" #include "pci-sh4.h"
static u8 rts7751r2d_irq_tab[] __initdata = { static u8 rts7751r2d_irq_tab[] __initdata = {
......
arch/sh/drivers/pci/ops-sdk7780.c
View file @ 7639a454
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <asm/sdk7780.h> #include <mach/sdk7780.h>
#include <asm/io.h> #include <asm/io.h>
#include "pci-sh4.h" #include "pci-sh4.h"
......
arch/sh/drivers/pci/ops-titan.c
View file @ 7639a454
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/titan.h> #include <mach/titan.h>
#include "pci-sh4.h" #include "pci-sh4.h"
static char titan_irq_tab[] __initdata = { static char titan_irq_tab[] __initdata = {
......
drivers/input/touchscreen/hp680_ts_input.c
View file @ 7639a454
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/delay.h> #include <asm/delay.h>
#include <asm/adc.h> #include <asm/adc.h>
#include <asm/hp6xx.h> #include <mach/hp6xx.h>
#define MODNAME "hp680_ts_input" #define MODNAME "hp680_ts_input"
......
drivers/leds/leds-hp6xx.c
View file @ 7639a454
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/leds.h> #include <linux/leds.h>
#include <asm/hd64461.h> #include <asm/hd64461.h>
#include <asm/hp6xx.h> #include <mach/hp6xx.h>
static void hp6xxled_green_set(struct led_classdev *led_cdev, static void hp6xxled_green_set(struct led_classdev *led_cdev,
enum led_brightness value) enum led_brightness value)
......
drivers/rtc/rtc-ds1302.c
View file @ 7639a454
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#define RTC_SCLK 0x0400 #define RTC_SCLK 0x0400
#ifdef CONFIG_SH_SECUREEDGE5410 #ifdef CONFIG_SH_SECUREEDGE5410
#include <asm/snapgear.h> #include <mach/snapgear.h>
#define set_dp(x) SECUREEDGE_WRITE_IOPORT(x, 0x1c00) #define set_dp(x) SECUREEDGE_WRITE_IOPORT(x, 0x1c00)
#define get_dp() SECUREEDGE_READ_IOPORT() #define get_dp() SECUREEDGE_READ_IOPORT()
#else #else
......
drivers/video/backlight/hp680_bl.c
View file @ 7639a454
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <linux/backlight.h> #include <linux/backlight.h>
#include <cpu/dac.h> #include <cpu/dac.h>
#include <asm/hp6xx.h> #include <mach/hp6xx.h>
#include <asm/hd64461.h> #include <asm/hd64461.h>
#define HP680_MAX_INTENSITY 255 #define HP680_MAX_INTENSITY 255
......
sound/oss/sh_dac_audio.c
View file @ 7639a454
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <asm/cpu/dac.h> #include <asm/cpu/dac.h>
#include <asm/cpu/timer.h> #include <asm/cpu/timer.h>
#include <asm/machvec.h> #include <asm/machvec.h>
#include <asm/hp6xx.h> #include <mach/hp6xx.h>
#include <asm/hd64461.h> #include <asm/hd64461.h>
#define MODNAME "sh_dac_audio" #define MODNAME "sh_dac_audio"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment