All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] ARM: sun7i: dts: add support for Sinovoip/Bananapi BPI-R1
@ 2016-10-02  4:36 Stephen Arnold
  2016-10-02  4:36 ` Stephen Arnold
  2016-10-02 17:17 ` Jagan Teki
  0 siblings, 2 replies; 11+ messages in thread
From: Stephen Arnold @ 2016-10-02  4:36 UTC (permalink / raw)
  To: u-boot

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>
+ * 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 at 1 {
+		reg = <1>;
+	};
+};
+
+&i2c0 {
+	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 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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
-- 
2.8.1

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [U-Boot] [PATCH] ARM: sun7i: dts: add support for Sinovoip/Bananapi BPI-R1
  2016-10-02  4:36 [U-Boot] [PATCH] ARM: sun7i: dts: add support for Sinovoip/Bananapi BPI-R1 Stephen Arnold
@ 2016-10-02  4:36 ` Stephen Arnold
  2016-10-03  6:55   ` Hans de Goede
  2016-10-02 17:17 ` Jagan Teki
  1 sibling, 1 reply; 11+ messages in thread
From: Stephen Arnold @ 2016-10-02  4:36 UTC (permalink / raw)
  To: u-boot

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: Steve Arnold <nerdboy@gentoo.org>
---
 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 2015 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 at 1 {
+		reg = <1>;
+	};
+};
+
+&i2c0 {
+	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 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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
-- 
2.9.3

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [U-Boot] [PATCH] ARM: sun7i: dts: add support for Sinovoip/Bananapi BPI-R1
  2016-10-02  4:36 [U-Boot] [PATCH] ARM: sun7i: dts: add support for Sinovoip/Bananapi BPI-R1 Stephen Arnold
  2016-10-02  4:36 ` Stephen Arnold
@ 2016-10-02 17:17 ` Jagan Teki
  2016-10-02 17:56   ` Stephen Arnold
  1 sibling, 1 reply; 11+ messages in thread
From: Jagan Teki @ 2016-10-02 17:17 UTC (permalink / raw)
  To: u-boot

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 at 1 {
> +               reg = <1>;
> +       };
> +};
> +
> +&i2c0 {
> +       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 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [U-Boot] [PATCH] ARM: sun7i: dts: add support for Sinovoip/Bananapi BPI-R1
  2016-10-02 17:17 ` Jagan Teki
@ 2016-10-02 17:56   ` Stephen Arnold
  2016-10-02 18:04     ` Jagan Teki
  0 siblings, 1 reply; 11+ messages in thread
From: Stephen Arnold @ 2016-10-02 17:56 UTC (permalink / raw)
  To: u-boot

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 at 1 {
>> +               reg = <1>;
>> +       };
>> +};
>> +
>> +&i2c0 {
>> +       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 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [U-Boot] [PATCH] ARM: sun7i: dts: add support for Sinovoip/Bananapi BPI-R1
  2016-10-02 17:56   ` Stephen Arnold
@ 2016-10-02 18:04     ` Jagan Teki
  2016-10-02 18:57       ` Stephen Arnold
  0 siblings, 1 reply; 11+ messages in thread
From: Jagan Teki @ 2016-10-02 18:04 UTC (permalink / raw)
  To: u-boot

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.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [U-Boot] [PATCH] ARM: sun7i: dts: add support for Sinovoip/Bananapi BPI-R1
  2016-10-02 18:04     ` Jagan Teki
@ 2016-10-02 18:57       ` Stephen Arnold
  0 siblings, 0 replies; 11+ messages in thread
From: Stephen Arnold @ 2016-10-02 18:57 UTC (permalink / raw)
  To: u-boot

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.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [U-Boot] [PATCH] ARM: sun7i: dts: add support for Sinovoip/Bananapi BPI-R1
  2016-10-02  4:36 ` Stephen Arnold
@ 2016-10-03  6:55   ` Hans de Goede
  2016-10-03 13:04     ` Jagan Teki
  2016-10-03 16:42     ` Stephen Arnold
  0 siblings, 2 replies; 11+ messages in thread
From: Hans de Goede @ 2016-10-03  6:55 UTC (permalink / raw)
  To: u-boot

Hi,

On 02-10-16 06:36, Stephen Arnold wrote:
> From: Steve Arnold <stephen.arnold42@gmail.com>
>
> * needs different GMAC_TX_DELAY than lamobo-r1 (not compatible)

I see why this would need a separate defconfig, but why do you also
need a new dts file ?

And if you need just a minor dts tweak, please just include the
existing dts file and make the tweak, rather then writing a
whole new dts file.

Also have you submitted the dts file to the upstream kernel ?

Regards,

Hans



> * tested with 4.8_rc6 b53-mdio and kernel dts switch nodes
>
> Signed-off-by: Steve Arnold <nerdboy@gentoo.org>
> ---
>  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 2015 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 at 1 {
> +		reg = <1>;
> +	};
> +};
> +
> +&i2c0 {
> +	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 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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

There is no need to set these 3 options, they are the default.

> +CONFIG_ETH_DESIGNWARE=y

> +CONFIG_DM_SERIAL=y
> +CONFIG_USB=y
> +CONFIG_DM_USB=y

Likewise for these 3 options, they are on by default too.

OTOH you do like want to do:

CONFIG_USB_EHCI_HCD=y

So that the usb ports will work in u-boot.

Regards,

Hans

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [U-Boot] [PATCH] ARM: sun7i: dts: add support for Sinovoip/Bananapi BPI-R1
  2016-10-03  6:55   ` Hans de Goede
@ 2016-10-03 13:04     ` Jagan Teki
  2016-10-03 13:25       ` Hans de Goede
  2016-10-03 16:42     ` Stephen Arnold
  1 sibling, 1 reply; 11+ messages in thread
From: Jagan Teki @ 2016-10-03 13:04 UTC (permalink / raw)
  To: u-boot

On Mon, Oct 3, 2016 at 12:25 PM, Hans de Goede <hdegoede@redhat.com> wrote:
> Hi,
>
> On 02-10-16 06:36, Stephen Arnold wrote:
>>
>> From: Steve Arnold <stephen.arnold42@gmail.com>
>>
>> * needs different GMAC_TX_DELAY than lamobo-r1 (not compatible)
>
>
> I see why this would need a separate defconfig, but why do you also
> need a new dts file ?
>
> And if you need just a minor dts tweak, please just include the
> existing dts file and make the tweak, rather then writing a
> whole new dts file.
>
> Also have you submitted the dts file to the upstream kernel ?
>
> Regards,
>
> Hans
>
>
>
>
>> * tested with 4.8_rc6 b53-mdio and kernel dts switch nodes
>>
>> Signed-off-by: Steve Arnold <nerdboy@gentoo.org>
>> ---
>>  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 2015 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 at 1 {
>> +               reg = <1>;
>> +       };
>> +};
>> +
>> +&i2c0 {
>> +       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 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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
>
>
> There is no need to set these 3 options, they are the default.
>
>> +CONFIG_ETH_DESIGNWARE=y
>
>
>> +CONFIG_DM_SERIAL=y
>> +CONFIG_USB=y
>> +CONFIG_DM_USB=y

I think we can use the existing Bananapi_defconfig and build for -r1
dts, this make more sense for identical board families and reduce the
no.of defconfigs.

thanks!
-- 
Jagan Teki
Free Software Engineer | www.openedev.com
U-Boot, Linux | Upstream Maintainer
Hyderabad, India.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [U-Boot] [PATCH] ARM: sun7i: dts: add support for Sinovoip/Bananapi BPI-R1
  2016-10-03 13:04     ` Jagan Teki
@ 2016-10-03 13:25       ` Hans de Goede
  0 siblings, 0 replies; 11+ messages in thread
From: Hans de Goede @ 2016-10-03 13:25 UTC (permalink / raw)
  To: u-boot

HI,

On 03-10-16 15:04, Jagan Teki wrote:
> On Mon, Oct 3, 2016 at 12:25 PM, Hans de Goede <hdegoede@redhat.com> wrote:
>> Hi,
>>
>> On 02-10-16 06:36, Stephen Arnold wrote:
>>>
>>> From: Steve Arnold <stephen.arnold42@gmail.com>
>>>
>>> * needs different GMAC_TX_DELAY than lamobo-r1 (not compatible)
>>
>>
>> I see why this would need a separate defconfig, but why do you also
>> need a new dts file ?
>>
>> And if you need just a minor dts tweak, please just include the
>> existing dts file and make the tweak, rather then writing a
>> whole new dts file.
>>
>> Also have you submitted the dts file to the upstream kernel ?
>>
>> Regards,
>>
>> Hans
>>
>>
>>
>>
>>> * tested with 4.8_rc6 b53-mdio and kernel dts switch nodes
>>>
>>> Signed-off-by: Steve Arnold <nerdboy@gentoo.org>
>>> ---
>>>  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 2015 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 at 1 {
>>> +               reg = <1>;
>>> +       };
>>> +};
>>> +
>>> +&i2c0 {
>>> +       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 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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
>>
>>
>> There is no need to set these 3 options, they are the default.
>>
>>> +CONFIG_ETH_DESIGNWARE=y
>>
>>
>>> +CONFIG_DM_SERIAL=y
>>> +CONFIG_USB=y
>>> +CONFIG_DM_USB=y
>
> I think we can use the existing Bananapi_defconfig and build for -r1
> dts, this make more sense for identical board families and reduce the
> no.of defconfigs.

No, we really need to have a defconfig which can work for a board
without having to override any of the settings through e.g.
make menuconfig.

This is esp. important for the Linux distro's as they simply pre-build
u-boot-sunxi-spl.bin files for their users for all existing sunxi defconfigs.

Regards,

Hans

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [U-Boot] [PATCH] ARM: sun7i: dts: add support for Sinovoip/Bananapi BPI-R1
  2016-10-03  6:55   ` Hans de Goede
  2016-10-03 13:04     ` Jagan Teki
@ 2016-10-03 16:42     ` Stephen Arnold
  2016-10-10  7:46       ` Hans de Goede
  1 sibling, 1 reply; 11+ messages in thread
From: Stephen Arnold @ 2016-10-03 16:42 UTC (permalink / raw)
  To: u-boot

On Sun, Oct 2, 2016 at 11:55 PM, Hans de Goede <hdegoede@redhat.com> wrote:
> Hi,
>
> On 02-10-16 06:36, Stephen Arnold wrote:
>>
>> From: Steve Arnold <stephen.arnold42@gmail.com>
>>
>> * needs different GMAC_TX_DELAY than lamobo-r1 (not compatible)
>
>
> I see why this would need a separate defconfig, but why do you also
> need a new dts file ?

I don't have a lamobo to test on, however, several dts things seem
"broken" when trying to run the bananapi with lamobo config, mostly
from memory:

1) uart3 has incorrect pin setting
2) USB host doesn't work (so you get u-boot console but no keyboard)
3) ahci power pin seems to make it less than stable (odd behavior
building native with sata rootfs)
4) missing i2c on the rpi pin header

