omap fixes for merge window
Hi Arnd & Olof,
Here's a set of fixes that would be nice to get merged during the merge window before the GPIO changes get merged to avoid boot issues on many omap boards.
The changes queued in the GPIO tree require getting rid of OMAP_GPIO_IRQ and use gpio_to_irq() instead. This is needed for dynamically allocated GPIO interrupt ranges.
Ideally these changes would have been done way earlier of course. Unfortunately this issue was not discovered until last week while testing linux-next.
Also included is one fix for the wrong __init changes for display.c.
This branch is based on the previously merged fixes-non-critical-part3 as that's pretty much the earliest point where these apply.
Note that these might add on a bit to the existing trivial merge conflicts with drivers/video related board file clean-up queued by Tomi.
Regards,
Tony
The following changes since commit 4647ca5761f5534470e98d06494403a2fd0d7b32:
Tony Lindgren (1):
ARM: OMAP2+: Fix build for omap4 only builds with missing include of linux/bug.h
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap cleanup-fixes
Tarun Kanti DebBarma (3):
ARM: OMAP: boards: Fix OMAP_GPIO_IRQ usage with gpio_to_irq()
drivers: input: Fix OMAP_GPIO_IRQ with gpio_to_irq() in ams_delta_serio_exit()
ARM: OMAP: Remove OMAP_GPIO_IRQ macro definition
Tomi Valkeinen (1):
ARM: OMAP2+: Remove __init from DSI mux functions
arch/arm/mach-omap1/board-h2.c | 8 ++++---- arch/arm/mach-omap1/board-h3.c | 9 ++++----- arch/arm/mach-omap1/board-htcherald.c | 6 +++--- arch/arm/mach-omap1/board-innovator.c | 4 ++-- arch/arm/mach-omap1/board-nokia770.c | 2 +- arch/arm/mach-omap1/board-osk.c | 12 ++++++------ arch/arm/mach-omap1/board-palmte.c | 2 +- arch/arm/mach-omap1/board-palmtt.c | 2 +- arch/arm/mach-omap1/board-palmz71.c | 2 +- arch/arm/mach-omap1/board-voiceblue.c | 16 +++++++--------- arch/arm/mach-omap2/board-2430sdp.c | 2 +- arch/arm/mach-omap2/board-4430sdp.c | 2 +- arch/arm/mach-omap2/board-apollon.c | 6 ++++-- arch/arm/mach-omap2/board-devkit8000.c | 3 ++- arch/arm/mach-omap2/board-h4.c | 2 +- arch/arm/mach-omap2/board-omap3evm.c | 2 +- arch/arm/mach-omap2/board-omap4panda.c | 2 +- arch/arm/mach-omap2/board-rx51-peripherals.c | 3 ++- arch/arm/mach-omap2/board-zoom-debugboard.c | 3 ++- arch/arm/mach-omap2/board-zoom-peripherals.c | 6 ++++-- arch/arm/mach-omap2/common-board-devices.c | 2 +- arch/arm/mach-omap2/display.c | 8 ++++---- arch/arm/plat-omap/include/plat/gpio.h | 4 ---- drivers/input/serio/ams_delta_serio.c | 2 +- 24 files changed, 55 insertions(+), 55 deletions(-)
Hi Tony,
Quoted 9 lines · Tony Lindgren
Hi Arnd & Olof,
Here's a set of fixes that would be nice to get merged during the merge window before the GPIO changes get merged to avoid boot issues on many omap boards.
The changes queued in the GPIO tree require getting rid of
OMAP_GPIO_IRQand usegpio_to_irq()instead. This is needed for dynamically allocated GPIO interrupt ranges.
Sorry for the slow response on this, we've been focused on getting the main pulls going in. I'm about to start a fixes branch now and looked at this pull request.
I replied to one of the original patches in this branch, they need to be fixed before they can go in:
http://marc.info/?l=linux-omap&m=133299716528617&w=2
Also, that way we can get a clean branch based on current mainline without merge conflicts.
-Olof
Quoted 13 lines · Olof Johansson
Hi Tony,
Quoted 9 lines · Tony Lindgren
Hi Arnd & Olof,
Here's a set of fixes that would be nice to get merged during the merge window before the GPIO changes get merged to avoid boot issues on many omap boards.
The changes queued in the GPIO tree require getting rid of
OMAP_GPIO_IRQand usegpio_to_irq()instead. This is needed for dynamically allocated GPIO interrupt ranges.
Quoted 8 lines
Sorry for the slow response on this, we've been focused on getting the main pulls going in. I'm about to start a fixes branch now and looked at this pull request.
I replied to one of the original patches in this branch, they need to be fixed before they can go in:
Thanks, that's a good catch.
Quoted 2 lines
Also, that way we can get a clean branch based on current mainline without merge conflicts.
Yes will do.
Regards,
Tony
Quoted 21 lines · Tony Lindgren
Quoted 20 lines · Olof Johansson
Hi Tony,
Quoted 9 lines · Tony Lindgren
Hi Arnd & Olof,
Here's a set of fixes that would be nice to get merged during the merge window before the GPIO changes get merged to avoid boot issues on many omap boards.
The changes queued in the GPIO tree require getting rid of
OMAP_GPIO_IRQand usegpio_to_irq()instead. This is needed for dynamically allocated GPIO interrupt ranges.Sorry for the slow response on this, we've been focused on getting the main pulls going in. I'm about to start a fixes branch now and looked at this pull request.
I replied to one of the original patches in this branch, they need to be fixed before they can go in:
Quoted 8 lines
Quoted 1 line
Thanks, that's a good catch.
Quoted 2 lines
Also, that way we can get a clean branch based on current mainline without merge conflicts.
Yes will do.
Olof, here's an updated pull request for your fixes staging branch.
This contains the updated gpio_to_irq patches from Tarun, and a trivial build fix from Govindraj to #include <asm/system_misc.h> in pm.c. The DSI mux patch is the same.
Note that the branch name is now just fixes as the necessary commits are now all in the mainline tree.
Regards,
Tony
The following changes since commit 0195c00244dc2e9f522475868fa278c473ba7339:
Linus Torvalds (1):
Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/.../dhowells/linux-asm_system
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap fixes
Govindraj.R (1):
ARM: OMAP: pm: fix compilation break
Tarun Kanti DebBarma (3):
ARM: OMAP: boards: Fix OMAP_GPIO_IRQ usage with gpio_to_irq()
drivers: input: Fix OMAP_GPIO_IRQ with gpio_to_irq() in ams_delta_serio_exit()
ARM: OMAP: Remove OMAP_GPIO_IRQ macro definition
Tomi Valkeinen (1):
ARM: OMAP2+: Remove __init from DSI mux functions
Tony Lindgren (2):
Merge branch 'fix-dss-mux' into fixes
Merge branch 'fixes-gpio-to-irq' into fixes
arch/arm/mach-omap1/board-h2.c | 8 ++++---- arch/arm/mach-omap1/board-h3.c | 9 ++++----- arch/arm/mach-omap1/board-htcherald.c | 6 +++--- arch/arm/mach-omap1/board-innovator.c | 4 ++-- arch/arm/mach-omap1/board-nokia770.c | 2 +- arch/arm/mach-omap1/board-osk.c | 12 ++++++------ arch/arm/mach-omap1/board-palmte.c | 2 +- arch/arm/mach-omap1/board-palmtt.c | 2 +- arch/arm/mach-omap1/board-palmz71.c | 2 +- arch/arm/mach-omap1/board-voiceblue.c | 16 +++++++--------- arch/arm/mach-omap1/pm.c | 1 + arch/arm/mach-omap2/board-2430sdp.c | 2 +- arch/arm/mach-omap2/board-4430sdp.c | 2 +- arch/arm/mach-omap2/board-apollon.c | 4 ++-- arch/arm/mach-omap2/board-devkit8000.c | 2 +- arch/arm/mach-omap2/board-h4.c | 2 +- arch/arm/mach-omap2/board-omap3evm.c | 2 +- arch/arm/mach-omap2/board-omap4panda.c | 2 +- arch/arm/mach-omap2/board-rx51-peripherals.c | 3 ++- arch/arm/mach-omap2/board-zoom-debugboard.c | 3 ++- arch/arm/mach-omap2/board-zoom-peripherals.c | 6 ++++-- arch/arm/mach-omap2/common-board-devices.c | 2 +- arch/arm/mach-omap2/display.c | 8 ++++---- arch/arm/mach-omap2/pm.c | 2 ++ arch/arm/plat-omap/include/plat/gpio.h | 4 ---- drivers/input/serio/ams_delta_serio.c | 2 +- 26 files changed, 55 insertions(+), 55 deletions(-)
Quoted 45 lines · Tony Lindgren
Quoted 21 lines · Tony Lindgren
Quoted 20 lines · Olof Johansson
Hi Tony,
Quoted 9 lines · Tony Lindgren
Hi Arnd & Olof,
Here's a set of fixes that would be nice to get merged during the merge window before the GPIO changes get merged to avoid boot issues on many omap boards.
The changes queued in the GPIO tree require getting rid of
OMAP_GPIO_IRQand usegpio_to_irq()instead. This is needed for dynamically allocated GPIO interrupt ranges.Sorry for the slow response on this, we've been focused on getting the main pulls going in. I'm about to start a fixes branch now and looked at this pull request.
I replied to one of the original patches in this branch, they need to be fixed before they can go in:
Quoted 8 lines
Quoted 1 line
Thanks, that's a good catch.
Quoted 2 lines
Also, that way we can get a clean branch based on current mainline without merge conflicts.
Yes will do.
Olof, here's an updated pull request for your fixes staging branch.
This contains the updated
gpio_to_irqpatches from Tarun, and a trivial build fix from Govindraj to #include <asm/system_misc.h> inpm.c. The DSI mux patch is the same.Note that the branch name is now just fixes as the necessary commits are now all in the mainline tree.
Regards,
Tony
Quoted 7 lines
The following changes since commit
0195c00244dc2e9f522475868fa278c473ba7339:
?Linus Torvalds (1):
? ? ? ?Merge tag 'split-asm_system_h-for-linus-20120328' ofgit://git.kernel.org/.../dhowells/linux-asm_systemare available in the git repository at:
?git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap fixe
Thanks, pulled.
-Olof