Skip to content

L
linux
Commit f779b7dd authored by Russell King's avatar Russell King
Browse files
Options

Merge branch 'for-rmk' of... 

Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable

Conflicts:
	arch/arm/mach-at91/include/mach/system.h
	arch/arm/mach-imx/mach-cpuimx27.c

AT91 conflict resolution:
Acked-by: default avatarAnders Larsen <al@alarsen.net>
IMX conflict resolution confirmed by Uwe Kleine-König.
parents 3c00079b fe0cdec8
Expand all Show whitespace changes
Inline Side-by-side
Showing with 5277 additions and 1423 deletions
Documentation/networking/e1000.txt
View file @ f779b7dd
This diff is collapsed.
Documentation/networking/e1000e.txt 0 → 100644
View file @ f779b7dd
This diff is collapsed.
Documentation/networking/ixgbevf.txt 100755 → 100644
View file @ f779b7dd
Linux* Base Driver for Intel(R) Network Connection Linux* Base Driver for Intel(R) Network Connection
================================================== ==================================================
November 24, 2009 Intel Gigabit Linux driver.
Copyright(c) 1999 - 2010 Intel Corporation.
Contents Contents
======== ========
- In This Release
- Identifying Your Adapter - Identifying Your Adapter
- Known Issues/Troubleshooting - Known Issues/Troubleshooting
- Support - Support
In This Release
===============
This file describes the ixgbevf Linux* Base Driver for Intel Network This file describes the ixgbevf Linux* Base Driver for Intel Network
Connection. Connection.
...@@ -33,7 +30,7 @@ Identifying Your Adapter ...@@ -33,7 +30,7 @@ Identifying Your Adapter
For more information on how to identify your adapter, go to the Adapter & For more information on how to identify your adapter, go to the Adapter &
Driver ID Guide at: Driver ID Guide at:
http://support.intel.com/support/network/sb/CS-008441.htm http://support.intel.com/support/go/network/adapter/idguide.htm
Known Issues/Troubleshooting Known Issues/Troubleshooting
============================ ============================
...@@ -57,34 +54,3 @@ or the Intel Wired Networking project hosted by Sourceforge at: ...@@ -57,34 +54,3 @@ or the Intel Wired Networking project hosted by Sourceforge at:
If an issue is identified with the released source code on the supported If an issue is identified with the released source code on the supported
kernel with a supported adapter, email the specific information related kernel with a supported adapter, email the specific information related
to the issue to e1000-devel@lists.sf.net to the issue to e1000-devel@lists.sf.net
License
=======
Intel 10 Gigabit Linux driver.
Copyright(c) 1999 - 2009 Intel Corporation.
This program is free software; you can redistribute it and/or modify it
under the terms and conditions of the GNU General Public License,
version 2, as published by the Free Software Foundation.
This program is distributed in the hope it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
The full GNU General Public License is included in this distribution in
the file called "COPYING".
Trademarks
==========
Intel, Itanium, and Pentium are trademarks or registered trademarks of
Intel Corporation or its subsidiaries in the United States and other
countries.
* Other names and brands may be claimed as the property of others.
Documentation/vm/page-types.c
View file @ f779b7dd
...@@ -478,7 +478,7 @@ static void prepare_hwpoison_fd(void) ...@@ -478,7 +478,7 @@ static void prepare_hwpoison_fd(void)
} }
if (opt_unpoison && !hwpoison_forget_fd) { if (opt_unpoison && !hwpoison_forget_fd) {
sprintf(buf, "%s/renew-pfn", hwpoison_debug_fs); sprintf(buf, "%s/unpoison-pfn", hwpoison_debug_fs);
hwpoison_forget_fd = checked_open(buf, O_WRONLY); hwpoison_forget_fd = checked_open(buf, O_WRONLY);
} }
} }
......
MAINTAINERS
View file @ f779b7dd
...@@ -969,6 +969,16 @@ L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers) ...@@ -969,6 +969,16 @@ L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
S: Maintained S: Maintained
F: arch/arm/mach-s5p*/ F: arch/arm/mach-s5p*/
ARM/SAMSUNG S5P SERIES FIMC SUPPORT
M: Kyungmin Park <kyungmin.park@samsung.com>
M: Sylwester Nawrocki <s.nawrocki@samsung.com>
L: linux-arm-kernel@lists.infradead.org
L: linux-media@vger.kernel.org
S: Maintained
F: arch/arm/plat-s5p/dev-fimc*
F: arch/arm/plat-samsung/include/plat/*fimc*
F: drivers/media/video/s5p-fimc/
ARM/SHMOBILE ARM ARCHITECTURE ARM/SHMOBILE ARM ARCHITECTURE
M: Paul Mundt <lethal@linux-sh.org> M: Paul Mundt <lethal@linux-sh.org>
M: Magnus Damm <magnus.damm@gmail.com> M: Magnus Damm <magnus.damm@gmail.com>
...@@ -2547,7 +2557,7 @@ S: Supported ...@@ -2547,7 +2557,7 @@ S: Supported
F: drivers/scsi/gdt* F: drivers/scsi/gdt*
GENERIC GPIO I2C DRIVER GENERIC GPIO I2C DRIVER
M: Haavard Skinnemoen <hskinnemoen@atmel.com> M: Haavard Skinnemoen <hskinnemoen@gmail.com>
S: Supported S: Supported
F: drivers/i2c/busses/i2c-gpio.c F: drivers/i2c/busses/i2c-gpio.c
F: include/linux/i2c-gpio.h F: include/linux/i2c-gpio.h
...@@ -3075,16 +3085,27 @@ L: netdev@vger.kernel.org ...@@ -3075,16 +3085,27 @@ L: netdev@vger.kernel.org
S: Maintained S: Maintained
F: drivers/net/ixp2000/ F: drivers/net/ixp2000/
INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe) INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe/ixgbevf)
M: Jeff Kirsher <jeffrey.t.kirsher@intel.com> M: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
M: Jesse Brandeburg <jesse.brandeburg@intel.com> M: Jesse Brandeburg <jesse.brandeburg@intel.com>
M: Bruce Allan <bruce.w.allan@intel.com> M: Bruce Allan <bruce.w.allan@intel.com>
M: Alex Duyck <alexander.h.duyck@intel.com> M: Carolyn Wyborny <carolyn.wyborny@intel.com>
M: Don Skidmore <donald.c.skidmore@intel.com>
M: Greg Rose <gregory.v.rose@intel.com>
M: PJ Waskiewicz <peter.p.waskiewicz.jr@intel.com> M: PJ Waskiewicz <peter.p.waskiewicz.jr@intel.com>
M: Alex Duyck <alexander.h.duyck@intel.com>
M: John Ronciak <john.ronciak@intel.com> M: John Ronciak <john.ronciak@intel.com>
L: e1000-devel@lists.sourceforge.net L: e1000-devel@lists.sourceforge.net
W: http://e1000.sourceforge.net/ W: http://e1000.sourceforge.net/
S: Supported S: Supported
F: Documentation/networking/e100.txt
F: Documentation/networking/e1000.txt
F: Documentation/networking/e1000e.txt
F: Documentation/networking/igb.txt
F: Documentation/networking/igbvf.txt
F: Documentation/networking/ixgb.txt
F: Documentation/networking/ixgbe.txt
F: Documentation/networking/ixgbevf.txt
F: drivers/net/e100.c F: drivers/net/e100.c
F: drivers/net/e1000/ F: drivers/net/e1000/
F: drivers/net/e1000e/ F: drivers/net/e1000e/
...@@ -3092,6 +3113,7 @@ F: drivers/net/igb/ ...@@ -3092,6 +3113,7 @@ F: drivers/net/igb/
F: drivers/net/igbvf/ F: drivers/net/igbvf/
F: drivers/net/ixgb/ F: drivers/net/ixgb/
F: drivers/net/ixgbe/ F: drivers/net/ixgbe/
F: drivers/net/ixgbevf/
INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
L: linux-wireless@vger.kernel.org L: linux-wireless@vger.kernel.org
...@@ -5020,6 +5042,12 @@ F: drivers/media/common/saa7146* ...@@ -5020,6 +5042,12 @@ F: drivers/media/common/saa7146*
F: drivers/media/video/*7146* F: drivers/media/video/*7146*
F: include/media/*7146* F: include/media/*7146*
SAMSUNG AUDIO (ASoC) DRIVERS
M: Jassi Brar <jassi.brar@samsung.com>
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
S: Supported
F: sound/soc/s3c24xx
TLG2300 VIDEO4LINUX-2 DRIVER TLG2300 VIDEO4LINUX-2 DRIVER
M: Huang Shijie <shijie8@gmail.com> M: Huang Shijie <shijie8@gmail.com>
M: Kang Yong <kangyong@telegent.com> M: Kang Yong <kangyong@telegent.com>
...@@ -6462,8 +6490,10 @@ F: include/linux/wm97xx.h ...@@ -6462,8 +6490,10 @@ F: include/linux/wm97xx.h
WOLFSON MICROELECTRONICS DRIVERS WOLFSON MICROELECTRONICS DRIVERS
M: Mark Brown <broonie@opensource.wolfsonmicro.com> M: Mark Brown <broonie@opensource.wolfsonmicro.com>
M: Ian Lartey <ian@opensource.wolfsonmicro.com> M: Ian Lartey <ian@opensource.wolfsonmicro.com>
M: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
T: git git://opensource.wolfsonmicro.com/linux-2.6-asoc
T: git git://opensource.wolfsonmicro.com/linux-2.6-audioplus T: git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
W: http://opensource.wolfsonmicro.com/node/8 W: http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices
S: Supported S: Supported
F: Documentation/hwmon/wm83?? F: Documentation/hwmon/wm83??
F: drivers/leds/leds-wm83*.c F: drivers/leds/leds-wm83*.c
......
Makefile
View file @ f779b7dd
VERSION = 2 VERSION = 2
PATCHLEVEL = 6 PATCHLEVEL = 6
SUBLEVEL = 36 SUBLEVEL = 36
EXTRAVERSION = -rc7 EXTRAVERSION = -rc8
NAME = Sheep on Meth NAME = Flesh-Eating Bats with Fangs
# *DOCUMENTATION* # *DOCUMENTATION*
# To see a list of typical targets execute "make help" # To see a list of typical targets execute "make help"
......
arch/arm/Kconfig
View file @ f779b7dd
...@@ -680,8 +680,8 @@ config ARCH_S3C64XX ...@@ -680,8 +680,8 @@ config ARCH_S3C64XX
help help
Samsung S3C64XX series based systems Samsung S3C64XX series based systems
config ARCH_S5P6440 config ARCH_S5P64X0
bool "Samsung S5P6440" bool "Samsung S5P6440 S5P6450"
select CPU_V6 select CPU_V6
select GENERIC_GPIO select GENERIC_GPIO
select HAVE_CLK select HAVE_CLK
...@@ -690,7 +690,8 @@ config ARCH_S5P6440 ...@@ -690,7 +690,8 @@ config ARCH_S5P6440
select HAVE_S3C2410_I2C select HAVE_S3C2410_I2C
select HAVE_S3C_RTC select HAVE_S3C_RTC
help help
Samsung S5P6440 CPU based systems Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440,
SMDK6450.
config ARCH_S5P6442 config ARCH_S5P6442
bool "Samsung S5P6442" bool "Samsung S5P6442"
...@@ -941,7 +942,7 @@ if ARCH_S3C64XX ...@@ -941,7 +942,7 @@ if ARCH_S3C64XX
source "arch/arm/mach-s3c64xx/Kconfig" source "arch/arm/mach-s3c64xx/Kconfig"
endif endif
source "arch/arm/mach-s5p6440/Kconfig" source "arch/arm/mach-s5p64x0/Kconfig"
source "arch/arm/mach-s5p6442/Kconfig" source "arch/arm/mach-s5p6442/Kconfig"
...@@ -1114,6 +1115,20 @@ config ARM_ERRATA_720789 ...@@ -1114,6 +1115,20 @@ config ARM_ERRATA_720789
invalidated are not, resulting in an incoherency in the system page invalidated are not, resulting in an incoherency in the system page
tables. The workaround changes the TLB flushing routines to invalidate tables. The workaround changes the TLB flushing routines to invalidate
entries regardless of the ASID. entries regardless of the ASID.
config ARM_ERRATA_743622
bool "ARM errata: Faulty hazard checking in the Store Buffer may lead to data corruption"
depends on CPU_V7
help
This option enables the workaround for the 743622 Cortex-A9
(r2p0..r2p2) erratum. Under very rare conditions, a faulty
optimisation in the Cortex-A9 Store Buffer may lead to data
corruption. This workaround sets a specific bit in the diagnostic
register of the Cortex-A9 which disables the Store Buffer
optimisation, preventing the defect from occurring. This has no
visible impact on the overall performance or power consumption of the
processor.
endmenu endmenu
source "arch/arm/common/Kconfig" source "arch/arm/common/Kconfig"
...@@ -1270,7 +1285,7 @@ source kernel/Kconfig.preempt ...@@ -1270,7 +1285,7 @@ source kernel/Kconfig.preempt
config HZ config HZ
int int
default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || \ default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P64X0 || \
ARCH_S5P6442 || ARCH_S5PV210 || ARCH_S5PV310 ARCH_S5P6442 || ARCH_S5PV210 || ARCH_S5PV310
default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER
default AT91_TIMER_HZ if ARCH_AT91 default AT91_TIMER_HZ if ARCH_AT91
......
arch/arm/Makefile
View file @ f779b7dd
...@@ -173,7 +173,7 @@ machine-$(CONFIG_ARCH_RPC) := rpc ...@@ -173,7 +173,7 @@ machine-$(CONFIG_ARCH_RPC) := rpc
machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2416 s3c2440 s3c2443 machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2416 s3c2440 s3c2443
machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0 machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0
machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx
machine-$(CONFIG_ARCH_S5P6440) := s5p6440 machine-$(CONFIG_ARCH_S5P64X0) := s5p64x0
machine-$(CONFIG_ARCH_S5P6442) := s5p6442 machine-$(CONFIG_ARCH_S5P6442) := s5p6442
machine-$(CONFIG_ARCH_S5PC100) := s5pc100 machine-$(CONFIG_ARCH_S5PC100) := s5pc100
machine-$(CONFIG_ARCH_S5PV210) := s5pv210 machine-$(CONFIG_ARCH_S5PV210) := s5pv210
......
arch/arm/configs/s5p6440_defconfig → arch/arm/configs/s5p64x0_defconfig
View file @ f779b7dd
...@@ -5,10 +5,11 @@ CONFIG_KALLSYMS_ALL=y ...@@ -5,10 +5,11 @@ CONFIG_KALLSYMS_ALL=y
CONFIG_MODULES=y CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_UNLOAD=y
# CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_BSG is not set
CONFIG_ARCH_S5P6440=y CONFIG_ARCH_S5P64X0=y
CONFIG_S3C_BOOT_ERROR_RESET=y CONFIG_S3C_BOOT_ERROR_RESET=y
CONFIG_S3C_LOWLEVEL_UART_PORT=1 CONFIG_S3C_LOWLEVEL_UART_PORT=1
CONFIG_MACH_SMDK6440=y CONFIG_MACH_SMDK6440=y
CONFIG_MACH_SMDK6450=y
CONFIG_CPU_32v6K=y CONFIG_CPU_32v6K=y
CONFIG_AEABI=y CONFIG_AEABI=y
CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x20800000,8M console=ttySAC1,115200 init=/linuxrc" CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x20800000,8M console=ttySAC1,115200 init=/linuxrc"
......
arch/arm/kernel/kprobes-decode.c
View file @ f779b7dd
...@@ -1162,11 +1162,12 @@ space_cccc_001x(kprobe_opcode_t insn, struct arch_specific_insn *asi) ...@@ -1162,11 +1162,12 @@ space_cccc_001x(kprobe_opcode_t insn, struct arch_specific_insn *asi)
{ {
/* /*
* MSR : cccc 0011 0x10 xxxx xxxx xxxx xxxx xxxx * MSR : cccc 0011 0x10 xxxx xxxx xxxx xxxx xxxx
* Undef : cccc 0011 0x00 xxxx xxxx xxxx xxxx xxxx * Undef : cccc 0011 0100 xxxx xxxx xxxx xxxx xxxx
* ALU op with S bit and Rd == 15 : * ALU op with S bit and Rd == 15 :
* cccc 001x xxx1 xxxx 1111 xxxx xxxx xxxx * cccc 001x xxx1 xxxx 1111 xxxx xxxx xxxx
*/ */
if ((insn & 0x0f900000) == 0x03200000 || /* MSR & Undef */ if ((insn & 0x0fb00000) == 0x03200000 || /* MSR */
(insn & 0x0ff00000) == 0x03400000 || /* Undef */
(insn & 0x0e10f000) == 0x0210f000) /* ALU s-bit, R15 */ (insn & 0x0e10f000) == 0x0210f000) /* ALU s-bit, R15 */
return INSN_REJECTED; return INSN_REJECTED;
...@@ -1177,7 +1178,7 @@ space_cccc_001x(kprobe_opcode_t insn, struct arch_specific_insn *asi) ...@@ -1177,7 +1178,7 @@ space_cccc_001x(kprobe_opcode_t insn, struct arch_specific_insn *asi)
* *S (bit 20) updates condition codes * *S (bit 20) updates condition codes
* ADC/SBC/RSC reads the C flag * ADC/SBC/RSC reads the C flag
*/ */
insn &= 0xfff00fff; /* Rn = r0, Rd = r0 */ insn &= 0xffff0fff; /* Rd = r0 */
asi->insn[0] = insn; asi->insn[0] = insn;
asi->insn_handler = (insn & (1 << 20)) ? /* S-bit */ asi->insn_handler = (insn & (1 << 20)) ? /* S-bit */
emulate_alu_imm_rwflags : emulate_alu_imm_rflags; emulate_alu_imm_rwflags : emulate_alu_imm_rflags;
......
arch/arm/mach-at91/include/mach/system.h
View file @ f779b7dd
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
static inline void arch_idle(void) static inline void arch_idle(void)
{ {
#ifndef CONFIG_DEBUG_KERNEL
/* /*
* Disable the processor clock. The processor will be automatically * Disable the processor clock. The processor will be automatically
* re-enabled by an interrupt or by a reset. * re-enabled by an interrupt or by a reset.
...@@ -38,11 +37,11 @@ static inline void arch_idle(void) ...@@ -38,11 +37,11 @@ static inline void arch_idle(void)
#else #else
at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK); at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK);
#endif #endif
#else #ifndef CONFIG_CPU_ARM920T
/* /*
* Set the processor (CP15) into 'Wait for Interrupt' mode. * Set the processor (CP15) into 'Wait for Interrupt' mode.
* Unlike disabling the processor clock via the PMC (above) * Post-RM9200 processors need this in conjunction with the above
* this allows the processor to be woken via JTAG. * to save power when idle.
*/ */
cpu_do_idle(); cpu_do_idle();
#endif #endif
......
arch/arm/mach-ep93xx/dma-m2p.c
View file @ f779b7dd
...@@ -276,7 +276,7 @@ static void channel_disable(struct m2p_channel *ch) ...@@ -276,7 +276,7 @@ static void channel_disable(struct m2p_channel *ch)
v &= ~(M2P_CONTROL_STALL_IRQ_EN | M2P_CONTROL_NFB_IRQ_EN); v &= ~(M2P_CONTROL_STALL_IRQ_EN | M2P_CONTROL_NFB_IRQ_EN);
m2p_set_control(ch, v); m2p_set_control(ch, v);
while (m2p_channel_state(ch) == STATE_ON) while (m2p_channel_state(ch) >= STATE_ON)
cpu_relax(); cpu_relax();
m2p_set_control(ch, 0x0); m2p_set_control(ch, 0x0);
......
arch/arm/mach-imx/Kconfig
View file @ f779b7dd
...@@ -122,6 +122,7 @@ config MACH_CPUIMX27 ...@@ -122,6 +122,7 @@ config MACH_CPUIMX27
select IMX_HAVE_PLATFORM_IMX_I2C select IMX_HAVE_PLATFORM_IMX_I2C
select IMX_HAVE_PLATFORM_IMX_UART select IMX_HAVE_PLATFORM_IMX_UART
select IMX_HAVE_PLATFORM_MXC_NAND select IMX_HAVE_PLATFORM_MXC_NAND
select MXC_ULPI if USB_ULPI
help help
Include support for Eukrea CPUIMX27 platform. This includes Include support for Eukrea CPUIMX27 platform. This includes
specific configurations for the module and its peripherals. specific configurations for the module and its peripherals.
......
arch/arm/mach-imx/mach-cpuimx27.c
View file @ f779b7dd
...@@ -258,7 +258,7 @@ static void __init eukrea_cpuimx27_init(void) ...@@ -258,7 +258,7 @@ static void __init eukrea_cpuimx27_init(void)
i2c_register_board_info(0, eukrea_cpuimx27_i2c_devices, i2c_register_board_info(0, eukrea_cpuimx27_i2c_devices,
ARRAY_SIZE(eukrea_cpuimx27_i2c_devices)); ARRAY_SIZE(eukrea_cpuimx27_i2c_devices));
imx27_add_imx_i2c(1, &cpuimx27_i2c1_data); imx27_add_imx_i2c(0, &cpuimx27_i2c1_data);
imx27_add_fec(NULL); imx27_add_fec(NULL);
platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
......
arch/arm/mach-s5p6440/include/mach/map.h deleted 100644 → 0
View file @ 3c00079b
/* linux/arch/arm/mach-s5p6440/include/mach/map.h
*
* Copyright (c) 2009 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
*
* S5P6440 - Memory map 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 __ASM_ARCH_MAP_H
#define __ASM_ARCH_MAP_H __FILE__
#include <plat/map-base.h>
#include <plat/map-s5p.h>
#define S5P6440_PA_CHIPID (0xE0000000)
#define S5P_PA_CHIPID S5P6440_PA_CHIPID
#define S5P6440_PA_SYSCON (0xE0100000)
#define S5P6440_PA_CLK (S5P6440_PA_SYSCON + 0x0)
#define S5P_PA_SYSCON S5P6440_PA_SYSCON
#define S5P6440_PA_GPIO (0xE0308000)
#define S5P_PA_GPIO S5P6440_PA_GPIO
#define S5P6440_PA_VIC0 (0xE4000000)
#define S5P_PA_VIC0 S5P6440_PA_VIC0
#define S5P6440_PA_PDMA 0xE9000000
#define S5P6440_PA_VIC1 (0xE4100000)
#define S5P_PA_VIC1 S5P6440_PA_VIC1
#define S5P6440_PA_TIMER (0xEA000000)
#define S5P_PA_TIMER S5P6440_PA_TIMER
#define S5P6440_PA_RTC (0xEA100000)
#define S5P6440_PA_WDT (0xEA200000)
#define S5P_PA_WDT S5P6440_PA_WDT
#define S5P6440_PA_UART (0xEC000000)
#define S5P_PA_UART0 (S5P6440_PA_UART + 0x0)
#define S5P_PA_UART1 (S5P6440_PA_UART + 0x400)
#define S5P_PA_UART2 (S5P6440_PA_UART + 0x800)
#define S5P_PA_UART3 (S5P6440_PA_UART + 0xC00)
#define S5P_SZ_UART SZ_256
#define S5P6440_PA_IIC0 (0xEC104000)
#define S5P6440_PA_IIC1 (0xEC20F000)
#define S5P6440_PA_SPI0 0xEC400000
#define S5P6440_PA_SPI1 0xEC500000
#define S5P6440_PA_HSOTG (0xED100000)
#define S5P6440_PA_HSMMC0 (0xED800000)
#define S5P6440_PA_HSMMC1 (0xED900000)
#define S5P6440_PA_HSMMC2 (0xEDA00000)
#define S5P6440_PA_SDRAM (0x20000000)
#define S5P_PA_SDRAM S5P6440_PA_SDRAM
/* I2S */
#define S5P6440_PA_I2S 0xF2000000
/* PCM */
#define S5P6440_PA_PCM 0xF2100000
#define S5P6440_PA_ADC (0xF3000000)
/* compatibiltiy defines. */
#define S3C_PA_UART S5P6440_PA_UART
#define S3C_PA_IIC S5P6440_PA_IIC0
#define S3C_PA_RTC S5P6440_PA_RTC
#define S3C_PA_IIC1 S5P6440_PA_IIC1
#define S3C_PA_WDT S5P6440_PA_WDT
#define SAMSUNG_PA_ADC S5P6440_PA_ADC
#endif /* __ASM_ARCH_MAP_H */
arch/arm/mach-s5p6440/include/mach/regs-clock.h deleted 100644 → 0
View file @ 3c00079b
/* linux/arch/arm/mach-s5p6440/include/mach/regs-clock.h
*
* Copyright (c) 2009 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
*
* S5P6440 - 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 __ASM_ARCH_REGS_CLOCK_H
#define __ASM_ARCH_REGS_CLOCK_H __FILE__
#include <mach/map.h>
#define S5P_CLKREG(x) (S3C_VA_SYS + (x))
#define S5P_APLL_LOCK S5P_CLKREG(0x00)
#define S5P_MPLL_LOCK S5P_CLKREG(0x04)
#define S5P_EPLL_LOCK S5P_CLKREG(0x08)
#define S5P_APLL_CON S5P_CLKREG(0x0C)
#define S5P_MPLL_CON S5P_CLKREG(0x10)
#define S5P_EPLL_CON S5P_CLKREG(0x14)
#define S5P_EPLL_CON_K S5P_CLKREG(0x18)
#define S5P_CLK_SRC0 S5P_CLKREG(0x1C)
#define S5P_CLK_DIV0 S5P_CLKREG(0x20)
#define S5P_CLK_DIV1 S5P_CLKREG(0x24)
#define S5P_CLK_DIV2 S5P_CLKREG(0x28)
#define S5P_CLK_OUT S5P_CLKREG(0x2C)
#define S5P_CLK_GATE_HCLK0 S5P_CLKREG(0x30)
#define S5P_CLK_GATE_PCLK S5P_CLKREG(0x34)
#define S5P_CLK_GATE_SCLK0 S5P_CLKREG(0x38)
#define S5P_CLK_GATE_MEM0 S5P_CLKREG(0x3C)
#define S5P_CLK_DIV3 S5P_CLKREG(0x40)
#define S5P_CLK_GATE_HCLK1 S5P_CLKREG(0x44)
#define S5P_CLK_GATE_SCLK1 S5P_CLKREG(0x48)
#define S5P_AHB_CON0 S5P_CLKREG(0x100)
#define S5P_CLK_SRC1 S5P_CLKREG(0x10C)
#define S5P_SWRESET S5P_CLKREG(0x114)
#define S5P_SYS_ID S5P_CLKREG(0x118)
#define S5P_SYS_OTHERS S5P_CLKREG(0x11C)
#define S5P_MEM_CFG_STAT S5P_CLKREG(0x12C)
#define S5P_PWR_CFG S5P_CLKREG(0x804)
#define S5P_EINT_WAKEUP_MASK S5P_CLKREG(0x808)
#define S5P_NORMAL_CFG S5P_CLKREG(0x810)
#define S5P_STOP_CFG S5P_CLKREG(0x814)
#define S5P_SLEEP_CFG S5P_CLKREG(0x818)
#define S5P_OSC_FREQ S5P_CLKREG(0x820)
#define S5P_OSC_STABLE S5P_CLKREG(0x824)
#define S5P_PWR_STABLE S5P_CLKREG(0x828)
#define S5P_MTC_STABLE S5P_CLKREG(0x830)
#define S5P_OTHERS S5P_CLKREG(0x900)
#define S5P_RST_STAT S5P_CLKREG(0x904)
#define S5P_WAKEUP_STAT S5P_CLKREG(0x908)
#define S5P_SLPEN S5P_CLKREG(0x930)
#define S5P_INFORM0 S5P_CLKREG(0xA00)
#define S5P_INFORM1 S5P_CLKREG(0xA04)
#define S5P_INFORM2 S5P_CLKREG(0xA08)
#define S5P_INFORM3 S5P_CLKREG(0xA0C)
/* CLKDIV0 */
#define S5P_CLKDIV0_PCLK_MASK (0xf << 12)
#define S5P_CLKDIV0_PCLK_SHIFT (12)
#define S5P_CLKDIV0_HCLK_MASK (0xf << 8)
#define S5P_CLKDIV0_HCLK_SHIFT (8)
#define S5P_CLKDIV0_MPLL_MASK (0x1 << 4)
#define S5P_CLKDIV0_ARM_MASK (0xf << 0)
#define S5P_CLKDIV0_ARM_SHIFT (0)
/* CLKDIV3 */
#define S5P_CLKDIV3_PCLK_LOW_MASK (0xf << 12)
#define S5P_CLKDIV3_PCLK_LOW_SHIFT (12)
#define S5P_CLKDIV3_HCLK_LOW_MASK (0xf << 8)
#define S5P_CLKDIV3_HCLK_LOW_SHIFT (8)
/* HCLK0 GATE Registers */
#define S5P_CLKCON_HCLK0_USB (1<<20)
#define S5P_CLKCON_HCLK0_HSMMC2 (1<<19)
#define S5P_CLKCON_HCLK0_HSMMC1 (1<<18)
#define S5P_CLKCON_HCLK0_HSMMC0 (1<<17)
#define S5P_CLKCON_HCLK0_POST0 (1<<5)
/* HCLK1 GATE Registers */
#define S5P_CLKCON_HCLK1_DISPCON (1<<1)
/* PCLK GATE Registers */
#define S5P_CLKCON_PCLK_IIS2 (1<<26)
#define S5P_CLKCON_PCLK_SPI1 (1<<22)
#define S5P_CLKCON_PCLK_SPI0 (1<<21)
#define S5P_CLKCON_PCLK_GPIO (1<<18)
#define S5P_CLKCON_PCLK_IIC0 (1<<17)
#define S5P_CLKCON_PCLK_TSADC (1<<12)
#define S5P_CLKCON_PCLK_PWM (1<<7)
#define S5P_CLKCON_PCLK_RTC (1<<6)
#define S5P_CLKCON_PCLK_WDT (1<<5)
#define S5P_CLKCON_PCLK_UART3 (1<<4)
#define S5P_CLKCON_PCLK_UART2 (1<<3)
#define S5P_CLKCON_PCLK_UART1 (1<<2)
#define S5P_CLKCON_PCLK_UART0 (1<<1)
/* SCLK0 GATE Registers */
#define S5P_CLKCON_SCLK0_MMC2_48 (1<<29)
#define S5P_CLKCON_SCLK0_MMC1_48 (1<<28)
#define S5P_CLKCON_SCLK0_MMC0_48 (1<<27)
#define S5P_CLKCON_SCLK0_MMC2 (1<<26)
#define S5P_CLKCON_SCLK0_MMC1 (1<<25)
#define S5P_CLKCON_SCLK0_MMC0 (1<<24)
#define S5P_CLKCON_SCLK0_SPI1_48 (1<<23)
#define S5P_CLKCON_SCLK0_SPI0_48 (1<<22)
#define S5P_CLKCON_SCLK0_SPI1 (1<<21)
#define S5P_CLKCON_SCLK0_SPI0 (1<<20)
#define S5P_CLKCON_SCLK0_UART (1<<5)
/* SCLK1 GATE Registers */
/* MEM0 GATE Registers */
#define S5P_CLKCON_MEM0_HCLK_NFCON (1<<2)
/*OTHERS Resgister */
#define S5P_OTHERS_USB_SIG_MASK (1<<16)
#define S5P_OTHERS_HCLK_LOW_SEL_MPLL (1<<6)
/* Compatibility defines */
#define ARM_CLK_DIV S5P_CLK_DIV0
#define ARM_DIV_RATIO_SHIFT 0
#define ARM_DIV_MASK (0xf << ARM_DIV_RATIO_SHIFT)
#endif /* __ASM_ARCH_REGS_CLOCK_H */
arch/arm/mach-s5p6440/include/mach/uncompress.h deleted 100644 → 0
View file @ 3c00079b
/* linux/arch/arm/mach-s5p6440/include/mach/uncompress.h
*
* Copyright (c) 2009 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
*
* S5P6440 - uncompress code
*
* 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_UNCOMPRESS_H
#define __ASM_ARCH_UNCOMPRESS_H
#include <mach/map.h>
#include <plat/uncompress.h>
static void arch_detect_cpu(void)
{
/* we do not need to do any cpu detection here at the moment. */
}
#endif /* __ASM_ARCH_UNCOMPRESS_H */
arch/arm/mach-s5p6442/cpu.c
View file @ f779b7dd
/* linux/arch/arm/mach-s5p6442/cpu.c /* linux/arch/arm/mach-s5p6442/cpu.c
* *
* Copyright (c) 2010 Samsung Electronics Co., Ltd. * Copyright (c) 2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com/ * http://www.samsung.com
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 as
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <linux/sysdev.h> #include <linux/sysdev.h>
#include <linux/serial_core.h> #include <linux/serial_core.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/sched.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
...@@ -46,11 +47,31 @@ static struct map_desc s5p6442_iodesc[] __initdata = { ...@@ -46,11 +47,31 @@ static struct map_desc s5p6442_iodesc[] __initdata = {
.pfn = __phys_to_pfn(S5P6442_PA_SYSTIMER), .pfn = __phys_to_pfn(S5P6442_PA_SYSTIMER),
.length = SZ_16K, .length = SZ_16K,
.type = MT_DEVICE, .type = MT_DEVICE,
}, {
.virtual = (unsigned long)S5P_VA_GPIO,
.pfn = __phys_to_pfn(S5P6442_PA_GPIO),
.length = SZ_4K,
.type = MT_DEVICE,
}, {
.virtual = (unsigned long)VA_VIC0,
.pfn = __phys_to_pfn(S5P6442_PA_VIC0),
.length = SZ_16K,
.type = MT_DEVICE,
}, {
.virtual = (unsigned long)VA_VIC1,
.pfn = __phys_to_pfn(S5P6442_PA_VIC1),
.length = SZ_16K,
.type = MT_DEVICE,
}, { }, {
.virtual = (unsigned long)VA_VIC2, .virtual = (unsigned long)VA_VIC2,
.pfn = __phys_to_pfn(S5P6442_PA_VIC2), .pfn = __phys_to_pfn(S5P6442_PA_VIC2),
.length = SZ_16K, .length = SZ_16K,
.type = MT_DEVICE, .type = MT_DEVICE,
}, {
.virtual = (unsigned long)S3C_VA_UART,
.pfn = __phys_to_pfn(S3C_PA_UART),
.length = SZ_512K,
.type = MT_DEVICE,
} }
}; };
...@@ -62,10 +83,11 @@ static void s5p6442_idle(void) ...@@ -62,10 +83,11 @@ static void s5p6442_idle(void)
local_irq_enable(); local_irq_enable();
} }
/* s5p6442_map_io /*
* s5p6442_map_io
* *
* register the standard cpu IO areas * register the standard cpu IO areas
*/ */
void __init s5p6442_map_io(void) void __init s5p6442_map_io(void)
{ {
......
arch/arm/mach-s5p6442/include/mach/map.h
View file @ f779b7dd
...@@ -23,16 +23,10 @@ ...@@ -23,16 +23,10 @@
#define S5P_PA_SYSCON S5P6442_PA_SYSCON #define S5P_PA_SYSCON S5P6442_PA_SYSCON
#define S5P6442_PA_GPIO (0xE0200000) #define S5P6442_PA_GPIO (0xE0200000)
#define S5P_PA_GPIO S5P6442_PA_GPIO
#define S5P6442_PA_VIC0 (0xE4000000) #define S5P6442_PA_VIC0 (0xE4000000)
#define S5P_PA_VIC0 S5P6442_PA_VIC0
#define S5P6442_PA_VIC1 (0xE4100000) #define S5P6442_PA_VIC1 (0xE4100000)
#define S5P_PA_VIC1 S5P6442_PA_VIC1
#define S5P6442_PA_VIC2 (0xE4200000) #define S5P6442_PA_VIC2 (0xE4200000)
#define S5P_PA_VIC2 S5P6442_PA_VIC2
#define S5P6442_PA_MDMA 0xE8000000 #define S5P6442_PA_MDMA 0xE8000000
#define S5P6442_PA_PDMA 0xE9000000 #define S5P6442_PA_PDMA 0xE9000000
......
arch/arm/mach-s5p6440/Kconfig → arch/arm/mach-s5p64x0/Kconfig
View file @ f779b7dd
# arch/arm/mach-s5p6440/Kconfig # arch/arm/mach-s5p64x0/Kconfig
# #
# Copyright (c) 2009 Samsung Electronics Co., Ltd. # Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
# http://www.samsung.com/ # http://www.samsung.com/
# #
# Licensed under GPLv2 # Licensed under GPLv2
if ARCH_S5P6440 if ARCH_S5P64X0
config CPU_S5P6440 config CPU_S5P6440
bool bool
select PLAT_S5P
select S3C_PL330_DMA select S3C_PL330_DMA
help help
Enable S5P6440 CPU support Enable S5P6440 CPU support
config S5P6440_SETUP_I2C1 config CPU_S5P6450
bool
select PLAT_S5P
select S3C_PL330_DMA
help
Enable S5P6450 CPU support
config S5P64X0_SETUP_I2C1
bool bool
help help
Common setup code for i2c bus 1. Common setup code for i2c bus 1.
# machine support
config MACH_SMDK6440 config MACH_SMDK6440
bool "SMDK6440" bool "SMDK6440"
select CPU_S5P6440 select CPU_S5P6440
select S3C_DEV_I2C1 select S3C_DEV_I2C1
select S3C_DEV_RTC select S3C_DEV_RTC
select S3C_DEV_WDT select S3C_DEV_WDT
select S3C64XX_DEV_SPI
select SAMSUNG_DEV_ADC select SAMSUNG_DEV_ADC
select SAMSUNG_DEV_TS select SAMSUNG_DEV_TS
select S5P6440_SETUP_I2C1 select S5P64X0_SETUP_I2C1
help help
Machine support for the Samsung SMDK6440 Machine support for the Samsung SMDK6440
config MACH_SMDK6450
bool "SMDK6450"
select CPU_S5P6450
select S3C_DEV_I2C1
select S3C_DEV_RTC
select S3C_DEV_WDT
select S3C64XX_DEV_SPI
select SAMSUNG_DEV_ADC
select SAMSUNG_DEV_TS
select S5P64X0_SETUP_I2C1
help
Machine support for the Samsung SMDK6450
endif endif
arch/arm/mach-s5p6440/Makefile → arch/arm/mach-s5p64x0/Makefile
View file @ f779b7dd
# arch/arm/mach-s5p6440/Makefile # arch/arm/mach-s5p64x0/Makefile
# #
# Copyright (c) 2009 Samsung Electronics Co., Ltd. # Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
# http://www.samsung.com/ # http://www.samsung.com
# #
# Licensed under GPLv2 # Licensed under GPLv2
...@@ -10,16 +10,21 @@ obj-m := ...@@ -10,16 +10,21 @@ obj-m :=
obj-n := obj-n :=
obj- := obj- :=
# Core support for S5P6440 system # Core support for S5P64X0 system
obj-$(CONFIG_CPU_S5P6440) += cpu.o init.o clock.o gpio.o dma.o obj-$(CONFIG_ARCH_S5P64X0) += cpu.o init.o clock.o dma.o
obj-$(CONFIG_CPU_S5P6440) += setup-i2c0.o obj-$(CONFIG_ARCH_S5P64X0) += setup-i2c0.o
obj-$(CONFIG_CPU_S5P6440) += clock-s5p6440.o gpio.o
obj-$(CONFIG_CPU_S5P6450) += clock-s5p6450.o
# machine support # machine support
obj-$(CONFIG_MACH_SMDK6440) += mach-smdk6440.o obj-$(CONFIG_MACH_SMDK6440) += mach-smdk6440.o
obj-$(CONFIG_MACH_SMDK6450) += mach-smdk6450.o
# device support # device support
obj-y += dev-audio.o obj-y += dev-audio.o
obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o
obj-$(CONFIG_S5P6440_SETUP_I2C1) += setup-i2c1.o
obj-$(CONFIG_S5P64X0_SETUP_I2C1) += setup-i2c1.o
arch/arm/mach-s5p64x0/clock-s5p6450.c 0 → 100644
View file @ f779b7dd
This diff is collapsed.
arch/arm/mach-s5p64x0/clock.c 0 → 100644
View file @ f779b7dd
/* linux/arch/arm/mach-s5p64x0/clock.c
*
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com
*
* S5P64X0 - Clock 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.
*/
#include <linux/init.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/list.h>
#include <linux/errno.h>
#include <linux/err.h>
#include <linux/clk.h>
#include <linux/sysdev.h>
#include <linux/io.h>
#include <mach/hardware.h>
#include <mach/map.h>
#include <mach/regs-clock.h>
#include <plat/cpu-freq.h>
#include <plat/clock.h>
#include <plat/cpu.h>
#include <plat/pll.h>
#include <plat/s5p-clock.h>
#include <plat/clock-clksrc.h>
#include <plat/s5p6440.h>
#include <plat/s5p6450.h>
struct clksrc_clk clk_mout_apll = {
.clk = {
.name = "mout_apll",
.id = -1,
},
.sources = &clk_src_apll,
.reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 0, .size = 1 },
};
struct clksrc_clk clk_mout_mpll = {
.clk = {
.name = "mout_mpll",
.id = -1,
},
.sources = &clk_src_mpll,
.reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 1, .size = 1 },
};
struct clksrc_clk clk_mout_epll = {
.clk = {
.name = "mout_epll",
.id = -1,
},
.sources = &clk_src_epll,
.reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 2, .size = 1 },
};
enum perf_level {
L0 = 532*1000,
L1 = 266*1000,
L2 = 133*1000,
};
static const u32 clock_table[][3] = {
/*{ARM_CLK, DIVarm, DIVhclk}*/
{L0 * 1000, (0 << ARM_DIV_RATIO_SHIFT), (3 << S5P64X0_CLKDIV0_HCLK_SHIFT)},
{L1 * 1000, (1 << ARM_DIV_RATIO_SHIFT), (1 << S5P64X0_CLKDIV0_HCLK_SHIFT)},
{L2 * 1000, (3 << ARM_DIV_RATIO_SHIFT), (0 << S5P64X0_CLKDIV0_HCLK_SHIFT)},
};
int s5p64x0_epll_enable(struct clk *clk, int enable)
{
unsigned int ctrlbit = clk->ctrlbit;
unsigned int epll_con = __raw_readl(S5P64X0_EPLL_CON) & ~ctrlbit;
if (enable)
__raw_writel(epll_con | ctrlbit, S5P64X0_EPLL_CON);
else
__raw_writel(epll_con, S5P64X0_EPLL_CON);
return 0;
}
unsigned long s5p64x0_epll_get_rate(struct clk *clk)
{
return clk->rate;
}
unsigned long s5p64x0_armclk_get_rate(struct clk *clk)
{
unsigned long rate = clk_get_rate(clk->parent);
u32 clkdiv;
/* divisor mask starts at bit0, so no need to shift */
clkdiv = __raw_readl(ARM_CLK_DIV) & ARM_DIV_MASK;
return rate / (clkdiv + 1);
}
unsigned long s5p64x0_armclk_round_rate(struct clk *clk, unsigned long rate)
{
u32 iter;
for (iter = 1 ; iter < ARRAY_SIZE(clock_table) ; iter++) {
if (rate > clock_table[iter][0])
return clock_table[iter-1][0];
}
return clock_table[ARRAY_SIZE(clock_table) - 1][0];
}
int s5p64x0_armclk_set_rate(struct clk *clk, unsigned long rate)
{
u32 round_tmp;
u32 iter;
u32 clk_div0_tmp;
u32 cur_rate = clk->ops->get_rate(clk);
unsigned long flags;
round_tmp = clk->ops->round_rate(clk, rate);
if (round_tmp == cur_rate)
return 0;
for (iter = 0 ; iter < ARRAY_SIZE(clock_table) ; iter++) {
if (round_tmp == clock_table[iter][0])
break;
}
if (iter >= ARRAY_SIZE(clock_table))
iter = ARRAY_SIZE(clock_table) - 1;
local_irq_save(flags);
if (cur_rate > round_tmp) {
/* Frequency Down */
clk_div0_tmp = __raw_readl(ARM_CLK_DIV) & ~(ARM_DIV_MASK);
clk_div0_tmp |= clock_table[iter][1];
__raw_writel(clk_div0_tmp, ARM_CLK_DIV);
clk_div0_tmp = __raw_readl(ARM_CLK_DIV) &
~(S5P64X0_CLKDIV0_HCLK_MASK);
clk_div0_tmp |= clock_table[iter][2];
__raw_writel(clk_div0_tmp, ARM_CLK_DIV);
} else {
/* Frequency Up */
clk_div0_tmp = __raw_readl(ARM_CLK_DIV) &
~(S5P64X0_CLKDIV0_HCLK_MASK);
clk_div0_tmp |= clock_table[iter][2];
__raw_writel(clk_div0_tmp, ARM_CLK_DIV);
clk_div0_tmp = __raw_readl(ARM_CLK_DIV) & ~(ARM_DIV_MASK);
clk_div0_tmp |= clock_table[iter][1];
__raw_writel(clk_div0_tmp, ARM_CLK_DIV);
}
local_irq_restore(flags);
clk->rate = clock_table[iter][0];
return 0;
}
struct clk_ops s5p64x0_clkarm_ops = {
.get_rate = s5p64x0_armclk_get_rate,
.set_rate = s5p64x0_armclk_set_rate,
.round_rate = s5p64x0_armclk_round_rate,
};
struct clksrc_clk clk_armclk = {
.clk = {
.name = "armclk",
.id = 1,
.parent = &clk_mout_apll.clk,
.ops = &s5p64x0_clkarm_ops,
},
.reg_div = { .reg = S5P64X0_CLK_DIV0, .shift = 0, .size = 4 },
};
struct clksrc_clk clk_dout_mpll = {
.clk = {
.name = "dout_mpll",
.id = -1,
.parent = &clk_mout_mpll.clk,
},
.reg_div = { .reg = S5P64X0_CLK_DIV0, .shift = 4, .size = 1 },
};
struct clk *clkset_hclk_low_list[] = {
&clk_mout_apll.clk,
&clk_mout_mpll.clk,
};
struct clksrc_sources clkset_hclk_low = {
.sources = clkset_hclk_low_list,
.nr_sources = ARRAY_SIZE(clkset_hclk_low_list),
};
int s5p64x0_pclk_ctrl(struct clk *clk, int enable)
{
return s5p_gatectrl(S5P64X0_CLK_GATE_PCLK, clk, enable);
}
int s5p64x0_hclk0_ctrl(struct clk *clk, int enable)
{
return s5p_gatectrl(S5P64X0_CLK_GATE_HCLK0, clk, enable);
}
int s5p64x0_hclk1_ctrl(struct clk *clk, int enable)
{
return s5p_gatectrl(S5P64X0_CLK_GATE_HCLK1, clk, enable);
}
int s5p64x0_sclk_ctrl(struct clk *clk, int enable)
{
return s5p_gatectrl(S5P64X0_CLK_GATE_SCLK0, clk, enable);
}
int s5p64x0_sclk1_ctrl(struct clk *clk, int enable)
{
return s5p_gatectrl(S5P64X0_CLK_GATE_SCLK1, clk, enable);
}
int s5p64x0_mem_ctrl(struct clk *clk, int enable)
{
return s5p_gatectrl(S5P64X0_CLK_GATE_MEM0, clk, enable);
}
int s5p64x0_clk48m_ctrl(struct clk *clk, int enable)
{
unsigned long flags;
u32 val;
/* can't rely on clock lock, this register has other usages */
local_irq_save(flags);
val = __raw_readl(S5P64X0_OTHERS);
if (enable)
val |= S5P64X0_OTHERS_USB_SIG_MASK;
else
val &= ~S5P64X0_OTHERS_USB_SIG_MASK;
__raw_writel(val, S5P64X0_OTHERS);
local_irq_restore(flags);
return 0;
}
arch/arm/mach-s5p6440/cpu.c → arch/arm/mach-s5p64x0/cpu.c
View file @ f779b7dd
/* linux/arch/arm/mach-s5p6440/cpu.c /* linux/arch/arm/mach-s5p64x0/cpu.c
* *
* Copyright (c) 2009 Samsung Electronics Co., Ltd. * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com/ * http://www.samsung.com
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 as
...@@ -19,52 +19,115 @@ ...@@ -19,52 +19,115 @@
#include <linux/sysdev.h> #include <linux/sysdev.h>
#include <linux/serial_core.h> #include <linux/serial_core.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/sched.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/irq.h> #include <asm/mach/irq.h>
#include <asm/proc-fns.h> #include <asm/proc-fns.h>
#include <asm/irq.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/map.h> #include <mach/map.h>
#include <asm/irq.h>
#include <plat/regs-serial.h>
#include <mach/regs-clock.h> #include <mach/regs-clock.h>
#include <plat/regs-serial.h>
#include <plat/cpu.h> #include <plat/cpu.h>
#include <plat/devs.h> #include <plat/devs.h>
#include <plat/clock.h> #include <plat/clock.h>
#include <plat/s5p6440.h> #include <plat/s5p6440.h>
#include <plat/s5p6450.h>
#include <plat/adc-core.h> #include <plat/adc-core.h>
static void s5p6440_idle(void) /* Initial IO mappings */
static struct map_desc s5p64x0_iodesc[] __initdata = {
{
.virtual = (unsigned long)S5P_VA_GPIO,
.pfn = __phys_to_pfn(S5P64X0_PA_GPIO),
.length = SZ_4K,
.type = MT_DEVICE,
}, {
.virtual = (unsigned long)VA_VIC0,
.pfn = __phys_to_pfn(S5P64X0_PA_VIC0),
.length = SZ_16K,
.type = MT_DEVICE,
}, {
.virtual = (unsigned long)VA_VIC1,
.pfn = __phys_to_pfn(S5P64X0_PA_VIC1),
.length = SZ_16K,
.type = MT_DEVICE,
},
};
static struct map_desc s5p6440_iodesc[] __initdata = {
{
.virtual = (unsigned long)S3C_VA_UART,
.pfn = __phys_to_pfn(S5P6440_PA_UART(0)),
.length = SZ_4K,
.type = MT_DEVICE,
},
};
static struct map_desc s5p6450_iodesc[] __initdata = {
{
.virtual = (unsigned long)S3C_VA_UART,
.pfn = __phys_to_pfn(S5P6450_PA_UART(0)),
.length = SZ_512K,
.type = MT_DEVICE,
}, {
.virtual = (unsigned long)S3C_VA_UART + SZ_512K,
.pfn = __phys_to_pfn(S5P6450_PA_UART(5)),
.length = SZ_4K,
.type = MT_DEVICE,
},
};
static void s5p64x0_idle(void)
{ {
unsigned long val; unsigned long val;
if (!need_resched()) { if (!need_resched()) {
val = __raw_readl(S5P_PWR_CFG); val = __raw_readl(S5P64X0_PWR_CFG);
val &= ~(0x3<<5); val &= ~(0x3 << 5);
val |= (0x1<<5); val |= (0x1 << 5);
__raw_writel(val, S5P_PWR_CFG); __raw_writel(val, S5P64X0_PWR_CFG);
cpu_do_idle(); cpu_do_idle();
} }
local_irq_enable(); local_irq_enable();
} }
/* s5p6440_map_io /*
* s5p64x0_map_io
* *
* register the standard cpu IO areas * register the standard CPU IO areas
*/ */
void __init s5p6440_map_io(void) void __init s5p6440_map_io(void)
{ {
/* initialize any device information early */ /* initialize any device information early */
s3c_adc_setname("s3c64xx-adc"); s3c_adc_setname("s3c64xx-adc");
iotable_init(s5p64x0_iodesc, ARRAY_SIZE(s5p64x0_iodesc));
iotable_init(s5p6440_iodesc, ARRAY_SIZE(s5p6440_iodesc));
} }
void __init s5p6450_map_io(void)
{
/* initialize any device information early */
s3c_adc_setname("s3c64xx-adc");
iotable_init(s5p64x0_iodesc, ARRAY_SIZE(s5p64x0_iodesc));
iotable_init(s5p6450_iodesc, ARRAY_SIZE(s5p6440_iodesc));
}
/*
* s5p64x0_init_clocks
*
* register and setup the CPU clocks
*/
void __init s5p6440_init_clocks(int xtal) void __init s5p6440_init_clocks(int xtal)
{ {
printk(KERN_DEBUG "%s: initializing clocks\n", __func__); printk(KERN_DEBUG "%s: initializing clocks\n", __func__);
...@@ -75,9 +138,25 @@ void __init s5p6440_init_clocks(int xtal) ...@@ -75,9 +138,25 @@ void __init s5p6440_init_clocks(int xtal)
s5p6440_setup_clocks(); s5p6440_setup_clocks();
} }
void __init s5p6450_init_clocks(int xtal)
{
printk(KERN_DEBUG "%s: initializing clocks\n", __func__);
s3c24xx_register_baseclocks(xtal);
s5p_register_clocks(xtal);
s5p6450_register_clocks();
s5p6450_setup_clocks();
}
/*
* s5p64x0_init_irq
*
* register the CPU interrupts
*/
void __init s5p6440_init_irq(void) void __init s5p6440_init_irq(void)
{ {
/* S5P6440 supports only 2 VIC */ /* S5P6440 supports 2 VIC */
u32 vic[2]; u32 vic[2];
/* /*
...@@ -90,27 +169,41 @@ void __init s5p6440_init_irq(void) ...@@ -90,27 +169,41 @@ void __init s5p6440_init_irq(void)
s5p_init_irq(vic, ARRAY_SIZE(vic)); s5p_init_irq(vic, ARRAY_SIZE(vic));
} }
struct sysdev_class s5p6440_sysclass = { void __init s5p6450_init_irq(void)
.name = "s5p6440-core", {
/* S5P6450 supports only 2 VIC */
u32 vic[2];
/*
* VIC0 is missing IRQ_VIC0[(13-15), (21-22)]
* VIC1 is missing IRQ VIC1[12, 14, 23]
*/
vic[0] = 0xff9f1fff;
vic[1] = 0xff7fafff;
s5p_init_irq(vic, ARRAY_SIZE(vic));
}
struct sysdev_class s5p64x0_sysclass = {
.name = "s5p64x0-core",
}; };
static struct sys_device s5p6440_sysdev = { static struct sys_device s5p64x0_sysdev = {
.cls = &s5p6440_sysclass, .cls = &s5p64x0_sysclass,
}; };
static int __init s5p6440_core_init(void) static int __init s5p64x0_core_init(void)
{ {
return sysdev_class_register(&s5p6440_sysclass); return sysdev_class_register(&s5p64x0_sysclass);
} }
core_initcall(s5p64x0_core_init);
core_initcall(s5p6440_core_init); int __init s5p64x0_init(void)
int __init s5p6440_init(void)
{ {
printk(KERN_INFO "S5P6440: Initializing architecture\n"); printk(KERN_INFO "S5P64X0(S5P6440/S5P6450): Initializing architecture\n");
/* set idle function */ /* set idle function */
pm_idle = s5p6440_idle; pm_idle = s5p64x0_idle;
return sysdev_register(&s5p6440_sysdev); return sysdev_register(&s5p64x0_sysdev);
} }
arch/arm/mach-s5p6440/dev-audio.c → arch/arm/mach-s5p64x0/dev-audio.c
View file @ f779b7dd
/* linux/arch/arm/mach-s5p6440/dev-audio.c /* linux/arch/arm/mach-s5p64x0/dev-audio.c
* *
* Copyright (c) 2010 Samsung Electronics Co. Ltd * Copyright (c) 2010 Samsung Electronics Co. Ltd
* Jaswinder Singh <jassi.brar@samsung.com> * Jaswinder Singh <jassi.brar@samsung.com>
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
...@@ -41,14 +41,41 @@ static int s5p6440_cfg_i2s(struct platform_device *pdev) ...@@ -41,14 +41,41 @@ static int s5p6440_cfg_i2s(struct platform_device *pdev)
return 0; return 0;
} }
static struct s3c_audio_pdata s3c_i2s_pdata = { static int s5p6450_cfg_i2s(struct platform_device *pdev)
{
/* configure GPIO for i2s port */
switch (pdev->id) {
case -1:
s3c_gpio_cfgpin(S5P6450_GPB(4), S3C_GPIO_SFN(5));
s3c_gpio_cfgpin(S5P6450_GPR(4), S3C_GPIO_SFN(5));
s3c_gpio_cfgpin(S5P6450_GPR(5), S3C_GPIO_SFN(5));
s3c_gpio_cfgpin(S5P6450_GPR(6), S3C_GPIO_SFN(5));
s3c_gpio_cfgpin(S5P6450_GPR(7), S3C_GPIO_SFN(5));
s3c_gpio_cfgpin(S5P6450_GPR(8), S3C_GPIO_SFN(5));
s3c_gpio_cfgpin(S5P6450_GPR(13), S3C_GPIO_SFN(5));
s3c_gpio_cfgpin(S5P6450_GPR(14), S3C_GPIO_SFN(5));
break;
default:
printk(KERN_ERR "Invalid Device %d\n", pdev->id);
return -EINVAL;
}
return 0;
}
static struct s3c_audio_pdata s5p6440_i2s_pdata = {
.cfg_gpio = s5p6440_cfg_i2s, .cfg_gpio = s5p6440_cfg_i2s,
}; };
static struct resource s5p6440_iis0_resource[] = { static struct s3c_audio_pdata s5p6450_i2s_pdata = {
.cfg_gpio = s5p6450_cfg_i2s,
};
static struct resource s5p64x0_iis0_resource[] = {
[0] = { [0] = {
.start = S5P6440_PA_I2S, .start = S5P64X0_PA_I2S,
.end = S5P6440_PA_I2S + 0x100 - 1, .end = S5P64X0_PA_I2S + 0x100 - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
[1] = { [1] = {
...@@ -66,10 +93,20 @@ static struct resource s5p6440_iis0_resource[] = { ...@@ -66,10 +93,20 @@ static struct resource s5p6440_iis0_resource[] = {
struct platform_device s5p6440_device_iis = { struct platform_device s5p6440_device_iis = {
.name = "s3c64xx-iis-v4", .name = "s3c64xx-iis-v4",
.id = -1, .id = -1,
.num_resources = ARRAY_SIZE(s5p6440_iis0_resource), .num_resources = ARRAY_SIZE(s5p64x0_iis0_resource),
.resource = s5p6440_iis0_resource, .resource = s5p64x0_iis0_resource,
.dev = {
.platform_data = &s5p6440_i2s_pdata,
},
};
struct platform_device s5p6450_device_iis0 = {
.name = "s3c64xx-iis-v4",
.id = -1,
.num_resources = ARRAY_SIZE(s5p64x0_iis0_resource),
.resource = s5p64x0_iis0_resource,
.dev = { .dev = {
.platform_data = &s3c_i2s_pdata, .platform_data = &s5p6450_i2s_pdata,
}, },
}; };
...@@ -94,14 +131,14 @@ static int s5p6440_pcm_cfg_gpio(struct platform_device *pdev) ...@@ -94,14 +131,14 @@ static int s5p6440_pcm_cfg_gpio(struct platform_device *pdev)
return 0; return 0;
} }
static struct s3c_audio_pdata s3c_pcm_pdata = { static struct s3c_audio_pdata s5p6440_pcm_pdata = {
.cfg_gpio = s5p6440_pcm_cfg_gpio, .cfg_gpio = s5p6440_pcm_cfg_gpio,
}; };
static struct resource s5p6440_pcm0_resource[] = { static struct resource s5p6440_pcm0_resource[] = {
[0] = { [0] = {
.start = S5P6440_PA_PCM, .start = S5P64X0_PA_PCM,
.end = S5P6440_PA_PCM + 0x100 - 1, .end = S5P64X0_PA_PCM + 0x100 - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
[1] = { [1] = {
...@@ -122,6 +159,6 @@ struct platform_device s5p6440_device_pcm = { ...@@ -122,6 +159,6 @@ struct platform_device s5p6440_device_pcm = {
.num_resources = ARRAY_SIZE(s5p6440_pcm0_resource), .num_resources = ARRAY_SIZE(s5p6440_pcm0_resource),
.resource = s5p6440_pcm0_resource, .resource = s5p6440_pcm0_resource,
.dev = { .dev = {
.platform_data = &s3c_pcm_pdata, .platform_data = &s5p6440_pcm_pdata,
}, },
}; };
arch/arm/mach-s5p6440/dev-spi.c → arch/arm/mach-s5p64x0/dev-spi.c
View file @ f779b7dd
/* linux/arch/arm/mach-s5p6440/dev-spi.c /* linux/arch/arm/mach-s5p64x0/dev-spi.c
*
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com
* *
* Copyright (C) 2010 Samsung Electronics Co. Ltd. * Copyright (C) 2010 Samsung Electronics Co. Ltd.
* Jaswinder Singh <jassi.brar@samsung.com> * Jaswinder Singh <jassi.brar@samsung.com>
...@@ -6,7 +9,7 @@ ...@@ -6,7 +9,7 @@
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
...@@ -15,14 +18,15 @@ ...@@ -15,14 +18,15 @@
#include <mach/dma.h> #include <mach/dma.h>
#include <mach/map.h> #include <mach/map.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/regs-clock.h>
#include <mach/spi-clocks.h> #include <mach/spi-clocks.h>
#include <plat/s3c64xx-spi.h> #include <plat/s3c64xx-spi.h>
#include <plat/gpio-cfg.h> #include <plat/gpio-cfg.h>
static char *spi_src_clks[] = { static char *s5p64x0_spi_src_clks[] = {
[S5P6440_SPI_SRCCLK_PCLK] = "pclk", [S5P64X0_SPI_SRCCLK_PCLK] = "pclk",
[S5P6440_SPI_SRCCLK_SCLK] = "spi_epll", [S5P64X0_SPI_SRCCLK_SCLK] = "sclk_spi",
}; };
/* SPI Controller platform_devices */ /* SPI Controller platform_devices */
...@@ -62,10 +66,39 @@ static int s5p6440_spi_cfg_gpio(struct platform_device *pdev) ...@@ -62,10 +66,39 @@ static int s5p6440_spi_cfg_gpio(struct platform_device *pdev)
return 0; return 0;
} }
static struct resource s5p6440_spi0_resource[] = { static int s5p6450_spi_cfg_gpio(struct platform_device *pdev)
{
switch (pdev->id) {
case 0:
s3c_gpio_cfgpin(S5P6450_GPC(0), S3C_GPIO_SFN(2));
s3c_gpio_cfgpin(S5P6450_GPC(1), S3C_GPIO_SFN(2));
s3c_gpio_cfgpin(S5P6450_GPC(2), S3C_GPIO_SFN(2));
s3c_gpio_setpull(S5P6450_GPC(0), S3C_GPIO_PULL_UP);
s3c_gpio_setpull(S5P6450_GPC(1), S3C_GPIO_PULL_UP);
s3c_gpio_setpull(S5P6450_GPC(2), S3C_GPIO_PULL_UP);
break;
case 1:
s3c_gpio_cfgpin(S5P6450_GPC(4), S3C_GPIO_SFN(2));
s3c_gpio_cfgpin(S5P6450_GPC(5), S3C_GPIO_SFN(2));
s3c_gpio_cfgpin(S5P6450_GPC(6), S3C_GPIO_SFN(2));
s3c_gpio_setpull(S5P6450_GPC(4), S3C_GPIO_PULL_UP);
s3c_gpio_setpull(S5P6450_GPC(5), S3C_GPIO_PULL_UP);
s3c_gpio_setpull(S5P6450_GPC(6), S3C_GPIO_PULL_UP);
break;
default:
dev_err(&pdev->dev, "Invalid SPI Controller number!");
return -EINVAL;
}
return 0;
}
static struct resource s5p64x0_spi0_resource[] = {
[0] = { [0] = {
.start = S5P6440_PA_SPI0, .start = S5P64X0_PA_SPI0,
.end = S5P6440_PA_SPI0 + 0x100 - 1, .end = S5P64X0_PA_SPI0 + 0x100 - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
[1] = { [1] = {
...@@ -91,24 +124,29 @@ static struct s3c64xx_spi_info s5p6440_spi0_pdata = { ...@@ -91,24 +124,29 @@ static struct s3c64xx_spi_info s5p6440_spi0_pdata = {
.rx_lvl_offset = 15, .rx_lvl_offset = 15,
}; };
static struct s3c64xx_spi_info s5p6450_spi0_pdata = {
.cfg_gpio = s5p6450_spi_cfg_gpio,
.fifo_lvl_mask = 0x1ff,
.rx_lvl_offset = 15,
};
static u64 spi_dmamask = DMA_BIT_MASK(32); static u64 spi_dmamask = DMA_BIT_MASK(32);
struct platform_device s5p6440_device_spi0 = { struct platform_device s5p64x0_device_spi0 = {
.name = "s3c64xx-spi", .name = "s3c64xx-spi",
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(s5p6440_spi0_resource), .num_resources = ARRAY_SIZE(s5p64x0_spi0_resource),
.resource = s5p6440_spi0_resource, .resource = s5p64x0_spi0_resource,
.dev = { .dev = {
.dma_mask = &spi_dmamask, .dma_mask = &spi_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32), .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &s5p6440_spi0_pdata,
}, },
}; };
static struct resource s5p6440_spi1_resource[] = { static struct resource s5p64x0_spi1_resource[] = {
[0] = { [0] = {
.start = S5P6440_PA_SPI1, .start = S5P64X0_PA_SPI1,
.end = S5P6440_PA_SPI1 + 0x100 - 1, .end = S5P64X0_PA_SPI1 + 0x100 - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
[1] = { [1] = {
...@@ -134,35 +172,53 @@ static struct s3c64xx_spi_info s5p6440_spi1_pdata = { ...@@ -134,35 +172,53 @@ static struct s3c64xx_spi_info s5p6440_spi1_pdata = {
.rx_lvl_offset = 15, .rx_lvl_offset = 15,
}; };
struct platform_device s5p6440_device_spi1 = { static struct s3c64xx_spi_info s5p6450_spi1_pdata = {
.cfg_gpio = s5p6450_spi_cfg_gpio,
.fifo_lvl_mask = 0x7f,
.rx_lvl_offset = 15,
};
struct platform_device s5p64x0_device_spi1 = {
.name = "s3c64xx-spi", .name = "s3c64xx-spi",
.id = 1, .id = 1,
.num_resources = ARRAY_SIZE(s5p6440_spi1_resource), .num_resources = ARRAY_SIZE(s5p64x0_spi1_resource),
.resource = s5p6440_spi1_resource, .resource = s5p64x0_spi1_resource,
.dev = { .dev = {
.dma_mask = &spi_dmamask, .dma_mask = &spi_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32), .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &s5p6440_spi1_pdata,
}, },
}; };
void __init s5p6440_spi_set_info(int cntrlr, int src_clk_nr, int num_cs) void __init s5p64x0_spi_set_info(int cntrlr, int src_clk_nr, int num_cs)
{ {
unsigned int id;
struct s3c64xx_spi_info *pd; struct s3c64xx_spi_info *pd;
id = __raw_readl(S5P64X0_SYS_ID) & 0xFF000;
/* Reject invalid configuration */ /* Reject invalid configuration */
if (!num_cs || src_clk_nr < 0 if (!num_cs || src_clk_nr < 0
|| src_clk_nr > S5P6440_SPI_SRCCLK_SCLK) { || src_clk_nr > S5P64X0_SPI_SRCCLK_SCLK) {
printk(KERN_ERR "%s: Invalid SPI configuration\n", __func__); printk(KERN_ERR "%s: Invalid SPI configuration\n", __func__);
return; return;
} }
switch (cntrlr) { switch (cntrlr) {
case 0: case 0:
if (id == 0x50000)
pd = &s5p6450_spi0_pdata;
else
pd = &s5p6440_spi0_pdata; pd = &s5p6440_spi0_pdata;
s5p64x0_device_spi0.dev.platform_data = pd;
break; break;
case 1: case 1:
if (id == 0x50000)
pd = &s5p6450_spi1_pdata;
else
pd = &s5p6440_spi1_pdata; pd = &s5p6440_spi1_pdata;
s5p64x0_device_spi1.dev.platform_data = pd;
break; break;
default: default:
printk(KERN_ERR "%s: Invalid SPI controller(%d)\n", printk(KERN_ERR "%s: Invalid SPI controller(%d)\n",
...@@ -172,5 +228,5 @@ void __init s5p6440_spi_set_info(int cntrlr, int src_clk_nr, int num_cs) ...@@ -172,5 +228,5 @@ void __init s5p6440_spi_set_info(int cntrlr, int src_clk_nr, int num_cs)
pd->num_cs = num_cs; pd->num_cs = num_cs;
pd->src_clk_nr = src_clk_nr; pd->src_clk_nr = src_clk_nr;
pd->src_clk_name = spi_src_clks[src_clk_nr]; pd->src_clk_name = s5p64x0_spi_src_clks[src_clk_nr];
} }
arch/arm/mach-s5p6440/dma.c → arch/arm/mach-s5p64x0/dma.c
View file @ f779b7dd
/* /* linux/arch/arm/mach-s5p64x0/dma.c
*
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com
*
* Copyright (C) 2010 Samsung Electronics Co. Ltd. * Copyright (C) 2010 Samsung Electronics Co. Ltd.
* Jaswinder Singh <jassi.brar@samsung.com> * Jaswinder Singh <jassi.brar@samsung.com>
* *
...@@ -15,25 +19,24 @@ ...@@ -15,25 +19,24 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <plat/devs.h>
#include <plat/irqs.h>
#include <mach/map.h> #include <mach/map.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/regs-clock.h>
#include <plat/devs.h>
#include <plat/s3c-pl330-pdata.h> #include <plat/s3c-pl330-pdata.h>
static u64 dma_dmamask = DMA_BIT_MASK(32); static u64 dma_dmamask = DMA_BIT_MASK(32);
static struct resource s5p6440_pdma_resource[] = { static struct resource s5p64x0_pdma_resource[] = {
[0] = { [0] = {
.start = S5P6440_PA_PDMA, .start = S5P64X0_PA_PDMA,
.end = S5P6440_PA_PDMA + SZ_4K, .end = S5P64X0_PA_PDMA + SZ_4K,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
[1] = { [1] = {
...@@ -80,26 +83,67 @@ static struct s3c_pl330_platdata s5p6440_pdma_pdata = { ...@@ -80,26 +83,67 @@ static struct s3c_pl330_platdata s5p6440_pdma_pdata = {
}, },
}; };
static struct platform_device s5p6440_device_pdma = { static struct s3c_pl330_platdata s5p6450_pdma_pdata = {
.peri = {
[0] = DMACH_UART0_RX,
[1] = DMACH_UART0_TX,
[2] = DMACH_UART1_RX,
[3] = DMACH_UART1_TX,
[4] = DMACH_UART2_RX,
[5] = DMACH_UART2_TX,
[6] = DMACH_UART3_RX,
[7] = DMACH_UART3_TX,
[8] = DMACH_UART4_RX,
[9] = DMACH_UART4_TX,
[10] = DMACH_PCM0_TX,
[11] = DMACH_PCM0_RX,
[12] = DMACH_I2S0_TX,
[13] = DMACH_I2S0_RX,
[14] = DMACH_SPI0_TX,
[15] = DMACH_SPI0_RX,
[16] = DMACH_PCM1_TX,
[17] = DMACH_PCM1_RX,
[18] = DMACH_PCM2_TX,
[19] = DMACH_PCM2_RX,
[20] = DMACH_SPI1_TX,
[21] = DMACH_SPI1_RX,
[22] = DMACH_USI_TX,
[23] = DMACH_USI_RX,
[24] = DMACH_MAX,
[25] = DMACH_I2S1_TX,
[26] = DMACH_I2S1_RX,
[27] = DMACH_I2S2_TX,
[28] = DMACH_I2S2_RX,
[29] = DMACH_PWM,
[30] = DMACH_UART5_RX,
[31] = DMACH_UART5_TX,
},
};
static struct platform_device s5p64x0_device_pdma = {
.name = "s3c-pl330", .name = "s3c-pl330",
.id = 1, .id = 0,
.num_resources = ARRAY_SIZE(s5p6440_pdma_resource), .num_resources = ARRAY_SIZE(s5p64x0_pdma_resource),
.resource = s5p6440_pdma_resource, .resource = s5p64x0_pdma_resource,
.dev = { .dev = {
.dma_mask = &dma_dmamask, .dma_mask = &dma_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32), .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &s5p6440_pdma_pdata,
}, },
}; };
static struct platform_device *s5p6440_dmacs[] __initdata = { static int __init s5p64x0_dma_init(void)
&s5p6440_device_pdma,
};
static int __init s5p6440_dma_init(void)
{ {
platform_add_devices(s5p6440_dmacs, ARRAY_SIZE(s5p6440_dmacs)); unsigned int id;
id = __raw_readl(S5P64X0_SYS_ID) & 0xFF000;
if (id == 0x50000)
s5p64x0_device_pdma.dev.platform_data = &s5p6450_pdma_pdata;
else
s5p64x0_device_pdma.dev.platform_data = &s5p6440_pdma_pdata;
platform_device_register(&s5p64x0_device_pdma);
return 0; return 0;
} }
arch_initcall(s5p6440_dma_init); arch_initcall(s5p64x0_dma_init);
arch/arm/mach-s5p6440/gpio.c → arch/arm/mach-s5p64x0/gpio.c
View file @ f779b7dd
/* arch/arm/mach-s5p6440/gpio.c /* linux/arch/arm/mach-s5p64x0/gpio.c
* *
* Copyright (c) 2009 Samsung Electronics Co., Ltd. * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com/ * http://www.samsung.com
* *
* S5P6440 - GPIOlib support * S5P64X0 - GPIOlib support
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/irq.h> #include <linux/irq.h>
...@@ -22,26 +22,29 @@ ...@@ -22,26 +22,29 @@
#include <plat/gpio-cfg.h> #include <plat/gpio-cfg.h>
#include <plat/gpio-cfg-helpers.h> #include <plat/gpio-cfg-helpers.h>
/* GPIO bank summary: /* To be implemented S5P6450 GPIO */
*
* Bank GPIOs Style SlpCon ExtInt Group /*
* A 6 4Bit Yes 1 * S5P6440 GPIO bank summary:
* B 7 4Bit Yes 1 *
* C 8 4Bit Yes 2 * Bank GPIOs Style SlpCon ExtInt Group
* F 2 2Bit Yes 4 [1] * A 6 4Bit Yes 1
* G 7 4Bit Yes 5 * B 7 4Bit Yes 1
* H 10 4Bit[2] Yes 6 * C 8 4Bit Yes 2
* I 16 2Bit Yes None * F 2 2Bit Yes 4 [1]
* J 12 2Bit Yes None * G 7 4Bit Yes 5
* N 16 2Bit No IRQ_EINT * H 10 4Bit[2] Yes 6
* P 8 2Bit Yes 8 * I 16 2Bit Yes None
* R 15 4Bit[2] Yes 8 * J 12 2Bit Yes None
* * N 16 2Bit No IRQ_EINT
* [1] BANKF pins 14,15 do not form part of the external interrupt sources * P 8 2Bit Yes 8
* [2] BANK has two control registers, GPxCON0 and GPxCON1 * R 15 4Bit[2] Yes 8
*/ *
* [1] BANKF pins 14,15 do not form part of the external interrupt sources
* [2] BANK has two control registers, GPxCON0 and GPxCON1
*/
static int s5p6440_gpiolib_rbank_4bit2_input(struct gpio_chip *chip, static int s5p64x0_gpiolib_rbank_4bit2_input(struct gpio_chip *chip,
unsigned int offset) unsigned int offset)
{ {
struct s3c_gpio_chip *ourchip = to_s3c_gpio(chip); struct s3c_gpio_chip *ourchip = to_s3c_gpio(chip);
...@@ -77,7 +80,7 @@ static int s5p6440_gpiolib_rbank_4bit2_input(struct gpio_chip *chip, ...@@ -77,7 +80,7 @@ static int s5p6440_gpiolib_rbank_4bit2_input(struct gpio_chip *chip,
return 0; return 0;
} }
static int s5p6440_gpiolib_rbank_4bit2_output(struct gpio_chip *chip, static int s5p64x0_gpiolib_rbank_4bit2_output(struct gpio_chip *chip,
unsigned int offset, int value) unsigned int offset, int value)
{ {
struct s3c_gpio_chip *ourchip = to_s3c_gpio(chip); struct s3c_gpio_chip *ourchip = to_s3c_gpio(chip);
...@@ -124,12 +127,11 @@ static int s5p6440_gpiolib_rbank_4bit2_output(struct gpio_chip *chip, ...@@ -124,12 +127,11 @@ static int s5p6440_gpiolib_rbank_4bit2_output(struct gpio_chip *chip,
return 0; return 0;
} }
int s5p6440_gpio_setcfg_4bit_rbank(struct s3c_gpio_chip *chip, int s5p64x0_gpio_setcfg_4bit_rbank(struct s3c_gpio_chip *chip,
unsigned int off, unsigned int cfg) unsigned int off, unsigned int cfg)
{ {
void __iomem *reg = chip->base; void __iomem *reg = chip->base;
unsigned int shift; unsigned int shift;
unsigned long flags;
u32 con; u32 con;
switch (off) { switch (off) {
...@@ -155,26 +157,22 @@ int s5p6440_gpio_setcfg_4bit_rbank(struct s3c_gpio_chip *chip, ...@@ -155,26 +157,22 @@ int s5p6440_gpio_setcfg_4bit_rbank(struct s3c_gpio_chip *chip,
cfg <<= shift; cfg <<= shift;
} }
s3c_gpio_lock(chip, flags);
con = __raw_readl(reg); con = __raw_readl(reg);
con &= ~(0xf << shift); con &= ~(0xf << shift);
con |= cfg; con |= cfg;
__raw_writel(con, reg); __raw_writel(con, reg);
s3c_gpio_unlock(chip, flags);
return 0; return 0;
} }
static struct s3c_gpio_cfg s5p6440_gpio_cfgs[] = { static struct s3c_gpio_cfg s5p64x0_gpio_cfgs[] = {
{ {
.cfg_eint = 0, .cfg_eint = 0,
}, { }, {
.cfg_eint = 7, .cfg_eint = 7,
}, { }, {
.cfg_eint = 3, .cfg_eint = 3,
.set_config = s5p6440_gpio_setcfg_4bit_rbank, .set_config = s5p64x0_gpio_setcfg_4bit_rbank,
}, { }, {
.cfg_eint = 0, .cfg_eint = 0,
.set_config = s3c_gpio_setcfg_s3c24xx, .set_config = s3c_gpio_setcfg_s3c24xx,
...@@ -193,7 +191,7 @@ static struct s3c_gpio_cfg s5p6440_gpio_cfgs[] = { ...@@ -193,7 +191,7 @@ static struct s3c_gpio_cfg s5p6440_gpio_cfgs[] = {
static struct s3c_gpio_chip s5p6440_gpio_4bit[] = { static struct s3c_gpio_chip s5p6440_gpio_4bit[] = {
{ {
.base = S5P6440_GPA_BASE, .base = S5P6440_GPA_BASE,
.config = &s5p6440_gpio_cfgs[1], .config = &s5p64x0_gpio_cfgs[1],
.chip = { .chip = {
.base = S5P6440_GPA(0), .base = S5P6440_GPA(0),
.ngpio = S5P6440_GPIO_A_NR, .ngpio = S5P6440_GPIO_A_NR,
...@@ -201,7 +199,7 @@ static struct s3c_gpio_chip s5p6440_gpio_4bit[] = { ...@@ -201,7 +199,7 @@ static struct s3c_gpio_chip s5p6440_gpio_4bit[] = {
}, },
}, { }, {
.base = S5P6440_GPB_BASE, .base = S5P6440_GPB_BASE,
.config = &s5p6440_gpio_cfgs[1], .config = &s5p64x0_gpio_cfgs[1],
.chip = { .chip = {
.base = S5P6440_GPB(0), .base = S5P6440_GPB(0),
.ngpio = S5P6440_GPIO_B_NR, .ngpio = S5P6440_GPIO_B_NR,
...@@ -209,7 +207,7 @@ static struct s3c_gpio_chip s5p6440_gpio_4bit[] = { ...@@ -209,7 +207,7 @@ static struct s3c_gpio_chip s5p6440_gpio_4bit[] = {
}, },
}, { }, {
.base = S5P6440_GPC_BASE, .base = S5P6440_GPC_BASE,
.config = &s5p6440_gpio_cfgs[1], .config = &s5p64x0_gpio_cfgs[1],
.chip = { .chip = {
.base = S5P6440_GPC(0), .base = S5P6440_GPC(0),
.ngpio = S5P6440_GPIO_C_NR, .ngpio = S5P6440_GPIO_C_NR,
...@@ -217,7 +215,7 @@ static struct s3c_gpio_chip s5p6440_gpio_4bit[] = { ...@@ -217,7 +215,7 @@ static struct s3c_gpio_chip s5p6440_gpio_4bit[] = {
}, },
}, { }, {
.base = S5P6440_GPG_BASE, .base = S5P6440_GPG_BASE,
.config = &s5p6440_gpio_cfgs[1], .config = &s5p64x0_gpio_cfgs[1],
.chip = { .chip = {
.base = S5P6440_GPG(0), .base = S5P6440_GPG(0),
.ngpio = S5P6440_GPIO_G_NR, .ngpio = S5P6440_GPIO_G_NR,
...@@ -229,7 +227,7 @@ static struct s3c_gpio_chip s5p6440_gpio_4bit[] = { ...@@ -229,7 +227,7 @@ static struct s3c_gpio_chip s5p6440_gpio_4bit[] = {
static struct s3c_gpio_chip s5p6440_gpio_4bit2[] = { static struct s3c_gpio_chip s5p6440_gpio_4bit2[] = {
{ {
.base = S5P6440_GPH_BASE + 0x4, .base = S5P6440_GPH_BASE + 0x4,
.config = &s5p6440_gpio_cfgs[1], .config = &s5p64x0_gpio_cfgs[1],
.chip = { .chip = {
.base = S5P6440_GPH(0), .base = S5P6440_GPH(0),
.ngpio = S5P6440_GPIO_H_NR, .ngpio = S5P6440_GPIO_H_NR,
...@@ -238,10 +236,10 @@ static struct s3c_gpio_chip s5p6440_gpio_4bit2[] = { ...@@ -238,10 +236,10 @@ static struct s3c_gpio_chip s5p6440_gpio_4bit2[] = {
}, },
}; };
static struct s3c_gpio_chip gpio_rbank_4bit2[] = { static struct s3c_gpio_chip s5p6440_gpio_rbank_4bit2[] = {
{ {
.base = S5P6440_GPR_BASE + 0x4, .base = S5P6440_GPR_BASE + 0x4,
.config = &s5p6440_gpio_cfgs[2], .config = &s5p64x0_gpio_cfgs[2],
.chip = { .chip = {
.base = S5P6440_GPR(0), .base = S5P6440_GPR(0),
.ngpio = S5P6440_GPIO_R_NR, .ngpio = S5P6440_GPIO_R_NR,
...@@ -253,7 +251,7 @@ static struct s3c_gpio_chip gpio_rbank_4bit2[] = { ...@@ -253,7 +251,7 @@ static struct s3c_gpio_chip gpio_rbank_4bit2[] = {
static struct s3c_gpio_chip s5p6440_gpio_2bit[] = { static struct s3c_gpio_chip s5p6440_gpio_2bit[] = {
{ {
.base = S5P6440_GPF_BASE, .base = S5P6440_GPF_BASE,
.config = &s5p6440_gpio_cfgs[5], .config = &s5p64x0_gpio_cfgs[5],
.chip = { .chip = {
.base = S5P6440_GPF(0), .base = S5P6440_GPF(0),
.ngpio = S5P6440_GPIO_F_NR, .ngpio = S5P6440_GPIO_F_NR,
...@@ -261,7 +259,7 @@ static struct s3c_gpio_chip s5p6440_gpio_2bit[] = { ...@@ -261,7 +259,7 @@ static struct s3c_gpio_chip s5p6440_gpio_2bit[] = {
}, },
}, { }, {
.base = S5P6440_GPI_BASE, .base = S5P6440_GPI_BASE,
.config = &s5p6440_gpio_cfgs[3], .config = &s5p64x0_gpio_cfgs[3],
.chip = { .chip = {
.base = S5P6440_GPI(0), .base = S5P6440_GPI(0),
.ngpio = S5P6440_GPIO_I_NR, .ngpio = S5P6440_GPIO_I_NR,
...@@ -269,7 +267,7 @@ static struct s3c_gpio_chip s5p6440_gpio_2bit[] = { ...@@ -269,7 +267,7 @@ static struct s3c_gpio_chip s5p6440_gpio_2bit[] = {
}, },
}, { }, {
.base = S5P6440_GPJ_BASE, .base = S5P6440_GPJ_BASE,
.config = &s5p6440_gpio_cfgs[3], .config = &s5p64x0_gpio_cfgs[3],
.chip = { .chip = {
.base = S5P6440_GPJ(0), .base = S5P6440_GPJ(0),
.ngpio = S5P6440_GPIO_J_NR, .ngpio = S5P6440_GPIO_J_NR,
...@@ -277,7 +275,7 @@ static struct s3c_gpio_chip s5p6440_gpio_2bit[] = { ...@@ -277,7 +275,7 @@ static struct s3c_gpio_chip s5p6440_gpio_2bit[] = {
}, },
}, { }, {
.base = S5P6440_GPN_BASE, .base = S5P6440_GPN_BASE,
.config = &s5p6440_gpio_cfgs[4], .config = &s5p64x0_gpio_cfgs[4],
.chip = { .chip = {
.base = S5P6440_GPN(0), .base = S5P6440_GPN(0),
.ngpio = S5P6440_GPIO_N_NR, .ngpio = S5P6440_GPIO_N_NR,
...@@ -285,7 +283,7 @@ static struct s3c_gpio_chip s5p6440_gpio_2bit[] = { ...@@ -285,7 +283,7 @@ static struct s3c_gpio_chip s5p6440_gpio_2bit[] = {
}, },
}, { }, {
.base = S5P6440_GPP_BASE, .base = S5P6440_GPP_BASE,
.config = &s5p6440_gpio_cfgs[5], .config = &s5p64x0_gpio_cfgs[5],
.chip = { .chip = {
.base = S5P6440_GPP(0), .base = S5P6440_GPP(0),
.ngpio = S5P6440_GPIO_P_NR, .ngpio = S5P6440_GPIO_P_NR,
...@@ -294,7 +292,7 @@ static struct s3c_gpio_chip s5p6440_gpio_2bit[] = { ...@@ -294,7 +292,7 @@ static struct s3c_gpio_chip s5p6440_gpio_2bit[] = {
}, },
}; };
void __init s5p6440_gpiolib_set_cfg(struct s3c_gpio_cfg *chipcfg, int nr_chips) void __init s5p64x0_gpiolib_set_cfg(struct s3c_gpio_cfg *chipcfg, int nr_chips)
{ {
for (; nr_chips > 0; nr_chips--, chipcfg++) { for (; nr_chips > 0; nr_chips--, chipcfg++) {
if (!chipcfg->set_config) if (!chipcfg->set_config)
...@@ -308,13 +306,13 @@ void __init s5p6440_gpiolib_set_cfg(struct s3c_gpio_cfg *chipcfg, int nr_chips) ...@@ -308,13 +306,13 @@ void __init s5p6440_gpiolib_set_cfg(struct s3c_gpio_cfg *chipcfg, int nr_chips)
} }
} }
static void __init s5p6440_gpio_add_rbank_4bit2(struct s3c_gpio_chip *chip, static void __init s5p64x0_gpio_add_rbank_4bit2(struct s3c_gpio_chip *chip,
int nr_chips) int nr_chips)
{ {
for (; nr_chips > 0; nr_chips--, chip++) { for (; nr_chips > 0; nr_chips--, chip++) {
chip->chip.direction_input = s5p6440_gpiolib_rbank_4bit2_input; chip->chip.direction_input = s5p64x0_gpiolib_rbank_4bit2_input;
chip->chip.direction_output = chip->chip.direction_output =
s5p6440_gpiolib_rbank_4bit2_output; s5p64x0_gpiolib_rbank_4bit2_output;
s3c_gpiolib_add(chip); s3c_gpiolib_add(chip);
} }
} }
...@@ -324,8 +322,8 @@ static int __init s5p6440_gpiolib_init(void) ...@@ -324,8 +322,8 @@ static int __init s5p6440_gpiolib_init(void)
struct s3c_gpio_chip *chips = s5p6440_gpio_2bit; struct s3c_gpio_chip *chips = s5p6440_gpio_2bit;
int nr_chips = ARRAY_SIZE(s5p6440_gpio_2bit); int nr_chips = ARRAY_SIZE(s5p6440_gpio_2bit);
s5p6440_gpiolib_set_cfg(s5p6440_gpio_cfgs, s5p64x0_gpiolib_set_cfg(s5p64x0_gpio_cfgs,
ARRAY_SIZE(s5p6440_gpio_cfgs)); ARRAY_SIZE(s5p64x0_gpio_cfgs));
for (; nr_chips > 0; nr_chips--, chips++) for (; nr_chips > 0; nr_chips--, chips++)
s3c_gpiolib_add(chips); s3c_gpiolib_add(chips);
...@@ -336,8 +334,8 @@ static int __init s5p6440_gpiolib_init(void) ...@@ -336,8 +334,8 @@ static int __init s5p6440_gpiolib_init(void)
samsung_gpiolib_add_4bit2_chips(s5p6440_gpio_4bit2, samsung_gpiolib_add_4bit2_chips(s5p6440_gpio_4bit2,
ARRAY_SIZE(s5p6440_gpio_4bit2)); ARRAY_SIZE(s5p6440_gpio_4bit2));
s5p6440_gpio_add_rbank_4bit2(gpio_rbank_4bit2, s5p64x0_gpio_add_rbank_4bit2(s5p6440_gpio_rbank_4bit2,
ARRAY_SIZE(gpio_rbank_4bit2)); ARRAY_SIZE(s5p6440_gpio_rbank_4bit2));
return 0; return 0;
} }
......
arch/arm/mach-s5p6440/include/mach/debug-macro.S → arch/arm/mach-s5p64x0/include/mach/debug-macro.S
View file @ f779b7dd
/* linux/arch/arm/mach-s5p6440/include/mach/debug-macro.S /* linux/arch/arm/mach-s5p64x0/include/mach/debug-macro.S
* *
* Copyright (c) 2009 Samsung Electronics Co., Ltd. * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com/ * http://www.samsung.com
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 as
...@@ -10,28 +10,24 @@ ...@@ -10,28 +10,24 @@
/* pull in the relevant register and map files. */ /* pull in the relevant register and map files. */
#include <mach/map.h> #include <plat/map-base.h>
#include <plat/regs-serial.h> #include <plat/map-s5p.h>
/* note, for the boot process to work we have to keep the UART #include <plat/regs-serial.h>
* virtual address aligned to an 1MiB boundary for the L1
* mapping the head code makes. We keep the UART virtual address
* aligned and add in the offset when we load the value here.
*/
.macro addruart, rx, rtmp .macro addruart, rp, rv
mrc p15, 0, \rx, c1, c0 mov \rp, #0xE0000000
tst \rx, #1 orr \rp, \rp, #0x00100000
ldreq \rx, = S3C_PA_UART ldr \rp, [\rp, #0x118 ]
ldrne \rx, = S3C_VA_UART and \rp, \rp, #0xff000
teq \rp, #0x50000 @@ S5P6450
ldreq \rp, =0xEC800000
movne \rp, #0xEC000000 @@ S5P6440
ldrne \rv, = S3C_VA_UART
#if CONFIG_DEBUG_S3C_UART != 0 #if CONFIG_DEBUG_S3C_UART != 0
add \rx, \rx, #(0x400 * CONFIG_DEBUG_S3C_UART) add \rp, \rp, #(0x400 * CONFIG_DEBUG_S3C_UART)
add \rv, \rv, #(0x400 * CONFIG_DEBUG_S3C_UART)
#endif #endif
.endm .endm
/* include the reset of the code which will do the work, we're only
* compiling for a single cpu processor type so the default of s3c2440
* will be fine with us.
*/
#include <plat/debug-macro.S> #include <plat/debug-macro.S>
arch/arm/mach-s5p6440/include/mach/entry-macro.S → arch/arm/mach-s5p64x0/include/mach/entry-macro.S
View file @ f779b7dd
/* linux/arch/arm/mach-s5p6440/include/mach/entry-macro.S /* linux/arch/arm/mach-s5p64x0/include/mach/entry-macro.S
* *
* Copyright (c) 2009 Samsung Electronics Co., Ltd. * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com/ * http://www.samsung.com
* *
* Low-level IRQ helper macros for the Samsung S5P6440 * Low-level IRQ helper macros for the Samsung S5P64X0
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 as
......
arch/arm/mach-s5p6440/include/mach/gpio.h → arch/arm/mach-s5p64x0/include/mach/gpio.h
View file @ f779b7dd
/* linux/arch/arm/mach-s5p6440/include/mach/gpio.h /* linux/arch/arm/mach-s5p64x0/include/mach/gpio.h
* *
* Copyright (c) 2009 Samsung Electronics Co., Ltd. * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com/ * http://www.samsung.com
* *
* S5P6440 - GPIO lib support * S5P64X0 - GPIO lib support
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 as
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#define gpio_to_irq __gpio_to_irq #define gpio_to_irq __gpio_to_irq
/* GPIO bank sizes */ /* GPIO bank sizes */
#define S5P6440_GPIO_A_NR (6) #define S5P6440_GPIO_A_NR (6)
#define S5P6440_GPIO_B_NR (7) #define S5P6440_GPIO_B_NR (7)
#define S5P6440_GPIO_C_NR (8) #define S5P6440_GPIO_C_NR (8)
...@@ -31,30 +32,66 @@ ...@@ -31,30 +32,66 @@
#define S5P6440_GPIO_P_NR (8) #define S5P6440_GPIO_P_NR (8)
#define S5P6440_GPIO_R_NR (15) #define S5P6440_GPIO_R_NR (15)
#define S5P6450_GPIO_A_NR (6)
#define S5P6450_GPIO_B_NR (7)
#define S5P6450_GPIO_C_NR (8)
#define S5P6450_GPIO_D_NR (8)
#define S5P6450_GPIO_F_NR (2)
#define S5P6450_GPIO_G_NR (14)
#define S5P6450_GPIO_H_NR (10)
#define S5P6450_GPIO_I_NR (16)
#define S5P6450_GPIO_J_NR (12)
#define S5P6450_GPIO_K_NR (5)
#define S5P6450_GPIO_N_NR (16)
#define S5P6450_GPIO_P_NR (11)
#define S5P6450_GPIO_Q_NR (14)
#define S5P6450_GPIO_R_NR (15)
#define S5P6450_GPIO_S_NR (8)
/* GPIO bank numbers */ /* GPIO bank numbers */
/* CONFIG_S3C_GPIO_SPACE allows the user to select extra /* CONFIG_S3C_GPIO_SPACE allows the user to select extra
* space for debugging purposes so that any accidental * space for debugging purposes so that any accidental
* change from one gpio bank to another can be caught. * change from one gpio bank to another can be caught.
*/ */
#define S5P6440_GPIO_NEXT(__gpio) \
#define S5P64X0_GPIO_NEXT(__gpio) \
((__gpio##_START) + (__gpio##_NR) + CONFIG_S3C_GPIO_SPACE + 1) ((__gpio##_START) + (__gpio##_NR) + CONFIG_S3C_GPIO_SPACE + 1)
enum s5p_gpio_number { enum s5p6440_gpio_number {
S5P6440_GPIO_A_START = 0, S5P6440_GPIO_A_START = 0,
S5P6440_GPIO_B_START = S5P6440_GPIO_NEXT(S5P6440_GPIO_A), S5P6440_GPIO_B_START = S5P64X0_GPIO_NEXT(S5P6440_GPIO_A),
S5P6440_GPIO_C_START = S5P6440_GPIO_NEXT(S5P6440_GPIO_B), S5P6440_GPIO_C_START = S5P64X0_GPIO_NEXT(S5P6440_GPIO_B),
S5P6440_GPIO_F_START = S5P6440_GPIO_NEXT(S5P6440_GPIO_C), S5P6440_GPIO_F_START = S5P64X0_GPIO_NEXT(S5P6440_GPIO_C),
S5P6440_GPIO_G_START = S5P6440_GPIO_NEXT(S5P6440_GPIO_F), S5P6440_GPIO_G_START = S5P64X0_GPIO_NEXT(S5P6440_GPIO_F),
S5P6440_GPIO_H_START = S5P6440_GPIO_NEXT(S5P6440_GPIO_G), S5P6440_GPIO_H_START = S5P64X0_GPIO_NEXT(S5P6440_GPIO_G),
S5P6440_GPIO_I_START = S5P6440_GPIO_NEXT(S5P6440_GPIO_H), S5P6440_GPIO_I_START = S5P64X0_GPIO_NEXT(S5P6440_GPIO_H),
S5P6440_GPIO_J_START = S5P6440_GPIO_NEXT(S5P6440_GPIO_I), S5P6440_GPIO_J_START = S5P64X0_GPIO_NEXT(S5P6440_GPIO_I),
S5P6440_GPIO_N_START = S5P6440_GPIO_NEXT(S5P6440_GPIO_J), S5P6440_GPIO_N_START = S5P64X0_GPIO_NEXT(S5P6440_GPIO_J),
S5P6440_GPIO_P_START = S5P6440_GPIO_NEXT(S5P6440_GPIO_N), S5P6440_GPIO_P_START = S5P64X0_GPIO_NEXT(S5P6440_GPIO_N),
S5P6440_GPIO_R_START = S5P6440_GPIO_NEXT(S5P6440_GPIO_P), S5P6440_GPIO_R_START = S5P64X0_GPIO_NEXT(S5P6440_GPIO_P),
}; };
/* S5P6440 GPIO number definitions. */ enum s5p6450_gpio_number {
S5P6450_GPIO_A_START = 0,
S5P6450_GPIO_B_START = S5P64X0_GPIO_NEXT(S5P6450_GPIO_A),
S5P6450_GPIO_C_START = S5P64X0_GPIO_NEXT(S5P6450_GPIO_B),
S5P6450_GPIO_D_START = S5P64X0_GPIO_NEXT(S5P6450_GPIO_C),
S5P6450_GPIO_F_START = S5P64X0_GPIO_NEXT(S5P6450_GPIO_D),
S5P6450_GPIO_G_START = S5P64X0_GPIO_NEXT(S5P6450_GPIO_F),
S5P6450_GPIO_H_START = S5P64X0_GPIO_NEXT(S5P6450_GPIO_G),
S5P6450_GPIO_I_START = S5P64X0_GPIO_NEXT(S5P6450_GPIO_H),
S5P6450_GPIO_J_START = S5P64X0_GPIO_NEXT(S5P6450_GPIO_I),
S5P6450_GPIO_K_START = S5P64X0_GPIO_NEXT(S5P6450_GPIO_J),
S5P6450_GPIO_N_START = S5P64X0_GPIO_NEXT(S5P6450_GPIO_K),
S5P6450_GPIO_P_START = S5P64X0_GPIO_NEXT(S5P6450_GPIO_N),
S5P6450_GPIO_Q_START = S5P64X0_GPIO_NEXT(S5P6450_GPIO_P),
S5P6450_GPIO_R_START = S5P64X0_GPIO_NEXT(S5P6450_GPIO_Q),
S5P6450_GPIO_S_START = S5P64X0_GPIO_NEXT(S5P6450_GPIO_R),
};
/* GPIO number definitions */
#define S5P6440_GPA(_nr) (S5P6440_GPIO_A_START + (_nr)) #define S5P6440_GPA(_nr) (S5P6440_GPIO_A_START + (_nr))
#define S5P6440_GPB(_nr) (S5P6440_GPIO_B_START + (_nr)) #define S5P6440_GPB(_nr) (S5P6440_GPIO_B_START + (_nr))
#define S5P6440_GPC(_nr) (S5P6440_GPIO_C_START + (_nr)) #define S5P6440_GPC(_nr) (S5P6440_GPIO_C_START + (_nr))
...@@ -67,13 +104,35 @@ enum s5p_gpio_number { ...@@ -67,13 +104,35 @@ enum s5p_gpio_number {
#define S5P6440_GPP(_nr) (S5P6440_GPIO_P_START + (_nr)) #define S5P6440_GPP(_nr) (S5P6440_GPIO_P_START + (_nr))
#define S5P6440_GPR(_nr) (S5P6440_GPIO_R_START + (_nr)) #define S5P6440_GPR(_nr) (S5P6440_GPIO_R_START + (_nr))
/* the end of the S5P6440 specific gpios */ #define S5P6450_GPA(_nr) (S5P6450_GPIO_A_START + (_nr))
#define S5P6450_GPB(_nr) (S5P6450_GPIO_B_START + (_nr))
#define S5P6450_GPC(_nr) (S5P6450_GPIO_C_START + (_nr))
#define S5P6450_GPD(_nr) (S5P6450_GPIO_D_START + (_nr))
#define S5P6450_GPF(_nr) (S5P6450_GPIO_F_START + (_nr))
#define S5P6450_GPG(_nr) (S5P6450_GPIO_G_START + (_nr))
#define S5P6450_GPH(_nr) (S5P6450_GPIO_H_START + (_nr))
#define S5P6450_GPI(_nr) (S5P6450_GPIO_I_START + (_nr))
#define S5P6450_GPJ(_nr) (S5P6450_GPIO_J_START + (_nr))
#define S5P6450_GPK(_nr) (S5P6450_GPIO_K_START + (_nr))
#define S5P6450_GPN(_nr) (S5P6450_GPIO_N_START + (_nr))
#define S5P6450_GPP(_nr) (S5P6450_GPIO_P_START + (_nr))
#define S5P6450_GPQ(_nr) (S5P6450_GPIO_Q_START + (_nr))
#define S5P6450_GPR(_nr) (S5P6450_GPIO_R_START + (_nr))
#define S5P6450_GPS(_nr) (S5P6450_GPIO_S_START + (_nr))
/* the end of the S5P64X0 specific gpios */
#define S5P6440_GPIO_END (S5P6440_GPR(S5P6440_GPIO_R_NR) + 1) #define S5P6440_GPIO_END (S5P6440_GPR(S5P6440_GPIO_R_NR) + 1)
#define S3C_GPIO_END S5P6440_GPIO_END #define S5P6450_GPIO_END (S5P6450_GPS(S5P6450_GPIO_S_NR) + 1)
#define S5P64X0_GPIO_END (S5P6440_GPIO_END > S5P6450_GPIO_END ? \
S5P6440_GPIO_END : S5P6450_GPIO_END)
#define S3C_GPIO_END S5P64X0_GPIO_END
/* define the number of gpios we need to the one after the last GPIO range */
/* define the number of gpios we need to the one after the GPR() range */ #define ARCH_NR_GPIOS (S5P64X0_GPIO_END + CONFIG_SAMSUNG_GPIO_EXTRA)
#define ARCH_NR_GPIOS (S5P6440_GPR(S5P6440_GPIO_R_NR) + \
CONFIG_SAMSUNG_GPIO_EXTRA + 1)
#include <asm-generic/gpio.h> #include <asm-generic/gpio.h>
......
arch/arm/mach-s5p6440/include/mach/hardware.h → arch/arm/mach-s5p64x0/include/mach/hardware.h
View file @ f779b7dd
/* linux/arch/arm/mach-s5p6440/include/mach/hardware.h /* linux/arch/arm/mach-s5p64x0/include/mach/hardware.h
* *
* Copyright (c) 2009 Samsung Electronics Co., Ltd. * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com/ * http://www.samsung.com
* *
* S5P6440 - Hardware support * S5P64X0 - Hardware support
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 as
......
arch/arm/mach-s5p64x0/include/mach/i2c.h 0 → 100644
View file @ f779b7dd
/* linux/arch/arm/mach-s5p64x0/include/mach/i2c.h
*
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com
*
* S5P64X0 I2C configuration
*
* 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.
*/
extern void s5p6440_i2c0_cfg_gpio(struct platform_device *dev);
extern void s5p6440_i2c1_cfg_gpio(struct platform_device *dev);
extern void s5p6450_i2c0_cfg_gpio(struct platform_device *dev);
extern void s5p6450_i2c1_cfg_gpio(struct platform_device *dev);
arch/arm/mach-s5p6440/include/mach/io.h → arch/arm/mach-s5p64x0/include/mach/io.h
View file @ f779b7dd
/* arch/arm/mach-s5p6440/include/mach/io.h /* linux/arch/arm/mach-s5p64x0/include/mach/io.h
*
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com
* *
* Copyright 2008 Simtec Electronics * Copyright 2008 Simtec Electronics
* Ben Dooks <ben-linux@fluff.org> * Ben Dooks <ben-linux@fluff.org>
* *
* Default IO routines for S3C64XX based * Default IO routines for S5P64X0 based
*/ *
* 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_ARM_ARCH_IO_H #ifndef __ASM_ARM_ARCH_IO_H
#define __ASM_ARM_ARCH_IO_H #define __ASM_ARM_ARCH_IO_H
......
arch/arm/mach-s5p6440/include/mach/irqs.h → arch/arm/mach-s5p64x0/include/mach/irqs.h
View file @ f779b7dd
/* linux/arch/arm/mach-s5p6440/include/mach/irqs.h /* linux/arch/arm/mach-s5p64x0/include/mach/irqs.h
* *
* Copyright 2009 Samsung Electronics Co., Ltd. * Copyright 2009-2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com/ * http://www.samsung.com
* *
* S5P6440 - IRQ definitions * S5P64X0 - IRQ definitions
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#ifndef __ASM_ARCH_S5P_IRQS_H #ifndef __ASM_ARCH_IRQS_H
#define __ASM_ARCH_S5P_IRQS_H __FILE__ #define __ASM_ARCH_IRQS_H __FILE__
#include <plat/irqs.h> #include <plat/irqs.h>
...@@ -20,10 +20,12 @@ ...@@ -20,10 +20,12 @@
#define IRQ_EINT0_3 S5P_IRQ_VIC0(0) #define IRQ_EINT0_3 S5P_IRQ_VIC0(0)
#define IRQ_EINT4_11 S5P_IRQ_VIC0(1) #define IRQ_EINT4_11 S5P_IRQ_VIC0(1)
#define IRQ_RTC_TIC S5P_IRQ_VIC0(2) #define IRQ_RTC_TIC S5P_IRQ_VIC0(2)
#define IRQ_IIS1 S5P_IRQ_VIC0(3) /* for only S5P6450 */
#define IRQ_IIS2 S5P_IRQ_VIC0(4) /* for only S5P6450 */
#define IRQ_IIC1 S5P_IRQ_VIC0(5) #define IRQ_IIC1 S5P_IRQ_VIC0(5)
#define IRQ_I2SV40 S5P_IRQ_VIC0(6) #define IRQ_I2SV40 S5P_IRQ_VIC0(6)
#define IRQ_GPS S5P_IRQ_VIC0(7) #define IRQ_GPS S5P_IRQ_VIC0(7) /* for only S5P6450 */
#define IRQ_POST0 S5P_IRQ_VIC0(9)
#define IRQ_2D S5P_IRQ_VIC0(11) #define IRQ_2D S5P_IRQ_VIC0(11)
#define IRQ_TIMER0_VIC S5P_IRQ_VIC0(23) #define IRQ_TIMER0_VIC S5P_IRQ_VIC0(23)
#define IRQ_TIMER1_VIC S5P_IRQ_VIC0(24) #define IRQ_TIMER1_VIC S5P_IRQ_VIC0(24)
...@@ -39,22 +41,26 @@ ...@@ -39,22 +41,26 @@
#define IRQ_EINT12_15 S5P_IRQ_VIC1(0) #define IRQ_EINT12_15 S5P_IRQ_VIC1(0)
#define IRQ_PCM0 S5P_IRQ_VIC1(2) #define IRQ_PCM0 S5P_IRQ_VIC1(2)
#define IRQ_PCM1 S5P_IRQ_VIC1(3) /* for only S5P6450 */
#define IRQ_PCM2 S5P_IRQ_VIC1(4) /* for only S5P6450 */
#define IRQ_UART0 S5P_IRQ_VIC1(5) #define IRQ_UART0 S5P_IRQ_VIC1(5)
#define IRQ_UART1 S5P_IRQ_VIC1(6) #define IRQ_UART1 S5P_IRQ_VIC1(6)
#define IRQ_UART2 S5P_IRQ_VIC1(7) #define IRQ_UART2 S5P_IRQ_VIC1(7)
#define IRQ_UART3 S5P_IRQ_VIC1(8) #define IRQ_UART3 S5P_IRQ_VIC1(8)
#define IRQ_DMA0 S5P_IRQ_VIC1(9) #define IRQ_DMA0 S5P_IRQ_VIC1(9)
#define IRQ_UART4 S5P_IRQ_VIC1(10) /* S5P6450 */
#define IRQ_UART5 S5P_IRQ_VIC1(11) /* S5P6450 */
#define IRQ_NFC S5P_IRQ_VIC1(13) #define IRQ_NFC S5P_IRQ_VIC1(13)
#define IRQ_USI S5P_IRQ_VIC1(15) /* S5P6450 */
#define IRQ_SPI0 S5P_IRQ_VIC1(16) #define IRQ_SPI0 S5P_IRQ_VIC1(16)
#define IRQ_SPI1 S5P_IRQ_VIC1(17) #define IRQ_SPI1 S5P_IRQ_VIC1(17)
#define IRQ_HSMMC2 S5P_IRQ_VIC1(17) /* Shared */
#define IRQ_IIC S5P_IRQ_VIC1(18) #define IRQ_IIC S5P_IRQ_VIC1(18)
#define IRQ_DISPCON3 S5P_IRQ_VIC1(19) #define IRQ_DISPCON3 S5P_IRQ_VIC1(19)
#define IRQ_FIMGVG S5P_IRQ_VIC1(20)
#define IRQ_EINT_GROUPS S5P_IRQ_VIC1(21) #define IRQ_EINT_GROUPS S5P_IRQ_VIC1(21)
#define IRQ_PMU S5P_IRQ_VIC1(23) #define IRQ_PMU S5P_IRQ_VIC1(23) /* S5P6440 */
#define IRQ_HSMMC0 S5P_IRQ_VIC1(24) #define IRQ_HSMMC0 S5P_IRQ_VIC1(24)
#define IRQ_HSMMC1 S5P_IRQ_VIC1(25) #define IRQ_HSMMC1 S5P_IRQ_VIC1(25)
#define IRQ_HSMMC2 IRQ_SPI1 /* shared with SPI1 */
#define IRQ_OTG S5P_IRQ_VIC1(26) #define IRQ_OTG S5P_IRQ_VIC1(26)
#define IRQ_DSI S5P_IRQ_VIC1(27) #define IRQ_DSI S5P_IRQ_VIC1(27)
#define IRQ_RTC_ALARM S5P_IRQ_VIC1(28) #define IRQ_RTC_ALARM S5P_IRQ_VIC1(28)
...@@ -63,6 +69,24 @@ ...@@ -63,6 +69,24 @@
#define IRQ_TC IRQ_PENDN #define IRQ_TC IRQ_PENDN
#define IRQ_ADC S5P_IRQ_VIC1(31) #define IRQ_ADC S5P_IRQ_VIC1(31)
/* UART interrupts, S5P6450 has 5 UARTs */
#define IRQ_S5P_UART_BASE4 (96)
#define IRQ_S5P_UART_BASE5 (100)
#define IRQ_S5P_UART_RX4 (IRQ_S5P_UART_BASE4 + UART_IRQ_RXD)
#define IRQ_S5P_UART_TX4 (IRQ_S5P_UART_BASE4 + UART_IRQ_TXD)
#define IRQ_S5P_UART_ERR4 (IRQ_S5P_UART_BASE4 + UART_IRQ_ERR)
#define IRQ_S5P_UART_RX5 (IRQ_S5P_UART_BASE5 + UART_IRQ_RXD)
#define IRQ_S5P_UART_TX5 (IRQ_S5P_UART_BASE5 + UART_IRQ_TXD)
#define IRQ_S5P_UART_ERR5 (IRQ_S5P_UART_BASE5 + UART_IRQ_ERR)
/* S3C compatibilty defines */
#define IRQ_S3CUART_RX4 IRQ_S5P_UART_RX4
#define IRQ_S3CUART_RX5 IRQ_S5P_UART_RX5
/* S5P6450 EINT feature will be added */
/* /*
* Since the IRQ_EINT(x) are a linear mapping on s5p6440 we just defined * Since the IRQ_EINT(x) are a linear mapping on s5p6440 we just defined
* them as an IRQ_EINT(x) macro from S5P_IRQ_EINT_BASE which we place * them as an IRQ_EINT(x) macro from S5P_IRQ_EINT_BASE which we place
...@@ -115,4 +139,4 @@ ...@@ -115,4 +139,4 @@
#define NR_IRQS (IRQ_EINT_GROUP8_BASE + IRQ_EINT_GROUP8_NR + 1) #define NR_IRQS (IRQ_EINT_GROUP8_BASE + IRQ_EINT_GROUP8_NR + 1)
#endif /* __ASM_ARCH_S5P_IRQS_H */ #endif /* __ASM_ARCH_IRQS_H */
arch/arm/mach-s5p64x0/include/mach/map.h 0 → 100644
View file @ f779b7dd
/* linux/arch/arm/mach-s5p64x0/include/mach/map.h
*
* Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com
*
* S5P64X0 - Memory map 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 __ASM_ARCH_MAP_H
#define __ASM_ARCH_MAP_H __FILE__
#include <plat/map-base.h>
#include <plat/map-s5p.h>
#define S5P64X0_PA_SDRAM (0x20000000)
#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_PDMA (0xE9000000)
#define S5P64X0_PA_TIMER (0xEA000000)
#define S5P_PA_TIMER S5P64X0_PA_TIMER
#define S5P64X0_PA_RTC (0xEA100000)
#define S5P64X0_PA_WDT (0xEA200000)
#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
#define S5P6440_PA_IIC0 (0xEC104000)
#define S5P6440_PA_IIC1 (0xEC20F000)
#define S5P6450_PA_IIC0 (0xEC100000)
#define S5P6450_PA_IIC1 (0xEC200000)
#define S5P64X0_PA_SPI0 (0xEC400000)
#define S5P64X0_PA_SPI1 (0xEC500000)
#define S5P64X0_PA_HSOTG (0xED100000)
#define S5P64X0_PA_HSMMC(x) (0xED800000 + ((x) * 0x100000))
#define S5P64X0_PA_I2S (0xF2000000)
#define S5P64X0_PA_PCM (0xF2100000)
#define S5P64X0_PA_ADC (0xF3000000)
/* compatibiltiy defines. */
#define S3C_PA_HSMMC0 S5P64X0_PA_HSMMC(0)
#define S3C_PA_HSMMC1 S5P64X0_PA_HSMMC(1)
#define S3C_PA_HSMMC2 S5P64X0_PA_HSMMC(2)
#define S3C_PA_IIC S5P6440_PA_IIC0
#define S3C_PA_IIC1 S5P6440_PA_IIC1
#define S3C_PA_RTC S5P64X0_PA_RTC
#define S3C_PA_WDT S5P64X0_PA_WDT
#define SAMSUNG_PA_ADC S5P64X0_PA_ADC
#endif /* __ASM_ARCH_MAP_H */
arch/arm/mach-s5p6440/include/mach/memory.h → arch/arm/mach-s5p64x0/include/mach/memory.h
View file @ f779b7dd
/* linux/arch/arm/mach-s5p6440/include/mach/memory.h /* linux/arch/arm/mach-s5p64x0/include/mach/memory.h
* *
* Copyright (c) 2009 Samsung Electronics Co., Ltd. * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com/ * http://www.samsung.com
* *
* S5P6440 - Memory definitions * S5P64X0 - Memory definitions
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 as
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
*/ */
#ifndef __ASM_ARCH_MEMORY_H #ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H #define __ASM_ARCH_MEMORY_H __FILE__
#define PHYS_OFFSET UL(0x20000000) #define PHYS_OFFSET UL(0x20000000)
#define CONSISTENT_DMA_SIZE SZ_8M #define CONSISTENT_DMA_SIZE SZ_8M
......
arch/arm/mach-s5p6440/include/mach/pwm-clock.h → arch/arm/mach-s5p64x0/include/mach/pwm-clock.h
View file @ f779b7dd
/* linux/arch/arm/mach-s5p6440/include/mach/pwm-clock.h /* linux/arch/arm/mach-s5p64x0/include/mach/pwm-clock.h
* *
* Copyright (c) 2009 Samsung Electronics Co., Ltd. * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com/ * http://www.samsung.com
* *
* Copyright 2008 Openmoko, Inc. * Copyright 2008 Openmoko, Inc.
* Copyright 2008 Simtec Electronics * Copyright 2008 Simtec Electronics
* Ben Dooks <ben@simtec.co.uk> * Ben Dooks <ben@simtec.co.uk>
* http://armlinux.simtec.co.uk/ * http://armlinux.simtec.co.uk/
* *
* Based on arch/arm/mach-s3c64xx/include/mach/pwm-clock.h * S5P64X0 - pwm clock and timer support
*
* S5P6440 - pwm clock and timer support
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 as
......
arch/arm/mach-s5p64x0/include/mach/regs-clock.h 0 → 100644
View file @ f779b7dd
/* linux/arch/arm/mach-s5p64x0/include/mach/regs-clock.h
*
* Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com
*
* S5P64X0 - 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 __ASM_ARCH_REGS_CLOCK_H
#define __ASM_ARCH_REGS_CLOCK_H __FILE__
#include <mach/map.h>
#define S5P_CLKREG(x) (S3C_VA_SYS + (x))
#define S5P64X0_APLL_CON S5P_CLKREG(0x0C)
#define S5P64X0_MPLL_CON S5P_CLKREG(0x10)
#define S5P64X0_EPLL_CON S5P_CLKREG(0x14)
#define S5P64X0_EPLL_CON_K S5P_CLKREG(0x18)
#define S5P64X0_CLK_SRC0 S5P_CLKREG(0x1C)
#define S5P64X0_CLK_DIV0 S5P_CLKREG(0x20)
#define S5P64X0_CLK_DIV1 S5P_CLKREG(0x24)
#define S5P64X0_CLK_DIV2 S5P_CLKREG(0x28)
#define S5P64X0_CLK_GATE_HCLK0 S5P_CLKREG(0x30)
#define S5P64X0_CLK_GATE_PCLK S5P_CLKREG(0x34)
#define S5P64X0_CLK_GATE_SCLK0 S5P_CLKREG(0x38)
#define S5P64X0_CLK_GATE_MEM0 S5P_CLKREG(0x3C)
#define S5P64X0_CLK_DIV3 S5P_CLKREG(0x40)
#define S5P64X0_CLK_GATE_HCLK1 S5P_CLKREG(0x44)
#define S5P64X0_CLK_GATE_SCLK1 S5P_CLKREG(0x48)
#define S5P6450_DPLL_CON S5P_CLKREG(0x50)
#define S5P6450_DPLL_CON_K S5P_CLKREG(0x54)
#define S5P64X0_CLK_SRC1 S5P_CLKREG(0x10C)
#define S5P64X0_SYS_ID S5P_CLKREG(0x118)
#define S5P64X0_SYS_OTHERS S5P_CLKREG(0x11C)
#define S5P64X0_PWR_CFG S5P_CLKREG(0x804)
#define S5P64X0_OTHERS S5P_CLKREG(0x900)
#define S5P64X0_CLKDIV0_HCLK_SHIFT (8)
#define S5P64X0_CLKDIV0_HCLK_MASK (0xF << S5P64X0_CLKDIV0_HCLK_SHIFT)
#define S5P64X0_OTHERS_USB_SIG_MASK (1 << 16)
/* Compatibility defines */
#define ARM_CLK_DIV S5P64X0_CLK_DIV0
#define ARM_DIV_RATIO_SHIFT 0
#define ARM_DIV_MASK (0xF << ARM_DIV_RATIO_SHIFT)
#endif /* __ASM_ARCH_REGS_CLOCK_H */
arch/arm/mach-s5p6440/include/mach/regs-gpio.h → arch/arm/mach-s5p64x0/include/mach/regs-gpio.h
View file @ f779b7dd
/* linux/arch/arm/mach-s5p6440/include/mach/regs-gpio.h /* linux/arch/arm/mach-s5p64x0/include/mach/regs-gpio.h
* *
* Copyright (c) 2009 Samsung Electronics Co., Ltd. * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com/ * http://www.samsung.com
* *
* S5P6440 - GPIO register definitions * S5P64X0 - GPIO register definitions
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#ifndef __ASM_ARCH_REGS_GPIO_H #ifndef __ASM_ARCH_REGS_GPIO_H
#define __ASM_ARCH_REGS_GPIO_H __FILE__ #define __ASM_ARCH_REGS_GPIO_H __FILE__
#include <mach/map.h> #include <mach/map.h>
/* Will be implemented S5P6442 GPIOlib */
/* Base addresses for each of the banks */ /* Base addresses for each of the banks */
#define S5P6440_GPA_BASE (S5P_VA_GPIO + 0x0000) #define S5P6440_GPA_BASE (S5P_VA_GPIO + 0x0000)
#define S5P6440_GPB_BASE (S5P_VA_GPIO + 0x0020) #define S5P6440_GPB_BASE (S5P_VA_GPIO + 0x0020)
#define S5P6440_GPC_BASE (S5P_VA_GPIO + 0x0040) #define S5P6440_GPC_BASE (S5P_VA_GPIO + 0x0040)
...@@ -27,6 +30,7 @@ ...@@ -27,6 +30,7 @@
#define S5P6440_GPN_BASE (S5P_VA_GPIO + 0x0830) #define S5P6440_GPN_BASE (S5P_VA_GPIO + 0x0830)
#define S5P6440_GPP_BASE (S5P_VA_GPIO + 0x0160) #define S5P6440_GPP_BASE (S5P_VA_GPIO + 0x0160)
#define S5P6440_GPR_BASE (S5P_VA_GPIO + 0x0290) #define S5P6440_GPR_BASE (S5P_VA_GPIO + 0x0290)
#define S5P6440_EINT0CON0 (S5P_VA_GPIO + 0x900) #define S5P6440_EINT0CON0 (S5P_VA_GPIO + 0x900)
#define S5P6440_EINT0FLTCON0 (S5P_VA_GPIO + 0x910) #define S5P6440_EINT0FLTCON0 (S5P_VA_GPIO + 0x910)
#define S5P6440_EINT0FLTCON1 (S5P_VA_GPIO + 0x914) #define S5P6440_EINT0FLTCON1 (S5P_VA_GPIO + 0x914)
...@@ -34,19 +38,23 @@ ...@@ -34,19 +38,23 @@
#define S5P6440_EINT0PEND (S5P_VA_GPIO + 0x924) #define S5P6440_EINT0PEND (S5P_VA_GPIO + 0x924)
/* for LCD */ /* for LCD */
#define S5P6440_SPCON_LCD_SEL_RGB (1 << 0) #define S5P6440_SPCON_LCD_SEL_RGB (1 << 0)
#define S5P6440_SPCON_LCD_SEL_MASK (3 << 0) #define S5P6440_SPCON_LCD_SEL_MASK (3 << 0)
/* These set of macros are not really useful for the /*
* GPF/GPI/GPJ/GPN/GPP, * These set of macros are not really useful for the
* useful for others set of GPIO's (4 bit) * GPF/GPI/GPJ/GPN/GPP, useful for others set of GPIO's (4 bit)
*/ */
#define S5P6440_GPIO_CONMASK(__gpio) (0xf << ((__gpio) * 4)) #define S5P6440_GPIO_CONMASK(__gpio) (0xf << ((__gpio) * 4))
#define S5P6440_GPIO_INPUT(__gpio) (0x0 << ((__gpio) * 4)) #define S5P6440_GPIO_INPUT(__gpio) (0x0 << ((__gpio) * 4))
#define S5P6440_GPIO_OUTPUT(__gpio) (0x1 << ((__gpio) * 4)) #define S5P6440_GPIO_OUTPUT(__gpio) (0x1 << ((__gpio) * 4))
/* Use these macros for GPF/GPI/GPJ/GPN/GPP set of GPIO (2 bit) /*
* */ * Use these macros for GPF/GPI/GPJ/GPN/GPP set of GPIO (2 bit)
*/
#define S5P6440_GPIO2_CONMASK(__gpio) (0x3 << ((__gpio) * 2)) #define S5P6440_GPIO2_CONMASK(__gpio) (0x3 << ((__gpio) * 2))
#define S5P6440_GPIO2_INPUT(__gpio) (0x0 << ((__gpio) * 2)) #define S5P6440_GPIO2_INPUT(__gpio) (0x0 << ((__gpio) * 2))
#define S5P6440_GPIO2_OUTPUT(__gpio) (0x1 << ((__gpio) * 2)) #define S5P6440_GPIO2_OUTPUT(__gpio) (0x1 << ((__gpio) * 2))
......
arch/arm/mach-s5p6440/include/mach/regs-irq.h → arch/arm/mach-s5p64x0/include/mach/regs-irq.h
View file @ f779b7dd
/* linux/arch/arm/mach-s5p6440/include/mach/regs-irq.h /* linux/arch/arm/mach-s5p64x0/include/mach/regs-irq.h
* *
* Copyright (c) 2009 Samsung Electronics Co., Ltd. * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com/ * http://www.samsung.com
* *
* S5P6440 - IRQ register definitions * S5P64X0 - IRQ register definitions
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 as
......
arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h 0 → 100644
View file @ f779b7dd
/* linux/arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h
*
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com
*
* Header file for s5p64x0 clock 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_CLOCK_H
#define __ASM_ARCH_CLOCK_H __FILE__
#include <linux/clk.h>
extern struct clksrc_clk clk_mout_apll;
extern struct clksrc_clk clk_mout_mpll;
extern struct clksrc_clk clk_mout_epll;
extern int s5p64x0_epll_enable(struct clk *clk, int enable);
extern unsigned long s5p64x0_epll_get_rate(struct clk *clk);
extern unsigned long s5p64x0_armclk_get_rate(struct clk *clk);
extern unsigned long s5p64x0_armclk_round_rate(struct clk *clk, unsigned long rate);
extern int s5p64x0_armclk_set_rate(struct clk *clk, unsigned long rate);
extern struct clk_ops s5p64x0_clkarm_ops;
extern struct clksrc_clk clk_armclk;
extern struct clksrc_clk clk_dout_mpll;
extern struct clk *clkset_hclk_low_list[];
extern struct clksrc_sources clkset_hclk_low;
extern int s5p64x0_pclk_ctrl(struct clk *clk, int enable);
extern int s5p64x0_hclk0_ctrl(struct clk *clk, int enable);
extern int s5p64x0_hclk1_ctrl(struct clk *clk, int enable);
extern int s5p64x0_sclk_ctrl(struct clk *clk, int enable);
extern int s5p64x0_sclk1_ctrl(struct clk *clk, int enable);
extern int s5p64x0_mem_ctrl(struct clk *clk, int enable);
extern int s5p64x0_clk48m_ctrl(struct clk *clk, int enable);
#endif /* __ASM_ARCH_CLOCK_H */
arch/arm/mach-s5p6440/include/mach/spi-clocks.h → arch/arm/mach-s5p64x0/include/mach/spi-clocks.h
View file @ f779b7dd
/* linux/arch/arm/mach-s5p6440/include/mach/spi-clocks.h /* linux/arch/arm/mach-s5p64x0/include/mach/spi-clocks.h
*
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com
* *
* Copyright (C) 2010 Samsung Electronics Co. Ltd. * Copyright (C) 2010 Samsung Electronics Co. Ltd.
* Jaswinder Singh <jassi.brar@samsung.com> * Jaswinder Singh <jassi.brar@samsung.com>
...@@ -6,12 +9,12 @@ ...@@ -6,12 +9,12 @@
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#ifndef __S5P6440_PLAT_SPI_CLKS_H #ifndef __ASM_ARCH_SPI_CLKS_H
#define __S5P6440_PLAT_SPI_CLKS_H __FILE__ #define __ASM_ARCH_SPI_CLKS_H __FILE__
#define S5P6440_SPI_SRCCLK_PCLK 0 #define S5P64X0_SPI_SRCCLK_PCLK 0
#define S5P6440_SPI_SRCCLK_SCLK 1 #define S5P64X0_SPI_SRCCLK_SCLK 1
#endif /* __S5P6440_PLAT_SPI_CLKS_H */ #endif /* __ASM_ARCH_SPI_CLKS_H */
arch/arm/mach-s5p6440/include/mach/system.h → arch/arm/mach-s5p64x0/include/mach/system.h
View file @ f779b7dd
/* linux/arch/arm/mach-s5p6440/include/mach/system.h /* linux/arch/arm/mach-s5p64x0/include/mach/system.h
* *
* Copyright (c) 2009 Samsung Electronics Co., Ltd. * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com/ * http://www.samsung.com
* *
* S5P6440 - system support header * S5P64X0 - system support header
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 as
......
arch/arm/mach-s5p6440/include/mach/tick.h → arch/arm/mach-s5p64x0/include/mach/tick.h
View file @ f779b7dd
/* linux/arch/arm/mach-s5p6440/include/mach/tick.h /* linux/arch/arm/mach-s5p64x0/include/mach/tick.h
* *
* Copyright (c) 2009 Samsung Electronics Co., Ltd. * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com/ * http://www.samsung.com
* *
* S5P6440 - Timer tick support definitions * Copyright 2008 Openmoko, Inc.
* Copyright 2008 Simtec Electronics
* http://armlinux.simtec.co.uk/
* Ben Dooks <ben@simtec.co.uk>
*
* S5P64X0 - Timer tick support definitions
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 as
......
arch/arm/mach-s5p6440/include/mach/timex.h → arch/arm/mach-s5p64x0/include/mach/timex.h
View file @ f779b7dd
/* arch/arm/mach-s3c64xx/include/mach/timex.h /* linux/arch/arm/mach-s5p64x0/include/mach/timex.h
*
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com
* *
* Copyright (c) 2003-2005 Simtec Electronics * Copyright (c) 2003-2005 Simtec Electronics
* Ben Dooks <ben@simtec.co.uk> * Ben Dooks <ben@simtec.co.uk>
* *
* S3C6400 - time parameters * S5P64X0 - time parameters
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 as
......
arch/arm/mach-s5p64x0/include/mach/uncompress.h 0 → 100644
View file @ f779b7dd
This diff is collapsed.
arch/arm/mach-s5p6440/include/mach/vmalloc.h → arch/arm/mach-s5p64x0/include/mach/vmalloc.h
View file @ f779b7dd
/* arch/arm/mach-s5p6440/include/mach/vmalloc.h /* linux/arch/arm/mach-s5p64x0/include/mach/vmalloc.h
*
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com
* *
* Copyright 2010 Ben Dooks <ben-linux@fluff.org> * Copyright 2010 Ben Dooks <ben-linux@fluff.org>
* *
......
arch/arm/mach-s5p6440/init.c → arch/arm/mach-s5p64x0/init.c
View file @ f779b7dd
/* linux/arch/arm/mach-s5p6440/init.c /* linux/arch/arm/mach-s5p64x0/init.c
* *
* Copyright (c) 2009 Samsung Electronics Co., Ltd. * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com/ * http://www.samsung.com
* *
* S5P6440 - Init support * S5P64X0 - Init support
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 as
...@@ -15,12 +15,15 @@ ...@@ -15,12 +15,15 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/serial_core.h> #include <linux/serial_core.h>
#include <mach/map.h>
#include <plat/cpu.h> #include <plat/cpu.h>
#include <plat/devs.h> #include <plat/devs.h>
#include <plat/s5p6440.h> #include <plat/s5p6440.h>
#include <plat/s5p6450.h>
#include <plat/regs-serial.h> #include <plat/regs-serial.h>
static struct s3c24xx_uart_clksrc s5p6440_serial_clocks[] = { static struct s3c24xx_uart_clksrc s5p64x0_serial_clocks[] = {
[0] = { [0] = {
.name = "pclk_low", .name = "pclk_low",
.divisor = 1, .divisor = 1,
...@@ -36,17 +39,35 @@ static struct s3c24xx_uart_clksrc s5p6440_serial_clocks[] = { ...@@ -36,17 +39,35 @@ static struct s3c24xx_uart_clksrc s5p6440_serial_clocks[] = {
}; };
/* uart registration process */ /* uart registration process */
void __init s5p6440_common_init_uarts(struct s3c2410_uartcfg *cfg, int no)
void __init s5p64x0_common_init_uarts(struct s3c2410_uartcfg *cfg, int no)
{ {
struct s3c2410_uartcfg *tcfg = cfg; struct s3c2410_uartcfg *tcfg = cfg;
u32 ucnt; u32 ucnt;
for (ucnt = 0; ucnt < no; ucnt++, tcfg++) { for (ucnt = 0; ucnt < no; ucnt++, tcfg++) {
if (!tcfg->clocks) { if (!tcfg->clocks) {
tcfg->clocks = s5p6440_serial_clocks; tcfg->clocks = s5p64x0_serial_clocks;
tcfg->clocks_size = ARRAY_SIZE(s5p6440_serial_clocks); tcfg->clocks_size = ARRAY_SIZE(s5p64x0_serial_clocks);
} }
} }
}
void __init s5p6440_init_uarts(struct s3c2410_uartcfg *cfg, int no)
{
int uart;
for (uart = 0; uart < no; uart++) {
s5p_uart_resources[uart].resources->start = S5P6440_PA_UART(uart);
s5p_uart_resources[uart].resources->end = S5P6440_PA_UART(uart) + S5P_SZ_UART;
}
s5p64x0_common_init_uarts(cfg, no);
s3c24xx_init_uartdevs("s3c6400-uart", s5p_uart_resources, cfg, no);
}
void __init s5p6450_init_uarts(struct s3c2410_uartcfg *cfg, int no)
{
s5p64x0_common_init_uarts(cfg, no);
s3c24xx_init_uartdevs("s3c6400-uart", s5p_uart_resources, cfg, no); s3c24xx_init_uartdevs("s3c6400-uart", s5p_uart_resources, cfg, no);
} }
arch/arm/mach-s5p64x0/mach-smdk6450.c 0 → 100644
View file @ f779b7dd
This diff is collapsed.
arch/arm/mach-s5pc100/cpu.c
View file @ f779b7dd
This diff is collapsed.
arch/arm/mach-s5pc100/include/mach/map.h
View file @ f779b7dd
This diff is collapsed.
arch/arm/mach-s5pv210/Kconfig
View file @ f779b7dd
This diff is collapsed.
arch/arm/mach-s5pv210/Makefile
View file @ f779b7dd
This diff is collapsed.
arch/arm/mach-s5pv210/clock.c
View file @ f779b7dd
This diff is collapsed.
arch/arm/mach-s5pv210/cpu.c
View file @ f779b7dd
This diff is collapsed.
arch/arm/mach-s5pv210/include/mach/map.h
View file @ f779b7dd
This diff is collapsed.
arch/arm/mach-s5pv210/mach-aquila.c
View file @ f779b7dd
This diff is collapsed.
arch/arm/mach-s5pv210/mach-goni.c
View file @ f779b7dd
This diff is collapsed.
arch/arm/mach-s5pv310/cpu.c
View file @ f779b7dd
This diff is collapsed.
arch/arm/mach-s5pv310/include/mach/irqs.h
View file @ f779b7dd
This diff is collapsed.
arch/arm/mach-s5pv310/include/mach/map.h
View file @ f779b7dd
This diff is collapsed.
arch/arm/mach-vexpress/ct-ca9x4.c
View file @ f779b7dd
This diff is collapsed.
arch/arm/mach-vexpress/v2m.c
View file @ f779b7dd
This diff is collapsed.
arch/arm/mm/ioremap.c
View file @ f779b7dd
This diff is collapsed.
arch/arm/mm/mmu.c
View file @ f779b7dd
This diff is collapsed.
arch/arm/mm/proc-v7.S
View file @ f779b7dd
This diff is collapsed.
arch/arm/plat-omap/iommu.c
View file @ f779b7dd
This diff is collapsed.
arch/arm/plat-s5p/Kconfig
View file @ f779b7dd
This diff is collapsed.
arch/arm/plat-s5p/Makefile
View file @ f779b7dd
...@@ -24,3 +24,4 @@ obj-$(CONFIG_S5P_EXT_INT) += irq-eint.o ...@@ -24,3 +24,4 @@ obj-$(CONFIG_S5P_EXT_INT) += irq-eint.o
obj-$(CONFIG_S5P_DEV_FIMC0) += dev-fimc0.o obj-$(CONFIG_S5P_DEV_FIMC0) += dev-fimc0.o
obj-$(CONFIG_S5P_DEV_FIMC1) += dev-fimc1.o obj-$(CONFIG_S5P_DEV_FIMC1) += dev-fimc1.o
obj-$(CONFIG_S5P_DEV_FIMC2) += dev-fimc2.o obj-$(CONFIG_S5P_DEV_FIMC2) += dev-fimc2.o
obj-$(CONFIG_S5P_DEV_ONENAND) += dev-onenand.o
arch/arm/plat-s5p/clock.c
View file @ f779b7dd
This diff is collapsed.
arch/arm/plat-s5p/cpu.c
View file @ f779b7dd
This diff is collapsed.
arch/arm/plat-s5p/dev-uart.c
View file @ f779b7dd
This diff is collapsed.
arch/arm/plat-s5p/include/plat/pll.h
View file @ f779b7dd
This diff is collapsed.
arch/arm/plat-s5p/include/plat/s5p-clock.h
View file @ f779b7dd
This diff is collapsed.
arch/arm/plat-s5p/include/plat/s5p6440.h
View file @ f779b7dd
This diff is collapsed.
arch/arm/plat-s5p/include/plat/s5p6450.h 0 → 100644
View file @ f779b7dd
This diff is collapsed.
arch/arm/plat-samsung/adc.c
View file @ f779b7dd
This diff is collapsed.
arch/arm/plat-samsung/clock.c
View file @ f779b7dd
This diff is collapsed.
arch/arm/plat-samsung/include/plat/cpu.h
View file @ f779b7dd
This diff is collapsed.
arch/arm/plat-samsung/include/plat/devs.h
View file @ f779b7dd
This diff is collapsed.
arch/mips/include/asm/siginfo.h
View file @ f779b7dd
This diff is collapsed.
arch/x86/ia32/ia32_aout.c
View file @ f779b7dd
This diff is collapsed.
arch/x86/kernel/cpu/mcheck/mce_amd.c
View file @ f779b7dd
This diff is collapsed.
arch/x86/kernel/cpu/mcheck/therm_throt.c
View file @ f779b7dd
This diff is collapsed.
arch/x86/kvm/svm.c
View file @ f779b7dd
This diff is collapsed.
arch/x86/mm/srat_64.c
View file @ f779b7dd
This diff is collapsed.
block/elevator.c
View file @ f779b7dd
This diff is collapsed.
drivers/acpi/blacklist.c
View file @ f779b7dd
This diff is collapsed.
drivers/acpi/processor_core.c
View file @ f779b7dd
This diff is collapsed.
drivers/atm/iphase.c
View file @ f779b7dd
This diff is collapsed.
drivers/atm/iphase.h
View file @ f779b7dd
This diff is collapsed.
drivers/atm/solos-pci.c
View file @ f779b7dd
This diff is collapsed.
drivers/block/virtio_blk.c
View file @ f779b7dd
This diff is collapsed.
drivers/dma/ioat/dma_v2.c
View file @ f779b7dd
This diff is collapsed.
drivers/gpu/drm/i915/i915_dma.c
View file @ f779b7dd
This diff is collapsed.
drivers/gpu/drm/i915/intel_fb.c
View file @ f779b7dd
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_fbcon.c
View file @ f779b7dd
This diff is collapsed.
drivers/gpu/drm/nouveau/nouveau_notifier.c
View file @ f779b7dd
This diff is collapsed.
drivers/gpu/drm/radeon/evergreen.c
View file @ f779b7dd
This diff is collapsed.
drivers/gpu/drm/radeon/r100.c
View file @ f779b7dd
This diff is collapsed.
drivers/gpu/drm/radeon/r600.c
View file @ f779b7dd
This diff is collapsed.
drivers/gpu/drm/radeon/r600_blit_kms.c
View file @ f779b7dd
This diff is collapsed.
drivers/gpu/drm/radeon/radeon.h
View file @ f779b7dd
This diff is collapsed.
drivers/gpu/drm/radeon/radeon_atombios.c
View file @ f779b7dd
This diff is collapsed.
drivers/gpu/drm/radeon/radeon_combios.c
View file @ f779b7dd
This diff is collapsed.
drivers/gpu/drm/radeon/radeon_fb.c
View file @ f779b7dd
This diff is collapsed.
drivers/gpu/drm/radeon/radeon_object.c
View file @ f779b7dd
This diff is collapsed.
drivers/gpu/drm/radeon/radeon_object.h
View file @ f779b7dd
This diff is collapsed.
drivers/gpu/drm/radeon/rs600.c
View file @ f779b7dd
This diff is collapsed.
drivers/gpu/drm/radeon/rs690.c
View file @ f779b7dd
This diff is collapsed.
drivers/gpu/drm/radeon/rv770.c
View file @ f779b7dd
This diff is collapsed.
drivers/gpu/drm/ttm/ttm_bo.c
View file @ f779b7dd
This diff is collapsed.
drivers/i2c/busses/i2c-cpm.c
View file @ f779b7dd
This diff is collapsed.
drivers/i2c/busses/i2c-ibm_iic.c
View file @ f779b7dd
This diff is collapsed.
drivers/i2c/busses/i2c-mpc.c
View file @ f779b7dd
This diff is collapsed.
drivers/i2c/busses/i2c-pca-isa.c
View file @ f779b7dd
This diff is collapsed.
drivers/i2c/busses/i2c-pca-platform.c
View file @ f779b7dd
This diff is collapsed.
drivers/i2c/i2c-core.c
View file @ f779b7dd
This diff is collapsed.
drivers/idle/intel_idle.c
View file @ f779b7dd
This diff is collapsed.
drivers/input/joydev.c
View file @ f779b7dd
This diff is collapsed.
drivers/input/misc/uinput.c
View file @ f779b7dd
This diff is collapsed.
drivers/input/tablet/wacom_sys.c
View file @ f779b7dd
This diff is collapsed.
drivers/input/tablet/wacom_wac.c
View file @ f779b7dd
This diff is collapsed.
drivers/isdn/sc/interrupt.c
View file @ f779b7dd
This diff is collapsed.
drivers/md/bitmap.c
View file @ f779b7dd
This diff is collapsed.
drivers/md/raid1.c
View file @ f779b7dd
This diff is collapsed.
drivers/media/IR/ir-keytable.c
View file @ f779b7dd
This diff is collapsed.
drivers/media/IR/ir-lirc-codec.c
View file @ f779b7dd
This diff is collapsed.
drivers/media/IR/ir-raw-event.c
View file @ f779b7dd
This diff is collapsed.
drivers/media/IR/ir-sysfs.c
View file @ f779b7dd
This diff is collapsed.
drivers/media/IR/keymaps/rc-rc6-mce.c
View file @ f779b7dd
This diff is collapsed.
drivers/media/IR/mceusb.c
View file @ f779b7dd
This diff is collapsed.
drivers/media/dvb/dvb-usb/dib0700_core.c
View file @ f779b7dd
This diff is collapsed.
drivers/media/dvb/dvb-usb/dib0700_devices.c
View file @ f779b7dd
This diff is collapsed.
drivers/media/dvb/dvb-usb/opera1.c
View file @ f779b7dd
This diff is collapsed.
drivers/media/dvb/frontends/dib7000p.c
View file @ f779b7dd
This diff is collapsed.
drivers/media/dvb/frontends/dib7000p.h
View file @ f779b7dd
This diff is collapsed.
drivers/media/dvb/siano/smscoreapi.c
View file @ f779b7dd
This diff is collapsed.
drivers/media/video/cx231xx/Makefile
View file @ f779b7dd
This diff is collapsed.
drivers/media/video/cx231xx/cx231xx-cards.c
View file @ f779b7dd
This diff is collapsed.
drivers/media/video/cx25840/cx25840-core.c
View file @ f779b7dd
This diff is collapsed.
drivers/media/video/cx88/Kconfig
View file @ f779b7dd
This diff is collapsed.
drivers/media/video/gspca/gspca.c
View file @ f779b7dd
This diff is collapsed.
drivers/media/video/gspca/sn9c20x.c
View file @ f779b7dd
This diff is collapsed.
drivers/media/video/ivtv/ivtvfb.c
View file @ f779b7dd
This diff is collapsed.
drivers/media/video/mem2mem_testdev.c
View file @ f779b7dd
This diff is collapsed.
drivers/media/video/mt9m111.c
View file @ f779b7dd
This diff is collapsed.
drivers/media/video/mt9v022.c
View file @ f779b7dd
This diff is collapsed.
drivers/media/video/mx2_camera.c
View file @ f779b7dd
This diff is collapsed.
drivers/media/video/pvrusb2/pvrusb2-ctrl.c
View file @ f779b7dd
This diff is collapsed.
drivers/media/video/s5p-fimc/fimc-core.c
View file @ f779b7dd
This diff is collapsed.
drivers/media/video/saa7134/saa7134-cards.c
View file @ f779b7dd
This diff is collapsed.
drivers/media/video/uvc/uvc_driver.c
View file @ f779b7dd
This diff is collapsed.
drivers/media/video/uvc/uvcvideo.h
View file @ f779b7dd
This diff is collapsed.
drivers/media/video/videobuf-dma-contig.c
View file @ f779b7dd
This diff is collapsed.
drivers/media/video/videobuf-dma-sg.c
View file @ f779b7dd
This diff is collapsed.
drivers/misc/bh1780gli.c
View file @ f779b7dd
This diff is collapsed.
drivers/net/Kconfig
View file @ f779b7dd
This diff is collapsed.
drivers/net/b44.c
View file @ f779b7dd
This diff is collapsed.
drivers/net/bonding/bond_main.c
View file @ f779b7dd
This diff is collapsed.
drivers/net/ehea/ehea_main.c
View file @ f779b7dd
This diff is collapsed.
drivers/net/ehea/ehea_qmr.h
View file @ f779b7dd
This diff is collapsed.
drivers/net/fec.c
View file @ f779b7dd
This diff is collapsed.
drivers/net/r8169.c
View file @ f779b7dd
This diff is collapsed.
drivers/net/skge.c
View file @ f779b7dd
This diff is collapsed.
drivers/net/tg3.c
View file @ f779b7dd
This diff is collapsed.
drivers/net/tg3.h
View file @ f779b7dd
This diff is collapsed.
drivers/net/wimax/i2400m/rx.c
View file @ f779b7dd
This diff is collapsed.
drivers/net/wireless/ath/ath9k/ani.c
View file @ f779b7dd
This diff is collapsed.
drivers/platform/x86/intel_ips.c
View file @ f779b7dd
This diff is collapsed.
drivers/regulator/ad5398.c
View file @ f779b7dd
This diff is collapsed.
drivers/regulator/isl6271a-regulator.c
View file @ f779b7dd
This diff is collapsed.
drivers/rtc/rtc-ds3232.c
View file @ f779b7dd
This diff is collapsed.
drivers/serial/Kconfig
View file @ f779b7dd
This diff is collapsed.
drivers/serial/samsung.c
View file @ f779b7dd
This diff is collapsed.
drivers/staging/tm6000/Kconfig
View file @ f779b7dd
This diff is collapsed.
drivers/staging/tm6000/tm6000-input.c
View file @ f779b7dd
This diff is collapsed.
fs/binfmt_aout.c
View file @ f779b7dd
This diff is collapsed.
fs/ceph/caps.c
View file @ f779b7dd
This diff is collapsed.
fs/ceph/export.c
View file @ f779b7dd
This diff is collapsed.
fs/ceph/file.c
View file @ f779b7dd
This diff is collapsed.
fs/ceph/osd_client.c
View file @ f779b7dd
This diff is collapsed.
fs/exec.c
View file @ f779b7dd
This diff is collapsed.
fs/exofs/inode.c
View file @ f779b7dd
This diff is collapsed.
fs/nfsd/nfsfh.h
View file @ f779b7dd
This diff is collapsed.
fs/notify/Kconfig
View file @ f779b7dd
This diff is collapsed.
fs/xfs/linux-2.6/xfs_sync.c
View file @ f779b7dd
This diff is collapsed.
include/drm/ttm/ttm_bo_api.h
View file @ f779b7dd
This diff is collapsed.
include/linux/Kbuild
View file @ f779b7dd
This diff is collapsed.
include/linux/coredump.h
View file @ f779b7dd
This diff is collapsed.
include/linux/elevator.h
View file @ f779b7dd
This diff is collapsed.
include/media/videobuf-dma-sg.h
View file @ f779b7dd
This diff is collapsed.
include/net/bluetooth/bluetooth.h
View file @ f779b7dd
This diff is collapsed.
kernel/perf_event.c
View file @ f779b7dd
This diff is collapsed.
kernel/signal.c
View file @ f779b7dd
This diff is collapsed.
kernel/sysctl.c
View file @ f779b7dd
This diff is collapsed.
kernel/trace/ring_buffer.c
View file @ f779b7dd
This diff is collapsed.
mm/memcontrol.c
View file @ f779b7dd
This diff is collapsed.
mm/memory-failure.c
View file @ f779b7dd
This diff is collapsed.
mm/page_alloc.c
View file @ f779b7dd
This diff is collapsed.
net/atm/mpc.c
View file @ f779b7dd
This diff is collapsed.
net/bluetooth/l2cap.c
View file @ f779b7dd
This diff is collapsed.
net/bluetooth/rfcomm/sock.c
View file @ f779b7dd
This diff is collapsed.
net/caif/caif_socket.c
View file @ f779b7dd
This diff is collapsed.
net/core/ethtool.c
View file @ f779b7dd
This diff is collapsed.
net/core/stream.c
View file @ f779b7dd
This diff is collapsed.
net/ipv4/Kconfig
View file @ f779b7dd
This diff is collapsed.
net/ipv4/igmp.c
View file @ f779b7dd
This diff is collapsed.
net/ipv6/route.c
View file @ f779b7dd
This diff is collapsed.
net/mac80211/agg-tx.c
View file @ f779b7dd
This diff is collapsed.
net/mac80211/status.c
View file @ f779b7dd
This diff is collapsed.
net/sched/cls_u32.c
View file @ f779b7dd
This diff is collapsed.
net/sctp/auth.c
View file @ f779b7dd
This diff is collapsed.
net/sctp/socket.c
View file @ f779b7dd
This diff is collapsed.
scripts/kconfig/conf.c
View file @ f779b7dd
This diff is collapsed.
scripts/kconfig/expr.h
View file @ f779b7dd
This diff is collapsed.
scripts/kconfig/menu.c
View file @ f779b7dd
This diff is collapsed.
scripts/kconfig/symbol.c
View file @ f779b7dd
This diff is collapsed.
sound/oss/soundcard.c
View file @ f779b7dd
This diff is collapsed.
sound/pci/hda/patch_sigmatel.c
View file @ f779b7dd
This diff is collapsed.
tools/perf/perf.h
View file @ f779b7dd
This diff is collapsed.
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