Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
1d651f33
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,发现更多精彩内容 >>
提交
1d651f33
编写于
4月 30, 2005
作者:
L
Linus Torvalds
浏览文件
操作
浏览文件
下载
差异文件
Merge of master.kernel.org:/home/rmk/linux-2.6-rmk.git
上级
49e7dc54
4774e226
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
23 addition
and
8 deletion
+23
-8
arch/arm/mach-integrator/integrator_cp.c
arch/arm/mach-integrator/integrator_cp.c
+16
-1
drivers/video/amba-clcd.c
drivers/video/amba-clcd.c
+4
-4
include/asm-arm/arch-integrator/cm.h
include/asm-arm/arch-integrator/cm.h
+3
-3
未找到文件。
arch/arm/mach-integrator/integrator_cp.c
浏览文件 @
1d651f33
...
...
@@ -420,7 +420,22 @@ static struct clcd_panel vga = {
*/
static
void
cp_clcd_enable
(
struct
clcd_fb
*
fb
)
{
cm_control
(
CM_CTRL_LCDMUXSEL_MASK
,
CM_CTRL_LCDMUXSEL_VGA
);
u32
val
;
if
(
fb
->
fb
.
var
.
bits_per_pixel
<=
8
)
val
=
CM_CTRL_LCDMUXSEL_VGA_8421BPP
;
else
if
(
fb
->
fb
.
var
.
bits_per_pixel
<=
16
)
val
=
CM_CTRL_LCDMUXSEL_VGA_16BPP
;
else
val
=
0
;
/* no idea for this, don't trust the docs */
cm_control
(
CM_CTRL_LCDMUXSEL_MASK
|
CM_CTRL_LCDEN0
|
CM_CTRL_LCDEN1
|
CM_CTRL_STATIC1
|
CM_CTRL_STATIC2
|
CM_CTRL_STATIC
|
CM_CTRL_n24BITEN
,
val
);
}
static
unsigned
long
framesize
=
SZ_1M
;
...
...
drivers/video/amba-clcd.c
浏览文件 @
1d651f33
...
...
@@ -134,16 +134,16 @@ clcdfb_set_bitfields(struct clcd_fb *fb, struct fb_var_screeninfo *var)
break
;
case
16
:
var
->
red
.
length
=
5
;
var
->
green
.
length
=
5
;
var
->
green
.
length
=
6
;
var
->
blue
.
length
=
5
;
if
(
fb
->
panel
->
cntl
&
CNTL_BGR
)
{
var
->
red
.
offset
=
1
0
;
var
->
red
.
offset
=
1
1
;
var
->
green
.
offset
=
5
;
var
->
blue
.
offset
=
0
;
}
else
{
var
->
red
.
offset
=
0
;
var
->
green
.
offset
=
5
;
var
->
blue
.
offset
=
1
0
;
var
->
blue
.
offset
=
1
1
;
}
break
;
case
32
:
...
...
@@ -256,7 +256,7 @@ clcdfb_setcolreg(unsigned int regno, unsigned int red, unsigned int green,
convert_bitfield
(
green
,
&
fb
->
fb
.
var
.
green
)
|
convert_bitfield
(
red
,
&
fb
->
fb
.
var
.
red
);
if
(
fb
->
fb
.
var
.
bits_per_pixel
==
8
&&
regno
<
256
)
{
if
(
fb
->
fb
.
fix
.
visual
==
FB_VISUAL_PSEUDOCOLOR
&&
regno
<
256
)
{
int
hw_reg
=
CLCD_PALETTE
+
((
regno
*
2
)
&
~
3
);
u32
val
,
mask
,
newval
;
...
...
include/asm-arm/arch-integrator/cm.h
浏览文件 @
1d651f33
...
...
@@ -24,9 +24,9 @@ void cm_control(u32, u32);
#define CM_CTRL_LCDBIASDN (1 << 10)
#define CM_CTRL_LCDMUXSEL_MASK (7 << 11)
#define CM_CTRL_LCDMUXSEL_GENLCD (1 << 11)
#define CM_CTRL_LCDMUXSEL_
SHARPLCD1 (3
<< 11)
#define CM_CTRL_LCDMUXSEL_SHARPLCD
2 (4
<< 11)
#define CM_CTRL_LCDMUXSEL_VGA
(7
<< 11)
#define CM_CTRL_LCDMUXSEL_
VGA_16BPP (2
<< 11)
#define CM_CTRL_LCDMUXSEL_SHARPLCD
(3
<< 11)
#define CM_CTRL_LCDMUXSEL_VGA
_8421BPP (4
<< 11)
#define CM_CTRL_LCDEN0 (1 << 14)
#define CM_CTRL_LCDEN1 (1 << 15)
#define CM_CTRL_STATIC1 (1 << 16)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录