diff options
Diffstat (limited to 'arch/arm/mach-s5pv210/include')
| -rw-r--r-- | arch/arm/mach-s5pv210/include/mach/cpu-freq-v210.h | 31 | ||||
| -rw-r--r-- | arch/arm/mach-s5pv210/include/mach/irqs.h | 4 | ||||
| -rw-r--r-- | arch/arm/mach-s5pv210/include/mach/map.h | 14 | ||||
| -rw-r--r-- | arch/arm/mach-s5pv210/include/mach/media.h | 26 | ||||
| -rw-r--r-- | arch/arm/mach-s5pv210/include/mach/memory.h | 4 | ||||
| -rw-r--r-- | arch/arm/mach-s5pv210/include/mach/pm-core.h | 3 | ||||
| -rw-r--r-- | arch/arm/mach-s5pv210/include/mach/regs-audss.h | 44 | ||||
| -rw-r--r-- | arch/arm/mach-s5pv210/include/mach/regs-clock.h | 31 | ||||
| -rw-r--r-- | arch/arm/mach-s5pv210/include/mach/regs-fb.h | 21 |
9 files changed, 24 insertions, 154 deletions
diff --git a/arch/arm/mach-s5pv210/include/mach/cpu-freq-v210.h b/arch/arm/mach-s5pv210/include/mach/cpu-freq-v210.h deleted file mode 100644 index 8274a01..0000000 --- a/arch/arm/mach-s5pv210/include/mach/cpu-freq-v210.h +++ /dev/null @@ -1,31 +0,0 @@ -/* arch/arm/mach-s5pv210/include/mach/cpu-freq-v210.h - * - * Copyright (c) 2010 Samsung Electronics Co., Ltd. - * - * S5PV210/S5PC110 CPU frequency scaling support - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. -*/ - -#ifndef __ASM_ARCH_CPU_FREQ_H -#define __ASM_ARCH_CPU_FREQ_H - -#include <linux/cpufreq.h> - -/* For cpu-freq driver */ -struct s5pv210_cpufreq_voltage { - unsigned int freq; /* kHz */ - unsigned long varm; /* uV */ - unsigned long vint; /* uV */ -}; - -struct s5pv210_cpufreq_data { - struct s5pv210_cpufreq_voltage *volt; - unsigned int size; -}; - -extern void s5pv210_cpufreq_set_platdata(struct s5pv210_cpufreq_data *pdata); - -#endif /* __ASM_ARCH_CPU_FREQ_H */ diff --git a/arch/arm/mach-s5pv210/include/mach/irqs.h b/arch/arm/mach-s5pv210/include/mach/irqs.h index 1e3ad87..b9f9ec3 100644 --- a/arch/arm/mach-s5pv210/include/mach/irqs.h +++ b/arch/arm/mach-s5pv210/include/mach/irqs.h @@ -99,8 +99,8 @@ #define IRQ_TC IRQ_PENDN #define IRQ_KEYPAD S5P_IRQ_VIC2(25) #define IRQ_CG S5P_IRQ_VIC2(26) -#define IRQ_SSS_HASH S5P_IRQ_VIC2(27) -#define IRQ_SSS_INT S5P_IRQ_VIC2(28) +#define IRQ_SSS_INT S5P_IRQ_VIC2(27) +#define IRQ_SSS_HASH S5P_IRQ_VIC2(28) #define IRQ_PCM2 S5P_IRQ_VIC2(29) #define IRQ_SDMIRQ S5P_IRQ_VIC2(30) #define IRQ_SDMFIQ S5P_IRQ_VIC2(31) diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h index 4f09492..1dd5883 100644 --- a/arch/arm/mach-s5pv210/include/mach/map.h +++ b/arch/arm/mach-s5pv210/include/mach/map.h @@ -16,11 +16,7 @@ #include <plat/map-base.h> #include <plat/map-s5p.h> -#ifdef CONFIG_CPU_S5PC110 -#define S5PV210_PA_SDRAM 0x30000000 -#else #define S5PV210_PA_SDRAM 0x20000000 -#endif #define S5PV210_PA_SROM_BANK5 0xA8000000 @@ -63,15 +59,11 @@ #define S5PV210_PA_CFCON 0xE8200000 -#define S5PV210_PA_ACE 0xEA000000 - #define S5PV210_PA_HSMMC(x) (0xEB000000 + ((x) * 0x100000)) #define S5PV210_PA_HSOTG 0xEC000000 #define S5PV210_PA_HSPHY 0xEC100000 -#define S5PV210_PA_AUDSS 0xEEE10000 - #define S5PV210_PA_IIS0 0xEEE30000 #define S5PV210_PA_IIS1 0xE2100000 #define S5PV210_PA_IIS2 0xE2A00000 @@ -107,8 +99,8 @@ #define S3C_PA_IIC1 S5PV210_PA_IIC1 #define S3C_PA_IIC2 S5PV210_PA_IIC2 #define S3C_PA_RTC S5PV210_PA_RTC -#define S3C_PA_WDT S5PV210_PA_WATCHDOG #define S3C_PA_USB_HSOTG S5PV210_PA_HSOTG +#define S3C_PA_WDT S5PV210_PA_WATCHDOG #define S5P_PA_CHIPID S5PV210_PA_CHIPID #define S5P_PA_FIMC0 S5PV210_PA_FIMC0 @@ -121,15 +113,11 @@ #define S5P_PA_SROMC S5PV210_PA_SROMC #define S5P_PA_SYSCON S5PV210_PA_SYSCON #define S5P_PA_TIMER S5PV210_PA_TIMER -#define S5P_PA_HSOTG S5PV210_PA_HSOTG -#define S5P_PA_HSPHY S5PV210_PA_HSPHY #define SAMSUNG_PA_ADC S5PV210_PA_ADC #define SAMSUNG_PA_CFCON S5PV210_PA_CFCON #define SAMSUNG_PA_KEYPAD S5PV210_PA_KEYPAD -#define S5P_PA_ACE S5PV210_PA_ACE - /* UART */ #define S3C_VA_UARTx(x) (S3C_VA_UART + ((x) * S3C_UART_OFFSET)) diff --git a/arch/arm/mach-s5pv210/include/mach/media.h b/arch/arm/mach-s5pv210/include/mach/media.h deleted file mode 100644 index 573cd8f..0000000 --- a/arch/arm/mach-s5pv210/include/mach/media.h +++ /dev/null @@ -1,26 +0,0 @@ -/* linux/arch/arm/mach-s5pv210/include/mach/media.h - * - * Copyright (c) 2010 Samsung Electronics Co., Ltd. - * http://www.samsung.com/ - * - * Samsung Media device descriptions for s5pv210 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. -*/ - -#ifndef _S5PV210_MEDIA_H -#define _S5PV210_MEDIA_H - -#define S5P_MDEV_FIMC0 0 -#define S5P_MDEV_FIMC1 1 -#define S5P_MDEV_FIMC2 2 -#define S5P_MDEV_MFC 4 -#define S5P_MDEV_JPEG 5 -#define S5P_MDEV_FIMD 6 -#define S5P_MDEV_FIMG2D 7 -#define S5P_MDEV_TEXSTREAM 8 - -#define S5P_RANGE_MFC SZ_256M -#endif diff --git a/arch/arm/mach-s5pv210/include/mach/memory.h b/arch/arm/mach-s5pv210/include/mach/memory.h index 5c42a7a..7b5fcf0 100644 --- a/arch/arm/mach-s5pv210/include/mach/memory.h +++ b/arch/arm/mach-s5pv210/include/mach/memory.h @@ -13,11 +13,7 @@ #ifndef __ASM_ARCH_MEMORY_H #define __ASM_ARCH_MEMORY_H -#ifdef CONFIG_CPU_S5PC110 -#define PLAT_PHYS_OFFSET UL(0x30000000) -#else #define PLAT_PHYS_OFFSET UL(0x20000000) -#endif #define CONSISTENT_DMA_SIZE (SZ_8M + SZ_4M + SZ_2M) /* diff --git a/arch/arm/mach-s5pv210/include/mach/pm-core.h b/arch/arm/mach-s5pv210/include/mach/pm-core.h index 3e22109..e8d394f 100644 --- a/arch/arm/mach-s5pv210/include/mach/pm-core.h +++ b/arch/arm/mach-s5pv210/include/mach/pm-core.h @@ -41,6 +41,3 @@ static inline void s3c_pm_arch_update_uart(void __iomem *regs, { /* nothing here yet */ } - -static inline void s3c_pm_restored_gpios(void) { } -static inline void s3c_pm_saved_gpios(void) { } diff --git a/arch/arm/mach-s5pv210/include/mach/regs-audss.h b/arch/arm/mach-s5pv210/include/mach/regs-audss.h deleted file mode 100644 index cb6ccd1..0000000 --- a/arch/arm/mach-s5pv210/include/mach/regs-audss.h +++ /dev/null @@ -1,44 +0,0 @@ -/* arch/arm/mach-s5pv210/include/mach/regs-audss.h - * - * Copyright 2011 Samsung Electronics - * - * S5PV2XX Audio SubSystem clock register definitions - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. -*/ - -#ifndef __MACH_REGS_AUDSS_H -#define __MACH_REGS_AUDSS_H __FILE__ - -#define S5P_AUDSSREG(x) (S5P_VA_AUDSS + (x)) - -#define S5P_CLKSRC_AUDSS S5P_AUDSSREG(0x0) -#define S5P_CLKDIV_AUDSS S5P_AUDSSREG(0x4) -#define S5P_CLKGATE_AUDSS S5P_AUDSSREG(0x8) - -/* CLKSRC0 */ -#define S5P_AUDSS_CLKSRC_MAIN_MASK (0x1<<0) -#define S5P_AUDSS_CLKSRC_MAIN_SHIFT (0) -#define S5P_AUDSS_CLKSRC_BUSCLK_MASK (0x1<<1) -#define S5P_AUDSS_CLKSRC_BUSCLK_SHIFT (1) -#define S5P_AUDSS_CLKSRC_I2SCLK_MASK (0x3<<2) -#define S5P_AUDSS_CLKSRC_I2SCLK_SHIFT (2) - -/* CLKDIV0 */ -#define S5P_AUDSS_CLKDIV_BUSCLK_MASK (0xf<<0) -#define S5P_AUDSS_CLKDIV_BUSCLK_SHIFT (0) -#define S5P_AUDSS_CLKDIV_I2SCLK_MASK (0xf<<4) -#define S5P_AUDSS_CLKDIV_I2SCLK_SHIFT (4) - -/* IP Clock Gate 0 Registers */ -#define S5P_AUDSS_CLKGATE_HCLKRP (1<<0) -#define S5P_AUDSS_CLKGATE_HCLKBUF (1<<1) -#define S5P_AUDSS_CLKGATE_HCLKDMA (1<<2) -#define S5P_AUDSS_CLKGATE_HCLKHWA (1<<3) -#define S5P_AUDSS_CLKGATE_HCLKUART (1<<4) -#define S5P_AUDSS_CLKGATE_HCLKI2S (1<<5) -#define S5P_AUDSS_CLKGATE_CLKI2S (1<<6) - -#endif /* _MACH_REGS_AUDSS_H */ diff --git a/arch/arm/mach-s5pv210/include/mach/regs-clock.h b/arch/arm/mach-s5pv210/include/mach/regs-clock.h index 7a843d1..78925c5 100644 --- a/arch/arm/mach-s5pv210/include/mach/regs-clock.h +++ b/arch/arm/mach-s5pv210/include/mach/regs-clock.h @@ -118,32 +118,6 @@ #define S5P_CLKDIV6_ONEDRAM_SHIFT (28) #define S5P_CLKDIV6_ONEDRAM_MASK (0xF << S5P_CLKDIV6_ONEDRAM_SHIFT) -/* CLK_OUT register */ -#define S5P_CLKOUT_DIVVAL_SHIFT (20) -#define S5P_CLKOUT_DIVVAL_MASK (0xF << S5P_CLKOUT_DIVVAL_SHIFT) -#define S5P_CLKOUT_CLKSEL_SHIFT (12) -#define S5P_CLKOUT_CLKSEL_MASK (0x1F << S5P_CLKOUT_CLKSEL_SHIFT) -#define S5P_CLKOUT_CLKSEL_APLL (0 << S5P_CLKOUT_CLKSEL_SHIFT) -#define S5P_CLKOUT_CLKSEL_MPLL (1 << S5P_CLKOUT_CLKSEL_SHIFT) -#define S5P_CLKOUT_CLKSEL_EPLL (2 << S5P_CLKOUT_CLKSEL_SHIFT) -#define S5P_CLKOUT_CLKSEL_VPLL (3 << S5P_CLKOUT_CLKSEL_SHIFT) -#define S5P_CLKOUT_CLKSEL_SCLK_USBPHY0 (4 << S5P_CLKOUT_CLKSEL_SHIFT) -#define S5P_CLKOUT_CLKSEL_SCLK_USBPHY1 (5 << S5P_CLKOUT_CLKSEL_SHIFT) -#define S5P_CLKOUT_CLKSEL_SCLK_HDMIPHY (6 << S5P_CLKOUT_CLKSEL_SHIFT) -#define S5P_CLKOUT_CLKSEL_RTC (7 << S5P_CLKOUT_CLKSEL_SHIFT) -#define S5P_CLKOUT_CLKSEL_TICK (8 << S5P_CLKOUT_CLKSEL_SHIFT) -#define S5P_CLKOUT_CLKSEL_HCLK200 (9 << S5P_CLKOUT_CLKSEL_SHIFT) -#define S5P_CLKOUT_CLKSEL_PCLK100 (10 << S5P_CLKOUT_CLKSEL_SHIFT) -#define S5P_CLKOUT_CLKSEL_HCLK166 (11 << S5P_CLKOUT_CLKSEL_SHIFT) -#define S5P_CLKOUT_CLKSEL_PCLK83 (12 << S5P_CLKOUT_CLKSEL_SHIFT) -#define S5P_CLKOUT_CLKSEL_HCLK133 (13 << S5P_CLKOUT_CLKSEL_SHIFT) -#define S5P_CLKOUT_CLKSEL_PCLK66 (14 << S5P_CLKOUT_CLKSEL_SHIFT) -#define S5P_CLKOUT_CLKSEL_ARMCLK (15 << S5P_CLKOUT_CLKSEL_SHIFT) -#define S5P_CLKOUT_CLKSEL_SCLK_HPM (16 << S5P_CLKOUT_CLKSEL_SHIFT) -#define S5P_CLKOUT_CLKSEL_XXTI (17 << S5P_CLKOUT_CLKSEL_SHIFT) -#define S5P_CLKOUT_CLKSEL_XUSBXTI (18 << S5P_CLKOUT_CLKSEL_SHIFT) -#define S5P_CLKOUT_CLKSEL_DOUT (19 << S5P_CLKOUT_CLKSEL_SHIFT) - #define S5P_SWRESET S5P_CLKREG(0x2000) #define S5P_ARM_MCS_CON S5P_CLKREG(0x6100) @@ -223,11 +197,6 @@ #define S5P_OTHERS_RET_MMC (1 << 29) #define S5P_OTHERS_RET_UART (1 << 28) #define S5P_OTHERS_USB_SIG_MASK (1 << 16) -#define S5P_OTHERS_CLKOUT_SHIFT (8) -#define S5P_OTHERS_CLKOUT_MASK (0x3 << S5P_OTHERS_CLKOUT_SHIFT) -#define S5P_OTHERS_CLKOUT_SYSCON (0 << S5P_OTHERS_CLKOUT_SHIFT) -#define S5P_OTHERS_CLKOUT_XXIT (2 << S5P_OTHERS_CLKOUT_SHIFT) -#define S5P_OTHERS_CLKOUT_XUSBXTI (3 << S5P_OTHERS_CLKOUT_SHIFT) /* S5P_DAC_CONTROL */ #define S5P_DAC_ENABLE (1) diff --git a/arch/arm/mach-s5pv210/include/mach/regs-fb.h b/arch/arm/mach-s5pv210/include/mach/regs-fb.h new file mode 100644 index 0000000..60d9929 --- /dev/null +++ b/arch/arm/mach-s5pv210/include/mach/regs-fb.h @@ -0,0 +1,21 @@ +/* + * Copyright 2010 Ben Dooks <ben-linux@fluff.org> + * + * Dummy framebuffer to allow build for the moment. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. +*/ + +#ifndef __ASM_ARCH_MACH_REGS_FB_H +#define __ASM_ARCH_MACH_REGS_FB_H __FILE__ + +#include <plat/regs-fb-v4.h> + +static inline unsigned int s3c_fb_pal_reg(unsigned int window, int reg) +{ + return 0x2400 + (window * 256 *4 ) + reg; +} + +#endif /* __ASM_ARCH_MACH_REGS_FB_H */ |