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

+45 -42

58 changed files

expand all

arch

Makefile

boards

board-magicpanelr2.c

board-sh7785lcr.c

board-shmin.c

mach-edosk7705

io.c

setup.c

mach-highlander

irq-r7780mp.c

irq-r7780rp.c

irq-r7785rp.c

psw.c

setup.c

mach-hp6xx

hp6xx_apm.c

pm.c

setup.c

mach-lboxre2

irq.c

setup.c

mach-microdev

io.c

irq.c

setup.c

mach-migor

lcd_qvga.c

setup.c

mach-r2d

irq.c

setup.c

mach-sdk7780

irq.c

setup.c

mach-sh7763rdp

irq.c

setup.c

mach-snapgear

setup.c

mach-systemh

io.c

irq.c

setup.c

mach-titan

io.c

setup.c

drivers

pci

ops-lboxre2.c

ops-r7780rp.c

ops-rts7751r2d.c

ops-sdk7780.c

ops-titan.c

include

mach-common

mach

edosk7705.h

highlander.h

hp6xx.h

lboxre2.h

magicpanelr2.h

microdev.h

migor.h

r2d.h

sdk7780.h

sh7763rdp.h

sh7785lcr.h

shmin.h

snapgear.h

systemh7751.h

titan.h

drivers

input

touchscreen

hp680_ts_input.c

leds

leds-hp6xx.c

rtc

rtc-ds1302.c

video

backlight

hp680_bl.c

sound

oss

sh_dac_audio.c

arch/sh/Makefile

··· 125 125 $(filter-out ., $(patsubst %,%/,$(machdir-y)))) 126 126 endif 127 127 128 + # Common machine type headers. Not part of the arch/sh/boards/ hierarchy. 129 + machdir-y += mach-common 130 + 128 131 # Companion chips 129 132 core-$(CONFIG_HD6446X_SERIES) += arch/sh/cchips/hd6446x/ 130 133

+1 -1

arch/sh/boards/board-magicpanelr2.c

··· 18 18 #include <linux/mtd/partitions.h> 19 19 #include <linux/mtd/physmap.h> 20 20 #include <linux/mtd/map.h> 21 - #include <asm/magicpanelr2.h> 21 + #include <mach/magicpanelr2.h> 22 22 #include <asm/heartbeat.h> 23 23 #include <cpu/sh7720.h> 24 24

+1 -1

arch/sh/boards/board-sh7785lcr.c

··· 19 19 #include <linux/i2c-pca-platform.h> 20 20 #include <linux/i2c-algo-pca.h> 21 21 #include <asm/heartbeat.h> 22 - #include <asm/sh7785lcr.h> 22 + #include <mach/sh7785lcr.h> 23 23 24 24 /* 25 25 * NOTE: This board has 2 physical memory maps.

+1 -1

arch/sh/boards/board-shmin.c

··· 8 8 #include <linux/init.h> 9 9 #include <linux/irq.h> 10 10 #include <asm/machvec.h> 11 - #include <asm/shmin.h> 11 + #include <mach/shmin.h> 12 12 #include <asm/clock.h> 13 13 #include <asm/io.h> 14 14

+1 -1

arch/sh/boards/mach-edosk7705/io.c

··· 11 11 #include <linux/kernel.h> 12 12 #include <linux/types.h> 13 13 #include <asm/io.h> 14 - #include <asm/edosk7705/io.h> 14 + #include <mach/edosk7705.h> 15 15 #include <asm/addrspace.h> 16 16 17 17 #define SMC_IOADDR 0xA2000000

+1 -1

arch/sh/boards/mach-edosk7705/setup.c

··· 10 10 */ 11 11 #include <linux/init.h> 12 12 #include <asm/machvec.h> 13 - #include <asm/edosk7705/io.h> 13 + #include <mach/edosk7705.h> 14 14 15 15 static void __init sh_edosk7705_init_irq(void) 16 16 {

+1 -1

arch/sh/boards/mach-highlander/irq-r7780mp.c

