Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
dc85ce15
L
linux
项目概览
xiphi1978
/
linux
通知
2
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,发现更多精彩内容 >>
提交
dc85ce15
编写于
3月 23, 2009
作者:
R
Russell King
提交者:
Russell King
3月 23, 2009
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'fix' of
git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
上级
4731f8b6
1efb7180
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
23 addition
and
7 deletion
+23
-7
arch/arm/mach-pxa/clock.c
arch/arm/mach-pxa/clock.c
+2
-2
arch/arm/mach-pxa/clock.h
arch/arm/mach-pxa/clock.h
+1
-1
arch/arm/mach-pxa/e740.c
arch/arm/mach-pxa/e740.c
+1
-1
arch/arm/mach-pxa/e750.c
arch/arm/mach-pxa/e750.c
+1
-1
arch/arm/mach-pxa/e800.c
arch/arm/mach-pxa/e800.c
+1
-1
arch/arm/mach-pxa/include/mach/mfp-pxa300.h
arch/arm/mach-pxa/include/mach/mfp-pxa300.h
+1
-0
arch/arm/mach-pxa/include/mach/mfp-pxa320.h
arch/arm/mach-pxa/include/mach/mfp-pxa320.h
+1
-0
arch/arm/mach-pxa/tosa.c
arch/arm/mach-pxa/tosa.c
+1
-1
drivers/video/pxafb.c
drivers/video/pxafb.c
+14
-0
未找到文件。
arch/arm/mach-pxa/clock.c
浏览文件 @
dc85ce15
...
@@ -87,7 +87,7 @@ void clks_register(struct clk_lookup *clks, size_t num)
...
@@ -87,7 +87,7 @@ void clks_register(struct clk_lookup *clks, size_t num)
clkdev_add
(
&
clks
[
i
]);
clkdev_add
(
&
clks
[
i
]);
}
}
int
clk_add_alias
(
c
har
*
alias
,
struct
device
*
alias_dev
,
char
*
id
,
int
clk_add_alias
(
c
onst
char
*
alias
,
const
char
*
alias_dev_name
,
char
*
id
,
struct
device
*
dev
)
struct
device
*
dev
)
{
{
struct
clk
*
r
=
clk_get
(
dev
,
id
);
struct
clk
*
r
=
clk_get
(
dev
,
id
);
...
@@ -96,7 +96,7 @@ int clk_add_alias(char *alias, struct device *alias_dev, char *id,
...
@@ -96,7 +96,7 @@ int clk_add_alias(char *alias, struct device *alias_dev, char *id,
if
(
!
r
)
if
(
!
r
)
return
-
ENODEV
;
return
-
ENODEV
;
l
=
clkdev_alloc
(
r
,
alias
,
alias_dev
?
dev_name
(
alias_dev
)
:
NULL
);
l
=
clkdev_alloc
(
r
,
alias
,
alias_dev
_name
);
clk_put
(
r
);
clk_put
(
r
);
if
(
!
l
)
if
(
!
l
)
return
-
ENODEV
;
return
-
ENODEV
;
...
...
arch/arm/mach-pxa/clock.h
浏览文件 @
dc85ce15
...
@@ -69,6 +69,6 @@ extern void clk_pxa3xx_cken_disable(struct clk *);
...
@@ -69,6 +69,6 @@ extern void clk_pxa3xx_cken_disable(struct clk *);
#endif
#endif
void
clks_register
(
struct
clk_lookup
*
clks
,
size_t
num
);
void
clks_register
(
struct
clk_lookup
*
clks
,
size_t
num
);
int
clk_add_alias
(
c
har
*
alias
,
struct
device
*
alias_dev
,
char
*
id
,
int
clk_add_alias
(
c
onst
char
*
alias
,
const
char
*
alias_name
,
char
*
id
,
struct
device
*
dev
);
struct
device
*
dev
);
arch/arm/mach-pxa/e740.c
浏览文件 @
dc85ce15
...
@@ -189,7 +189,7 @@ static void __init e740_init(void)
...
@@ -189,7 +189,7 @@ static void __init e740_init(void)
{
{
pxa2xx_mfp_config
(
ARRAY_AND_SIZE
(
e740_pin_config
));
pxa2xx_mfp_config
(
ARRAY_AND_SIZE
(
e740_pin_config
));
eseries_register_clks
();
eseries_register_clks
();
clk_add_alias
(
"CLK_CK48M"
,
&
e740_t7l66xb_device
.
dev
,
clk_add_alias
(
"CLK_CK48M"
,
e740_t7l66xb_device
.
name
,
"UDCCLK"
,
&
pxa25x_device_udc
.
dev
),
"UDCCLK"
,
&
pxa25x_device_udc
.
dev
),
eseries_get_tmio_gpios
();
eseries_get_tmio_gpios
();
platform_add_devices
(
devices
,
ARRAY_SIZE
(
devices
));
platform_add_devices
(
devices
,
ARRAY_SIZE
(
devices
));
...
...
arch/arm/mach-pxa/e750.c
浏览文件 @
dc85ce15
...
@@ -190,7 +190,7 @@ static struct platform_device *devices[] __initdata = {
...
@@ -190,7 +190,7 @@ static struct platform_device *devices[] __initdata = {
static
void
__init
e750_init
(
void
)
static
void
__init
e750_init
(
void
)
{
{
pxa2xx_mfp_config
(
ARRAY_AND_SIZE
(
e750_pin_config
));
pxa2xx_mfp_config
(
ARRAY_AND_SIZE
(
e750_pin_config
));
clk_add_alias
(
"CLK_CK3P6MI"
,
&
e750_tc6393xb_device
.
dev
,
clk_add_alias
(
"CLK_CK3P6MI"
,
e750_tc6393xb_device
.
name
,
"GPIO11_CLK"
,
NULL
),
"GPIO11_CLK"
,
NULL
),
eseries_get_tmio_gpios
();
eseries_get_tmio_gpios
();
platform_add_devices
(
devices
,
ARRAY_SIZE
(
devices
));
platform_add_devices
(
devices
,
ARRAY_SIZE
(
devices
));
...
...
arch/arm/mach-pxa/e800.c
浏览文件 @
dc85ce15
...
@@ -196,7 +196,7 @@ static struct platform_device *devices[] __initdata = {
...
@@ -196,7 +196,7 @@ static struct platform_device *devices[] __initdata = {
static
void
__init
e800_init
(
void
)
static
void
__init
e800_init
(
void
)
{
{
clk_add_alias
(
"CLK_CK3P6MI"
,
&
e800_tc6393xb_device
.
dev
,
clk_add_alias
(
"CLK_CK3P6MI"
,
e800_tc6393xb_device
.
name
,
"GPIO11_CLK"
,
NULL
),
"GPIO11_CLK"
,
NULL
),
eseries_get_tmio_gpios
();
eseries_get_tmio_gpios
();
platform_add_devices
(
devices
,
ARRAY_SIZE
(
devices
));
platform_add_devices
(
devices
,
ARRAY_SIZE
(
devices
));
...
...
arch/arm/mach-pxa/include/mach/mfp-pxa300.h
浏览文件 @
dc85ce15
...
@@ -41,6 +41,7 @@
...
@@ -41,6 +41,7 @@
#endif
#endif
/* Chip Select */
/* Chip Select */
#define GPIO1_nCS2 MFP_CFG(GPIO1, AF1)
#define GPIO2_nCS3 MFP_CFG(GPIO2, AF1)
#define GPIO2_nCS3 MFP_CFG(GPIO2, AF1)
/* AC97 */
/* AC97 */
...
...
arch/arm/mach-pxa/include/mach/mfp-pxa320.h
浏览文件 @
dc85ce15
...
@@ -38,6 +38,7 @@
...
@@ -38,6 +38,7 @@
#define GPIO17_2_GPIO MFP_CFG(GPIO17_2, AF0)
#define GPIO17_2_GPIO MFP_CFG(GPIO17_2, AF0)
/* Chip Select */
/* Chip Select */
#define GPIO3_nCS2 MFP_CFG(GPIO3, AF1)
#define GPIO4_nCS3 MFP_CFG(GPIO4, AF1)
#define GPIO4_nCS3 MFP_CFG(GPIO4, AF1)
/* AC97 */
/* AC97 */
...
...
arch/arm/mach-pxa/tosa.c
浏览文件 @
dc85ce15
...
@@ -919,7 +919,7 @@ static void __init tosa_init(void)
...
@@ -919,7 +919,7 @@ static void __init tosa_init(void)
pxa2xx_set_spi_info
(
2
,
&
pxa_ssp_master_info
);
pxa2xx_set_spi_info
(
2
,
&
pxa_ssp_master_info
);
spi_register_board_info
(
spi_board_info
,
ARRAY_SIZE
(
spi_board_info
));
spi_register_board_info
(
spi_board_info
,
ARRAY_SIZE
(
spi_board_info
));
clk_add_alias
(
"CLK_CK3P6MI"
,
&
tc6393xb_device
.
dev
,
"GPIO11_CLK"
,
NULL
);
clk_add_alias
(
"CLK_CK3P6MI"
,
tc6393xb_device
.
name
,
"GPIO11_CLK"
,
NULL
);
platform_add_devices
(
devices
,
ARRAY_SIZE
(
devices
));
platform_add_devices
(
devices
,
ARRAY_SIZE
(
devices
));
}
}
...
...
drivers/video/pxafb.c
浏览文件 @
dc85ce15
...
@@ -883,10 +883,21 @@ static void __devinit init_pxafb_overlay(struct pxafb_info *fbi,
...
@@ -883,10 +883,21 @@ static void __devinit init_pxafb_overlay(struct pxafb_info *fbi,
init_completion
(
&
ofb
->
branch_done
);
init_completion
(
&
ofb
->
branch_done
);
}
}
static
inline
int
pxafb_overlay_supported
(
void
)
{
if
(
cpu_is_pxa27x
()
||
cpu_is_pxa3xx
())
return
1
;
return
0
;
}
static
int
__devinit
pxafb_overlay_init
(
struct
pxafb_info
*
fbi
)
static
int
__devinit
pxafb_overlay_init
(
struct
pxafb_info
*
fbi
)
{
{
int
i
,
ret
;
int
i
,
ret
;
if
(
!
pxafb_overlay_supported
())
return
0
;
for
(
i
=
0
;
i
<
2
;
i
++
)
{
for
(
i
=
0
;
i
<
2
;
i
++
)
{
init_pxafb_overlay
(
fbi
,
&
fbi
->
overlay
[
i
],
i
);
init_pxafb_overlay
(
fbi
,
&
fbi
->
overlay
[
i
],
i
);
ret
=
register_framebuffer
(
&
fbi
->
overlay
[
i
].
fb
);
ret
=
register_framebuffer
(
&
fbi
->
overlay
[
i
].
fb
);
...
@@ -909,6 +920,9 @@ static void __devexit pxafb_overlay_exit(struct pxafb_info *fbi)
...
@@ -909,6 +920,9 @@ static void __devexit pxafb_overlay_exit(struct pxafb_info *fbi)
{
{
int
i
;
int
i
;
if
(
!
pxafb_overlay_supported
())
return
;
for
(
i
=
0
;
i
<
2
;
i
++
)
for
(
i
=
0
;
i
<
2
;
i
++
)
unregister_framebuffer
(
&
fbi
->
overlay
[
i
].
fb
);
unregister_framebuffer
(
&
fbi
->
overlay
[
i
].
fb
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录