Skip to content

L
linux
Commit b08b69a1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 's5p-fixes-for-linus' of... 

Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: S5PV210: Fix regulator names
  ARM: S5PV210: Update max8998_platform_data
  ARM: SAMSUNG: Drop exporting s3c24xx_ts_set_platdata
  ARM: S5P: Fix end address in memory resource information for UART devices
  ARM: S5P64X0: Cleanup map.h file
  ARM: S5P6442: Cleanup map.h file
  ARM: S5PC100: Clenaup map.h file
  ARM: S5PV210: Cleanup map.h file
  ARM: S5PV310: Cleanup map.h file
parents b4f5c462 d1061331
Show whitespace changes
Inline Side-by-side
Showing with 342 additions and 363 deletions
arch/arm/mach-s5p6442/include/mach/map.h
View file @ b08b69a1
/* linux/arch/arm/mach-s5p6442/include/mach/map.h /* linux/arch/arm/mach-s5p6442/include/mach/map.h
* *
* Copyright (c) 2010 Samsung Electronics Co., Ltd. * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com/ * http://www.samsung.com/
* *
* S5P6442 - Memory map definitions * S5P6442 - Memory map definitions
...@@ -16,56 +16,61 @@ ...@@ -16,56 +16,61 @@
#include <plat/map-base.h> #include <plat/map-base.h>
#include <plat/map-s5p.h> #include <plat/map-s5p.h>
#define S5P6442_PA_CHIPID (0xE0000000) #define S5P6442_PA_SDRAM 0x20000000
#define S5P_PA_CHIPID S5P6442_PA_CHIPID
#define S5P6442_PA_SYSCON (0xE0100000) #define S5P6442_PA_I2S0 0xC0B00000
#define S5P_PA_SYSCON S5P6442_PA_SYSCON #define S5P6442_PA_I2S1 0xF2200000
#define S5P6442_PA_GPIO (0xE0200000) #define S5P6442_PA_CHIPID 0xE0000000
#define S5P6442_PA_VIC0 (0xE4000000) #define S5P6442_PA_SYSCON 0xE0100000
#define S5P6442_PA_VIC1 (0xE4100000)
#define S5P6442_PA_VIC2 (0xE4200000)
#define S5P6442_PA_SROMC (0xE7000000) #define S5P6442_PA_GPIO 0xE0200000
#define S5P_PA_SROMC S5P6442_PA_SROMC
#define S5P6442_PA_MDMA 0xE8000000 #define S5P6442_PA_VIC0 0xE4000000
#define S5P6442_PA_PDMA 0xE9000000 #define S5P6442_PA_VIC1 0xE4100000
#define S5P6442_PA_VIC2 0xE4200000
#define S5P6442_PA_TIMER (0xEA000000) #define S5P6442_PA_SROMC 0xE7000000
#define S5P_PA_TIMER S5P6442_PA_TIMER
#define S5P6442_PA_SYSTIMER (0xEA100000) #define S5P6442_PA_MDMA 0xE8000000
#define S5P6442_PA_PDMA 0xE9000000
#define S5P6442_PA_WATCHDOG (0xEA200000) #define S5P6442_PA_TIMER 0xEA000000
#define S5P6442_PA_UART (0xEC000000) #define S5P6442_PA_SYSTIMER 0xEA100000
#define S5P_PA_UART0 (S5P6442_PA_UART + 0x0) #define S5P6442_PA_WATCHDOG 0xEA200000
#define S5P_PA_UART1 (S5P6442_PA_UART + 0x400)
#define S5P_PA_UART2 (S5P6442_PA_UART + 0x800)
#define S5P_SZ_UART SZ_256
#define S5P6442_PA_IIC0 (0xEC100000) #define S5P6442_PA_UART 0xEC000000
#define S5P6442_PA_SDRAM (0x20000000) #define S5P6442_PA_IIC0 0xEC100000
#define S5P_PA_SDRAM S5P6442_PA_SDRAM
#define S5P6442_PA_SPI 0xEC300000 #define S5P6442_PA_SPI 0xEC300000
/* I2S */
#define S5P6442_PA_I2S0 0xC0B00000
#define S5P6442_PA_I2S1 0xF2200000
/* PCM */
#define S5P6442_PA_PCM0 0xF2400000 #define S5P6442_PA_PCM0 0xF2400000
#define S5P6442_PA_PCM1 0xF2500000 #define S5P6442_PA_PCM1 0xF2500000
/* compatibiltiy defines. */ /* Compatibiltiy Defines */
#define S3C_PA_IIC S5P6442_PA_IIC0
#define S3C_PA_WDT S5P6442_PA_WATCHDOG #define S3C_PA_WDT S5P6442_PA_WATCHDOG
#define S5P_PA_CHIPID S5P6442_PA_CHIPID
#define S5P_PA_SDRAM S5P6442_PA_SDRAM
#define S5P_PA_SROMC S5P6442_PA_SROMC
#define S5P_PA_SYSCON S5P6442_PA_SYSCON
#define S5P_PA_TIMER S5P6442_PA_TIMER
/* UART */
#define S3C_PA_UART S5P6442_PA_UART #define S3C_PA_UART S5P6442_PA_UART
#define S3C_PA_IIC S5P6442_PA_IIC0
#define S5P_PA_UART(x) (S3C_PA_UART + ((x) * S3C_UART_OFFSET))
#define S5P_PA_UART0 S5P_PA_UART(0)
#define S5P_PA_UART1 S5P_PA_UART(1)
#define S5P_PA_UART2 S5P_PA_UART(2)
#define S5P_SZ_UART SZ_256
#endif /* __ASM_ARCH_MAP_H */ #endif /* __ASM_ARCH_MAP_H */
arch/arm/mach-s5p64x0/include/mach/map.h
View file @ b08b69a1
/* linux/arch/arm/mach-s5p64x0/include/mach/map.h /* linux/arch/arm/mach-s5p64x0/include/mach/map.h
* *
* Copyright (c) 2009-2010 Samsung Electronics Co., Ltd. * Copyright (c) 2009-2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com * http://www.samsung.com
* *
* S5P64X0 - Memory map definitions * S5P64X0 - Memory map definitions
...@@ -16,64 +16,46 @@ ...@@ -16,64 +16,46 @@
#include <plat/map-base.h> #include <plat/map-base.h>
#include <plat/map-s5p.h> #include <plat/map-s5p.h>
#define S5P64X0_PA_SDRAM (0x20000000) #define S5P64X0_PA_SDRAM 0x20000000
#define S5P64X0_PA_CHIPID (0xE0000000) #define S5P64X0_PA_CHIPID 0xE0000000
#define S5P_PA_CHIPID S5P64X0_PA_CHIPID
#define S5P64X0_PA_SYSCON (0xE0100000)
#define S5P_PA_SYSCON S5P64X0_PA_SYSCON
#define S5P64X0_PA_GPIO (0xE0308000)
#define S5P64X0_PA_VIC0 (0xE4000000)
#define S5P64X0_PA_VIC1 (0xE4100000)
#define S5P64X0_PA_SROMC (0xE7000000) #define S5P64X0_PA_SYSCON 0xE0100000
#define S5P_PA_SROMC S5P64X0_PA_SROMC
#define S5P64X0_PA_PDMA (0xE9000000)
#define S5P64X0_PA_TIMER (0xEA000000)
#define S5P_PA_TIMER S5P64X0_PA_TIMER
#define S5P64X0_PA_RTC (0xEA100000) #define S5P64X0_PA_GPIO 0xE0308000
#define S5P64X0_PA_WDT (0xEA200000) #define S5P64X0_PA_VIC0 0xE4000000
#define S5P64X0_PA_VIC1 0xE4100000
#define S5P6440_PA_UART(x) (0xEC000000 + ((x) * S3C_UART_OFFSET)) #define S5P64X0_PA_SROMC 0xE7000000
#define S5P6450_PA_UART(x) ((x < 5) ? (0xEC800000 + ((x) * S3C_UART_OFFSET)) : (0xEC000000))
#define S5P_PA_UART0 S5P6450_PA_UART(0) #define S5P64X0_PA_PDMA 0xE9000000
#define S5P_PA_UART1 S5P6450_PA_UART(1)
#define S5P_PA_UART2 S5P6450_PA_UART(2)
#define S5P_PA_UART3 S5P6450_PA_UART(3)
#define S5P_PA_UART4 S5P6450_PA_UART(4)
#define S5P_PA_UART5 S5P6450_PA_UART(5)
#define S5P_SZ_UART SZ_256 #define S5P64X0_PA_TIMER 0xEA000000
#define S5P64X0_PA_RTC 0xEA100000
#define S5P64X0_PA_WDT 0xEA200000
#define S5P6440_PA_IIC0 (0xEC104000) #define S5P6440_PA_IIC0 0xEC104000
#define S5P6440_PA_IIC1 (0xEC20F000) #define S5P6440_PA_IIC1 0xEC20F000
#define S5P6450_PA_IIC0 (0xEC100000) #define S5P6450_PA_IIC0 0xEC100000
#define S5P6450_PA_IIC1 (0xEC200000) #define S5P6450_PA_IIC1 0xEC200000
#define S5P64X0_PA_SPI0 (0xEC400000) #define S5P64X0_PA_SPI0 0xEC400000
#define S5P64X0_PA_SPI1 (0xEC500000) #define S5P64X0_PA_SPI1 0xEC500000
#define S5P64X0_PA_HSOTG (0xED100000) #define S5P64X0_PA_HSOTG 0xED100000
#define S5P64X0_PA_HSMMC(x) (0xED800000 + ((x) * 0x100000)) #define S5P64X0_PA_HSMMC(x) (0xED800000 + ((x) * 0x100000))
#define S5P64X0_PA_I2S (0xF2000000) #define S5P64X0_PA_I2S 0xF2000000
#define S5P6450_PA_I2S1 0xF2800000 #define S5P6450_PA_I2S1 0xF2800000
#define S5P6450_PA_I2S2 0xF2900000 #define S5P6450_PA_I2S2 0xF2900000
#define S5P64X0_PA_PCM (0xF2100000) #define S5P64X0_PA_PCM 0xF2100000
#define S5P64X0_PA_ADC (0xF3000000) #define S5P64X0_PA_ADC 0xF3000000
/* compatibiltiy defines. */ /* Compatibiltiy Defines */
#define S3C_PA_HSMMC0 S5P64X0_PA_HSMMC(0) #define S3C_PA_HSMMC0 S5P64X0_PA_HSMMC(0)
#define S3C_PA_HSMMC1 S5P64X0_PA_HSMMC(1) #define S3C_PA_HSMMC1 S5P64X0_PA_HSMMC(1)
...@@ -83,6 +65,25 @@ ...@@ -83,6 +65,25 @@
#define S3C_PA_RTC S5P64X0_PA_RTC #define S3C_PA_RTC S5P64X0_PA_RTC
#define S3C_PA_WDT S5P64X0_PA_WDT #define S3C_PA_WDT S5P64X0_PA_WDT
#define S5P_PA_CHIPID S5P64X0_PA_CHIPID
#define S5P_PA_SROMC S5P64X0_PA_SROMC
#define S5P_PA_SYSCON S5P64X0_PA_SYSCON
#define S5P_PA_TIMER S5P64X0_PA_TIMER
#define SAMSUNG_PA_ADC S5P64X0_PA_ADC #define SAMSUNG_PA_ADC S5P64X0_PA_ADC
/* UART */
#define S5P6440_PA_UART(x) (0xEC000000 + ((x) * S3C_UART_OFFSET))
#define S5P6450_PA_UART(x) ((x < 5) ? (0xEC800000 + ((x) * S3C_UART_OFFSET)) : (0xEC000000))
#define S5P_PA_UART0 S5P6450_PA_UART(0)
#define S5P_PA_UART1 S5P6450_PA_UART(1)
#define S5P_PA_UART2 S5P6450_PA_UART(2)
#define S5P_PA_UART3 S5P6450_PA_UART(3)
#define S5P_PA_UART4 S5P6450_PA_UART(4)
#define S5P_PA_UART5 S5P6450_PA_UART(5)
#define S5P_SZ_UART SZ_256
#endif /* __ASM_ARCH_MAP_H */ #endif /* __ASM_ARCH_MAP_H */
arch/arm/mach-s5pc100/include/mach/map.h
View file @ b08b69a1
/* linux/arch/arm/mach-s5pc100/include/mach/map.h /* linux/arch/arm/mach-s5pc100/include/mach/map.h
*
* Copyright (c) 2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
* *
* Copyright 2009 Samsung Electronics Co. * Copyright 2009 Samsung Electronics Co.
* Byungho Min <bhmin@samsung.com> * Byungho Min <bhmin@samsung.com>
...@@ -16,145 +19,115 @@ ...@@ -16,145 +19,115 @@
#include <plat/map-base.h> #include <plat/map-base.h>
#include <plat/map-s5p.h> #include <plat/map-s5p.h>
/* #define S5PC100_PA_SDRAM 0x20000000
* map-base.h has already defined virtual memory address
* S3C_VA_IRQ S3C_ADDR(0x00000000) irq controller(s)
* S3C_VA_SYS S3C_ADDR(0x00100000) system control
* S3C_VA_MEM S3C_ADDR(0x00200000) system control (not used)
* S3C_VA_TIMER S3C_ADDR(0x00300000) timer block
* S3C_VA_WATCHDOG S3C_ADDR(0x00400000) watchdog
* S3C_VA_UART S3C_ADDR(0x01000000) UART
*
* S5PC100 specific virtual memory address can be defined here
* S5PC1XX_VA_GPIO S3C_ADDR(0x00500000) GPIO
*
*/
#define S5PC100_PA_ONENAND_BUF (0xB0000000) #define S5PC100_PA_ONENAND 0xE7100000
#define S5PC100_SZ_ONENAND_BUF (SZ_256M - SZ_32M) #define S5PC100_PA_ONENAND_BUF 0xB0000000
/* Chip ID */ #define S5PC100_PA_CHIPID 0xE0000000
#define S5PC100_PA_CHIPID (0xE0000000) #define S5PC100_PA_SYSCON 0xE0100000
#define S5P_PA_CHIPID S5PC100_PA_CHIPID
#define S5PC100_PA_SYSCON (0xE0100000) #define S5PC100_PA_OTHERS 0xE0200000
#define S5P_PA_SYSCON S5PC100_PA_SYSCON
#define S5PC100_PA_OTHERS (0xE0200000)
#define S5PC100_VA_OTHERS (S3C_VA_SYS + 0x10000)
#define S5PC100_PA_GPIO (0xE0300000) #define S5PC100_PA_GPIO 0xE0300000
#define S5PC1XX_VA_GPIO S3C_ADDR(0x00500000)
/* Interrupt */ #define S5PC100_PA_VIC0 0xE4000000
#define S5PC100_PA_VIC0 (0xE4000000) #define S5PC100_PA_VIC1 0xE4100000
#define S5PC100_PA_VIC1 (0xE4100000) #define S5PC100_PA_VIC2 0xE4200000
#define S5PC100_PA_VIC2 (0xE4200000)
#define S5PC100_VA_VIC S3C_VA_IRQ
#define S5PC100_VA_VIC_OFFSET 0x10000
#define S5PC1XX_VA_VIC(x) (S5PC100_VA_VIC + ((x) * S5PC100_VA_VIC_OFFSET))
#define S5PC100_PA_SROMC (0xE7000000) #define S5PC100_PA_SROMC 0xE7000000
#define S5P_PA_SROMC S5PC100_PA_SROMC
#define S5PC100_PA_ONENAND (0xE7100000)
#define S5PC100_PA_CFCON (0xE7800000)
/* DMA */
#define S5PC100_PA_MDMA (0xE8100000)
#define S5PC100_PA_PDMA0 (0xE9000000)
#define S5PC100_PA_PDMA1 (0xE9200000)
/* Timer */
#define S5PC100_PA_TIMER (0xEA000000)
#define S5P_PA_TIMER S5PC100_PA_TIMER
#define S5PC100_PA_SYSTIMER (0xEA100000) #define S5PC100_PA_CFCON 0xE7800000
#define S5PC100_PA_WATCHDOG (0xEA200000) #define S5PC100_PA_MDMA 0xE8100000
#define S5PC100_PA_RTC (0xEA300000) #define S5PC100_PA_PDMA0 0xE9000000
#define S5PC100_PA_PDMA1 0xE9200000
#define S5PC100_PA_UART (0xEC000000) #define S5PC100_PA_TIMER 0xEA000000
#define S5PC100_PA_SYSTIMER 0xEA100000
#define S5PC100_PA_WATCHDOG 0xEA200000
#define S5PC100_PA_RTC 0xEA300000
#define S5P_PA_UART0 (S5PC100_PA_UART + 0x0) #define S5PC100_PA_UART 0xEC000000
#define S5P_PA_UART1 (S5PC100_PA_UART + 0x400)
#define S5P_PA_UART2 (S5PC100_PA_UART + 0x800)
#define S5P_PA_UART3 (S5PC100_PA_UART + 0xC00)
#define S5P_SZ_UART SZ_256
#define S5PC100_PA_IIC0 (0xEC100000) #define S5PC100_PA_IIC0 0xEC100000
#define S5PC100_PA_IIC1 (0xEC200000) #define S5PC100_PA_IIC1 0xEC200000
/* SPI */
#define S5PC100_PA_SPI0 0xEC300000 #define S5PC100_PA_SPI0 0xEC300000
#define S5PC100_PA_SPI1 0xEC400000 #define S5PC100_PA_SPI1 0xEC400000
#define S5PC100_PA_SPI2 0xEC500000 #define S5PC100_PA_SPI2 0xEC500000
/* USB HS OTG */ #define S5PC100_PA_USB_HSOTG 0xED200000
#define S5PC100_PA_USB_HSOTG (0xED200000) #define S5PC100_PA_USB_HSPHY 0xED300000
#define S5PC100_PA_USB_HSPHY (0xED300000)
#define S5PC100_PA_HSMMC(x) (0xED800000 + ((x) * 0x100000))
#define S5PC100_PA_FB (0xEE000000) #define S5PC100_PA_FB 0xEE000000
#define S5PC100_PA_FIMC0 (0xEE200000) #define S5PC100_PA_FIMC0 0xEE200000
#define S5PC100_PA_FIMC1 (0xEE300000) #define S5PC100_PA_FIMC1 0xEE300000
#define S5PC100_PA_FIMC2 (0xEE400000) #define S5PC100_PA_FIMC2 0xEE400000
#define S5PC100_PA_I2S0 (0xF2000000) #define S5PC100_PA_I2S0 0xF2000000
#define S5PC100_PA_I2S1 (0xF2100000) #define S5PC100_PA_I2S1 0xF2100000
#define S5PC100_PA_I2S2 (0xF2200000) #define S5PC100_PA_I2S2 0xF2200000
#define S5PC100_PA_AC97 0xF2300000 #define S5PC100_PA_AC97 0xF2300000
/* PCM */
#define S5PC100_PA_PCM0 0xF2400000 #define S5PC100_PA_PCM0 0xF2400000
#define S5PC100_PA_PCM1 0xF2500000 #define S5PC100_PA_PCM1 0xF2500000
#define S5PC100_PA_SPDIF 0xF2600000 #define S5PC100_PA_SPDIF 0xF2600000
#define S5PC100_PA_TSADC (0xF3000000) #define S5PC100_PA_TSADC 0xF3000000
/* KEYPAD */ #define S5PC100_PA_KEYPAD 0xF3100000
#define S5PC100_PA_KEYPAD (0xF3100000)
#define S5PC100_PA_HSMMC(x) (0xED800000 + ((x) * 0x100000)) /* Compatibiltiy Defines */
#define S5PC100_PA_SDRAM (0x20000000)
#define S5P_PA_SDRAM S5PC100_PA_SDRAM
/* compatibiltiy defines. */
#define S3C_PA_UART S5PC100_PA_UART
#define S3C_PA_IIC S5PC100_PA_IIC0
#define S3C_PA_IIC1 S5PC100_PA_IIC1
#define S3C_PA_FB S5PC100_PA_FB #define S3C_PA_FB S5PC100_PA_FB
#define S3C_PA_G2D S5PC100_PA_G2D
#define S3C_PA_G3D S5PC100_PA_G3D
#define S3C_PA_JPEG S5PC100_PA_JPEG
#define S3C_PA_ROTATOR S5PC100_PA_ROTATOR
#define S5P_VA_VIC0 S5PC1XX_VA_VIC(0)
#define S5P_VA_VIC1 S5PC1XX_VA_VIC(1)
#define S5P_VA_VIC2 S5PC1XX_VA_VIC(2)
#define S3C_PA_USB_HSOTG S5PC100_PA_USB_HSOTG
#define S3C_PA_USB_HSPHY S5PC100_PA_USB_HSPHY
#define S3C_PA_HSMMC0 S5PC100_PA_HSMMC(0) #define S3C_PA_HSMMC0 S5PC100_PA_HSMMC(0)
#define S3C_PA_HSMMC1 S5PC100_PA_HSMMC(1) #define S3C_PA_HSMMC1 S5PC100_PA_HSMMC(1)
#define S3C_PA_HSMMC2 S5PC100_PA_HSMMC(2) #define S3C_PA_HSMMC2 S5PC100_PA_HSMMC(2)
#define S3C_PA_IIC S5PC100_PA_IIC0
#define S3C_PA_IIC1 S5PC100_PA_IIC1
#define S3C_PA_KEYPAD S5PC100_PA_KEYPAD #define S3C_PA_KEYPAD S5PC100_PA_KEYPAD
#define S3C_PA_WDT S5PC100_PA_WATCHDOG
#define S3C_PA_TSADC S5PC100_PA_TSADC
#define S3C_PA_ONENAND S5PC100_PA_ONENAND #define S3C_PA_ONENAND S5PC100_PA_ONENAND
#define S3C_PA_ONENAND_BUF S5PC100_PA_ONENAND_BUF #define S3C_PA_ONENAND_BUF S5PC100_PA_ONENAND_BUF
#define S3C_SZ_ONENAND_BUF S5PC100_SZ_ONENAND_BUF
#define S3C_PA_RTC S5PC100_PA_RTC #define S3C_PA_RTC S5PC100_PA_RTC
#define S3C_PA_TSADC S5PC100_PA_TSADC
#define S3C_PA_USB_HSOTG S5PC100_PA_USB_HSOTG
#define S3C_PA_USB_HSPHY S5PC100_PA_USB_HSPHY
#define S3C_PA_WDT S5PC100_PA_WATCHDOG
#define S5P_PA_CHIPID S5PC100_PA_CHIPID
#define S5P_PA_FIMC0 S5PC100_PA_FIMC0
#define S5P_PA_FIMC1 S5PC100_PA_FIMC1
#define S5P_PA_FIMC2 S5PC100_PA_FIMC2
#define S5P_PA_SDRAM S5PC100_PA_SDRAM
#define S5P_PA_SROMC S5PC100_PA_SROMC
#define S5P_PA_SYSCON S5PC100_PA_SYSCON
#define S5P_PA_TIMER S5PC100_PA_TIMER
#define SAMSUNG_PA_ADC S5PC100_PA_TSADC #define SAMSUNG_PA_ADC S5PC100_PA_TSADC
#define SAMSUNG_PA_CFCON S5PC100_PA_CFCON #define SAMSUNG_PA_CFCON S5PC100_PA_CFCON
#define SAMSUNG_PA_KEYPAD S5PC100_PA_KEYPAD #define SAMSUNG_PA_KEYPAD S5PC100_PA_KEYPAD
#define S5P_PA_FIMC0 S5PC100_PA_FIMC0 #define S5PC100_VA_OTHERS (S3C_VA_SYS + 0x10000)
#define S5P_PA_FIMC1 S5PC100_PA_FIMC1
#define S5P_PA_FIMC2 S5PC100_PA_FIMC2 #define S3C_SZ_ONENAND_BUF (SZ_256M - SZ_32M)
/* UART */
#define S3C_PA_UART S5PC100_PA_UART
#define S5P_PA_UART(x) (S3C_PA_UART + ((x) * S3C_UART_OFFSET))
#define S5P_PA_UART0 S5P_PA_UART(0)
#define S5P_PA_UART1 S5P_PA_UART(1)
#define S5P_PA_UART2 S5P_PA_UART(2)
#define S5P_PA_UART3 S5P_PA_UART(3)
#define S5P_SZ_UART SZ_256
#endif /* __ASM_ARCH_C100_MAP_H */ #endif /* __ASM_ARCH_MAP_H */
arch/arm/mach-s5pv210/include/mach/map.h
View file @ b08b69a1
/* linux/arch/arm/mach-s5pv210/include/mach/map.h /* linux/arch/arm/mach-s5pv210/include/mach/map.h
* *
* Copyright (c) 2010 Samsung Electronics Co., Ltd. * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com/ * http://www.samsung.com/
* *
* S5PV210 - Memory map definitions * S5PV210 - Memory map definitions
...@@ -16,104 +16,81 @@ ...@@ -16,104 +16,81 @@
#include <plat/map-base.h> #include <plat/map-base.h>
#include <plat/map-s5p.h> #include <plat/map-s5p.h>
#define S5PV210_PA_SROM_BANK5 (0xA8000000) #define S5PV210_PA_SDRAM 0x20000000
#define S5PC110_PA_ONENAND (0xB0000000) #define S5PV210_PA_SROM_BANK5 0xA8000000
#define S5P_PA_ONENAND S5PC110_PA_ONENAND
#define S5PC110_PA_ONENAND_DMA (0xB0600000) #define S5PC110_PA_ONENAND 0xB0000000
#define S5P_PA_ONENAND_DMA S5PC110_PA_ONENAND_DMA #define S5PC110_PA_ONENAND_DMA 0xB0600000
#define S5PV210_PA_CHIPID (0xE0000000) #define S5PV210_PA_CHIPID 0xE0000000
#define S5P_PA_CHIPID S5PV210_PA_CHIPID
#define S5PV210_PA_SYSCON (0xE0100000) #define S5PV210_PA_SYSCON 0xE0100000
#define S5P_PA_SYSCON S5PV210_PA_SYSCON
#define S5PV210_PA_GPIO (0xE0200000) #define S5PV210_PA_GPIO 0xE0200000
#define S5PV210_PA_SPDIF 0xE1100000
/* SPI */
#define S5PV210_PA_SPI0 0xE1300000 #define S5PV210_PA_SPI0 0xE1300000
#define S5PV210_PA_SPI1 0xE1400000 #define S5PV210_PA_SPI1 0xE1400000
#define S5PV210_PA_KEYPAD (0xE1600000) #define S5PV210_PA_KEYPAD 0xE1600000
#define S5PV210_PA_IIC0 (0xE1800000) #define S5PV210_PA_ADC 0xE1700000
#define S5PV210_PA_IIC1 (0xFAB00000)
#define S5PV210_PA_IIC2 (0xE1A00000)
#define S5PV210_PA_TIMER (0xE2500000)
#define S5P_PA_TIMER S5PV210_PA_TIMER
#define S5PV210_PA_SYSTIMER (0xE2600000) #define S5PV210_PA_IIC0 0xE1800000
#define S5PV210_PA_IIC1 0xFAB00000
#define S5PV210_PA_IIC2 0xE1A00000
#define S5PV210_PA_WATCHDOG (0xE2700000) #define S5PV210_PA_AC97 0xE2200000
#define S5PV210_PA_RTC (0xE2800000)
#define S5PV210_PA_UART (0xE2900000)
#define S5P_PA_UART0 (S5PV210_PA_UART + 0x0)
#define S5P_PA_UART1 (S5PV210_PA_UART + 0x400)
#define S5P_PA_UART2 (S5PV210_PA_UART + 0x800)
#define S5P_PA_UART3 (S5PV210_PA_UART + 0xC00)
#define S5P_SZ_UART SZ_256
#define S3C_VA_UARTx(x) (S3C_VA_UART + ((x) * S3C_UART_OFFSET))
#define S5PV210_PA_SROMC (0xE8000000) #define S5PV210_PA_PCM0 0xE2300000
#define S5P_PA_SROMC S5PV210_PA_SROMC #define S5PV210_PA_PCM1 0xE1200000
#define S5PV210_PA_PCM2 0xE2B00000
#define S5PV210_PA_CFCON (0xE8200000) #define S5PV210_PA_TIMER 0xE2500000
#define S5PV210_PA_SYSTIMER 0xE2600000
#define S5PV210_PA_WATCHDOG 0xE2700000
#define S5PV210_PA_RTC 0xE2800000
#define S5PV210_PA_MDMA 0xFA200000 #define S5PV210_PA_UART 0xE2900000
#define S5PV210_PA_PDMA0 0xE0900000
#define S5PV210_PA_PDMA1 0xE0A00000
#define S5PV210_PA_FB (0xF8000000) #define S5PV210_PA_SROMC 0xE8000000
#define S5PV210_PA_FIMC0 (0xFB200000) #define S5PV210_PA_CFCON 0xE8200000
#define S5PV210_PA_FIMC1 (0xFB300000)
#define S5PV210_PA_FIMC2 (0xFB400000)
#define S5PV210_PA_HSMMC(x) (0xEB000000 + ((x) * 0x100000)) #define S5PV210_PA_HSMMC(x) (0xEB000000 + ((x) * 0x100000))
#define S5PV210_PA_HSOTG (0xEC000000) #define S5PV210_PA_HSOTG 0xEC000000
#define S5PV210_PA_HSPHY (0xEC100000) #define S5PV210_PA_HSPHY 0xEC100000
#define S5PV210_PA_VIC0 (0xF2000000)
#define S5PV210_PA_VIC1 (0xF2100000)
#define S5PV210_PA_VIC2 (0xF2200000)
#define S5PV210_PA_VIC3 (0xF2300000)
#define S5PV210_PA_SDRAM (0x20000000)
#define S5P_PA_SDRAM S5PV210_PA_SDRAM
/* S/PDIF */
#define S5PV210_PA_SPDIF 0xE1100000
/* I2S */
#define S5PV210_PA_IIS0 0xEEE30000 #define S5PV210_PA_IIS0 0xEEE30000
#define S5PV210_PA_IIS1 0xE2100000 #define S5PV210_PA_IIS1 0xE2100000
#define S5PV210_PA_IIS2 0xE2A00000 #define S5PV210_PA_IIS2 0xE2A00000
/* PCM */ #define S5PV210_PA_DMC0 0xF0000000
#define S5PV210_PA_PCM0 0xE2300000 #define S5PV210_PA_DMC1 0xF1400000
#define S5PV210_PA_PCM1 0xE1200000
#define S5PV210_PA_PCM2 0xE2B00000
/* AC97 */ #define S5PV210_PA_VIC0 0xF2000000
#define S5PV210_PA_AC97 0xE2200000 #define S5PV210_PA_VIC1 0xF2100000
#define S5PV210_PA_VIC2 0xF2200000
#define S5PV210_PA_VIC3 0xF2300000
#define S5PV210_PA_ADC (0xE1700000) #define S5PV210_PA_FB 0xF8000000
#define S5PV210_PA_DMC0 (0xF0000000) #define S5PV210_PA_MDMA 0xFA200000
#define S5PV210_PA_DMC1 (0xF1400000) #define S5PV210_PA_PDMA0 0xE0900000
#define S5PV210_PA_PDMA1 0xE0A00000
#define S5PV210_PA_MIPI_CSIS 0xFA600000 #define S5PV210_PA_MIPI_CSIS 0xFA600000
/* compatibiltiy defines. */ #define S5PV210_PA_FIMC0 0xFB200000
#define S3C_PA_UART S5PV210_PA_UART #define S5PV210_PA_FIMC1 0xFB300000
#define S5PV210_PA_FIMC2 0xFB400000
/* Compatibiltiy Defines */
#define S3C_PA_FB S5PV210_PA_FB
#define S3C_PA_HSMMC0 S5PV210_PA_HSMMC(0) #define S3C_PA_HSMMC0 S5PV210_PA_HSMMC(0)
#define S3C_PA_HSMMC1 S5PV210_PA_HSMMC(1) #define S3C_PA_HSMMC1 S5PV210_PA_HSMMC(1)
#define S3C_PA_HSMMC2 S5PV210_PA_HSMMC(2) #define S3C_PA_HSMMC2 S5PV210_PA_HSMMC(2)
...@@ -121,17 +98,38 @@ ...@@ -121,17 +98,38 @@
#define S3C_PA_IIC S5PV210_PA_IIC0 #define S3C_PA_IIC S5PV210_PA_IIC0
#define S3C_PA_IIC1 S5PV210_PA_IIC1 #define S3C_PA_IIC1 S5PV210_PA_IIC1
#define S3C_PA_IIC2 S5PV210_PA_IIC2 #define S3C_PA_IIC2 S5PV210_PA_IIC2
#define S3C_PA_FB S5PV210_PA_FB
#define S3C_PA_RTC S5PV210_PA_RTC #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_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 #define S5P_PA_FIMC0 S5PV210_PA_FIMC0
#define S5P_PA_FIMC1 S5PV210_PA_FIMC1 #define S5P_PA_FIMC1 S5PV210_PA_FIMC1
#define S5P_PA_FIMC2 S5PV210_PA_FIMC2 #define S5P_PA_FIMC2 S5PV210_PA_FIMC2
#define S5P_PA_MIPI_CSIS0 S5PV210_PA_MIPI_CSIS #define S5P_PA_MIPI_CSIS0 S5PV210_PA_MIPI_CSIS
#define S5P_PA_ONENAND S5PC110_PA_ONENAND
#define S5P_PA_ONENAND_DMA S5PC110_PA_ONENAND_DMA
#define S5P_PA_SDRAM S5PV210_PA_SDRAM
#define S5P_PA_SROMC S5PV210_PA_SROMC
#define S5P_PA_SYSCON S5PV210_PA_SYSCON
#define S5P_PA_TIMER S5PV210_PA_TIMER
#define SAMSUNG_PA_ADC S5PV210_PA_ADC #define SAMSUNG_PA_ADC S5PV210_PA_ADC
#define SAMSUNG_PA_CFCON S5PV210_PA_CFCON #define SAMSUNG_PA_CFCON S5PV210_PA_CFCON
#define SAMSUNG_PA_KEYPAD S5PV210_PA_KEYPAD #define SAMSUNG_PA_KEYPAD S5PV210_PA_KEYPAD
/* UART */
#define S3C_VA_UARTx(x) (S3C_VA_UART + ((x) * S3C_UART_OFFSET))
#define S3C_PA_UART S5PV210_PA_UART
#define S5P_PA_UART(x) (S3C_PA_UART + ((x) * S3C_UART_OFFSET))
#define S5P_PA_UART0 S5P_PA_UART(0)
#define S5P_PA_UART1 S5P_PA_UART(1)
#define S5P_PA_UART2 S5P_PA_UART(2)
#define S5P_PA_UART3 S5P_PA_UART(3)
#define S5P_SZ_UART SZ_256
#endif /* __ASM_ARCH_MAP_H */ #endif /* __ASM_ARCH_MAP_H */
arch/arm/mach-s5pv210/mach-aquila.c
View file @ b08b69a1
...@@ -149,7 +149,7 @@ static struct regulator_init_data aquila_ldo2_data = { ...@@ -149,7 +149,7 @@ static struct regulator_init_data aquila_ldo2_data = {
static struct regulator_init_data aquila_ldo3_data = { static struct regulator_init_data aquila_ldo3_data = {
.constraints = { .constraints = {
.name = "VUSB/MIPI_1.1V", .name = "VUSB+MIPI_1.1V",
.min_uV = 1100000, .min_uV = 1100000,
.max_uV = 1100000, .max_uV = 1100000,
.apply_uV = 1, .apply_uV = 1,
...@@ -197,7 +197,7 @@ static struct regulator_init_data aquila_ldo7_data = { ...@@ -197,7 +197,7 @@ static struct regulator_init_data aquila_ldo7_data = {
static struct regulator_init_data aquila_ldo8_data = { static struct regulator_init_data aquila_ldo8_data = {
.constraints = { .constraints = {
.name = "VUSB/VADC_3.3V", .name = "VUSB+VADC_3.3V",
.min_uV = 3300000, .min_uV = 3300000,
.max_uV = 3300000, .max_uV = 3300000,
.apply_uV = 1, .apply_uV = 1,
...@@ -207,7 +207,7 @@ static struct regulator_init_data aquila_ldo8_data = { ...@@ -207,7 +207,7 @@ static struct regulator_init_data aquila_ldo8_data = {
static struct regulator_init_data aquila_ldo9_data = { static struct regulator_init_data aquila_ldo9_data = {
.constraints = { .constraints = {
.name = "VCC/VCAM_2.8V", .name = "VCC+VCAM_2.8V",
.min_uV = 2800000, .min_uV = 2800000,
.max_uV = 2800000, .max_uV = 2800000,
.apply_uV = 1, .apply_uV = 1,
...@@ -381,9 +381,12 @@ static struct max8998_platform_data aquila_max8998_pdata = { ...@@ -381,9 +381,12 @@ static struct max8998_platform_data aquila_max8998_pdata = {
.buck1_set1 = S5PV210_GPH0(3), .buck1_set1 = S5PV210_GPH0(3),
.buck1_set2 = S5PV210_GPH0(4), .buck1_set2 = S5PV210_GPH0(4),
.buck2_set3 = S5PV210_GPH0(5), .buck2_set3 = S5PV210_GPH0(5),
.buck1_max_voltage1 = 1200000, .buck1_voltage1 = 1200000,
.buck1_max_voltage2 = 1200000, .buck1_voltage2 = 1200000,
.buck2_max_voltage = 1200000, .buck1_voltage3 = 1200000,
.buck1_voltage4 = 1200000,
.buck2_voltage1 = 1200000,
.buck2_voltage2 = 1200000,
}; };
#endif #endif
......
arch/arm/mach-s5pv210/mach-goni.c
View file @ b08b69a1
...@@ -288,7 +288,7 @@ static struct regulator_init_data goni_ldo2_data = { ...@@ -288,7 +288,7 @@ static struct regulator_init_data goni_ldo2_data = {
static struct regulator_init_data goni_ldo3_data = { static struct regulator_init_data goni_ldo3_data = {
.constraints = { .constraints = {
.name = "VUSB/MIPI_1.1V", .name = "VUSB+MIPI_1.1V",
.min_uV = 1100000, .min_uV = 1100000,
.max_uV = 1100000, .max_uV = 1100000,
.apply_uV = 1, .apply_uV = 1,
...@@ -337,7 +337,7 @@ static struct regulator_init_data goni_ldo7_data = { ...@@ -337,7 +337,7 @@ static struct regulator_init_data goni_ldo7_data = {
static struct regulator_init_data goni_ldo8_data = { static struct regulator_init_data goni_ldo8_data = {
.constraints = { .constraints = {
.name = "VUSB/VADC_3.3V", .name = "VUSB+VADC_3.3V",
.min_uV = 3300000, .min_uV = 3300000,
.max_uV = 3300000, .max_uV = 3300000,
.apply_uV = 1, .apply_uV = 1,
...@@ -347,7 +347,7 @@ static struct regulator_init_data goni_ldo8_data = { ...@@ -347,7 +347,7 @@ static struct regulator_init_data goni_ldo8_data = {
static struct regulator_init_data goni_ldo9_data = { static struct regulator_init_data goni_ldo9_data = {
.constraints = { .constraints = {
.name = "VCC/VCAM_2.8V", .name = "VCC+VCAM_2.8V",
.min_uV = 2800000, .min_uV = 2800000,
.max_uV = 2800000, .max_uV = 2800000,
.apply_uV = 1, .apply_uV = 1,
...@@ -521,9 +521,12 @@ static struct max8998_platform_data goni_max8998_pdata = { ...@@ -521,9 +521,12 @@ static struct max8998_platform_data goni_max8998_pdata = {
.buck1_set1 = S5PV210_GPH0(3), .buck1_set1 = S5PV210_GPH0(3),
.buck1_set2 = S5PV210_GPH0(4), .buck1_set2 = S5PV210_GPH0(4),
.buck2_set3 = S5PV210_GPH0(5), .buck2_set3 = S5PV210_GPH0(5),
.buck1_max_voltage1 = 1200000, .buck1_voltage1 = 1200000,
.buck1_max_voltage2 = 1200000, .buck1_voltage2 = 1200000,
.buck2_max_voltage = 1200000, .buck1_voltage3 = 1200000,
.buck1_voltage4 = 1200000,
.buck2_voltage1 = 1200000,
.buck2_voltage2 = 1200000,
}; };
#endif #endif
......
arch/arm/mach-s5pv310/include/mach/map.h
View file @ b08b69a1
/* linux/arch/arm/mach-s5pv310/include/mach/map.h /* linux/arch/arm/mach-s5pv310/include/mach/map.h
* *
* Copyright (c) 2010 Samsung Electronics Co., Ltd. * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com/ * http://www.samsung.com/
* *
* S5PV310 - Memory map definitions * S5PV310 - Memory map definitions
...@@ -23,90 +23,43 @@ ...@@ -23,90 +23,43 @@
#include <plat/map-s5p.h> #include <plat/map-s5p.h>
#define S5PV310_PA_SYSRAM (0x02025000) #define S5PV310_PA_SYSRAM 0x02025000
#define S5PV310_PA_SROM_BANK(x) (0x04000000 + ((x) * 0x01000000))
#define S5PC210_PA_ONENAND (0x0C000000)
#define S5P_PA_ONENAND S5PC210_PA_ONENAND
#define S5PC210_PA_ONENAND_DMA (0x0C600000)
#define S5P_PA_ONENAND_DMA S5PC210_PA_ONENAND_DMA
#define S5PV310_PA_CHIPID (0x10000000)
#define S5P_PA_CHIPID S5PV310_PA_CHIPID
#define S5PV310_PA_SYSCON (0x10010000)
#define S5P_PA_SYSCON S5PV310_PA_SYSCON
#define S5PV310_PA_PMU (0x10020000)
#define S5PV310_PA_CMU (0x10030000)
#define S5PV310_PA_WATCHDOG (0x10060000)
#define S5PV310_PA_RTC (0x10070000)
#define S5PV310_PA_DMC0 (0x10400000)
#define S5PV310_PA_COMBINER (0x10448000)
#define S5PV310_PA_COREPERI (0x10500000)
#define S5PV310_PA_GIC_CPU (0x10500100)
#define S5PV310_PA_TWD (0x10500600)
#define S5PV310_PA_GIC_DIST (0x10501000)
#define S5PV310_PA_L2CC (0x10502000)
/* DMA */
#define S5PV310_PA_MDMA 0x10810000
#define S5PV310_PA_PDMA0 0x12680000
#define S5PV310_PA_PDMA1 0x12690000
#define S5PV310_PA_GPIO1 (0x11400000)
#define S5PV310_PA_GPIO2 (0x11000000)
#define S5PV310_PA_GPIO3 (0x03860000)
#define S5PV310_PA_MIPI_CSIS0 0x11880000
#define S5PV310_PA_MIPI_CSIS1 0x11890000
#define S5PV310_PA_HSMMC(x) (0x12510000 + ((x) * 0x10000))
#define S5PV310_PA_SROMC (0x12570000)
#define S5P_PA_SROMC S5PV310_PA_SROMC
/* S/PDIF */
#define S5PV310_PA_SPDIF 0xE1100000
/* I2S */
#define S5PV310_PA_I2S0 0x03830000 #define S5PV310_PA_I2S0 0x03830000
#define S5PV310_PA_I2S1 0xE3100000 #define S5PV310_PA_I2S1 0xE3100000
#define S5PV310_PA_I2S2 0xE2A00000 #define S5PV310_PA_I2S2 0xE2A00000
/* PCM */
#define S5PV310_PA_PCM0 0x03840000 #define S5PV310_PA_PCM0 0x03840000
#define S5PV310_PA_PCM1 0x13980000 #define S5PV310_PA_PCM1 0x13980000
#define S5PV310_PA_PCM2 0x13990000 #define S5PV310_PA_PCM2 0x13990000
/* AC97 */ #define S5PV310_PA_SROM_BANK(x) (0x04000000 + ((x) * 0x01000000))
#define S5PV310_PA_AC97 0x139A0000
#define S5PV310_PA_UART (0x13800000) #define S5PC210_PA_ONENAND 0x0C000000
#define S5PC210_PA_ONENAND_DMA 0x0C600000
#define S5P_PA_UART(x) (S5PV310_PA_UART + ((x) * S3C_UART_OFFSET)) #define S5PV310_PA_CHIPID 0x10000000
#define S5P_PA_UART0 S5P_PA_UART(0)
#define S5P_PA_UART1 S5P_PA_UART(1)
#define S5P_PA_UART2 S5P_PA_UART(2)
#define S5P_PA_UART3 S5P_PA_UART(3)
#define S5P_PA_UART4 S5P_PA_UART(4)
#define S5P_SZ_UART SZ_256 #define S5PV310_PA_SYSCON 0x10010000
#define S5PV310_PA_PMU 0x10020000
#define S5PV310_PA_CMU 0x10030000
#define S5PV310_PA_IIC(x) (0x13860000 + ((x) * 0x10000)) #define S5PV310_PA_WATCHDOG 0x10060000
#define S5PV310_PA_RTC 0x10070000
#define S5PV310_PA_TIMER (0x139D0000) #define S5PV310_PA_DMC0 0x10400000
#define S5P_PA_TIMER S5PV310_PA_TIMER
#define S5PV310_PA_SDRAM (0x40000000) #define S5PV310_PA_COMBINER 0x10448000
#define S5P_PA_SDRAM S5PV310_PA_SDRAM
#define S5PV310_PA_COREPERI 0x10500000
#define S5PV310_PA_GIC_CPU 0x10500100
#define S5PV310_PA_TWD 0x10500600
#define S5PV310_PA_GIC_DIST 0x10501000
#define S5PV310_PA_L2CC 0x10502000
#define S5PV310_PA_MDMA 0x10810000
#define S5PV310_PA_PDMA0 0x12680000
#define S5PV310_PA_PDMA1 0x12690000
#define S5PV310_PA_SYSMMU_MDMA 0x10A40000 #define S5PV310_PA_SYSMMU_MDMA 0x10A40000
#define S5PV310_PA_SYSMMU_SSS 0x10A50000 #define S5PV310_PA_SYSMMU_SSS 0x10A50000
...@@ -125,8 +78,31 @@ ...@@ -125,8 +78,31 @@
#define S5PV310_PA_SYSMMU_MFC_L 0x13620000 #define S5PV310_PA_SYSMMU_MFC_L 0x13620000
#define S5PV310_PA_SYSMMU_MFC_R 0x13630000 #define S5PV310_PA_SYSMMU_MFC_R 0x13630000
/* compatibiltiy defines. */ #define S5PV310_PA_GPIO1 0x11400000
#define S3C_PA_UART S5PV310_PA_UART #define S5PV310_PA_GPIO2 0x11000000
#define S5PV310_PA_GPIO3 0x03860000
#define S5PV310_PA_MIPI_CSIS0 0x11880000
#define S5PV310_PA_MIPI_CSIS1 0x11890000
#define S5PV310_PA_HSMMC(x) (0x12510000 + ((x) * 0x10000))
#define S5PV310_PA_SROMC 0x12570000
#define S5PV310_PA_UART 0x13800000
#define S5PV310_PA_IIC(x) (0x13860000 + ((x) * 0x10000))
#define S5PV310_PA_AC97 0x139A0000
#define S5PV310_PA_TIMER 0x139D0000
#define S5PV310_PA_SDRAM 0x40000000
#define S5PV310_PA_SPDIF 0xE1100000
/* Compatibiltiy Defines */
#define S3C_PA_HSMMC0 S5PV310_PA_HSMMC(0) #define S3C_PA_HSMMC0 S5PV310_PA_HSMMC(0)
#define S3C_PA_HSMMC1 S5PV310_PA_HSMMC(1) #define S3C_PA_HSMMC1 S5PV310_PA_HSMMC(1)
#define S3C_PA_HSMMC2 S5PV310_PA_HSMMC(2) #define S3C_PA_HSMMC2 S5PV310_PA_HSMMC(2)
...@@ -141,7 +117,28 @@ ...@@ -141,7 +117,28 @@
#define S3C_PA_IIC7 S5PV310_PA_IIC(7) #define S3C_PA_IIC7 S5PV310_PA_IIC(7)
#define S3C_PA_RTC S5PV310_PA_RTC #define S3C_PA_RTC S5PV310_PA_RTC
#define S3C_PA_WDT S5PV310_PA_WATCHDOG #define S3C_PA_WDT S5PV310_PA_WATCHDOG
#define S5P_PA_CHIPID S5PV310_PA_CHIPID
#define S5P_PA_MIPI_CSIS0 S5PV310_PA_MIPI_CSIS0 #define S5P_PA_MIPI_CSIS0 S5PV310_PA_MIPI_CSIS0
#define S5P_PA_MIPI_CSIS1 S5PV310_PA_MIPI_CSIS1 #define S5P_PA_MIPI_CSIS1 S5PV310_PA_MIPI_CSIS1
#define S5P_PA_ONENAND S5PC210_PA_ONENAND
#define S5P_PA_ONENAND_DMA S5PC210_PA_ONENAND_DMA
#define S5P_PA_SDRAM S5PV310_PA_SDRAM
#define S5P_PA_SROMC S5PV310_PA_SROMC
#define S5P_PA_SYSCON S5PV310_PA_SYSCON
#define S5P_PA_TIMER S5PV310_PA_TIMER
/* UART */
#define S3C_PA_UART S5PV310_PA_UART
#define S5P_PA_UART(x) (S3C_PA_UART + ((x) * S3C_UART_OFFSET))
#define S5P_PA_UART0 S5P_PA_UART(0)
#define S5P_PA_UART1 S5P_PA_UART(1)
#define S5P_PA_UART2 S5P_PA_UART(2)
#define S5P_PA_UART3 S5P_PA_UART(3)
#define S5P_PA_UART4 S5P_PA_UART(4)
#define S5P_SZ_UART SZ_256
#endif /* __ASM_ARCH_MAP_H */ #endif /* __ASM_ARCH_MAP_H */
arch/arm/plat-s5p/dev-uart.c
View file @ b08b69a1
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
static struct resource s5p_uart0_resource[] = { static struct resource s5p_uart0_resource[] = {
[0] = { [0] = {
.start = S5P_PA_UART0, .start = S5P_PA_UART0,
.end = S5P_PA_UART0 + S5P_SZ_UART, .end = S5P_PA_UART0 + S5P_SZ_UART - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
[1] = { [1] = {
...@@ -51,7 +51,7 @@ static struct resource s5p_uart0_resource[] = { ...@@ -51,7 +51,7 @@ static struct resource s5p_uart0_resource[] = {
static struct resource s5p_uart1_resource[] = { static struct resource s5p_uart1_resource[] = {
[0] = { [0] = {
.start = S5P_PA_UART1, .start = S5P_PA_UART1,
.end = S5P_PA_UART1 + S5P_SZ_UART, .end = S5P_PA_UART1 + S5P_SZ_UART - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
[1] = { [1] = {
...@@ -74,7 +74,7 @@ static struct resource s5p_uart1_resource[] = { ...@@ -74,7 +74,7 @@ static struct resource s5p_uart1_resource[] = {
static struct resource s5p_uart2_resource[] = { static struct resource s5p_uart2_resource[] = {
[0] = { [0] = {
.start = S5P_PA_UART2, .start = S5P_PA_UART2,
.end = S5P_PA_UART2 + S5P_SZ_UART, .end = S5P_PA_UART2 + S5P_SZ_UART - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
[1] = { [1] = {
...@@ -98,7 +98,7 @@ static struct resource s5p_uart3_resource[] = { ...@@ -98,7 +98,7 @@ static struct resource s5p_uart3_resource[] = {
#if CONFIG_SERIAL_SAMSUNG_UARTS > 3 #if CONFIG_SERIAL_SAMSUNG_UARTS > 3
[0] = { [0] = {
.start = S5P_PA_UART3, .start = S5P_PA_UART3,
.end = S5P_PA_UART3 + S5P_SZ_UART, .end = S5P_PA_UART3 + S5P_SZ_UART - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
[1] = { [1] = {
...@@ -123,7 +123,7 @@ static struct resource s5p_uart4_resource[] = { ...@@ -123,7 +123,7 @@ static struct resource s5p_uart4_resource[] = {
#if CONFIG_SERIAL_SAMSUNG_UARTS > 4 #if CONFIG_SERIAL_SAMSUNG_UARTS > 4
[0] = { [0] = {
.start = S5P_PA_UART4, .start = S5P_PA_UART4,
.end = S5P_PA_UART4 + S5P_SZ_UART, .end = S5P_PA_UART4 + S5P_SZ_UART - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
[1] = { [1] = {
...@@ -148,7 +148,7 @@ static struct resource s5p_uart5_resource[] = { ...@@ -148,7 +148,7 @@ static struct resource s5p_uart5_resource[] = {
#if CONFIG_SERIAL_SAMSUNG_UARTS > 5 #if CONFIG_SERIAL_SAMSUNG_UARTS > 5
[0] = { [0] = {
.start = S5P_PA_UART5, .start = S5P_PA_UART5,
.end = S5P_PA_UART5 + S5P_SZ_UART, .end = S5P_PA_UART5 + S5P_SZ_UART - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
[1] = { [1] = {
......
arch/arm/plat-samsung/dev-ts.c
View file @ b08b69a1
...@@ -58,4 +58,3 @@ void __init s3c24xx_ts_set_platdata(struct s3c2410_ts_mach_info *pd) ...@@ -58,4 +58,3 @@ void __init s3c24xx_ts_set_platdata(struct s3c2410_ts_mach_info *pd)
s3c_device_ts.dev.platform_data = npd; s3c_device_ts.dev.platform_data = npd;
} }
EXPORT_SYMBOL(s3c24xx_ts_set_platdata);
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7