From mboxrd@z Thu Jan 1 00:00:00 1970 From: maxime.ripard@free-electrons.com (Maxime Ripard) Date: Sun, 28 Sep 2014 18:43:37 +0200 Subject: [PATCH] ARM: sun7i: add support for A20-OLinuXino-Lime2 In-Reply-To: <54280AA7.1090401@gmail.com> References: <54280AA7.1090401@gmail.com> Message-ID: <20140928164337.GB15315@lukather> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Sun, Sep 28, 2014 at 02:18:31PM +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 > --- > > I'd like to see this go in with the dual license, but not really > sure if that's appropriate while sunxi-common-regulators.dtsi is still > GPL only. Thanks for the remainder, and yes, it should be fine even though sunxi-common-regulators is only GPL (but the resulting binary would be GPL-only). > Happy to resend with single license header if it's deemed > better for now though. > > arch/arm/boot/dts/Makefile | 1 + > arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 178 ++++++++++++++++++++++++ > 2 files changed, 179 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..14fbc43 > --- /dev/null > +++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts > @@ -0,0 +1,178 @@ > +/* > + * Copyright 2014 - Iain Paton > + * > + * 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 at 01c00000 { > + > + ahci: sata at 01c18000 { > + target-supply = <®_ahci_5v>; > + status = "okay"; > + }; > + > + ehci0: usb at 01c14000 { > + status = "okay"; > + }; > + > + ehci1: usb at 01c1c000 { > + status = "okay"; > + }; > + > + gmac: ethernet at 01c50000 { > + pinctrl-names = "default"; > + pinctrl-0 = <&gmac_pins_rgmii_a>; > + phy = <&phy1>; > + phy-mode = "rgmii"; > + status = "okay"; > + > + phy1: ethernet-phy at 1 { > + reg = <1>; > + }; > + }; > + > + i2c0: i2c at 01c2ac00 { > + pinctrl-names = "default"; > + pinctrl-0 = <&i2c0_pins_a>; > + status = "okay"; > + > + axp209: pmic at 34 { > + compatible = "x-powers,axp209"; > + reg = <0x34>; > + interrupt-parent = <&nmi_intc>; > + interrupts = <0 8>; > + > + interrupt-controller; > + #interrupt-cells = <1>; It would be greate if you could add the regulators used on the board here. You might want to hold off a bit until the merge window is out, since some patches useful for this are still pending, or based your patch on top of linux-next > + }; > + > + }; > + > + i2c1: i2c at 01c2b000 { > + pinctrl-names = "default"; > + pinctrl-0 = <&i2c1_pins_a>; > + status = "okay"; > + }; > + > + mmc0: mmc at 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 at 01c14400 { > + status = "okay"; > + }; > + > + ohci1: usb at 01c1c400 { > + status = "okay"; > + }; > + > + uart0: serial at 01c28000 { > + pinctrl-names = "default"; > + pinctrl-0 = <&uart0_pins_a>; > + status = "okay"; > + }; > + > + usbphy: phy at 01c13400 { > + usb1_vbus-supply = <®_usb1_vbus>; > + usb2_vbus-supply = <®_usb2_vbus>; > + status = "okay"; > + }; > + > + pinctrl at 01c20800 { > + ahci_pwr_pin_olinuxinolime: ahci_pwr_pin at 1 { > + allwinner,pins = "PC3"; > + allwinner,function = "gpio_out"; > + allwinner,drive = <0>; > + allwinner,pull = <0>; > + }; > + > + led_pins_olinuxinolime: led_pins at 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"; > + }; > +}; > -- > 1.8.5.1 > It looks fine otherwise, thanks! Maxime -- Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: