From: Lee Jones <lee.jones@linaro.org>
To: patrice.chotard@st.com, jassisinghbrar@gmail.com
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, kernel@stlinux.com,
devicetree@vger.kernel.org, Lee Jones <lee.jones@linaro.org>
Subject: [PATCH] mailbox: sti: Fix mbox-names copy and paste error
Date: Wed, 4 Jan 2017 12:05:27 +0000 [thread overview]
Message-ID: <20170104120527.24806-1-lee.jones@linaro.org> (raw)
Due to an over-sight, mbox-names has become mbox-name in some instances.
Let's put it right.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
Documentation/devicetree/bindings/mailbox/sti-mailbox.txt | 4 ++--
arch/arm/boot/dts/stih407-family.dtsi | 8 ++++----
drivers/mailbox/mailbox-sti.c | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Documentation/devicetree/bindings/mailbox/sti-mailbox.txt b/Documentation/devicetree/bindings/mailbox/sti-mailbox.txt
index 351f612..648d176 100644
--- a/Documentation/devicetree/bindings/mailbox/sti-mailbox.txt
+++ b/Documentation/devicetree/bindings/mailbox/sti-mailbox.txt
@@ -9,7 +9,7 @@ Controller
Required properties:
- compatible : Should be "st,stih407-mailbox"
- reg : Offset and length of the device's register set
-- mbox-name : Name of the mailbox
+- mbox-names : Name of the mailbox
- #mbox-cells: : Must be 2
<&phandle instance channel direction>
phandle : Label name of controller
@@ -26,7 +26,7 @@ mailbox0: mailbox@0 {
reg = <0x08f00000 0x1000>;
interrupts = <GIC_SPI 1 IRQ_TYPE_NONE>;
#mbox-cells = <2>;
- mbox-name = "a9";
+ mbox-names = "a9";
};
Client
diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi
index c8b2944..00c67d4 100644
--- a/arch/arm/boot/dts/stih407-family.dtsi
+++ b/arch/arm/boot/dts/stih407-family.dtsi
@@ -787,7 +787,7 @@
reg = <0x8f00000 0x1000>;
interrupts = <GIC_SPI 1 IRQ_TYPE_NONE>;
#mbox-cells = <2>;
- mbox-name = "a9";
+ mbox-names = "a9";
status = "okay";
};
@@ -795,7 +795,7 @@
compatible = "st,stih407-mailbox";
reg = <0x8f01000 0x1000>;
#mbox-cells = <2>;
- mbox-name = "st231_gp_1";
+ mbox-names = "st231_gp_1";
status = "okay";
};
@@ -803,7 +803,7 @@
compatible = "st,stih407-mailbox";
reg = <0x8f02000 0x1000>;
#mbox-cells = <2>;
- mbox-name = "st231_gp_0";
+ mbox-names = "st231_gp_0";
status = "okay";
};
@@ -811,7 +811,7 @@
compatible = "st,stih407-mailbox";
reg = <0x8f03000 0x1000>;
#mbox-cells = <2>;
- mbox-name = "st231_audio_video";
+ mbox-names = "st231_audio_video";
status = "okay";
};
diff --git a/drivers/mailbox/mailbox-sti.c b/drivers/mailbox/mailbox-sti.c
index 41bcd33..e532a98 100644
--- a/drivers/mailbox/mailbox-sti.c
+++ b/drivers/mailbox/mailbox-sti.c
@@ -434,7 +434,7 @@ static int sti_mbox_probe(struct platform_device *pdev)
if (IS_ERR(mdev->base))
return PTR_ERR(mdev->base);
- ret = of_property_read_string(np, "mbox-name", &mdev->name);
+ ret = of_property_read_string(np, "mbox-names", &mdev->name);
if (ret)
mdev->name = np->full_name;
--
2.10.2
next reply other threads:[~2017-01-04 12:05 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-04 12:05 Lee Jones [this message]
2017-01-04 14:57 ` [PATCH] mailbox: sti: Fix mbox-names copy and paste error Rob Herring
2017-01-04 16:01 ` Lee Jones
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=20170104120527.24806-1-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=jassisinghbrar@gmail.com \
--cc=kernel@stlinux.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=patrice.chotard@st.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 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).