Message ID | 1466602902-4022-1-git-send-email-quentin.schulz@free-electrons.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Wed, Jun 22, 2016 at 9:41 PM, Quentin Schulz <quentin.schulz@free-electrons.com> wrote: > The Parrot Board is an evaluation board with an Allwinner R16 (assumed > to be close to an Allwinner A33), 4GB of eMMC, 512MB of RAM, USB host > and OTG, a WiFi/Bluetooth combo chip, a micro SD Card reader, 2 > controllable buttons, an LVDS port with separated backlight and > capacitive touch panel ports, an audio/microphone jack, a camera CSI > port, 2 sets of 22 GPIOs and an accelerometer. > > Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com> > --- > > Patch dependencies: > - regulator: axp20x: Add support for the (external) drivebus regulator > - ARM: dts: axp22x.dtsi: Add reg_drivebus node > - ARM: dts: axp22x.dtsi: Add usb_power_supply node > - power: axp20x_usb: Add support for usb power-supply on axp22x pmics > - mfd: axp20x: Extend axp22x_volatile_ranges > - mfd: axp20x: Add axp20x-usb-power-supply for axp22x pmics > - phy-sun4i-usb: Add workaround for missing Vbus det interrupts on A31 > or the micro USB port would not be powered. > > v2: > - correct typos, > - chose less generic name suffix for nodes (now_parrot_r16), > - add comment for i2c childless node, > - add comment for two regulators-powered WiFi chip, > - add comment to explicit the use of some regulators, > - add usb_vbus_power-supply property in usbphy node (this adds a > dependance to an other patch), > > arch/arm/boot/dts/Makefile | 1 + > arch/arm/boot/dts/sun8i-r16-parrot.dts | 356 +++++++++++++++++++++++++++++++++ > 2 files changed, 357 insertions(+) > create mode 100644 arch/arm/boot/dts/sun8i-r16-parrot.dts > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index 1ff5434..6c7581f 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -762,6 +762,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \ > sun8i-a33-ippo-q8h-v1.2.dtb \ > sun8i-a33-q8-tablet.dtb \ > sun8i-a33-sinlinx-sina33.dtb \ > + sun8i-r16-parrot.dtb \ > sun8i-a83t-allwinner-h8homlet-v2.dtb \ > sun8i-a83t-cubietruck-plus.dtb \ > sun8i-h3-orangepi-2.dtb \ > diff --git a/arch/arm/boot/dts/sun8i-r16-parrot.dts b/arch/arm/boot/dts/sun8i-r16-parrot.dts > new file mode 100644 > index 0000000..cd68bfa > --- /dev/null > +++ b/arch/arm/boot/dts/sun8i-r16-parrot.dts > @@ -0,0 +1,356 @@ [...] > +®_usb1_vbus { > + pinctrl-names = "default"; > + pinctrl-0 = <&usb1_vbus_pin_parrot_r16>; > + gpio = <&pio 3 12 GPIO_ACTIVE_HIGH>; /* PD12 */ > + status = "okay"; > +}; > + > +&uart0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&uart0_pins_b>; > + status = "okay"; > +}; > + > +&usb_otg { > + dr_mode = "otg"; > + status = "okay"; > +}; > + > +&usb_power_supply { > + status = "okay"; > +}; > + > +&usbphy { > + status = "okay"; > + pinctrl-names = "default"; > + pinctrl-0 = <&usb0_id_det>; > + usb0_vbus-supply = <®_drivevbus>; > + usb0_id_det-gpios = <&pio 3 10 GPIO_ACTIVE_HIGH>; /* PD10 */ > + usb0_vbus_power-supply = <&usb_power_supply>; > + usb1_vbus-supply = <®_usb1_vbus>; /* USB1 VBUS is always on */ The comment is misleading, as you have a controllable regulator above. Otherwise, Acked-by: Chen-Yu Tsai <wens@csie.org> > +}; > -- > 2.5.0 >
Hi, On Wed, Jun 22, 2016 at 03:41:42PM +0200, Quentin Schulz wrote: > The Parrot Board is an evaluation board with an Allwinner R16 (assumed > to be close to an Allwinner A33), 4GB of eMMC, 512MB of RAM, USB host > and OTG, a WiFi/Bluetooth combo chip, a micro SD Card reader, 2 > controllable buttons, an LVDS port with separated backlight and > capacitive touch panel ports, an audio/microphone jack, a camera CSI > port, 2 sets of 22 GPIOs and an accelerometer. > > Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com> > --- > > Patch dependencies: > - regulator: axp20x: Add support for the (external) drivebus regulator > - ARM: dts: axp22x.dtsi: Add reg_drivebus node > - ARM: dts: axp22x.dtsi: Add usb_power_supply node > - power: axp20x_usb: Add support for usb power-supply on axp22x pmics > - mfd: axp20x: Extend axp22x_volatile_ranges > - mfd: axp20x: Add axp20x-usb-power-supply for axp22x pmics Those are not dependencies worth mentionning, they've already been merged. > - phy-sun4i-usb: Add workaround for missing Vbus det interrupts on A31 > or the micro USB port would not be powered. > > v2: > - correct typos, > - chose less generic name suffix for nodes (now_parrot_r16), > - add comment for i2c childless node, > - add comment for two regulators-powered WiFi chip, > - add comment to explicit the use of some regulators, > - add usb_vbus_power-supply property in usbphy node (this adds a > dependance to an other patch), > > arch/arm/boot/dts/Makefile | 1 + > arch/arm/boot/dts/sun8i-r16-parrot.dts | 356 +++++++++++++++++++++++++++++++++ > 2 files changed, 357 insertions(+) > create mode 100644 arch/arm/boot/dts/sun8i-r16-parrot.dts > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index 1ff5434..6c7581f 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -762,6 +762,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \ > sun8i-a33-ippo-q8h-v1.2.dtb \ > sun8i-a33-q8-tablet.dtb \ > sun8i-a33-sinlinx-sina33.dtb \ > + sun8i-r16-parrot.dtb \ This is supposed to be ordered alphabetically > sun8i-a83t-allwinner-h8homlet-v2.dtb \ > sun8i-a83t-cubietruck-plus.dtb \ > sun8i-h3-orangepi-2.dtb \ > diff --git a/arch/arm/boot/dts/sun8i-r16-parrot.dts b/arch/arm/boot/dts/sun8i-r16-parrot.dts > new file mode 100644 > index 0000000..cd68bfa > --- /dev/null > +++ b/arch/arm/boot/dts/sun8i-r16-parrot.dts > @@ -0,0 +1,356 @@ > +/* > + * Copyright 2016 Quentin Schulz > + * > + * Quentin Schulz <quentin.schulz@free-electrons.com> > + * > + * This file is dual-licensed: you can use it either under the terms > + * of the GPL or the X11 license, at your option. Note that this dual > + * licensing only applies to this file, and not this project as a > + * whole. > + * > + * a) This file is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation; either version 2 of the > + * License, or (at your option) any later version. > + * > + * This file is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * Or, alternatively, > + * > + * b) Permission is hereby granted, free of charge, to any person > + * obtaining a copy of this software and associated documentation > + * files (the "Software"), to deal in the Software without > + * restriction, including without limitation the rights to use, > + * copy, modify, merge, publish, distribute, sublicense, and/or > + * sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following > + * conditions: > + * > + * The above copyright notice and this permission notice shall be > + * included in all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > + */ > + > +/dts-v1/; > +#include "sun8i-a33.dtsi" > +#include "sunxi-common-regulators.dtsi" > + > +#include <dt-bindings/gpio/gpio.h> > +#include <dt-bindings/input/input.h> > + > +/ { > + model = "Allwinner Parrot EVB R16"; I think something like "Allwinner R16 EVB (Parrot)" would be better. > + compatible = "allwinner,parrot-evb-r16", "allwinner,sun8i-a33"; And we usually put the soc name first, so something like "allwinner,r16-evb" or "allwinner,parrot" > + > + aliases { > + serial0 = &uart0; > + }; > + > + chosen { > + stdout-path = "serial0:115200n8"; > + }; > + > + leds { > + compatible = "gpio-leds"; > + pinctrl-names = "default"; > + pinctrl-0 = <&led_pins_parrot_r16>; > + > + led1 { > + label = "parrot_r16:led1:usr"; > + gpio = <&pio 4 17 GPIO_ACTIVE_HIGH>; /* PE17 */ > + }; > + > + led2 { > + label = "parrot_r16:led2:usr"; parrot_r16 is redundant. Once again, parrot, or r16-evb. > + gpio = <&pio 4 16 GPIO_ACTIVE_HIGH>; /* PE16 */ > + }; > + }; > + > + wifi_pwrseq: wifi_pwrseq { > + compatible = "mmc-pwrseq-simple"; > + reset-gpios = <&r_pio 0 6 GPIO_ACTIVE_LOW>; /* PL06 */ > + }; > + > +}; > + > +&ehci0 { > + status = "okay"; > +}; > + > +&i2c1 { > + pinctrl-names = "default"; > + pinctrl-0 = <&i2c1_pins_a>; > + status = "okay"; > + > + /* An as-yet-unknown accelerometer is connected to this i2c bus. */ Maybe add a TODO, or FIXME tag? > +}; > + > +&lradc { > + vref-supply = <®_aldo3>; > + status = "okay"; > + > + button@0 { > + label = "V+"; > + linux,code = <KEY_VOLUMEUP>; > + channel = <0>; > + voltage = <190000>; > + }; > + > + button@1 { > + label = "V-"; > + linux,code = <KEY_VOLUMEDOWN>; > + channel = <0>; > + voltage = <390000>; > + }; > + > +}; > + > +&mmc0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_parrot_r16>; > + vmmc-supply = <®_dcdc1>; > + cd-gpios = <&pio 3 14 GPIO_ACTIVE_LOW>; /* PD14 */ > + bus-width = <4>; > + status = "okay"; > +}; > + > +/* > + * TODO: WiFi chip needs dldo1 AND dldo2 as vmmc-supply. > + * aldo1 is connected to VCC-IO-WIFI and thus should be vqmmc. > + * Once two regulators can be in sync for vmmc-supply, modify this node > + * accordingly. > + */ I would place that comment above the regulator definitions. > +&mmc1 { > + pinctrl-names = "default"; > + pinctrl-0 = <&mmc1_pins_a>, <&wifi_reset_pin_parrot_r16>; > + vmmc-supply = <®_aldo1>; > + mmc-pwrseq = <&wifi_pwrseq>; > + bus-width = <4>; > + non-removable; > + status = "okay"; > +}; > + > +&mmc2 { > + pinctrl-names = "default"; > + pinctrl-0 = <&mmc2_8bit_pins>; > + vmmc-supply = <®_dcdc1>; > + bus-width = <8>; > + non-removable; > + cap-mmc-hw-reset; > + status = "okay"; > +}; > + > +&mmc2_8bit_pins { > + allwinner,drive = <SUN4I_PINCTRL_40_MA>; > + allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; > +}; > + > +&ohci0 { > + status = "okay"; > +}; > + > +&pio { > + mmc0_cd_pin_parrot_r16: mmc0_cd_pin@0 { > + allwinner,pins = "PD14"; > + allwinner,function = "gpio_in"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; > + }; > + > + led_pins_parrot_r16: led_pins@0 { > + allwinner,pins = "PE16", "PE17"; > + allwinner,function = "gpio_out"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > + > + usb0_id_det: usb0_id_detect_pin@0 { > + allwinner,pins = "PD10"; > + allwinner,function = "gpio_in"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; > + }; > + > + usb1_vbus_pin_parrot_r16: usb1_vbus_pin@0 { > + allwinner,pins = "PD12"; > + allwinner,function = "gpio_out"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > +}; > + > +&r_pio { > + wifi_reset_pin_parrot_r16: wifi_reset_pin@0 { > + allwinner,pins = "PL6"; > + allwinner,function = "gpio_out"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > +}; > + > +&r_rsb { > + status = "okay"; > + > + axp22x: pmic@3a3 { > + compatible = "x-powers,axp223"; > + reg = <0x3a3>; > + interrupt-parent = <&nmi_intc>; > + interrupts = <0 IRQ_TYPE_LEVEL_LOW>; > + drivevbus-supply = <®_vcc5v0>; > + x-powers,drive-vbus-en; > + }; > +}; > + > +#include "axp22x.dtsi" > + > +/* Used for VCC-IO, VCC-PD, VCC-USB, HPVCC, VCC-IO-BB and VCC-IO-WIFI */ Just call it vcc-io then. > +®_aldo1 { > + regulator-always-on; > + regulator-min-microvolt = <3000000>; > + regulator-max-microvolt = <3000000>; > + regulator-name = "aldo1"; > +}; > + > +®_aldo2 { > + regulator-always-on; > + regulator-min-microvolt = <2350000>; > + regulator-max-microvolt = <2650000>; > + regulator-name = "vdd-dll"; > +}; > + > +®_aldo3 { > + regulator-always-on; > + regulator-min-microvolt = <2700000>; > + regulator-max-microvolt = <3300000>; > + regulator-name = "vcc-pll-avcc"; > +}; > + > +®_dc5ldo { > + regulator-always-on; > + regulator-min-microvolt = <900000>; > + regulator-max-microvolt = <1400000>; > + regulator-name = "vdd-cpus"; > +}; > + > +®_dcdc1 { > + regulator-always-on; > + regulator-min-microvolt = <3000000>; > + regulator-max-microvolt = <3000000>; > + regulator-name = "vcc-3v0"; > +}; > + > +®_dcdc2 { > + regulator-always-on; > + regulator-min-microvolt = <900000>; > + regulator-max-microvolt = <1400000>; > + regulator-name = "vdd-sys"; > +}; > + > +®_dcdc3 { > + regulator-always-on; > + regulator-min-microvolt = <900000>; > + regulator-max-microvolt = <1400000>; > + regulator-name = "vdd-cpu"; > +}; > + > +®_dcdc5 { > + regulator-always-on; > + regulator-min-microvolt = <1500000>; > + regulator-max-microvolt = <1500000>; > + regulator-name = "vcc-dram"; > +}; > + > +®_dldo1 { > + /* > + * TODO: WiFi chip needs dldo1 AND dldo2 to be on to be powered. > + * Remove next line once it is possible to sync two regulators. > + */ > + regulator-always-on; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-name = "vcc-wifi"; > +}; > + > +®_dldo2 { > + /* > + * TODO: WiFi chip needs dldo1 AND dldo2 to be on to be powered. > + * Remove next line once it is possible to sync two regulators. > + */ Those comments are actually fine, you can just drop the comment on the MMC node then :) > + regulator-always-on; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-name = "vcc-wifi1"; vcc-wifi0 and vcc-wifi1 maybe? > +}; > + > +®_dldo3 { > + regulator-min-microvolt = <3000000>; > + regulator-max-microvolt = <3000000>; > + regulator-name = "vcc-3v0-csi"; > +}; > + > +®_drivevbus { > + regulator-name = "usb0-vbus"; > + status = "okay"; > +}; > + > +®_eldo1 { > + regulator-min-microvolt = <1200000>; > + regulator-max-microvolt = <1200000>; > + regulator-name = "vcc-1v2-hsic"; > +}; > + > +®_eldo2 { > + regulator-min-microvolt = <3000000>; > + regulator-max-microvolt = <3000000>; > + regulator-name = "dsp-vcc"; You have all the other regulators starting with vcc but this one, some consistency would be great :) > +}; > + > +/* Mapped to GPIO 22 in U21 GPIOs set */ So is it a GPIO or a regulator? > +®_eldo3 { > + regulator-min-microvolt = <3000000>; > + regulator-max-microvolt = <3000000>; > + regulator-name = "eldo3"; > +}; > + > +®_usb1_vbus { > + pinctrl-names = "default"; > + pinctrl-0 = <&usb1_vbus_pin_parrot_r16>; > + gpio = <&pio 3 12 GPIO_ACTIVE_HIGH>; /* PD12 */ > + status = "okay"; > +}; > + > +&uart0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&uart0_pins_b>; > + status = "okay"; > +}; > + > +&usb_otg { > + dr_mode = "otg"; > + status = "okay"; > +}; > + > +&usb_power_supply { > + status = "okay"; > +}; > + > +&usbphy { > + status = "okay"; > + pinctrl-names = "default"; > + pinctrl-0 = <&usb0_id_det>; > + usb0_vbus-supply = <®_drivevbus>; > + usb0_id_det-gpios = <&pio 3 10 GPIO_ACTIVE_HIGH>; /* PD10 */ > + usb0_vbus_power-supply = <&usb_power_supply>; > + usb1_vbus-supply = <®_usb1_vbus>; /* USB1 VBUS is always on */ Like Chen-Yu said, that comment is wrong. Thanks! Maxime
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 1ff5434..6c7581f 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -762,6 +762,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \ sun8i-a33-ippo-q8h-v1.2.dtb \ sun8i-a33-q8-tablet.dtb \ sun8i-a33-sinlinx-sina33.dtb \ + sun8i-r16-parrot.dtb \ sun8i-a83t-allwinner-h8homlet-v2.dtb \ sun8i-a83t-cubietruck-plus.dtb \ sun8i-h3-orangepi-2.dtb \ diff --git a/arch/arm/boot/dts/sun8i-r16-parrot.dts b/arch/arm/boot/dts/sun8i-r16-parrot.dts new file mode 100644 index 0000000..cd68bfa --- /dev/null +++ b/arch/arm/boot/dts/sun8i-r16-parrot.dts @@ -0,0 +1,356 @@ +/* + * Copyright 2016 Quentin Schulz + * + * Quentin Schulz <quentin.schulz@free-electrons.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively, + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +/dts-v1/; +#include "sun8i-a33.dtsi" +#include "sunxi-common-regulators.dtsi" + +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> + +/ { + model = "Allwinner Parrot EVB R16"; + compatible = "allwinner,parrot-evb-r16", "allwinner,sun8i-a33"; + + aliases { + serial0 = &uart0; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&led_pins_parrot_r16>; + + led1 { + label = "parrot_r16:led1:usr"; + gpio = <&pio 4 17 GPIO_ACTIVE_HIGH>; /* PE17 */ + }; + + led2 { + label = "parrot_r16:led2:usr"; + gpio = <&pio 4 16 GPIO_ACTIVE_HIGH>; /* PE16 */ + }; + }; + + wifi_pwrseq: wifi_pwrseq { + compatible = "mmc-pwrseq-simple"; + reset-gpios = <&r_pio 0 6 GPIO_ACTIVE_LOW>; /* PL06 */ + }; + +}; + +&ehci0 { + status = "okay"; +}; + +&i2c1 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_pins_a>; + status = "okay"; + + /* An as-yet-unknown accelerometer is connected to this i2c bus. */ +}; + +&lradc { + vref-supply = <®_aldo3>; + status = "okay"; + + button@0 { + label = "V+"; + linux,code = <KEY_VOLUMEUP>; + channel = <0>; + voltage = <190000>; + }; + + button@1 { + label = "V-"; + linux,code = <KEY_VOLUMEDOWN>; + channel = <0>; + voltage = <390000>; + }; + +}; + +&mmc0 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_parrot_r16>; + vmmc-supply = <®_dcdc1>; + cd-gpios = <&pio 3 14 GPIO_ACTIVE_LOW>; /* PD14 */ + bus-width = <4>; + status = "okay"; +}; + +/* + * TODO: WiFi chip needs dldo1 AND dldo2 as vmmc-supply. + * aldo1 is connected to VCC-IO-WIFI and thus should be vqmmc. + * Once two regulators can be in sync for vmmc-supply, modify this node + * accordingly. + */ +&mmc1 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc1_pins_a>, <&wifi_reset_pin_parrot_r16>; + vmmc-supply = <®_aldo1>; + mmc-pwrseq = <&wifi_pwrseq>; + bus-width = <4>; + non-removable; + status = "okay"; +}; + +&mmc2 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc2_8bit_pins>; + vmmc-supply = <®_dcdc1>; + bus-width = <8>; + non-removable; + cap-mmc-hw-reset; + status = "okay"; +}; + +&mmc2_8bit_pins { + allwinner,drive = <SUN4I_PINCTRL_40_MA>; + allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; +}; + +&ohci0 { + status = "okay"; +}; + +&pio { + mmc0_cd_pin_parrot_r16: mmc0_cd_pin@0 { + allwinner,pins = "PD14"; + allwinner,function = "gpio_in"; + allwinner,drive = <SUN4I_PINCTRL_10_MA>; + allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; + }; + + led_pins_parrot_r16: led_pins@0 { + allwinner,pins = "PE16", "PE17"; + allwinner,function = "gpio_out"; + allwinner,drive = <SUN4I_PINCTRL_10_MA>; + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; + }; + + usb0_id_det: usb0_id_detect_pin@0 { + allwinner,pins = "PD10"; + allwinner,function = "gpio_in"; + allwinner,drive = <SUN4I_PINCTRL_10_MA>; + allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; + }; + + usb1_vbus_pin_parrot_r16: usb1_vbus_pin@0 { + allwinner,pins = "PD12"; + allwinner,function = "gpio_out"; + allwinner,drive = <SUN4I_PINCTRL_10_MA>; + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; + }; +}; + +&r_pio { + wifi_reset_pin_parrot_r16: wifi_reset_pin@0 { + allwinner,pins = "PL6"; + allwinner,function = "gpio_out"; + allwinner,drive = <SUN4I_PINCTRL_10_MA>; + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; + }; +}; + +&r_rsb { + status = "okay"; + + axp22x: pmic@3a3 { + compatible = "x-powers,axp223"; + reg = <0x3a3>; + interrupt-parent = <&nmi_intc>; + interrupts = <0 IRQ_TYPE_LEVEL_LOW>; + drivevbus-supply = <®_vcc5v0>; + x-powers,drive-vbus-en; + }; +}; + +#include "axp22x.dtsi" + +/* Used for VCC-IO, VCC-PD, VCC-USB, HPVCC, VCC-IO-BB and VCC-IO-WIFI */ +®_aldo1 { + regulator-always-on; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + regulator-name = "aldo1"; +}; + +®_aldo2 { + regulator-always-on; + regulator-min-microvolt = <2350000>; + regulator-max-microvolt = <2650000>; + regulator-name = "vdd-dll"; +}; + +®_aldo3 { + regulator-always-on; + regulator-min-microvolt = <2700000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc-pll-avcc"; +}; + +®_dc5ldo { + regulator-always-on; + regulator-min-microvolt = <900000>; + regulator-max-microvolt = <1400000>; + regulator-name = "vdd-cpus"; +}; + +®_dcdc1 { + regulator-always-on; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + regulator-name = "vcc-3v0"; +}; + +®_dcdc2 { + regulator-always-on; + regulator-min-microvolt = <900000>; + regulator-max-microvolt = <1400000>; + regulator-name = "vdd-sys"; +}; + +®_dcdc3 { + regulator-always-on; + regulator-min-microvolt = <900000>; + regulator-max-microvolt = <1400000>; + regulator-name = "vdd-cpu"; +}; + +®_dcdc5 { + regulator-always-on; + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <1500000>; + regulator-name = "vcc-dram"; +}; + +®_dldo1 { + /* + * TODO: WiFi chip needs dldo1 AND dldo2 to be on to be powered. + * Remove next line once it is possible to sync two regulators. + */ + regulator-always-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc-wifi"; +}; + +®_dldo2 { + /* + * TODO: WiFi chip needs dldo1 AND dldo2 to be on to be powered. + * Remove next line once it is possible to sync two regulators. + */ + regulator-always-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc-wifi1"; +}; + +®_dldo3 { + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + regulator-name = "vcc-3v0-csi"; +}; + +®_drivevbus { + regulator-name = "usb0-vbus"; + status = "okay"; +}; + +®_eldo1 { + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-name = "vcc-1v2-hsic"; +}; + +®_eldo2 { + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + regulator-name = "dsp-vcc"; +}; + +/* Mapped to GPIO 22 in U21 GPIOs set */ +®_eldo3 { + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + regulator-name = "eldo3"; +}; + +®_usb1_vbus { + pinctrl-names = "default"; + pinctrl-0 = <&usb1_vbus_pin_parrot_r16>; + gpio = <&pio 3 12 GPIO_ACTIVE_HIGH>; /* PD12 */ + status = "okay"; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins_b>; + status = "okay"; +}; + +&usb_otg { + dr_mode = "otg"; + status = "okay"; +}; + +&usb_power_supply { + status = "okay"; +}; + +&usbphy { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&usb0_id_det>; + usb0_vbus-supply = <®_drivevbus>; + usb0_id_det-gpios = <&pio 3 10 GPIO_ACTIVE_HIGH>; /* PD10 */ + usb0_vbus_power-supply = <&usb_power_supply>; + usb1_vbus-supply = <®_usb1_vbus>; /* USB1 VBUS is always on */ +};
The Parrot Board is an evaluation board with an Allwinner R16 (assumed to be close to an Allwinner A33), 4GB of eMMC, 512MB of RAM, USB host and OTG, a WiFi/Bluetooth combo chip, a micro SD Card reader, 2 controllable buttons, an LVDS port with separated backlight and capacitive touch panel ports, an audio/microphone jack, a camera CSI port, 2 sets of 22 GPIOs and an accelerometer. Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com> --- Patch dependencies: - regulator: axp20x: Add support for the (external) drivebus regulator - ARM: dts: axp22x.dtsi: Add reg_drivebus node - ARM: dts: axp22x.dtsi: Add usb_power_supply node - power: axp20x_usb: Add support for usb power-supply on axp22x pmics - mfd: axp20x: Extend axp22x_volatile_ranges - mfd: axp20x: Add axp20x-usb-power-supply for axp22x pmics - phy-sun4i-usb: Add workaround for missing Vbus det interrupts on A31 or the micro USB port would not be powered. v2: - correct typos, - chose less generic name suffix for nodes (now_parrot_r16), - add comment for i2c childless node, - add comment for two regulators-powered WiFi chip, - add comment to explicit the use of some regulators, - add usb_vbus_power-supply property in usbphy node (this adds a dependance to an other patch), arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/sun8i-r16-parrot.dts | 356 +++++++++++++++++++++++++++++++++ 2 files changed, 357 insertions(+) create mode 100644 arch/arm/boot/dts/sun8i-r16-parrot.dts