From: Simon Horman <horms@verge.net.au>
To: linux-sh@vger.kernel.org
Subject: Re: [PATCH] ARM: shmobile: armadillo800eva: __io abuse cleanup
Date: Fri, 12 Oct 2012 04:32:01 +0000 [thread overview]
Message-ID: <20121012043159.GD15421@verge.net.au> (raw)
In-Reply-To: <87fw7w38mf.wl%kuninori.morimoto.gx@renesas.com>
On Thu, Oct 11, 2012 at 06:24:46PM -0700, Kuninori Morimoto wrote:
> a2a47ca36642e3995e982957bc42678cf11ca6ac
> (ARM: __io abuse cleanup) cleanuped __io() -> IOMEM(),
> but armadillo800eva was a outside of a target,
> since "merge window" timing issue.
> This patch cleanup it, and enabled CONFIG_CACHE_L2X0
Hi Morimoto-san,
could you please split this into two patches?
One for the IOMEM annotation. And one for the defconfig change.
The reason being that the changes do not appear to be dependent on each other
even though they both relate to L2X0.
Also, could you indicate if either of the changes are fixes
and thus appropriate for 3.7?
Thanks
> Cc: Masahiro Nakai <nakai@atmark-techno.com>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
> arch/arm/configs/armadillo800eva_defconfig | 2 +-
> arch/arm/mach-shmobile/board-armadillo800eva.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig
> index f78d259..a18593d 100644
> --- a/arch/arm/configs/armadillo800eva_defconfig
> +++ b/arch/arm/configs/armadillo800eva_defconfig
> @@ -20,7 +20,7 @@ CONFIG_MACH_ARMADILLO800EVA=y
> # CONFIG_SH_TIMER_TMU is not set
> CONFIG_ARM_THUMB=y
> CONFIG_CPU_BPREDICT_DISABLE=y
> -# CONFIG_CACHE_L2X0 is not set
> +CONFIG_CACHE_L2X0=y
> CONFIG_ARM_ERRATA_430973=y
> CONFIG_ARM_ERRATA_458693=y
> CONFIG_ARM_ERRATA_460075=y
> diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
> index 2912eab..3cc8b1c 100644
> --- a/arch/arm/mach-shmobile/board-armadillo800eva.c
> +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
> @@ -1196,7 +1196,7 @@ static void __init eva_init(void)
>
> #ifdef CONFIG_CACHE_L2X0
> /* Early BRESP enable, Shared attribute override enable, 32K*8way */
> - l2x0_init(__io(0xf0002000), 0x40440000, 0x82000fff);
> + l2x0_init(IOMEM(0xf0002000), 0x40440000, 0x82000fff);
> #endif
>
> i2c_register_board_info(0, i2c0_devices, ARRAY_SIZE(i2c0_devices));
> --
> 1.7.9.5
>
next prev parent reply other threads:[~2012-10-12 4:32 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-09 6:03 [PATCH] ARM: shmobile: armadillo800eva: fixup: sound card detection order Kuninori Morimoto
2012-08-27 8:48 ` Simon Horman
2012-08-31 6:33 ` Simon Horman
2012-09-03 6:06 ` [PATCH] ARM: shmobile: armadillo800eva: enable rw rootfs mount Kuninori Morimoto
2012-09-03 8:34 ` Simon Horman
2012-09-13 3:10 ` [PATCH] ARM: shmobile: armadillo800eva: Add support RTC Nobuhiro Iwamatsu
2012-09-13 4:06 ` Simon Horman
2012-09-13 5:11 ` Nobuhiro Iwamatsu
2012-10-12 1:24 ` [PATCH] ARM: shmobile: armadillo800eva: __io abuse cleanup Kuninori Morimoto
2012-10-12 1:39 ` [PATCH] ARM: shmobile: armadillo800eva: enable restart Kuninori Morimoto
2012-10-12 4:25 ` Simon Horman
2012-10-12 4:32 ` Simon Horman [this message]
2013-01-18 5:02 ` [PATCH] ARM: shmobile: armadillo800eva: set clock rates before timer init Hideki EIRAKU
2013-01-18 6:28 ` Kuninori Morimoto
2013-01-30 4:23 ` Simon Horman
2013-04-15 4:44 ` [PATCH] arm: shmobile: armadillo800eva: Fix maximum number of SCIF Nobuhiro Iwamatsu
2013-04-16 2:35 ` Simon Horman
2013-07-02 15:24 ` [PATCH] ARM: shmobile: armadillo800eva: add DMA support to MMCIF Guennadi Liakhovetski
2013-07-03 6:05 ` Simon Horman
2013-07-24 8:16 ` [PATCH] ARM: shmobile: armadillo800eva: tidyup ST1232 pin settings Kuninori Morimoto
2013-07-24 9:58 ` Laurent Pinchart
2013-07-25 0:50 ` [PATCH] ARM: shmobile: armadillo800eva: Don't request GPIO 166 in board code Kuninori Morimoto
2013-12-18 14:03 ` [PATCH] ARM: shmobile: armadillo800eva: Enable backlight control in defconfig Laurent Pinchart
2013-12-19 6:13 ` Simon Horman
2014-04-14 0:59 ` [PATCH] ARM: shmobile: armadillo800eva: fixup SND_SOC_DAIFMT_CBx_CFx flags Kuninori Morimoto
2014-04-14 3:48 ` Simon Horman
2014-05-28 2:57 ` [PATCH] ARM: shmobile: armadillo800eva: fixup HDMI sound flags setting Kuninori Morimoto
2014-05-28 4:06 ` Simon Horman
2014-05-28 4:23 ` Kuninori Morimoto
2014-05-28 4:41 ` Simon Horman
2014-05-28 8:47 ` Geert Uytterhoeven
2014-08-11 2:38 ` [PATCH] ARM: shmobile: armadillo800eva: Sort includes Simon Horman
2014-08-22 1:47 ` Simon Horman
2014-09-02 1:16 ` Simon Horman
2014-09-24 0:59 ` Simon Horman
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=20121012043159.GD15421@verge.net.au \
--to=horms@verge.net.au \
--cc=linux-sh@vger.kernel.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).