Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
19dee0d2
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看板
提交
19dee0d2
编写于
10年前
作者:
M
Mark Brown
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'spi/topic/cleanup' into spi-sh-msiof
Conflicts: drivers/spi/spi-sh-msiof.c
上级
b0d0ce8b
8e3489f3
无相关合并请求
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
3 addition
and
9 deletion
+3
-9
drivers/spi/spi-cadence.c
drivers/spi/spi-cadence.c
+1
-1
drivers/spi/spi-clps711x.c
drivers/spi/spi-clps711x.c
+0
-2
drivers/spi/spi-falcon.c
drivers/spi/spi-falcon.c
+0
-2
drivers/spi/spi-fsl-spi.c
drivers/spi/spi-fsl-spi.c
+1
-1
drivers/spi/spi-omap-100k.c
drivers/spi/spi-omap-100k.c
+0
-2
drivers/spi/spi-sh-hspi.c
drivers/spi/spi-sh-hspi.c
+1
-1
未找到文件。
drivers/spi/spi-cadence.c
浏览文件 @
19dee0d2
...
...
@@ -647,7 +647,7 @@ static int __maybe_unused cdns_spi_resume(struct device *dev)
static
SIMPLE_DEV_PM_OPS
(
cdns_spi_dev_pm_ops
,
cdns_spi_suspend
,
cdns_spi_resume
);
static
struct
of_device_id
cdns_spi_of_match
[]
=
{
static
const
struct
of_device_id
cdns_spi_of_match
[]
=
{
{
.
compatible
=
"xlnx,zynq-spi-r1p6"
},
{
.
compatible
=
"cdns,spi-r1p6"
},
{
/* end of table */
}
...
...
This diff is collapsed.
Click to expand it.
drivers/spi/spi-clps711x.c
浏览文件 @
19dee0d2
...
...
@@ -184,8 +184,6 @@ static int spi_clps711x_probe(struct platform_device *pdev)
}
master
->
max_speed_hz
=
clk_get_rate
(
hw
->
spi_clk
);
platform_set_drvdata
(
pdev
,
master
);
hw
->
syscon
=
syscon_regmap_lookup_by_pdevname
(
"syscon.3"
);
if
(
IS_ERR
(
hw
->
syscon
))
{
ret
=
PTR_ERR
(
hw
->
syscon
);
...
...
This diff is collapsed.
Click to expand it.
drivers/spi/spi-falcon.c
浏览文件 @
19dee0d2
...
...
@@ -425,8 +425,6 @@ static int falcon_sflash_probe(struct platform_device *pdev)
master
->
unprepare_transfer_hardware
=
falcon_sflash_unprepare_xfer
;
master
->
dev
.
of_node
=
pdev
->
dev
.
of_node
;
platform_set_drvdata
(
pdev
,
priv
);
ret
=
devm_spi_register_master
(
&
pdev
->
dev
,
master
);
if
(
ret
)
spi_master_put
(
master
);
...
...
This diff is collapsed.
Click to expand it.
drivers/spi/spi-fsl-spi.c
浏览文件 @
19dee0d2
...
...
@@ -58,7 +58,7 @@ static struct fsl_spi_match_data of_fsl_spi_grlib_config = {
.
type
=
TYPE_GRLIB
,
};
static
struct
of_device_id
of_fsl_spi_match
[]
=
{
static
const
struct
of_device_id
of_fsl_spi_match
[]
=
{
{
.
compatible
=
"fsl,spi"
,
.
data
=
&
of_fsl_spi_fsl_config
,
...
...
This diff is collapsed.
Click to expand it.
drivers/spi/spi-omap-100k.c
浏览文件 @
19dee0d2
...
...
@@ -420,8 +420,6 @@ static int omap1_spi100k_probe(struct platform_device *pdev)
master
->
min_speed_hz
=
OMAP1_SPI100K_MAX_FREQ
/
(
1
<<
16
);
master
->
max_speed_hz
=
OMAP1_SPI100K_MAX_FREQ
;
platform_set_drvdata
(
pdev
,
master
);
spi100k
=
spi_master_get_devdata
(
master
);
/*
...
...
This diff is collapsed.
Click to expand it.
drivers/spi/spi-sh-hspi.c
浏览文件 @
19dee0d2
...
...
@@ -304,7 +304,7 @@ static int hspi_remove(struct platform_device *pdev)
return
0
;
}
static
struct
of_device_id
hspi_of_match
[]
=
{
static
const
struct
of_device_id
hspi_of_match
[]
=
{
{
.
compatible
=
"renesas,hspi"
,
},
{
/* sentinel */
}
};
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
反馈
建议
客服
返回
顶部