Skip to contentSkip to conversation

newer version of HTC Dream support

DISCUSSION Pavel Machek 4 participants 27 messages Aug 24, 2009 – Sep 26, 2009 1 message not in the archive

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

Hi!

With 2.6.31 being closer... is there a git tree or set of patches to make it boot on HTC Dream?

Quite a lot of hw should be supported in linux-next, and it would be nice to get arch-specific code working with linux-next and eventually merged...

Pavel

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#1 lore raw

Hi!

Quoted 6 lines

With 2.6.31 being closer... is there a git tree or set of patches to make it boot on HTC Dream?

Quite a lot of hw should be supported in linux-next, and it would be nice to get arch-specific code working with linux-next and eventually merged...

Any news here? If you need some more kernel hackers I guess I'm looking for a job :-).

Pavel

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#2 lore raw
Quoted 11 lines · On Tue, 1 Sep 2009 15:21:59 +0200 Pavel Machek wrote:

Hi!

Quoted 6 lines

With 2.6.31 being closer... is there a git tree or set of patches to make it boot on HTC Dream?

Quite a lot of hw should be supported in linux-next, and it would be nice to get arch-specific code working with linux-next and eventually merged...

Any news here? If you need some more kernel hackers I guess I'm looking for a job :-).

well, mmotm and linux-next dream builds fail like this:

CC drivers/staging/dream/gpio_axis.o
drivers/staging/dream/gpio_axis.c:18:30: error: linux/gpio_event.h: No such file or directory drivers/staging/dream/gpio_axis.c: In function 'gpio_event_update_axis':
drivers/staging/dream/gpio_axis.c:68: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:69: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:70: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:71: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:71: error: 'GPIOEAF_PRINT_RAW' undeclared (first use in this function) drivers/staging/dream/gpio_axis.c:71: error: (Each undeclared identifier is reported only once drivers/staging/dream/gpio_axis.c:71: error: for each function it appears in.) drivers/staging/dream/gpio_axis.c:71: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:71: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:72: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:72: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:75: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:75: error: 'EV_REL' undeclared (first use in this function) drivers/staging/dream/gpio_axis.c:75: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:75: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:76: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:77: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:78: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:78: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:78: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:79: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:80: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:80: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:80: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:81: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:81: error: 'GPIOEAF_PRINT_EVENT' undeclared (first use in this function) drivers/staging/dream/gpio_axis.c:81: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:81: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:82: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:82: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:87: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:87: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:87: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:88: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:88: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:90: error: implicit declaration of function 'input_report_rel' drivers/staging/dream/gpio_axis.c:90: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:92: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:92: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:92: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:93: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:93: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:95: error: implicit declaration of function 'input_event' drivers/staging/dream/gpio_axis.c:95: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:95: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:97: error: implicit declaration of function 'input_sync' drivers/staging/dream/gpio_axis.c: At top level:
drivers/staging/dream/gpio_axis.c:110: warning: 'struct gpio_event_info' declared inside parameter list drivers/staging/dream/gpio_axis.c:110: warning: its scope is only this definition or declaration, which is probably not what you want drivers/staging/dream/gpio_axis.c: In function 'gpio_event_axis_func':
drivers/staging/dream/gpio_axis.c:118: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:118: warning: type defaults to 'int' in declaration of '__mptr' drivers/staging/dream/gpio_axis.c:118: warning: initialization from incompatible pointer type drivers/staging/dream/gpio_axis.c:118: error: invalid use of undefined type 'struct gpio_event_axis_info' drivers/staging/dream/gpio_axis.c:119: error: 'GPIO_EVENT_FUNC_SUSPEND' undeclared (first use in this function) drivers/staging/dream/gpio_axis.c:120: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:121: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:124: error: 'GPIO_EVENT_FUNC_RESUME' undeclared (first use in this function) drivers/staging/dream/gpio_axis.c:125: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:126: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:130: error: 'GPIO_EVENT_FUNC_INIT' undeclared (first use in this function) drivers/staging/dream/gpio_axis.c:139: error: implicit declaration of function 'input_set_capability' drivers/staging/dream/gpio_axis.c:139: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:139: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:140: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:140: error: 'EV_ABS' undeclared (first use in this function) drivers/staging/dream/gpio_axis.c:140: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:140: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:141: error: implicit declaration of function 'input_set_abs_params' drivers/staging/dream/gpio_axis.c:141: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:142: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:144: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:145: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:148: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:151: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:167: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:168: error: dereferencing pointer to incomplete type drivers/staging/dream/gpio_axis.c:172: error: dereferencing pointer to incomplete type
make[4]: *** [drivers/staging/dream/gpio_axis.o] Error 1
make[3]: *** [drivers/staging/dream] Error 2

config attached.

---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/

#3 lore raw

Hi!

Quoted 11 lines
Quoted 9 lines
Quoted 6 lines

With 2.6.31 being closer... is there a git tree or set of patches to make it boot on HTC Dream?

Quite a lot of hw should be supported in linux-next, and it would be nice to get arch-specific code working with linux-next and eventually merged...

Any news here? If you need some more kernel hackers I guess I'm looking for a job :-).

well, mmotm and linux-next dream builds fail like this:

Ok, is the goal here to get it to compile, or get it to boot?

I have recent tree that compiles, somewhere, but getting it to boot is 'slightly more interesting'.
Pavel

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#4 lore raw
Quoted 9 lines · On Fri, 11 Sep 2009 09:16:16 +0200 Pavel Machek wrote:

Hi!

