From: gregory.clement@free-electrons•com (Gregory CLEMENT)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v6 4/4] ARM: dts: mvebu: Update with the new compatible string for mv64xxx-i2c
Date: Mon, 02 Sep 2013 13:44:45 +0200 [thread overview]
Message-ID: <52247A2D.9090400@free-electrons.com> (raw)
In-Reply-To: <1377181169-17483-2-git-send-email-gregory.clement@free-electrons.com>
Hi Jason,
Unless I missed it I didn't see this patch in your last pull request.
Wolfram took the 3 others patches and Mark Rutland agreed with the binding
introduced in the patch 3. So I think we are fine to take this patch
in mvebu.
Thanks,
On 22/08/2013 16:19, Gregory CLEMENT wrote:
> The mv64xxx-i2c embedded in the Armada XP have a new feature to
> offload i2c transaction. This new version of the IP come also with
> some errata. This lead to the introduction to a another compatible
> string.
>
> This commit split the i2c information into armada-370.dtsi and
> armada-xp.dtsi. Most of the data remains the same and stay in the
> common file Armada-370-xp.dtsi. With this new feature the size of the
> registers are bigger for Armada XP and the new compatible string is
> used.
>
> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons•com>
> ---
> arch/arm/boot/dts/armada-370-xp.dtsi | 2 --
> arch/arm/boot/dts/armada-370.dtsi | 8 ++++++++
> arch/arm/boot/dts/armada-xp.dtsi | 10 ++++++++++
> 3 files changed, 18 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
> index 90b1176..d8b24c9 100644
> --- a/arch/arm/boot/dts/armada-370-xp.dtsi
> +++ b/arch/arm/boot/dts/armada-370-xp.dtsi
> @@ -121,7 +121,6 @@
>
> i2c0: i2c at 11000 {
> compatible = "marvell,mv64xxx-i2c";
> - reg = <0x11000 0x20>;
> #address-cells = <1>;
> #size-cells = <0>;
> interrupts = <31>;
> @@ -132,7 +131,6 @@
>
> i2c1: i2c at 11100 {
> compatible = "marvell,mv64xxx-i2c";
> - reg = <0x11100 0x20>;
> #address-cells = <1>;
> #size-cells = <0>;
> interrupts = <32>;
> diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
> index fa3dfc6..0e2eefa 100644
> --- a/arch/arm/boot/dts/armada-370.dtsi
> +++ b/arch/arm/boot/dts/armada-370.dtsi
> @@ -155,6 +155,14 @@
> };
> };
>
> + i2c0: i2c at 11000 {
> + reg = <0x11000 0x20>;
> + };
> +
> + i2c1: i2c at 11100 {
> + reg = <0x11100 0x20>;
> + };
> +
> usb at 50000 {
> clocks = <&coreclk 0>;
> };
> diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
> index 416eb94..e1f2547 100644
> --- a/arch/arm/boot/dts/armada-xp.dtsi
> +++ b/arch/arm/boot/dts/armada-xp.dtsi
> @@ -138,6 +138,16 @@
> };
> };
>
> + i2c0: i2c at 11000 {
> + compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
> + reg = <0x11000 0x100>;
> + };
> +
> + i2c1: i2c at 11100 {
> + compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
> + reg = <0x11100 0x100>;
> + };
> +
> usb at 50000 {
> clocks = <&gateclk 18>;
> };
>
--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
next prev parent reply other threads:[~2013-09-02 11:44 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-22 14:19 [PATCH v6 3/4] ARM: dts: mvebu: Introduce a new compatible string for mv64xxx-i2c Gregory CLEMENT
2013-08-22 14:19 ` [PATCH v6 4/4] ARM: dts: mvebu: Update with the " Gregory CLEMENT
2013-09-02 11:44 ` Gregory CLEMENT [this message]
2013-09-02 17:25 ` Jason Cooper
2013-09-03 12:36 ` Jason Cooper
2013-08-22 16:22 ` [PATCH v6 3/4] ARM: dts: mvebu: Introduce a " Wolfram Sang
2013-08-23 7:07 ` Gregory CLEMENT
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=52247A2D.9090400@free-electrons.com \
--to=gregory.clement@free-electrons$(echo .)com \
--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