From: s.hauer@pengutronix.de (Sascha Hauer)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 6/7] add macro definitions according to ehci-mxc driver change
Date: Wed, 20 Jul 2011 21:43:18 +0200 [thread overview]
Message-ID: <20110720194318.GO26347@pengutronix.de> (raw)
In-Reply-To: <1311160106-4898-7-git-send-email-tony.lin@freescale.com>
On Wed, Jul 20, 2011 at 07:08:25PM +0800, Tony Lin wrote:
> Signed-off-by: Tony Lin <tony.lin@freescale.com>
> ---
> arch/arm/mach-mxs/include/mach/hardware.h | 2 ++
> arch/arm/mach-mxs/include/mach/mxs.h | 12 +++++++++++-
> arch/arm/plat-mxc/include/mach/mxc.h | 3 +++
> 3 files changed, 16 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-mxs/include/mach/hardware.h b/arch/arm/mach-mxs/include/mach/hardware.h
> index 53e89a0..affa72b 100644
> --- a/arch/arm/mach-mxs/include/mach/hardware.h
> +++ b/arch/arm/mach-mxs/include/mach/hardware.h
> @@ -26,4 +26,6 @@
> #define IOMEM(addr) ((void __force __iomem *)(addr))
> #endif
>
> +#include "mxs.h"
> +
> #endif /* __MACH_MXS_HARDWARE_H__ */
> diff --git a/arch/arm/mach-mxs/include/mach/mxs.h b/arch/arm/mach-mxs/include/mach/mxs.h
> index 35a89dd..6e5928d 100644
> --- a/arch/arm/mach-mxs/include/mach/mxs.h
> +++ b/arch/arm/mach-mxs/include/mach/mxs.h
> @@ -35,7 +35,17 @@
> machine_is_mx28evk() || \
> machine_is_tx28() || \
> 0)
> -
> +#define cpu_is_mx1() (0)
> +#define cpu_is_mx21() (0)
> +#define cpu_is_mx25() (0)
> +#define cpu_is_mx27() (0)
> +#define cpu_is_mx31() (0)
> +#define cpu_is_mx35() (0)
> +#define cpu_is_mx50() (0)
> +#define cpu_is_mx51() (0)
> +#define cpu_is_mx53() (0)
> +#define cpu_is_mx3() (cpu_is_mx31() || cpu_is_mx35())
> +#define cpu_is_mx2() (cpu_is_mx21() || cpu_is_mx27())
As said before, please get rid of the usage of the macros in the driver
instead.
BTW this patch would have to be earlier in the series to maintain
bisectability.
Sascha
> /*
> * IO addresses common to MXS-based
> */
> diff --git a/arch/arm/plat-mxc/include/mach/mxc.h b/arch/arm/plat-mxc/include/mach/mxc.h
> index 0987923..d4dbe9e 100644
> --- a/arch/arm/plat-mxc/include/mach/mxc.h
> +++ b/arch/arm/plat-mxc/include/mach/mxc.h
> @@ -176,6 +176,9 @@ extern unsigned int __mxc_cpu_type;
> # define cpu_is_mx53() (0)
> #endif
>
> +# define cpu_is_mx23() (0)
> +# define cpu_is_mx28() (0)
> +
> #ifndef __ASSEMBLY__
>
> struct cpu_op {
> --
> 1.7.0.4
>
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
next prev parent reply other threads:[~2011-07-20 19:43 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-20 11:08 [PATCH 0/7] ARM: mx28: add usb host function Tony Lin
2011-07-20 10:57 ` Felipe Balbi
2011-07-20 11:08 ` [PATCH 1/7] consolidate definitions and structures to share among platforms Tony Lin
2011-07-20 10:59 ` Felipe Balbi
2011-07-20 11:03 ` Lin Tony-B19295
2011-07-20 11:16 ` Felipe Balbi
2011-07-20 11:21 ` Lin Tony-B19295
2011-07-20 11:08 ` [PATCH 2/7] enable usb1 phy power supply Tony Lin
2011-07-20 11:01 ` Felipe Balbi
2011-07-20 11:41 ` Wolfram Sang
2011-07-22 2:16 ` Lin Tony-B19295
2011-07-20 19:08 ` Sascha Hauer
2011-07-22 2:20 ` Lin Tony-B19295
2011-07-20 11:08 ` [PATCH 3/7] add usb phy clocks to clock tree Tony Lin
2011-07-20 11:02 ` Felipe Balbi
2011-07-20 11:05 ` Lin Tony-B19295
2011-07-20 19:10 ` Sascha Hauer
2011-07-22 6:02 ` Lin Tony-B19295
2011-07-22 9:18 ` Sascha Hauer
2011-07-20 11:08 ` [PATCH 4/7] mx28: add usb host phy functions Tony Lin
2011-07-20 11:12 ` Felipe Balbi
2011-07-20 19:26 ` Sascha Hauer
2011-07-22 2:23 ` Lin Tony-B19295
2011-07-21 6:04 ` Lothar Waßmann
2011-07-20 11:08 ` [PATCH 5/7] ehci mxc: make it more flexible to be used for mx28 Tony Lin
2011-07-20 11:05 ` Arnaud Patard (Rtp)
2011-07-20 11:08 ` Lin Tony-B19295
2011-07-20 11:45 ` Wolfram Sang
2011-07-20 11:14 ` Felipe Balbi
2011-07-20 11:21 ` Lin Tony-B19295
2011-07-20 11:23 ` Felipe Balbi
2011-07-20 11:25 ` Lin Tony-B19295
2011-07-20 11:27 ` Felipe Balbi
2011-07-20 13:59 ` Alan Stern
2011-07-22 5:18 ` Lin Tony-B19295
2011-07-20 19:41 ` Sascha Hauer
2011-07-20 11:08 ` [PATCH 6/7] add macro definitions according to ehci-mxc driver change Tony Lin
2011-07-20 19:43 ` Sascha Hauer [this message]
2011-07-21 6:06 ` Lothar Waßmann
2011-07-20 11:08 ` [PATCH 7/7] add usb host function to default config Tony Lin
2011-07-20 20:07 ` [PATCH 0/7] ARM: mx28: add usb host function Sascha Hauer
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=20110720194318.GO26347@pengutronix.de \
--to=s.hauer@pengutronix.de \
--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).