··· 12 12 #include <linux/init.h> 13 13 #include <linux/irq.h> 14 14 #include <linux/io.h> 15 - #include <asm/r7780rp.h> 15 + #include <mach/highlander.h> 16 16 17 17 enum { 18 18 UNUSED = 0,

+1 -1

arch/sh/boards/mach-highlander/irq-r7780rp.c

··· 12 12 #include <linux/init.h> 13 13 #include <linux/irq.h> 14 14 #include <linux/io.h> 15 - #include <asm/r7780rp.h> 15 + #include <mach/highlander.h> 16 16 17 17 enum { 18 18 UNUSED = 0,

+1 -1

arch/sh/boards/mach-highlander/irq-r7785rp.c

··· 12 12 #include <linux/init.h> 13 13 #include <linux/irq.h> 14 14 #include <linux/io.h> 15 - #include <asm/r7780rp.h> 15 + #include <mach/highlander.h> 16 16 17 17 enum { 18 18 UNUSED = 0,

+1 -1

arch/sh/boards/mach-highlander/psw.c

··· 13 13 #include <linux/init.h> 14 14 #include <linux/interrupt.h> 15 15 #include <linux/platform_device.h> 16 - #include <asm/r7780rp.h> 16 + #include <mach/highlander.h> 17 17 #include <asm/push-switch.h> 18 18 19 19 static irqreturn_t psw_irq_handler(int irq, void *arg)

+1 -1

arch/sh/boards/mach-highlander/setup.c

··· 20 20 #include <linux/i2c.h> 21 21 #include <net/ax88796.h> 22 22 #include <asm/machvec.h> 23 - #include <asm/r7780rp.h> 23 + #include <mach/highlander.h> 24 24 #include <asm/clock.h> 25 25 #include <asm/heartbeat.h> 26 26 #include <asm/io.h>

+1 -1

arch/sh/boards/mach-hp6xx/hp6xx_apm.c

··· 14 14 #include <linux/apm-emulation.h> 15 15 #include <linux/io.h> 16 16 #include <asm/adc.h> 17 - #include <asm/hp6xx.h> 17 + #include <mach/hp6xx.h> 18 18 19 19 /* percentage values */ 20 20 #define APM_CRITICAL 10

+1 -1

arch/sh/boards/mach-hp6xx/pm.c

··· 12 12 #include <linux/time.h> 13 13 #include <asm/io.h> 14 14 #include <asm/hd64461.h> 15 - #include <asm/hp6xx.h> 15 + #include <mach/hp6xx.h> 16 16 #include <cpu/dac.h> 17 17 #include <asm/pm.h> 18 18

+1 -1

arch/sh/boards/mach-hp6xx/setup.c

··· 15 15 #include <asm/hd64461.h> 16 16 #include <asm/io.h> 17 17 #include <asm/irq.h> 18 - #include <asm/hp6xx.h> 18 + #include <mach/hp6xx.h> 19 19 #include <cpu/dac.h> 20 20 21 21 #define SCPCR 0xa4000116

+1 -1

arch/sh/boards/mach-lboxre2/irq.c

··· 15 15 #include <linux/irq.h> 16 16 #include <asm/irq.h> 17 17 #include <asm/io.h> 18 - #include <asm/lboxre2.h> 18 + #include <mach/lboxre2.h> 19 19 20 20 /* 21 21 * Initialize IRQ setting

+1 -1

arch/sh/boards/mach-lboxre2/setup.c

··· 16 16 #include <linux/ata_platform.h> 17 17 #include <asm/machvec.h> 18 18 #include <asm/addrspace.h> 19 - #include <asm/lboxre2.h> 19 + #include <mach/lboxre2.h> 20 20 #include <asm/io.h> 21 21 22 22 static struct resource cf_ide_resources[] = {

+1 -1

arch/sh/boards/mach-microdev/io.c

··· 15 15 #include <linux/pci.h> 16 16 #include <linux/wait.h> 17 17 #include <asm/io.h> 18 - #include <asm/microdev.h> 18 + #include <mach/microdev.h> 19 19 20 20 /* 21 21 * we need to have a 'safe' address to re-direct all I/O requests

