From: khilman@ti•com (Kevin Hilman)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v8 00/20] OMAP2+: UART: Runtime adaptation + cleanup
Date: Tue, 13 Dec 2011 11:26:40 -0800 [thread overview]
Message-ID: <87fwgow9vz.fsf@ti.com> (raw)
In-Reply-To: <CAAL8m4wGN5ykm3-+xrGPe-WJUDBdterxAyZ=C3kH862+n1DprQ@mail.gmail.com> (Govindraj's message of "Tue, 13 Dec 2011 18:31:13 +0530")
Govindraj <govindraj.ti@gmail•com> writes:
[...]
> I have re-based this patch series against LO master
> commit id: deee6d5359969a0ce4e2760cfd7b9f379bd5698a
>
> Same is available here [1]
>
> I have tested this patch series along with:
>
> 1.) Tero's V11 irq chaining series
> http://www.spinics.net/lists/linux-omap/msg61445.html
> (This patch series is used for uart wakeup handling using
> prcm_irq chaining)
>
> 2.) Rajendra's hwmod change
> http://www.spinics.net/lists/arm-kernel/msg148632.html
> (This patch handles init_no_idle flag setting
> without this patch there will be boot warning however
> all pm features will work after boot up.)
>
> 3.) Vishwa's io daisy chain changes.
> http://permalink.gmane.org/gmane.linux.ports.arm.omap/65500
> (tested with and without this patch series pm features works).
>
> Same combination of patches based on above commit id
> used for testing is available here [2].
Please have a closer look at your branch.
The second commit[1] commits the .rej file from a failed patch apply,
so obviously doesn't do what was intended.
Kevin
[1]
>From ae5d13382a5784f35f5bfe05413fbec4632e58f0 Mon Sep 17 00:00:00 2001
From: "Govindraj.R" <govindraj.raja@ti•com>
Date: Tue, 13 Sep 2011 13:32:32 +0530
Subject: [PATCH] OMAP2+: UART: cleanup 8250 console driver support
We had been using traditional 8250 driver as uart console driver
prior to omap-serial driver. Since we have omap-serial driver
in mainline kernel for some time now it has been used as default
uart console driver on omap2+ platforms. Remove 8250 support for
omap-uarts.
Serial_in and serial_out override for 8250 serial driver is also
removed. Empty fifo read fix is already taken care with omap-serial
driver with data ready bit check from LSR reg before reading RX fifo.
Also waiting for THRE(transmit hold reg empty) is done with wait_for_xmitr
in omap-serial driver.
Serial_in/out overrides are not neceesary for omap-serial driver
and things that are taken with omap-serial driver are removed here.
Remove headers that were necessary to support 8250 support
and remove all config bindings done to keep 8250 backward compatibility
while adding omap-serial driver. Remove omap_uart_reset needed for
8250 autoconf.
Signed-off-by: Govindraj.R <govindraj.raja@ti•com>
---
arch/arm/mach-omap2/serial.c.rej | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/mach-omap2/serial.c.rej
diff --git a/arch/arm/mach-omap2/serial.c.rej b/arch/arm/mach-omap2/serial.c.rej
new file mode 100644
index 0000000..2325897
--- /dev/null
+++ b/arch/arm/mach-omap2/serial.c.rej
@@ -0,0 +1,26 @@
+--- arch/arm/mach-omap2/serial.c
++++ arch/arm/mach-omap2/serial.c
+@@ -19,23 +19,17 @@
+ */
+ #include <linux/kernel.h>
+ #include <linux/init.h>
+-#include <linux/serial_reg.h>
+ #include <linux/clk.h>
+ #include <linux/io.h>
+ #include <linux/delay.h>
+ #include <linux/platform_device.h>
+ #include <linux/slab.h>
+-#include <linux/serial_8250.h>
+ #include <linux/pm_runtime.h>
+ #include <linux/console.h>
+
+-#ifdef CONFIG_SERIAL_OMAP
+ #include <plat/omap-serial.h>
+-#endif
+-
+ #include <plat/common.h>
+ #include <plat/board.h>
+-#include <plat/clock.h>
+ #include <plat/dma.h>
+ #include <plat/omap_hwmod.h>
+ #include <plat/omap_device.h>
--
1.7.6
next prev parent reply other threads:[~2011-12-13 19:26 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-11 9:57 [PATCH v8 00/20] OMAP2+: UART: Runtime adaptation + cleanup Govindraj.R
2011-11-11 9:57 ` [PATCH v8 01/20] OMAP2+: UART: cleanup + remove uart pm specific API Govindraj.R
2011-11-11 9:57 ` [PATCH v8 02/20] OMAP2+: UART: cleanup 8250 console driver support Govindraj.R
2011-11-11 9:57 ` [PATCH v8 03/20] OMAP2+: UART: Cleanup part of clock gating mechanism for uart Govindraj.R
2011-11-11 9:57 ` [PATCH v8 04/20] OMAP2+: UART: Add default mux for all uarts Govindraj.R
2011-11-11 9:57 ` [PATCH v8 05/20] OMAP2+: UART: Remove mapbase/membase fields from pdata Govindraj.R
2011-11-11 9:57 ` [PATCH v8 06/20] OMAP2+: UART: Add runtime pm support for omap-serial driver Govindraj.R
2011-11-11 9:57 ` [PATCH v8 07/20] OMAP2+: UART: Remove context_save and move context restore to driver Govindraj.R
2011-11-11 9:57 ` [PATCH v8 08/20] OMAP2+: UART: Ensure all reg values configured are available from port structure Govindraj.R
2011-11-11 9:57 ` [PATCH v8 09/20] OMAP2+: UART: Remove uart reset function Govindraj.R
2011-12-07 0:21 ` [PATCH v8 00/20] OMAP2+: UART: Runtime adaptation + cleanup Kevin Hilman
2011-12-07 0:46 ` Alan Cox
2011-12-13 14:15 ` Rajendra Nayak
2011-12-13 17:35 ` Kevin Hilman
2011-12-13 13:01 ` Govindraj
2011-12-13 19:26 ` Kevin Hilman [this message]
2011-12-14 8:46 ` Govindraj
2011-12-14 15:29 ` Kevin Hilman
2011-12-14 16:20 ` Govindraj
2011-12-14 18:56 ` Kevin Hilman
2011-12-13 23:32 ` Kevin Hilman
2011-12-14 9:21 ` Govindraj
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87fwgow9vz.fsf@ti.com \
--to=khilman@ti$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox