projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[s3c24xx] Reverese mangle_pmu logic. Initalize regulator constrains to those
[openwrt.git]
/
target
/
linux
/
s3c24xx
/
files-2.6.30
/
arch
/
arm
/
mach-s3c2442
/
mach-gta02.c
diff --git
a/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/mach-gta02.c
b/target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/mach-gta02.c
index
b461802
..
64b6b0d
100644
(file)
--- a/
target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/mach-gta02.c
+++ b/
target/linux/s3c24xx/files-2.6.30/arch/arm/mach-s3c2442/mach-gta02.c
@@
-464,7
+464,7
@@
static void gta02_pmu_force_shutdown(struct pcf50633 *pcf)
static void gta02_udc_vbus_draw(unsigned int ma)
{
static void gta02_udc_vbus_draw(unsigned int ma)
{
-
if (!gta02_pcf)
+ if (!gta02_pcf)
return;
gta02_usb_vbus_draw = ma;
return;
gta02_usb_vbus_draw = ma;
@@
-624,8
+624,8
@@
struct pcf50633_platform_data gta02_pcf_pdata = {
[PCF50633_REGULATOR_LDO1] = {
.constraints = {
.name = "GSENSOR_3V3",
[PCF50633_REGULATOR_LDO1] = {
.constraints = {
.name = "GSENSOR_3V3",
- .min_uV =
1
300000,
- .max_uV =
1
300000,
+ .min_uV =
3
300000,
+ .max_uV =
3
300000,
.valid_modes_mask = REGULATOR_MODE_NORMAL,
.apply_uV = 1,
},
.valid_modes_mask = REGULATOR_MODE_NORMAL,
.apply_uV = 1,
},
@@
-664,8
+664,8
@@
struct pcf50633_platform_data gta02_pcf_pdata = {
[PCF50633_REGULATOR_LDO5] = {
.constraints = {
.name = "RF_3V",
[PCF50633_REGULATOR_LDO5] = {
.constraints = {
.name = "RF_3V",
- .min_uV =
15
00000,
- .max_uV =
15
00000,
+ .min_uV =
30
00000,
+ .max_uV =
30
00000,
.valid_modes_mask = REGULATOR_MODE_NORMAL,
.apply_uV = 1,
.state_mem = {
.valid_modes_mask = REGULATOR_MODE_NORMAL,
.apply_uV = 1,
.state_mem = {
@@
-678,10
+678,11
@@
struct pcf50633_platform_data gta02_pcf_pdata = {
[PCF50633_REGULATOR_LDO6] = {
.constraints = {
.name = "LCM_3V",
[PCF50633_REGULATOR_LDO6] = {
.constraints = {
.name = "LCM_3V",
- .min_uV = 0,
- .max_uV = 3
3
00000,
+ .min_uV =
300000
0,
+ .max_uV = 3
0
00000,
.always_on = 1,
.valid_modes_mask = REGULATOR_MODE_NORMAL,
.always_on = 1,
.valid_modes_mask = REGULATOR_MODE_NORMAL,
+ .apply_uV = 1,
},
.num_consumer_supplies = 0,
},
},
.num_consumer_supplies = 0,
},
@@
-715,28
+716,21
@@
static void mangle_pmu_pdata_by_system_rev(void)
/* FIXME: this is only in v1 due to wrong PMU variant */
reg_init_data[PCF50633_REGULATOR_DOWN2]
.constraints.state_mem.enabled = 1;
/* FIXME: this is only in v1 due to wrong PMU variant */
reg_init_data[PCF50633_REGULATOR_DOWN2]
.constraints.state_mem.enabled = 1;
- break;
- case GTA02v2_SYSTEM_REV:
- case GTA02v3_SYSTEM_REV:
- case GTA02v4_SYSTEM_REV:
- case GTA02v5_SYSTEM_REV:
- case GTA02v6_SYSTEM_REV:
- reg_init_data[PCF50633_REGULATOR_LDO1]
- .constraints.min_uV = 3300000;
+
reg_init_data[PCF50633_REGULATOR_LDO1]
reg_init_data[PCF50633_REGULATOR_LDO1]
- .constraints.min_uV =
3
300000;
+ .constraints.min_uV =
1
300000;
reg_init_data[PCF50633_REGULATOR_LDO1]
reg_init_data[PCF50633_REGULATOR_LDO1]
- .constraints.
state_mem.enabled =
0;
+ .constraints.
max_uV = 130000
0;
reg_init_data[PCF50633_REGULATOR_LDO5]
reg_init_data[PCF50633_REGULATOR_LDO5]
- .constraints.min_uV =
30
00000;
+ .constraints.min_uV =
15
00000;
reg_init_data[PCF50633_REGULATOR_LDO5]
reg_init_data[PCF50633_REGULATOR_LDO5]
- .constraints.max_uV =
30
00000;
+ .constraints.max_uV =
15
00000;
reg_init_data[PCF50633_REGULATOR_LDO6]
reg_init_data[PCF50633_REGULATOR_LDO6]
- .constraints.min_uV =
300000
0;
+ .constraints.min_uV = 0;
reg_init_data[PCF50633_REGULATOR_LDO6]
reg_init_data[PCF50633_REGULATOR_LDO6]
- .constraints.max_uV = 3
0
00000;
+ .constraints.max_uV = 3
3
00000;
reg_init_data[PCF50633_REGULATOR_LDO6]
.constraints.apply_uV = 1;
break;
reg_init_data[PCF50633_REGULATOR_LDO6]
.constraints.apply_uV = 1;
break;
@@
-1560,7
+1554,7
@@
static void gta02_pmu_regulator_registered(struct pcf50633 *pcf, int id)
pdev = >a02_glamo_dev;
break;
default:
pdev = >a02_glamo_dev;
break;
default:
- return;
+
return;
}
pdev->dev.parent = ®ulator->dev;
}
pdev->dev.parent = ®ulator->dev;
This page took
0.024461 seconds
and
4
git commands to generate.