plus a few more odds and ends.

> And if you need just a minor dts tweak, please just include the
> existing dts file and make the tweak, rather then writing a
> whole new dts file.

What exactly qualifies as a "minor tweak"?  This seems like more than that...

> Also have you submitted the dts file to the upstream kernel ?

Not yet, but it kinda needs u-boot in order to work, so I submitted
here first.  The kernel dts needs even more tweaks to make cpufreq and
voltage adjustments correctly; now with a tiny heatsink it idles at ~
42 C instead of 49/50 deg C.

Lastly, I could not get "compatible" to do much here; the only way I
could boot my bananapi-r1 test (kernel) dts was to make a symlink from
lamobo-r1.dts to bananapi-r1.dts.  I couldn't find an example of two
similar-enough boards sharing a dts file with two different names as
"compatible".  Is there such an example somewhere and I missed it?

Thanks, Steve

> Regards,
>
> Hans
>
>
>
>
>> * tested with 4.8_rc6 b53-mdio and kernel dts switch nodes
>>
>> Signed-off-by: Steve Arnold <nerdboy@gentoo.org>
>> ---
>>  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 2015 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 at 1 {
>> +               reg = <1>;
>> +       };
>> +};
>> +
>> +&i2c0 {
>> +       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 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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
>
>
> There is no need to set these 3 options, they are the default.
>
>> +CONFIG_ETH_DESIGNWARE=y
>
>
>> +CONFIG_DM_SERIAL=y
>> +CONFIG_USB=y
>> +CONFIG_DM_USB=y
>
>
> Likewise for these 3 options, they are on by default too.
>
> OTOH you do like want to do:
>
> CONFIG_USB_EHCI_HCD=y
>
> So that the usb ports will work in u-boot.
>
> Regards,
>
> Hans

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [U-Boot] [PATCH] ARM: sun7i: dts: add support for Sinovoip/Bananapi BPI-R1
  2016-10-03 16:42     ` Stephen Arnold
@ 2016-10-10  7:46       ` Hans de Goede
  0 siblings, 0 replies; 11+ messages in thread
From: Hans de Goede @ 2016-10-10  7:46 UTC (permalink / raw)
  To: u-boot

Hi Stephen,

First of all sorry for not responding sooner, I know there
have been a few versions since this one. But AFAICT those
don't address the get the dt accepted into the kernel thing
first, which really needs to be addressed before this can
be merged, see my comments below.

On 03-10-16 18:42, Stephen Arnold wrote:
> On Sun, Oct 2, 2016 at 11:55 PM, Hans de Goede <hdegoede@redhat.com> wrote:
>> Hi,
>>
>> On 02-10-16 06:36, Stephen Arnold wrote:
>>>
>>> From: Steve Arnold <stephen.arnold42@gmail.com>
>>>
>>> * needs different GMAC_TX_DELAY than lamobo-r1 (not compatible)
>>
>>
>> I see why this would need a separate defconfig, but why do you also
>> need a new dts file ?
>
> I don't have a lamobo to test on, however, several dts things seem
> "broken" when trying to run the bananapi with lamobo config, mostly
> from memory:
>
> 1) uart3 has incorrect pin setting
> 2) USB host doesn't work (so you get u-boot console but no keyboard)
> 3) ahci power pin seems to make it less than stable (odd behavior
> building native with sata rootfs)
> 4) missing i2c on the rpi pin header
>
> plus a few more odds and ends.
>
>> And if you need just a minor dts tweak, please just include the
>> existing dts file and make the tweak, rather then writing a
>> whole new dts file.
>
> What exactly qualifies as a "minor tweak"?  This seems like more than that...

