diff mbox

[U-Boot] ARM: sun7i: dts: add support for Sinovoip/Bananapi BPI-R1

Message ID 20161002043645.24143-1-stephen.arnold42@gmail.com
State Changes Requested
Headers show

Commit Message

Stephen Arnold Oct. 2, 2016, 4:36 a.m. UTC
From: Steve Arnold <stephen.arnold42@gmail.com>

* needs different GMAC_TX_DELAY than lamobo-r1 (not compatible)
* tested with 4.8_rc6 b53-mdio and kernel dts switch nodes

Signed-off-by: Stephen 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 | 321 +++++++++++++++++++++++++++++++++
 configs/Bananapi_R1_defconfig          |  19 ++
 3 files changed, 341 insertions(+)
 create mode 100644 arch/arm/dts/sun7i-a20-bananapi-r1.dts
 create mode 100644 configs/Bananapi_R1_defconfig

Comments

Jagan Teki Oct. 2, 2016, 5:17 p.m. UTC | #1
On Sun, Oct 2, 2016 at 10:06 AM, Stephen Arnold
<stephen.arnold42@gmail.com> wrote:
> From: Steve Arnold <stephen.arnold42@gmail.com>
>
> * needs different GMAC_TX_DELAY than lamobo-r1 (not compatible)
> * tested with 4.8_rc6 b53-mdio and kernel dts switch nodes
>
> Signed-off-by: Stephen 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 | 321 +++++++++++++++++++++++++++++++++
>  configs/Bananapi_R1_defconfig          |  19 ++
>  3 files changed, 341 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 032c5ae..0cbae00 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -216,6 +216,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..30a827f
> --- /dev/null
> +++ b/arch/arm/dts/sun7i-a20-bananapi-r1.dts
> @@ -0,0 +1,321 @@
> +/*
> + * Copyright 2015 Hans de Goede <hdegoede@redhat.com>
> + *
> + * Changes copyright 2016 Stephen Arnold <nerdboy@gentoo.org>

Did you copied this dts from somewhere in ML?

> + * 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 = <&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";
> +
> +       phy1: ethernet-phy@1 {
> +               reg = <1>;
> +       };
> +};
> +
> +&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 = <&reg_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>;
> +       };
> +};
> +
> +&reg_ahci_5v {
> +       status = "okay";
> +};
> +
> +&reg_dcdc2 {
> +       regulator-always-on;
> +       regulator-min-microvolt = <1000000>;
> +       regulator-max-microvolt = <1400000>;
> +       regulator-name = "vdd-cpu";
> +};
> +
> +&reg_dcdc3 {
> +       regulator-always-on;
> +       regulator-min-microvolt = <1000000>;
> +       regulator-max-microvolt = <1400000>;
> +       regulator-name = "vdd-int-dll";
> +};
> +
> +&reg_ldo1 {
> +       regulator-name = "vdd-rtc";
> +};
> +
> +&reg_ldo2 {
> +       regulator-always-on;
> +       regulator-min-microvolt = <3000000>;
> +       regulator-max-microvolt = <3000000>;
> +       regulator-name = "avcc";
> +};
> +
> +&reg_usb0_vbus {
> +       pinctrl-0 = <&usb0_vbus_pin_bpi_r1>;
> +       gpio = <&pio 1 9 GPIO_ACTIVE_HIGH>; /* PB9 */
> +       status = "okay";
> +};
> +
> +&reg_usb1_vbus {
> +       status = "okay";
> +};
> +
> +&reg_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 = <&reg_usb0_vbus>;
> +       usb1_vbus-supply = <&reg_usb1_vbus>;
> +       usb2_vbus-supply = <&reg_usb2_vbus>;
> +       status = "okay";
> +};
> diff --git a/configs/Bananapi_R1_defconfig b/configs/Bananapi_R1_defconfig
> new file mode 100644
> index 0000000..e5341ee
> --- /dev/null
> +++ b/configs/Bananapi_R1_defconfig
> @@ -0,0 +1,19 @@
> +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_DM_ETH=y
> +CONFIG_PHYLIB=y
> +# CONFIG_RTL8211X_PHY_FORCE_MASTER=y
> +CONFIG_ETH_DESIGNWARE=y
> +CONFIG_DM_SERIAL=y
> +CONFIG_USB=y
> +CONFIG_DM_USB=y

Better use the existing Bananapi_defconfig,because most of the configs
are redundant.

thanks!
Stephen Arnold Oct. 2, 2016, 5:56 p.m. UTC | #2
It can't.  Ethernet and USB are both fubar'd using lamobo-r1 on
bananapi-r1.  Mainly the GMAC delay is different,  If you buy one and
test it, you will find that they are definitely *not* compatible.
Period.

Steve

On Sun, Oct 2, 2016 at 10:17 AM, Jagan Teki <jagannadh.teki@gmail.com> wrote:
> On Sun, Oct 2, 2016 at 10:06 AM, Stephen Arnold
> <stephen.arnold42@gmail.com> wrote:
>> From: Steve Arnold <stephen.arnold42@gmail.com>
>>
>> * needs different GMAC_TX_DELAY than lamobo-r1 (not compatible)
>> * tested with 4.8_rc6 b53-mdio and kernel dts switch nodes
>>
>> Signed-off-by: Stephen 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 | 321 +++++++++++++++++++++++++++++++++
>>  configs/Bananapi_R1_defconfig          |  19 ++
>>  3 files changed, 341 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 032c5ae..0cbae00 100644
>> --- a/arch/arm/dts/Makefile
>> +++ b/arch/arm/dts/Makefile
>> @@ -216,6 +216,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..30a827f
>> --- /dev/null
>> +++ b/arch/arm/dts/sun7i-a20-bananapi-r1.dts
>> @@ -0,0 +1,321 @@
>> +/*
>> + * Copyright 2015 Hans de Goede <hdegoede@redhat.com>
>> + *
>> + * Changes copyright 2016 Stephen Arnold <nerdboy@gentoo.org>
>
> Did you copied this dts from somewhere in ML?
>
>> + * 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 = <&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";
>> +
>> +       phy1: ethernet-phy@1 {
>> +               reg = <1>;
>> +       };
>> +};
>> +
>> +&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 = <&reg_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>;
>> +       };
>> +};
>> +
>> +&reg_ahci_5v {
>> +       status = "okay";
>> +};
>> +
>> +&reg_dcdc2 {
>> +       regulator-always-on;
>> +       regulator-min-microvolt = <1000000>;
>> +       regulator-max-microvolt = <1400000>;
>> +       regulator-name = "vdd-cpu";
>> +};
>> +
>> +&reg_dcdc3 {
>> +       regulator-always-on;
>> +       regulator-min-microvolt = <1000000>;
>> +       regulator-max-microvolt = <1400000>;
>> +       regulator-name = "vdd-int-dll";
>> +};
>> +
>> +&reg_ldo1 {
>> +       regulator-name = "vdd-rtc";
>> +};
>> +
>> +&reg_ldo2 {
>> +       regulator-always-on;
>> +       regulator-min-microvolt = <3000000>;
>> +       regulator-max-microvolt = <3000000>;
>> +       regulator-name = "avcc";
>> +};
>> +
>> +&reg_usb0_vbus {
>> +       pinctrl-0 = <&usb0_vbus_pin_bpi_r1>;
>> +       gpio = <&pio 1 9 GPIO_ACTIVE_HIGH>; /* PB9 */
>> +       status = "okay";
>> +};
>> +
>> +&reg_usb1_vbus {
>> +       status = "okay";
>> +};
>> +
>> +&reg_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 = <&reg_usb0_vbus>;
>> +       usb1_vbus-supply = <&reg_usb1_vbus>;
>> +       usb2_vbus-supply = <&reg_usb2_vbus>;
>> +       status = "okay";
>> +};
>> diff --git a/configs/Bananapi_R1_defconfig b/configs/Bananapi_R1_defconfig
>> new file mode 100644
>> index 0000000..e5341ee
>> --- /dev/null
>> +++ b/configs/Bananapi_R1_defconfig
>> @@ -0,0 +1,19 @@
>> +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_DM_ETH=y
>> +CONFIG_PHYLIB=y
>> +# CONFIG_RTL8211X_PHY_FORCE_MASTER=y
>> +CONFIG_ETH_DESIGNWARE=y
>> +CONFIG_DM_SERIAL=y
>> +CONFIG_USB=y
>> +CONFIG_DM_USB=y
>
> Better use the existing Bananapi_defconfig,because most of the configs
> are redundant.
>
> thanks!
> --
> Jagan Teki
> Free Software Engineer | www.openedev.com
> U-Boot, Linux | Upstream Maintainer
> Hyderabad, India.
Jagan Teki Oct. 2, 2016, 6:04 p.m. UTC | #3
On Sun, Oct 2, 2016 at 11:26 PM, Stephen Arnold
<stephen.arnold42@gmail.com> wrote:
> It can't.  Ethernet and USB are both fubar'd using lamobo-r1 on
> bananapi-r1.  Mainly the GMAC delay is different,  If you buy one and
> test it, you will find that they are definitely *not* compatible.
> Period.

