Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
6f36a806
K
Kernel
项目概览
openeuler
/
Kernel
1 年多 前同步成功
通知
8
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看板
提交
6f36a806
编写于
1月 17, 2012
作者:
B
Ben Dooks
浏览文件
操作
浏览文件
下载
差异文件
Merge branches 'for-33/i2c/eg20t' and 'for-33/i2c/omap' into for-linus/i2c-33
上级
8956dc10
6145197b
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
100 addition
and
40 deletion
+100
-40
Documentation/devicetree/bindings/i2c/omap-i2c.txt
Documentation/devicetree/bindings/i2c/omap-i2c.txt
+30
-0
drivers/i2c/busses/i2c-omap.c
drivers/i2c/busses/i2c-omap.c
+70
-40
未找到文件。
Documentation/devicetree/bindings/i2c/omap-i2c.txt
0 → 100644
浏览文件 @
6f36a806
I2C for OMAP platforms
Required properties :
- compatible : Must be "ti,omap3-i2c" or "ti,omap4-i2c"
- ti,hwmods : Must be "i2c<n>", n being the instance number (1-based)
- #address-cells = <1>;
- #size-cells = <0>;
Recommended properties :
- clock-frequency : Desired I2C bus clock frequency in Hz. Otherwise
the default 100 kHz frequency will be used.
Optional properties:
- Child nodes conforming to i2c bus binding
Note: Current implementation will fetch base address, irq and dma
from omap hwmod data base during device registration.
Future plan is to migrate hwmod data base contents into device tree
blob so that, all the required data will be used from device tree dts
file.
Examples :
i2c1: i2c@0 {
compatible = "ti,omap3-i2c";
#address-cells = <1>;
#size-cells = <0>;
ti,hwmods = "i2c1";
clock-frequency = <400000>;
};
drivers/i2c/busses/i2c-omap.c
浏览文件 @
6f36a806
...
...
@@ -37,6 +37,9 @@
#include <linux/platform_device.h>
#include <linux/clk.h>
#include <linux/io.h>
#include <linux/of.h>
#include <linux/of_i2c.h>
#include <linux/of_device.h>
#include <linux/slab.h>
#include <linux/i2c-omap.h>
#include <linux/pm_runtime.h>
...
...
@@ -182,7 +185,9 @@ struct omap_i2c_dev {
u32
latency
;
/* maximum mpu wkup latency */
void
(
*
set_mpu_wkup_lat
)(
struct
device
*
dev
,
long
latency
);
u32
speed
;
/* Speed of bus in Khz */
u32
speed
;
/* Speed of bus in kHz */
u32
dtrev
;
/* extra revision from DT */
u32
flags
;
u16
cmd_err
;
u8
*
buf
;
u8
*
regs
;
...
...
@@ -235,7 +240,7 @@ static const u8 reg_map_ip_v2[] = {
[
OMAP_I2C_BUF_REG
]
=
0x94
,
[
OMAP_I2C_CNT_REG
]
=
0x98
,
[
OMAP_I2C_DATA_REG
]
=
0x9c
,
[
OMAP_I2C_SYSC_REG
]
=
0x
2
0
,
[
OMAP_I2C_SYSC_REG
]
=
0x
1
0
,
[
OMAP_I2C_CON_REG
]
=
0xa4
,
[
OMAP_I2C_OA_REG
]
=
0xa8
,
[
OMAP_I2C_SA_REG
]
=
0xac
,
...
...
@@ -266,11 +271,7 @@ static inline u16 omap_i2c_read_reg(struct omap_i2c_dev *i2c_dev, int reg)
static
void
omap_i2c_unidle
(
struct
omap_i2c_dev
*
dev
)
{
struct
omap_i2c_bus_platform_data
*
pdata
;
pdata
=
dev
->
dev
->
platform_data
;
if
(
pdata
->
flags
&
OMAP_I2C_FLAG_RESET_REGS_POSTIDLE
)
{
if
(
dev
->
flags
&
OMAP_I2C_FLAG_RESET_REGS_POSTIDLE
)
{
omap_i2c_write_reg
(
dev
,
OMAP_I2C_CON_REG
,
0
);
omap_i2c_write_reg
(
dev
,
OMAP_I2C_PSC_REG
,
dev
->
pscstate
);
omap_i2c_write_reg
(
dev
,
OMAP_I2C_SCLL_REG
,
dev
->
scllstate
);
...
...
@@ -291,13 +292,10 @@ static void omap_i2c_unidle(struct omap_i2c_dev *dev)
static
void
omap_i2c_idle
(
struct
omap_i2c_dev
*
dev
)
{
struct
omap_i2c_bus_platform_data
*
pdata
;
u16
iv
;
pdata
=
dev
->
dev
->
platform_data
;
dev
->
iestate
=
omap_i2c_read_reg
(
dev
,
OMAP_I2C_IE_REG
);
if
(
pdata
->
rev
==
OMAP_I2C_IP_VERSION_2
)
if
(
dev
->
dt
rev
==
OMAP_I2C_IP_VERSION_2
)
omap_i2c_write_reg
(
dev
,
OMAP_I2C_IP_V2_IRQENABLE_CLR
,
1
);
else
omap_i2c_write_reg
(
dev
,
OMAP_I2C_IE_REG
,
0
);
...
...
@@ -320,9 +318,6 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
unsigned
long
timeout
;
unsigned
long
internal_clk
=
0
;
struct
clk
*
fclk
;
struct
omap_i2c_bus_platform_data
*
pdata
;
pdata
=
dev
->
dev
->
platform_data
;
if
(
dev
->
rev
>=
OMAP_I2C_OMAP1_REV_2
)
{
/* Disable I2C controller before soft reset */
...
...
@@ -373,7 +368,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
}
omap_i2c_write_reg
(
dev
,
OMAP_I2C_CON_REG
,
0
);
if
(
pdata
->
flags
&
OMAP_I2C_FLAG_ALWAYS_ARMXOR_CLK
)
{
if
(
dev
->
flags
&
OMAP_I2C_FLAG_ALWAYS_ARMXOR_CLK
)
{
/*
* The I2C functional clock is the armxor_ck, so there's
* no need to get "armxor_ck" separately. Now, if OMAP2420
...
...
@@ -397,7 +392,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
psc
=
fclk_rate
/
12000000
;
}
if
(
!
(
pdata
->
flags
&
OMAP_I2C_FLAG_SIMPLE_CLOCK
))
{
if
(
!
(
dev
->
flags
&
OMAP_I2C_FLAG_SIMPLE_CLOCK
))
{
/*
* HSI2C controller internal clk rate should be 19.2 Mhz for
...
...
@@ -406,7 +401,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
* The filter is iclk (fclk for HS) period.
*/
if
(
dev
->
speed
>
400
||
pdata
->
flags
&
OMAP_I2C_FLAG_FORCE_19200_INT_CLK
)
dev
->
flags
&
OMAP_I2C_FLAG_FORCE_19200_INT_CLK
)
internal_clk
=
19200
;
else
if
(
dev
->
speed
>
100
)
internal_clk
=
9600
;
...
...
@@ -475,7 +470,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
dev
->
errata
=
0
;
if
(
pdata
->
flags
&
OMAP_I2C_FLAG_APPLY_ERRATA_I207
)
if
(
dev
->
flags
&
OMAP_I2C_FLAG_APPLY_ERRATA_I207
)
dev
->
errata
|=
I2C_OMAP_ERRATA_I207
;
/* Enable interrupts */
...
...
@@ -484,7 +479,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
OMAP_I2C_IE_AL
)
|
((
dev
->
fifo_size
)
?
(
OMAP_I2C_IE_RDR
|
OMAP_I2C_IE_XDR
)
:
0
);
omap_i2c_write_reg
(
dev
,
OMAP_I2C_IE_REG
,
dev
->
iestate
);
if
(
pdata
->
flags
&
OMAP_I2C_FLAG_RESET_REGS_POSTIDLE
)
{
if
(
dev
->
flags
&
OMAP_I2C_FLAG_RESET_REGS_POSTIDLE
)
{
dev
->
pscstate
=
psc
;
dev
->
scllstate
=
scll
;
dev
->
sclhstate
=
sclh
;
...
...
@@ -804,9 +799,6 @@ omap_i2c_isr(int this_irq, void *dev_id)
u16
bits
;
u16
stat
,
w
;
int
err
,
count
=
0
;
struct
omap_i2c_bus_platform_data
*
pdata
;
pdata
=
dev
->
dev
->
platform_data
;
if
(
pm_runtime_suspended
(
dev
->
dev
))
return
IRQ_NONE
;
...
...
@@ -830,11 +822,9 @@ omap_i2c_isr(int this_irq, void *dev_id)
~
(
OMAP_I2C_STAT_RRDY
|
OMAP_I2C_STAT_RDR
|
OMAP_I2C_STAT_XRDY
|
OMAP_I2C_STAT_XDR
));
if
(
stat
&
OMAP_I2C_STAT_NACK
)
{
if
(
stat
&
OMAP_I2C_STAT_NACK
)
err
|=
OMAP_I2C_STAT_NACK
;
omap_i2c_write_reg
(
dev
,
OMAP_I2C_CON_REG
,
OMAP_I2C_CON_STP
);
}
if
(
stat
&
OMAP_I2C_STAT_AL
)
{
dev_err
(
dev
->
dev
,
"Arbitration lost
\n
"
);
err
|=
OMAP_I2C_STAT_AL
;
...
...
@@ -875,7 +865,7 @@ omap_i2c_isr(int this_irq, void *dev_id)
* Data reg in 2430, omap3 and
* omap4 is 8 bit wide
*/
if
(
pdata
->
flags
&
if
(
dev
->
flags
&
OMAP_I2C_FLAG_16BIT_DATA_REG
)
{
if
(
dev
->
buf_len
)
{
*
dev
->
buf
++
=
w
>>
8
;
...
...
@@ -918,7 +908,7 @@ omap_i2c_isr(int this_irq, void *dev_id)
* Data reg in 2430, omap3 and
* omap4 is 8 bit wide
*/
if
(
pdata
->
flags
&
if
(
dev
->
flags
&
OMAP_I2C_FLAG_16BIT_DATA_REG
)
{
if
(
dev
->
buf_len
)
{
w
|=
*
dev
->
buf
++
<<
8
;
...
...
@@ -965,6 +955,32 @@ static const struct i2c_algorithm omap_i2c_algo = {
.
functionality
=
omap_i2c_func
,
};
#ifdef CONFIG_OF
static
struct
omap_i2c_bus_platform_data
omap3_pdata
=
{
.
rev
=
OMAP_I2C_IP_VERSION_1
,
.
flags
=
OMAP_I2C_FLAG_APPLY_ERRATA_I207
|
OMAP_I2C_FLAG_RESET_REGS_POSTIDLE
|
OMAP_I2C_FLAG_BUS_SHIFT_2
,
};
static
struct
omap_i2c_bus_platform_data
omap4_pdata
=
{
.
rev
=
OMAP_I2C_IP_VERSION_2
,
};
static
const
struct
of_device_id
omap_i2c_of_match
[]
=
{
{
.
compatible
=
"ti,omap4-i2c"
,
.
data
=
&
omap4_pdata
,
},
{
.
compatible
=
"ti,omap3-i2c"
,
.
data
=
&
omap3_pdata
,
},
{
},
};
MODULE_DEVICE_TABLE
(
of
,
omap_i2c_of_match
);
#endif
static
int
__devinit
omap_i2c_probe
(
struct
platform_device
*
pdev
)
{
...
...
@@ -972,9 +988,10 @@ omap_i2c_probe(struct platform_device *pdev)
struct
i2c_adapter
*
adap
;
struct
resource
*
mem
,
*
irq
,
*
ioarea
;
struct
omap_i2c_bus_platform_data
*
pdata
=
pdev
->
dev
.
platform_data
;
struct
device_node
*
node
=
pdev
->
dev
.
of_node
;
const
struct
of_device_id
*
match
;
irq_handler_t
isr
;
int
r
;
u32
speed
=
0
;
/* NOTE: driver uses the static register mapping */
mem
=
platform_get_resource
(
pdev
,
IORESOURCE_MEM
,
0
);
...
...
@@ -1001,15 +1018,24 @@ omap_i2c_probe(struct platform_device *pdev)
goto
err_release_region
;
}
if
(
pdata
!=
NULL
)
{
speed
=
pdata
->
clkrate
;
match
=
of_match_device
(
omap_i2c_of_match
,
&
pdev
->
dev
);
if
(
match
)
{
u32
freq
=
100000
;
/* default to 100000 Hz */
pdata
=
match
->
data
;
dev
->
dtrev
=
pdata
->
rev
;
dev
->
flags
=
pdata
->
flags
;
of_property_read_u32
(
node
,
"clock-frequency"
,
&
freq
);
/* convert DT freq value in Hz into kHz for speed */
dev
->
speed
=
freq
/
1000
;
}
else
if
(
pdata
!=
NULL
)
{
dev
->
speed
=
pdata
->
clkrate
;
dev
->
flags
=
pdata
->
flags
;
dev
->
set_mpu_wkup_lat
=
pdata
->
set_mpu_wkup_lat
;
}
else
{
speed
=
100
;
/* Default speed */
dev
->
set_mpu_wkup_lat
=
NULL
;
dev
->
dtrev
=
pdata
->
rev
;
}
dev
->
speed
=
speed
;
dev
->
dev
=
&
pdev
->
dev
;
dev
->
irq
=
irq
->
start
;
dev
->
base
=
ioremap
(
mem
->
start
,
resource_size
(
mem
));
...
...
@@ -1020,9 +1046,9 @@ omap_i2c_probe(struct platform_device *pdev)
platform_set_drvdata
(
pdev
,
dev
);
dev
->
reg_shift
=
(
pdata
->
flags
>>
OMAP_I2C_FLAG_BUS_SHIFT__SHIFT
)
&
3
;
dev
->
reg_shift
=
(
dev
->
flags
>>
OMAP_I2C_FLAG_BUS_SHIFT__SHIFT
)
&
3
;
if
(
pdata
->
rev
==
OMAP_I2C_IP_VERSION_2
)
if
(
dev
->
dt
rev
==
OMAP_I2C_IP_VERSION_2
)
dev
->
regs
=
(
u8
*
)
reg_map_ip_v2
;
else
dev
->
regs
=
(
u8
*
)
reg_map_ip_v1
;
...
...
@@ -1035,7 +1061,7 @@ omap_i2c_probe(struct platform_device *pdev)
if
(
dev
->
rev
<=
OMAP_I2C_REV_ON_3430
)
dev
->
errata
|=
I2C_OMAP3_1P153
;
if
(
!
(
pdata
->
flags
&
OMAP_I2C_FLAG_NO_FIFO
))
{
if
(
!
(
dev
->
flags
&
OMAP_I2C_FLAG_NO_FIFO
))
{
u16
s
;
/* Set up the fifo size - Get total size */
...
...
@@ -1058,7 +1084,7 @@ omap_i2c_probe(struct platform_device *pdev)
/* calculate wakeup latency constraint for MPU */
if
(
dev
->
set_mpu_wkup_lat
!=
NULL
)
dev
->
latency
=
(
1000000
*
dev
->
fifo_size
)
/
(
1000
*
speed
/
8
);
(
1000
*
dev
->
speed
/
8
);
}
/* reset ASAP, clearing any IRQs */
...
...
@@ -1074,7 +1100,7 @@ omap_i2c_probe(struct platform_device *pdev)
}
dev_info
(
dev
->
dev
,
"bus %d rev%d.%d.%d at %d kHz
\n
"
,
pdev
->
id
,
pdata
->
rev
,
dev
->
rev
>>
4
,
dev
->
rev
&
0xf
,
dev
->
speed
);
dev
->
dt
rev
,
dev
->
rev
>>
4
,
dev
->
rev
&
0xf
,
dev
->
speed
);
pm_runtime_put
(
dev
->
dev
);
...
...
@@ -1085,6 +1111,7 @@ omap_i2c_probe(struct platform_device *pdev)
strlcpy
(
adap
->
name
,
"OMAP I2C adapter"
,
sizeof
(
adap
->
name
));
adap
->
algo
=
&
omap_i2c_algo
;
adap
->
dev
.
parent
=
&
pdev
->
dev
;
adap
->
dev
.
of_node
=
pdev
->
dev
.
of_node
;
/* i2c device drivers may be active on return from add_adapter() */
adap
->
nr
=
pdev
->
id
;
...
...
@@ -1094,6 +1121,8 @@ omap_i2c_probe(struct platform_device *pdev)
goto
err_free_irq
;
}
of_i2c_register_devices
(
adap
);
return
0
;
err_free_irq:
...
...
@@ -1166,6 +1195,7 @@ static struct platform_driver omap_i2c_driver = {
.
name
=
"omap_i2c"
,
.
owner
=
THIS_MODULE
,
.
pm
=
OMAP_I2C_PM_OPS
,
.
of_match_table
=
of_match_ptr
(
omap_i2c_of_match
),
},
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录