+1 -1

arch/sh/boards/mach-microdev/irq.c

··· 14 14 #include <linux/interrupt.h> 15 15 #include <asm/system.h> 16 16 #include <asm/io.h> 17 - #include <asm/microdev.h> 17 + #include <mach/microdev.h> 18 18 19 19 #define NUM_EXTERNAL_IRQS 16 /* IRL0 .. IRL15 */ 20 20

+1 -1

arch/sh/boards/mach-microdev/setup.c

··· 14 14 #include <linux/platform_device.h> 15 15 #include <linux/ioport.h> 16 16 #include <video/s1d13xxxfb.h> 17 - #include <asm/microdev.h> 17 + #include <mach/microdev.h> 18 18 #include <asm/io.h> 19 19 #include <asm/machvec.h> 20 20

+1 -1

arch/sh/boards/mach-migor/lcd_qvga.c

··· 20 20 #include <linux/gpio.h> 21 21 #include <video/sh_mobile_lcdc.h> 22 22 #include <cpu/sh7722.h> 23 - #include <asm/migor.h> 23 + #include <mach/migor.h> 24 24 25 25 /* LCD Module is a PH240320T according to board schematics. This module 26 26 * is made up of a 240x320 LCD hooked up to a R61505U (or HX8347-A01?)

+1 -1

arch/sh/boards/mach-migor/setup.c

··· 25 25 #include <asm/machvec.h> 26 26 #include <asm/io.h> 27 27 #include <asm/sh_keysc.h> 28 - #include <asm/migor.h> 28 + #include <mach/migor.h> 29 29 #include <cpu/sh7722.h> 30 30 31 31 /* Address IRQ Size Bus Description

+1 -1

arch/sh/boards/mach-r2d/irq.c

··· 13 13 #include <linux/irq.h> 14 14 #include <linux/interrupt.h> 15 15 #include <linux/io.h> 16 - #include <asm/rts7751r2d.h> 16 + #include <mach/r2d.h> 17 17 18 18 #define R2D_NR_IRL 13 19 19

+1 -1

arch/sh/boards/mach-r2d/setup.c

··· 18 18 #include <linux/spi/spi.h> 19 19 #include <linux/spi/spi_bitbang.h> 20 20 #include <asm/machvec.h> 21 - #include <asm/rts7751r2d.h> 21 + #include <mach/r2d.h> 22 22 #include <asm/io.h> 23 23 #include <asm/io_trapped.h> 24 24 #include <asm/spi.h>

+1 -1

arch/sh/boards/mach-sdk7780/irq.c

··· 12 12 #include <linux/init.h> 13 13 #include <linux/irq.h> 14 14 #include <linux/io.h> 15 - #include <asm/sdk7780.h> 15 + #include <mach/sdk7780.h> 16 16 17 17 enum { 18 18 UNUSED = 0,

+1 -1

arch/sh/boards/mach-sdk7780/setup.c

··· 13 13 #include <linux/platform_device.h> 14 14 #include <linux/ata_platform.h> 15 15 #include <asm/machvec.h> 16 - #include <asm/sdk7780.h> 16 + #include <mach/sdk7780.h> 17 17 #include <asm/heartbeat.h> 18 18 #include <asm/io.h> 19 19 #include <asm/addrspace.h>

+1 -1

arch/sh/boards/mach-sh7763rdp/irq.c

··· 15 15 #include <linux/irq.h> 16 16 #include <asm/io.h> 17 17 #include <asm/irq.h> 18 - #include <asm/sh7763rdp.h> 18 + #include <mach/sh7763rdp.h> 19 19 20 20 #define INTC_BASE (0xFFD00000) 21 21 #define INTC_INT2PRI7 (INTC_BASE+0x4001C)

+1 -1

arch/sh/boards/mach-sh7763rdp/setup.c

