Okay, but I could use a little clarity; do you want the u-boot dts to look just like my (proposed) kernel dts? Or do I start with kernel dts and remove the gmac/axp209 stuff?
If we can merge all of this feedback into a single list of changes, then I can take a whack at it later this week (after a few work things). Back to the test mtg...
Thanks in advance, Steve
On Mon, Oct 10, 2016 at 3:34 AM, Jagan Teki jagannadh.teki@gmail.com wrote:
On Mon, Oct 10, 2016 at 2:34 AM, Stephen Arnold stephen.arnold42@gmail.com wrote:
From: Steve Arnold stephen.arnold42@gmail.com
- changes from lamobo-r1 required include:
- unset ahci power pin
- usbvbus gpio pin change
- mmc cd gpio pin change
- enable uart2, set default LED trigger
- CONFIG_GMAC_TX_DELAY change
Changes for v2:
- incorprated feedback for config options (remove 3, add 1)
Changes for v3/v4:
- re-submit (no change to patch payload) with cover
Changes for v5:
- re-submit as one patch (no change to patch payload)
Signed-off-by: Steve Arnold stephen.arnold42@gmail.com Cc: Ian Campbell ijc@hellion.org.uk Cc: Hans De Goede hdegoede@redhat.com
arch/arm/dts/Makefile | 1 + arch/arm/dts/sun7i-a20-bananapi-r1.dts | 376 +++++++++++++++++++++++++++++++++ configs/Bananapi_R1_defconfig | 16 ++ 3 files changed, 393 insertions(+) create mode 100644 arch/arm/dts/sun7i-a20-bananapi-r1.dts create mode 100644 configs/Bananapi_R1_defconfig
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 8458f6b..8aa8646 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -217,6 +217,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \ sun7i-a20-ainol-aw1.dtb \ sun7i-a20-bananapi.dtb \ sun7i-a20-bananapi-m1-plus.dtb \
sun7i-a20-bananapi-r1.dtb \ sun7i-a20-bananapro.dtb \ sun7i-a20-cubieboard2.dtb \ sun7i-a20-cubietruck.dtb \diff --git a/arch/arm/dts/sun7i-a20-bananapi-r1.dts b/arch/arm/dts/sun7i-a20-bananapi-r1.dts new file mode 100644 index 0000000..1a550f9 --- /dev/null +++ b/arch/arm/dts/sun7i-a20-bananapi-r1.dts @@ -0,0 +1,376 @@ +/*
- Copyright 2015 Hans de Goede hdegoede@redhat.com
- Changes copyright 2016 Stephen Arnold nerdboy@gentoo.org
Remove "Changes" text and add your copy on top, it some how look take reference from Hans.
- This file is dual-licensed: you can use it either under the terms
- of the GPL or the X11 license, at your option. Note that this dual
- licensing only applies to this file, and not this project as a
- whole.
- a) This file is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
This file is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- Or, alternatively,
- b) Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, sublicense, and/or
sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following
conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.- */
+/dts-v1/; +#include "sun7i-a20.dtsi" +#include "sunxi-common-regulators.dtsi"
+#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/interrupt-controller/irq.h> +#include <dt-bindings/pinctrl/sun4i-a10.h>
+/ {
model = "Banana Pi BPI-R1";compatible = "sinovoip,bpi-r1", "allwinner,sun7i-a20";aliases {serial0 = &uart0;serial1 = &uart2;serial2 = &uart3;serial3 = &uart7;};chosen {stdout-path = "serial0:115200n8";};leds {compatible = "gpio-leds";pinctrl-names = "default";pinctrl-0 = <&led_pins_bpi_r1>;green {label = "bpi-r1:green:usr";gpios = <&pio 7 24 GPIO_ACTIVE_HIGH>; /* PH24 */linux,default-trigger = "heartbeat";This property not needed, skip this.
};};reg_gmac_3v3: gmac-3v3 {compatible = "regulator-fixed";pinctrl-names = "default";pinctrl-0 = <&gmac_power_pin_bpi_r1>;regulator-name = "gmac-3v3";regulator-min-microvolt = <3300000>;regulator-max-microvolt = <3300000>;startup-delay-us = <100000>;enable-active-high;gpio = <&pio 7 23 GPIO_ACTIVE_HIGH>; /* PH23 */};+};
+&ahci {
target-supply = <®_ahci_5v>;status = "okay";+};
+&cpu0 {
cpu-supply = <®_dcdc2>;+};
+&ehci0 {
status = "okay";+};
+&ehci1 {
status = "okay";+};
+&ohci0 {
status = "okay";+};
+&ohci1 {
status = "okay";+};
+&gmac {
pinctrl-names = "default";pinctrl-0 = <&gmac_pins_rgmii_a>;phy = <&phy1>;phy-mode = "rgmii";phy-supply = <®_gmac_3v3>;status = "okay";fixed-link {speed = <1000>;full-duplex;};mdio {compatible = "snps,dwmac-mdio";#address-cells = <1>;#size-cells = <0>;switch: ethernet-switch@1e {compatible = "brcm,bcm53125";We don't have this compatible in drivers/net yet, better to skip this gmac node once added/tested.
reg = <30>;#address-cells = <1>;#size-cells = <0>;ports {#address-cells = <1>;#size-cells = <0>;port0: port@0 {reg = <0>;label = "lan2";};port1: port@1 {reg = <1>;label = "lan3";};port2: port@2 {reg = <2>;label = "lan4";};port3: port@3 {reg = <3>;label = "wan";};port4: port@4 {reg = <4>;label = "lan1";};port8: port@8 {reg = <8>;label = "cpu";ethernet = <&gmac>;phy-mode = "rgmii";fixed-link {speed = <1000>;full-duplex;};};};};};+};
+&i2c0 {
pinctrl-names = "default";pinctrl-0 = <&i2c0_pins_a>;status = "okay";axp209: pmic@34 {compatible = "x-powers,axp209";I think same as gmac
So instead of copy the entire dts, please add the nodes which are tested. maintenance becomes difficult for long run for unnecessary/untested nodes atleast for dts files(!dtsi)
thanks!
Jagan Teki Free Software Engineer | www.openedev.com U-Boot, Linux | Upstream Maintainer Hyderabad, India.