I taking about the CONFIG_* entries which is used in defconfig, dts is
fine anyway we need it as a separate.
Stephen Arnold Oct. 2, 2016, 6:57 p.m. UTC | #4
I guess I'm not sure what you're saying then;  do you want a smaller
config?  Or something else?  Currently bananapi-r1 does not work at
all without its own config and .dts file.  Do you have a different
solution?  BTW, I also have kernel dts patches but everything hinges
on correctly setting up the ethernet.

https://github.com/VCTLabs/armv7-lpae-multiplatform

Basically, I really only care that all this stuff works (especially
the ethernet on a board with a switch chip) - okay, that plus sata dts
tweaks and a good quality usb cable for stable power.  Without
changing that GMAC delay parameter, you get something that looks like
it should work, but only a handful of packets ever actually make it
from one end to the other.

Steve

On Sun, Oct 2, 2016 at 11:04 AM, Jagan Teki <jagannadh.teki@gmail.com> wrote:
> On Sun, Oct 2, 2016 at 11:26 PM, Stephen Arnold
> <stephen.arnold42@gmail.com> wrote:
>> It can't.  Ethernet and USB are both fubar'd using lamobo-r1 on
>> bananapi-r1.  Mainly the GMAC delay is different,  If you buy one and
>> test it, you will find that they are definitely *not* compatible.
>> Period.
>
> I taking about the CONFIG_* entries which is used in defconfig, dts is
> fine anyway we need it as a separate.
>
> --
> Jagan Teki
> Free Software Engineer | www.openedev.com
> U-Boot, Linux | Upstream Maintainer
> Hyderabad, India.
diff mbox

Patch

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 032c5ae..0cbae00 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -216,6 +216,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..30a827f
--- /dev/null
+++ b/arch/arm/dts/sun7i-a20-bananapi-r1.dts
@@ -0,0 +1,321 @@ 
+/*
+ * 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 = <&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";
+
+	phy1: ethernet-phy@1 {
+		reg = <1>;
+	};
+};
+
+&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 = <&reg_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>;
+	};
+};
+
+&reg_ahci_5v {
+	status = "okay";
+};
+
+&reg_dcdc2 {
+	regulator-always-on;
+	regulator-min-microvolt = <1000000>;
+	regulator-max-microvolt = <1400000>;
+	regulator-name = "vdd-cpu";
+};
+
+&reg_dcdc3 {
+	regulator-always-on;
+	regulator-min-microvolt = <1000000>;
+	regulator-max-microvolt = <1400000>;
+	regulator-name = "vdd-int-dll";
+};
+
+&reg_ldo1 {
+	regulator-name = "vdd-rtc";
+};
+
+&reg_ldo2 {
+	regulator-always-on;
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "avcc";
+};
+
+&reg_usb0_vbus {
+	pinctrl-0 = <&usb0_vbus_pin_bpi_r1>;
+	gpio = <&pio 1 9 GPIO_ACTIVE_HIGH>; /* PB9 */
+	status = "okay";
+};
+
+&reg_usb1_vbus {
+	status = "okay";
+};
+
+&reg_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 = <&reg_usb0_vbus>;
+	usb1_vbus-supply = <&reg_usb1_vbus>;
+	usb2_vbus-supply = <&reg_usb2_vbus>;
+	status = "okay";
+};
diff --git a/configs/Bananapi_R1_defconfig b/configs/Bananapi_R1_defconfig
new file mode 100644
index 0000000..e5341ee
--- /dev/null
+++ b/configs/Bananapi_R1_defconfig
@@ -0,0 +1,19 @@ 
+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_DM_ETH=y
+CONFIG_PHYLIB=y
+# CONFIG_RTL8211X_PHY_FORCE_MASTER=y
+CONFIG_ETH_DESIGNWARE=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y