Skip to contentSkip to conversation

HTC Herald various device support

PATCH In review Cory Maccarrone 2 participants 6 messages Jul 20, 2010 – Nov 29, 2010

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

cover HTC Herald various device support

This patch set is an updated version of a series of patches I submitted a while ago. It's built against the latest linux-omap master branch, and removes all defconfig updates. Other comments were put in place as well.

This patch set implements the following drivers and support for them into the HTC Herald:

* MMC card support
* I2C and HTCPLD drivers
* TSC2046 touchscreen support
* Serial port fixes for omap7xx
* Bluetooth common code for HTC omap7xx smartphones

The bluetooth drivers are implemented with the expectation that they will be used by other devices once the board files are submitted (Elf/Elfin, Opal, etc).

Cory Maccarrone (7):
[OMAP] gpio: Allow for extended GPIO space [OMAP] Add allowance for extra IRQ space
[OMAP] HTCHERALD: MMC, I2C, HTCPLD and related devices [OMAP] htcherald: SPI register config, TSC2046 touchscreen [omap1] omap7xx clocks, mux, serial fixes [omap1] Bluetooth device code common to HTC smartphones [htcherald] Add board support for UARTs, bluetooth

 arch/arm/mach-omap1/Kconfig               |    2 +
 arch/arm/mach-omap1/Makefile              |    2 +-
 arch/arm/mach-omap1/board-htcherald.c     |  346 ++++++++++++++++++++++++++++-
 arch/arm/mach-omap1/clock_data.c          |   20 ++
 arch/arm/mach-omap1/htc-bt.c              |  183 +++++++++++++++
 arch/arm/mach-omap1/include/mach/htc-bt.h |   22 ++
 arch/arm/mach-omap1/mux.c                 |    4 +
 arch/arm/mach-omap1/serial.c              |    7 +
 arch/arm/plat-omap/Kconfig                |   36 +++
 arch/arm/plat-omap/include/plat/gpio.h    |    7 +
 arch/arm/plat-omap/include/plat/irqs.h    |    6 +-
 arch/arm/plat-omap/include/plat/mux.h     |    4 +
 12 files changed, 631 insertions(+), 8 deletions(-)
 create mode 100644 arch/arm/mach-omap1/htc-bt.c
 create mode 100644 arch/arm/mach-omap1/include/mach/htc-bt.h
#1 lore raw

PATCH 1/7 gpio: Allow for extended GPIO space

This change copies from the s3c24xx the ability for a board to specify if it wants 64 or 128 more GPIOs in the board space. This is needed to get the HTC Herald board's extra htcpld gpios to work as actual gpios.

---
 arch/arm/plat-omap/Kconfig             |   18 ++++++++++++++++++
 arch/arm/plat-omap/include/plat/gpio.h |    7 +++++++
 2 files changed, 25 insertions(+), 0 deletions(-)
arch/arm/plat-omap/Kconfig +18 -0
index e2ed952..5bc7a79 100644
@@ -2,6 +2,24 @@ if ARCH_OMAP
 
 menu "TI OMAP Common Features"
 
+config OMAP_GPIO_EXTRA
+	int
+	default 128 if OMAP_GPIO_EXTRA128
+	default 64 if OMAP_GPIO_EXTRA64
+	default 0
+
+config OMAP_GPIO_EXTRA64
+	bool
+	help
+	  Add an extra 64 gpio numbers to the available GPIO pool. This is
+	  available for boards that need extra gpios for external devices.
+
+config OMAP_GPIO_EXTRA128
+	bool
+	help
+	  Add an extra 128 gpio numbers to the available GPIO pool. This is
+	  available for boards that need extra gpios for external devices.
+
 config ARCH_OMAP_OTG
 	bool
 
arch/arm/plat-omap/include/plat/gpio.h +7 -0
index de1c604..d21b790 100644
@@ -86,6 +86,13 @@ extern void omap_gpio_restore_context(void);
  * The original OMAP-specfic calls should eventually be removed.
  */
 
+/*
+ * Some boards require extra gpio capacity to support external
+ * devices that need GPIO.
+ */
+
+#define ARCH_NR_GPIOS	(256 + CONFIG_OMAP_GPIO_EXTRA)
+
 #include <linux/errno.h>
 #include <asm-generic/gpio.h>
 
Signature · 1 line
1.7.0.4
#2 lore raw

Re: [PATCH 1/7] [OMAP] gpio: Allow for extended GPIO space

Quoted 4 lines · Cory Maccarrone

This change copies from the s3c24xx the ability for a board to specify if it wants 64 or 128 more GPIOs in the board space. This is needed to get the HTC Herald board's extra htcpld gpios to work as actual gpios.

<snip>

Quoted 8 lines
arch/arm/plat-omap/Kconfig +8 -0
+config OMAP_GPIO_EXTRA
+	int
+	default 128 if OMAP_GPIO_EXTRA128
+	default 64 if OMAP_GPIO_EXTRA64
+	default 0
+
+config OMAP_GPIO_EXTRA64
+	bool

arch/arm/plat-omap/Kconfig if ARCH_OMAP · line 22

Quoted 10 lines
arch/arm/plat-omap/Kconfig +10 -0
+	help
+	  Add an extra 64 gpio numbers to the available GPIO pool. This is
+	  available for boards that need extra gpios for external devices.
+
+config OMAP_GPIO_EXTRA128
+	bool
+	help
+	  Add an extra 128 gpio numbers to the available GPIO pool. This is
+	  available for boards that need extra gpios for external devices.
+

