mirror of
https://github.com/torvalds/linux.git
synced 2024-11-11 22:51:42 +00:00
Merge branch 'next-s3c64xx-moves' into next-s3c
This commit is contained in:
Ben Dooks
commit
b282e29b54
@ -110,5 +110,6 @@
|
||||
#define S3C_PA_UART S3C24XX_PA_UART
|
||||
#define S3C_PA_USBHOST S3C2410_PA_USBHOST
|
||||
#define S3C_PA_HSMMC0 S3C2443_PA_HSMMC
|
||||
#define S3C_PA_NAND S3C24XX_PA_NAND
|
||||
|
||||
#endif /* __ASM_ARCH_MAP_H */
|
||||
|
||||
@ -81,5 +81,6 @@
|
||||
|
||||
#define S3C_PA_UART S3C24A0_PA_UART
|
||||
#define S3C_PA_IIC S3C24A0_PA_IIC
|
||||
#define S3C_PA_NAND S3C24XX_PA_NAND
|
||||
|
||||
#endif /* __ASM_ARCH_24A0_MAP_H */
|
||||
|
||||
@ -38,6 +38,7 @@
|
||||
#define S3C_VA_UART2 S3C_VA_UARTx(2)
|
||||
#define S3C_VA_UART3 S3C_VA_UARTx(3)
|
||||
|
||||
#define S3C64XX_PA_NAND (0x70200000)
|
||||
#define S3C64XX_PA_FB (0x77100000)
|
||||
#define S3C64XX_PA_USB_HSOTG (0x7C000000)
|
||||
#define S3C64XX_PA_WATCHDOG (0x7E004000)
|
||||
@ -74,6 +75,7 @@
|
||||
#define S3C_PA_HSMMC2 S3C64XX_PA_HSMMC2
|
||||
#define S3C_PA_IIC S3C64XX_PA_IIC0
|
||||
#define S3C_PA_IIC1 S3C64XX_PA_IIC1
|
||||
#define S3C_PA_NAND S3C64XX_PA_NAND
|
||||
#define S3C_PA_FB S3C64XX_PA_FB
|
||||
#define S3C_PA_USBHOST S3C64XX_PA_USBHOST
|
||||
#define S3C_PA_USB_HSOTG S3C64XX_PA_USB_HSOTG
|
||||
|
||||
@ -48,6 +48,8 @@ void __init s3c6400_map_io(void)
|
||||
|
||||
/* the i2c devices are directly compatible with s3c2440 */
|
||||
s3c_i2c0_setname("s3c2440-i2c");
|
||||
|
||||
s3c_device_nand.name = "s3c6400-nand";
|
||||
}
|
||||
|
||||
void __init s3c6400_init_clocks(int xtal)
|
||||
|
||||
@ -62,6 +62,8 @@ void __init s3c6410_map_io(void)
|
||||
/* the i2c devices are directly compatible with s3c2440 */
|
||||
s3c_i2c0_setname("s3c2440-i2c");
|
||||
s3c_i2c1_setname("s3c2440-i2c");
|
||||
|
||||
s3c_device_nand.name = "s3c6400-nand";
|
||||
}
|
||||
|
||||
void __init s3c6410_init_clocks(int xtal)
|
||||
|
||||
@ -28,13 +28,17 @@ obj-$(CONFIG_PM) += pm.o
|
||||
obj-$(CONFIG_PM) += pm-gpio.o
|
||||
obj-$(CONFIG_S3C2410_PM_CHECK) += pm-check.o
|
||||
|
||||
# PWM support
|
||||
|
||||
obj-$(CONFIG_HAVE_PWM) += pwm.o
|
||||
|
||||
# devices
|
||||
|
||||
obj-$(CONFIG_S3C_DEV_HSMMC) += dev-hsmmc.o
|
||||
obj-$(CONFIG_S3C_DEV_HSMMC1) += dev-hsmmc1.o
|
||||
obj-y += dev-i2c0.o
|
||||
obj-$(CONFIG_S3C_DEV_I2C1) += dev-i2c1.o
|
||||
obj-$(CONFIG_SND_S3C64XX_SOC_I2S) += dev-audio.o
|
||||
obj-$(CONFIG_S3C_DEV_FB) += dev-fb.o
|
||||
obj-$(CONFIG_S3C_DEV_USB_HOST) += dev-usb.o
|
||||
obj-$(CONFIG_S3C_DEV_USB_HSOTG) += dev-usb-hsotg.o
|
||||
obj-y += dev-nand.o
|
||||
|
||||
30
arch/arm/plat-s3c/dev-nand.c
Normal file
30
arch/arm/plat-s3c/dev-nand.c
Normal file
@ -0,0 +1,30 @@
|
||||
/*
|
||||
* S3C series device definition for nand device
|
||||
*
|
||||
* 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/kernel.h>
|
||||
#include <linux/platform_device.h>
|
||||
|
||||
#include <mach/map.h>
|
||||
#include <plat/devs.h>
|
||||
|
||||
static struct resource s3c_nand_resource[] = {
|
||||
[0] = {
|
||||
.start = S3C_PA_NAND,
|
||||
.end = S3C_PA_NAND + SZ_1M,
|
||||
.flags = IORESOURCE_MEM,
|
||||
}
|
||||
};
|
||||
|
||||
struct platform_device s3c_device_nand = {
|
||||
.name = "s3c2410-nand",
|
||||
.id = -1,
|
||||
.num_resources = ARRAY_SIZE(s3c_nand_resource),
|
||||
.resource = s3c_nand_resource,
|
||||
};
|
||||
|
||||
EXPORT_SYMBOL(s3c_device_nand);
|
||||
@ -1,10 +1,10 @@
|
||||
/* arch/arm/plat-s3c24xx/pwm.c
|
||||
/* arch/arm/plat-s3c/pwm.c
|
||||
*
|
||||
* Copyright (c) 2007 Ben Dooks
|
||||
* Copyright (c) 2008 Simtec Electronics
|
||||
* Ben Dooks <ben@simtec.co.uk>, <ben-linux@fluff.org>
|
||||
*
|
||||
* S3C24XX PWM device core
|
||||
* S3C series PWM device core
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -20,6 +20,7 @@
|
||||
#include <linux/pwm.h>
|
||||
|
||||
#include <mach/irqs.h>
|
||||
#include <mach/map.h>
|
||||
|
||||
#include <plat/devs.h>
|
||||
#include <plat/regs-timer.h>
|
||||
@ -36,7 +36,6 @@ obj-$(CONFIG_PM_SIMTEC) += pm-simtec.o
|
||||
obj-$(CONFIG_PM) += pm.o
|
||||
obj-$(CONFIG_PM) += irq-pm.o
|
||||
obj-$(CONFIG_PM) += sleep.o
|
||||
obj-$(CONFIG_S3C24XX_PWM) += pwm.o
|
||||
obj-$(CONFIG_S3C2410_CLOCK) += s3c2410-clock.o
|
||||
obj-$(CONFIG_S3C2410_DMA) += dma.o
|
||||
obj-$(CONFIG_S3C24XX_ADC) += adc.o
|
||||
|
||||
@ -182,25 +182,6 @@ void __init s3c24xx_fb_set_platdata(struct s3c2410fb_mach_info *pd)
|
||||
}
|
||||
}
|
||||
|
||||
/* NAND Controller */
|
||||
|
||||
static struct resource s3c_nand_resource[] = {
|
||||
[0] = {
|
||||
.start = S3C24XX_PA_NAND,
|
||||
.end = S3C24XX_PA_NAND + S3C24XX_SZ_NAND - 1,
|
||||
.flags = IORESOURCE_MEM,
|
||||
}
|
||||
};
|
||||
|
||||
struct platform_device s3c_device_nand = {
|
||||
.name = "s3c2410-nand",
|
||||
.id = -1,
|
||||
.num_resources = ARRAY_SIZE(s3c_nand_resource),
|
||||
.resource = s3c_nand_resource,
|
||||
};
|
||||
|
||||
EXPORT_SYMBOL(s3c_device_nand);
|
||||
|
||||
/* USB Device (Gadget)*/
|
||||
|
||||
static struct resource s3c_usbgadget_resource[] = {
|
||||
|
||||
@ -40,4 +40,5 @@ obj-$(CONFIG_S3C64XX_DMA) += dma.o
|
||||
obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o
|
||||
obj-$(CONFIG_S3C64XX_SETUP_I2C1) += setup-i2c1.o
|
||||
obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP) += setup-fb-24bpp.o
|
||||
obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
|
||||
obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
|
||||
obj-$(CONFIG_SND_S3C24XX_SOC) += dev-audio.o
|
||||
|
||||
Loading…
Reference in New Issue
Block a user