From: robherring2@gmail.com (Rob Herring)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 7/8] ARM: OMAP: Remove plat/io.h by moving it into mach/io.h
Date: Wed, 29 Feb 2012 21:34:08 -0600 [thread overview]
Message-ID: <4F4EEE30.9080109@gmail.com> (raw)
In-Reply-To: <20120301010348.GV18901@atomide.com>
On 02/29/2012 07:03 PM, Tony Lindgren wrote:
> * Tony Lindgren <tony@atomide.com> [120229 16:08]:
>> * Russell King - ARM Linux <linux@arm.linux.org.uk> [120229 15:40]:
>>> On Wed, Feb 29, 2012 at 05:59:27PM -0600, Rob Herring wrote:
>>>> BTW, all these includes need to get removed. I'll add a fix to my series
>>>> unless you already have fixes:
>>>>
>>>> arch/arm/mach-omap1/sleep.S:#include <mach/io.h>
>>>> arch/arm/mach-omap1/sram.S:#include <mach/io.h>
>>>> arch/arm/plat-omap/include/plat/sdrc.h:#include <mach/io.h>
>>>> drivers/media/video/davinci/vpbe_osd.c:#include <mach/io.h>
>>>> drivers/media/video/davinci/vpbe_venc.c:#include <mach/io.h>
>>>> drivers/video/omap2/vrfb.c:#include <mach/io.h>
>>>
>>> All the ones included from .h and .c files should be using linux/io.h
>>> and not some other derivative.
>>
>> Oops looks like I missed some files while fixing up the .c files.
>> The .S files should be able to just use the local header now.
>>
>> I'll do a patch for that, won't touch the davinci files though.
>
> Here's the patch to remove mach/io.h for omaps. We can now remove
> all of them like Rob suggested :)
>
> Rob, I assume you'll apply this into your branch?
>
Yes
> Regards,
>
> Tony
>
>
> From: Tony Lindgren <tony@atomide.com>
> Date: Wed, 29 Feb 2012 17:01:22 -0800
> Subject: [PATCH] ARM: OMAP: Remove remaining includes for mach/io.h
>
> These are no longer needed with the recent iomap.h
> changes.
>
> Reported-by: Rob Herring <robherring2@gmail.com>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
>
> --- a/arch/arm/mach-omap1/include/mach/entry-macro.S
> +++ b/arch/arm/mach-omap1/include/mach/entry-macro.S
> @@ -11,7 +11,6 @@
> */
>
> #include <mach/hardware.h>
> -#include <mach/io.h>
> #include <mach/irqs.h>
>
> #include "../../iomap.h"
> --- a/arch/arm/mach-omap1/sram.S
> +++ b/arch/arm/mach-omap1/sram.S
> @@ -12,7 +12,6 @@
>
> #include <asm/assembler.h>
>
> -#include <mach/io.h>
> #include <mach/hardware.h>
>
> #include "iomap.h"
> --- a/arch/arm/plat-omap/include/plat/sdrc.h
> +++ b/arch/arm/plat-omap/include/plat/sdrc.h
> @@ -16,8 +16,6 @@
> * published by the Free Software Foundation.
> */
>
> -#include <mach/io.h>
> -
I added iomap.h here as there are macros in the header from it.
Rob
> /* SDRC register offsets - read/write with sdrc_{read,write}_reg() */
>
> #define SDRC_SYSCONFIG 0x010
> --- a/drivers/video/omap2/vrfb.c
> +++ b/drivers/video/omap2/vrfb.c
> @@ -27,7 +27,6 @@
> #include <linux/bitops.h>
> #include <linux/mutex.h>
>
> -#include <mach/io.h>
> #include <plat/vrfb.h>
> #include <plat/sdrc.h>
>
next prev parent reply other threads:[~2012-03-01 3:34 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-21 23:40 [PATCH 0/8] Split omap plat/io.h into local iomap.h files Tony Lindgren
2012-02-21 23:40 ` [PATCH 1/8] ARM: OMAP2+: Move DISPC L3 firewall to happen in omap_display_init() Tony Lindgren
2012-02-22 8:09 ` Tomi Valkeinen
2012-02-22 19:05 ` Tony Lindgren
2012-02-22 22:17 ` Tony Lindgren
2012-02-21 23:40 ` [PATCH 2/8] ARM: OMAP2+: Move SDRC related functions from io.h into local common.h Tony Lindgren
2012-02-21 23:40 ` [PATCH 3/8] ARM: OMAP: Move omap_init_consistent_dma_size() to " Tony Lindgren
2012-02-21 23:40 ` [PATCH 4/8] ARM: OMAP1: Move 16xx GPIO system clock to platform init code Tony Lindgren
2012-02-23 23:42 ` Tony Lindgren
2012-03-12 17:30 ` Grant Likely
2012-03-12 18:05 ` Tony Lindgren
2012-02-21 23:40 ` [PATCH 5/8] ARM: OMAP1: Move most of plat/io.h into local iomap.h Tony Lindgren
2012-02-23 23:44 ` Tony Lindgren
2012-02-21 23:40 ` [PATCH 6/8] ARM: OMAP2+: " Tony Lindgren
2012-02-23 23:46 ` Tony Lindgren
2012-02-21 23:40 ` [PATCH 7/8] ARM: OMAP: Remove plat/io.h by moving it into mach/io.h Tony Lindgren
2012-02-22 2:24 ` Rob Herring
2012-02-24 0:06 ` Tony Lindgren
2012-02-24 18:22 ` Tony Lindgren
2012-02-27 3:47 ` Rob Herring
2012-02-29 1:47 ` Tony Lindgren
2012-02-29 1:49 ` Tony Lindgren
2012-02-29 23:59 ` Rob Herring
2012-03-01 0:11 ` Russell King - ARM Linux
2012-03-01 0:39 ` Tony Lindgren
2012-03-01 1:03 ` Tony Lindgren
2012-03-01 3:34 ` Rob Herring [this message]
2012-03-01 3:46 ` Tony Lindgren
2012-03-01 3:53 ` Rob Herring
2012-03-01 4:54 ` Tony Lindgren
2012-02-21 23:40 ` [PATCH 8/8] ARM: OMAP2+: Limit omap_read/write usage to legacy USB drivers Tony Lindgren
2012-02-22 8:14 ` Tomi Valkeinen
2012-02-22 18:57 ` Tony Lindgren
2012-02-22 22:44 ` Tony Lindgren
2012-02-24 18:25 ` Tony Lindgren
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=4F4EEE30.9080109@gmail.com \
--to=robherring2@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).