From: ludovic.desroches <ludovic.desroches@atmel.com>
To: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Chris Ball <cjb@laptop.org>,
Ludovic.Desroches@atmel.com, linux-mmc@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] mmc: atmel-mci: modify CLKDIV displaying in debugfs
Date: Mon, 9 Jul 2012 09:05:53 +0200 [thread overview]
Message-ID: <4FFA82D1.5080904@atmel.com> (raw)
In-Reply-To: <1341569511-11340-1-git-send-email-nicolas.ferre@atmel.com>
Le 07/06/2012 12:11 PM, Nicolas Ferre a écrit :
> Modify clock division displaying in debugfs for matching
> the new CLKDIV,CLKODD user interface arrangement.
> Is using the has_odd_clk_div property to choose the proper format.
>
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Thanks.
> ---
> drivers/mmc/host/atmel-mci.c | 12 +++++++++---
> 1 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
> index 1fe20cd..9c5daa2 100644
> --- a/drivers/mmc/host/atmel-mci.c
> +++ b/drivers/mmc/host/atmel-mci.c
> @@ -396,11 +396,17 @@ static int atmci_regs_show(struct seq_file *s, void *v)
> clk_disable(host->mck);
> spin_unlock_bh(&host->lock);
>
> - seq_printf(s, "MR:\t0x%08x%s%s CLKDIV=%u\n",
> + seq_printf(s, "MR:\t0x%08x%s%s ",
> buf[ATMCI_MR / 4],
> buf[ATMCI_MR / 4] & ATMCI_MR_RDPROOF ? " RDPROOF" : "",
> - buf[ATMCI_MR / 4] & ATMCI_MR_WRPROOF ? " WRPROOF" : "",
> - buf[ATMCI_MR / 4] & 0xff);
> + buf[ATMCI_MR / 4] & ATMCI_MR_WRPROOF ? " WRPROOF" : "");
> + if (host->caps.has_odd_clk_div)
> + seq_printf(s, "{CLKDIV,CLKODD}=%u\n",
> + ((buf[ATMCI_MR / 4] & 0xff) << 1)
> + | ((buf[ATMCI_MR / 4] >> 16) & 1));
> + else
> + seq_printf(s, "CLKDIV=%u\n",
> + (buf[ATMCI_MR / 4] & 0xff));
> seq_printf(s, "DTOR:\t0x%08x\n", buf[ATMCI_DTOR / 4]);
> seq_printf(s, "SDCR:\t0x%08x\n", buf[ATMCI_SDCR / 4]);
> seq_printf(s, "ARGR:\t0x%08x\n", buf[ATMCI_ARGR / 4]);
>
WARNING: multiple messages have this Message-ID (diff)
From: ludovic.desroches@atmel.com (ludovic.desroches)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] mmc: atmel-mci: modify CLKDIV displaying in debugfs
Date: Mon, 9 Jul 2012 09:05:53 +0200 [thread overview]
Message-ID: <4FFA82D1.5080904@atmel.com> (raw)
In-Reply-To: <1341569511-11340-1-git-send-email-nicolas.ferre@atmel.com>
Le 07/06/2012 12:11 PM, Nicolas Ferre a ?crit :
> Modify clock division displaying in debugfs for matching
> the new CLKDIV,CLKODD user interface arrangement.
> Is using the has_odd_clk_div property to choose the proper format.
>
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Thanks.
> ---
> drivers/mmc/host/atmel-mci.c | 12 +++++++++---
> 1 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
> index 1fe20cd..9c5daa2 100644
> --- a/drivers/mmc/host/atmel-mci.c
> +++ b/drivers/mmc/host/atmel-mci.c
> @@ -396,11 +396,17 @@ static int atmci_regs_show(struct seq_file *s, void *v)
> clk_disable(host->mck);
> spin_unlock_bh(&host->lock);
>
> - seq_printf(s, "MR:\t0x%08x%s%s CLKDIV=%u\n",
> + seq_printf(s, "MR:\t0x%08x%s%s ",
> buf[ATMCI_MR / 4],
> buf[ATMCI_MR / 4] & ATMCI_MR_RDPROOF ? " RDPROOF" : "",
> - buf[ATMCI_MR / 4] & ATMCI_MR_WRPROOF ? " WRPROOF" : "",
> - buf[ATMCI_MR / 4] & 0xff);
> + buf[ATMCI_MR / 4] & ATMCI_MR_WRPROOF ? " WRPROOF" : "");
> + if (host->caps.has_odd_clk_div)
> + seq_printf(s, "{CLKDIV,CLKODD}=%u\n",
> + ((buf[ATMCI_MR / 4] & 0xff) << 1)
> + | ((buf[ATMCI_MR / 4] >> 16) & 1));
> + else
> + seq_printf(s, "CLKDIV=%u\n",
> + (buf[ATMCI_MR / 4] & 0xff));
> seq_printf(s, "DTOR:\t0x%08x\n", buf[ATMCI_DTOR / 4]);
> seq_printf(s, "SDCR:\t0x%08x\n", buf[ATMCI_SDCR / 4]);
> seq_printf(s, "ARGR:\t0x%08x\n", buf[ATMCI_ARGR / 4]);
>
next prev parent reply other threads:[~2012-07-09 7:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-06 10:11 [PATCH] mmc: atmel-mci: modify CLKDIV displaying in debugfs Nicolas Ferre
2012-07-06 10:11 ` Nicolas Ferre
2012-07-09 7:05 ` ludovic.desroches [this message]
2012-07-09 7:05 ` ludovic.desroches
2012-07-10 3:22 ` Chris Ball
2012-07-10 3:22 ` Chris Ball
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=4FFA82D1.5080904@atmel.com \
--to=ludovic.desroches@atmel.com \
--cc=cjb@laptop.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=nicolas.ferre@atmel.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.