From: arnd@arndb•de (Arnd Bergmann)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 2/6 v2] ARM: integrator: check PL010 device name rather than base address
Date: Sat, 1 Sep 2012 18:32:47 +0000 [thread overview]
Message-ID: <201209011832.47805.arnd@arndb.de> (raw)
In-Reply-To: <1346471760-23993-2-git-send-email-linus.walleij@linaro.org>
On Saturday 01 September 2012, Linus Walleij wrote:
> In the PL010 UART callback a comparison against the base address is
> done to figure out which UART is doing the callback. This does not
> play well with device tree, so let's check the dev_name() of the
> device instead.
>
> Signed-off-by: Linus Walleij <linus.walleij@linaro•org>
Hmm, I think the dev_name would also not be that nice, because it changes
after the conversion to DT is complete.
> arch/arm/mach-integrator/core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c
> index 5ba4bc8..67ea181 100644
> --- a/arch/arm/mach-integrator/core.c
> +++ b/arch/arm/mach-integrator/core.c
> @@ -100,7 +100,7 @@ static void integrator_uart_set_mctrl(struct amba_device *dev, void __iomem *bas
> {
> unsigned int ctrls = 0, ctrlc = 0, rts_mask, dtr_mask;
>
> - if (dev == &uart0_device) {
> + if (!strcmp(dev_name(&dev->dev), "uart0")) {
> rts_mask = 1 << 4;
> dtr_mask = 1 << 5;
> } else {
Maybe it's possible to compare the base pointer against INTEGRATOR_UART0_BASE instead?
Arnd
next prev parent reply other threads:[~2012-09-01 18:32 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-01 3:55 [PATCH 1/6 v2] ARM: integrator: call common init function from machine Linus Walleij
2012-09-01 3:55 ` [PATCH 2/6 v2] ARM: integrator: check PL010 device name rather than base address Linus Walleij
2012-09-01 3:55 ` [PATCH 3/6 v2] ARM: plat-versatile: add DT support to FPGA IRQ controller Linus Walleij
2012-09-01 3:55 ` [PATCH 4/6 v2] ARM: integrator: initial device tree support Linus Walleij
2012-09-01 3:55 ` [PATCH 5/6 v2] ARM: integrator: convert AMBA devices to device tree Linus Walleij
2012-09-01 3:55 ` [PATCH 6/6 v2] ARM: integrator: convert platform devices to Device Tree Linus Walleij
2012-09-01 18:41 ` [PATCH 4/6 v2] ARM: integrator: initial device tree support Arnd Bergmann
2012-09-03 21:43 ` Linus Walleij
2012-09-03 21:55 ` Russell King - ARM Linux
2012-09-04 7:19 ` Linus Walleij
2012-09-05 5:34 ` Olof Johansson
2012-09-05 5:47 ` Linus Walleij
2012-09-02 22:59 ` Rob Herring
2012-09-03 21:51 ` Linus Walleij
2012-09-06 13:20 ` Rob Herring
2012-09-06 13:56 ` Linus Walleij
2012-09-06 14:19 ` Arnd Bergmann
2012-09-12 16:52 ` Linus Walleij
2012-09-06 15:35 ` Rob Herring
2012-09-06 14:14 ` Russell King - ARM Linux
2012-09-01 18:32 ` Arnd Bergmann [this message]
2012-09-03 19:40 ` [PATCH 2/6 v2] ARM: integrator: check PL010 device name rather than base address Linus Walleij
2012-09-03 19:51 ` Linus Walleij
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=201209011832.47805.arnd@arndb.de \
--to=arnd@arndb$(echo .)de \
--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