Quoted 7 lines
Quoted 7 lines
Quoted 6 lines

With 2.6.31 being closer... is there a git tree or set of patches to make it boot on HTC Dream?

Quite a lot of hw should be supported in linux-next, and it would be nice to get arch-specific code working with linux-next and eventually merged...

Quoted 6 lines
Quoted 4 lines
Quoted 2 lines

Any news here? If you need some more kernel hackers I guess I'm looking for a job :-).

well, mmotm and linux-next dream builds fail like this:

Ok, is the goal here to get it to compile, or get it to boot?

Can you do b. (boot) without a. (compile)?

Quoted 2 lines

I have recent tree that compiles, somewhere, but getting it to boot is 'slightly more interesting'.

Sure, booting is more interesting. Especially if one has the device.

---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/

#5 lore raw

Hi!

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 6 lines

With 2.6.31 being closer... is there a git tree or set of patches to make it boot on HTC Dream?

Quite a lot of hw should be supported in linux-next, and it would be nice to get arch-specific code working with linux-next and eventually merged...

Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines

Any news here? If you need some more kernel hackers I guess I'm looking for a job :-).

well, mmotm and linux-next dream builds fail like this:

Ok, is the goal here to get it to compile, or get it to boot?

Can you do b. (boot) without a. (compile)?

Well, hardly, but I can do a) without b), and it is very much easier. So... which is it?

Quoted 4 lines
Quoted 2 lines

I have recent tree that compiles, somewhere, but getting it to boot is 'slightly more interesting'.

Sure, booting is more interesting. Especially if one has the device.

Do you have one?

Pavel

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#6 lore raw
Quoted 12 lines · On Fri, 11 Sep 2009 18:13:35 +0200 Pavel Machek wrote:

Hi!

Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 9 lines
Quoted 6 lines

With 2.6.31 being closer... is there a git tree or set of patches to make it boot on HTC Dream?

Quite a lot of hw should be supported in linux-next, and it would be nice to get arch-specific code working with linux-next and eventually merged...

Any news here? If you need some more kernel hackers I guess I'm looking for a job :-).

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
Quoted 1 line

well, mmotm and linux-next dream builds fail like this:

Ok, is the goal here to get it to compile, or get it to boot?

Can you do b. (boot) without a. (compile)?

Well, hardly, but I can do a) without b), and it is very much easier. So... which is it?

I'm only targeting compile/build.

Quoted 6 lines
Quoted 4 lines
Quoted 2 lines

I have recent tree that compiles, somewhere, but getting it to boot is 'slightly more interesting'.

Sure, booting is more interesting. Especially if one has the device.

Do you have one?

Nope. Hence compile/build.

---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/

#7 lore raw
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

Can you do b. (boot) without a. (compile)?

Well, hardly, but I can do a) without b), and it is very much easier. So... which is it?

I'm only targeting compile/build.

Ok, I guess I should appologize for testing patch in wrong configuration. This should fix it:

---

Fix compilation of gpio_* input drivers on -next kernel. Adds needed headers and removes unprotected wakelock/earlysuspend dependencies.

drivers/staging/dream/gpio_event.c +1 -2
index 8b64c1e..e60e2c0 100644
@@ -13,7 +13,7 @@
  *
  */
 
-#include <linux/earlysuspend.h>
+
 #include <linux/module.h>
 #include <linux/input.h>
 #include <linux/gpio_event.h>
@@ -23,7 +23,6 @@
 struct gpio_event {
 	struct input_dev *input_dev;
 	const struct gpio_event_platform_data *info;
-	struct early_suspend early_suspend;
 	void *state[0];
 };
 
drivers/staging/dream/gpio_input.c +0 -7
index 7e307f2..0638ec4 100644
@@ -19,7 +19,6 @@
 #include <linux/hrtimer.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>