··· 17 17 #include <linux/mtd/physmap.h> 18 18 #include <linux/fb.h> 19 19 #include <linux/io.h> 20 - #include <asm/sh7763rdp.h> 20 + #include <mach/sh7763rdp.h> 21 21 #include <asm/sh_eth.h> 22 22 #include <asm/sh7760fb.h> 23 23

+1 -1

arch/sh/boards/mach-snapgear/setup.c

··· 19 19 #include <linux/module.h> 20 20 #include <linux/sched.h> 21 21 #include <asm/machvec.h> 22 - #include <asm/snapgear.h> 22 + #include <mach/snapgear.h> 23 23 #include <asm/irq.h> 24 24 #include <asm/io.h> 25 25 #include <cpu/timer.h>

+1 -1

arch/sh/boards/mach-systemh/io.c

··· 9 9 #include <linux/kernel.h> 10 10 #include <linux/types.h> 11 11 #include <linux/pci.h> 12 - #include <asm/systemh7751.h> 12 + #include <mach/systemh7751.h> 13 13 #include <asm/addrspace.h> 14 14 #include <asm/io.h> 15 15

+1 -1

arch/sh/boards/mach-systemh/irq.c

··· 14 14 #include <linux/interrupt.h> 15 15 16 16 #include <asm/io.h> 17 - #include <asm/systemh7751.h> 17 + #include <mach/systemh7751.h> 18 18 #include <asm/smc37c93x.h> 19 19 20 20 /* address of external interrupt mask register

+1 -1

arch/sh/boards/mach-systemh/setup.c

··· 16 16 */ 17 17 #include <linux/init.h> 18 18 #include <asm/machvec.h> 19 - #include <asm/systemh7751.h> 19 + #include <mach/systemh7751.h> 20 20 21 21 extern void make_systemh_irq(unsigned int irq); 22 22

+1 -1

arch/sh/boards/mach-titan/io.c

··· 4 4 #include <linux/pci.h> 5 5 #include <asm/machvec.h> 6 6 #include <asm/addrspace.h> 7 - #include <asm/titan.h> 7 + #include <mach/titan.h> 8 8 #include <asm/io.h> 9 9 10 10 static inline unsigned int port2adr(unsigned int port)

+1 -1

arch/sh/boards/mach-titan/setup.c

··· 9 9 */ 10 10 #include <linux/init.h> 11 11 #include <linux/irq.h> 12 - #include <asm/titan.h> 12 + #include <mach/titan.h> 13 13 #include <asm/io.h> 14 14 15 15 static void __init init_titan_irq(void)

+1 -1

arch/sh/drivers/pci/ops-lboxre2.c

··· 10 10 #include <linux/init.h> 11 11 #include <linux/pci.h> 12 12 #include <linux/io.h> 13 - #include <asm/lboxre2.h> 13 + #include <mach/lboxre2.h> 14 14 #include "pci-sh4.h" 15 15 16 16 static char lboxre2_irq_tab[] __initdata = {

+1 -1

arch/sh/drivers/pci/ops-r7780rp.c

··· 13 13 #include <linux/init.h> 14 14 #include <linux/delay.h> 15 15 #include <linux/pci.h> 16 - #include <asm/r7780rp.h> 16 + #include <mach/highlander.h> 17 17 #include <asm/io.h> 18 18 #include "pci-sh4.h" 19 19

+1 -1

arch/sh/drivers/pci/ops-rts7751r2d.c

··· 15 15 #include <linux/init.h> 16 16 #include <linux/pci.h> 17 17 #include <linux/io.h> 18 - #include <asm/rts7751r2d.h> 18 + #include <mach/r2d.h> 19 19 #include "pci-sh4.h" 20 20 21 21 static u8 rts7751r2d_irq_tab[] __initdata = {

+1 -1

arch/sh/drivers/pci/ops-sdk7780.c

··· 13 13 #include <linux/init.h> 14 14 #include <linux/delay.h> 15 15 #include <linux/pci.h> 16 - #include <asm/sdk7780.h> 16 + #include <mach/sdk7780.h> 17 17 #include <asm/io.h> 18 18 #include "pci-sh4.h" 19 19

