| Message ID | 54366326.3060303@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Iain, On Thu, Oct 09, 2014 at 11:27:50AM +0100, Iain Paton wrote: > This adds support for the Olimex A20-OLinuXino-Lime2 > https://www.olimex.com/Products/OLinuXino/A20/A20-OLinuXIno-LIME2 > > Differences to previous Lime boards are 1GB RAM and gigabit ethernet > > Signed-off-by: Iain Paton <ipaton0@gmail.com> Sorry for noticing this so late, but we sort the DT nodes by their base address. Could you respin this for another version? > --- > > changes for v2 > add axp209 regulators node > > changes for v3 > add reg_axp_ipsout regulator > follow suggestion by Chen-Yu in > http://lists.infradead.org/pipermail/linux-arm-kernel/2014-October/292645.html > on parenting the regulators > > changes for v4 > give regulators better names > add spacing between nodes > drop ldo5 as it doesn't appear to be used > > arch/arm/boot/dts/Makefile | 1 + > arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 229 ++++++++++++++++++++++++ > 2 files changed, 230 insertions(+) > create mode 100644 arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index 2f42b18..ea6c672 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -420,6 +420,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \ > sun7i-a20-hummingbird.dtb \ > sun7i-a20-i12-tvbox.dtb \ > sun7i-a20-olinuxino-lime.dtb \ > + sun7i-a20-olinuxino-lime2.dtb \ > sun7i-a20-olinuxino-micro.dtb \ > sun7i-a20-pcduino3.dtb > dtb-$(CONFIG_MACH_SUN8I) += \ > diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts > new file mode 100644 > index 0000000..4e68101 > --- /dev/null > +++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts > @@ -0,0 +1,229 @@ > +/* > + * Copyright 2014 - Iain Paton <ipaton0@gmail.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 library 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 library 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. > + * > + * You should have received a copy of the GNU General Public > + * License along with this library; if not, write to the Free > + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, > + * MA 02110-1301 USA > + * > + * 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" > + > +/ { > + model = "Olimex A20-OLinuXino-LIME2"; > + compatible = "olimex,a20-olinuxino-lime2", "allwinner,sun7i-a20"; > + > + soc@01c00000 { > + And drop this newline while we're at it? Thanks a lot, Maxime
On 09/10/14 20:56, Maxime Ripard wrote: > Hi Iain, > > On Thu, Oct 09, 2014 at 11:27:50AM +0100, Iain Paton wrote: >> This adds support for the Olimex A20-OLinuXino-Lime2 >> https://www.olimex.com/Products/OLinuXino/A20/A20-OLinuXIno-LIME2 >> >> Differences to previous Lime boards are 1GB RAM and gigabit ethernet >> >> Signed-off-by: Iain Paton <ipaton0@gmail.com> > > Sorry for noticing this so late, but we sort the DT nodes by their > base address. Could you respin this for another version? Sure, no problem, on it's way shortly. Is there any general rule for this sort of thing, or is this something specific to sunxi? Asking mainly as I've been asked to do them alphabetically previously by a different maintainer and that's esentially why I did it the same way here. Everyone having different undocumented conventions seems likely to become counter productive eventually. Iain
On Fri, Oct 10, 2014 at 02:15:48PM +0100, Iain Paton wrote: > On 09/10/14 20:56, Maxime Ripard wrote: > > Hi Iain, > > > > On Thu, Oct 09, 2014 at 11:27:50AM +0100, Iain Paton wrote: > >> This adds support for the Olimex A20-OLinuXino-Lime2 > >> https://www.olimex.com/Products/OLinuXino/A20/A20-OLinuXIno-LIME2 > >> > >> Differences to previous Lime boards are 1GB RAM and gigabit ethernet > >> > >> Signed-off-by: Iain Paton <ipaton0@gmail.com> > > > > Sorry for noticing this so late, but we sort the DT nodes by their > > base address. Could you respin this for another version? > > Sure, no problem, on it's way shortly. > > Is there any general rule for this sort of thing, or is this something > specific to sunxi? > > Asking mainly as I've been asked to do them alphabetically previously > by a different maintainer and that's esentially why I did it the same > way here. > > Everyone having different undocumented conventions seems likely to > become counter productive eventually. That's unusual, it should be a global convention at least for ARM. Maxime
Am 10.10.2014 um 15:56 schrieb Maxime Ripard: > On Fri, Oct 10, 2014 at 02:15:48PM +0100, Iain Paton wrote: >> On 09/10/14 20:56, Maxime Ripard wrote: >>> Sorry for noticing this so late, but we sort the DT nodes by their >>> base address. Could you respin this for another version? >> >> Sure, no problem, on it's way shortly. >> >> Is there any general rule for this sort of thing, or is this something >> specific to sunxi? >> >> Asking mainly as I've been asked to do them alphabetically previously >> by a different maintainer and that's esentially why I did it the same >> way here. >> >> Everyone having different undocumented conventions seems likely to >> become counter productive eventually. > > That's unusual, it should be a global convention at least for ARM. From what I understood it's by unit address for foo@12345678 and alphabetically for &foo. So there is both actually, plus existing inconsistencies. :) Andreas
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 2f42b18..ea6c672 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -420,6 +420,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \ sun7i-a20-hummingbird.dtb \ sun7i-a20-i12-tvbox.dtb \ sun7i-a20-olinuxino-lime.dtb \ + sun7i-a20-olinuxino-lime2.dtb \ sun7i-a20-olinuxino-micro.dtb \ sun7i-a20-pcduino3.dtb dtb-$(CONFIG_MACH_SUN8I) += \ diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts new file mode 100644 index 0000000..4e68101 --- /dev/null +++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts @@ -0,0 +1,229 @@ +/* + * Copyright 2014 - Iain Paton <ipaton0@gmail.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 library 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 library 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. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA + * + * 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" + +/ { + model = "Olimex A20-OLinuXino-LIME2"; + compatible = "olimex,a20-olinuxino-lime2", "allwinner,sun7i-a20"; + + soc@01c00000 { + + ahci: sata@01c18000 { + target-supply = <®_ahci_5v>; + status = "okay"; + }; + + ehci0: usb@01c14000 { + status = "okay"; + }; + + ehci1: usb@01c1c000 { + status = "okay"; + }; + + gmac: ethernet@01c50000 { + pinctrl-names = "default"; + pinctrl-0 = <&gmac_pins_rgmii_a>; + phy = <&phy1>; + phy-mode = "rgmii"; + status = "okay"; + + phy1: ethernet-phy@1 { + reg = <1>; + }; + }; + + i2c0: i2c@01c2ac00 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c0_pins_a>; + status = "okay"; + + axp209: pmic@34 { + compatible = "x-powers,axp209"; + reg = <0x34>; + interrupt-parent = <&nmi_intc>; + interrupts = <0 8>; + + interrupt-controller; + #interrupt-cells = <1>; + + acin-supply = <®_axp_ipsout>; + vin2-supply = <®_axp_ipsout>; + vin3-supply = <®_axp_ipsout>; + ldo24in-supply = <®_axp_ipsout>; + ldo3in-supply = <®_axp_ipsout>; + + regulators { + vdd_rtc: ldo1 { + regulator-min-microvolt = <1300000>; + regulator-max-microvolt = <1300000>; + regulator-always-on; + }; + + avcc: ldo2 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vcc_csi0: ldo3 { + regulator-min-microvolt = <700000>; + regulator-max-microvolt = <3500000>; + regulator-always-on; + }; + + vcc_csi1: ldo4 { + regulator-min-microvolt = <1250000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vdd_cpu: dcdc2 { + regulator-min-microvolt = <700000>; + regulator-max-microvolt = <2275000>; + regulator-always-on; + }; + + vdd_int: dcdc3 { + regulator-min-microvolt = <700000>; + regulator-max-microvolt = <3500000>; + regulator-always-on; + }; + }; + }; + }; + + i2c1: i2c@01c2b000 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_pins_a>; + status = "okay"; + }; + + mmc0: mmc@01c0f000 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; + vmmc-supply = <®_vcc3v3>; + bus-width = <4>; + cd-gpios = <&pio 7 1 0>; /* PH1 */ + cd-inverted; + status = "okay"; + }; + + ohci0: usb@01c14400 { + status = "okay"; + }; + + ohci1: usb@01c1c400 { + status = "okay"; + }; + + uart0: serial@01c28000 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins_a>; + status = "okay"; + }; + + usbphy: phy@01c13400 { + usb1_vbus-supply = <®_usb1_vbus>; + usb2_vbus-supply = <®_usb2_vbus>; + status = "okay"; + }; + + pinctrl@01c20800 { + ahci_pwr_pin_olinuxinolime: ahci_pwr_pin@1 { + allwinner,pins = "PC3"; + allwinner,function = "gpio_out"; + allwinner,drive = <0>; + allwinner,pull = <0>; + }; + + led_pins_olinuxinolime: led_pins@0 { + allwinner,pins = "PH2"; + allwinner,function = "gpio_out"; + allwinner,drive = <1>; + allwinner,pull = <0>; + }; + }; + }; + + leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&led_pins_olinuxinolime>; + + green { + label = "a20-olinuxino-lime2:green:usr"; + gpios = <&pio 7 2 0>; + default-state = "on"; + }; + }; + + reg_ahci_5v: ahci-5v { + pinctrl-0 = <&ahci_pwr_pin_olinuxinolime>; + gpio = <&pio 2 3 0>; + status = "okay"; + }; + + reg_usb1_vbus: usb1-vbus { + status = "okay"; + }; + + reg_usb2_vbus: usb2-vbus { + status = "okay"; + }; + + reg_axp_ipsout: axp_ipsout { + compatible = "regulator-fixed"; + regulator-name = "axp-ipsout"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + }; +};
This adds support for the Olimex A20-OLinuXino-Lime2 https://www.olimex.com/Products/OLinuXino/A20/A20-OLinuXIno-LIME2 Differences to previous Lime boards are 1GB RAM and gigabit ethernet Signed-off-by: Iain Paton <ipaton0@gmail.com> --- changes for v2 add axp209 regulators node changes for v3 add reg_axp_ipsout regulator follow suggestion by Chen-Yu in http://lists.infradead.org/pipermail/linux-arm-kernel/2014-October/292645.html on parenting the regulators changes for v4 give regulators better names add spacing between nodes drop ldo5 as it doesn't appear to be used arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 229 ++++++++++++++++++++++++ 2 files changed, 230 insertions(+) create mode 100644 arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts