From: Antoine Tenart <antoine.tenart@free-electrons.com> To: sebastian.hesselbarth@gmail.com Cc: Antoine Tenart <antoine.tenart@free-electrons.com>, jszhang@marvell.com, zmxu@marvell.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 09/10] ARM: berlin: rework chip and system controller nodes for BG2CD Date: Fri, 6 Mar 2015 16:05:27 +0100 [thread overview] Message-ID: <1425654328-26298-10-git-send-email-antoine.tenart@free-electrons.com> (raw) In-Reply-To: <1425654328-26298-1-git-send-email-antoine.tenart@free-electrons.com> The chip and system controller nodes are now handled by the Berlin controller mfd driver. Its sub-devices are then registered by the mfd driver and let the drivers be probed properly, using their own sub-nodes. Rework the device tree to take this changes into account. Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com> --- arch/arm/boot/dts/berlin2cd.dtsi | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/berlin2cd.dtsi b/arch/arm/boot/dts/berlin2cd.dtsi index 81b670ac494a..4bca01ee94d6 100644 --- a/arch/arm/boot/dts/berlin2cd.dtsi +++ b/arch/arm/boot/dts/berlin2cd.dtsi @@ -84,7 +84,7 @@ compatible = "marvell,berlin2cd-usb-phy"; reg = <0xb74000 0x128>; #phy-cells = <0>; - resets = <&chip 0x178 23>; + resets = <&chip_rst 0x178 23>; status = "disabled"; }; @@ -92,7 +92,7 @@ compatible = "marvell,berlin2cd-usb-phy"; reg = <0xb78000 0x128>; #phy-cells = <0>; - resets = <&chip 0x178 24>; + resets = <&chip_rst 0x178 24>; status = "disabled"; }; @@ -294,17 +294,25 @@ }; }; - chip: chip-control@ea0000 { - compatible = "marvell,berlin2cd-chip-ctrl"; - #clock-cells = <1>; - #reset-cells = <2>; + chip: chip-controller@ea0000 { + compatible = "marvell,berlin2cd-chip-ctrl", "simple-mfd", "syscon"; reg = <0xea0000 0x400>; + #clock-cells = <1>; clocks = <&refclk>; clock-names = "refclk"; - uart0_pmux: uart0-pmux { - groups = "G6"; - function = "uart0"; + soc_pinctrl: pin-controller { + compatible = "marvell,berlin2cd-soc-pinctrl"; + + uart0_pmux: uart0-pmux { + groups = "G6"; + function = "uart0"; + }; + }; + + chip_rst: reset { + compatible = "marvell,berlin2-reset"; + #reset-cells = <2>; }; }; @@ -389,8 +397,12 @@ }; sysctrl: system-controller@d000 { - compatible = "marvell,berlin2cd-system-ctrl"; + compatible = "marvell,berlin2cd-system-ctrl", "simple-mfd", "syscon"; reg = <0xd000 0x100>; + + sys_pinctrl: pin-controller { + compatible = "marvell,berlin2cd-system-pinctrl"; + }; }; sic: interrupt-controller@e000 { -- 2.3.1
WARNING: multiple messages have this Message-ID (diff)
From: antoine.tenart@free-electrons.com (Antoine Tenart) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 09/10] ARM: berlin: rework chip and system controller nodes for BG2CD Date: Fri, 6 Mar 2015 16:05:27 +0100 [thread overview] Message-ID: <1425654328-26298-10-git-send-email-antoine.tenart@free-electrons.com> (raw) In-Reply-To: <1425654328-26298-1-git-send-email-antoine.tenart@free-electrons.com> The chip and system controller nodes are now handled by the Berlin controller mfd driver. Its sub-devices are then registered by the mfd driver and let the drivers be probed properly, using their own sub-nodes. Rework the device tree to take this changes into account. Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com> --- arch/arm/boot/dts/berlin2cd.dtsi | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/berlin2cd.dtsi b/arch/arm/boot/dts/berlin2cd.dtsi index 81b670ac494a..4bca01ee94d6 100644 --- a/arch/arm/boot/dts/berlin2cd.dtsi +++ b/arch/arm/boot/dts/berlin2cd.dtsi @@ -84,7 +84,7 @@ compatible = "marvell,berlin2cd-usb-phy"; reg = <0xb74000 0x128>; #phy-cells = <0>; - resets = <&chip 0x178 23>; + resets = <&chip_rst 0x178 23>; status = "disabled"; }; @@ -92,7 +92,7 @@ compatible = "marvell,berlin2cd-usb-phy"; reg = <0xb78000 0x128>; #phy-cells = <0>; - resets = <&chip 0x178 24>; + resets = <&chip_rst 0x178 24>; status = "disabled"; }; @@ -294,17 +294,25 @@ }; }; - chip: chip-control at ea0000 { - compatible = "marvell,berlin2cd-chip-ctrl"; - #clock-cells = <1>; - #reset-cells = <2>; + chip: chip-controller at ea0000 { + compatible = "marvell,berlin2cd-chip-ctrl", "simple-mfd", "syscon"; reg = <0xea0000 0x400>; + #clock-cells = <1>; clocks = <&refclk>; clock-names = "refclk"; - uart0_pmux: uart0-pmux { - groups = "G6"; - function = "uart0"; + soc_pinctrl: pin-controller { + compatible = "marvell,berlin2cd-soc-pinctrl"; + + uart0_pmux: uart0-pmux { + groups = "G6"; + function = "uart0"; + }; + }; + + chip_rst: reset { + compatible = "marvell,berlin2-reset"; + #reset-cells = <2>; }; }; @@ -389,8 +397,12 @@ }; sysctrl: system-controller at d000 { - compatible = "marvell,berlin2cd-system-ctrl"; + compatible = "marvell,berlin2cd-system-ctrl", "simple-mfd", "syscon"; reg = <0xd000 0x100>; + + sys_pinctrl: pin-controller { + compatible = "marvell,berlin2cd-system-pinctrl"; + }; }; sic: interrupt-controller at e000 { -- 2.3.1
next prev parent reply other threads:[~2015-03-06 15:06 UTC|newest] Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-03-06 15:05 [PATCH v2 00/10] ARM: berlin: refactor chip and system controllers Antoine Tenart 2015-03-06 15:05 ` Antoine Tenart 2015-03-06 15:05 ` [PATCH v2 01/10] Documentation: bindings: update the Berlin controllers documentation Antoine Tenart 2015-03-06 15:05 ` Antoine Tenart 2015-03-06 15:05 ` [PATCH v2 02/10] ARM: berlin: select MFD_SYSCON by default Antoine Tenart 2015-03-06 15:05 ` Antoine Tenart 2015-03-06 15:05 ` [PATCH v2 03/10] reset: berlin: convert to a platform driver Antoine Tenart 2015-03-06 15:05 ` Antoine Tenart 2015-03-09 10:16 ` Philipp Zabel 2015-03-09 10:16 ` Philipp Zabel 2015-03-10 9:57 ` Antoine Tenart 2015-03-10 9:57 ` Antoine Tenart 2015-03-25 8:26 ` Linus Walleij 2015-03-25 8:26 ` Linus Walleij 2015-05-12 14:43 ` Antoine Tenart 2015-05-12 14:43 ` Antoine Tenart 2015-05-13 8:38 ` Philipp Zabel 2015-05-13 8:38 ` Philipp Zabel 2015-05-15 9:14 ` Sebastian Hesselbarth 2015-05-15 9:14 ` Sebastian Hesselbarth 2015-03-06 15:05 ` [PATCH v2 04/10] Documentation: bindings: move the Berlin reset documentation Antoine Tenart 2015-03-06 15:05 ` Antoine Tenart 2015-03-09 10:16 ` Philipp Zabel 2015-03-09 10:16 ` Philipp Zabel 2015-03-06 15:05 ` [PATCH v2 05/10] pinctrl: berlin: use the regmap provided by syscon Antoine Tenart 2015-03-06 15:05 ` Antoine Tenart 2015-04-28 11:30 ` Sebastian Hesselbarth 2015-04-28 11:30 ` Sebastian Hesselbarth 2015-05-06 14:28 ` Linus Walleij 2015-05-06 14:28 ` Linus Walleij 2015-05-06 14:28 ` Linus Walleij 2015-03-06 15:05 ` [PATCH v2 06/10] pinctrl: berlin: use proper compatibles Antoine Tenart 2015-03-06 15:05 ` Antoine Tenart 2015-06-10 7:13 ` Linus Walleij 2015-06-10 7:13 ` Linus Walleij 2015-06-10 7:13 ` Linus Walleij 2015-06-12 9:05 ` Antoine Tenart 2015-06-12 9:05 ` Antoine Tenart 2015-06-12 9:05 ` Antoine Tenart 2015-06-12 9:24 ` Sebastian Hesselbarth 2015-06-12 9:24 ` Sebastian Hesselbarth 2015-06-12 9:24 ` Sebastian Hesselbarth 2015-03-06 15:05 ` [PATCH v2 07/10] Documentation: bindings: move the Berlin pinctrl documentation Antoine Tenart 2015-03-06 15:05 ` Antoine Tenart 2015-06-10 7:14 ` Linus Walleij 2015-06-10 7:14 ` Linus Walleij 2015-06-10 7:14 ` Linus Walleij 2015-03-06 15:05 ` [PATCH v2 08/10] ARM: berlin: rework chip and system controller nodes for BG2 Antoine Tenart 2015-03-06 15:05 ` Antoine Tenart 2015-03-06 15:05 ` Antoine Tenart [this message] 2015-03-06 15:05 ` [PATCH v2 09/10] ARM: berlin: rework chip and system controller nodes for BG2CD Antoine Tenart 2015-03-06 15:05 ` [PATCH v2 10/10] ARM: berlin: rework chip and system controller nodes for BG2Q Antoine Tenart 2015-03-06 15:05 ` Antoine Tenart 2015-03-09 17:13 ` [PATCH v2 00/10] ARM: berlin: refactor chip and system controllers Linus Walleij 2015-03-09 17:13 ` Linus Walleij
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=1425654328-26298-10-git-send-email-antoine.tenart@free-electrons.com \ --to=antoine.tenart@free-electrons.com \ --cc=jszhang@marvell.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=sebastian.hesselbarth@gmail.com \ --cc=zmxu@marvell.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: 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.