* Re: Pending patches mostly pushed, please check
2006-01-03 19:13 ` Pending patches mostly pushed, please check Tony Lindgren
@ 2006-01-03 20:41 ` Ladislav Michl
2006-01-04 0:09 ` Tony Lindgren
2006-01-03 22:36 ` Todd Poynor
` (4 subsequent siblings)
5 siblings, 1 reply; 18+ messages in thread
From: Ladislav Michl @ 2006-01-03 20:41 UTC (permalink / raw)
To: Tony Lindgren; +Cc: linux-omap-open-source
On Tue, Jan 03, 2006 at 11:13:56AM -0800, Tony Lindgren wrote:
> Hi all,
>
> I've pushed bunch of patches listed. Please check the status of
> your patches below.
>
> Also reply to this thread if you know if a patch that you think
> should be pushed and has not been pushed yet.
Umm, here is one more :-)
Remove support for board Netstar. I hope it helped to sort out various
needs to drivers and now when nearly everything [1] was converted to
platform device there is no more need to bother you with updates to
board file :-). I'll maintain it as separate patch (using PTXdist).
Thanks for all the fish :-)
Best regards,
ladis
[1] Oh, it seems USB host driver still contains those
machine_is_omap_xxx. Will fix that later...
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index a8d2d9a..f17b4ac 100644
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@ -69,12 +69,6 @@ config MACH_VOICEBLUE
Support for Voiceblue GSM/VoIP gateway. Say Y here if you have
such a board.
-config MACH_NETSTAR
- bool "NetStar"
- depends on ARCH_OMAP1 && ARCH_OMAP15XX
- help
- Support for NetStar PBX. Say Y here if you have such a board.
-
config MACH_OMAP_PALMTE
bool "Palm Tungsten E"
depends on ARCH_OMAP1 && ARCH_OMAP15XX
diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile
index 856fedf..fe6598d 100644
--- a/arch/arm/mach-omap1/Makefile
+++ b/arch/arm/mach-omap1/Makefile
@@ -20,7 +20,6 @@ obj-$(CONFIG_MACH_OMAP_PERSEUS2) += boar
obj-$(CONFIG_MACH_OMAP_OSK) += board-osk.o
obj-$(CONFIG_MACH_OMAP_H3) += board-h3.o
obj-$(CONFIG_MACH_VOICEBLUE) += board-voiceblue.o
-obj-$(CONFIG_MACH_NETSTAR) += board-netstar.o
obj-$(CONFIG_MACH_OMAP_PALMTE) += board-palmte.o
ifeq ($(CONFIG_ARCH_OMAP15XX),y)
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index cc31113..f4c4e8e 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -50,10 +50,10 @@ config MTD_NAND_SPIA
If you had to ask, you don't have one. Say 'N'.
config MTD_NAND_OMAP
- tristate "NAND Flash device on OMAP H3/H2/P2 or NETSTAR boards"
- depends on ARM && ARCH_OMAP1 && MTD_NAND && (MACH_OMAP_H2 || MACH_OMAP_H3 || MACH_NETSTAR || MACH_OMAP_PERSEUS2)
- help
- Support for NAND flash on Texas Instruments H3/H2/P2/NETSTAR platforms.
+ tristate "NAND Flash device on OMAP H3/H2/P2 boards"
+ depends on ARM && ARCH_OMAP1 && MTD_NAND && (MACH_OMAP_H2 || MACH_OMAP_H3 || MACH_OMAP_PERSEUS2)
+ help
+ Support for NAND flash on Texas Instruments H3/H2/P2 platforms.
config MTD_NAND_TOTO
tristate "NAND Flash device on TOTO board"
diff --git a/include/asm-arm/arch-omap/hardware.h b/include/asm-arm/arch-omap/hardware.h
index 5406b87..ecf5bae 100644
--- a/include/asm-arm/arch-omap/hardware.h
+++ b/include/asm-arm/arch-omap/hardware.h
@@ -314,10 +314,6 @@
#include "board-voiceblue.h"
#endif
-#ifdef CONFIG_MACH_NETSTAR
-#include "board-netstar.h"
-#endif
-
#endif /* !__ASSEMBLER__ */
#endif /* __ASM_ARCH_OMAP_HARDWARE_H */
--- a/include/asm-arm/arch-omap/board-netstar.h 2006-01-03 21:23:00.000000000 +0100
+++ b/include/asm-arm/arch-omap/board-netstar.h 2006-01-03 15:00:45.568894352 +0100
@@ -1,19 +0,0 @@
-/*
- * Copyright (C) 2004 2N Telekomunikace, Ladislav Michl <michl@2n.cz>
- *
- * Hardware definitions for OMAP5910 based NetStar board.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef __ASM_ARCH_NETSTAR_H
-#define __ASM_ARCH_NETSTAR_H
-
-#include <asm/arch/tc.h>
-
-#define OMAP_NAND_FLASH_START1 OMAP_CS1_PHYS + (1 << 23)
-#define OMAP_NAND_FLASH_START2 OMAP_CS1_PHYS + (2 << 23)
-
-#endif /* __ASM_ARCH_NETSTAR_H */
--- a/arch/arm/mach-omap1/board-netstar.c 2006-01-03 21:22:43.000000000 +0100
+++ b/arch/arm/mach-omap1/board-netstar.c 2006-01-03 15:00:45.568894352 +0100
@@ -1,160 +0,0 @@
-/*
- * Modified from board-generic.c
- *
- * Copyright (C) 2004 2N Telekomunikace, Ladislav Michl <michl@2n.cz>
- *
- * Code for Netstar OMAP board.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <linux/delay.h>
-#include <linux/platform_device.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/notifier.h>
-#include <linux/reboot.h>
-
-#include <asm/hardware.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-
-#include <asm/arch/gpio.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/usb.h>
-#include <asm/arch/common.h>
-
-extern void __init omap_init_time(void);
-extern int omap_gpio_init(void);
-
-static struct resource netstar_smc91x_resources[] = {
- [0] = {
- .start = OMAP_CS1_PHYS + 0x300,
- .end = OMAP_CS1_PHYS + 0x300 + 16,
- .flags = IORESOURCE_MEM,
- },
- [1] = {
- .start = OMAP_GPIO_IRQ(8),
- .end = OMAP_GPIO_IRQ(8),
- .flags = IORESOURCE_IRQ,
- },
-};
-
-static struct platform_device netstar_smc91x_device = {
- .name = "smc91x",
- .id = 0,
- .num_resources = ARRAY_SIZE(netstar_smc91x_resources),
- .resource = netstar_smc91x_resources,
-};
-
-static struct platform_device *netstar_devices[] __initdata = {
- &netstar_smc91x_device,
-};
-
-static struct omap_uart_config netstar_uart_config __initdata = {
- .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
-};
-
-static struct omap_board_config_kernel netstar_config[] = {
- { OMAP_TAG_UART, &netstar_uart_config },
-};
-
-static void __init netstar_init_irq(void)
-{
- omap_init_irq();
- omap_gpio_init();
-}
-
-static void __init netstar_init(void)
-{
- /* green LED */
- omap_request_gpio(4);
- omap_set_gpio_direction(4, 0);
- /* smc91x reset */
- omap_request_gpio(7);
- omap_set_gpio_direction(7, 0);
- omap_set_gpio_dataout(7, 1);
- udelay(2); /* wait at least 100ns */
- omap_set_gpio_dataout(7, 0);
- mdelay(50); /* 50ms until PHY ready */
- /* smc91x interrupt pin */
- omap_request_gpio(8);
-
- omap_request_gpio(12);
- omap_request_gpio(13);
- omap_request_gpio(14);
- omap_request_gpio(15);
- set_irq_type(OMAP_GPIO_IRQ(12), IRQT_FALLING);
- set_irq_type(OMAP_GPIO_IRQ(13), IRQT_FALLING);
- set_irq_type(OMAP_GPIO_IRQ(14), IRQT_FALLING);
- set_irq_type(OMAP_GPIO_IRQ(15), IRQT_FALLING);
-
- platform_add_devices(netstar_devices, ARRAY_SIZE(netstar_devices));
-
- /* Switch on green LED */
- omap_set_gpio_dataout(4, 0);
- /* Switch off red LED */
- omap_writeb(0x00, OMAP_LPG1_PMR); /* Disable clock */
- omap_writeb(0x80, OMAP_LPG1_LCR);
-
- omap_board_config = netstar_config;
- omap_board_config_size = ARRAY_SIZE(netstar_config);
- omap_serial_init();
-}
-
-static void __init netstar_map_io(void)
-{
- omap_map_common_io();
-}
-
-#define MACHINE_PANICED 1
-#define MACHINE_REBOOTING 2
-#define MACHINE_REBOOT 4
-static unsigned long machine_state;
-
-static int panic_event(struct notifier_block *this, unsigned long event,
- void *ptr)
-{
- if (test_and_set_bit(MACHINE_PANICED, &machine_state))
- return NOTIFY_DONE;
-
- /* Switch off green LED */
- omap_set_gpio_dataout(4, 1);
- /* Flash red LED */
- omap_writeb(0x78, OMAP_LPG1_LCR);
- omap_writeb(0x01, OMAP_LPG1_PMR); /* Enable clock */
-
- return NOTIFY_DONE;
-}
-
-static struct notifier_block panic_block = {
- .notifier_call = panic_event,
-};
-
-static int __init netstar_late_init(void)
-{
- /* TODO: Setup front panel switch here */
-
- /* Setup panic notifier */
- notifier_chain_register(&panic_notifier_list, &panic_block);
-
- return 0;
-}
-
-postcore_initcall(netstar_late_init);
-
-MACHINE_START(NETSTAR, "NetStar OMAP5910")
- /* Maintainer: Ladislav Michl <michl@2n.cz> */
- .phys_ram = 0x10000000,
- .phys_io = 0xfff00000,
- .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc,
- .boot_params = 0x10000100,
- .map_io = netstar_map_io,
- .init_irq = netstar_init_irq,
- .init_machine = netstar_init,
- .timer = &omap_timer,
-MACHINE_END
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: Pending patches mostly pushed, please check
2006-01-03 20:41 ` Ladislav Michl
@ 2006-01-04 0:09 ` Tony Lindgren
0 siblings, 0 replies; 18+ messages in thread
From: Tony Lindgren @ 2006-01-04 0:09 UTC (permalink / raw)
To: Ladislav Michl; +Cc: linux-omap-open-source
* Ladislav Michl <ladis@linux-mips.org> [060103 12:41]:
> On Tue, Jan 03, 2006 at 11:13:56AM -0800, Tony Lindgren wrote:
> > Hi all,
> >
> > I've pushed bunch of patches listed. Please check the status of
> > your patches below.
> >
> > Also reply to this thread if you know if a patch that you think
> > should be pushed and has not been pushed yet.
>
> Umm, here is one more :-)
>
> Remove support for board Netstar. I hope it helped to sort out various
> needs to drivers and now when nearly everything [1] was converted to
> platform device there is no more need to bother you with updates to
> board file :-). I'll maintain it as separate patch (using PTXdist).
> Thanks for all the fish :-)
OK, so long :) Pushing today.
> Best regards,
> ladis
>
> [1] Oh, it seems USB host driver still contains those
> machine_is_omap_xxx. Will fix that later...
OK
Tony
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: Pending patches mostly pushed, please check
2006-01-03 19:13 ` Pending patches mostly pushed, please check Tony Lindgren
2006-01-03 20:41 ` Ladislav Michl
@ 2006-01-03 22:36 ` Todd Poynor
2006-01-04 0:27 ` Tony Lindgren
2006-01-04 0:25 ` Todd Poynor
` (3 subsequent siblings)
5 siblings, 1 reply; 18+ messages in thread
From: Todd Poynor @ 2006-01-03 22:36 UTC (permalink / raw)
To: Tony Lindgren; +Cc: linux-omap-open-source
On Tue, Jan 03, 2006 at 11:13:56AM -0800, Tony Lindgren wrote:
>
> Also reply to this thread if you know if a patch that you think
> should be pushed and has not been pushed yet.
Here's one that probably should go in, although del_mtd_partitions +
mtdblock is known broken
(http://lists.infradead.org/pipermail/linux-mtd/2004-November/011007.html).
---------- snip
OMAP MTD NOR mapping driver remove partitions created from platform data.
Signed-off-by: Todd Poynor <tpoynor@mvista.com>
---
commit 54131af1a43d5ddabfd5b96fd74e51de86943894
tree 94686025ea41abb2ecd102e3bb15f93b3e77f09f
parent 91b3e09b5720c0ed00d059a3b95cdf3a4c1a18fb
author Todd Poynor <tpoynor@mvista.com> Tue, 03 Jan 2006 14:31:59 -0800
committer Todd Poynor <tpoynor@mvista.com> Tue, 03 Jan 2006 14:31:59 -0800
drivers/mtd/maps/omap_nor.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/mtd/maps/omap_nor.c b/drivers/mtd/maps/omap_nor.c
index a6e705f..6614e97 100644
--- a/drivers/mtd/maps/omap_nor.c
+++ b/drivers/mtd/maps/omap_nor.c
@@ -137,11 +137,12 @@ out_free_info:
static int __devexit omapflash_remove(struct platform_device *pdev)
{
struct omapflash_info *info = platform_get_drvdata(pdev);
+ struct flash_platform_data *pdata = pdev->dev.platform_data;
platform_set_drvdata(pdev, NULL);
if (info) {
- if (info->parts) {
+ if (info->parts || (pdata && pdata->parts)) {
del_mtd_partitions(info->mtd);
kfree(info->parts);
} else
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: Pending patches mostly pushed, please check
2006-01-03 22:36 ` Todd Poynor
@ 2006-01-04 0:27 ` Tony Lindgren
0 siblings, 0 replies; 18+ messages in thread
From: Tony Lindgren @ 2006-01-04 0:27 UTC (permalink / raw)
To: Todd Poynor; +Cc: linux-omap-open-source
* Todd Poynor <tpoynor@mvista.com> [060103 14:36]:
> On Tue, Jan 03, 2006 at 11:13:56AM -0800, Tony Lindgren wrote:
> >
> > Also reply to this thread if you know if a patch that you think
> > should be pushed and has not been pushed yet.
>
> Here's one that probably should go in, although del_mtd_partitions +
> mtdblock is known broken
> (http://lists.infradead.org/pipermail/linux-mtd/2004-November/011007.html).
>
> ---------- snip
>
> OMAP MTD NOR mapping driver remove partitions created from platform data.
>
> Signed-off-by: Todd Poynor <tpoynor@mvista.com>
>
> ---
> commit 54131af1a43d5ddabfd5b96fd74e51de86943894
> tree 94686025ea41abb2ecd102e3bb15f93b3e77f09f
> parent 91b3e09b5720c0ed00d059a3b95cdf3a4c1a18fb
> author Todd Poynor <tpoynor@mvista.com> Tue, 03 Jan 2006 14:31:59 -0800
> committer Todd Poynor <tpoynor@mvista.com> Tue, 03 Jan 2006 14:31:59 -0800
>
> drivers/mtd/maps/omap_nor.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mtd/maps/omap_nor.c b/drivers/mtd/maps/omap_nor.c
> index a6e705f..6614e97 100644
> --- a/drivers/mtd/maps/omap_nor.c
> +++ b/drivers/mtd/maps/omap_nor.c
> @@ -137,11 +137,12 @@ out_free_info:
> static int __devexit omapflash_remove(struct platform_device *pdev)
> {
> struct omapflash_info *info = platform_get_drvdata(pdev);
> + struct flash_platform_data *pdata = pdev->dev.platform_data;
>
> platform_set_drvdata(pdev, NULL);
>
> if (info) {
> - if (info->parts) {
> + if (info->parts || (pdata && pdata->parts)) {
> del_mtd_partitions(info->mtd);
> kfree(info->parts);
> } else
>
Just pushed this one.
Tony
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: Pending patches mostly pushed, please check
2006-01-03 19:13 ` Pending patches mostly pushed, please check Tony Lindgren
2006-01-03 20:41 ` Ladislav Michl
2006-01-03 22:36 ` Todd Poynor
@ 2006-01-04 0:25 ` Todd Poynor
2006-01-04 0:33 ` Tony Lindgren
2006-01-04 7:12 ` Komal Shah
` (2 subsequent siblings)
5 siblings, 1 reply; 18+ messages in thread
From: Todd Poynor @ 2006-01-04 0:25 UTC (permalink / raw)
To: Tony Lindgren; +Cc: linux-omap-open-source
Tony Lindgren wrote:
>> 9) LDM wakeup flags for OMAP keypad
>> http://linux.omap.com/pipermail/linux-omap-open-source/2005-December/005897.html
>
> Let's think about this one a bit more. Maybe we should have u32 device_wakeup in
> pm.c, and then various drivers would mask it with OMAP_WAKEUP_KEYPAD etc?
>
> Or maybe device_init_wakeup() should register a callback function in the driver,
> and them pm.c just calls all registered wakeup callback functions? That would
> move the enable/disable code to drivers.
Agreed, I should have labeled this patch as at an RFC stage. It's the
first attempt I'm aware of to apply the wakeup flags stuff begun for
PCI/USB to an embedded SoC, and was intended to start a discussion on
the above sorts of issues, which should also occur on
linux-pm@lists.osdl.org (and other embedded-oriented wakeup patches are
being floated there as well). It would be nice to move the wakeup
enable code to drivers, but with the per-core keypad IRQ assignments,
the need to enable level-2 IRQs, etc., not sure if a platform core file
ends up being more suitable, don't have a strong opinion myself so far.
On a related note, if anybody knows how to tell what source woke up an
OMAP from deep/big sleep I'd appreciate hearing about it. I haven't
found a register devoted to it, and keypad wakeup on my H3 seemed to
show a pending Level-2 interrupt in the level-1 ITR, but the level-2
ITRs all read zero (reading prior to enabling interrupts upon deep sleep
resume). Thanks,
--
Todd
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: Pending patches mostly pushed, please check
2006-01-04 0:25 ` Todd Poynor
@ 2006-01-04 0:33 ` Tony Lindgren
0 siblings, 0 replies; 18+ messages in thread
From: Tony Lindgren @ 2006-01-04 0:33 UTC (permalink / raw)
To: Todd Poynor; +Cc: linux-omap-open-source
* Todd Poynor <tpoynor@mvista.com> [060103 16:26]:
> Tony Lindgren wrote:
>
> >>9) LDM wakeup flags for OMAP keypad
> >>http://linux.omap.com/pipermail/linux-omap-open-source/2005-December/005897.html
> >
> >Let's think about this one a bit more. Maybe we should have u32
> >device_wakeup in
> >pm.c, and then various drivers would mask it with OMAP_WAKEUP_KEYPAD etc?
> >
> >Or maybe device_init_wakeup() should register a callback function in the
> >driver,
> >and them pm.c just calls all registered wakeup callback functions? That
> >would
> >move the enable/disable code to drivers.
>
> Agreed, I should have labeled this patch as at an RFC stage. It's the
> first attempt I'm aware of to apply the wakeup flags stuff begun for
> PCI/USB to an embedded SoC, and was intended to start a discussion on
> the above sorts of issues, which should also occur on
> linux-pm@lists.osdl.org (and other embedded-oriented wakeup patches are
> being floated there as well). It would be nice to move the wakeup
> enable code to drivers, but with the per-core keypad IRQ assignments,
> the need to enable level-2 IRQs, etc., not sure if a platform core file
> ends up being more suitable, don't have a strong opinion myself so far.
Yeah, let's discuss this on linux-pm.
> On a related note, if anybody knows how to tell what source woke up an
> OMAP from deep/big sleep I'd appreciate hearing about it. I haven't
> found a register devoted to it, and keypad wakeup on my H3 seemed to
> show a pending Level-2 interrupt in the level-1 ITR, but the level-2
> ITRs all read zero (reading prior to enabling interrupts upon deep sleep
> resume). Thanks,
I'd like to know too if there is such a register!
Tony
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: Pending patches mostly pushed, please check
2006-01-03 19:13 ` Pending patches mostly pushed, please check Tony Lindgren
` (2 preceding siblings ...)
2006-01-04 0:25 ` Todd Poynor
@ 2006-01-04 7:12 ` Komal Shah
2006-01-06 19:37 ` [PATCH] Convert touchscreen to input_allocate_device Dirk Behme
2006-01-06 19:37 ` [PATCH] Re: Pending patches mostly pushed, please check Dirk Behme
5 siblings, 0 replies; 18+ messages in thread
From: Komal Shah @ 2006-01-04 7:12 UTC (permalink / raw)
To: Tony Lindgren, Dirk Behme, imre.deak; +Cc: linux-omap-open-source
--- Tony Lindgren <tony@atomide.com> wrote:
> > Experimental & test (do not apply yet):
> > =======================================
> >
> > 1) omap24xx vout and dispc library
> >
>
http://linux.omap.com/pipermail/linux-omap-open-source/2005-December/005932.html
Imre,
Could you please reply on this? If needed I can re-work on integration
as per your suggestions.
> >
> > 3) keypad: platform_data and 24xx support -exp
> >
>
>http://linux.omap.com/pipermail/linux-omap-open-source/2005-December/005889.html
> >
> > 4) omap24xx IrDA update
> >
>
>http://linux.omap.com/pipermail/linux-omap-open-source/2005-December/005992.html
Please comment on keypad and irda patches. If acceptable then I can
regenerate them against latest git tree. Thanx.
IrDA patch is now working on H4 without crash.
Patches sitting under my ompt-git tree:
o h4 nand patch (not able to test...as got stuck with x-loader an d
u-boot flashing). If someone wants to experiment, I can release.
o OMAP2 spi master controller driver + tsc2101 protocol driver
as per david's framework. I have written good amount of the code for
this, but not yet working successfully. If someone wants to have fun
then I can submit to them.
---Komal Shah
http://komalshah.blogspot.com/
__________________________________________
Yahoo! DSL – Something to write home about.
Just $16.99/mo. or less.
dsl.yahoo.com
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH] Convert touchscreen to input_allocate_device
2006-01-03 19:13 ` Pending patches mostly pushed, please check Tony Lindgren
` (3 preceding siblings ...)
2006-01-04 7:12 ` Komal Shah
@ 2006-01-06 19:37 ` Dirk Behme
2006-01-14 0:18 ` Tony Lindgren
2006-01-06 19:37 ` [PATCH] Re: Pending patches mostly pushed, please check Dirk Behme
5 siblings, 1 reply; 18+ messages in thread
From: Dirk Behme @ 2006-01-06 19:37 UTC (permalink / raw)
To: Tony Lindgren; +Cc: linux-omap-open-source
[-- Attachment #1: Type: text/plain, Size: 397 bytes --]
Tony Lindgren wrote:
> Dirk, I've only pushed Todd's timer fix below like you suggested. Can you please
> update your patch?
ARM: OMAP: Convert touchscreen to input_allocate_device() to remove:
input: device omap_ts is statically allocated, will not register
Please convert to input_allocate_device() or contact dtor_core@ameritech.net
Signed-off-by: Dirk Behme <dirk.behme_at_de.bosch.com>
[-- Attachment #2: touchscreen_input_allocate_device.patch --]
[-- Type: text/plain, Size: 3403 bytes --]
--- ./drivers/input/touchscreen/omap/omap_ts.c_orig 2006-01-06 16:43:40.000000000 +0100
+++ ./drivers/input/touchscreen/omap/omap_ts.c 2006-01-06 18:48:39.754015208 +0100
@@ -65,10 +65,10 @@ static int omap_ts_read(void)
ts_omap.dev->read(data);
- input_report_abs(&(ts_omap.inputdevice), ABS_X, data[0]);
- input_report_abs(&(ts_omap.inputdevice), ABS_Y, data[1]);
- input_report_abs(&(ts_omap.inputdevice), ABS_PRESSURE, data[2]);
- input_sync(&(ts_omap.inputdevice));
+ input_report_abs(ts_omap.inputdevice, ABS_X, data[0]);
+ input_report_abs(ts_omap.inputdevice, ABS_Y, data[1]);
+ input_report_abs(ts_omap.inputdevice, ABS_PRESSURE, data[2]);
+ input_sync(ts_omap.inputdevice);
DEBUG_TS("omap_ts_read: read x=%d,y=%d,p=%d\n", data[0], data[1],
data[2]);
@@ -85,7 +85,7 @@ static void omap_ts_timer(unsigned long
if (!ts_omap.dev->penup()) {
if (!ts_omap.touched) {
DEBUG_TS("omap_ts_timer: pen down\n");
- input_report_key(&(ts_omap.inputdevice), BTN_TOUCH, 1);
+ input_report_key(ts_omap.inputdevice, BTN_TOUCH, 1);
}
ts_omap.touched = 1;
omap_ts_read();
@@ -95,12 +95,12 @@ static void omap_ts_timer(unsigned long
if (ts_omap.touched) {
DEBUG_TS("omap_ts_timer: pen up\n");
ts_omap.touched = 0;
- input_report_abs(&(ts_omap.inputdevice), ABS_X, 0);
- input_report_abs(&(ts_omap.inputdevice), ABS_Y, 0);
- input_report_abs(&(ts_omap.inputdevice), ABS_PRESSURE,
+ input_report_abs(ts_omap.inputdevice, ABS_X, 0);
+ input_report_abs(ts_omap.inputdevice, ABS_Y, 0);
+ input_report_abs(ts_omap.inputdevice, ABS_PRESSURE,
0);
- input_sync(&(ts_omap.inputdevice));
- input_report_key(&(ts_omap.inputdevice), BTN_TOUCH, 0);
+ input_sync(ts_omap.inputdevice);
+ input_report_key(ts_omap.inputdevice, BTN_TOUCH, 0);
}
if (!ts_omap.irq_enabled) {
ts_omap.irq_enabled = 1;
@@ -167,14 +167,14 @@ static int __init omap_ts_probe(struct p
return -EINVAL;
}
- init_input_dev(&(ts_omap.inputdevice));
- ts_omap.inputdevice.name = OMAP_TS_NAME;
- ts_omap.inputdevice.dev = &pdev->dev;
- ts_omap.inputdevice.evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
- ts_omap.inputdevice.keybit[LONG(BTN_TOUCH)] |= BIT(BTN_TOUCH);
- ts_omap.inputdevice.absbit[0] =
+ ts_omap.inputdevice = input_allocate_device();
+ ts_omap.inputdevice->name = OMAP_TS_NAME;
+ ts_omap.inputdevice->dev = &pdev->dev;
+ ts_omap.inputdevice->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+ ts_omap.inputdevice->keybit[LONG(BTN_TOUCH)] |= BIT(BTN_TOUCH);
+ ts_omap.inputdevice->absbit[0] =
BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_PRESSURE);
- input_register_device(&(ts_omap.inputdevice));
+ input_register_device(ts_omap.inputdevice);
ts_omap.dev->enable();
@@ -186,7 +186,7 @@ static int __init omap_ts_probe(struct p
static int omap_ts_remove(struct platform_device *pdev)
{
ts_omap.dev->disable();
- input_unregister_device(&ts_omap.inputdevice);
+ input_unregister_device(ts_omap.inputdevice);
if (ts_omap.irq != -1)
free_irq(ts_omap.irq, &ts_omap);
--- ./drivers/input/touchscreen/omap/omap_ts.h_orig 2006-01-06 16:43:40.000000000 +0100
+++ ./drivers/input/touchscreen/omap/omap_ts.h 2006-01-06 18:48:39.756014904 +0100
@@ -42,7 +42,7 @@ struct ts_device {
};
struct omap_ts_t{
- struct input_dev inputdevice;
+ struct input_dev * inputdevice;
struct timer_list ts_timer; // Timer for triggering acquisitions
int touched;
int irq;
[-- Attachment #3: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH] Convert touchscreen to input_allocate_device
2006-01-06 19:37 ` [PATCH] Convert touchscreen to input_allocate_device Dirk Behme
@ 2006-01-14 0:18 ` Tony Lindgren
0 siblings, 0 replies; 18+ messages in thread
From: Tony Lindgren @ 2006-01-14 0:18 UTC (permalink / raw)
To: Dirk Behme; +Cc: linux-omap-open-source
* Dirk Behme <dirk.behme@de.bosch.com> [060106 11:36]:
> Tony Lindgren wrote:
> >Dirk, I've only pushed Todd's timer fix below like you suggested. Can you
> >please
> >update your patch?
>
> ARM: OMAP: Convert touchscreen to input_allocate_device() to remove:
>
> input: device omap_ts is statically allocated, will not register
> Please convert to input_allocate_device() or contact dtor_core@ameritech.net
Pushing this one today, thanks.
Tony
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH] Re: Pending patches mostly pushed, please check
2006-01-03 19:13 ` Pending patches mostly pushed, please check Tony Lindgren
` (4 preceding siblings ...)
2006-01-06 19:37 ` [PATCH] Convert touchscreen to input_allocate_device Dirk Behme
@ 2006-01-06 19:37 ` Dirk Behme
2006-01-14 0:20 ` Tony Lindgren
5 siblings, 1 reply; 18+ messages in thread
From: Dirk Behme @ 2006-01-06 19:37 UTC (permalink / raw)
To: Tony Lindgren; +Cc: linux-omap-open-source
[-- Attachment #1: Type: text/plain, Size: 392 bytes --]
Hi Tony,
Tony Lindgren wrote:
>>12) ALSA Audio L/R Channel Interchanges fix
>>http://linux.omap.com/pipermail/linux-omap-open-source/2005-December/005971.html
>
> Applied.
Can you check if this is really applied? Using most recent git I can
still apply it ;-)
There were two similiar patches: One for OSS (is applied, number 7 of
the list) and this one for ALSA.
Best regards
Dirk
[-- Attachment #2: audio_alsa_LR.patch --]
[-- Type: text/plain, Size: 3414 bytes --]
--- ./sound/arm/omap-aic23.c_orig 2005-12-02 16:57:32.000000000 +0100
+++ ./sound/arm/omap-aic23.c 2005-12-18 18:17:51.360077016 +0100
@@ -34,6 +34,8 @@
*
* 2005-07-29 INdT Kernel Team - Alsa driver for omap osk. Creation of new
* file omap-aic23.c
+ *
+ * 2005-12-18 Dirk Behme - Added L/R Channel Interchange fix as proposed by Ajaya Babu
*/
#include <linux/config.h>
@@ -156,6 +158,20 @@ static snd_pcm_hw_constraint_list_t hw_c
.mask = 0,
};
+/*
+ * HW interface start and stop helper functions
+ */
+static int audio_ifc_start(void)
+{
+ omap_mcbsp_start(AUDIO_MCBSP);
+ return 0;
+}
+
+static int audio_ifc_stop(void)
+{
+ omap_mcbsp_stop(AUDIO_MCBSP);
+ return 0;
+}
/*
* Codec/mcbsp init and configuration section
@@ -243,12 +259,20 @@ static void omap_aic23_audio_init(struct
SNDRV_PCM_STREAM_PLAYBACK;
omap_aic23->s[SNDRV_PCM_STREAM_PLAYBACK].dma_dev =
OMAP_DMA_MCBSP1_TX;
+ omap_aic23->s[SNDRV_PCM_STREAM_PLAYBACK].hw_start =
+ audio_ifc_start;
+ omap_aic23->s[SNDRV_PCM_STREAM_PLAYBACK].hw_stop =
+ audio_ifc_stop;
omap_aic23->s[SNDRV_PCM_STREAM_CAPTURE].id = "Alsa AIC23 in";
omap_aic23->s[SNDRV_PCM_STREAM_CAPTURE].stream_id =
SNDRV_PCM_STREAM_CAPTURE;
omap_aic23->s[SNDRV_PCM_STREAM_CAPTURE].dma_dev =
OMAP_DMA_MCBSP1_RX;
+ omap_aic23->s[SNDRV_PCM_STREAM_CAPTURE].hw_start =
+ audio_ifc_start;
+ omap_aic23->s[SNDRV_PCM_STREAM_CAPTURE].hw_stop =
+ audio_ifc_stop;
/* configuring the McBSP */
omap_mcbsp_request(AUDIO_MCBSP);
--- ./sound/arm/omap-aic23.h_orig 2005-11-20 17:38:56.000000000 +0100
+++ ./sound/arm/omap-aic23.h 2005-12-18 18:17:51.362076712 +0100
@@ -33,7 +33,8 @@
* 2005/07/25 INdT-10LE Kernel Team - Alsa driver for omap osk,
* original version based in sa1100 driver
* and omap oss driver.
- *
+ *
+ * 2005-12-18 Dirk Behme - Added L/R Channel Interchange fix as proposed by Ajaya Babu
*/
#ifndef __OMAP_AIC23_H
@@ -85,6 +86,8 @@ struct audio_stream {
snd_pcm_substream_t *stream; /* the pcm stream */
unsigned linked:1; /* dma channels linked */
int offset; /* store start position of the last period in the alsa buffer */
+ int (*hw_start)(void); /* interface to start HW interface, e.g. McBSP */
+ int (*hw_stop)(void); /* interface to stop HW interface, e.g. McBSP */
};
/*
--- ./sound/arm/omap-alsa-dma.c_orig 2005-11-20 17:38:56.000000000 +0100
+++ ./sound/arm/omap-alsa-dma.c 2005-12-18 18:17:51.365076256 +0100
@@ -34,7 +34,9 @@
* 2005-07-19 INdT Kernel Team - Alsa port. Creation of new file omap-alsa-dma.c based in
* omap-audio-dma-intfc.c oss file. Support for aic23 codec.
* Removal of buffer handling (Alsa does that), modifications
- * in dma handling and port to alsa structures.
+ * in dma handling and port to alsa structures.
+ *
+ * 2005-12-18 Dirk Behme - Added L/R Channel Interchange fix as proposed by Ajaya Babu
*/
#include <linux/config.h>
@@ -356,8 +358,10 @@ static int audio_start_dma_chain(struct
int channel = s->lch[s->dma_q_head];
FN_IN;
if (!s->started) {
+ s->hw_stop(); /* stops McBSP Interface */
omap_start_dma(channel);
s->started = 1;
+ s->hw_start(); /* start McBSP interface */
}
/* else the dma itself will progress forward with out our help */
FN_OUT(0);
[-- Attachment #3: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread