| Message ID | 20161009210454.11360-4-stephen.arnold42@gmail.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Jagannadha Sutradharudu Teki |
| Headers | show |
On Mon, Oct 10, 2016 at 2:34 AM, Stephen Arnold <stephen.arnold42@gmail.com> wrote: > From: Steve Arnold <stephen.arnold42@gmail.com> > > * changes from lamobo-r1 required include: > - unset ahci power pin > - usbvbus gpio pin change > - mmc cd gpio pin change > - enable uart2, set default LED trigger > - CONFIG_GMAC_TX_DELAY change > > Changes for v2: > - incorprated feedback for config options (remove 3, add 1) > Changes for v3/v4: > - re-submit (no change to patch payload) with cover > Changes for v5: > - re-submit as one patch (no change to patch payload) > > Signed-off-by: Steve Arnold <stephen.arnold42@gmail.com> > Cc: Ian Campbell <ijc@hellion.org.uk> > Cc: Hans De Goede <hdegoede@redhat.com> > > arch/arm/dts/Makefile | 1 + > arch/arm/dts/sun7i-a20-bananapi-r1.dts | 376 +++++++++++++++++++++++++++++++++ > configs/Bananapi_R1_defconfig | 16 ++ > 3 files changed, 393 insertions(+) > create mode 100644 arch/arm/dts/sun7i-a20-bananapi-r1.dts > create mode 100644 configs/Bananapi_R1_defconfig > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index 8458f6b..8aa8646 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -217,6 +217,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \ > sun7i-a20-ainol-aw1.dtb \ > sun7i-a20-bananapi.dtb \ > sun7i-a20-bananapi-m1-plus.dtb \ > + sun7i-a20-bananapi-r1.dtb \ > sun7i-a20-bananapro.dtb \ > sun7i-a20-cubieboard2.dtb \ > sun7i-a20-cubietruck.dtb \ > diff --git a/arch/arm/dts/sun7i-a20-bananapi-r1.dts b/arch/arm/dts/sun7i-a20-bananapi-r1.dts > new file mode 100644 > index 0000000..1a550f9 > --- /dev/null > +++ b/arch/arm/dts/sun7i-a20-bananapi-r1.dts > @@ -0,0 +1,376 @@ > +/* > + * Copyright 2015 Hans de Goede <hdegoede@redhat.com> > + * Changes copyright 2016 Stephen Arnold <nerdboy@gentoo.org> Remove "Changes" text and add your copy on top, it some how look take reference from Hans. > + * > + * 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 "sun7i-a20.dtsi" > +#include "sunxi-common-regulators.dtsi" > + > +#include <dt-bindings/gpio/gpio.h> > +#include <dt-bindings/interrupt-controller/irq.h> > +#include <dt-bindings/pinctrl/sun4i-a10.h> > + > +/ { > + model = "Banana Pi BPI-R1"; > + compatible = "sinovoip,bpi-r1", "allwinner,sun7i-a20"; > + > + aliases { > + serial0 = &uart0; > + serial1 = &uart2; > + serial2 = &uart3; > + serial3 = &uart7; > + }; > + > + chosen { > + stdout-path = "serial0:115200n8"; > + }; > + > + leds { > + compatible = "gpio-leds"; > + pinctrl-names = "default"; > + pinctrl-0 = <&led_pins_bpi_r1>; > + > + green { > + label = "bpi-r1:green:usr"; > + gpios = <&pio 7 24 GPIO_ACTIVE_HIGH>; /* PH24 */ > + linux,default-trigger = "heartbeat"; This property not needed, skip this. > + }; > + }; > + > + reg_gmac_3v3: gmac-3v3 { > + compatible = "regulator-fixed"; > + pinctrl-names = "default"; > + pinctrl-0 = <&gmac_power_pin_bpi_r1>; > + regulator-name = "gmac-3v3"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + startup-delay-us = <100000>; > + enable-active-high; > + gpio = <&pio 7 23 GPIO_ACTIVE_HIGH>; /* PH23 */ > + }; > + > +}; > + > +&ahci { > + target-supply = <®_ahci_5v>; > + status = "okay"; > +}; > + > +&cpu0 { > + cpu-supply = <®_dcdc2>; > +}; > + > +&ehci0 { > + status = "okay"; > +}; > + > +&ehci1 { > + status = "okay"; > +}; > + > +&ohci0 { > + status = "okay"; > +}; > + > +&ohci1 { > + status = "okay"; > +}; > + > +&gmac { > + pinctrl-names = "default"; > + pinctrl-0 = <&gmac_pins_rgmii_a>; > + phy = <&phy1>; > + phy-mode = "rgmii"; > + phy-supply = <®_gmac_3v3>; > + status = "okay"; > + > + fixed-link { > + speed = <1000>; > + full-duplex; > + }; > + > + mdio { > + compatible = "snps,dwmac-mdio"; > + #address-cells = <1>; > + #size-cells = <0>; > + > + switch: ethernet-switch@1e { > + compatible = "brcm,bcm53125"; We don't have this compatible in drivers/net yet, better to skip this gmac node once added/tested. > + reg = <30>; > + #address-cells = <1>; > + #size-cells = <0>; > + > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + port0: port@0 { > + reg = <0>; > + label = "lan2"; > + }; > + > + port1: port@1 { > + reg = <1>; > + label = "lan3"; > + }; > + > + port2: port@2 { > + reg = <2>; > + label = "lan4"; > + }; > + > + port3: port@3 { > + reg = <3>; > + label = "wan"; > + }; > + > + port4: port@4 { > + reg = <4>; > + label = "lan1"; > + }; > + > + port8: port@8 { > + reg = <8>; > + label = "cpu"; > + ethernet = <&gmac>; > + phy-mode = "rgmii"; > + fixed-link { > + speed = <1000>; > + full-duplex; > + }; > + }; > + }; > + }; > + }; > +}; > + > +&i2c0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&i2c0_pins_a>; > + status = "okay"; > + > + axp209: pmic@34 { > + compatible = "x-powers,axp209"; I think same as gmac So instead of copy the entire dts, please add the nodes which are tested. maintenance becomes difficult for long run for unnecessary/untested nodes atleast for dts files(!dtsi) thanks!
Okay, but I could use a little clarity; do you want the u-boot dts to look just like my (proposed) kernel dts? Or do I start with kernel dts and remove the gmac/axp209 stuff? If we can merge all of this feedback into a single list of changes, then I can take a whack at it later this week (after a few work things). Back to the test mtg... Thanks in advance, Steve On Mon, Oct 10, 2016 at 3:34 AM, Jagan Teki <jagannadh.teki@gmail.com> wrote: > On Mon, Oct 10, 2016 at 2:34 AM, Stephen Arnold > <stephen.arnold42@gmail.com> wrote: >> From: Steve Arnold <stephen.arnold42@gmail.com> >> >> * changes from lamobo-r1 required include: >> - unset ahci power pin >> - usbvbus gpio pin change >> - mmc cd gpio pin change >> - enable uart2, set default LED trigger >> - CONFIG_GMAC_TX_DELAY change >> >> Changes for v2: >> - incorprated feedback for config options (remove 3, add 1) >> Changes for v3/v4: >> - re-submit (no change to patch payload) with cover >> Changes for v5: >> - re-submit as one patch (no change to patch payload) >> >> Signed-off-by: Steve Arnold <stephen.arnold42@gmail.com> >> Cc: Ian Campbell <ijc@hellion.org.uk> >> Cc: Hans De Goede <hdegoede@redhat.com> >> >> arch/arm/dts/Makefile | 1 + >> arch/arm/dts/sun7i-a20-bananapi-r1.dts | 376 +++++++++++++++++++++++++++++++++ >> configs/Bananapi_R1_defconfig | 16 ++ >> 3 files changed, 393 insertions(+) >> create mode 100644 arch/arm/dts/sun7i-a20-bananapi-r1.dts >> create mode 100644 configs/Bananapi_R1_defconfig >> >> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile >> index 8458f6b..8aa8646 100644 >> --- a/arch/arm/dts/Makefile >> +++ b/arch/arm/dts/Makefile >> @@ -217,6 +217,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \ >> sun7i-a20-ainol-aw1.dtb \ >> sun7i-a20-bananapi.dtb \ >> sun7i-a20-bananapi-m1-plus.dtb \ >> + sun7i-a20-bananapi-r1.dtb \ >> sun7i-a20-bananapro.dtb \ >> sun7i-a20-cubieboard2.dtb \ >> sun7i-a20-cubietruck.dtb \ >> diff --git a/arch/arm/dts/sun7i-a20-bananapi-r1.dts b/arch/arm/dts/sun7i-a20-bananapi-r1.dts >> new file mode 100644 >> index 0000000..1a550f9 >> --- /dev/null >> +++ b/arch/arm/dts/sun7i-a20-bananapi-r1.dts >> @@ -0,0 +1,376 @@ >> +/* >> + * Copyright 2015 Hans de Goede <hdegoede@redhat.com> >> + * Changes copyright 2016 Stephen Arnold <nerdboy@gentoo.org> > > Remove "Changes" text and add your copy on top, it some how look take > reference from Hans. > >> + * >> + * 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 "sun7i-a20.dtsi" >> +#include "sunxi-common-regulators.dtsi" >> + >> +#include <dt-bindings/gpio/gpio.h> >> +#include <dt-bindings/interrupt-controller/irq.h> >> +#include <dt-bindings/pinctrl/sun4i-a10.h> >> + >> +/ { >> + model = "Banana Pi BPI-R1"; >> + compatible = "sinovoip,bpi-r1", "allwinner,sun7i-a20"; >> + >> + aliases { >> + serial0 = &uart0; >> + serial1 = &uart2; >> + serial2 = &uart3; >> + serial3 = &uart7; >> + }; >> + >> + chosen { >> + stdout-path = "serial0:115200n8"; >> + }; >> + >> + leds { >> + compatible = "gpio-leds"; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&led_pins_bpi_r1>; >> + >> + green { >> + label = "bpi-r1:green:usr"; >> + gpios = <&pio 7 24 GPIO_ACTIVE_HIGH>; /* PH24 */ >> + linux,default-trigger = "heartbeat"; > > This property not needed, skip this. > >> + }; >> + }; >> + >> + reg_gmac_3v3: gmac-3v3 { >> + compatible = "regulator-fixed"; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&gmac_power_pin_bpi_r1>; >> + regulator-name = "gmac-3v3"; >> + regulator-min-microvolt = <3300000>; >> + regulator-max-microvolt = <3300000>; >> + startup-delay-us = <100000>; >> + enable-active-high; >> + gpio = <&pio 7 23 GPIO_ACTIVE_HIGH>; /* PH23 */ >> + }; >> + >> +}; >> + >> +&ahci { >> + target-supply = <®_ahci_5v>; >> + status = "okay"; >> +}; >> + >> +&cpu0 { >> + cpu-supply = <®_dcdc2>; >> +}; >> + >> +&ehci0 { >> + status = "okay"; >> +}; >> + >> +&ehci1 { >> + status = "okay"; >> +}; >> + >> +&ohci0 { >> + status = "okay"; >> +}; >> + >> +&ohci1 { >> + status = "okay"; >> +}; >> + >> +&gmac { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&gmac_pins_rgmii_a>; >> + phy = <&phy1>; >> + phy-mode = "rgmii"; >> + phy-supply = <®_gmac_3v3>; >> + status = "okay"; >> + >> + fixed-link { >> + speed = <1000>; >> + full-duplex; >> + }; >> + >> + mdio { >> + compatible = "snps,dwmac-mdio"; >> + #address-cells = <1>; >> + #size-cells = <0>; >> + >> + switch: ethernet-switch@1e { >> + compatible = "brcm,bcm53125"; > > We don't have this compatible in drivers/net yet, better to skip this > gmac node once added/tested. > >> + reg = <30>; >> + #address-cells = <1>; >> + #size-cells = <0>; >> + >> + ports { >> + #address-cells = <1>; >> + #size-cells = <0>; >> + >> + port0: port@0 { >> + reg = <0>; >> + label = "lan2"; >> + }; >> + >> + port1: port@1 { >> + reg = <1>; >> + label = "lan3"; >> + }; >> + >> + port2: port@2 { >> + reg = <2>; >> + label = "lan4"; >> + }; >> + >> + port3: port@3 { >> + reg = <3>; >> + label = "wan"; >> + }; >> + >> + port4: port@4 { >> + reg = <4>; >> + label = "lan1"; >> + }; >> + >> + port8: port@8 { >> + reg = <8>; >> + label = "cpu"; >> + ethernet = <&gmac>; >> + phy-mode = "rgmii"; >> + fixed-link { >> + speed = <1000>; >> + full-duplex; >> + }; >> + }; >> + }; >> + }; >> + }; >> +}; >> + >> +&i2c0 { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&i2c0_pins_a>; >> + status = "okay"; >> + >> + axp209: pmic@34 { >> + compatible = "x-powers,axp209"; > > I think same as gmac > > So instead of copy the entire dts, please add the nodes which are > tested. maintenance becomes difficult for long run for > unnecessary/untested nodes atleast for dts files(!dtsi) > > thanks! > -- > Jagan Teki > Free Software Engineer | www.openedev.com > U-Boot, Linux | Upstream Maintainer > Hyderabad, India.
On Wed, Oct 12, 2016 at 12:18 AM, Stephen Arnold <stephen.arnold42@gmail.com> wrote: > Okay, but I could use a little clarity; do you want the u-boot dts to > look just like my (proposed) kernel dts? Or do I start with kernel > dts and remove the gmac/axp209 stuff? > > If we can merge all of this feedback into a single list of changes, > then I can take a whack at it later this week (after a few work > things). Back to the test mtg... Please take a reference of Linux dts and add tested nodes/properties, this would be certainly gives a better understanding and maintenance easy. thanks!
Okay, rebased on u-boot master again and updated the config for i2c/spl. I have an RFC patch for u-boot and an updated kernel dts to test; I also brought in the (small) sun7i-a20.dtsi patch to add the standard A20 i2c4 pins_a which is the only i2c brought out on the Pi header (goes with pin fix for uart3). Since this is not quite what I'm running now, and I had to go back and trace some wiring on the schematic for USB, I think I've got it dialed in now, so I'll test it when my kernel is finished. If that looks good, I'll make a kernel patch and try that list for a change... Thanks, Steve On Wed, Oct 12, 2016 at 9:27 AM, Jagan Teki <jteki@openedev.com> wrote: > On Wed, Oct 12, 2016 at 12:18 AM, Stephen Arnold > <stephen.arnold42@gmail.com> wrote: >> Okay, but I could use a little clarity; do you want the u-boot dts to >> look just like my (proposed) kernel dts? Or do I start with kernel >> dts and remove the gmac/axp209 stuff? >> >> If we can merge all of this feedback into a single list of changes, >> then I can take a whack at it later this week (after a few work >> things). Back to the test mtg... > > Please take a reference of Linux dts and add tested nodes/properties, > this would be certainly gives a better understanding and maintenance > easy. > > thanks! > -- > Jagan Teki > Free Software Engineer | www.openedev.com > U-Boot, Linux | Upstream Maintainer > Hyderabad, India.
On Fri, Oct 14, 2016 at 4:58 AM, Stephen Arnold <stephen.arnold42@gmail.com> wrote: > Okay, rebased on u-boot master again and updated the config for > i2c/spl. I have an RFC patch for u-boot and an updated kernel dts to > test; I also brought in the (small) sun7i-a20.dtsi patch to add the > standard A20 i2c4 pins_a which is the only i2c brought out on the Pi > header (goes with pin fix for uart3). > > Since this is not quite what I'm running now, and I had to go back and > trace some wiring on the schematic for USB, I think I've got it dialed > in now, so I'll test it when my kernel is finished. > > If that looks good, I'll make a kernel patch and try that list for a change... OK, please send. thanks!
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 8458f6b..8aa8646 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -217,6 +217,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \ sun7i-a20-ainol-aw1.dtb \ sun7i-a20-bananapi.dtb \ sun7i-a20-bananapi-m1-plus.dtb \ + sun7i-a20-bananapi-r1.dtb \ sun7i-a20-bananapro.dtb \ sun7i-a20-cubieboard2.dtb \ sun7i-a20-cubietruck.dtb \ diff --git a/arch/arm/dts/sun7i-a20-bananapi-r1.dts b/arch/arm/dts/sun7i-a20-bananapi-r1.dts new file mode 100644 index 0000000..1a550f9 --- /dev/null +++ b/arch/arm/dts/sun7i-a20-bananapi-r1.dts @@ -0,0 +1,376 @@ +/* + * Copyright 2015 Hans de Goede <hdegoede@redhat.com> + * Changes copyright 2016 Stephen Arnold <nerdboy@gentoo.org> + * + * 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 "sun7i-a20.dtsi" +#include "sunxi-common-regulators.dtsi" + +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/interrupt-controller/irq.h> +#include <dt-bindings/pinctrl/sun4i-a10.h> + +/ { + model = "Banana Pi BPI-R1"; + compatible = "sinovoip,bpi-r1", "allwinner,sun7i-a20"; + + aliases { + serial0 = &uart0; + serial1 = &uart2; + serial2 = &uart3; + serial3 = &uart7; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&led_pins_bpi_r1>; + + green { + label = "bpi-r1:green:usr"; + gpios = <&pio 7 24 GPIO_ACTIVE_HIGH>; /* PH24 */ + linux,default-trigger = "heartbeat"; + }; + }; + + reg_gmac_3v3: gmac-3v3 { + compatible = "regulator-fixed"; + pinctrl-names = "default"; + pinctrl-0 = <&gmac_power_pin_bpi_r1>; + regulator-name = "gmac-3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + startup-delay-us = <100000>; + enable-active-high; + gpio = <&pio 7 23 GPIO_ACTIVE_HIGH>; /* PH23 */ + }; + +}; + +&ahci { + target-supply = <®_ahci_5v>; + status = "okay"; +}; + +&cpu0 { + cpu-supply = <®_dcdc2>; +}; + +&ehci0 { + status = "okay"; +}; + +&ehci1 { + status = "okay"; +}; + +&ohci0 { + status = "okay"; +}; + +&ohci1 { + status = "okay"; +}; + +&gmac { + pinctrl-names = "default"; + pinctrl-0 = <&gmac_pins_rgmii_a>; + phy = <&phy1>; + phy-mode = "rgmii"; + phy-supply = <®_gmac_3v3>; + status = "okay"; + + fixed-link { + speed = <1000>; + full-duplex; + }; + + mdio { + compatible = "snps,dwmac-mdio"; + #address-cells = <1>; + #size-cells = <0>; + + switch: ethernet-switch@1e { + compatible = "brcm,bcm53125"; + reg = <30>; + #address-cells = <1>; + #size-cells = <0>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port0: port@0 { + reg = <0>; + label = "lan2"; + }; + + port1: port@1 { + reg = <1>; + label = "lan3"; + }; + + port2: port@2 { + reg = <2>; + label = "lan4"; + }; + + port3: port@3 { + reg = <3>; + label = "wan"; + }; + + port4: port@4 { + reg = <4>; + label = "lan1"; + }; + + port8: port@8 { + reg = <8>; + label = "cpu"; + ethernet = <&gmac>; + phy-mode = "rgmii"; + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + }; + }; + }; +}; + +&i2c0 { + 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 IRQ_TYPE_LEVEL_LOW>; + + interrupt-controller; + #interrupt-cells = <1>; + }; +}; + +#include "axp209.dtsi" + +&i2c2 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c2_pins_a>; + status = "okay"; +}; + +&ir0 { + pinctrl-names = "default"; + pinctrl-0 = <&ir0_rx_pins_a>; + status = "okay"; +}; + +&mmc0 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bpi_r1>; + vmmc-supply = <®_vcc3v3>; + bus-width = <4>; + cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ + cd-inverted; + status = "okay"; +}; + +&otg_sram { + status = "okay"; +}; + +&pio { + usb0_id_detect_pin: usb0_id_detect_pin@0 { + allwinner,pins = "PH4"; + allwinner,function = "gpio_in"; + allwinner,drive = <SUN4I_PINCTRL_10_MA>; + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; + }; + + usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { + allwinner,pins = "PH5"; + allwinner,function = "gpio_in"; + allwinner,drive = <SUN4I_PINCTRL_10_MA>; + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; + }; + + usb0_vbus_pin_bpi_r1: usb0_vbus_pin@0 { + allwinner,pins = "PB9"; + allwinner,function = "gpio_out"; + allwinner,drive = <SUN4I_PINCTRL_10_MA>; + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; + }; + + usb2_vbus_pin_bpi_r1: usb2_vbus_pin@0 { + allwinner,pins = "PH3"; + allwinner,function = "gpio_out"; + allwinner,drive = <SUN4I_PINCTRL_10_MA>; + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; + }; + + mmc0_cd_pin_bpi_r1: mmc0_cd_pin@0 { + allwinner,pins = "PH1"; + allwinner,function = "gpio_in"; + allwinner,drive = <SUN4I_PINCTRL_10_MA>; + allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; + }; + + gmac_power_pin_bpi_r1: gmac_power_pin@0 { + allwinner,pins = "PH23"; + allwinner,function = "gpio_out"; + allwinner,drive = <SUN4I_PINCTRL_10_MA>; + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; + }; + + led_pins_bpi_r1: led_pins@0 { + allwinner,pins = "PH24"; + allwinner,function = "gpio_out"; + allwinner,drive = <SUN4I_PINCTRL_10_MA>; + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; + }; +}; + +®_ahci_5v { + status = "okay"; +}; + +®_dcdc2 { + regulator-always-on; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1400000>; + 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_bpi_r1>; + gpio = <&pio 1 9 GPIO_ACTIVE_HIGH>; /* PB9 */ + status = "okay"; +}; + +®_usb1_vbus { + status = "okay"; +}; + +®_usb2_vbus { + pinctrl-0 = <&usb2_vbus_pin_bpi_r1>; + gpio = <&pio 7 3 GPIO_ACTIVE_HIGH>; /* PH3 */ + status = "okay"; +}; + +&spi0 { + pinctrl-names = "default"; + pinctrl-0 = <&spi0_pins_a>, + <&spi0_cs0_pins_a>, + <&spi0_cs1_pins_a>; + status = "okay"; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins_a>; + status = "okay"; +}; + +&uart2 { + pinctrl-names = "default"; + pinctrl-0 = <&uart2_pins_a>; + status = "okay"; +}; + +&uart3 { + pinctrl-names = "default"; + pinctrl-0 = <&uart3_pins_b>; + status = "okay"; +}; + +&uart7 { + pinctrl-names = "default"; + pinctrl-0 = <&uart7_pins_a>; + status = "okay"; +}; + +&usb_otg { + dr_mode = "otg"; + status = "okay"; +}; + +&usb_power_supply { + 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"; +}; diff --git a/configs/Bananapi_R1_defconfig b/configs/Bananapi_R1_defconfig new file mode 100644 index 0000000..3743d5c --- /dev/null +++ b/configs/Bananapi_R1_defconfig @@ -0,0 +1,16 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN7I=y +CONFIG_DRAM_CLK=432 +CONFIG_GMAC_TX_DELAY=3 +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapi-r1" +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_SPL=y +CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI" +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_FPGA is not set +CONFIG_USB_EHCI_HCD=y +CONFIG_DM_ETH=y +CONFIG_PHYLIB=y +# CONFIG_RTL8211X_PHY_FORCE_MASTER=y