ARM: add support for Bananapi BPI-R1

From: Steve Arnold <[email protected]>

* 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 <[email protected]>

Cc Ian Campbell <[email protected]>

Cc Hans De Goede <[email protected]>

 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

arch/arm/dts/Makefile +1 -0

index 8458f6b..8aa8646 100644
@@ -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 \

arch/arm/dts/sun7i-a20-bananapi-r1.dts new file +0 -0

new file mode 100644
index 0000000..1a550f9

arch/arm/dts/sun7i-a20-bananapi-r1.dts new file +62 -0

+ *
+ * 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";
+       };

arch/arm/dts/sun7i-a20-bananapi-r1.dts new file +52 -0

+               };
+       };
+
+       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 = <&reg_ahci_5v>;
+       status = "okay";
+};
+
+&cpu0 {
+       cpu-supply = <&reg_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 = <&reg_gmac_3v3>;
+       status = "okay";
+
+       fixed-link {
+               speed = <1000>;

arch/arm/dts/sun7i-a20-bananapi-r1.dts new file +45 -0

+                       reg = <30>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port0: port at 0 {
+                                       reg = <0>;
+                                       label = "lan2";
+                               };
+
+                               port1: port at 1 {
+                                       reg = <1>;
+                                       label = "lan3";
+                               };
+
+                               port2: port at 2 {
+                                       reg = <2>;
+                                       label = "lan4";
+                               };
+
+                               port3: port at 3 {
+                                       reg = <3>;
+                                       label = "wan";
+                               };
+
+                               port4: port at 4 {
+                                       reg = <4>;
+                                       label = "lan1";
+                               };
+
+                               port8: port at 8 {
+                                       reg = <8>;
+                                       label = "cpu";
+                                       ethernet = <&gmac>;
+                                       phy-mode = "rgmii";
+                                       fixed-link {
+                                               speed = <1000>;
+                                               full-duplex;
+                                       };
+                               };
+                       };
+               };

Quoted 45 lines · Stephen Arnold

From: Steve Arnold <[email protected]>

* 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 <[email protected]>

Cc Ian Campbell <[email protected]>

Cc Hans De Goede <[email protected]>

 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

arch/arm/dts/Makefile +1 -0

index 8458f6b..8aa8646 100644
@@ -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 \

arch/arm/dts/sun7i-a20-bananapi-r1.dts new file +0 -0

new file mode 100644
index 0000000..1a550f9

arch/arm/dts/sun7i-a20-bananapi-r1.dts line 3

Quoted 3 lines

arch/arm/dts/sun7i-a20-bananapi-r1.dts new file +3 -0

@@ -0,0 +1,376 @@
+/*
+ * Copyright 2015 Hans de Goede <[email protected]>
+ * Changes copyright 2016 Stephen Arnold <[email protected]>

Remove "Changes" text and add your copy on top, it some how look take reference from Hans.

Quoted 62 lines

arch/arm/dts/sun7i-a20-bananapi-r1.dts new file +62 -0

+ *
+ * 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";
+       };

arch/arm/dts/sun7i-a20-bananapi-r1.dts line 75

Quoted 10 lines

arch/arm/dts/sun7i-a20-bananapi-r1.dts new file +10 -0

+
+       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.

Quoted 52 lines

arch/arm/dts/sun7i-a20-bananapi-r1.dts new file +52 -0

+               };
+       };
+
+       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 = <&reg_ahci_5v>;
+       status = "okay";
+};
+
+&cpu0 {
+       cpu-supply = <&reg_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 = <&reg_gmac_3v3>;
+       status = "okay";
+
+       fixed-link {
+               speed = <1000>;

arch/arm/dts/sun7i-a20-bananapi-r1.dts line 137

Quoted 10 lines

arch/arm/dts/sun7i-a20-bananapi-r1.dts new file +10 -0

+               full-duplex;
+       };
+
+       mdio {
+               compatible = "snps,dwmac-mdio";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               switch: ethernet-switch at 1e {
+                       compatible = "brcm,bcm53125";

We don't have this compatible in drivers/net yet, better to skip this gmac node once added/tested.

Quoted 45 lines

arch/arm/dts/sun7i-a20-bananapi-r1.dts new file +45 -0

+                       reg = <30>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port0: port at 0 {
+                                       reg = <0>;
+                                       label = "lan2";
+                               };
+
+                               port1: port at 1 {
+                                       reg = <1>;
+                                       label = "lan3";
+                               };
+
+                               port2: port at 2 {
+                                       reg = <2>;
+                                       label = "lan4";
+                               };
+
+                               port3: port at 3 {
+                                       reg = <3>;
+                                       label = "wan";
+                               };
+
+                               port4: port at 4 {
+                                       reg = <4>;
+                                       label = "lan1";
+                               };
+
+                               port8: port at 8 {
+                                       reg = <8>;
+                                       label = "cpu";
+                                       ethernet = <&gmac>;
+                                       phy-mode = "rgmii";
+                                       fixed-link {
+                                               speed = <1000>;
+                                               full-duplex;
+                                       };
+                               };
+                       };
+               };

arch/arm/dts/sun7i-a20-bananapi-r1.dts line 192

Quoted 10 lines

arch/arm/dts/sun7i-a20-bananapi-r1.dts new file +10 -0

+       };
+};
+
+&i2c0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&i2c0_pins_a>;
+       status = "okay";
+
+       axp209: pmic at 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.

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...

Quoted 7 lines · Stephen Arnold

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.

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...

From: Steve Arnold <[email protected]>

* 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

Steve Arnold (2):
ARM: sun7i: config: add config for Sinovoip/Bananapi BPI-R1
ARM: sun7i: dts: add support for Sinovoip/Bananapi BPI-R1

 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

Signed-off-by Steve Arnold <[email protected]>

Cc Ian Campbell <[email protected]>

Cc Hans De Goede <[email protected]>

--
2.9.3