staging/dream: add missing include files/fix compilation
in [Kernel]
|
Prev: [PATCH] ACPICA: wrong acpi_parse_state assigned acpi_ps_init_scope() ?
Next: [patch 0/4] Only use HPET MSI timers on systems with deep C-state support
From: Greg KH on 14 Jan 2010 19:40 On Fri, Dec 25, 2009 at 09:59:18PM +0100, Pavel Machek wrote: > This adds missing include files, so it should now compile. ifdef > guards were added to Kconfig, so it should not cause problems on > non-arch-msm machines. > > Signed-off-by: Pavel Machek <pavel(a)ucw.cz> Odd, this doesn't apply to the linux-next tree, some of the files are already there. Care to refresh this? thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Pavel Machek on 19 Jan 2010 00:50 On Thu 2010-01-14 16:24:19, Greg KH wrote: > On Fri, Dec 25, 2009 at 09:59:18PM +0100, Pavel Machek wrote: > > This adds missing include files, so it should now compile. ifdef > > guards were added to Kconfig, so it should not cause problems on > > non-arch-msm machines. > > > > Signed-off-by: Pavel Machek <pavel(a)ucw.cz> > > Odd, this doesn't apply to the linux-next tree, some of the files are > already there. Strange, it seems it is almost all already in. Well, good :-). But there's small problem. linux-next now contains dwalker's tree, and I could not get it to compile, even with staging disabled. I'll need to look into that. Here are remaining few patches, now easy to read. (It also shows that at least CONFIG_AMSS_VERSION and CONFIG_GPIO should really be in arch/arm. I believe it will get there in .34 or so...) --- Guard whole dream/ specific Kconfig with CONFIG_DREAM so that we don't cause compile failures in other architectures. Add missing pieces so that it compiles. I am not sure if this is ready for staging. I guess we should wait till I get tree to compile in -next...? Signed-off-by: Pavel Machek <pavel(a)ucw.cz> diff --git a/drivers/staging/dream/Kconfig b/drivers/staging/dream/Kconfig index 4afa081..a824417 100644 --- a/drivers/staging/dream/Kconfig +++ b/drivers/staging/dream/Kconfig @@ -1,16 +1,55 @@ config DREAM - tristate "HTC Dream support" - depends on BROKEN + bool "HTC Dream support" + depends on ARCH_MSM + +if DREAM 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 +endif diff --git a/drivers/staging/dream/Makefile b/drivers/staging/dream/Makefile index 2b79151..f1e0429 100644 --- a/drivers/staging/dream/Makefile +++ b/drivers/staging/dream/Makefile @@ -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 diff --git a/drivers/staging/dream/camera/mt9t013.c b/drivers/staging/dream/camera/mt9t013.c index 88229f2..ecb4866 100644 --- a/drivers/staging/dream/camera/mt9t013.c +++ b/drivers/staging/dream/camera/mt9t013.c @@ -9,7 +9,7 @@ #include <linux/miscdevice.h> #include <linux/kernel.h> #include <media/msm_camera.h> -#include <mach/gpio.h> +#include <linux/gpio.h> #include <mach/camera.h> #include <asm/mach-types.h> #include "mt9t013.h" diff --git a/drivers/staging/dream/qdsp5/adsp.c b/drivers/staging/dream/qdsp5/adsp.c index 9069535..1fab9ce 100644 --- a/drivers/staging/dream/qdsp5/adsp.c +++ b/drivers/staging/dream/qdsp5/adsp.c @@ -45,6 +45,7 @@ static inline void allow_suspend(void) #include "adsp.h" #define INT_ADSP INT_ADSP_A9_A11 +#define MSM_AD5_BASE IOMEM(0xE0300000) static struct adsp_info adsp_info; static struct msm_rpc_endpoint *rpc_cb_server_client; diff --git a/drivers/staging/dream/qdsp5/snd.c b/drivers/staging/dream/qdsp5/snd.c index 037d7ff..9ee0d90 100644 --- a/drivers/staging/dream/qdsp5/snd.c +++ b/drivers/staging/dream/qdsp5/snd.c @@ -28,6 +28,16 @@ #include <mach/board.h> #include <mach/msm_rpcrouter.h> +struct snd_endpoint { + int id; + const char *name; +}; + +struct msm_snd_endpoints { + struct snd_endpoint *endpoints; + unsigned num; +}; + struct snd_ctxt { struct mutex lock; int opened; -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Daniel Walker on 19 Jan 2010 10:20 On Tue, 2010-01-19 at 06:45 +0100, Pavel Machek wrote: > On Thu 2010-01-14 16:24:19, Greg KH wrote: > > On Fri, Dec 25, 2009 at 09:59:18PM +0100, Pavel Machek wrote: > > > This adds missing include files, so it should now compile. ifdef > > > guards were added to Kconfig, so it should not cause problems on > > > non-arch-msm machines. > > > > > > Signed-off-by: Pavel Machek <pavel(a)ucw.cz> > > > > Odd, this doesn't apply to the linux-next tree, some of the files are > > already there. > > Strange, it seems it is almost all already in. Well, good :-). > > But there's small problem. linux-next now contains dwalker's tree, and > I could not get it to compile, even with staging disabled. I'll need > to look into that. I worked on it a little, but I won't have time to really start cleaning up that tree till next week, or this weekend. I pushed a new tree for next that should compile for dream with the attached config. I also included the patch that I added to get it to compile (you'll need the machine types too which I didn't include). Daniel
From: Pavel Machek on 31 Jan 2010 03:50 Hi! > > > > This adds missing include files, so it should now compile. ifdef > > > > guards were added to Kconfig, so it should not cause problems on > > > > non-arch-msm machines. > > > > > > > > Signed-off-by: Pavel Machek <pavel(a)ucw.cz> > > > > > > Odd, this doesn't apply to the linux-next tree, some of the files are > > > already there. > > > > Strange, it seems it is almost all already in. Well, good :-). > > > > But there's small problem. linux-next now contains dwalker's tree, and > > I could not get it to compile, even with staging disabled. I'll need > > to look into that. > > I worked on it a little, but I won't have time to really start cleaning > up that tree till next week, or this weekend. > > I pushed a new tree for next that should compile for dream with the > attached config. I also included the patch that I added to get it to > compile (you'll need the machine types too which I didn't include). Thanks! I checked out linux-next version, and it seems to include > commit cdf6c137865357112aa31666b65b938ab29fa736 > msm: compile fixes for dream. this patch. It still fails with: arch/arm/mach-msm/rpc_hsusb.c: In function 'msm_chg_rpc_connect': arch/arm/mach-msm/rpc_hsusb.c:156: error: implicit declaration of function 'machine_is_msm7201a_surf' arch/arm/mach-msm/rpc_hsusb.c:156: error: implicit declaration of function 'machine_is_msm7x27_surf' arch/arm/mach-msm/rpc_hsusb.c:157: error: implicit declaration of function 'machine_is_qsd8x50_surf' make[1]: *** [arch/arm/mach-msm/rpc_hsusb.o] Error 1 make: *** [arch/arm/mach-msm] Error 2 (and similar error further down). This fixes it, but you probably want to add machine_is_* to your git. (Aha, is that what you meant by "machine types"? With this patch it compiles. Signed-off-by: Pavel Machek <pavel(a)ucw.cz> diff --git a/arch/arm/mach-msm/rpc_hsusb.c b/arch/arm/mach-msm/rpc_hsusb.c index 22dee1c..52ba8b0 100644 --- a/arch/arm/mach-msm/rpc_hsusb.c +++ b/arch/arm/mach-msm/rpc_hsusb.c @@ -152,11 +152,6 @@ EXPORT_SYMBOL(msm_hsusb_rpc_connect); /* rpc connect for charging */ int msm_chg_rpc_connect(void) { - - if (machine_is_msm7201a_surf() || machine_is_msm7x27_surf() || - machine_is_qsd8x50_surf()) - return -ENOTSUPP; - if (chg_ep && !IS_ERR(chg_ep)) { printk(KERN_INFO "%s: chg_ep already connected\n", __func__); return 0; diff --git a/arch/arm/mach-msm/rpc_server_handset.c b/arch/arm/mach-msm/rpc_server_handset.c index f2df4ac..2b3d33e 100644 --- a/arch/arm/mach-msm/rpc_server_handset.c +++ b/arch/arm/mach-msm/rpc_server_handset.c @@ -369,12 +369,6 @@ static int __init hs_rpc_init(void) { int rc; - if (machine_is_msm7x27_surf() || machine_is_msm7x27_ffa()) { - rc = hs_rpc_cb_init(); - if (rc) - pr_err("%s: failed to initialize\n", __func__); - } - return msm_rpc_create_server(&hs_rpc_server); } module_init(hs_rpc_init); -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Pavel Machek on 31 Jan 2010 04:30
Hi! > > > > > This adds missing include files, so it should now compile. ifdef > > > > > guards were added to Kconfig, so it should not cause problems on > > > > > non-arch-msm machines. > > > > > > > > > > Signed-off-by: Pavel Machek <pavel(a)ucw.cz> > > > > > > > > Odd, this doesn't apply to the linux-next tree, some of the files are > > > > already there. > > > > > > Strange, it seems it is almost all already in. Well, good :-). > > > > > > But there's small problem. linux-next now contains dwalker's tree, and > > > I could not get it to compile, even with staging disabled. I'll need > > > to look into that. > > > > I worked on it a little, but I won't have time to really start cleaning > > up that tree till next week, or this weekend. > > > > I pushed a new tree for next that should compile for dream with the > > attached config. I also included the patch that I added to get it to > > compile (you'll need the machine types too which I didn't include). > > Thanks! I checked out linux-next version, and it seems to include > > > commit cdf6c137865357112aa31666b65b938ab29fa736 > > msm: compile fixes for dream. > > this patch. It still fails with: > > arch/arm/mach-msm/rpc_hsusb.c: In function 'msm_chg_rpc_connect': > arch/arm/mach-msm/rpc_hsusb.c:156: error: implicit declaration of > function 'machine_is_msm7201a_surf' > arch/arm/mach-msm/rpc_hsusb.c:156: error: implicit declaration of > function 'machine_is_msm7x27_surf' > arch/arm/mach-msm/rpc_hsusb.c:157: error: implicit declaration of > function 'machine_is_qsd8x50_surf' > make[1]: *** [arch/arm/mach-msm/rpc_hsusb.o] Error 1 > make: *** [arch/arm/mach-msm] Error 2 > > (and similar error further down). This fixes it, but you probably want > to add machine_is_* to your git. (Aha, is that what you meant by > "machine types"? > > With this patch it compiles. Ok, it compiles, but I do not see it booting. You config has: CONFIG_MSM_DEBUG_UART=3 # CONFIG_MSM_DEBUG_UART_NONE is not set # CONFIG_MSM_DEBUG_UART1 is not set # CONFIG_MSM_DEBUG_UART2 is not set CONFIG_MSM_DEBUG_UART3=y .... CONFIG_DEBUG_LL=y CONFIG_EARLY_PRINTK=y set, so I'd expect it to say something on the serial line... (right? Or do I still need to patch printk.c to get that?). And I see nothing :-(. I'm using ../fastboot -c "console=ttyMSM2 root=/dev/mmcblk0p1 rootdelay=5 fbcon=rotate:1" boot /data/l/linux-dwalker/arch/arm/boot/zImage ....with different kernel, it works (as in "I get most of the boot on serial line; it will not actually mount root"). Pavel -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |