Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
8dc16cf9
U
U-Boot.Mirror
项目概览
OS
/
U-Boot.Mirror
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
U-Boot.Mirror
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8dc16cf9
编写于
4月 14, 2013
作者:
A
Albert ARIBAUD
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
上级
f84a7b8f
0f1411bc
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
12 addition
and
9 deletion
+12
-9
arch/arm/include/asm/arch-mx5/imx-regs.h
arch/arm/include/asm/arch-mx5/imx-regs.h
+1
-0
arch/arm/include/asm/arch-mx6/imx-regs.h
arch/arm/include/asm/arch-mx6/imx-regs.h
+1
-0
drivers/spi/mxc_spi.c
drivers/spi/mxc_spi.c
+9
-8
include/configs/mx6qsabre_common.h
include/configs/mx6qsabre_common.h
+1
-1
未找到文件。
arch/arm/include/asm/arch-mx5/imx-regs.h
浏览文件 @
8dc16cf9
...
...
@@ -230,6 +230,7 @@
#define MXC_CSPICTRL_EN (1 << 0)
#define MXC_CSPICTRL_MODE (1 << 1)
#define MXC_CSPICTRL_XCH (1 << 2)
#define MXC_CSPICTRL_MODE_MASK (0xf << 4)
#define MXC_CSPICTRL_CHIPSELECT(x) (((x) & 0x3) << 12)
#define MXC_CSPICTRL_BITCOUNT(x) (((x) & 0xfff) << 20)
#define MXC_CSPICTRL_PREDIV(x) (((x) & 0xF) << 12)
...
...
arch/arm/include/asm/arch-mx6/imx-regs.h
浏览文件 @
8dc16cf9
...
...
@@ -346,6 +346,7 @@ struct cspi_regs {
#define MXC_CSPICTRL_EN (1 << 0)
#define MXC_CSPICTRL_MODE (1 << 1)
#define MXC_CSPICTRL_XCH (1 << 2)
#define MXC_CSPICTRL_MODE_MASK (0xf << 4)
#define MXC_CSPICTRL_CHIPSELECT(x) (((x) & 0x3) << 12)
#define MXC_CSPICTRL_BITCOUNT(x) (((x) & 0xfff) << 20)
#define MXC_CSPICTRL_PREDIV(x) (((x) & 0xF) << 12)
...
...
drivers/spi/mxc_spi.c
浏览文件 @
8dc16cf9
...
...
@@ -137,11 +137,15 @@ static s32 spi_cfg_mxc(struct mxc_spi_slave *mxcs, unsigned int cs,
return
-
1
;
}
/* Reset spi */
reg_write
(
&
regs
->
ctrl
,
0
);
reg_write
(
&
regs
->
ctrl
,
MXC_CSPICTRL_EN
);
reg_ctrl
=
reg_read
(
&
regs
->
ctrl
);
/*
* Reset SPI and set all CSs to master mode, if toggling
* between slave and master mode we might see a glitch
* on the clock line
*/
reg_ctrl
=
MXC_CSPICTRL_MODE_MASK
;
reg_write
(
&
regs
->
ctrl
,
reg_ctrl
);
reg_ctrl
|=
MXC_CSPICTRL_EN
;
reg_write
(
&
regs
->
ctrl
,
reg_ctrl
);
/*
* The following computation is taken directly from Freescale's code.
...
...
@@ -174,9 +178,6 @@ static s32 spi_cfg_mxc(struct mxc_spi_slave *mxcs, unsigned int cs,
reg_ctrl
=
(
reg_ctrl
&
~
MXC_CSPICTRL_POSTDIV
(
0x0F
))
|
MXC_CSPICTRL_POSTDIV
(
post_div
);
/* always set to master mode */
reg_ctrl
|=
1
<<
(
cs
+
4
);
/* We need to disable SPI before changing registers */
reg_ctrl
&=
~
MXC_CSPICTRL_EN
;
...
...
include/configs/mx6qsabre_common.h
浏览文件 @
8dc16cf9
...
...
@@ -148,7 +148,7 @@
#define CONFIG_BOOTCOMMAND \
"mmc dev ${mmcdev};" \
"if mmc rescan
${mmcdev}
; then " \
"if mmc rescan; then " \
"if run loadbootscript; then " \
"run bootscript; " \
"else " \
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录