* [PATCH v2 0/6] ARM: dts: sun8i: v40 Rewrite BPi M2 Berry DTS based on BPi M2 Ultra
@ 2019-04-12 10:32 Pablo Greco
2019-04-12 10:33 ` [PATCH v2 1/6] ARM: dts: sun8i: v40: bananapi-m2-berry: Sort device node dereferences Pablo Greco
` (4 more replies)
0 siblings, 5 replies; 12+ messages in thread
From: Pablo Greco @ 2019-04-12 10:32 UTC (permalink / raw)
To: linux-sunxi
Cc: Pablo Greco, Rob Herring, Mark Rutland, Maxime Ripard,
Chen-Yu Tsai, devicetree, linux-arm-kernel, linux-kernel
BPi M2 Berry is a trimmed down version of the BPi M2 Ultra, completely
software compatible.
Changes include:
- 2GiB -> 1GiB
- no eMMC
- no onboard microphone
- no IR
- no blue LED
- no charging (and power jack to USB)
- dropped USB2 and connect USB1 to a 4-port HUB.
Changes since v1:
- Split into smaller patches
Pablo Greco (6):
ARM: dts: sun8i: v40: bananapi-m2-berry: Sort device node
dereferences.
ARM: dts: sun8i: v40: bananapi-m2-berry: Enable GMAC ethernet
controller
ARM: dts: sun8i: v40: bananapi-m2-berry: Enable HDMI output
ARM: dts: sun8i: v40: bananapi-m2-berry: Enable AHCI
ARM: dts: sun8i: v40: bananapi-m2-berry: Fix WiFi regulator
definitions
ARM: dts: sun8i: v40: bananapi-m2-berry: Add Bluetooth device node
arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 144 ++++++++++++++++++++--
1 file changed, 131 insertions(+), 13 deletions(-)
--
1.8.3.1
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH v2 1/6] ARM: dts: sun8i: v40: bananapi-m2-berry: Sort device node dereferences. 2019-04-12 10:32 [PATCH v2 0/6] ARM: dts: sun8i: v40 Rewrite BPi M2 Berry DTS based on BPi M2 Ultra Pablo Greco @ 2019-04-12 10:33 ` Pablo Greco [not found] ` <1555065186-8154-2-git-send-email-pgreco-/kQrlZ55X3WoClj4AeEUq9i2O/JbrIOy@public.gmane.org> 2019-04-12 10:33 ` [PATCH v2 2/6] ARM: dts: sun8i: v40: bananapi-m2-berry: Enable GMAC ethernet controller Pablo Greco ` (3 subsequent siblings) 4 siblings, 1 reply; 12+ messages in thread From: Pablo Greco @ 2019-04-12 10:33 UTC (permalink / raw) To: linux-sunxi Cc: Pablo Greco, Rob Herring, Mark Rutland, Maxime Ripard, Chen-Yu Tsai, devicetree, linux-arm-kernel, linux-kernel The device node dereferences are out of order, sort them. Signed-off-by: Pablo Greco <pgreco@centosproject.org> --- arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 36 +++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts index bf97f62..f05cabd 100644 --- a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts +++ b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts @@ -105,6 +105,24 @@ #include "axp22x.dtsi" +&mmc0 { + vmmc-supply = <®_dcdc1>; + bus-width = <4>; + cd-gpios = <&pio 7 13 GPIO_ACTIVE_LOW>; /* PH13 */ + status = "okay"; +}; + +&mmc1 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc1_pg_pins>; + vmmc-supply = <®_dldo2>; + vqmmc-supply = <®_dldo1>; + mmc-pwrseq = <&wifi_pwrseq>; + bus-width = <4>; + non-removable; + status = "okay"; +}; + ®_aldo3 { regulator-always-on; regulator-min-microvolt = <2700000>; @@ -152,24 +170,6 @@ regulator-name = "vcc-wifi"; }; -&mmc0 { - vmmc-supply = <®_dcdc1>; - bus-width = <4>; - cd-gpios = <&pio 7 13 GPIO_ACTIVE_LOW>; /* PH13 */ - status = "okay"; -}; - -&mmc1 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc1_pg_pins>; - vmmc-supply = <®_dldo2>; - vqmmc-supply = <®_dldo1>; - mmc-pwrseq = <&wifi_pwrseq>; - bus-width = <4>; - non-removable; - status = "okay"; -}; - &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_pb_pins>; -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
[parent not found: <1555065186-8154-2-git-send-email-pgreco-/kQrlZ55X3WoClj4AeEUq9i2O/JbrIOy@public.gmane.org>]
* Re: [PATCH v2 1/6] ARM: dts: sun8i: v40: bananapi-m2-berry: Sort device node dereferences. [not found] ` <1555065186-8154-2-git-send-email-pgreco-/kQrlZ55X3WoClj4AeEUq9i2O/JbrIOy@public.gmane.org> @ 2019-04-15 7:52 ` Maxime Ripard 0 siblings, 0 replies; 12+ messages in thread From: Maxime Ripard @ 2019-04-15 7:52 UTC (permalink / raw) To: Pablo Greco Cc: linux-sunxi-/JYPxA39Uh5TLH3MbocFFw, Rob Herring, Mark Rutland, Chen-Yu Tsai, devicetree-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-kernel-u79uwXL29TY76Z2rM5mHXA [-- Attachment #1: Type: text/plain, Size: 320 bytes --] On Fri, Apr 12, 2019 at 07:33:00AM -0300, Pablo Greco wrote: > The device node dereferences are out of order, sort them. > > Signed-off-by: Pablo Greco <pgreco-/kQrlZ55X3WoClj4AeEUq9i2O/JbrIOy@public.gmane.org> Applied, thanks! Maxime -- Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 2/6] ARM: dts: sun8i: v40: bananapi-m2-berry: Enable GMAC ethernet controller 2019-04-12 10:32 [PATCH v2 0/6] ARM: dts: sun8i: v40 Rewrite BPi M2 Berry DTS based on BPi M2 Ultra Pablo Greco 2019-04-12 10:33 ` [PATCH v2 1/6] ARM: dts: sun8i: v40: bananapi-m2-berry: Sort device node dereferences Pablo Greco @ 2019-04-12 10:33 ` Pablo Greco [not found] ` <1555065186-8154-3-git-send-email-pgreco-/kQrlZ55X3WoClj4AeEUq9i2O/JbrIOy@public.gmane.org> 2019-04-12 10:33 ` [PATCH v2 3/6] ARM: dts: sun8i: v40: bananapi-m2-berry: Enable HDMI output Pablo Greco ` (2 subsequent siblings) 4 siblings, 1 reply; 12+ messages in thread From: Pablo Greco @ 2019-04-12 10:33 UTC (permalink / raw) To: linux-sunxi Cc: Pablo Greco, Rob Herring, Mark Rutland, Maxime Ripard, Chen-Yu Tsai, devicetree, linux-arm-kernel, linux-kernel Just like the Bananapi M2 Ultra, the Bananapi M2 Berry has a Realtek RTL8211E RGMII PHY tied to the GMAC. The PMIC's DC1SW output provides power for the PHY, while the ALDO2 output provides I/O voltages on both sides. Signed-off-by: Pablo Greco <pgreco@centosproject.org> --- arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 30 +++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts index f05cabd..0d79e91 100644 --- a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts +++ b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts @@ -50,6 +50,7 @@ compatible = "sinovoip,bpi-m2-berry", "allwinner,sun8i-r40"; aliases { + ethernet0 = &gmac; serial0 = &uart0; }; @@ -92,6 +93,22 @@ status = "okay"; }; +&gmac { + pinctrl-names = "default"; + pinctrl-0 = <&gmac_rgmii_pins>; + phy-handle = <&phy1>; + phy-mode = "rgmii"; + phy-supply = <®_dc1sw>; + status = "okay"; +}; + +&gmac_mdio { + phy1: ethernet-phy@1 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <1>; + }; +}; + &i2c0 { status = "okay"; @@ -123,6 +140,13 @@ status = "okay"; }; +®_aldo2 { + regulator-always-on; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; + regulator-name = "vcc-pa"; +}; + ®_aldo3 { regulator-always-on; regulator-min-microvolt = <2700000>; @@ -130,6 +154,12 @@ regulator-name = "avcc"; }; +®_dc1sw { + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + regulator-name = "vcc-gmac-phy"; +}; + ®_dcdc1 { regulator-always-on; regulator-min-microvolt = <3000000>; -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
[parent not found: <1555065186-8154-3-git-send-email-pgreco-/kQrlZ55X3WoClj4AeEUq9i2O/JbrIOy@public.gmane.org>]
* Re: [PATCH v2 2/6] ARM: dts: sun8i: v40: bananapi-m2-berry: Enable GMAC ethernet controller [not found] ` <1555065186-8154-3-git-send-email-pgreco-/kQrlZ55X3WoClj4AeEUq9i2O/JbrIOy@public.gmane.org> @ 2019-04-15 7:53 ` Maxime Ripard 2019-04-16 10:47 ` Pablo Sebastián Greco 0 siblings, 1 reply; 12+ messages in thread From: Maxime Ripard @ 2019-04-15 7:53 UTC (permalink / raw) To: Pablo Greco Cc: linux-sunxi-/JYPxA39Uh5TLH3MbocFFw, Rob Herring, Mark Rutland, Chen-Yu Tsai, devicetree-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-kernel-u79uwXL29TY76Z2rM5mHXA [-- Attachment #1: Type: text/plain, Size: 1707 bytes --] On Fri, Apr 12, 2019 at 07:33:01AM -0300, Pablo Greco wrote: > Just like the Bananapi M2 Ultra, the Bananapi M2 Berry has a Realtek > RTL8211E RGMII PHY tied to the GMAC. > The PMIC's DC1SW output provides power for the PHY, while the ALDO2 > output provides I/O voltages on both sides. > > Signed-off-by: Pablo Greco <pgreco-/kQrlZ55X3WoClj4AeEUq9i2O/JbrIOy@public.gmane.org> > --- > arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 30 +++++++++++++++++++++++ > 1 file changed, 30 insertions(+) > > diff --git a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts > index f05cabd..0d79e91 100644 > --- a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts > +++ b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts > @@ -50,6 +50,7 @@ > compatible = "sinovoip,bpi-m2-berry", "allwinner,sun8i-r40"; > > aliases { > + ethernet0 = &gmac; > serial0 = &uart0; > }; > > @@ -92,6 +93,22 @@ > status = "okay"; > }; > > +&gmac { > + pinctrl-names = "default"; > + pinctrl-0 = <&gmac_rgmii_pins>; > + phy-handle = <&phy1>; > + phy-mode = "rgmii"; > + phy-supply = <®_dc1sw>; > + status = "okay"; > +}; > + > +&gmac_mdio { > + phy1: ethernet-phy@1 { > + compatible = "ethernet-phy-ieee802.3-c22"; > + reg = <1>; > + }; > +}; > + > &i2c0 { > status = "okay"; > > @@ -123,6 +140,13 @@ > status = "okay"; > }; > > +®_aldo2 { > + regulator-always-on; > + regulator-min-microvolt = <2500000>; > + regulator-max-microvolt = <2500000>; > + regulator-name = "vcc-pa"; > +}; > + If this one provides power to the pins, it should be tied to the PIO node. Maxime -- Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 2/6] ARM: dts: sun8i: v40: bananapi-m2-berry: Enable GMAC ethernet controller 2019-04-15 7:53 ` Maxime Ripard @ 2019-04-16 10:47 ` Pablo Sebastián Greco [not found] ` <eb80d64f-7355-071b-c1d1-04e0eb4475ce-/kQrlZ55X3WoClj4AeEUq9i2O/JbrIOy@public.gmane.org> 0 siblings, 1 reply; 12+ messages in thread From: Pablo Sebastián Greco @ 2019-04-16 10:47 UTC (permalink / raw) To: maxime.ripard Cc: linux-sunxi, Rob Herring, Mark Rutland, Chen-Yu Tsai, devicetree, linux-arm-kernel, linux-kernel El 15/4/19 a las 04:53, Maxime Ripard escribió: > On Fri, Apr 12, 2019 at 07:33:01AM -0300, Pablo Greco wrote: >> Just like the Bananapi M2 Ultra, the Bananapi M2 Berry has a Realtek >> RTL8211E RGMII PHY tied to the GMAC. >> The PMIC's DC1SW output provides power for the PHY, while the ALDO2 >> output provides I/O voltages on both sides. >> >> Signed-off-by: Pablo Greco <pgreco@centosproject.org> >> --- >> arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 30 +++++++++++++++++++++++ >> 1 file changed, 30 insertions(+) >> >> diff --git a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts >> index f05cabd..0d79e91 100644 >> --- a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts >> +++ b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts >> @@ -50,6 +50,7 @@ >> compatible = "sinovoip,bpi-m2-berry", "allwinner,sun8i-r40"; >> >> aliases { >> + ethernet0 = &gmac; >> serial0 = &uart0; >> }; >> >> @@ -92,6 +93,22 @@ >> status = "okay"; >> }; >> >> +&gmac { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&gmac_rgmii_pins>; >> + phy-handle = <&phy1>; >> + phy-mode = "rgmii"; >> + phy-supply = <®_dc1sw>; >> + status = "okay"; >> +}; >> + >> +&gmac_mdio { >> + phy1: ethernet-phy@1 { >> + compatible = "ethernet-phy-ieee802.3-c22"; >> + reg = <1>; >> + }; >> +}; >> + >> &i2c0 { >> status = "okay"; >> >> @@ -123,6 +140,13 @@ >> status = "okay"; >> }; >> >> +®_aldo2 { >> + regulator-always-on; >> + regulator-min-microvolt = <2500000>; >> + regulator-max-microvolt = <2500000>; >> + regulator-name = "vcc-pa"; >> +}; >> + > If this one provides power to the pins, it should be tied to the PIO > node. In that case, I should fix the bananapi-m2-ultra the same way. Do you prefer me to add those fixes to this series? Or is it better to apply this like it is, and I fix both together in a separated series? > Maxime > > -- > Maxime Ripard, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com > Pablo. ^ permalink raw reply [flat|nested] 12+ messages in thread
[parent not found: <eb80d64f-7355-071b-c1d1-04e0eb4475ce-/kQrlZ55X3WoClj4AeEUq9i2O/JbrIOy@public.gmane.org>]
* Re: [PATCH v2 2/6] ARM: dts: sun8i: v40: bananapi-m2-berry: Enable GMAC ethernet controller [not found] ` <eb80d64f-7355-071b-c1d1-04e0eb4475ce-/kQrlZ55X3WoClj4AeEUq9i2O/JbrIOy@public.gmane.org> @ 2019-04-16 13:00 ` Maxime Ripard 0 siblings, 0 replies; 12+ messages in thread From: Maxime Ripard @ 2019-04-16 13:00 UTC (permalink / raw) To: Pablo Sebastián Greco Cc: linux-sunxi-/JYPxA39Uh5TLH3MbocFFw, Rob Herring, Mark Rutland, Chen-Yu Tsai, devicetree-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-kernel-u79uwXL29TY76Z2rM5mHXA [-- Attachment #1: Type: text/plain, Size: 2793 bytes --] 65;5600;1c On Tue, Apr 16, 2019 at 07:47:09AM -0300, Pablo Sebastián Greco wrote: > > El 15/4/19 a las 04:53, Maxime Ripard escribió: > > On Fri, Apr 12, 2019 at 07:33:01AM -0300, Pablo Greco wrote: > > > Just like the Bananapi M2 Ultra, the Bananapi M2 Berry has a Realtek > > > RTL8211E RGMII PHY tied to the GMAC. > > > The PMIC's DC1SW output provides power for the PHY, while the ALDO2 > > > output provides I/O voltages on both sides. > > > > > > Signed-off-by: Pablo Greco <pgreco-/kQrlZ55X3WoClj4AeEUq9i2O/JbrIOy@public.gmane.org> > > > --- > > > arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 30 +++++++++++++++++++++++ > > > 1 file changed, 30 insertions(+) > > > > > > diff --git a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts > > > index f05cabd..0d79e91 100644 > > > --- a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts > > > +++ b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts > > > @@ -50,6 +50,7 @@ > > > compatible = "sinovoip,bpi-m2-berry", "allwinner,sun8i-r40"; > > > > > > aliases { > > > + ethernet0 = &gmac; > > > serial0 = &uart0; > > > }; > > > > > > @@ -92,6 +93,22 @@ > > > status = "okay"; > > > }; > > > > > > +&gmac { > > > + pinctrl-names = "default"; > > > + pinctrl-0 = <&gmac_rgmii_pins>; > > > + phy-handle = <&phy1>; > > > + phy-mode = "rgmii"; > > > + phy-supply = <®_dc1sw>; > > > + status = "okay"; > > > +}; > > > + > > > +&gmac_mdio { > > > + phy1: ethernet-phy@1 { > > > + compatible = "ethernet-phy-ieee802.3-c22"; > > > + reg = <1>; > > > + }; > > > +}; > > > + > > > &i2c0 { > > > status = "okay"; > > > > > > @@ -123,6 +140,13 @@ > > > status = "okay"; > > > }; > > > > > > +®_aldo2 { > > > + regulator-always-on; > > > + regulator-min-microvolt = <2500000>; > > > + regulator-max-microvolt = <2500000>; > > > + regulator-name = "vcc-pa"; > > > +}; > > > + > > If this one provides power to the pins, it should be tied to the PIO > > node. > > In that case, I should fix the bananapi-m2-ultra the same way. Do you prefer > me to add those fixes to this series? If you have that board, then please add that yep. > Or is it better to apply this like it is, and I fix both together in a > separated series? No, please resend a new version. Maxime -- Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org For more options, visit https://groups.google.com/d/optout. [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 228 bytes --] ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 3/6] ARM: dts: sun8i: v40: bananapi-m2-berry: Enable HDMI output 2019-04-12 10:32 [PATCH v2 0/6] ARM: dts: sun8i: v40 Rewrite BPi M2 Berry DTS based on BPi M2 Ultra Pablo Greco 2019-04-12 10:33 ` [PATCH v2 1/6] ARM: dts: sun8i: v40: bananapi-m2-berry: Sort device node dereferences Pablo Greco 2019-04-12 10:33 ` [PATCH v2 2/6] ARM: dts: sun8i: v40: bananapi-m2-berry: Enable GMAC ethernet controller Pablo Greco @ 2019-04-12 10:33 ` Pablo Greco [not found] ` <1555065186-8154-1-git-send-email-pgreco-/kQrlZ55X3WoClj4AeEUq9i2O/JbrIOy@public.gmane.org> 2019-04-12 10:33 ` [PATCH v2 6/6] ARM: dts: sun8i: v40: bananapi-m2-berry: Add Bluetooth device node Pablo Greco 4 siblings, 0 replies; 12+ messages in thread From: Pablo Greco @ 2019-04-12 10:33 UTC (permalink / raw) To: linux-sunxi Cc: Pablo Greco, Rob Herring, Mark Rutland, Maxime Ripard, Chen-Yu Tsai, devicetree, linux-arm-kernel, linux-kernel This patch adds the hdmi nodes to the Bananapi M2 Berry, the same way it was done to the Bananapi M2 Ultra Signed-off-by: Pablo Greco <pgreco@centosproject.org> --- arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 29 +++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts index 0d79e91..2a5b80b 100644 --- a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts +++ b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts @@ -58,6 +58,17 @@ stdout-path = "serial0:115200n8"; }; + connector { + compatible = "hdmi-connector"; + type = "a"; + + port { + hdmi_con_in: endpoint { + remote-endpoint = <&hdmi_out_con>; + }; + }; + }; + leds { compatible = "gpio-leds"; @@ -88,6 +99,10 @@ }; }; +&de { + status = "okay"; +}; + &ehci1 { /* Terminus Tech FE 1.1s 4-port USB 2.0 hub here */ status = "okay"; @@ -109,6 +124,16 @@ }; }; +&hdmi { + status = "okay"; +}; + +&hdmi_out { + hdmi_out_con: endpoint { + remote-endpoint = <&hdmi_con_in>; + }; +}; + &i2c0 { status = "okay"; @@ -200,6 +225,10 @@ regulator-name = "vcc-wifi"; }; +&tcon_tv0 { + status = "okay"; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_pb_pins>; -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
[parent not found: <1555065186-8154-1-git-send-email-pgreco-/kQrlZ55X3WoClj4AeEUq9i2O/JbrIOy@public.gmane.org>]
* [PATCH v2 4/6] ARM: dts: sun8i: v40: bananapi-m2-berry: Enable AHCI [not found] ` <1555065186-8154-1-git-send-email-pgreco-/kQrlZ55X3WoClj4AeEUq9i2O/JbrIOy@public.gmane.org> @ 2019-04-12 10:33 ` Pablo Greco [not found] ` <1555065186-8154-5-git-send-email-pgreco-/kQrlZ55X3WoClj4AeEUq9i2O/JbrIOy@public.gmane.org> 2019-04-12 10:33 ` [PATCH v2 5/6] ARM: dts: sun8i: v40: bananapi-m2-berry: Fix WiFi regulator definitions Pablo Greco 1 sibling, 1 reply; 12+ messages in thread From: Pablo Greco @ 2019-04-12 10:33 UTC (permalink / raw) To: linux-sunxi-/JYPxA39Uh5TLH3MbocFFw Cc: Pablo Greco, Rob Herring, Mark Rutland, Maxime Ripard, Chen-Yu Tsai, devicetree-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-kernel-u79uwXL29TY76Z2rM5mHXA Just like the Bananapi M2 Ultra, enable the ahci controller and the two regulators needed to activate it. Signed-off-by: Pablo Greco <pgreco-/kQrlZ55X3WoClj4AeEUq9i2O/JbrIOy@public.gmane.org> --- arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts index 2a5b80b..c37c7ab 100644 --- a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts +++ b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts @@ -99,6 +99,12 @@ }; }; +&ahci { + ahci-supply = <®_dldo4>; + phy-supply = <®_eldo3>; + status = "okay"; +}; + &de { status = "okay"; }; @@ -225,6 +231,18 @@ regulator-name = "vcc-wifi"; }; +®_dldo4 { + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; + regulator-name = "vdd2v5-sata"; +}; + +®_eldo3 { + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-name = "vdd1v2-sata"; +}; + &tcon_tv0 { status = "okay"; }; -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
[parent not found: <1555065186-8154-5-git-send-email-pgreco-/kQrlZ55X3WoClj4AeEUq9i2O/JbrIOy@public.gmane.org>]
* Re: [PATCH v2 4/6] ARM: dts: sun8i: v40: bananapi-m2-berry: Enable AHCI [not found] ` <1555065186-8154-5-git-send-email-pgreco-/kQrlZ55X3WoClj4AeEUq9i2O/JbrIOy@public.gmane.org> @ 2019-04-16 14:34 ` Jagan Teki 0 siblings, 0 replies; 12+ messages in thread From: Jagan Teki @ 2019-04-16 14:34 UTC (permalink / raw) To: Pablo Sebastián Greco Cc: linux-sunxi, Rob Herring, Mark Rutland, Maxime Ripard, Chen-Yu Tsai, devicetree, linux-arm-kernel, linux-kernel On Fri, Apr 12, 2019 at 4:03 PM Pablo Greco <pgreco-/kQrlZ55X3WoClj4AeEUq9i2O/JbrIOy@public.gmane.org> wrote: > > Just like the Bananapi M2 Ultra, enable the ahci controller and > the two regulators needed to activate it. > > Signed-off-by: Pablo Greco <pgreco-/kQrlZ55X3WoClj4AeEUq9i2O/JbrIOy@public.gmane.org> > --- Reviewed-by: Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org> ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 5/6] ARM: dts: sun8i: v40: bananapi-m2-berry: Fix WiFi regulator definitions [not found] ` <1555065186-8154-1-git-send-email-pgreco-/kQrlZ55X3WoClj4AeEUq9i2O/JbrIOy@public.gmane.org> 2019-04-12 10:33 ` [PATCH v2 4/6] ARM: dts: sun8i: v40: bananapi-m2-berry: Enable AHCI Pablo Greco @ 2019-04-12 10:33 ` Pablo Greco 1 sibling, 0 replies; 12+ messages in thread From: Pablo Greco @ 2019-04-12 10:33 UTC (permalink / raw) To: linux-sunxi-/JYPxA39Uh5TLH3MbocFFw Cc: Pablo Greco, Rob Herring, Mark Rutland, Maxime Ripard, Chen-Yu Tsai, devicetree-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-kernel-u79uwXL29TY76Z2rM5mHXA Just like was done for the bananapi-m2-ultra, add the second wifi/bt regulator and mark both as always-on. Signed-off-by: Pablo Greco <pgreco-/kQrlZ55X3WoClj4AeEUq9i2O/JbrIOy@public.gmane.org> --- arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts index c37c7ab..78f4a1a 100644 --- a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts +++ b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts @@ -225,12 +225,27 @@ regulator-name = "vcc-wifi-io"; }; +/* + * Our WiFi chip needs both DLDO2 and DLDO3 to be powered at the same + * time, with the two being in sync, to be able to meet maximum power + * consumption during transmits. Since this is not really supported + * right now, just use the two as always on, and we will fix it later. + */ + ®_dldo2 { + regulator-always-on; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-name = "vcc-wifi"; }; +®_dldo3 { + regulator-always-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc-wifi-2"; +}; + ®_dldo4 { regulator-min-microvolt = <2500000>; regulator-max-microvolt = <2500000>; -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v2 6/6] ARM: dts: sun8i: v40: bananapi-m2-berry: Add Bluetooth device node 2019-04-12 10:32 [PATCH v2 0/6] ARM: dts: sun8i: v40 Rewrite BPi M2 Berry DTS based on BPi M2 Ultra Pablo Greco ` (3 preceding siblings ...) [not found] ` <1555065186-8154-1-git-send-email-pgreco-/kQrlZ55X3WoClj4AeEUq9i2O/JbrIOy@public.gmane.org> @ 2019-04-12 10:33 ` Pablo Greco 4 siblings, 0 replies; 12+ messages in thread From: Pablo Greco @ 2019-04-12 10:33 UTC (permalink / raw) To: linux-sunxi Cc: Pablo Greco, Rob Herring, Mark Rutland, Maxime Ripard, Chen-Yu Tsai, devicetree, linux-arm-kernel, linux-kernel Since the bananapi-m2-ultra and the bananapi-m2-berry have the same WiFi/Bluetooth, add the required nodes to the bananapi-m2-berry. Signed-off-by: Pablo Greco <pgreco@centosproject.org> --- arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 26 +++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts index 78f4a1a..3d0bb7e 100644 --- a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts +++ b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts @@ -96,6 +96,8 @@ wifi_pwrseq: wifi_pwrseq { compatible = "mmc-pwrseq-simple"; reset-gpios = <&pio 6 10 GPIO_ACTIVE_LOW>; /* PG10 WIFI_EN */ + clocks = <&ccu CLK_OUTA>; + clock-names = "ext_clock"; }; }; @@ -171,6 +173,11 @@ status = "okay"; }; +&pio { + pinctrl-names = "default"; + pinctrl-0 = <&clk_out_a_pin>; +}; + ®_aldo2 { regulator-always-on; regulator-min-microvolt = <2500000>; @@ -268,6 +275,25 @@ status = "okay"; }; +&uart3 { + pinctrl-names = "default"; + pinctrl-0 = <&uart3_pg_pins>, <&uart3_rts_cts_pg_pins>; + uart-has-rtscts; + status = "okay"; + + bluetooth { + compatible = "brcm,bcm43438-bt"; + clocks = <&ccu CLK_OUTA>; + clock-names = "lpo"; + vbat-supply = <®_dldo2>; + vddio-supply = <®_dldo1>; + device-wakeup-gpios = <&pio 6 11 GPIO_ACTIVE_HIGH>; /* PG11 */ + /* TODO host wake line connected to PMIC GPIO pins */ + shutdown-gpios = <&pio 7 12 GPIO_ACTIVE_HIGH>; /* PH12 */ + max-speed = <1500000>; + }; +}; + &usbphy { usb1_vbus-supply = <®_vcc5v0>; status = "okay"; -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2019-04-16 14:34 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-12 10:32 [PATCH v2 0/6] ARM: dts: sun8i: v40 Rewrite BPi M2 Berry DTS based on BPi M2 Ultra Pablo Greco
2019-04-12 10:33 ` [PATCH v2 1/6] ARM: dts: sun8i: v40: bananapi-m2-berry: Sort device node dereferences Pablo Greco
[not found] ` <1555065186-8154-2-git-send-email-pgreco-/kQrlZ55X3WoClj4AeEUq9i2O/JbrIOy@public.gmane.org>
2019-04-15 7:52 ` Maxime Ripard
2019-04-12 10:33 ` [PATCH v2 2/6] ARM: dts: sun8i: v40: bananapi-m2-berry: Enable GMAC ethernet controller Pablo Greco
[not found] ` <1555065186-8154-3-git-send-email-pgreco-/kQrlZ55X3WoClj4AeEUq9i2O/JbrIOy@public.gmane.org>
2019-04-15 7:53 ` Maxime Ripard
2019-04-16 10:47 ` Pablo Sebastián Greco
[not found] ` <eb80d64f-7355-071b-c1d1-04e0eb4475ce-/kQrlZ55X3WoClj4AeEUq9i2O/JbrIOy@public.gmane.org>
2019-04-16 13:00 ` Maxime Ripard
2019-04-12 10:33 ` [PATCH v2 3/6] ARM: dts: sun8i: v40: bananapi-m2-berry: Enable HDMI output Pablo Greco
[not found] ` <1555065186-8154-1-git-send-email-pgreco-/kQrlZ55X3WoClj4AeEUq9i2O/JbrIOy@public.gmane.org>
2019-04-12 10:33 ` [PATCH v2 4/6] ARM: dts: sun8i: v40: bananapi-m2-berry: Enable AHCI Pablo Greco
[not found] ` <1555065186-8154-5-git-send-email-pgreco-/kQrlZ55X3WoClj4AeEUq9i2O/JbrIOy@public.gmane.org>
2019-04-16 14:34 ` Jagan Teki
2019-04-12 10:33 ` [PATCH v2 5/6] ARM: dts: sun8i: v40: bananapi-m2-berry: Fix WiFi regulator definitions Pablo Greco
2019-04-12 10:33 ` [PATCH v2 6/6] ARM: dts: sun8i: v40: bananapi-m2-berry: Add Bluetooth device node Pablo Greco
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox