Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
24109afd
L
linux
项目概览
xiphi1978
/
linux
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
24109afd
编写于
7月 11, 2011
作者:
A
Arnd Bergmann
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'fix' of
git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
into fixes
上级
659fb32d
512b7938
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
26 addition
and
24 deletion
+26
-24
arch/arm/mach-pxa/raumfeld.c
arch/arm/mach-pxa/raumfeld.c
+19
-17
arch/arm/plat-pxa/gpio.c
arch/arm/plat-pxa/gpio.c
+5
-5
drivers/pcmcia/pxa2xx_vpac270.c
drivers/pcmcia/pxa2xx_vpac270.c
+2
-2
未找到文件。
arch/arm/mach-pxa/raumfeld.c
浏览文件 @
24109afd
...
...
@@ -573,10 +573,10 @@ static struct pxafb_mode_info sharp_lq043t3dx02_mode = {
.
xres
=
480
,
.
yres
=
272
,
.
bpp
=
16
,
.
hsync_len
=
4
,
.
hsync_len
=
4
1
,
.
left_margin
=
2
,
.
right_margin
=
1
,
.
vsync_len
=
1
,
.
vsync_len
=
1
0
,
.
upper_margin
=
3
,
.
lower_margin
=
1
,
.
sync
=
0
,
...
...
@@ -596,29 +596,31 @@ static void __init raumfeld_lcd_init(void)
{
int
ret
;
pxa_set_fb_info
(
NULL
,
&
raumfeld_sharp_lcd_info
);
/* Earlier devices had the backlight regulator controlled
* via PWM, later versions use another controller for that */
if
((
system_rev
&
0xff
)
<
2
)
{
mfp_cfg_t
raumfeld_pwm_pin_config
=
GPIO17_PWM0_OUT
;
pxa3xx_mfp_config
(
&
raumfeld_pwm_pin_config
,
1
);
platform_device_register
(
&
raumfeld_pwm_backlight_device
);
}
else
platform_device_register
(
&
raumfeld_lt3593_device
);
ret
=
gpio_request
(
GPIO_TFT_VA_EN
,
"display VA enable"
);
if
(
ret
<
0
)
pr_warning
(
"Unable to request GPIO_TFT_VA_EN
\n
"
);
else
gpio_direction_output
(
GPIO_TFT_VA_EN
,
1
);
msleep
(
100
);
ret
=
gpio_request
(
GPIO_DISPLAY_ENABLE
,
"display enable"
);
if
(
ret
<
0
)
pr_warning
(
"Unable to request GPIO_DISPLAY_ENABLE
\n
"
);
else
gpio_direction_output
(
GPIO_DISPLAY_ENABLE
,
1
);
/* Hardware revision 2 has the backlight regulator controlled
* by an LT3593, earlier and later devices use PWM for that. */
if
((
system_rev
&
0xff
)
==
2
)
{
platform_device_register
(
&
raumfeld_lt3593_device
);
}
else
{
mfp_cfg_t
raumfeld_pwm_pin_config
=
GPIO17_PWM0_OUT
;
pxa3xx_mfp_config
(
&
raumfeld_pwm_pin_config
,
1
);
platform_device_register
(
&
raumfeld_pwm_backlight_device
);
}
pxa_set_fb_info
(
NULL
,
&
raumfeld_sharp_lcd_info
);
platform_device_register
(
&
pxa3xx_device_gcu
);
}
...
...
@@ -657,10 +659,10 @@ static struct lis3lv02d_platform_data lis3_pdata = {
#define SPI_AK4104 \
{ \
.modalias = "ak4104", \
.max_speed_hz = 10000, \
.bus_num = 0, \
.chip_select = 0, \
.modalias = "ak4104
-codec
", \
.max_speed_hz = 10000,
\
.bus_num = 0,
\
.chip_select = 0,
\
.controller_data = (void *) GPIO_SPDIF_CS, \
}
...
...
arch/arm/plat-pxa/gpio.c
浏览文件 @
24109afd
...
...
@@ -50,7 +50,7 @@ static inline void __iomem *gpio_chip_base(struct gpio_chip *c)
return
container_of
(
c
,
struct
pxa_gpio_chip
,
chip
)
->
regbase
;
}
static
inline
struct
pxa_gpio_chip
*
gpio_to_chip
(
unsigned
gpio
)
static
inline
struct
pxa_gpio_chip
*
gpio_to_
pxa
chip
(
unsigned
gpio
)
{
return
&
pxa_gpio_chips
[
gpio_to_bank
(
gpio
)];
}
...
...
@@ -161,7 +161,7 @@ static int pxa_gpio_irq_type(struct irq_data *d, unsigned int type)
int
gpio
=
irq_to_gpio
(
d
->
irq
);
unsigned
long
gpdr
,
mask
=
GPIO_bit
(
gpio
);
c
=
gpio_to_chip
(
gpio
);
c
=
gpio_to_
pxa
chip
(
gpio
);
if
(
type
==
IRQ_TYPE_PROBE
)
{
/* Don't mess with enabled GPIOs using preconfigured edges or
...
...
@@ -230,7 +230,7 @@ static void pxa_gpio_demux_handler(unsigned int irq, struct irq_desc *desc)
static
void
pxa_ack_muxed_gpio
(
struct
irq_data
*
d
)
{
int
gpio
=
irq_to_gpio
(
d
->
irq
);
struct
pxa_gpio_chip
*
c
=
gpio_to_chip
(
gpio
);
struct
pxa_gpio_chip
*
c
=
gpio_to_
pxa
chip
(
gpio
);
__raw_writel
(
GPIO_bit
(
gpio
),
c
->
regbase
+
GEDR_OFFSET
);
}
...
...
@@ -238,7 +238,7 @@ static void pxa_ack_muxed_gpio(struct irq_data *d)
static
void
pxa_mask_muxed_gpio
(
struct
irq_data
*
d
)
{
int
gpio
=
irq_to_gpio
(
d
->
irq
);
struct
pxa_gpio_chip
*
c
=
gpio_to_chip
(
gpio
);
struct
pxa_gpio_chip
*
c
=
gpio_to_
pxa
chip
(
gpio
);
uint32_t
grer
,
gfer
;
c
->
irq_mask
&=
~
GPIO_bit
(
gpio
);
...
...
@@ -252,7 +252,7 @@ static void pxa_mask_muxed_gpio(struct irq_data *d)
static
void
pxa_unmask_muxed_gpio
(
struct
irq_data
*
d
)
{
int
gpio
=
irq_to_gpio
(
d
->
irq
);
struct
pxa_gpio_chip
*
c
=
gpio_to_chip
(
gpio
);
struct
pxa_gpio_chip
*
c
=
gpio_to_
pxa
chip
(
gpio
);
c
->
irq_mask
|=
GPIO_bit
(
gpio
);
update_edge_detect
(
c
);
...
...
drivers/pcmcia/pxa2xx_vpac270.c
浏览文件 @
24109afd
...
...
@@ -76,10 +76,10 @@ static int vpac270_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
static
void
vpac270_pcmcia_hw_shutdown
(
struct
soc_pcmcia_socket
*
skt
)
{
if
(
skt
->
nr
==
0
)
gpio_
request
_array
(
vpac270_pcmcia_gpios
,
gpio_
free
_array
(
vpac270_pcmcia_gpios
,
ARRAY_SIZE
(
vpac270_pcmcia_gpios
));
else
gpio_
request
_array
(
vpac270_cf_gpios
,
gpio_
free
_array
(
vpac270_cf_gpios
,
ARRAY_SIZE
(
vpac270_cf_gpios
));
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录