Basically when your copy and pasting an entire dts and then changing
a few lines (say max 15 but that is not a hard limit) then we
prefer using the original dts as a base.

>> Also have you submitted the dts file to the upstream kernel ?
>
> Not yet, but it kinda needs u-boot in order to work, so I submitted
> here first.  The kernel dts needs even more tweaks to make cpufreq and
> voltage adjustments correctly; now with a tiny heatsink it idles at ~
> 42 C instead of 49/50 deg C.

Getting u-boot up and running first is fine / the logical thing todo,
submitting first is fine too, but is generally seen as an RFC until
you actually get the dts accepted into the kernel. For sunxi we strictly
use the kernel dts files and don't want to deviate from what is in the
kernel (we manually sync all sunxi dts files with the kernel aprox. once
every release). Note "accepted in to the kernel" is quite loose here,
if you submit it to Chen-Yu Tsai and Maxime Ripard and either gives
his ack, that is good enough.


> Lastly, I could not get "compatible" to do much here; the only way I
> could boot my bananapi-r1 test (kernel) dts was to make a symlink from
> lamobo-r1.dts to bananapi-r1.dts.  I couldn't find an example of two
> similar-enough boards sharing a dts file with two different names as
> "compatible".  Is there such an example somewhere and I missed it?

Here is a good example:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts

