diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-30 20:36:49 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-30 20:36:49 -0500 |
| commit | 14a3c4ab0e58d143c7928c9eb2f2610205e13bf2 (patch) | |
| tree | 885992999d7a1a2fd3586efcf32ebcbcbc3a72aa /arch/arm/plat-s3c/dev-i2c1.c | |
| parent | 1af237a099a3b8ff56aa384f605c6a68af7bf288 (diff) | |
| parent | 47992cbdaef2f18a47871b2ed01ad27f568c8b73 (diff) | |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (407 commits)
[ARM] pxafb: add support for overlay1 and overlay2 as framebuffer devices
[ARM] pxafb: cleanup of the timing checking code
[ARM] pxafb: cleanup of the color format manipulation code
[ARM] pxafb: add palette format support for LCCR4_PAL_FOR_3
[ARM] pxafb: add support for FBIOPAN_DISPLAY by dma braching
[ARM] pxafb: allow pxafb_set_par() to start from arbitrary yoffset
[ARM] pxafb: allow video memory size to be configurable
[ARM] pxa: add document on the MFP design and how to use it
[ARM] sa1100_wdt: don't assume CLOCK_TICK_RATE to be a constant
[ARM] rtc-sa1100: don't assume CLOCK_TICK_RATE to be a constant
[ARM] pxa/tavorevb: update board support (smartpanel LCD + keypad)
[ARM] pxa: Update eseries defconfig
[ARM] 5352/1: add w90p910-plat config file
[ARM] s3c: S3C options should depend on PLAT_S3C
[ARM] mv78xx0: implement GPIO and GPIO interrupt support
[ARM] Kirkwood: implement GPIO and GPIO interrupt support
[ARM] Orion: share GPIO IRQ handling code
[ARM] Orion: share GPIO handling code
[ARM] s3c: define __io using the typesafe version
[ARM] S3C64XX: Ensure CPU_V6 is selected
...
Diffstat (limited to 'arch/arm/plat-s3c/dev-i2c1.c')
| -rw-r--r-- | arch/arm/plat-s3c/dev-i2c1.c | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/arch/arm/plat-s3c/dev-i2c1.c b/arch/arm/plat-s3c/dev-i2c1.c new file mode 100644 index 000000000000..9658fb0aec95 --- /dev/null +++ b/arch/arm/plat-s3c/dev-i2c1.c | |||
| @@ -0,0 +1,68 @@ | |||
| 1 | /* linux/arch/arm/plat-s3c/dev-i2c1.c | ||
| 2 | * | ||
| 3 | * Copyright 2008 Simtec Electronics | ||
| 4 | * Ben Dooks <ben@simtec.co.uk> | ||
| 5 | * http://armlinux.simtec.co.uk/ | ||
| 6 | * | ||
| 7 | * S3C series device definition for i2c device 1 | ||
| 8 | * | ||
| 9 | * This program is free software; you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License version 2 as | ||
| 11 | * published by the Free Software Foundation. | ||
| 12 | */ | ||
| 13 | |||
| 14 | #include <linux/kernel.h> | ||
| 15 | #include <linux/string.h> | ||
| 16 | #include <linux/platform_device.h> | ||
| 17 | |||
| 18 | #include <mach/map.h> | ||
| 19 | |||
| 20 | #include <plat/regs-iic.h> | ||
| 21 | #include <plat/iic.h> | ||
| 22 | #include <plat/devs.h> | ||
| 23 | #include <plat/cpu.h> | ||
| 24 | |||
| 25 | static struct resource s3c_i2c_resource[] = { | ||
| 26 | [0] = { | ||
| 27 | .start = S3C_PA_IIC1, | ||
| 28 | .end = S3C_PA_IIC1 + SZ_4K - 1, | ||
| 29 | .flags = IORESOURCE_MEM, | ||
| 30 | }, | ||
| 31 | [1] = { | ||
| 32 | .start = IRQ_IIC1, | ||
| 33 | .end = IRQ_IIC1, | ||
| 34 | .flags = IORESOURCE_IRQ, | ||
| 35 | }, | ||
| 36 | }; | ||
| 37 | |||
| 38 | struct platform_device s3c_device_i2c1 = { | ||
| 39 | .name = "s3c2410-i2c", | ||
| 40 | .id = 1, | ||
| 41 | .num_resources = ARRAY_SIZE(s3c_i2c_resource), | ||
| 42 | .resource = s3c_i2c_resource, | ||
| 43 | }; | ||
| 44 | |||
| 45 | static struct s3c2410_platform_i2c default_i2c_data1 __initdata = { | ||
| 46 | .flags = 0, | ||
| 47 | .bus_num = 1, | ||
| 48 | .slave_addr = 0x10, | ||
| 49 | .bus_freq = 100*1000, | ||
| 50 | .max_freq = 400*1000, | ||
| 51 | .sda_delay = S3C2410_IICLC_SDA_DELAY5 | S3C2410_IICLC_FILTER_ON, | ||
| 52 | }; | ||
| 53 | |||
| 54 | void __init s3c_i2c1_set_platdata(struct s3c2410_platform_i2c *pd) | ||
| 55 | { | ||
| 56 | struct s3c2410_platform_i2c *npd; | ||
| 57 | |||
| 58 | if (!pd) | ||
| 59 | pd = &default_i2c_data1; | ||
| 60 | |||
| 61 | npd = kmemdup(pd, sizeof(struct s3c2410_platform_i2c), GFP_KERNEL); | ||
| 62 | if (!npd) | ||
| 63 | printk(KERN_ERR "%s: no memory for platform data\n", __func__); | ||
| 64 | else if (!npd->cfg_gpio) | ||
| 65 | npd->cfg_gpio = s3c_i2c1_cfg_gpio; | ||
| 66 | |||
| 67 | s3c_device_i2c1.dev.platform_data = npd; | ||
| 68 | } | ||