summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/input/Makefile1
-rw-r--r--drivers/input/evbug.c4
-rw-r--r--drivers/input/touchscreen/mxc_ts.c24
-rw-r--r--drivers/mxc/pmic/core/Makefile3
-rw-r--r--drivers/mxc/pmic/core/mc13892.c1
-rw-r--r--drivers/mxc/pmic/mc13892/Makefile1
-rw-r--r--drivers/mxc/pmic/mc13892/pmic_adc.c87
7 files changed, 105 insertions, 16 deletions
diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index 98c4f9a77876..d69ccbd3aea5 100644
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -1,3 +1,4 @@
+CFLAGS_evbug.o := -DDEBUG
#
# Makefile for the input core drivers.
#
diff --git a/drivers/input/evbug.c b/drivers/input/evbug.c
index 0353601ac3b5..bcd176eedb47 100644
--- a/drivers/input/evbug.c
+++ b/drivers/input/evbug.c
@@ -64,11 +64,13 @@ static int evbug_connect(struct input_handler *handler, struct input_dev *dev,
if (error)
goto err_unregister_handle;
+/*
+// Messing up debugging by interfering with init scripts , so I'm temporarily removing this.
printk(KERN_DEBUG "evbug.c: Connected device: %s (%s at %s)\n",
dev->dev.bus_id,
dev->name ?: "unknown",
dev->phys ?: "unknown");
-
+*/
return 0;
err_unregister_handle:
diff --git a/drivers/input/touchscreen/mxc_ts.c b/drivers/input/touchscreen/mxc_ts.c
index b354d81c5465..2b57a26804b6 100644
--- a/drivers/input/touchscreen/mxc_ts.c
+++ b/drivers/input/touchscreen/mxc_ts.c
@@ -43,6 +43,7 @@ static u32 input_ts_installed;
static int ts_thread(void *arg)
{
+ int j1=0, j2=0, j3=0, j4=0;
t_touch_screen ts_sample;
s32 wait = 0;
@@ -50,19 +51,36 @@ static int ts_thread(void *arg)
while (input_ts_installed) {
try_to_freeze();
memset(&ts_sample, 0, sizeof(t_touch_screen));
- if (0 != pmic_adc_get_touch_sample(&ts_sample, !wait))
- continue;
- if (!(ts_sample.contact_resistance || wait))
+ j3 = jiffies;
+ if (0 != pmic_adc_get_touch_sample(&ts_sample, !wait)){
+ printk("ttd: pmic_adc_get_touch_sample() RETURNS NONZERO\n");
continue;
+ }
+ j4 = jiffies;
+// printk("ts_thread: pmic_adc_get_touch_sample() took %d jiffies\n", j4 - j3);
+ if (!(ts_sample.contact_resistance || wait)){
+ printk("ttd: continue: res=%d, wait=%d\n", ts_sample.contact_resistance, wait);
+ continue;
+ }
+
+ printk("ttd: ts_thread sending event: abs x=%d, abx y = %d, resistance = %d\n",
+ ts_sample.x_position,
+ ts_sample.y_position,
+ ts_sample.contact_resistance
+ );
+ j1 = jiffies;
input_report_abs(mxc_inputdev, ABS_X, ts_sample.x_position);
input_report_abs(mxc_inputdev, ABS_Y, ts_sample.y_position);
input_report_abs(mxc_inputdev, ABS_PRESSURE,
ts_sample.contact_resistance);
input_sync(mxc_inputdev);
+ j2 = jiffies;
wait = ts_sample.contact_resistance;
+ j1 = jiffies;
msleep(20);
+ j2 = jiffies;
}
return 0;
diff --git a/drivers/mxc/pmic/core/Makefile b/drivers/mxc/pmic/core/Makefile
index e746702bc569..44eb70e5973a 100644
--- a/drivers/mxc/pmic/core/Makefile
+++ b/drivers/mxc/pmic/core/Makefile
@@ -1,3 +1,6 @@
+CFLAGS_mc13892.o := -DDEBUG
+
+
#
# Makefile for the PMIC core drivers.
#
diff --git a/drivers/mxc/pmic/core/mc13892.c b/drivers/mxc/pmic/core/mc13892.c
index 34ceec59221e..4b900d578b51 100644
--- a/drivers/mxc/pmic/core/mc13892.c
+++ b/drivers/mxc/pmic/core/mc13892.c
@@ -110,7 +110,6 @@ int pmic_read(int reg_num, unsigned int *reg_val)
return PMIC_ERROR;
frame |= reg_num << MXC_PMIC_REG_NUM_SHIFT;
-
ret = spi_rw(pmic_drv_data.spi, (u8 *) &frame, 1);
*reg_val = frame & MXC_PMIC_FRAME_MASK;
diff --git a/drivers/mxc/pmic/mc13892/Makefile b/drivers/mxc/pmic/mc13892/Makefile
index 0ed2b7eb4c11..b23e2087c95e 100644
--- a/drivers/mxc/pmic/mc13892/Makefile
+++ b/drivers/mxc/pmic/mc13892/Makefile
@@ -2,6 +2,7 @@
# Makefile for the mc13783 pmic drivers.
#
+CFLAGS_pmic_adc.o := -DDEBUG
obj-$(CONFIG_MXC_MC13892_ADC) += pmic_adc.o
#obj-$(CONFIG_MXC_MC13892_RTC) += pmic_rtc.o
obj-$(CONFIG_MXC_MC13892_LIGHT) += pmic_light.o
diff --git a/drivers/mxc/pmic/mc13892/pmic_adc.c b/drivers/mxc/pmic/mc13892/pmic_adc.c
index cec4d6045974..e987ef98ddd6 100644
--- a/drivers/mxc/pmic/mc13892/pmic_adc.c
+++ b/drivers/mxc/pmic/mc13892/pmic_adc.c
@@ -325,8 +325,9 @@ int pmic_adc_init(void)
{
unsigned int reg_value = 0, i = 0;
- if (suspend_flag == 1)
+ if (suspend_flag == 1){
return -EBUSY;
+ }
for (i = 0; i < ADC_NB_AVAILABLE; i++)
adc_dev[i] = ADC_FREE;
@@ -399,17 +400,23 @@ int mc13892_adc_init_param(t_adc_param * adc_param)
PMIC_STATUS mc13892_adc_convert(t_adc_param * adc_param)
{
+ int j1=0, j2=0, j3=0;
+ int jj1=0, jj2=0;
+
bool use_bis = false;
unsigned int adc_0_reg = 0, adc_1_reg = 0, reg_1 = 0, result_reg =
0, i = 0;
unsigned int result = 0, temp = 0;
pmic_version_t mc13892_ver;
pr_debug("mc13892 ADC - mc13892_adc_convert ....\n");
- if (suspend_flag == 1)
+ if (suspend_flag == 1){
+ printk("ttd: mc13892_adc_convert returns -EBUSY\n");
return -EBUSY;
+ }
if (adc_param->wait_tsi) {
/* configure adc to wait tsi interrupt */
+// printk("ttd: INIT_COMPLETION(adc_tsi)\n");
INIT_COMPLETION(adc_tsi);
/*for ts don't use bis */
@@ -425,9 +432,14 @@ PMIC_STATUS mc13892_adc_convert(t_adc_param * adc_param)
wait_ts = true;
wait_for_completion_interruptible(&adc_tsi);
wait_ts = false;
+ } else {
+// printk("ttd: mc13892_adc_convert(): is not in wait mode\n");
}
+
down(&convert_mutex);
+
use_bis = mc13892_adc_request(adc_param->read_ts);
+
if (use_bis < 0) {
pr_debug("process has received a signal and got interrupted\n");
return -EINTR;
@@ -465,6 +477,8 @@ PMIC_STATUS mc13892_adc_convert(t_adc_param * adc_param)
} else {
adc_0_reg = 0x002400 | (ADC_BIS * use_bis) | ADC_INC;
}
+j1 = jiffies;
+
pr_debug("Write Reg %i = %x\n", REG_ADC0, adc_0_reg);
/*Change has been made here */
CHECK_ERROR(pmic_write_reg(REG_ADC0, adc_0_reg,
@@ -487,6 +501,9 @@ PMIC_STATUS mc13892_adc_convert(t_adc_param * adc_param)
}
reg_1 = adc_1_reg;
if (use_bis == 0) {
+ int jj1 = 0, jj2 = 0;
+
+ jj1 = jiffies;
data_ready_adc_1 = false;
adc_1_reg |= ASC_ADC;
data_ready_adc_1 = true;
@@ -499,8 +516,11 @@ PMIC_STATUS mc13892_adc_convert(t_adc_param * adc_param)
ADC_DELAY_MASK | ASC_ADC | ADC_BIS));
pr_debug("wait adc done \n");
wait_for_completion_interruptible(&adcdone_it);
+ jj2 = jiffies;
+// printk("ttd: use_bis == 0, jiffies=%d\n", jj2-jj1);
data_ready_adc_1 = false;
} else {
+// printk("ttd: USE_BIS != 0\n");
data_ready_adc_2 = false;
adc_1_reg |= ASC_ADC;
data_ready_adc_2 = true;
@@ -512,6 +532,9 @@ PMIC_STATUS mc13892_adc_convert(t_adc_param * adc_param)
wait_for_completion_interruptible(&adcbisdone_it);
data_ready_adc_2 = false;
}
+ j2 = jiffies;
+// printk("ttd: partial adc_convert: %d j\n", j2 - j1);
+
/* read result and store in adc_param */
result = 0;
if (use_bis == 0)
@@ -519,17 +542,28 @@ PMIC_STATUS mc13892_adc_convert(t_adc_param * adc_param)
else
result_reg = REG_ADC4;
+ j2 = jiffies;
CHECK_ERROR(pmic_write_reg(REG_ADC1, 4 << ADC_CH_1_POS,
ADC_CH_0_MASK | ADC_CH_1_MASK));
+ j3 = jiffies;
+// printk(" ttd: then %d jiffies\n", j3-j2);
+
+ jj1 = jiffies;
for (i = 0; i <= 3; i++) {
+ j2 = jiffies;
CHECK_ERROR(pmic_read_reg(result_reg, &result, PMIC_ALL_BITS));
+ j3 = jiffies;
+// printk(" ttd: then again %d jiffies\n", j3-j2);
+
adc_param->value[i] = ((result & ADD1_RESULT_MASK) >> 2);
adc_param->value[i + 4] = ((result & ADD2_RESULT_MASK) >> 14);
pr_debug("value[%d] = %d, value[%d] = %d\n",
i, adc_param->value[i],
i + 4, adc_param->value[i + 4]);
}
+ jj2 = jiffies;
+// printk("ttd: double-check: %d jiffies\n", jj2 - jj1);
if (adc_param->read_ts) {
adc_param->ts_value.x_position = adc_param->value[0];
adc_param->ts_value.x_position1 = adc_param->value[0];
@@ -549,7 +583,6 @@ PMIC_STATUS mc13892_adc_convert(t_adc_param * adc_param)
} */
mc13892_adc_release(use_bis);
up(&convert_mutex);
-
return PMIC_SUCCESS;
}
@@ -636,8 +669,10 @@ PMIC_STATUS pmic_adc_convert_8x(t_channel channel, unsigned short *result)
PMIC_STATUS pmic_adc_set_touch_mode(t_touch_mode touch_mode)
{
- if (suspend_flag == 1)
+ if (suspend_flag == 1){
+ printk("pmic_adc: busy!!\n");
return -EBUSY;
+ }
CHECK_ERROR(pmic_write_reg(REG_ADC0,
BITFVAL(MC13892_ADC0_TS_M, touch_mode),
@@ -648,42 +683,69 @@ PMIC_STATUS pmic_adc_set_touch_mode(t_touch_mode touch_mode)
PMIC_STATUS pmic_adc_get_touch_mode(t_touch_mode * touch_mode)
{
unsigned int value;
- if (suspend_flag == 1)
+
+ if (suspend_flag == 1){
+ printk("pmic_adc: busy in get!!\n");
return -EBUSY;
+ }
CHECK_ERROR(pmic_read_reg(REG_ADC0, &value, PMIC_ALL_BITS));
*touch_mode = BITFEXT(value, MC13892_ADC0_TS_M);
+ printk("pmic_adc_get_touch_mode(): 0x%x\n", *touch_mode);
return PMIC_SUCCESS;
}
PMIC_STATUS pmic_adc_get_touch_sample(t_touch_screen *touch_sample, int wait)
{
- if (mc13892_adc_read_ts(touch_sample, wait) != 0)
+ int j1 = 0, j2 = 0, j3 = 0, j4 = 0;
+
+ j1 = jiffies;
+ if (mc13892_adc_read_ts(touch_sample, wait) != 0){
+ printk("ttd: pmic_adc_get_touch_sample PMIC_ERROR 1!!\n");
return PMIC_ERROR;
- if (0 == pmic_adc_filter(touch_sample))
+ }
+ j2 = jiffies;
+ if (0 == pmic_adc_filter(touch_sample)){
+ j3 = jiffies;
+ printk("pmic_adc_get_touch_sample(): read(w=%d): %d jf, filter: %d jf\n", wait, j2 - j1, j3 - j2);
return PMIC_SUCCESS;
- else
+ }
+ else {
+ printk("ttd: pmic_adc_get_touch_sample PMIC_ERROR 2!!\n");
return PMIC_ERROR;
+ }
}
PMIC_STATUS mc13892_adc_read_ts(t_touch_screen *ts_value, int wait_tsi)
{
+ int j1=0, j2=0, j3=0, j4=0;
+
t_adc_param param;
pr_debug("mc13892_adc : mc13892_adc_read_ts\n");
- if (suspend_flag == 1)
+ if (suspend_flag == 1){
+ printk("ttd: mc13892_adc_read_ts() returns -EBUSY\n");
return -EBUSY;
+ }
if (wait_ts) {
+ printk("ttd: mc13892_adc_read_ts() returns PMIC_ERROR\n");
pr_debug("mc13892_adc : error TS busy \n");
return PMIC_ERROR;
}
+ j1 = jiffies;
mc13892_adc_init_param(&param);
+ j2 = jiffies;
param.wait_tsi = wait_tsi;
param.read_ts = true;
- if (mc13892_adc_convert(&param) != 0)
+ j3 = jiffies;
+ if (mc13892_adc_convert(&param) != 0){
+ printk("ttd: mc13892_adc_read_ts() returns PMIC_ERROR after adc_convert\n");
return PMIC_ERROR;
+ }
+ j4 = jiffies;
+// printk(" mc13892_adc_read_ts(): init= %d j, convert = %d j\n", j2-j1, j4-j3);
/* check if x-y is ok */
if (param.ts_value.contact_resistance < 1000) {
ts_value->x_position = param.ts_value.x_position;
@@ -698,6 +760,7 @@ PMIC_STATUS mc13892_adc_read_ts(t_touch_screen *ts_value, int wait_tsi)
param.ts_value.contact_resistance + 1;
} else {
+ printk("ttd: bad contact resistance value: %d\n", param.ts_value.contact_resistance);
ts_value->x_position = 0;
ts_value->y_position = 0;
ts_value->contact_resistance = 0;
@@ -748,7 +811,8 @@ int mc13892_adc_release(int adc_index)
return -1;
}
-#ifdef DEBUG
+//#ifdef DEBUG
+#if 1
static t_adc_param adc_param_db;
static ssize_t adc_info(struct device *dev, struct device_attribute *attr,
@@ -964,6 +1028,7 @@ static struct platform_driver pmic_adc_driver_ldm = {
.remove = pmic_adc_module_remove,
};
+
static int __init pmic_adc_module_init(void)
{
pr_debug("PMIC ADC driver loading...\n");
generated by cgit v1.2.3 (git 2.0.4) at 2024-11-11 18:40:38 +0000