And here is another example which deletes one property from the original
dts it includes (yes this is possible too) :

https://github.com/jwrdegoede/linux-sunxi/blob/sunxi-wip/arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts

Note I'm not saying you must use #include the lamabo dts and override
various bits, I'm just offering it as a suggestion. You do must submit
whatever dts you come up with to the upstream kernel before we can
accept the dts (and thus the board) into u-boot. Please Cc me when
you submit the dts to the upstream kernel.

Usually this being done is indicated by adding a "The dts is identical to
the one submitted to the upstream kernel" to the u-boot commit msg when
submitting a new board to u-boot.

Regards,

Hans


p.s.

This was probably already mentioned, but please be sure to also update
board/sunxi/MAINTAINERS for the new board.




>>> * tested with 4.8_rc6 b53-mdio and kernel dts switch nodes
>>>
>>> Signed-off-by: Steve Arnold <nerdboy@gentoo.org>
>>> ---
>>>  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 2015 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 at 1 {
>>> +               reg = <1>;
>>> +       };
>>> +};
>>> +
>>> +&i2c0 {
>>> +       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 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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
>>
>>
>> There is no need to set these 3 options, they are the default.
>>
>>> +CONFIG_ETH_DESIGNWARE=y
>>
>>
>>> +CONFIG_DM_SERIAL=y
>>> +CONFIG_USB=y
>>> +CONFIG_DM_USB=y
>>
>>
>> Likewise for these 3 options, they are on by default too.
>>
>> OTOH you do like want to do:
>>
>> CONFIG_USB_EHCI_HCD=y
>>
>> So that the usb ports will work in u-boot.
>>
>> Regards,
>>
>> Hans

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2016-10-10  7:46 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-02  4:36 [U-Boot] [PATCH] ARM: sun7i: dts: add support for Sinovoip/Bananapi BPI-R1 Stephen Arnold
2016-10-02  4:36 ` Stephen Arnold
2016-10-03  6:55   ` Hans de Goede
2016-10-03 13:04     ` Jagan Teki
2016-10-03 13:25       ` Hans de Goede
2016-10-03 16:42     ` Stephen Arnold
2016-10-10  7:46       ` Hans de Goede
2016-10-02 17:17 ` Jagan Teki
2016-10-02 17:56   ` Stephen Arnold
2016-10-02 18:04     ` Jagan Teki
2016-10-02 18:57       ` Stephen Arnold

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.