Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Linux-御风守护者
linux
提交
c917c1d0
L
linux
项目概览
Linux-御风守护者
/
linux
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c917c1d0
编写于
4月 17, 2009
作者:
R
Russell King
提交者:
Russell King
4月 17, 2009
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'v2630-rc2-fixes' of
git://aeryn.fluff.org.uk/bjdooks/linux
上级
77f4025b
0c3ee078
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
30 addition
and
7 deletion
+30
-7
arch/arm/mach-s3c2412/mach-jive.c
arch/arm/mach-s3c2412/mach-jive.c
+2
-3
arch/arm/mach-s3c2440/mach-anubis.c
arch/arm/mach-s3c2440/mach-anubis.c
+1
-1
arch/arm/mach-s3c2440/mach-osiris.c
arch/arm/mach-s3c2440/mach-osiris.c
+0
-1
arch/arm/mach-s3c6410/mach-smdk6410.c
arch/arm/mach-s3c6410/mach-smdk6410.c
+4
-0
arch/arm/plat-s3c/gpio-config.c
arch/arm/plat-s3c/gpio-config.c
+3
-0
arch/arm/plat-s3c/include/plat/devs.h
arch/arm/plat-s3c/include/plat/devs.h
+1
-0
arch/arm/plat-s3c24xx/adc.c
arch/arm/plat-s3c24xx/adc.c
+18
-1
arch/arm/plat-s3c24xx/gpiolib.c
arch/arm/plat-s3c24xx/gpiolib.c
+1
-1
未找到文件。
arch/arm/mach-s3c2412/mach-jive.c
浏览文件 @
c917c1d0
...
...
@@ -52,7 +52,6 @@
#include <plat/cpu.h>
#include <plat/pm.h>
#include <plat/udc.h>
#include <plat/iic.h>
static
struct
map_desc
jive_iodesc
[]
__initdata
=
{
};
...
...
@@ -278,7 +277,7 @@ __setup("mtdset=", jive_mtdset);
#define LCD_HTOT (LCD_HSYNC + LCD_LEFT_MARGIN + LCD_XRES + LCD_RIGHT_MARGIN)
#define LCD_VTOT (LCD_VSYNC + LCD_LOWER_MARGIN + LCD_YRES + LCD_UPPER_MARGIN)
struct
s3c2410fb_display
jive_vgg2432a4_display
[]
=
{
st
atic
st
ruct
s3c2410fb_display
jive_vgg2432a4_display
[]
=
{
[
0
]
=
{
.
width
=
LCD_XRES
,
.
height
=
LCD_YRES
,
...
...
@@ -311,7 +310,7 @@ struct s3c2410fb_display jive_vgg2432a4_display[] = {
#define S3C2410_GPCCON_MASK(x) (3 << ((x) * 2))
#define S3C2410_GPDCON_MASK(x) (3 << ((x) * 2))
struct
s3c2410fb_mach_info
jive_lcd_config
=
{
st
atic
st
ruct
s3c2410fb_mach_info
jive_lcd_config
=
{
.
displays
=
jive_vgg2432a4_display
,
.
num_displays
=
ARRAY_SIZE
(
jive_vgg2432a4_display
),
.
default_display
=
0
,
...
...
arch/arm/mach-s3c2440/mach-anubis.c
浏览文件 @
c917c1d0
...
...
@@ -243,7 +243,7 @@ static struct s3c2410_platform_nand anubis_nand_info = {
/* IDE channels */
struct
pata_platform_info
anubis_ide_platdata
=
{
st
atic
st
ruct
pata_platform_info
anubis_ide_platdata
=
{
.
ioport_shift
=
5
,
};
...
...
arch/arm/mach-s3c2440/mach-osiris.c
浏览文件 @
c917c1d0
...
...
@@ -413,7 +413,6 @@ MACHINE_START(OSIRIS, "Simtec-OSIRIS")
.
io_pg_offst
=
(((
u32
)
S3C24XX_VA_UART
)
>>
18
)
&
0xfffc
,
.
boot_params
=
S3C2410_SDRAM_PA
+
0x100
,
.
map_io
=
osiris_map_io
,
.
init_machine
=
osiris_init
,
.
init_irq
=
s3c24xx_init_irq
,
.
init_machine
=
osiris_init
,
.
timer
=
&
s3c24xx_timer
,
...
...
arch/arm/mach-s3c6410/mach-smdk6410.c
浏览文件 @
c917c1d0
...
...
@@ -166,6 +166,10 @@ static void __init smdk6410_machine_init(void)
s3c_i2c1_set_platdata
(
NULL
);
s3c_fb_set_platdata
(
&
smdk6410_lcd_pdata
);
gpio_request
(
S3C64XX_GPN
(
5
),
"LCD power"
);
gpio_request
(
S3C64XX_GPF
(
13
),
"LCD power"
);
gpio_request
(
S3C64XX_GPF
(
15
),
"LCD power"
);
i2c_register_board_info
(
0
,
i2c_devs0
,
ARRAY_SIZE
(
i2c_devs0
));
i2c_register_board_info
(
1
,
i2c_devs1
,
ARRAY_SIZE
(
i2c_devs1
));
...
...
arch/arm/plat-s3c/gpio-config.c
浏览文件 @
c917c1d0
...
...
@@ -13,6 +13,7 @@
*/
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/gpio.h>
#include <linux/io.h>
...
...
@@ -38,6 +39,7 @@ int s3c_gpio_cfgpin(unsigned int pin, unsigned int config)
return
ret
;
}
EXPORT_SYMBOL
(
s3c_gpio_cfgpin
);
int
s3c_gpio_setpull
(
unsigned
int
pin
,
s3c_gpio_pull_t
pull
)
{
...
...
@@ -56,6 +58,7 @@ int s3c_gpio_setpull(unsigned int pin, s3c_gpio_pull_t pull)
return
ret
;
}
EXPORT_SYMBOL
(
s3c_gpio_setpull
);
#ifdef CONFIG_S3C_GPIO_CFG_S3C24XX
int
s3c_gpio_setcfg_s3c24xx_banka
(
struct
s3c_gpio_chip
*
chip
,
...
...
arch/arm/plat-s3c/include/plat/devs.h
浏览文件 @
c917c1d0
...
...
@@ -34,6 +34,7 @@ extern struct platform_device s3c_device_iis;
extern
struct
platform_device
s3c_device_rtc
;
extern
struct
platform_device
s3c_device_adc
;
extern
struct
platform_device
s3c_device_sdi
;
extern
struct
platform_device
s3c_device_hwmon
;
extern
struct
platform_device
s3c_device_hsmmc0
;
extern
struct
platform_device
s3c_device_hsmmc1
;
extern
struct
platform_device
s3c_device_hsmmc2
;
...
...
arch/arm/plat-s3c24xx/adc.c
浏览文件 @
c917c1d0
...
...
@@ -100,7 +100,7 @@ static void s3c_adc_dbgshow(struct adc_device *adc)
readl
(
adc
->
regs
+
S3C2410_ADCDLY
));
}
void
s3c_adc_try
(
struct
adc_device
*
adc
)
static
void
s3c_adc_try
(
struct
adc_device
*
adc
)
{
struct
s3c_adc_client
*
next
=
adc
->
ts_pend
;
...
...
@@ -190,6 +190,23 @@ EXPORT_SYMBOL_GPL(s3c_adc_register);
void
s3c_adc_release
(
struct
s3c_adc_client
*
client
)
{
/* We should really check that nothing is in progress. */
if
(
adc_dev
->
cur
==
client
)
adc_dev
->
cur
=
NULL
;
if
(
adc_dev
->
ts_pend
==
client
)
adc_dev
->
ts_pend
=
NULL
;
else
{
struct
list_head
*
p
,
*
n
;
struct
s3c_adc_client
*
tmp
;
list_for_each_safe
(
p
,
n
,
&
adc_pending
)
{
tmp
=
list_entry
(
p
,
struct
s3c_adc_client
,
pend
);
if
(
tmp
==
client
)
list_del
(
&
tmp
->
pend
);
}
}
if
(
adc_dev
->
cur
==
NULL
)
s3c_adc_try
(
adc_dev
);
kfree
(
client
);
}
EXPORT_SYMBOL_GPL
(
s3c_adc_release
);
...
...
arch/arm/plat-s3c24xx/gpiolib.c
浏览文件 @
c917c1d0
...
...
@@ -19,7 +19,7 @@
#include <linux/io.h>
#include <linux/gpio.h>
#include <
plat
/gpio-core.h>
#include <
mach
/gpio-core.h>
#include <mach/hardware.h>
#include <asm/irq.h>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录