Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
cddb7835
C
clone-Linux
项目概览
gsplhtlxg
/
clone-Linux
通知
2
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
clone-Linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
cddb7835
编写于
5月 16, 2009
作者:
R
Russell King
提交者:
Russell King
5月 16, 2009
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'omap-fixes' of
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
上级
b477dfba
005187ee
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
40 addition
and
33 deletion
+40
-33
arch/arm/mach-omap2/clock24xx.c
arch/arm/mach-omap2/clock24xx.c
+5
-5
arch/arm/mach-omap2/clock34xx.c
arch/arm/mach-omap2/clock34xx.c
+6
-6
arch/arm/mach-omap2/clock34xx.h
arch/arm/mach-omap2/clock34xx.h
+6
-6
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/devices.c
+4
-2
arch/arm/mach-omap2/prm-regbits-34xx.h
arch/arm/mach-omap2/prm-regbits-34xx.h
+1
-1
arch/arm/mach-omap2/usb-tusb6010.c
arch/arm/mach-omap2/usb-tusb6010.c
+1
-1
arch/arm/plat-omap/fb.c
arch/arm/plat-omap/fb.c
+3
-2
arch/arm/plat-omap/gpio.c
arch/arm/plat-omap/gpio.c
+1
-1
drivers/video/omap/dispc.c
drivers/video/omap/dispc.c
+8
-6
drivers/video/omap/rfbi.c
drivers/video/omap/rfbi.c
+5
-3
未找到文件。
arch/arm/mach-omap2/clock24xx.c
浏览文件 @
cddb7835
...
...
@@ -103,10 +103,10 @@ static struct omap_clk omap24xx_clks[] = {
CLK
(
NULL
,
"mdm_ick"
,
&
mdm_ick
,
CK_243X
),
CLK
(
NULL
,
"mdm_osc_ck"
,
&
mdm_osc_ck
,
CK_243X
),
/* DSS domain clocks */
CLK
(
NULL
,
"dss_ick"
,
&
dss_ick
,
CK_243X
|
CK_242X
),
CLK
(
NULL
,
"dss1_fck"
,
&
dss1_fck
,
CK_243X
|
CK_242X
),
CLK
(
NULL
,
"dss2_fck"
,
&
dss2_fck
,
CK_243X
|
CK_242X
),
CLK
(
NULL
,
"dss_54m
_fck"
,
&
dss_54m_fck
,
CK_243X
|
CK_242X
),
CLK
(
"omapfb"
,
"ick"
,
&
dss_ick
,
CK_243X
|
CK_242X
),
CLK
(
"omapfb"
,
"dss1_fck"
,
&
dss1_fck
,
CK_243X
|
CK_242X
),
CLK
(
"omapfb"
,
"dss2_fck"
,
&
dss2_fck
,
CK_243X
|
CK_242X
),
CLK
(
"omapfb"
,
"tv
_fck"
,
&
dss_54m_fck
,
CK_243X
|
CK_242X
),
/* L3 domain clocks */
CLK
(
NULL
,
"core_l3_ck"
,
&
core_l3_ck
,
CK_243X
|
CK_242X
),
CLK
(
NULL
,
"ssi_fck"
,
&
ssi_ssr_sst_fck
,
CK_243X
|
CK_242X
),
...
...
@@ -206,7 +206,7 @@ static struct omap_clk omap24xx_clks[] = {
CLK
(
NULL
,
"aes_ick"
,
&
aes_ick
,
CK_243X
|
CK_242X
),
CLK
(
NULL
,
"pka_ick"
,
&
pka_ick
,
CK_243X
|
CK_242X
),
CLK
(
NULL
,
"usb_fck"
,
&
usb_fck
,
CK_243X
|
CK_242X
),
CLK
(
NULL
,
"usbhs_
ick"
,
&
usbhs_ick
,
CK_243X
),
CLK
(
"musb_hdrc"
,
"
ick"
,
&
usbhs_ick
,
CK_243X
),
CLK
(
"mmci-omap-hs.0"
,
"ick"
,
&
mmchs1_ick
,
CK_243X
),
CLK
(
"mmci-omap-hs.0"
,
"fck"
,
&
mmchs1_fck
,
CK_243X
),
CLK
(
"mmci-omap-hs.1"
,
"ick"
,
&
mmchs2_ick
,
CK_243X
),
...
...
arch/arm/mach-omap2/clock34xx.c
浏览文件 @
cddb7835
...
...
@@ -157,7 +157,7 @@ static struct omap_clk omap34xx_clks[] = {
CLK
(
NULL
,
"ssi_ssr_fck"
,
&
ssi_ssr_fck
,
CK_343X
),
CLK
(
NULL
,
"ssi_sst_fck"
,
&
ssi_sst_fck
,
CK_343X
),
CLK
(
NULL
,
"core_l3_ick"
,
&
core_l3_ick
,
CK_343X
),
CLK
(
NULL
,
"hsotgusb_
ick"
,
&
hsotgusb_ick
,
CK_343X
),
CLK
(
"musb_hdrc"
,
"
ick"
,
&
hsotgusb_ick
,
CK_343X
),
CLK
(
NULL
,
"sdrc_ick"
,
&
sdrc_ick
,
CK_343X
),
CLK
(
NULL
,
"gpmc_fck"
,
&
gpmc_fck
,
CK_343X
),
CLK
(
NULL
,
"security_l3_ick"
,
&
security_l3_ick
,
CK_343X
),
...
...
@@ -197,11 +197,11 @@ static struct omap_clk omap34xx_clks[] = {
CLK
(
"omap_rng"
,
"ick"
,
&
rng_ick
,
CK_343X
),
CLK
(
NULL
,
"sha11_ick"
,
&
sha11_ick
,
CK_343X
),
CLK
(
NULL
,
"des1_ick"
,
&
des1_ick
,
CK_343X
),
CLK
(
NULL
,
"dss1_alwon_fck"
,
&
dss1_alwon_fck
,
CK_343X
),
CLK
(
NULL
,
"dss_
tv_fck"
,
&
dss_tv_fck
,
CK_343X
),
CLK
(
NULL
,
"dss_96m
_fck"
,
&
dss_96m_fck
,
CK_343X
),
CLK
(
NULL
,
"dss2_alwon_fck"
,
&
dss2_alwon_fck
,
CK_343X
),
CLK
(
NULL
,
"dss_ick"
,
&
dss_ick
,
CK_343X
),
CLK
(
"omapfb"
,
"dss1_fck"
,
&
dss1_alwon_fck
,
CK_343X
),
CLK
(
"omapfb"
,
"
tv_fck"
,
&
dss_tv_fck
,
CK_343X
),
CLK
(
"omapfb"
,
"video
_fck"
,
&
dss_96m_fck
,
CK_343X
),
CLK
(
"omapfb"
,
"dss2_fck"
,
&
dss2_alwon_fck
,
CK_343X
),
CLK
(
"omapfb"
,
"ick"
,
&
dss_ick
,
CK_343X
),
CLK
(
NULL
,
"cam_mclk"
,
&
cam_mclk
,
CK_343X
),
CLK
(
NULL
,
"cam_ick"
,
&
cam_ick
,
CK_343X
),
CLK
(
NULL
,
"csi2_96m_fck"
,
&
csi2_96m_fck
,
CK_343X
),
...
...
arch/arm/mach-omap2/clock34xx.h
浏览文件 @
cddb7835
...
...
@@ -2182,7 +2182,7 @@ static struct clk wkup_32k_fck = {
static
struct
clk
gpio1_dbck
=
{
.
name
=
"gpio1_dbck"
,
.
ops
=
&
clkops_omap2_dflt
_wait
,
.
ops
=
&
clkops_omap2_dflt
,
.
parent
=
&
wkup_32k_fck
,
.
enable_reg
=
OMAP_CM_REGADDR
(
WKUP_MOD
,
CM_FCLKEN
),
.
enable_bit
=
OMAP3430_EN_GPIO1_SHIFT
,
...
...
@@ -2427,7 +2427,7 @@ static struct clk per_32k_alwon_fck = {
static
struct
clk
gpio6_dbck
=
{
.
name
=
"gpio6_dbck"
,
.
ops
=
&
clkops_omap2_dflt
_wait
,
.
ops
=
&
clkops_omap2_dflt
,
.
parent
=
&
per_32k_alwon_fck
,
.
enable_reg
=
OMAP_CM_REGADDR
(
OMAP3430_PER_MOD
,
CM_FCLKEN
),
.
enable_bit
=
OMAP3430_EN_GPIO6_SHIFT
,
...
...
@@ -2437,7 +2437,7 @@ static struct clk gpio6_dbck = {
static
struct
clk
gpio5_dbck
=
{
.
name
=
"gpio5_dbck"
,
.
ops
=
&
clkops_omap2_dflt
_wait
,
.
ops
=
&
clkops_omap2_dflt
,
.
parent
=
&
per_32k_alwon_fck
,
.
enable_reg
=
OMAP_CM_REGADDR
(
OMAP3430_PER_MOD
,
CM_FCLKEN
),
.
enable_bit
=
OMAP3430_EN_GPIO5_SHIFT
,
...
...
@@ -2447,7 +2447,7 @@ static struct clk gpio5_dbck = {
static
struct
clk
gpio4_dbck
=
{
.
name
=
"gpio4_dbck"
,
.
ops
=
&
clkops_omap2_dflt
_wait
,
.
ops
=
&
clkops_omap2_dflt
,
.
parent
=
&
per_32k_alwon_fck
,
.
enable_reg
=
OMAP_CM_REGADDR
(
OMAP3430_PER_MOD
,
CM_FCLKEN
),
.
enable_bit
=
OMAP3430_EN_GPIO4_SHIFT
,
...
...
@@ -2457,7 +2457,7 @@ static struct clk gpio4_dbck = {
static
struct
clk
gpio3_dbck
=
{
.
name
=
"gpio3_dbck"
,
.
ops
=
&
clkops_omap2_dflt
_wait
,
.
ops
=
&
clkops_omap2_dflt
,
.
parent
=
&
per_32k_alwon_fck
,
.
enable_reg
=
OMAP_CM_REGADDR
(
OMAP3430_PER_MOD
,
CM_FCLKEN
),
.
enable_bit
=
OMAP3430_EN_GPIO3_SHIFT
,
...
...
@@ -2467,7 +2467,7 @@ static struct clk gpio3_dbck = {
static
struct
clk
gpio2_dbck
=
{
.
name
=
"gpio2_dbck"
,
.
ops
=
&
clkops_omap2_dflt
_wait
,
.
ops
=
&
clkops_omap2_dflt
,
.
parent
=
&
per_32k_alwon_fck
,
.
enable_reg
=
OMAP_CM_REGADDR
(
OMAP3430_PER_MOD
,
CM_FCLKEN
),
.
enable_bit
=
OMAP3430_EN_GPIO2_SHIFT
,
...
...
arch/arm/mach-omap2/devices.c
浏览文件 @
cddb7835
...
...
@@ -354,10 +354,12 @@ static void omap_init_mcspi(void)
platform_device_register
(
&
omap2_mcspi1
);
platform_device_register
(
&
omap2_mcspi2
);
#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)
platform_device_register
(
&
omap2_mcspi3
);
if
(
cpu_is_omap2430
()
||
cpu_is_omap343x
())
platform_device_register
(
&
omap2_mcspi3
);
#endif
#ifdef CONFIG_ARCH_OMAP3
platform_device_register
(
&
omap2_mcspi4
);
if
(
cpu_is_omap343x
())
platform_device_register
(
&
omap2_mcspi4
);
#endif
}
...
...
arch/arm/mach-omap2/prm-regbits-34xx.h
浏览文件 @
cddb7835
...
...
@@ -409,7 +409,7 @@
/* PM_PREPWSTST_CAM specific bits */
/* PM_PWSTCTRL_USBHOST specific bits */
#define OMAP3430ES2_SAVEANDRESTORE_SHIFT
(1 << 4)
#define OMAP3430ES2_SAVEANDRESTORE_SHIFT
4
/* RM_RSTST_PER specific bits */
...
...
arch/arm/mach-omap2/usb-tusb6010.c
浏览文件 @
cddb7835
...
...
@@ -187,7 +187,7 @@ int tusb6010_platform_retime(unsigned is_refclk)
unsigned
sysclk_ps
;
int
status
;
if
(
!
refclk_psec
||
sys
clk_ps
==
0
)
if
(
!
refclk_psec
||
f
clk_ps
==
0
)
return
-
ENODEV
;
sysclk_ps
=
is_refclk
?
refclk_psec
:
TUSB6010_OSCCLK_60
;
...
...
arch/arm/plat-omap/fb.c
浏览文件 @
cddb7835
...
...
@@ -206,9 +206,10 @@ void __init omapfb_reserve_sdram(void)
config_invalid
=
1
;
return
;
}
if
(
rg
.
paddr
)
if
(
rg
.
paddr
)
{
reserve_bootmem
(
rg
.
paddr
,
rg
.
size
,
BOOTMEM_DEFAULT
);
reserved
+=
rg
.
size
;
reserved
+=
rg
.
size
;
}
omapfb_config
.
mem_desc
.
region
[
i
]
=
rg
;
configured_regions
++
;
}
...
...
arch/arm/plat-omap/gpio.c
浏览文件 @
cddb7835
...
...
@@ -307,7 +307,7 @@ static inline int gpio_valid(int gpio)
return
0
;
if
(
cpu_is_omap24xx
()
&&
gpio
<
128
)
return
0
;
if
(
cpu_is_omap34xx
()
&&
gpio
<
1
60
)
if
(
cpu_is_omap34xx
()
&&
gpio
<
1
92
)
return
0
;
return
-
1
;
}
...
...
drivers/video/omap/dispc.c
浏览文件 @
cddb7835
...
...
@@ -880,20 +880,22 @@ static irqreturn_t omap_dispc_irq_handler(int irq, void *dev)
static
int
get_dss_clocks
(
void
)
{
if
(
IS_ERR
((
dispc
.
dss_ick
=
clk_get
(
dispc
.
fbdev
->
dev
,
"dss_ick"
))))
{
dev_err
(
dispc
.
fbdev
->
dev
,
"can't get dss_ick
\n
"
);
dispc
.
dss_ick
=
clk_get
(
dispc
.
fbdev
->
dev
,
"ick"
);
if
(
IS_ERR
(
dispc
.
dss_ick
))
{
dev_err
(
dispc
.
fbdev
->
dev
,
"can't get ick
\n
"
);
return
PTR_ERR
(
dispc
.
dss_ick
);
}
if
(
IS_ERR
((
dispc
.
dss1_fck
=
clk_get
(
dispc
.
fbdev
->
dev
,
"dss1_fck"
))))
{
dispc
.
dss1_fck
=
clk_get
(
dispc
.
fbdev
->
dev
,
"dss1_fck"
);
if
(
IS_ERR
(
dispc
.
dss1_fck
))
{
dev_err
(
dispc
.
fbdev
->
dev
,
"can't get dss1_fck
\n
"
);
clk_put
(
dispc
.
dss_ick
);
return
PTR_ERR
(
dispc
.
dss1_fck
);
}
if
(
IS_ERR
((
dispc
.
dss_54m_fck
=
clk_get
(
dispc
.
fbdev
->
dev
,
"dss_54m_fck"
))
))
{
dev_err
(
dispc
.
fbdev
->
dev
,
"can't get
dss_54m
_fck
\n
"
);
dispc
.
dss_54m_fck
=
clk_get
(
dispc
.
fbdev
->
dev
,
"tv_fck"
);
if
(
IS_ERR
(
dispc
.
dss_54m_fck
))
{
dev_err
(
dispc
.
fbdev
->
dev
,
"can't get
tv
_fck
\n
"
);
clk_put
(
dispc
.
dss_ick
);
clk_put
(
dispc
.
dss1_fck
);
return
PTR_ERR
(
dispc
.
dss_54m_fck
);
...
...
drivers/video/omap/rfbi.c
浏览文件 @
cddb7835
...
...
@@ -83,12 +83,14 @@ static inline u32 rfbi_read_reg(int idx)
static
int
rfbi_get_clocks
(
void
)
{
if
(
IS_ERR
((
rfbi
.
dss_ick
=
clk_get
(
rfbi
.
fbdev
->
dev
,
"dss_ick"
))))
{
dev_err
(
rfbi
.
fbdev
->
dev
,
"can't get dss_ick
\n
"
);
rfbi
.
dss_ick
=
clk_get
(
rfbi
.
fbdev
->
dev
,
"ick"
);
if
(
IS_ERR
(
rfbi
.
dss_ick
))
{
dev_err
(
rfbi
.
fbdev
->
dev
,
"can't get ick
\n
"
);
return
PTR_ERR
(
rfbi
.
dss_ick
);
}
if
(
IS_ERR
((
rfbi
.
dss1_fck
=
clk_get
(
rfbi
.
fbdev
->
dev
,
"dss1_fck"
))))
{
rfbi
.
dss1_fck
=
clk_get
(
rfbi
.
fbdev
->
dev
,
"dss1_fck"
);
if
(
IS_ERR
(
rfbi
.
dss1_fck
))
{
dev_err
(
rfbi
.
fbdev
->
dev
,
"can't get dss1_fck
\n
"
);
clk_put
(
rfbi
.
dss_ick
);
return
PTR_ERR
(
rfbi
.
dss1_fck
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录