Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
11224303
K
Kernel
项目概览
openeuler
/
Kernel
12 个月 前同步成功
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
11224303
编写于
11月 30, 2008
作者:
R
Russell King
提交者:
Russell King
11月 30, 2008
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'clks' into devel
上级
773e9610
ee569c43
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
65 addition
and
271 deletion
+65
-271
arch/arm/Kconfig
arch/arm/Kconfig
+1
-0
arch/arm/mach-aaec2000/Makefile
arch/arm/mach-aaec2000/Makefile
+1
-1
arch/arm/mach-aaec2000/clock.c
arch/arm/mach-aaec2000/clock.c
+0
-99
arch/arm/mach-aaec2000/clock.h
arch/arm/mach-aaec2000/clock.h
+0
-23
arch/arm/mach-aaec2000/core.c
arch/arm/mach-aaec2000/core.c
+23
-6
arch/arm/mach-ep93xx/clock.c
arch/arm/mach-ep93xx/clock.c
+23
-45
arch/arm/mach-ep93xx/include/mach/clkdev.h
arch/arm/mach-ep93xx/include/mach/clkdev.h
+7
-0
arch/arm/mach-lh7a40x/clocks.c
arch/arm/mach-lh7a40x/clocks.c
+4
-88
arch/arm/mach-netx/fb.c
arch/arm/mach-netx/fb.c
+2
-5
drivers/mmc/host/mmci.c
drivers/mmc/host/mmci.c
+1
-1
drivers/serial/amba-pl010.c
drivers/serial/amba-pl010.c
+1
-1
drivers/serial/amba-pl011.c
drivers/serial/amba-pl011.c
+1
-1
drivers/video/amba-clcd.c
drivers/video/amba-clcd.c
+1
-1
未找到文件。
arch/arm/Kconfig
浏览文件 @
11224303
...
...
@@ -271,6 +271,7 @@ config ARCH_EP93XX
select ARM_VIC
select GENERIC_GPIO
select HAVE_CLK
select COMMON_CLKDEV
select ARCH_REQUIRE_GPIOLIB
help
This enables support for the Cirrus EP93xx series of CPUs.
...
...
arch/arm/mach-aaec2000/Makefile
浏览文件 @
11224303
...
...
@@ -3,7 +3,7 @@
#
# Common support (must be linked before board specific support)
obj-y
+=
core.o
clock.o
obj-y
+=
core.o
# Specific board support
obj-$(CONFIG_MACH_AAED2000)
+=
aaed2000.o
arch/arm/mach-aaec2000/clock.c
已删除
100644 → 0
浏览文件 @
773e9610
/*
* linux/arch/arm/mach-aaec2000/clock.c
*
* Copyright (C) 2005 Nicolas Bellido Y Ortega
*
* Based on linux/arch/arm/mach-integrator/clock.c
*
* 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/module.h>
#include <linux/kernel.h>
#include <linux/list.h>
#include <linux/errno.h>
#include <linux/err.h>
#include <linux/string.h>
#include <linux/clk.h>
#include <linux/mutex.h>
#include "clock.h"
static
LIST_HEAD
(
clocks
);
static
DEFINE_MUTEX
(
clocks_mutex
);
struct
clk
*
clk_get
(
struct
device
*
dev
,
const
char
*
id
)
{
struct
clk
*
p
,
*
clk
=
ERR_PTR
(
-
ENOENT
);
mutex_lock
(
&
clocks_mutex
);
list_for_each_entry
(
p
,
&
clocks
,
node
)
{
if
(
strcmp
(
id
,
p
->
name
)
==
0
&&
try_module_get
(
p
->
owner
))
{
clk
=
p
;
break
;
}
}
mutex_unlock
(
&
clocks_mutex
);
return
clk
;
}
EXPORT_SYMBOL
(
clk_get
);
void
clk_put
(
struct
clk
*
clk
)
{
module_put
(
clk
->
owner
);
}
EXPORT_SYMBOL
(
clk_put
);
int
clk_enable
(
struct
clk
*
clk
)
{
return
0
;
}
EXPORT_SYMBOL
(
clk_enable
);
void
clk_disable
(
struct
clk
*
clk
)
{
}
EXPORT_SYMBOL
(
clk_disable
);
unsigned
long
clk_get_rate
(
struct
clk
*
clk
)
{
return
clk
->
rate
;
}
EXPORT_SYMBOL
(
clk_get_rate
);
long
clk_round_rate
(
struct
clk
*
clk
,
unsigned
long
rate
)
{
return
rate
;
}
EXPORT_SYMBOL
(
clk_round_rate
);
int
clk_set_rate
(
struct
clk
*
clk
,
unsigned
long
rate
)
{
return
0
;
}
EXPORT_SYMBOL
(
clk_set_rate
);
int
clk_register
(
struct
clk
*
clk
)
{
mutex_lock
(
&
clocks_mutex
);
list_add
(
&
clk
->
node
,
&
clocks
);
mutex_unlock
(
&
clocks_mutex
);
return
0
;
}
EXPORT_SYMBOL
(
clk_register
);
void
clk_unregister
(
struct
clk
*
clk
)
{
mutex_lock
(
&
clocks_mutex
);
list_del
(
&
clk
->
node
);
mutex_unlock
(
&
clocks_mutex
);
}
EXPORT_SYMBOL
(
clk_unregister
);
static
int
__init
clk_init
(
void
)
{
return
0
;
}
arch_initcall
(
clk_init
);
arch/arm/mach-aaec2000/clock.h
已删除
100644 → 0
浏览文件 @
773e9610
/*
* linux/arch/arm/mach-aaec2000/clock.h
*
* Copyright (C) 2005 Nicolas Bellido Y Ortega
*
* Based on linux/arch/arm/mach-integrator/clock.h
*
* 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.
*/
struct
module
;
struct
clk
{
struct
list_head
node
;
unsigned
long
rate
;
struct
module
*
owner
;
const
char
*
name
;
void
*
data
;
};
int
clk_register
(
struct
clk
*
clk
);
void
clk_unregister
(
struct
clk
*
clk
);
arch/arm/mach-aaec2000/core.c
浏览文件 @
11224303
...
...
@@ -19,6 +19,7 @@
#include <linux/interrupt.h>
#include <linux/timex.h>
#include <linux/signal.h>
#include <linux/clk.h>
#include <mach/hardware.h>
#include <asm/irq.h>
...
...
@@ -30,7 +31,6 @@
#include <asm/mach/map.h>
#include "core.h"
#include "clock.h"
/*
* Common I/O mapping:
...
...
@@ -229,9 +229,28 @@ static struct amba_device *amba_devs[] __initdata = {
&
clcd_device
,
};
static
struct
clk
aaec2000_clcd_clk
=
{
.
name
=
"CLCDCLK"
,
};
void
clk_disable
(
struct
clk
*
clk
)
{
}
int
clk_set_rate
(
struct
clk
*
clk
,
unsigned
long
rate
)
{
return
0
;
}
int
clk_enable
(
struct
clk
*
clk
)
{
return
0
;
}
struct
clk
*
clk_get
(
struct
device
*
dev
,
const
char
*
id
)
{
return
dev
&&
strcmp
(
dev_name
(
dev
),
"mb:16"
)
==
0
?
NULL
:
ERR_PTR
(
-
ENOENT
);
}
void
clk_put
(
struct
clk
*
clk
)
{
}
void
__init
aaec2000_set_clcd_plat_data
(
struct
aaec2000_clcd_info
*
clcd
)
{
...
...
@@ -265,8 +284,6 @@ static int __init aaec2000_init(void)
{
int
i
;
clk_register
(
&
aaec2000_clcd_clk
);
for
(
i
=
0
;
i
<
ARRAY_SIZE
(
amba_devs
);
i
++
)
{
struct
amba_device
*
d
=
amba_devs
[
i
];
amba_device_register
(
d
,
&
iomem_resource
);
...
...
arch/arm/mach-ep93xx/clock.c
浏览文件 @
11224303
...
...
@@ -16,11 +16,12 @@
#include <linux/module.h>
#include <linux/string.h>
#include <linux/io.h>
#include <asm/clkdev.h>
#include <asm/div64.h>
#include <mach/hardware.h>
struct
clk
{
char
*
name
;
unsigned
long
rate
;
int
users
;
u32
enable_reg
;
...
...
@@ -28,53 +29,33 @@ struct clk {
};
static
struct
clk
clk_uart
=
{
.
name
=
"UARTCLK"
,
.
rate
=
14745600
,
};
static
struct
clk
clk_pll1
=
{
.
name
=
"pll1"
,
};
static
struct
clk
clk_f
=
{
.
name
=
"fclk"
,
};
static
struct
clk
clk_h
=
{
.
name
=
"hclk"
,
};
static
struct
clk
clk_p
=
{
.
name
=
"pclk"
,
};
static
struct
clk
clk_pll2
=
{
.
name
=
"pll2"
,
};
static
struct
clk
clk_pll1
;
static
struct
clk
clk_f
;
static
struct
clk
clk_h
;
static
struct
clk
clk_p
;
static
struct
clk
clk_pll2
;
static
struct
clk
clk_usb_host
=
{
.
name
=
"usb_host"
,
.
enable_reg
=
EP93XX_SYSCON_CLOCK_CONTROL
,
.
enable_mask
=
EP93XX_SYSCON_CLOCK_USH_EN
,
};
static
struct
clk
*
clocks
[]
=
{
&
clk_uart
,
&
clk_pll1
,
&
clk_f
,
&
clk_h
,
&
clk_p
,
&
clk_pll2
,
&
clk_usb_host
,
#define INIT_CK(dev,con,ck) \
{ .dev_id = dev, .con_id = con, .clk = ck }
static
struct
clk_lookup
clocks
[]
=
{
INIT_CK
(
"apb:uart1"
,
NULL
,
&
clk_uart
),
INIT_CK
(
"apb:uart2"
,
NULL
,
&
clk_uart
),
INIT_CK
(
"apb:uart3"
,
NULL
,
&
clk_uart
),
INIT_CK
(
NULL
,
"pll1"
,
&
clk_pll1
),
INIT_CK
(
NULL
,
"fclk"
,
&
clk_f
),
INIT_CK
(
NULL
,
"hclk"
,
&
clk_h
),
INIT_CK
(
NULL
,
"pclk"
,
&
clk_p
),
INIT_CK
(
NULL
,
"pll2"
,
&
clk_pll2
),
INIT_CK
(
NULL
,
"usb_host"
,
&
clk_usb_host
),
};
struct
clk
*
clk_get
(
struct
device
*
dev
,
const
char
*
id
)
{
int
i
;
for
(
i
=
0
;
i
<
ARRAY_SIZE
(
clocks
);
i
++
)
{
if
(
!
strcmp
(
clocks
[
i
]
->
name
,
id
))
return
clocks
[
i
];
}
return
ERR_PTR
(
-
ENOENT
);
}
EXPORT_SYMBOL
(
clk_get
);
int
clk_enable
(
struct
clk
*
clk
)
{
...
...
@@ -106,12 +87,6 @@ unsigned long clk_get_rate(struct clk *clk)
}
EXPORT_SYMBOL
(
clk_get_rate
);
void
clk_put
(
struct
clk
*
clk
)
{
}
EXPORT_SYMBOL
(
clk_put
);
static
char
fclk_divisors
[]
=
{
1
,
2
,
4
,
8
,
16
,
1
,
1
,
1
};
static
char
hclk_divisors
[]
=
{
1
,
2
,
4
,
5
,
6
,
8
,
16
,
32
};
...
...
@@ -138,6 +113,7 @@ static unsigned long calc_pll_rate(u32 config_word)
static
int
__init
ep93xx_clock_init
(
void
)
{
u32
value
;
int
i
;
value
=
__raw_readl
(
EP93XX_SYSCON_CLOCK_SET1
);
if
(
!
(
value
&
0x00800000
))
{
/* PLL1 bypassed? */
...
...
@@ -165,6 +141,8 @@ static int __init ep93xx_clock_init(void)
clk_f
.
rate
/
1000000
,
clk_h
.
rate
/
1000000
,
clk_p
.
rate
/
1000000
);
for
(
i
=
0
;
i
<
ARRAY_SIZE
(
clocks
);
i
++
)
clkdev_add
(
&
clocks
[
i
]);
return
0
;
}
arch_initcall
(
ep93xx_clock_init
);
arch/arm/mach-ep93xx/include/mach/clkdev.h
0 → 100644
浏览文件 @
11224303
#ifndef __ASM_MACH_CLKDEV_H
#define __ASM_MACH_CLKDEV_H
#define __clk_get(clk) ({ 1; })
#define __clk_put(clk) do { } while (0)
#endif
arch/arm/mach-lh7a40x/clocks.c
浏览文件 @
11224303
...
...
@@ -14,21 +14,14 @@
#include <linux/err.h>
struct
module
;
struct
icst525_params
;
struct
clk
{
struct
list_head
node
;
unsigned
long
rate
;
struct
module
*
owner
;
const
char
*
name
;
// void *data;
// const struct icst525_params *params;
// void (*setvco)(struct clk *, struct icst525_vco vco);
};
int
clk_register
(
struct
clk
*
clk
);
void
clk_unregister
(
struct
clk
*
clk
);
/* ----- */
#define MAINDIV1(c) (((c) >> 7) & 0x0f)
...
...
@@ -79,31 +72,15 @@ unsigned int pclkfreq_get (void)
/* ----- */
static
LIST_HEAD
(
clocks
);
static
DECLARE_MUTEX
(
clocks_sem
);
struct
clk
*
clk_get
(
struct
device
*
dev
,
const
char
*
id
)
{
struct
clk
*
p
;
struct
clk
*
clk
=
ERR_PTR
(
-
ENOENT
);
down
(
&
clocks_sem
);
list_for_each_entry
(
p
,
&
clocks
,
node
)
{
if
(
strcmp
(
id
,
p
->
name
)
==
0
&&
try_module_get
(
p
->
owner
))
{
clk
=
p
;
break
;
}
}
up
(
&
clocks_sem
);
return
clk
;
return
dev
&&
strcmp
(
dev_name
(
dev
),
"cldc-lh7a40x"
)
==
0
?
NULL
:
ERR_PTR
(
-
ENOENT
);
}
EXPORT_SYMBOL
(
clk_get
);
void
clk_put
(
struct
clk
*
clk
)
{
module_put
(
clk
->
owner
);
}
EXPORT_SYMBOL
(
clk_put
);
...
...
@@ -118,20 +95,9 @@ void clk_disable (struct clk *clk)
}
EXPORT_SYMBOL
(
clk_disable
);
int
clk_use
(
struct
clk
*
clk
)
{
return
0
;
}
EXPORT_SYMBOL
(
clk_use
);
void
clk_unuse
(
struct
clk
*
clk
)
{
}
EXPORT_SYMBOL
(
clk_unuse
);
unsigned
long
clk_get_rate
(
struct
clk
*
clk
)
{
return
clk
->
rate
;
return
0
;
}
EXPORT_SYMBOL
(
clk_get_rate
);
...
...
@@ -143,56 +109,6 @@ EXPORT_SYMBOL(clk_round_rate);
int
clk_set_rate
(
struct
clk
*
clk
,
unsigned
long
rate
)
{
int
ret
=
-
EIO
;
return
ret
;
return
-
EIO
;
}
EXPORT_SYMBOL
(
clk_set_rate
);
#if 0
/*
* These are fixed clocks.
*/
static struct clk kmi_clk = {
.name = "KMIREFCLK",
.rate = 24000000,
};
static struct clk uart_clk = {
.name = "UARTCLK",
.rate = 24000000,
};
static struct clk mmci_clk = {
.name = "MCLK",
.rate = 33000000,
};
#endif
static
struct
clk
clcd_clk
=
{
.
name
=
"CLCDCLK"
,
.
rate
=
0
,
};
int
clk_register
(
struct
clk
*
clk
)
{
down
(
&
clocks_sem
);
list_add
(
&
clk
->
node
,
&
clocks
);
up
(
&
clocks_sem
);
return
0
;
}
EXPORT_SYMBOL
(
clk_register
);
void
clk_unregister
(
struct
clk
*
clk
)
{
down
(
&
clocks_sem
);
list_del
(
&
clk
->
node
);
up
(
&
clocks_sem
);
}
EXPORT_SYMBOL
(
clk_unregister
);
static
int
__init
clk_init
(
void
)
{
clk_register
(
&
clcd_clk
);
return
0
;
}
arch_initcall
(
clk_init
);
arch/arm/mach-netx/fb.c
浏览文件 @
11224303
...
...
@@ -22,14 +22,11 @@
#include <linux/dma-mapping.h>
#include <linux/amba/bus.h>
#include <linux/amba/clcd.h>
#include <linux/err.h>
#include <mach/netx-regs.h>
#include <mach/hardware.h>
struct
clk
{};
static
struct
clk
fb_clk
;
static
struct
clcd_panel
*
netx_panel
;
void
netx_clcd_enable
(
struct
clcd_fb
*
fb
)
...
...
@@ -85,7 +82,7 @@ int clk_enable(struct clk *clk)
struct
clk
*
clk_get
(
struct
device
*
dev
,
const
char
*
id
)
{
return
&
fb_clk
;
return
dev
&&
strcmp
(
dev_name
(
dev
),
"fb"
)
==
0
?
NULL
:
ERR_PTR
(
-
ENOENT
)
;
}
void
clk_put
(
struct
clk
*
clk
)
...
...
drivers/mmc/host/mmci.c
浏览文件 @
11224303
...
...
@@ -500,7 +500,7 @@ static int mmci_probe(struct amba_device *dev, void *id)
}
host
=
mmc_priv
(
mmc
);
host
->
clk
=
clk_get
(
&
dev
->
dev
,
"MCLK"
);
host
->
clk
=
clk_get
(
&
dev
->
dev
,
NULL
);
if
(
IS_ERR
(
host
->
clk
))
{
ret
=
PTR_ERR
(
host
->
clk
);
host
->
clk
=
NULL
;
...
...
drivers/serial/amba-pl010.c
浏览文件 @
11224303
...
...
@@ -692,7 +692,7 @@ static int pl010_probe(struct amba_device *dev, void *id)
goto
free
;
}
uap
->
clk
=
clk_get
(
&
dev
->
dev
,
"UARTCLK"
);
uap
->
clk
=
clk_get
(
&
dev
->
dev
,
NULL
);
if
(
IS_ERR
(
uap
->
clk
))
{
ret
=
PTR_ERR
(
uap
->
clk
);
goto
unmap
;
...
...
drivers/serial/amba-pl011.c
浏览文件 @
11224303
...
...
@@ -756,7 +756,7 @@ static int pl011_probe(struct amba_device *dev, void *id)
goto
free
;
}
uap
->
clk
=
clk_get
(
&
dev
->
dev
,
"UARTCLK"
);
uap
->
clk
=
clk_get
(
&
dev
->
dev
,
NULL
);
if
(
IS_ERR
(
uap
->
clk
))
{
ret
=
PTR_ERR
(
uap
->
clk
);
goto
unmap
;
...
...
drivers/video/amba-clcd.c
浏览文件 @
11224303
...
...
@@ -343,7 +343,7 @@ static int clcdfb_register(struct clcd_fb *fb)
{
int
ret
;
fb
->
clk
=
clk_get
(
&
fb
->
dev
->
dev
,
"CLCDCLK"
);
fb
->
clk
=
clk_get
(
&
fb
->
dev
->
dev
,
NULL
);
if
(
IS_ERR
(
fb
->
clk
))
{
ret
=
PTR_ERR
(
fb
->
clk
);
goto
out
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录