+1 -1

arch/sh/drivers/pci/ops-titan.c

··· 16 16 #include <linux/init.h> 17 17 #include <linux/pci.h> 18 18 #include <linux/io.h> 19 - #include <asm/titan.h> 19 + #include <mach/titan.h> 20 20 #include "pci-sh4.h" 21 21 22 22 static char titan_irq_tab[] __initdata = {

arch/sh/include/asm/edosk7705.h arch/sh/include/mach-common/mach/edosk7705.h

arch/sh/include/asm/hp6xx.h arch/sh/include/mach-common/mach/hp6xx.h

arch/sh/include/asm/lboxre2.h arch/sh/include/mach-common/mach/lboxre2.h

arch/sh/include/asm/magicpanelr2.h arch/sh/include/mach-common/mach/magicpanelr2.h

arch/sh/include/asm/microdev.h arch/sh/include/mach-common/mach/microdev.h

arch/sh/include/asm/migor.h arch/sh/include/mach-common/mach/migor.h

arch/sh/include/asm/r7780rp.h arch/sh/include/mach-common/mach/highlander.h

arch/sh/include/asm/rts7751r2d.h arch/sh/include/mach-common/mach/r2d.h

arch/sh/include/asm/sdk7780.h arch/sh/include/mach-common/mach/sdk7780.h

arch/sh/include/asm/sh7763rdp.h arch/sh/include/mach-common/mach/sh7763rdp.h

arch/sh/include/asm/sh7785lcr.h arch/sh/include/mach-common/mach/sh7785lcr.h

arch/sh/include/asm/shmin.h arch/sh/include/mach-common/mach/shmin.h

arch/sh/include/asm/snapgear.h arch/sh/include/mach-common/mach/snapgear.h

arch/sh/include/asm/systemh7751.h arch/sh/include/mach-common/mach/systemh7751.h

arch/sh/include/asm/titan.h arch/sh/include/mach-common/mach/titan.h

+1 -1

drivers/input/touchscreen/hp680_ts_input.c

··· 5 5 #include <asm/io.h> 6 6 #include <asm/delay.h> 7 7 #include <asm/adc.h> 8 - #include <asm/hp6xx.h> 8 + #include <mach/hp6xx.h> 9 9 10 10 #define MODNAME "hp680_ts_input" 11 11

+1 -1

drivers/leds/leds-hp6xx.c

··· 15 15 #include <linux/platform_device.h> 16 16 #include <linux/leds.h> 17 17 #include <asm/hd64461.h> 18 - #include <asm/hp6xx.h> 18 + #include <mach/hp6xx.h> 19 19 20 20 static void hp6xxled_green_set(struct led_classdev *led_cdev, 21 21 enum led_brightness value)

+1 -1

drivers/rtc/rtc-ds1302.c

··· 40 40 #define RTC_SCLK 0x0400 41 41 42 42 #ifdef CONFIG_SH_SECUREEDGE5410 43 - #include <asm/snapgear.h> 43 + #include <mach/snapgear.h> 44 44 #define set_dp(x) SECUREEDGE_WRITE_IOPORT(x, 0x1c00) 45 45 #define get_dp() SECUREEDGE_READ_IOPORT() 46 46 #else

+1 -1

drivers/video/backlight/hp680_bl.c

··· 19 19 #include <linux/backlight.h> 20 20 21 21 #include <cpu/dac.h> 22 - #include <asm/hp6xx.h> 22 + #include <mach/hp6xx.h> 23 23 #include <asm/hd64461.h> 24 24 25 25 #define HP680_MAX_INTENSITY 255

+1 -1

sound/oss/sh_dac_audio.c

··· 26 26 #include <asm/cpu/dac.h> 27 27 #include <asm/cpu/timer.h> 28 28 #include <asm/machvec.h> 29 - #include <asm/hp6xx.h> 29 + #include <mach/hp6xx.h> 30 30 #include <asm/hd64461.h> 31 31 32 32 #define MODNAME "sh_dac_audio"