Hi, On Sun, Mar 25, 2018 at 02:35:59PM +0200, Paul Kocialkowski wrote: > This introduces a newer dts for the Ainol AW1, that will be the base for > introducing upstream Linux support for the device. > > This update in U-Boot allows fixing USB OTG detection, that was missing > from the previous dts. > > Signed-off-by: Paul Kocialkowski <[email protected]>
We usually will use the Linux DTS once it's been merged, so please send it there first. > --- > arch/arm/dts/sun7i-a20-ainol-aw1.dts | 215 > ++++++++++++++++++++++++++++++++++- > 1 file changed, 211 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/dts/sun7i-a20-ainol-aw1.dts > b/arch/arm/dts/sun7i-a20-ainol-aw1.dts > index 8b730cdfae..f62d67d6d6 100644 > --- a/arch/arm/dts/sun7i-a20-ainol-aw1.dts > +++ b/arch/arm/dts/sun7i-a20-ainol-aw1.dts > @@ -1,17 +1,57 @@ > /* > - * Copyright 2015 Hans de Goede <[email protected]> > + * Copyright 2018 Paul Kocialkowski <[email protected]> > * > - * Minimal dts file for the Ainol AW1 for u-boot only > + * 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. > * > - * SPDX-License-Identifier: GPL-2.0+ or X11 > + * 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 "sun7i-a20.dtsi" > +#include "sunxi-common-regulators.dtsi" Since you have regulator support, you shouldn't need these anymore. > +#include <dt-bindings/gpio/gpio.h> > +#include <dt-bindings/input/input.h> > +#include <dt-bindings/interrupt-controller/irq.h> > +#include <dt-bindings/pwm/pwm.h> > > / { > model = "Ainol AW1"; > - compatible = "ainol,aw1", "allwinner,sun7i-a20"; > + compatible = "ainol,ainol-aw1", "allwinner,sun7i-a20"; > > aliases { > serial0 = &uart0; > @@ -20,6 +60,116 @@ > chosen { > stdout-path = "serial0:115200n8"; > }; > + > + backlight: backlight { > + compatible = "pwm-backlight"; > + pinctrl-names = "default"; > + pinctrl-0 = <&backlight_enable_pin>; > + pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>; > + brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>; > + default-brightness-level = <8>; > + enable-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */ > + }; > +}; > + > +&cpu0 { > + cpu-supply = <®_dcdc2>; > +}; > + > +&otg_sram { > + status = "okay"; > +}; > + > +&mmc0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&mmc0_pins_a>; > + vmmc-supply = <®_vcc3v3>; > + bus-width = <4>; > + cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ > + cd-inverted; > + status = "okay"; > +}; > + > +&usb_otg { > + dr_mode = "otg"; > + status = "okay"; > +}; > + > +&usbphy { > + pinctrl-names = "default"; > + pinctrl-0 = <&usb0_id_detect_pin>; > + usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ > + usb0_vbus_power-supply = <&usb_power_supply>; > + usb0_vbus-supply = <®_usb0_vbus>; > + usb1_vbus-supply = <®_usb1_vbus>; > + usb2_vbus-supply = <®_usb2_vbus>; > + status = "okay"; > +}; > + > +&ehci0 { > + status = "okay"; > +}; > + > +&ohci0 { > + status = "okay"; > +}; > + > +&ehci1 { > + status = "okay"; > +}; > + > +&ohci1 { > + status = "okay"; > +}; Your nodes should be ordered by alphabetical order (at least as much as possible, this isn't really doable for all the AXP stuff). > +&pio { > + backlight_enable_pin: backlight_enable_pin@0 { > + pins = "PH7"; > + function = "gpio_out"; > + }; > + > + usb0_id_detect_pin: usb0_id_detect_pin@0 { > + pins = "PH4"; > + function = "gpio_in"; > + bias-pull-up; > + }; > + > + usb0_vbus_pin: usb0_vbus_pin@0 { > + pins = "PB9"; > + function = "gpio_out"; > + }; > +}; We're trying to remove these nodes from our DTs, it's redundant since the GPIOs will request the pin in pinctrl when being taken. > + > +&pwm { > + pinctrl-names = "default"; > + pinctrl-0 = <&pwm0_pins_a>; > + status = "okay"; > +}; > + > +&lradc { > + vref-supply = <®_vcc3v0>; > + status = "okay"; > + > + button@571 { > + label = "Volume Up"; > + linux,code = <KEY_VOLUMEUP>; > + channel = <0>; > + voltage = <571428>; > + }; > + > + button@761 { > + label = "Volume Down"; > + linux,code = <KEY_VOLUMEDOWN>; > + channel = <0>; > + voltage = <761904>; > + }; > + > + button@952 { > + label = "Home"; > + linux,code = <KEY_HOME>; > + channel = <0>; > + voltage = <952380>; > + }; > }; > > &uart0 { > @@ -27,3 +177,60 @@ > pinctrl-0 = <&uart0_pins_a>; > status = "okay"; > }; > + > +&i2c0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&i2c0_pins_a>; > + status = "okay"; > + > + axp209: pmic@34 { > + reg = <0x34>; > + interrupt-parent = <&nmi_intc>; > + interrupts = <0 IRQ_TYPE_LEVEL_LOW>; > + }; > +}; > + > +#include "axp209.dtsi" > + > +®_dcdc2 { > + regulator-always-on; > + regulator-min-microvolt = <1000000>; > + regulator-max-microvolt = <1450000>; > + 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"; > +}; > + > +®_usb0_vbus { > + pinctrl-0 = <&usb0_vbus_pin>; > + gpio = <&pio 1 9 GPIO_ACTIVE_HIGH>; /*PB9 */ > + status = "okay"; > +}; > + > +®_usb1_vbus { > + status = "okay"; > +}; > + > +®_usb2_vbus { > + status = "okay"; > +}; > + > +&usb_power_supply { > + status = "okay"; > +}; > -- > 2.16.2 > -- Maxime Ripard, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
signature.asc
Description: PGP signature
_______________________________________________ U-Boot mailing list [email protected] https://lists.denx.de/listinfo/u-boot