-#include <linux/wakelock.h>
 
 enum {
 	DEBOUNCE_UNSTABLE     = BIT(0),	/* Got irq, while debouncing */
@@ -44,7 +43,6 @@ struct gpio_input_state {
 	int use_irq;
 	int debounce_count;
 	spinlock_t irq_lock;
-	struct wake_lock wake_lock;
 	struct gpio_key_state key_state[0];
 };
 
@@ -143,8 +141,6 @@ static enum hrtimer_restart gpio_event_input_timer_func(struct hrtimer *timer)
 		hrtimer_start(timer, ds->info->debounce_time, HRTIMER_MODE_REL);
 	else if (!ds->use_irq)
 		hrtimer_start(timer, ds->info->poll_time, HRTIMER_MODE_REL);
-	else
-		wake_unlock(&ds->wake_lock);
 
 	spin_unlock_irqrestore(&ds->irq_lock, irqflags);
 
@@ -170,7 +166,6 @@ static irqreturn_t gpio_event_input_irq_handler(int irq, void *dev_id)
 		if (ks->debounce & DEBOUNCE_WAIT_IRQ) {
 			ks->debounce = DEBOUNCE_UNKNOWN;
 			if (ds->debounce_count++ == 0) {
-				wake_lock(&ds->wake_lock);
 				hrtimer_start(
 					&ds->timer, ds->info->debounce_time,
 					HRTIMER_MODE_REL);
@@ -277,7 +272,6 @@ int gpio_event_input_func(struct input_dev *input_dev,
 		ds->debounce_count = di->keymap_size;
 		ds->input_dev = input_dev;
 		ds->info = di;
-		wake_lock_init(&ds->wake_lock, WAKE_LOCK_SUSPEND, "gpio_input");
 		spin_lock_init(&ds->irq_lock);
 
 		for (i = 0; i < di->keymap_size; i++) {
@@ -336,7 +330,6 @@ err_gpio_configure_failed:
 err_gpio_request_failed:
 		;
 	}
-	wake_lock_destroy(&ds->wake_lock);
 	kfree(ds);
 err_ds_alloc_failed:
 	return ret;
drivers/staging/dream/gpio_matrix.c +0 -8
index c1f4765..796de4f 100644
@@ -18,13 +18,11 @@
 #include <linux/gpio_event.h>
 #include <linux/hrtimer.h>
 #include <linux/interrupt.h>
-#include <linux/wakelock.h>
 
 struct gpio_kp {
 	struct input_dev *input_dev;
 	struct gpio_event_matrix_info *keypad_info;
 	struct hrtimer timer;
-	struct wake_lock wake_lock;
 	int current_output;
 	unsigned int use_irq:1;
 	unsigned int key_state_changed:1;
@@ -199,7 +197,6 @@ static enum hrtimer_restart gpio_keypad_timer_func(struct hrtimer *timer)
 	}
 	for (in = 0; in < mi->ninputs; in++)
 		enable_irq(gpio_to_irq(mi->input_gpios[in]));
-	wake_unlock(&kp->wake_lock);
 	return HRTIMER_NORESTART;
 }
 
@@ -222,7 +219,6 @@ static irqreturn_t gpio_keypad_irq_handler(int irq_in, void *dev_id)
 		else
 			gpio_direction_input(mi->output_gpios[i]);
 	}
-	wake_lock(&kp->wake_lock);
 	hrtimer_start(&kp->timer, ktime_set(0, 0), HRTIMER_MODE_REL);
 	return IRQ_HANDLED;
 }
@@ -363,7 +359,6 @@ int gpio_event_matrix_func(struct input_dev *input_dev,
 
 		hrtimer_init(&kp->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
 		kp->timer.function = gpio_keypad_timer_func;
-		wake_lock_init(&kp->wake_lock, WAKE_LOCK_SUSPEND, "gpio_kp");
 		err = gpio_keypad_request_irqs(kp);
 		kp->use_irq = err == 0;
 
@@ -371,8 +366,6 @@ int gpio_event_matrix_func(struct input_dev *input_dev,
 			"in %s mode\n", input_dev->name,
 			kp->use_irq ? "interrupt" : "polling");
 
-		if (kp->use_irq)
-			wake_lock(&kp->wake_lock);
 		hrtimer_start(&kp->timer, ktime_set(0, 0), HRTIMER_MODE_REL);
 
 		return 0;
@@ -386,7 +379,6 @@ int gpio_event_matrix_func(struct input_dev *input_dev,
 			free_irq(gpio_to_irq(mi->input_gpios[i]), kp);
 
 	hrtimer_cancel(&kp->timer);
-	wake_lock_destroy(&kp->wake_lock);
 	for (i = mi->noutputs - 1; i >= 0; i--) {
 err_gpio_direction_input_failed:
 		gpio_free(mi->input_gpios[i]);
include/linux/gpio_event.h new file +154 -0

154 lines not on this page · raw message

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#8 lore raw
Quoted 11 lines · On Fri, 11 Sep 2009 23:27:52 +0200 Pavel Machek wrote:
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

Can you do b. (boot) without a. (compile)?

Well, hardly, but I can do a) without b), and it is very much easier. So... which is it?

I'm only targeting compile/build.

Ok, I guess I should appologize for testing patch in wrong configuration. This should fix it:

Quoted 6 lines

---

Fix compilation of gpio_* input drivers on -next kernel. Adds needed headers and removes unprotected wakelock/earlysuspend dependencies.

Still doesn't build for me, but if it builds for you, that's great. (could be a tool chain problem on my side)

(I had to enable CONFIG_ANDROID [due to staging/Makefile:
obj-$(CONFIG_ANDROID) += dream/
] to get dream code to try to build,
but I think that this has already been mentioned.)

Where is these header files?

(from linux-next-20090911:)

drivers/staging/dream/camera/msm_camera.c:21:32: linux/android_pmem.h: No such file or directory drivers/staging/dream/camera/msm_vfe7x.c:8:32: linux/android_pmem.h: No such file or directory drivers/staging/dream/camera/msm_vfe7x.c:9:27: mach/msm_adsp.h: No such file or directory drivers/staging/dream/camera/msm_camera.c:23:30: media/msm_camera.h: No such file or directory drivers/staging/dream/camera/msm_vfe7x.h:6:30: media/msm_camera.h: No such file or directory

---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/

#9 lore raw

Hi!

Quoted 7 lines
Quoted 4 lines

Fix compilation of gpio_* input drivers on -next kernel. Adds needed headers and removes unprotected wakelock/earlysuspend dependencies.

Still doesn't build for me, but if it builds for you, that's great. (could be a tool chain problem on my side)

No, it does not look like toolchain problem :-(. I had parts disabled in Kconfig. This should make it _compile_ (but not link); somehow MSM_ADSP is neccessary for camera to link and I can't see how to enable it.

Thanks for the patience.
Pavel

---

Add pieces neccessary for compilation of msm_camera.

arch/arm/mach-msm/include/mach/board.h +36 -0
index 264d62e..271256c 100644
@@ -35,4 +35,40 @@ void __init msm_init_irq(void);
 void __init msm_init_gpio(void);
 void __init msm_clock_init(void);
 
+struct msm_camera_io_ext {
+	uint32_t mdcphy;
+	uint32_t mdcsz;
+	uint32_t appphy;
+	uint32_t appsz;
+};
+
+struct msm_camera_device_platform_data {
+	void (*camera_gpio_on) (void);
+	void (*camera_gpio_off)(void);
+	struct msm_camera_io_ext ioext;
+};
+
+#ifdef CONFIG_SENSORS_MT9T013
+struct msm_camera_legacy_device_platform_data {
+	int sensor_reset;
+	int sensor_pwd;
+	int vcm_pwd;
+	void (*config_gpio_on) (void);
+	void (*config_gpio_off)(void);
+};
+#endif
+
+#define MSM_CAMERA_FLASH_NONE 0
+#define MSM_CAMERA_FLASH_LED  1
+
+struct msm_camera_sensor_info {
+	const char *sensor_name;
+	int sensor_reset;
+	int sensor_pwd;
+	int vcm_pwd;
+	int mclk;
+	int flash_type;
+	struct msm_camera_device_platform_data *pdata;
+};
+
 #endif
arch/arm/mach-msm/include/mach/camera.h new file +279 -0

279 lines not on this page · raw message

arch/arm/mach-msm/include/mach/gpio.h new file +47 -0

47 lines not on this page · raw message

arch/arm/mach-msm/include/mach/msm_adsp.h new file +112 -0

112 lines not on this page · raw message

drivers/staging/dream/camera/msm_camera.c +0 -6
index 8816599..423fa7e 100644
@@ -1597,7 +1597,6 @@ static int __msm_release(struct msm_sync *sync)
 		MSM_DRAIN_QUEUE(sync, pict_frame_q);
 
 		sync->sctrl.s_release();
-		wake_unlock(&sync->wake_lock);
 
 		sync->apps_id = NULL;
 		CDBG("msm_release completed!\n");
@@ -1806,7 +1805,6 @@ static int __msm_open(struct msm_sync *sync, const char *const apps_id)
 	sync->apps_id = apps_id;
 
 	if (!sync->opencnt) {
-		wake_lock(&sync->wake_lock);
 
 		msm_camvfe_fn_init(&sync->vfefn, sync);
 		if (sync->vfefn.vfe_init) {
@@ -2044,8 +2042,6 @@ static int msm_sync_init(struct msm_sync *sync,
 	INIT_LIST_HEAD(&sync->pict_frame_q);
 	init_waitqueue_head(&sync->pict_frame_wait);
 
-	wake_lock_init(&sync->wake_lock, WAKE_LOCK_IDLE, "msm_camera");
-
 	rc = msm_camio_probe_on(pdev);
 	if (rc < 0)
 		return rc;
@@ -2058,7 +2054,6 @@ static int msm_sync_init(struct msm_sync *sync,
 	if (rc < 0) {
 		pr_err("msm_camera: failed to initialize %s\n",
 			sync->sdata->sensor_name);
-		wake_lock_destroy(&sync->wake_lock);
 		return rc;
 	}
 
@@ -2070,7 +2065,6 @@ static int msm_sync_init(struct msm_sync *sync,
 
 static int msm_sync_destroy(struct msm_sync *sync)
 {
-	wake_lock_destroy(&sync->wake_lock);
 	return 0;
 }
 
include/linux/android_pmem.h new file +80 -0

80 lines not on this page · raw message

include/linux/msm_adsp.h new file +84 -0

84 lines not on this page · raw message

include/media/msm_camera.h new file +388 -0

388 lines not on this page · raw message

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#10 lore raw
Quoted 15 lines · On Sun, 13 Sep 2009 10:37:19 +0200 Pavel Machek wrote:

Hi!

Quoted 7 lines
Quoted 4 lines

Fix compilation of gpio_* input drivers on -next kernel. Adds needed headers and removes unprotected wakelock/earlysuspend dependencies.

Still doesn't build for me, but if it builds for you, that's great. (could be a tool chain problem on my side)

No, it does not look like toolchain problem :-(. I had parts disabled in Kconfig. This should make it _compile_ (but not link); somehow MSM_ADSP is neccessary for camera to link and I can't see how to enable it.

Quoted 6 lines

Thanks for the patience.
Pavel

---

Add pieces neccessary for compilation of msm_camera.

drivers/staging/dream/camera/msm_camera.c:122: undefined reference to get_pmem_file' drivers/staging/dream/camera/msm_camera.c:305: undefined reference to put_pmem_file' drivers/staging/dream/camera/msm_vfe7x.c:173: undefined reference to msm_adsp_enable' drivers/staging/dream/camera/msm_vfe7x.c:186: undefined reference to msm_adsp_disable' drivers/staging/dream/camera/msm_vfe7x.c:195: undefined reference to msm_adsp_write' drivers/staging/dream/camera/msm_vfe7x.c:225: undefined reference to msm_adsp_put' drivers/staging/dream/camera/msm_vfe7x.c:264: undefined reference to `msm_adsp_get'

hint: CONFIG_MSM_ADSP is not enabled. I don't see a way to enable it.

---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/

#11 lore raw

Hi!

Quoted 2 lines
Quoted 2 lines

No, it does not look like toolchain problem :-(. I had parts disabled in Kconfig. This should make it _compile_ (but not link); somehow

                                    ~~~~~~~~~~~~~~~~~~~~~~~~
Quoted 6 lines

drivers/staging/dream/camera/msm_vfe7x.c:195: undefined reference to msm_adsp_write' drivers/staging/dream/camera/msm_vfe7x.c:225: undefined reference to msm_adsp_put' drivers/staging/dream/camera/msm_vfe7x.c:264: undefined reference to `msm_adsp_get'

hint: CONFIG_MSM_ADSP is not enabled. I don't see a way to enable it.

Yep, that's the compile but not link part. Here's another part of fixes. (Relative to the previous one; please apply both).

---

Remove wakelock dependency from some files, add neccessary headers.

arch/arm/mach-msm/include/mach/msm_iomap.h +1 -1
index 2f7b4c8..1b4cb1d 100644
@@ -116,6 +116,6 @@
 
 #define MSM_AD5_PHYS          0xAC000000
 #define MSM_AD5_SIZE          (SZ_1M*13)
-
+#define MSM_AD5_BASE          IOMEM(0xE0300000)
 
 #endif
arch/arm/mach-msm/include/mach/msm_rpcrouter.h new file +179 -0

179 lines not on this page · raw message

arch/arm/mach-msm/include/mach/msm_smd.h new file +107 -0

107 lines not on this page · raw message

arch/arm/mach-msm/include/mach/qdsp5/qdsp5audplaycmdi.h new file +94 -0

94 lines not on this page · raw message

arch/arm/mach-msm/include/mach/qdsp5/qdsp5audplaymsg.h new file +70 -0

70 lines not on this page · raw message

arch/arm/mach-msm/include/mach/qdsp5/qdsp5audppcmdi.h new file +914 -0

914 lines not on this page · raw message

arch/arm/mach-msm/include/mach/qdsp5/qdsp5audppmsg.h new file +318 -0

318 lines not on this page · raw message

arch/arm/mach-msm/include/mach/qdsp5/qdsp5audpreproccmdi.h new file +256 -0

256 lines not on this page · raw message

arch/arm/mach-msm/include/mach/qdsp5/qdsp5audpreprocmsg.h new file +85 -0

85 lines not on this page · raw message

arch/arm/mach-msm/include/mach/qdsp5/qdsp5audreccmdi.h new file +176 -0

176 lines not on this page · raw message

arch/arm/mach-msm/include/mach/qdsp5/qdsp5audrecmsg.h new file +127 -0

127 lines not on this page · raw message

arch/arm/mach-msm/include/mach/qdsp5/qdsp5jpegcmdi.h new file +376 -0

376 lines not on this page · raw message

arch/arm/mach-msm/include/mach/qdsp5/qdsp5jpegmsg.h new file +177 -0

177 lines not on this page · raw message

arch/arm/mach-msm/include/mach/qdsp5/qdsp5lpmcmdi.h new file +82 -0

82 lines not on this page · raw message

arch/arm/mach-msm/include/mach/qdsp5/qdsp5lpmmsg.h new file +80 -0

32 lines not on this page · raw message

arch/arm/mach-msm/include/mach/qdsp5/qdsp5vdeccmdi.h new file +235 -0

235 lines not on this page · raw message

arch/arm/mach-msm/include/mach/qdsp5/qdsp5vdecmsg.h new file +107 -0

107 lines not on this page · raw message

arch/arm/mach-msm/include/mach/qdsp5/qdsp5venccmdi.h new file +212 -0

212 lines not on this page · raw message

arch/arm/mach-msm/include/mach/qdsp5/qdsp5vfecmdi.h new file +910 -0

910 lines not on this page · raw message

arch/arm/mach-msm/include/mach/qdsp5/qdsp5vfemsg.h new file +290 -0

290 lines not on this page · raw message

drivers/staging/dream/Kconfig +33 -2
index 52bd187..5770ea6 100644

Lines of this file are not shown. View the raw message.

drivers/staging/dream/qdsp5/adsp.c +0 -5
index d096456..9069535 100644

Lines of this file are not shown. View the raw message.

drivers/staging/dream/smd/smd_qmi.c +0 -5
index d4e7d88..687db14 100644

Lines of this file are not shown. View the raw message.

drivers/staging/dream/smd/smd_rpcrouter.c +0 -12
index d4a4a88..5ac2cd4 100644

Lines of this file are not shown. View the raw message.

drivers/staging/dream/smd/smd_rpcrouter.h +0 -2
index a7416a2..86ab997 100644

Lines of this file are not shown. View the raw message.

drivers/staging/dream/smd/smd_tty.c +0 -5
index 2edd9d1..f409449 100644

Lines of this file are not shown. View the raw message.

include/linux/msm_rpcrouter.h new file +47 -0

47 lines not on this page · raw message

include/linux/wakelock.h new file +91 -0

91 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Part of the diff is not shown here. View the raw message.

#12 lore raw
In reply to Randy Dunlap

This adds android pmem driver, one of dependencies of camera driver.

drivers/staging/dream/Kconfig +5 -1
index 5770ea6..67783f8 100644
@@ -39,5 +39,9 @@ config INPUT_GPIO
 	  Say Y here if you want to support gpio based keys, wheels etc...
 
 config GENERIC_GPIO
-	bool
+	bool
+	default y
+
+config ANDROID_PMEM
+	bool "Android pmem allocator"
 	default y
drivers/staging/dream/Makefile +1 -0
index 2b79151..6afbadf 100644
@@ -1,4 +1,5 @@
 obj-$(CONFIG_MSM_ADSP)		+= qdsp5/ smd/
 obj-$(CONFIG_MSM_CAMERA)	+= camera/
 obj-$(CONFIG_INPUT_GPIO)	+= gpio_axis.o gpio_event.o gpio_input.o gpio_matrix.o gpio_output.o
+obj-$(CONFIG_ANDROID_PMEM)	+= pmem.o
 
drivers/staging/dream/pmem.c new file +1335 -0

1,335 lines not on this page · raw message

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#13 lore raw
In reply to Randy Dunlap

Puzzle is almost over. If you disable

#obj-y += audio_out.o audio_in.o audio_mp3.o audmgr.o audpp.o #obj-y += snd.o

from build, the rest should now build ok.

---

This adds gpio infrastructure for HTC Dream. Other pieces depend on it, including camera driver.

drivers/staging/dream/Makefile +1 -0
index 6afbadf..b1d4609 100644
@@ -2,4 +2,5 @@ obj-$(CONFIG_MSM_ADSP)		+= qdsp5/ smd/
 obj-$(CONFIG_MSM_CAMERA)	+= camera/
 obj-$(CONFIG_INPUT_GPIO)	+= gpio_axis.o gpio_event.o gpio_input.o gpio_matrix.o gpio_output.o
 obj-$(CONFIG_ANDROID_PMEM)	+= pmem.o
+obj-y				+= generic_gpio.o
 
drivers/staging/dream/generic_gpio.c new file +274 -0

274 lines not on this page · raw message

drivers/staging/dream/gpio_chip.h new file +38 -0
new file mode 100644
index 0000000..eab9f09
@@ -0,0 +1,38 @@
+/* arch/arm/mach-msm/gpio_chip.h
+ *
+ * Copyright (C) 2007 Google, Inc.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#ifndef _LINUX_GPIO_CHIP_H
+#define _LINUX_GPIO_CHIP_H
+
+#include <linux/list.h>
+
+struct gpio_chip {
+	struct list_head list;
+	struct gpio_state *state;
+
+	unsigned int start;
+	unsigned int end;
+
+	int (*configure)(struct gpio_chip *chip, unsigned int gpio, unsigned long flags);
+	int (*get_irq_num)(struct gpio_chip *chip, unsigned int gpio, unsigned int *irqp, unsigned long *irqnumflagsp);
+	int (*read)(struct gpio_chip *chip, unsigned int gpio);
+	int (*write)(struct gpio_chip *chip, unsigned int gpio, unsigned on);
+	int (*read_detect_status)(struct gpio_chip *chip, unsigned int gpio);
+	int (*clear_detect_status)(struct gpio_chip *chip, unsigned int gpio);
+};
+
+int register_gpio_chip(struct gpio_chip *gpio_chip);
+
+#endif
drivers/staging/dream/gpio_hw.h new file +100 -0

100 lines not on this page · raw message

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#14 lore raw

On Mon, 14 Sep 2009 00:38:07 +0200 Pavel Machek wrote:

Hi Pavel,
Sorry I missed the compile but not link distinction.

Quoted 1 line

Puzzle is almost over. If you disable

Yes, much closer now.

Quoted 4 lines

#obj-y += audio_out.o audio_in.o audio_mp3.o audmgr.o audpp.o #obj-y += snd.o

from build, the rest should now build ok.

but still not link?

drivers/staging/dream/camera/msm_camera.c:1482: undefined reference to `msm_camera_flash_set_led_state'

CONFIG_MSM_CAMERA_FLASH=y

---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/

#15 lore raw

Hi!

Quoted 1 line
Quoted 1 line

Puzzle is almost over. If you disable

...

Quoted 4 lines
Quoted 4 lines

#obj-y += audio_out.o audio_in.o audio_mp3.o audmgr.o audpp.o #obj-y += snd.o

from build, the rest should now build ok.

Ok, I have one to fix this. Camera flash should be easy to solve, Dream has none :-).

---

Fix compilation of audio bits for HTC Dream.

arch/arm/mach-msm/include/mach/board.h +10 -0
index 271256c..478970b 100644
@@ -71,4 +71,14 @@ struct msm_camera_sensor_info {
 	struct msm_camera_device_platform_data *pdata;
 };
 
+struct snd_endpoint {
+	int id;
+	const char *name;
+};
+
+struct msm_snd_endpoints {
+	struct snd_endpoint *endpoints;
+	unsigned num;
+};
+
 #endif
drivers/staging/dream/qdsp5/audio_out.c +0 -4
index d1adcf6..df87ca3 100644
@@ -38,8 +38,6 @@
 #include <mach/qdsp5/qdsp5audppcmdi.h>
 #include <mach/qdsp5/qdsp5audppmsg.h>
 
-#include <mach/htc_pwrsink.h>
-
 #include "evlog.h"
 
 #define LOG_AUDIO_EVENTS 1
@@ -260,7 +258,6 @@ static int audio_enable(struct audio *audio)
 	}
 
 	audio->enabled = 1;
-	htc_pwrsink_set(PWRSINK_AUDIO, 100);
 	return 0;
 }
 
@@ -695,7 +692,6 @@ static int audio_release(struct inode *inode, struct file *file)
 	audio_flush(audio);
 	audio->opened = 0;
 	mutex_unlock(&audio->lock);
-	htc_pwrsink_set(PWRSINK_AUDIO, 0);
 	return 0;
 }
 
include/linux/msm_audio.h new file +115 -0

115 lines not on this page · raw message

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#16 lore raw
In reply to Randy Dunlap

Hi!

Quoted 10 lines
Quoted 4 lines

#obj-y += audio_out.o audio_in.o audio_mp3.o audmgr.o audpp.o #obj-y += snd.o

from build, the rest should now build ok.

but still not link?

drivers/staging/dream/camera/msm_camera.c:1482: undefined reference to `msm_camera_flash_set_led_state'

CONFIG_MSM_CAMERA_FLASH=y

It should link with the patch below...

---

HTC Dream hardware has no camera flash, and current arm/mach-msm does not have flash support. Disable flash support for now.

drivers/staging/dream/camera/Kconfig +1 -1
index 0a3e903..bfb6d24 100644
@@ -15,7 +15,7 @@ config MSM_CAMERA_DEBUG
 
 config MSM_CAMERA_FLASH
 	bool "Qualcomm MSM camera flash support"
-	depends on MSM_CAMERA
+	depends on MSM_CAMERA && BROKEN
 	---help---
 	  Enable support for LED flash for msm camera
 
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#17 lore raw
Quoted 7 lines · On Mon, 14 Sep 2009 09:11:36 +0200 Pavel Machek wrote:

Hi!

Quoted 5 lines
Quoted 4 lines

#obj-y += audio_out.o audio_in.o audio_mp3.o audmgr.o audpp.o #obj-y += snd.o

from build, the rest should now build ok.

Quoted 7 lines
Quoted 5 lines

but still not link?

drivers/staging/dream/camera/msm_camera.c:1482: undefined reference to `msm_camera_flash_set_led_state'

CONFIG_MSM_CAMERA_FLASH=y

It should link with the patch below...

Ack. All built now. Thanks.

Quoted 25 lines

---

HTC Dream hardware has no camera flash, and current arm/mach-msm does not have flash support. Disable flash support for now.

drivers/staging/dream/camera/Kconfig +1 -1
index 0a3e903..bfb6d24 100644
@@ -15,7 +15,7 @@ config MSM_CAMERA_DEBUG
 
 config MSM_CAMERA_FLASH
 	bool "Qualcomm MSM camera flash support"
-	depends on MSM_CAMERA
+	depends on MSM_CAMERA && BROKEN
 	---help---
 	  Enable support for LED flash for msm camera
 
Signature · 3 lines
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/

#18 lore raw
In reply to Pavel Machek
Quoted 10 lines · Pavel Machek

Hi!

Quoted 7 lines
Quoted 4 lines

Fix compilation of gpio_* input drivers on -next kernel. Adds needed headers and removes unprotected wakelock/earlysuspend dependencies.

Still doesn't build for me, but if it builds for you, that's great. (could be a tool chain problem on my side)

Quoted 6 lines

No, it does not look like toolchain problem :-(. I had parts disabled in Kconfig. This should make it _compile_ (but not link); somehow MSM_ADSP is neccessary for camera to link and I can't see how to enable it.

Thanks for the patience.

Ugh, what patch should be applied in what order? Care to resend them with the proper "x/y" and a valid Subject: line?

thanks,

greg k-h

#19 lore raw

Hi!

Quoted 13 lines
Quoted 13 lines
Quoted 7 lines
Quoted 4 lines

Fix compilation of gpio_* input drivers on -next kernel. Adds needed headers and removes unprotected wakelock/earlysuspend dependencies.

Still doesn't build for me, but if it builds for you, that's great. (could be a tool chain problem on my side)

No, it does not look like toolchain problem :-(. I had parts disabled in Kconfig. This should make it _compile_ (but not link); somehow MSM_ADSP is neccessary for camera to link and I can't see how to enable it.

Quoted 4 lines
Quoted 1 line

Thanks for the patience.

Ugh, what patch should be applied in what order? Care to resend them with the proper "x/y" and a valid Subject: line?

All of patches are valid, and they should apply if you just "sort by date". I could dig them from my sent box...

Pavel

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#20 lore raw
Quoted 15 lines · Pavel Machek

Hi!

Quoted 13 lines
Quoted 13 lines
Quoted 7 lines
Quoted 4 lines

Fix compilation of gpio_* input drivers on -next kernel. Adds needed headers and removes unprotected wakelock/earlysuspend dependencies.

Still doesn't build for me, but if it builds for you, that's great. (could be a tool chain problem on my side)

No, it does not look like toolchain problem :-(. I had parts disabled in Kconfig. This should make it _compile_ (but not link); somehow MSM_ADSP is neccessary for camera to link and I can't see how to enable it.

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

Thanks for the patience.

Ugh, what patch should be applied in what order? Care to resend them with the proper "x/y" and a valid Subject: line?

All of patches are valid, and they should apply if you just "sort by date". I could dig them from my sent box...

Please resend them, their subjects need editing, and I want to make sure I have them all.

thanks,

greg k-h

#21 lore raw
Quoted 18 lines · Greg KH
Quoted 17 lines · Pavel Machek

Hi!

Quoted 15 lines
Quoted 14 lines
Quoted 7 lines
Quoted 4 lines

Fix compilation of gpio_* input drivers on -next kernel. Adds needed headers and removes unprotected wakelock/earlysuspend dependencies.

Still doesn't build for me, but if it builds for you, that's great. (could be a tool chain problem on my side)

No, it does not look like toolchain problem :-(. I had parts disabled in Kconfig. This should make it _compile_ (but not link); somehow MSM_ADSP is neccessary for camera to link and I can't see how to enable it.

Thanks for the patience.

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

Ugh, what patch should be applied in what order? Care to resend them with the proper "x/y" and a valid Subject: line?

All of patches are valid, and they should apply if you just "sort by date". I could dig them from my sent box...

Please resend them, their subjects need editing, and I want to make sure I have them all.

You already applied the first one, right?
Pavel

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#22 lore raw
Quoted 22 lines · Pavel Machek
Quoted 21 lines · Greg KH
Quoted 20 lines · Pavel Machek

Hi!

Quoted 17 lines
Quoted 8 lines
Quoted 7 lines
Quoted 4 lines

Fix compilation of gpio_* input drivers on -next kernel. Adds needed headers and removes unprotected wakelock/earlysuspend dependencies.

Still doesn't build for me, but if it builds for you, that's great. (could be a tool chain problem on my side)

Quoted 6 lines

No, it does not look like toolchain problem :-(. I had parts disabled in Kconfig. This should make it _compile_ (but not link); somehow MSM_ADSP is neccessary for camera to link and I can't see how to enable it.

Thanks for the patience.

Ugh, what patch should be applied in what order? Care to resend them with the proper "x/y" and a valid Subject: line?

Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

All of patches are valid, and they should apply if you just "sort by date". I could dig them from my sent box...

Please resend them, their subjects need editing, and I want to make sure I have them all.

You already applied the first one, right?

What is the "first" one? Did you get an email saying I had applied it?

I have over 600 patches in the staging tree, it's hard to remember specific ones...

thanks,

greg k-h

#23 lore raw
Quoted 29 lines · Greg KH
Quoted 28 lines · Pavel Machek
Quoted 26 lines · Greg KH
Quoted 15 lines · Pavel Machek

Hi!

Quoted 13 lines
Quoted 13 lines
Quoted 7 lines
Quoted 4 lines

Fix compilation of gpio_* input drivers on -next kernel. Adds needed headers and removes unprotected wakelock/earlysuspend dependencies.

Still doesn't build for me, but if it builds for you, that's great. (could be a tool chain problem on my side)

No, it does not look like toolchain problem :-(. I had parts disabled in Kconfig. This should make it _compile_ (but not link); somehow MSM_ADSP is neccessary for camera to link and I can't see how to enable it.

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

Thanks for the patience.

Ugh, what patch should be applied in what order? Care to resend them with the proper "x/y" and a valid Subject: line?

All of patches are valid, and they should apply if you just "sort by date". I could dig them from my sent box...

Please resend them, their subjects need editing, and I want to make sure I have them all.

Quoted 6 lines
Quoted 1 line

You already applied the first one, right?

What is the "first" one? Did you get an email saying I had applied it?

I have over 600 patches in the staging tree, it's hard to remember specific ones...

(See the mails I sent in the meantime. [patch for ignoring] is the one I think you applied.)
Pavel

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#24 lore raw
In reply to Greg KH
Quoted 18 lines · Greg KH
Quoted 17 lines · Pavel Machek

Hi!

Quoted 15 lines
Quoted 14 lines
Quoted 7 lines
Quoted 4 lines

Fix compilation of gpio_* input drivers on -next kernel. Adds needed headers and removes unprotected wakelock/earlysuspend dependencies.

Still doesn't build for me, but if it builds for you, that's great. (could be a tool chain problem on my side)

No, it does not look like toolchain problem :-(. I had parts disabled in Kconfig. This should make it _compile_ (but not link); somehow MSM_ADSP is neccessary for camera to link and I can't see how to enable it.

Thanks for the patience.

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

Ugh, what patch should be applied in what order? Care to resend them with the proper "x/y" and a valid Subject: line?

All of patches are valid, and they should apply if you just "sort by date". I could dig them from my sent box...

Please resend them, their subjects need editing, and I want to make sure I have them all.

Done. I belive you already applied [patch to ignore] so just take 1-6/6...
Pavel

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

A message that is not in the archive (sent off-list or not yet received): [email protected]

#26 lore raw

Re: Staging: dream: fix build errorsg

Quoted 8 lines · Greg KH
Quoted 7 lines · Pavel Machek

Fix compilation of gpio_* input drivers on -next kernel. Adds needed headers and removes unprotected wakelock/earlysuspend dependencies.

Quoted 8 lines
Quoted 5 lines
---
 drivers/staging/dream/gpio_event.c  |    3 
 drivers/staging/dream/gpio_input.c  |    7 -
 drivers/staging/dream/gpio_matrix.c |    8 -
 include/linux/gpio_event.h          |  154 ++++++++++++++++++++++++++++++++++++

This adds a file outside of the staging tree, so I'm going to drop it, sorry.

Ok, whats the preffered solution here? Create staging/include/linux and add gcc -I magic so it gets used?
Pavel

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#27 lore raw

Re: Staging: dream: fix build errorsg

Quoted 15 lines · Pavel Machek
Quoted 14 lines · Greg KH
Quoted 12 lines · Pavel Machek

Fix compilation of gpio_* input drivers on -next kernel. Adds needed headers and removes unprotected wakelock/earlysuspend dependencies.

---
 drivers/staging/dream/gpio_event.c  |    3 
 drivers/staging/dream/gpio_input.c  |    7 -
 drivers/staging/dream/gpio_matrix.c |    8 -
 include/linux/gpio_event.h          |  154 ++++++++++++++++++++++++++++++++++++
Quoted 5 lines
Quoted 2 lines

This adds a file outside of the staging tree, so I'm going to drop it, sorry.

Ok, whats the preffered solution here? Create staging/include/linux and add gcc -I magic so it gets used?

Could we do drivers/staging/include/ then make a link from include/staging/ (or something) into the drivers/staging include directory at build time?

The lower level msm sub-architecture already links to includes directly into the staging directory like this,

#include <../../../drivers/staging/android/timed_gpio.h>

which looks pretty ugly ..

Daniel