staging/dream: add missing include files
PATCH 2/3 staging/dream: add missing include files
Add missing files/includes neccessary for Dream compilation.
drivers/staging/dream/Kconfig +36 -1
@@ -2,11 +2,46 @@ source "drivers/staging/dream/smd/Kconfig" source "drivers/staging/dream/camera/Kconfig" +config MSM_AMSS_VERSION + int + default 6210 if MSM_AMSS_VERSION_6210 + default 6220 if MSM_AMSS_VERSION_6220 + default 6225 if MSM_AMSS_VERSION_6225 + default 6350 if MSM_AMSS_VERSION_6350 + +choice + prompt "AMSS modem firmware version" + + default MSM_AMSS_VERSION_6225 + + config MSM_AMSS_VERSION_6210 + bool "6.2.10" + + config MSM_AMSS_VERSION_6220 + bool "6.2.20" + + config MSM_AMSS_VERSION_6225 + bool "6.2.20 + New ADSP" + + config MSM_AMSS_VERSION_6350 + bool "6.3.50" +endchoice + +config MSM_ADSP + tristate "MSM ADSP driver" + default y + help + Provides access to registers needed by the userspace aDSP library. config INPUT_GPIO tristate "GPIO driver support" help Say Y here if you want to support gpio based keys, wheels etc... +config GENERIC_GPIO + bool + default y - +config ANDROID_PMEM + bool "Android pmem allocator" + default y
drivers/staging/dream/Makefile +3 -0
@@ -1,4 +1,7 @@ +EXTRA_CFLAGS=-Idrivers/staging/dream/include 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/camera/Kconfig +1 -1
@@ -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
drivers/staging/dream/camera/Makefile +1 -0
@@ -1,3 +1,4 @@ +EXTRA_CFLAGS=-Idrivers/staging/dream/include obj-$(CONFIG_MT9T013) += mt9t013.o mt9t013_reg.o obj-$(CONFIG_MT9D112) += mt9d112.o mt9d112_reg.o obj-$(CONFIG_MT9P012) += mt9p012_fox.o mt9p012_reg.o
drivers/staging/dream/include/linux/android_pmem.h new file +80 -0
80 lines not on this page · raw message
drivers/staging/dream/include/linux/gpio_event.h new file +154 -0
154 lines not on this page · raw message
drivers/staging/dream/include/linux/msm_adsp.h new file +84 -0
84 lines not on this page · raw message
drivers/staging/dream/include/linux/msm_audio.h new file +115 -0
115 lines not on this page · raw message
drivers/staging/dream/include/linux/msm_rpcrouter.h new file +47 -0
47 lines not on this page · raw message
drivers/staging/dream/include/linux/wakelock.h new file +91 -0
91 lines not on this page · raw message
drivers/staging/dream/include/mach/camera.h new file +279 -0
279 lines not on this page · raw message
drivers/staging/dream/include/mach/msm_adsp.h new file +112 -0
112 lines not on this page · raw message
drivers/staging/dream/include/mach/msm_rpcrouter.h new file +179 -0
179 lines not on this page · raw message
drivers/staging/dream/include/mach/msm_smd.h new file +107 -0
107 lines not on this page · raw message
drivers/staging/dream/include/mach/qdsp5/qdsp5audplaycmdi.h new file +94 -0
94 lines not on this page · raw message
drivers/staging/dream/include/mach/qdsp5/qdsp5audplaymsg.h new file +70 -0
70 lines not on this page · raw message
drivers/staging/dream/include/mach/qdsp5/qdsp5audppcmdi.h new file +914 -0
914 lines not on this page · raw message
drivers/staging/dream/include/mach/qdsp5/qdsp5audppmsg.h new file +318 -0
318 lines not on this page · raw message
drivers/staging/dream/include/mach/qdsp5/qdsp5audpreproccmdi.h new file +256 -0
256 lines not on this page · raw message
drivers/staging/dream/include/mach/qdsp5/qdsp5audpreprocmsg.h new file +85 -0
34 lines not on this page · raw message
drivers/staging/dream/include/mach/qdsp5/qdsp5audreccmdi.h new file +176 -0
176 lines not on this page · raw message
drivers/staging/dream/include/mach/qdsp5/qdsp5audrecmsg.h new file +127 -0
127 lines not on this page · raw message
drivers/staging/dream/include/mach/qdsp5/qdsp5jpegcmdi.h new file +376 -0
376 lines not on this page · raw message
drivers/staging/dream/include/mach/qdsp5/qdsp5jpegmsg.h new file +177 -0
177 lines not on this page · raw message
drivers/staging/dream/include/mach/qdsp5/qdsp5lpmcmdi.h new file +82 -0
82 lines not on this page · raw message
drivers/staging/dream/include/mach/qdsp5/qdsp5lpmmsg.h new file +80 -0
80 lines not on this page · raw message
drivers/staging/dream/include/mach/qdsp5/qdsp5vdeccmdi.h new file +235 -0
235 lines not on this page · raw message
drivers/staging/dream/include/mach/qdsp5/qdsp5vdecmsg.h new file +107 -0
107 lines not on this page · raw message
drivers/staging/dream/include/mach/qdsp5/qdsp5venccmdi.h new file +212 -0
212 lines not on this page · raw message
drivers/staging/dream/include/mach/qdsp5/qdsp5vfecmdi.h new file +910 -0
910 lines not on this page · raw message
drivers/staging/dream/include/mach/qdsp5/qdsp5vfemsg.h new file +290 -0
290 lines not on this page · raw message
drivers/staging/dream/include/media/msm_camera.h new file +388 -0
388 lines not on this page · raw message
include/linux/msm_mdp.h new file +86 -0
86 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.
Quoted 3 lines · Pavel Machek
Add missing files/includes neccessary for Dream compilation.
Signed-off-by Pavel Machek <[email protected]>
This patch includes a file that is not in the drivers/staging/ directory, and it does this Kconfig mess:
drivers/staging/dream/Kconfig source "drivers/staging/dream/smd/Kconfig" · line 43
Quoted 3 lines
drivers/staging/dream/Kconfig +3
-0+config GENERIC_GPIO + bool + default y
Which breaks the i386 build. Don't force on a general config option like this, that's not nice at all :(
So I'll not apply this one, and the 3/3 patch.
thanks,
greg k-h
Quoted 7 lines · Greg KH
Quoted 3 lines · Pavel Machek
Add missing files/includes neccessary for Dream compilation.
Signed-off-by Pavel Machek <[email protected]>This patch includes a file that is not in the
drivers/staging/directory, and it does thisKconfigmess:
Oops, sorry. That one escaped me. I'll submit fixed version.
Quoted 6 lines
drivers/staging/dream/Kconfig source "drivers/staging/dream/smd/Kconfig" · line 43
Quoted 3 lines
drivers/staging/dream/Kconfig +3
-0+config GENERIC_GPIO + bool + default yWhich breaks the i386 build. Don't force on a general config option like this, that's not nice at all :(
Ok, I should figure out how to limit it to arch-msm.
Quoted 1 line
So I'll not apply this one, and the 3/3 patch.
Where can I get the tree to diff against? gregkh-08-staging-2.6.32-rc7-git4.patch just reverts everything.
I guess I can extract it from ://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/series ...
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Quoted 10 lines · Pavel Machek
Quoted 7 lines · Greg KH
drivers/staging/dream/Kconfig source "drivers/staging/dream/smd/Kconfig" · line 43
Quoted 3 lines · Pavel Machek
drivers/staging/dream/Kconfig +3
-0+config GENERIC_GPIO + bool + default yWhich breaks the i386 build. Don't force on a general config option like this, that's not nice at all :(
Ok, I should figure out how to limit it to arch-msm.
You do it by 'select'ing the symbol in arch/arm/Kconfig. See the many other examples therein of how to do it.
Quoted 10 lines · Russell King - ARM Linux
Quoted 9 lines · Pavel Machek
Quoted 7 lines · Greg KH
drivers/staging/dream/Kconfig source "drivers/staging/dream/smd/Kconfig" · line 43
Quoted 3 lines · Pavel Machek
drivers/staging/dream/Kconfig +3
-0+config GENERIC_GPIO + bool + default yWhich breaks the i386 build. Don't force on a general config option like this, that's not nice at all :(
Quoted 4 lines
Quoted 1 line
Ok, I should figure out how to limit it to arch-msm.
You do it by 'select'ing the symbol in
arch/arm/Kconfig. See the many other examples therein of how to do it.
Thanks.
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Quoted 5 lines · Pavel Machek
Where can I get the tree to diff against? gregkh-08-staging-2.6.32-rc7-git4.patch just reverts everything.
I guess I can extract it from ://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/series ...
Or grab the linux-next tree and branch from right before the "delete the drivers/staging/dream/ directory" patch.
thanks,
greg k-h
Quoted 9 lines · Greg KH
Quoted 5 lines · Pavel Machek
Where can I get the tree to diff against? gregkh-08-staging-2.6.32-rc7-git4.patch just reverts everything.
I guess I can extract it from ://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/series ...
Or grab the linux-next tree and branch from right before the "delete the
drivers/staging/dream/directory" patch.
What is the status here, BTW? staging/dream is still there in git pull from today. Would it be possible to avoid pushing that huge revert to Linus, after all? Fixes are available, and it would be nice to avoid big churn.... Pretty please...
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Quoted 8 lines · Pavel Machek
Quoted 7 lines · Greg KH
Quoted 5 lines · Pavel Machek
Where can I get the tree to diff against? gregkh-08-staging-2.6.32-rc7-git4.patch just reverts everything.
I guess I can extract it from ://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/series ...
Quoted 7 lines
Quoted 2 lines
Or grab the linux-next tree and branch from right before the "delete the
drivers/staging/dream/directory" patch.What is the status here, BTW? staging/dream is still there in git pull from today. Would it be possible to avoid pushing that huge revert to Linus, after all? Fixes are available, and it would be nice to avoid big churn.... Pretty please...
Sorry for the delay.
I've pushed out the staging patches for .33, and left in the Dream files, as you are trying very hard to get this to work, and to delete them now would just be rude of me. I'll drop the patch from -next that removes the files as well when I sync up with Linus later today.
I'll also work through the patches you have sent me so far that I haven't applied, I think there are still a few.
Hope this helps,
greg k-h
Quoted 24 lines · Greg KH
Quoted 8 lines · Pavel Machek
Quoted 7 lines · Greg KH
Quoted 5 lines · Pavel Machek
Where can I get the tree to diff against? gregkh-08-staging-2.6.32-rc7-git4.patch just reverts everything.
I guess I can extract it from ://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/series ...
Quoted 7 lines
Quoted 2 lines
Or grab the linux-next tree and branch from right before the "delete the
drivers/staging/dream/directory" patch.What is the status here, BTW? staging/dream is still there in git pull from today. Would it be possible to avoid pushing that huge revert to Linus, after all? Fixes are available, and it would be nice to avoid big churn.... Pretty please...
Sorry for the delay.
I've pushed out the staging patches for .33, and left in the Dream files, as you are trying very hard to get this to work, and to delete them now would just be rude of me. I'll drop the patch from -next that removes the files as well when I sync up with Linus later today.
Quoted 4 lines
I'll also work through the patches you have sent me so far that I haven't applied, I think there are still a few.
Hope this helps,
Yep, thanks!
(Things are getting better... slowly. Google now has android/dream tree based on 2.6.32, and first bits of dream support are being merged...)
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html