From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> To: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Cc: Jason Cooper <jason@lakedaemon.net>, Andrew Lunn <andrew@lunn.ch>, Gregory Clement <gregory.clement@free-electrons.com>, Gabriel Dobato <dobatog@gmail.com>, Wolfram Sang <wsa@the-dreams.de>, Stephen Warren <swarren@wwwdotorg.org>, linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/4] ARM: dts: dove: Add internal i2c multiplexer node Date: Fri, 27 Feb 2015 13:24:44 +0100 [thread overview] Message-ID: <1425039885-5137-4-git-send-email-sebastian.hesselbarth@gmail.com> (raw) In-Reply-To: <1425039885-5137-1-git-send-email-sebastian.hesselbarth@gmail.com> This adds a i2c-mux-pinctrl node to dove.dtsi for the internal i2c mux found on Dove SoCs. Up to now, we had no board using any of the two additional i2c busses, so make sure the change does not break any existing boards. Therefore, we rename the i2c-controller node label to "i2c" and enable it by default. Also, the dedicated sub-bus (now "i2c0") is enabled by default. The two optional sub-busses require additional external pin-muxing, so disable them by default. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com> --- Cc: Jason Cooper <jason@lakedaemon.net> Cc: Andrew Lunn <andrew@lunn.ch> Cc: Gregory Clement <gregory.clement@free-electrons.com> Cc: Gabriel Dobato <dobatog@gmail.com> Cc: Wolfram Sang <wsa@the-dreams.de> Cc: Stephen Warren <swarren@wwwdotorg.org> Cc: linux-i2c@vger.kernel.org Cc: devicetree@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- arch/arm/boot/dts/dove.dtsi | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi index 9ad829523a13..b3340e862b0e 100644 --- a/arch/arm/boot/dts/dove.dtsi +++ b/arch/arm/boot/dts/dove.dtsi @@ -28,6 +28,42 @@ }; }; + i2c-mux { + compatible = "i2c-mux-pinctrl"; + #address-cells = <1>; + #size-cells = <0>; + + i2c-parent = <&i2c>; + + pinctrl-names = "i2c0", "i2c1", "i2c2"; + pinctrl-0 = <&pmx_i2cmux_0>; + pinctrl-1 = <&pmx_i2cmux_1>; + pinctrl-2 = <&pmx_i2cmux_2>; + + i2c0: i2c@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + }; + + i2c1: i2c@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + /* Requires pmx_i2c1 on i2c controller node */ + status = "disabled"; + }; + + i2c2: i2c@2 { + reg = <2>; + #address-cells = <1>; + #size-cells = <0>; + /* Requires pmx_i2c2 on i2c controller node */ + status = "disabled"; + }; + }; + l2: l2-cache { compatible = "marvell,tauros2-cache"; marvell,tauros2-cache-features = <0>; @@ -123,7 +159,7 @@ status = "disabled"; }; - i2c0: i2c-ctrl@11000 { + i2c: i2c-ctrl@11000 { compatible = "marvell,mv64xxx-i2c"; reg = <0x11000 0x20>; #address-cells = <1>; @@ -132,7 +168,7 @@ clock-frequency = <400000>; timeout-ms = <1000>; clocks = <&core_clk 0>; - status = "disabled"; + status = "okay"; }; uart0: serial@12000 { -- 2.1.0
WARNING: multiple messages have this Message-ID (diff)
From: sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 3/4] ARM: dts: dove: Add internal i2c multiplexer node Date: Fri, 27 Feb 2015 13:24:44 +0100 [thread overview] Message-ID: <1425039885-5137-4-git-send-email-sebastian.hesselbarth@gmail.com> (raw) In-Reply-To: <1425039885-5137-1-git-send-email-sebastian.hesselbarth@gmail.com> This adds a i2c-mux-pinctrl node to dove.dtsi for the internal i2c mux found on Dove SoCs. Up to now, we had no board using any of the two additional i2c busses, so make sure the change does not break any existing boards. Therefore, we rename the i2c-controller node label to "i2c" and enable it by default. Also, the dedicated sub-bus (now "i2c0") is enabled by default. The two optional sub-busses require additional external pin-muxing, so disable them by default. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com> --- Cc: Jason Cooper <jason@lakedaemon.net> Cc: Andrew Lunn <andrew@lunn.ch> Cc: Gregory Clement <gregory.clement@free-electrons.com> Cc: Gabriel Dobato <dobatog@gmail.com> Cc: Wolfram Sang <wsa@the-dreams.de> Cc: Stephen Warren <swarren@wwwdotorg.org> Cc: linux-i2c at vger.kernel.org Cc: devicetree at vger.kernel.org Cc: linux-arm-kernel at lists.infradead.org Cc: linux-kernel at vger.kernel.org --- arch/arm/boot/dts/dove.dtsi | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi index 9ad829523a13..b3340e862b0e 100644 --- a/arch/arm/boot/dts/dove.dtsi +++ b/arch/arm/boot/dts/dove.dtsi @@ -28,6 +28,42 @@ }; }; + i2c-mux { + compatible = "i2c-mux-pinctrl"; + #address-cells = <1>; + #size-cells = <0>; + + i2c-parent = <&i2c>; + + pinctrl-names = "i2c0", "i2c1", "i2c2"; + pinctrl-0 = <&pmx_i2cmux_0>; + pinctrl-1 = <&pmx_i2cmux_1>; + pinctrl-2 = <&pmx_i2cmux_2>; + + i2c0: i2c at 0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + }; + + i2c1: i2c at 1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + /* Requires pmx_i2c1 on i2c controller node */ + status = "disabled"; + }; + + i2c2: i2c at 2 { + reg = <2>; + #address-cells = <1>; + #size-cells = <0>; + /* Requires pmx_i2c2 on i2c controller node */ + status = "disabled"; + }; + }; + l2: l2-cache { compatible = "marvell,tauros2-cache"; marvell,tauros2-cache-features = <0>; @@ -123,7 +159,7 @@ status = "disabled"; }; - i2c0: i2c-ctrl at 11000 { + i2c: i2c-ctrl at 11000 { compatible = "marvell,mv64xxx-i2c"; reg = <0x11000 0x20>; #address-cells = <1>; @@ -132,7 +168,7 @@ clock-frequency = <400000>; timeout-ms = <1000>; clocks = <&core_clk 0>; - status = "disabled"; + status = "okay"; }; uart0: serial at 12000 { -- 2.1.0
next prev parent reply other threads:[~2015-02-27 12:25 UTC|newest] Thread overview: 123+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-02-17 18:52 [PATCH 0/8] Add proper support for Compulab CM-A510/SBC-A510 Sebastian Hesselbarth 2015-02-17 18:52 ` Sebastian Hesselbarth 2015-02-17 18:52 ` Sebastian Hesselbarth 2015-02-17 18:52 ` [PATCH 1/8] i2c: mux-pinctrl: Rework to honor disabled child nodes Sebastian Hesselbarth 2015-02-17 18:52 ` Sebastian Hesselbarth 2015-02-17 18:52 ` Sebastian Hesselbarth 2015-02-17 20:46 ` Stephen Warren 2015-02-17 20:46 ` Stephen Warren 2015-02-17 20:46 ` Stephen Warren 2015-02-17 21:08 ` Sebastian Hesselbarth 2015-02-17 21:08 ` Sebastian Hesselbarth 2015-02-17 21:08 ` Sebastian Hesselbarth 2015-02-17 21:15 ` Stephen Warren 2015-02-17 21:15 ` Stephen Warren 2015-02-17 21:19 ` Sebastian Hesselbarth 2015-02-17 21:19 ` Sebastian Hesselbarth 2015-02-26 21:46 ` Stephen Warren 2015-02-26 21:46 ` Stephen Warren 2015-02-17 18:52 ` [PATCH 2/8] devicetree: vendor-prefixes: Add CompuLab to known vendors Sebastian Hesselbarth 2015-02-17 18:52 ` Sebastian Hesselbarth 2015-02-17 19:37 ` Rob Herring 2015-02-17 19:37 ` Rob Herring 2015-02-17 19:37 ` Rob Herring 2015-02-17 18:52 ` [PATCH 3/8] ARM: dts: dove: Fix uart[23] reg property Sebastian Hesselbarth 2015-02-17 18:52 ` Sebastian Hesselbarth 2015-02-23 14:54 ` Gregory CLEMENT 2015-02-23 14:54 ` Gregory CLEMENT 2015-02-17 18:52 ` [PATCH 4/8] ARM: dts: dove: Always include gpio and interrupt-controller headers Sebastian Hesselbarth 2015-02-17 18:52 ` Sebastian Hesselbarth 2015-02-23 14:54 ` Gregory CLEMENT 2015-02-23 14:54 ` Gregory CLEMENT 2015-02-17 18:52 ` [PATCH 5/8] ARM: dts: dove: Add node labels for PCIe ports 0 and 1 Sebastian Hesselbarth 2015-02-17 18:52 ` Sebastian Hesselbarth 2015-02-23 14:55 ` Gregory CLEMENT 2015-02-23 14:55 ` Gregory CLEMENT 2015-02-17 18:52 ` [PATCH 6/8] ARM: dts: dove: Add some more common pinctrl settings Sebastian Hesselbarth 2015-02-17 18:52 ` Sebastian Hesselbarth 2015-02-23 14:56 ` Gregory CLEMENT 2015-02-23 14:56 ` Gregory CLEMENT 2015-02-17 18:52 ` [PATCH 7/8] ARM: dts: dove: Add internal i2c multiplexer node Sebastian Hesselbarth 2015-02-17 18:52 ` Sebastian Hesselbarth 2015-02-23 15:07 ` Gregory CLEMENT 2015-02-23 15:07 ` Gregory CLEMENT 2015-02-23 15:07 ` Gregory CLEMENT 2015-02-17 18:52 ` [PATCH 8/8] ARM: dts: dove: Add proper support for Compulab CM-A510/SBC-A510 Sebastian Hesselbarth 2015-02-17 18:52 ` Sebastian Hesselbarth 2015-02-26 17:55 ` [PATCH 0/8] " Gregory CLEMENT 2015-02-26 17:55 ` Gregory CLEMENT 2015-02-26 17:55 ` Gregory CLEMENT 2015-02-26 19:39 ` Sebastian Hesselbarth 2015-02-26 19:39 ` Sebastian Hesselbarth 2015-02-26 20:01 ` Stephen Warren 2015-02-26 20:01 ` Stephen Warren 2015-02-26 20:35 ` Sebastian Hesselbarth 2015-02-26 20:35 ` Sebastian Hesselbarth 2015-02-27 12:24 ` [PATCH v2 0/4] " Sebastian Hesselbarth 2015-02-27 12:24 ` Sebastian Hesselbarth 2015-02-27 12:24 ` Sebastian Hesselbarth 2015-02-27 12:24 ` [PATCH v2 1/4] i2c: mux-pinctrl: Rework to honor disabled child nodes Sebastian Hesselbarth 2015-02-27 12:24 ` Sebastian Hesselbarth 2015-02-27 12:24 ` Sebastian Hesselbarth 2015-03-02 20:01 ` Stephen Warren 2015-03-02 20:01 ` Stephen Warren 2015-03-02 20:01 ` Stephen Warren 2015-03-04 9:10 ` Sebastian Hesselbarth 2015-03-04 9:10 ` Sebastian Hesselbarth 2015-03-04 9:10 ` Sebastian Hesselbarth 2015-03-09 12:21 ` [PATCH v3 " Sebastian Hesselbarth 2015-03-09 12:21 ` Sebastian Hesselbarth 2015-03-09 12:21 ` Sebastian Hesselbarth 2015-03-10 16:28 ` Stephen Warren 2015-03-10 16:28 ` Stephen Warren 2015-03-10 16:28 ` Stephen Warren 2015-03-16 20:15 ` Sebastian Hesselbarth 2015-03-16 20:15 ` Sebastian Hesselbarth 2015-03-16 20:15 ` Sebastian Hesselbarth 2015-03-18 12:30 ` Wolfram Sang 2015-03-18 12:30 ` Wolfram Sang 2015-03-18 13:23 ` Sebastian Hesselbarth 2015-03-18 13:23 ` Sebastian Hesselbarth 2015-03-18 13:23 ` Sebastian Hesselbarth 2015-03-18 14:00 ` Wolfram Sang 2015-03-18 14:00 ` Wolfram Sang 2015-03-18 23:10 ` Sebastian Hesselbarth 2015-03-18 23:10 ` Sebastian Hesselbarth 2015-03-19 10:09 ` Wolfram Sang 2015-03-19 10:09 ` Wolfram Sang 2015-03-19 10:09 ` Wolfram Sang 2015-03-19 10:48 ` Wolfram Sang 2015-03-19 10:48 ` Wolfram Sang 2015-03-19 10:48 ` Wolfram Sang 2015-03-19 15:47 ` Stephen Warren 2015-03-19 15:47 ` Stephen Warren 2015-03-19 15:47 ` Stephen Warren 2015-03-19 16:02 ` Wolfram Sang 2015-03-19 16:02 ` Wolfram Sang 2015-03-19 16:02 ` Wolfram Sang 2015-03-19 16:49 ` Stephen Warren 2015-03-19 16:49 ` Stephen Warren 2015-03-19 20:52 ` Sebastian Hesselbarth 2015-03-19 20:52 ` Sebastian Hesselbarth 2015-03-20 10:19 ` Wolfram Sang 2015-03-20 10:19 ` Wolfram Sang 2015-03-21 21:00 ` Wolfram Sang 2015-03-21 21:00 ` Wolfram Sang 2015-03-21 21:00 ` Wolfram Sang 2015-03-22 13:03 ` Sebastian Hesselbarth 2015-03-22 13:03 ` Sebastian Hesselbarth 2015-03-22 13:03 ` Sebastian Hesselbarth 2015-03-23 18:32 ` Wolfram Sang 2015-03-23 18:32 ` Wolfram Sang 2015-03-23 18:32 ` Wolfram Sang 2015-03-27 21:08 ` Sebastian Hesselbarth 2015-03-27 21:08 ` Sebastian Hesselbarth 2015-04-03 18:17 ` Wolfram Sang 2015-04-03 18:17 ` Wolfram Sang 2015-04-03 18:17 ` Wolfram Sang 2015-02-27 12:24 ` [PATCH v2 2/4] devicetree: vendor-prefixes: Add CompuLab to known vendors Sebastian Hesselbarth 2015-02-27 12:24 ` Sebastian Hesselbarth 2015-02-27 12:24 ` Sebastian Hesselbarth [this message] 2015-02-27 12:24 ` [PATCH v2 3/4] ARM: dts: dove: Add internal i2c multiplexer node Sebastian Hesselbarth 2015-02-27 12:24 ` [PATCH v2 4/4] ARM: dts: dove: Add proper support for Compulab CM-A510/SBC-A510 Sebastian Hesselbarth 2015-02-27 12:24 ` Sebastian Hesselbarth
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=1425039885-5137-4-git-send-email-sebastian.hesselbarth@gmail.com \ --to=sebastian.hesselbarth@gmail.com \ --cc=andrew@lunn.ch \ --cc=devicetree@vger.kernel.org \ --cc=dobatog@gmail.com \ --cc=gregory.clement@free-electrons.com \ --cc=jason@lakedaemon.net \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-i2c@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=swarren@wwwdotorg.org \ --cc=wsa@the-dreams.de \ /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: linkBe 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.