From: Chen-Yu Tsai <wens@csie.org> To: Maxime Ripard <maxime.ripard@free-electrons.com>, Dmitry Torokhov <dmitry.torokhov@gmail.com>, Zhang Rui <rui.zhang@intel.com>, Eduardo Valentin <edubezval@gmail.com> Cc: Chen-Yu Tsai <wens@csie.org>, Hans de Goede <hdegoede@redhat.com>, linux-input@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org Subject: [PATCH v2 7/9] ARM: dts: sun5i: hsg-h702: add axp209 regulator nodes Date: Fri, 9 Jan 2015 18:17:54 +0800 [thread overview] Message-ID: <1420798676-22856-8-git-send-email-wens@csie.org> (raw) In-Reply-To: <1420798676-22856-1-git-send-email-wens@csie.org> This patch adds the regulator nodes for the axp209 by including the axp209 dtsi. As the inputs of these regulators are from the axp209's PS output, which is basically just a mux over the 2 inputs, it is considered to be unregulated. Thus we do not provide input supply properties for them. The regulator names and constraints are based on the board schematics and the SoC datasheet. DCDC2 is used as the cpu power supply. This patch also references it from the cpu node. LDO3 powers the USB WiFi module. This patch also references it from the usb-phy node. Also get rid of axp209 properties already set in axp209.dtsi. Signed-off-by: Chen-Yu Tsai <wens@csie.org> --- changes since v1: - Use preprocessor include for axp209.dtsi --- arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 46 ++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts index 99a5968720b4..82637db1c55a 100644 --- a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts +++ b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts @@ -68,11 +68,7 @@ }; usbphy: phy@01c13400 { - /* - * There doesn't seem to be a GPIO for controlling - * usb1 vbus, despite the fex file saying otherwise. - */ - usb1_vbus-supply = <®_vcc5v0>; + usb1_vbus-supply = <®_ldo3>; status = "okay"; }; @@ -105,11 +101,8 @@ status = "okay"; axp209: pmic@34 { - compatible = "x-powers,axp209"; reg = <0x34>; interrupts = <0>; - interrupt-controller; - #interrupt-cells = <1>; }; }; @@ -131,3 +124,40 @@ }; }; }; + +#include "axp209.dtsi" + +&cpu0 { + cpu-supply = <®_dcdc2>; +}; + +®_dcdc2 { + regulator-always-on; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1500000>; + regulator-name = "vdd-cpu"; +}; + +®_dcdc3 { + regulator-always-on; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1400000>; + regulator-name = "vdd-int-dll"; +}; + +®_ldo1 { + regulator-name = "vdd-rtc"; +}; + +®_ldo2 { + regulator-always-on; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + regulator-name = "avcc"; +}; + +®_ldo3 { + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc-wifi"; +}; -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: wens@csie.org (Chen-Yu Tsai) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 7/9] ARM: dts: sun5i: hsg-h702: add axp209 regulator nodes Date: Fri, 9 Jan 2015 18:17:54 +0800 [thread overview] Message-ID: <1420798676-22856-8-git-send-email-wens@csie.org> (raw) In-Reply-To: <1420798676-22856-1-git-send-email-wens@csie.org> This patch adds the regulator nodes for the axp209 by including the axp209 dtsi. As the inputs of these regulators are from the axp209's PS output, which is basically just a mux over the 2 inputs, it is considered to be unregulated. Thus we do not provide input supply properties for them. The regulator names and constraints are based on the board schematics and the SoC datasheet. DCDC2 is used as the cpu power supply. This patch also references it from the cpu node. LDO3 powers the USB WiFi module. This patch also references it from the usb-phy node. Also get rid of axp209 properties already set in axp209.dtsi. Signed-off-by: Chen-Yu Tsai <wens@csie.org> --- changes since v1: - Use preprocessor include for axp209.dtsi --- arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 46 ++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts index 99a5968720b4..82637db1c55a 100644 --- a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts +++ b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts @@ -68,11 +68,7 @@ }; usbphy: phy at 01c13400 { - /* - * There doesn't seem to be a GPIO for controlling - * usb1 vbus, despite the fex file saying otherwise. - */ - usb1_vbus-supply = <®_vcc5v0>; + usb1_vbus-supply = <®_ldo3>; status = "okay"; }; @@ -105,11 +101,8 @@ status = "okay"; axp209: pmic at 34 { - compatible = "x-powers,axp209"; reg = <0x34>; interrupts = <0>; - interrupt-controller; - #interrupt-cells = <1>; }; }; @@ -131,3 +124,40 @@ }; }; }; + +#include "axp209.dtsi" + +&cpu0 { + cpu-supply = <®_dcdc2>; +}; + +®_dcdc2 { + regulator-always-on; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1500000>; + regulator-name = "vdd-cpu"; +}; + +®_dcdc3 { + regulator-always-on; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1400000>; + regulator-name = "vdd-int-dll"; +}; + +®_ldo1 { + regulator-name = "vdd-rtc"; +}; + +®_ldo2 { + regulator-always-on; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + regulator-name = "avcc"; +}; + +®_ldo3 { + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc-wifi"; +}; -- 2.1.4
next prev parent reply other threads:[~2015-01-09 10:17 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-01-09 10:17 [PATCH v2 0/9] ARM: sunxi: Support cpufreq on sun[457]i Chen-Yu Tsai 2015-01-09 10:17 ` Chen-Yu Tsai 2015-01-09 10:17 ` [PATCH v2 1/9] Input: sun4i-ts: Add thermal zone sensor support Chen-Yu Tsai 2015-01-09 10:17 ` Chen-Yu Tsai 2015-01-09 17:23 ` Dmitry Torokhov 2015-01-09 17:23 ` Dmitry Torokhov 2015-01-09 18:28 ` Chen-Yu Tsai 2015-01-09 18:28 ` Chen-Yu Tsai 2015-01-11 1:59 ` Chen-Yu Tsai 2015-01-11 1:59 ` Chen-Yu Tsai 2015-01-09 18:33 ` Eduardo Valentin 2015-01-09 18:33 ` Eduardo Valentin 2015-01-09 18:42 ` Dmitry Torokhov 2015-01-09 18:42 ` Dmitry Torokhov 2015-01-09 10:17 ` [PATCH v2 2/9] ARM: dts: sunxi: Add dtsi for AXP209 PMIC Chen-Yu Tsai 2015-01-09 10:17 ` Chen-Yu Tsai 2015-01-09 10:17 ` [PATCH v2 3/9] ARM: dts: sun7i: Add cpu thermal zones to dtsi Chen-Yu Tsai 2015-01-09 10:17 ` Chen-Yu Tsai 2015-01-09 18:10 ` Eduardo Valentin 2015-01-09 18:10 ` Eduardo Valentin 2015-01-09 10:17 ` [PATCH v2 4/9] ARM: dts: sun7i: cubieboard2: add axp209 regulator nodes Chen-Yu Tsai 2015-01-09 10:17 ` Chen-Yu Tsai 2015-01-09 10:17 ` [PATCH v2 5/9] ARM: dts: sun7i: cubietruck: " Chen-Yu Tsai 2015-01-09 10:17 ` Chen-Yu Tsai 2015-01-09 10:17 ` [PATCH v2 6/9] ARM: dts: sun5i: Add cpu thermal zones to dtsi Chen-Yu Tsai 2015-01-09 10:17 ` Chen-Yu Tsai 2015-01-09 18:10 ` Eduardo Valentin 2015-01-09 18:10 ` Eduardo Valentin 2015-01-09 18:11 ` Eduardo Valentin 2015-01-09 18:11 ` Eduardo Valentin 2015-01-09 10:17 ` Chen-Yu Tsai [this message] 2015-01-09 10:17 ` [PATCH v2 7/9] ARM: dts: sun5i: hsg-h702: add axp209 regulator nodes Chen-Yu Tsai 2015-01-09 10:17 ` [PATCH v2 8/9] ARM: dts: sun4i: Add cpu thermal zones to dtsi Chen-Yu Tsai 2015-01-09 10:17 ` Chen-Yu Tsai 2015-01-09 10:17 ` [PATCH v2 9/9] ARM: dts: sun4i: cubieboard: add axp209 regulator nodes Chen-Yu Tsai 2015-01-09 10:17 ` Chen-Yu Tsai
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=1420798676-22856-8-git-send-email-wens@csie.org \ --to=wens@csie.org \ --cc=dmitry.torokhov@gmail.com \ --cc=edubezval@gmail.com \ --cc=hdegoede@redhat.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-input@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=maxime.ripard@free-electrons.com \ --cc=rui.zhang@intel.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.