staging/dream: Add final missing bits
PATCH 2/3 staging/dream: Add final missing bits
This adds final missing bits that allow drivers/staging to compile. It replaces depends on BROKEN with depends on ARCH_MSM; that way selecting generic_gpio should no longer cause problems.
Signed-off-by Pavel Machek <[email protected]>
drivers/staging/dream/Kconfig +37 -2
@@ -1,16 +1,51 @@ config DREAM tristate "HTC Dream support" - depends on BROKEN + depends on ARCH_MSM 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/mt9t013.c +1 -1
@@ -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"
drivers/staging/dream/gpio_chip.h new file +38 -0
@@ -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/include/mach/gpio.h new file +47 -0
47 lines not on this page · raw message
drivers/staging/dream/qdsp5/adsp.c +1 -0
@@ -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;
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html