From: Yangtao Li <tiny.windzz@gmail.com>
To: srinivas.kandagatla@linaro.org, robh+dt@kernel.org,
mark.rutland@arm.com, maxime.ripard@bootlin.com, wens@csie.org
Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, Yangtao Li <tiny.windzz@gmail.com>
Subject: [PATCH v2 4/5] nvmem: sunxi-sid: add new reg_read func
Date: Tue, 2 Apr 2019 11:45:13 -0400 [thread overview]
Message-ID: <20190402154514.11284-5-tiny.windzz@gmail.com> (raw)
In-Reply-To: <20190402154514.11284-1-tiny.windzz@gmail.com>
Because there was an endianness issue. It seems that reg_read
function which the nvmem the driver currently exposes is wrong.
So add the new read function, the new function is used when the
native_endian flag is set.
Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
---
drivers/nvmem/sunxi_sid.c | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/drivers/nvmem/sunxi_sid.c b/drivers/nvmem/sunxi_sid.c
index 54620d72ddb9..5b8a42f686cd 100644
--- a/drivers/nvmem/sunxi_sid.c
+++ b/drivers/nvmem/sunxi_sid.c
@@ -37,6 +37,7 @@ struct sunxi_sid_cfg {
u32 value_offset;
u32 size;
bool need_register_readout;
+ bool native_endian;
};
struct sunxi_sid {
@@ -75,6 +76,31 @@ static int sunxi_sid_read(void *context, unsigned int offset,
return 0;
}
+static u8 sunxi_sid_read_byte_native(const struct sunxi_sid *sid,
+ const unsigned int offset)
+{
+ u32 sid_key;
+
+ sid_key = ioread32(sid->base + round_down(offset, 4));
+ sid_key >>= (offset % 4) * 8;
+
+ return sid_key;
+}
+
+static int sunxi_sid_read_native(void *context, unsigned int offset,
+ void *val, size_t bytes)
+{
+ struct sunxi_sid *sid = context;
+ u8 *buf = val;
+
+ offset += sid->value_offset;
+
+ while (bytes--)
+ *buf++ = sunxi_sid_read_byte_native(sid, offset++);
+
+ return 0;
+}
+
static int sun8i_sid_register_readout(const struct sunxi_sid *sid,
const unsigned int offset,
u32 *out)
@@ -169,9 +195,12 @@ static int sunxi_sid_probe(struct platform_device *pdev)
econfig.dev = dev;
if (cfg->need_register_readout)
econfig.reg_read = sun8i_sid_read_by_reg;
+ else if (cfg->native_endian)
+ econfig.reg_read = sunxi_sid_read_native;
else
econfig.reg_read = sunxi_sid_read;
econfig.priv = sid;
+
nvmem = devm_nvmem_register(dev, &econfig);
if (IS_ERR(nvmem))
return PTR_ERR(nvmem);
--
2.17.0
next prev parent reply other threads:[~2019-04-02 15:45 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-02 15:45 [PATCH v2 0/5] nvmem: sunxi-sid: add SID controller support for H6 Yangtao Li
2019-04-02 15:45 ` [PATCH v2 1/5] nvmem: sunxi-sid: fix wrong description in kernel doc Yangtao Li
2019-04-02 15:45 ` [PATCH v2 2/5] nvmem: sunxi-sid: add binding for H6's SID controller Yangtao Li
2019-04-02 15:45 ` [PATCH v2 3/5] nvmem: sunxi-sid: convert to SPDX license tags Yangtao Li
2019-04-02 15:45 ` Yangtao Li [this message]
2019-04-04 10:59 ` [PATCH v2 4/5] nvmem: sunxi-sid: add new reg_read func Srinivas Kandagatla
2019-04-04 11:05 ` Maxime Ripard
2019-04-04 13:36 ` Chen-Yu Tsai
2019-04-02 15:45 ` [PATCH v2 5/5] nvmem: sunxi-sid: add support for H6's SID controller Yangtao Li
2019-04-04 11:00 ` [PATCH v2 0/5] nvmem: sunxi-sid: add SID controller support for H6 Srinivas Kandagatla
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=20190402154514.11284-5-tiny.windzz@gmail.com \
--to=tiny.windzz@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=maxime.ripard@bootlin.com \
--cc=robh+dt@kernel.org \
--cc=srinivas.kandagatla@linaro.org \
--cc=wens@csie.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).