Let's wait on this and the following patch a a little, I believe there are already patches in the works to deal with this for the multi-arm support. So this should get solved eventually in a generic way.

Regards,

Tony

#3 lore raw

Re: [PATCH 1/7] [OMAP] gpio: Allow for extended GPIO space

Quoted 31 lines · Tony Lindgren
Quoted 4 lines · Cory Maccarrone

This change copies from the s3c24xx the ability for a board to specify if it wants 64 or 128 more GPIOs in the board space.  This is needed to get the HTC Herald board's extra htcpld gpios to work as actual gpios.

<snip>

Quoted 8 lines
arch/arm/plat-omap/Kconfig +8 -0
+config OMAP_GPIO_EXTRA
+     int
+     default 128 if OMAP_GPIO_EXTRA128
+     default 64 if OMAP_GPIO_EXTRA64
+     default 0
+
+config OMAP_GPIO_EXTRA64
+     bool

arch/arm/plat-omap/Kconfig if ARCH_OMAP · line 22

Quoted 10 lines
arch/arm/plat-omap/Kconfig +10 -0
+     help
+       Add an extra 64 gpio numbers to the available GPIO pool. This is
+       available for boards that need extra gpios for external devices.
+
+config OMAP_GPIO_EXTRA128
+     bool
+     help
+       Add an extra 128 gpio numbers to the available GPIO pool. This is
+       available for boards that need extra gpios for external devices.
+

Let's wait on this and the following patch a a little, I believe there are already patches in the works to deal with this for the multi-arm support. So this should get solved eventually in a generic way.

Quoted 4 lines

Regards,

Tony

Has anything happened with this recently? I haven't been keeping up too much, and I notice the latest linus-tree kernel still needs these patches (or something similar) for me to be able to use the htcpld on herald.

- Cory
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#4 lore raw

Re: [PATCH 1/7] [OMAP] gpio: Allow for extended GPIO space

Quoted 34 lines · Cory Maccarrone
Quoted 33 lines · Tony Lindgren
Quoted 4 lines · Cory Maccarrone

This change copies from the s3c24xx the ability for a board to specify if it wants 64 or 128 more GPIOs in the board space.  This is needed to get the HTC Herald board's extra htcpld gpios to work as actual gpios.

<snip>

Quoted 8 lines
arch/arm/plat-omap/Kconfig +8 -0
+config OMAP_GPIO_EXTRA
+     int
+     default 128 if OMAP_GPIO_EXTRA128
+     default 64 if OMAP_GPIO_EXTRA64
+     default 0
+
+config OMAP_GPIO_EXTRA64
+     bool

arch/arm/plat-omap/Kconfig if ARCH_OMAP · line 22

Quoted 10 lines
arch/arm/plat-omap/Kconfig +10 -0
+     help
+       Add an extra 64 gpio numbers to the available GPIO pool. This is
+       available for boards that need extra gpios for external devices.
+
+config OMAP_GPIO_EXTRA128
+     bool
+     help
+       Add an extra 128 gpio numbers to the available GPIO pool. This is
+       available for boards that need extra gpios for external devices.
+

Let's wait on this and the following patch a a little, I believe there are already patches in the works to deal with this for the multi-arm support. So this should get solved eventually in a generic way.

Regards,

Quoted 7 lines
Quoted 2 lines

Tony

Has anything happened with this recently? I haven't been keeping up too much, and I notice the latest linus-tree kernel still needs these patches (or something similar) for me to be able to use the htcpld on herald.

Well I'm working on a patch series that combines all mach-omap1 defconfigs into one, still need to sort out few places to make it work.

That means we must be able to compile in all the needed options without breaking things, so let's not make this a Kconfig option. Or at least it should be possible to enable it for all mach-omap1 machines.

AFAIK, you should be able to just define it the same way as TWL4030_IRQ_BASE in arch/arm/plat-omap/include/plat/irqs.h, maybe based it on CONFIG_ARCH_OMAP7XX?

Regards,

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#5 lore raw
In reply to Cory Maccarrone
Quoted 13 lines · Cory Maccarrone

This patch set is an updated version of a series of patches I submitted a while ago. It's built against the latest linux-omap master branch, and removes all defconfig updates. Other comments were put in place as well.

This patch set implements the following drivers and support for them into the HTC Herald:

* MMC card support
* I2C and HTCPLD drivers
* TSC2046 touchscreen support
* Serial port fixes for omap7xx
* Bluetooth common code for HTC omap7xx smartphones

Quoted 7 lines

The bluetooth drivers are implemented with the expectation that they will be used by other devices once the board files are submitted (Elf/Elfin, Opal, etc).

Cory Maccarrone (7):
[OMAP] gpio: Allow for extended GPIO space
[OMAP] Add allowance for extra IRQ space

Let's drop these two for now, they will get solved in a generic way hopefully quite soon.

Quoted 5 lines

[OMAP] HTCHERALD: MMC, I2C, HTCPLD and related devices [OMAP] htcherald: SPI register config, TSC2046 touchscreen [omap1] omap7xx clocks, mux, serial fixes [omap1] Bluetooth device code common to HTC smartphones [htcherald] Add board support for UARTs, bluetooth

Please repost these one more time with linux-arm-kernel list Cc'd. If no comments, we may be able to get these still into the current merge window.

Sorry for the delay, I've been offline for past few weeks :)

Regards,

Tony