linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ARM: dts: sun7i: Add dts file for Bananapi M1 Plus board
@ 2016-05-30 12:30 luoyi.ly
  2016-05-30 19:43 ` Maxime Ripard
  0 siblings, 1 reply; 8+ messages in thread
From: luoyi.ly @ 2016-05-30 12:30 UTC (permalink / raw)
  To: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, linux,
	maxime.ripard, wens, devicetree, linux-arm-kernel, linux-kernel,
	linux-sunxi
  Cc: luoyi

From: luoyi <luoyi.ly@gmail.com>

Add support for the Bananapi M1 Plus A20 development board from sinovoip.com.cn .
This board features 1G RAM, 2 USB A receptacles, 1 micro USB receptacle for
OTG, 1 micro USB receptacle for power, HDMI, sata, Gbit ethernet, ir receiver,
3.5 mm jack for stero sound out, on board microphone, 40 gpio pins and sdio wifi.

Signed-off-by: Luo Yi <luoyi.ly@gmail.com>
---
 arch/arm/boot/dts/Makefile                       |   1 +
 arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 270 +++++++++++++++++++++++
 2 files changed, 271 insertions(+)
 create mode 100644 arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index e06a5ab..fde407f 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -685,6 +685,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
 	sun6i-a31s-yones-toptech-bs1078-v2.dtb
 dtb-$(CONFIG_MACH_SUN7I) += \
 	sun7i-a20-bananapi.dtb \
+	sun7i-a20-bananapi-m1-plus.dtb \
 	sun7i-a20-bananapro.dtb \
 	sun7i-a20-cubieboard2.dtb \
 	sun7i-a20-cubietruck.dtb \
diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
new file mode 100644
index 0000000..b62fc1d
--- /dev/null
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
@@ -0,0 +1,270 @@
+/*
+ * Copyright 2016 Luo Yi <luoyi.ly@gmail.com>
+ * 
+ * Thanks to the original work by Hans de Goede <hdegoede@redhat.com>
+ *
+ * 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/arm-gic.h>
+
+/ {
+	model = "Banana Pi BPI-M1-Plus";
+	compatible = "sinovoip,bpi-m1-plus", "allwinner,sun7i-a20";
+
+	aliases {
+		serial0 = &uart0;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		pinctrl-names = "default";
+		pinctrl-0 = <&led_pins_bananapi>;
+
+		red {
+			label = "bananapi:red:usr";
+			gpios = <&pio 7 25 GPIO_ACTIVE_HIGH>;
+			linux,default-trigger = "default-on";
+		};
+
+		green {
+			label = "bananapi:green:usr";
+			gpios = <&pio 7 24 GPIO_ACTIVE_HIGH>;
+			linux,default-trigger = "heartbeat";
+
+		};
+	};
+
+	reg_gmac_3v3: gmac-3v3 {
+		compatible = "regulator-fixed";
+		pinctrl-names = "default";
+		pinctrl-0 = <&gmac_power_pin_bananapi>;
+		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>;
+	};
+
+	reg_vmmc3: vmmc3 {
+		compatible = "regulator-fixed";
+		pinctrl-names = "default";
+		pinctrl-0 = <&vmmc3_pin_bananapi>;
+		regulator-name = "vmmc3";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-always-on;
+		regulator-boot-on;
+		enable-active-high;
+		gpio = <&pio 7 22 GPIO_ACTIVE_HIGH>;
+	};
+
+};
+
+&ahci {
+	status = "okay";
+};
+
+&codec {
+	status = "okay";
+};
+
+&ehci0 {
+	status = "okay";
+};
+
+&ehci1 {
+	status = "okay";
+};
+
+&ohci0 {
+	status = "okay";
+};
+
+&ohci1 {
+	status = "okay";
+};
+
+&gmac {
+	pinctrl-names = "default";
+	pinctrl-0 = <&gmac_pins_rgmii_a>;
+	phy = <&phy1>;
+	phy-mode = "rgmii";
+	phy-supply = <&reg_gmac_3v3>;
+	status = "okay";
+
+	phy1: ethernet-phy@1 {
+		reg = <1>;
+	};
+};
+
+&i2c0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c0_pins_a>;
+	status = "okay";
+
+	axp209: pmic@34 {
+		compatible = "x-powers,axp209";
+		reg = <0x34>;
+		interrupt-parent = <&nmi_intc>;
+		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+
+		interrupt-controller;
+		#interrupt-cells = <1>;
+	};
+};
+
+&ir0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&ir0_rx_pins_a>;
+	status = "okay";
+};
+
+&mmc0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapi>;
+	vmmc-supply = <&reg_vcc3v3>;
+	bus-width = <4>;
+	cd-gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; /* PH10 */
+	cd-inverted;
+	status = "okay";
+};
+
+&mmc3 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc3_pins_a>;
+	vmmc-supply = <&reg_vmmc3>;
+	bus-width = <4>;
+	non-removable;
+	enable-sdio-wakeup;
+	status = "okay";
+
+	brcmf: bcrmf@1 {
+		reg = <1>;
+		compatible = "brcm,bcm4329-fmac";
+		interrupt-parent = <&pio>;
+		interrupts = <7 15 IRQ_TYPE_LEVEL_LOW>; 
+		interrupt-names = "host-wake";
+	};
+
+};
+
+&mmc3_pins_a {
+    /* AP6210 requires pull-up */
+	allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+};
+
+&pio {
+	gmac_power_pin_bananapi: gmac_power_pin@0 {
+		allwinner,pins = "PH23";
+		allwinner,function = "gpio_out";
+		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+	};
+
+	led_pins_bananapi: led_pins@0 {
+		allwinner,pins = "PH24", "PG2";
+		allwinner,function = "gpio_out";
+		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+	};
+
+	mmc0_cd_pin_bananapi: mmc0_cd_pin@0 {
+		allwinner,pins = "PH10";
+		allwinner,function = "gpio_in";
+		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+	};
+
+	usb1_vbus_pin_bananapi: usb1_vbus_pin@0 {
+		allwinner,pins = "PH0";
+		allwinner,function = "gpio_out";
+		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+	};
+
+	usb2_vbus_pin_bananapi: usb2_vbus_pin@0 {
+		allwinner,pins = "PH1";
+		allwinner,function = "gpio_out";
+		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+	};
+
+	vmmc3_pin_bananapi: vmmc3_pin@0 {
+		allwinner,pins = "PH22";
+		allwinner,function = "gpio_out";
+		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+	};
+};
+
+&reg_usb1_vbus {
+	pinctrl-0 = <&usb1_vbus_pin_bananapi>;
+	gpio = <&pio 7 0 GPIO_ACTIVE_HIGH>; /* PH0 */
+	status = "okay";
+};
+
+&reg_usb2_vbus {
+	pinctrl-0 = <&usb2_vbus_pin_bananapi>;
+	gpio = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
+	status = "okay";
+};
+
+&uart0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart0_pins_a>;
+	status = "okay";
+};
+
+&usbphy {
+	usb1_vbus-supply = <&reg_usb1_vbus>;
+	usb2_vbus-supply = <&reg_usb2_vbus>;
+	status = "okay";
+};
-- 
2.8.3

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

* Re: [PATCH] ARM: dts: sun7i: Add dts file for Bananapi M1 Plus board
  2016-05-30 12:30 [PATCH] ARM: dts: sun7i: Add dts file for Bananapi M1 Plus board luoyi.ly
@ 2016-05-30 19:43 ` Maxime Ripard
  2016-05-30 20:26   ` [linux-sunxi] " Bernhard Nortmann
  2016-05-31  3:03   ` Chen-Yu Tsai
  0 siblings, 2 replies; 8+ messages in thread
From: Maxime Ripard @ 2016-05-30 19:43 UTC (permalink / raw)
  To: luoyi.ly
  Cc: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, linux,
	wens, devicetree, linux-arm-kernel, linux-kernel, linux-sunxi

[-- Attachment #1: Type: text/plain, Size: 9614 bytes --]

Hi,

On Mon, May 30, 2016 at 08:30:13PM +0800, luoyi.ly@gmail.com wrote:
> From: luoyi <luoyi.ly@gmail.com>
> 
> Add support for the Bananapi M1 Plus A20 development board from sinovoip.com.cn .
> This board features 1G RAM, 2 USB A receptacles, 1 micro USB receptacle for
> OTG, 1 micro USB receptacle for power, HDMI, sata, Gbit ethernet, ir receiver,
> 3.5 mm jack for stero sound out, on board microphone, 40 gpio pins and sdio wifi.

What is the difference between the M1+ and the M1?

> 
> Signed-off-by: Luo Yi <luoyi.ly@gmail.com>
> ---
>  arch/arm/boot/dts/Makefile                       |   1 +
>  arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 270 +++++++++++++++++++++++
>  2 files changed, 271 insertions(+)
>  create mode 100644 arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
> 
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index e06a5ab..fde407f 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -685,6 +685,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
>  	sun6i-a31s-yones-toptech-bs1078-v2.dtb
>  dtb-$(CONFIG_MACH_SUN7I) += \
>  	sun7i-a20-bananapi.dtb \
> +	sun7i-a20-bananapi-m1-plus.dtb \
>  	sun7i-a20-bananapro.dtb \
>  	sun7i-a20-cubieboard2.dtb \
>  	sun7i-a20-cubietruck.dtb \
> diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
> new file mode 100644
> index 0000000..b62fc1d
> --- /dev/null
> +++ b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
> @@ -0,0 +1,270 @@
> +/*
> + * Copyright 2016 Luo Yi <luoyi.ly@gmail.com>
> + * 
> + * Thanks to the original work by Hans de Goede <hdegoede@redhat.com>
> + *
> + * 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/arm-gic.h>
> +
> +/ {
> +	model = "Banana Pi BPI-M1-Plus";
> +	compatible = "sinovoip,bpi-m1-plus", "allwinner,sun7i-a20";
> +
> +	aliases {
> +		serial0 = &uart0;
> +	};
> +
> +	chosen {
> +		stdout-path = "serial0:115200n8";
> +	};
> +
> +	leds {
> +		compatible = "gpio-leds";
> +		pinctrl-names = "default";
> +		pinctrl-0 = <&led_pins_bananapi>;
> +
> +		red {
> +			label = "bananapi:red:usr";

The first part the label is the board name, in that case that would be
bananapi-m1-plus.

> +			gpios = <&pio 7 25 GPIO_ACTIVE_HIGH>;
> +			linux,default-trigger = "default-on";

So that's the power led?

> +		};
> +
> +		green {
> +			label = "bananapi:green:usr";
> +			gpios = <&pio 7 24 GPIO_ACTIVE_HIGH>;
> +			linux,default-trigger = "heartbeat";

We don't enforce any trigger by default.

> +
> +		};
> +	};
> +
> +	reg_gmac_3v3: gmac-3v3 {
> +		compatible = "regulator-fixed";
> +		pinctrl-names = "default";
> +		pinctrl-0 = <&gmac_power_pin_bananapi>;
> +		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>;
> +	};
> +
> +	reg_vmmc3: vmmc3 {
> +		compatible = "regulator-fixed";
> +		pinctrl-names = "default";
> +		pinctrl-0 = <&vmmc3_pin_bananapi>;
> +		regulator-name = "vmmc3";
> +		regulator-min-microvolt = <3300000>;
> +		regulator-max-microvolt = <3300000>;
> +		regulator-always-on;
> +		regulator-boot-on;
> +		enable-active-high;
> +		gpio = <&pio 7 22 GPIO_ACTIVE_HIGH>;
> +	};

You can use reg_vcc3v3 from sunxi-common-regulators.dtsi.

> +
> +};
> +
> +&ahci {
> +	status = "okay";
> +};
> +
> +&codec {
> +	status = "okay";
> +};
> +
> +&ehci0 {
> +	status = "okay";
> +};
> +
> +&ehci1 {
> +	status = "okay";
> +};
> +
> +&ohci0 {
> +	status = "okay";
> +};
> +
> +&ohci1 {
> +	status = "okay";
> +};

Please order your nodes alphabetically.

> +
> +&gmac {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&gmac_pins_rgmii_a>;
> +	phy = <&phy1>;
> +	phy-mode = "rgmii";
> +	phy-supply = <&reg_gmac_3v3>;
> +	status = "okay";
> +
> +	phy1: ethernet-phy@1 {
> +		reg = <1>;
> +	};
> +};
> +
> +&i2c0 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&i2c0_pins_a>;
> +	status = "okay";
> +
> +	axp209: pmic@34 {
> +		compatible = "x-powers,axp209";
> +		reg = <0x34>;
> +		interrupt-parent = <&nmi_intc>;
> +		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
> +
> +		interrupt-controller;
> +		#interrupt-cells = <1>;
> +	};
> +};
> +
> +&ir0 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&ir0_rx_pins_a>;
> +	status = "okay";
> +};
> +
> +&mmc0 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapi>;
> +	vmmc-supply = <&reg_vcc3v3>;
> +	bus-width = <4>;
> +	cd-gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; /* PH10 */
> +	cd-inverted;
> +	status = "okay";
> +};
> +
> +&mmc3 {
> +	#address-cells = <1>;
> +	#size-cells = <0>;
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&mmc3_pins_a>;
> +	vmmc-supply = <&reg_vmmc3>;
> +	bus-width = <4>;
> +	non-removable;
> +	enable-sdio-wakeup;
> +	status = "okay";
> +
> +	brcmf: bcrmf@1 {
> +		reg = <1>;
> +		compatible = "brcm,bcm4329-fmac";
> +		interrupt-parent = <&pio>;
> +		interrupts = <7 15 IRQ_TYPE_LEVEL_LOW>; 
> +		interrupt-names = "host-wake";
> +	};
> +
> +};
> +
> +&mmc3_pins_a {
> +    /* AP6210 requires pull-up */
> +	allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
> +};
> +
> +&pio {
> +	gmac_power_pin_bananapi: gmac_power_pin@0 {
> +		allwinner,pins = "PH23";
> +		allwinner,function = "gpio_out";
> +		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> +		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> +	};
> +
> +	led_pins_bananapi: led_pins@0 {
> +		allwinner,pins = "PH24", "PG2";
> +		allwinner,function = "gpio_out";
> +		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> +		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> +	};
> +
> +	mmc0_cd_pin_bananapi: mmc0_cd_pin@0 {
> +		allwinner,pins = "PH10";
> +		allwinner,function = "gpio_in";
> +		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> +		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
> +	};
> +
> +	usb1_vbus_pin_bananapi: usb1_vbus_pin@0 {
> +		allwinner,pins = "PH0";
> +		allwinner,function = "gpio_out";
> +		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> +		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> +	};
> +
> +	usb2_vbus_pin_bananapi: usb2_vbus_pin@0 {
> +		allwinner,pins = "PH1";
> +		allwinner,function = "gpio_out";
> +		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> +		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> +	};
> +
> +	vmmc3_pin_bananapi: vmmc3_pin@0 {
> +		allwinner,pins = "PH22";
> +		allwinner,function = "gpio_out";
> +		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> +		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> +	};
> +};
> +
> +&reg_usb1_vbus {
> +	pinctrl-0 = <&usb1_vbus_pin_bananapi>;
> +	gpio = <&pio 7 0 GPIO_ACTIVE_HIGH>; /* PH0 */
> +	status = "okay";
> +};
> +
> +&reg_usb2_vbus {
> +	pinctrl-0 = <&usb2_vbus_pin_bananapi>;
> +	gpio = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
> +	status = "okay";
> +};
> +
> +&uart0 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&uart0_pins_a>;
> +	status = "okay";
> +};
> +
> +&usbphy {
> +	usb1_vbus-supply = <&reg_usb1_vbus>;
> +	usb2_vbus-supply = <&reg_usb2_vbus>;
> +	status = "okay";
> +};
> -- 
> 2.8.3
>

Thanks!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

* Re: [linux-sunxi] Re: [PATCH] ARM: dts: sun7i: Add dts file for Bananapi M1 Plus board
  2016-05-30 19:43 ` Maxime Ripard
@ 2016-05-30 20:26   ` Bernhard Nortmann
  2016-05-31 17:09     ` Maxime Ripard
  2016-05-31  3:03   ` Chen-Yu Tsai
  1 sibling, 1 reply; 8+ messages in thread
From: Bernhard Nortmann @ 2016-05-30 20:26 UTC (permalink / raw)
  To: maxime.ripard, luoyi.ly
  Cc: linux, wens, devicetree, linux-arm-kernel, linux-kernel, linux-sunxi

Am 30.05.2016 um 21:43 schrieb Maxime Ripard:
> Hi,
>
> On Mon, May 30, 2016 at 08:30:13PM +0800, luoyi.ly@gmail.com wrote:
>> From: luoyi <luoyi.ly@gmail.com>
>>
>> Add support for the Bananapi M1 Plus A20 development board from sinovoip.com.cn .
>> This board features 1G RAM, 2 USB A receptacles, 1 micro USB receptacle for
>> OTG, 1 micro USB receptacle for power, HDMI, sata, Gbit ethernet, ir receiver,
>> 3.5 mm jack for stero sound out, on board microphone, 40 gpio pins and sdio wifi.
> What is the difference between the M1+ and the M1?

The M1+ is an updated version of the original Banana Pi. If you're 
interested
in the details, have a look at http://linux-sunxi.org/Banana_Pi#Variants .
"BPi-M1+" is SinoVoip's counterpart of LeMaker's "Banana Pro", for which 
a .dts
already exists. Judging from .fex files, only a single pin assignment 
seems to
differ between the two (audio_pa_ctrl, PH26 vs. PH15).

Regards, B. Nortmann

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

* Re: [PATCH] ARM: dts: sun7i: Add dts file for Bananapi M1 Plus board
  2016-05-30 19:43 ` Maxime Ripard
  2016-05-30 20:26   ` [linux-sunxi] " Bernhard Nortmann
@ 2016-05-31  3:03   ` Chen-Yu Tsai
  1 sibling, 0 replies; 8+ messages in thread
From: Chen-Yu Tsai @ 2016-05-31  3:03 UTC (permalink / raw)
  To: 罗翼
  Cc: Maxime Ripard, Rob Herring, Pawel Moll, Mark Rutland,
	Ian Campbell, Kumar Gala, Russell King - ARM Linux, Chen-Yu Tsai,
	devicetree, linux-arm-kernel, linux-kernel, linux-sunxi

Hi,

On Tue, May 31, 2016 at 3:43 AM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> Hi,
>
> On Mon, May 30, 2016 at 08:30:13PM +0800, luoyi.ly@gmail.com wrote:
>> From: luoyi <luoyi.ly@gmail.com>
>>
>> Add support for the Bananapi M1 Plus A20 development board from sinovoip.com.cn .
>> This board features 1G RAM, 2 USB A receptacles, 1 micro USB receptacle for
>> OTG, 1 micro USB receptacle for power, HDMI, sata, Gbit ethernet, ir receiver,
>> 3.5 mm jack for stero sound out, on board microphone, 40 gpio pins and sdio wifi.
>
> What is the difference between the M1+ and the M1?
>
>>
>> Signed-off-by: Luo Yi <luoyi.ly@gmail.com>
>> ---
>>  arch/arm/boot/dts/Makefile                       |   1 +
>>  arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 270 +++++++++++++++++++++++
>>  2 files changed, 271 insertions(+)
>>  create mode 100644 arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
>>
>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>> index e06a5ab..fde407f 100644
>> --- a/arch/arm/boot/dts/Makefile
>> +++ b/arch/arm/boot/dts/Makefile
>> @@ -685,6 +685,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
>>       sun6i-a31s-yones-toptech-bs1078-v2.dtb
>>  dtb-$(CONFIG_MACH_SUN7I) += \
>>       sun7i-a20-bananapi.dtb \
>> +     sun7i-a20-bananapi-m1-plus.dtb \
>>       sun7i-a20-bananapro.dtb \
>>       sun7i-a20-cubieboard2.dtb \
>>       sun7i-a20-cubietruck.dtb \
>> diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
>> new file mode 100644
>> index 0000000..b62fc1d
>> --- /dev/null
>> +++ b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
>> @@ -0,0 +1,270 @@
>> +/*
>> + * Copyright 2016 Luo Yi <luoyi.ly@gmail.com>
>> + *
>> + * Thanks to the original work by Hans de Goede <hdegoede@redhat.com>
>> + *
>> + * 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/arm-gic.h>
>> +
>> +/ {
>> +     model = "Banana Pi BPI-M1-Plus";
>> +     compatible = "sinovoip,bpi-m1-plus", "allwinner,sun7i-a20";
>> +
>> +     aliases {
>> +             serial0 = &uart0;
>> +     };
>> +
>> +     chosen {
>> +             stdout-path = "serial0:115200n8";
>> +     };
>> +
>> +     leds {
>> +             compatible = "gpio-leds";
>> +             pinctrl-names = "default";
>> +             pinctrl-0 = <&led_pins_bananapi>;
>> +
>> +             red {
>> +                     label = "bananapi:red:usr";
>
> The first part the label is the board name, in that case that would be
> bananapi-m1-plus.
>
>> +                     gpios = <&pio 7 25 GPIO_ACTIVE_HIGH>;
>> +                     linux,default-trigger = "default-on";
>
> So that's the power led?
>
>> +             };
>> +
>> +             green {
>> +                     label = "bananapi:green:usr";
>> +                     gpios = <&pio 7 24 GPIO_ACTIVE_HIGH>;
>> +                     linux,default-trigger = "heartbeat";
>
> We don't enforce any trigger by default.
>
>> +
>> +             };
>> +     };
>> +
>> +     reg_gmac_3v3: gmac-3v3 {
>> +             compatible = "regulator-fixed";
>> +             pinctrl-names = "default";
>> +             pinctrl-0 = <&gmac_power_pin_bananapi>;
>> +             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>;
>> +     };
>> +
>> +     reg_vmmc3: vmmc3 {
>> +             compatible = "regulator-fixed";
>> +             pinctrl-names = "default";
>> +             pinctrl-0 = <&vmmc3_pin_bananapi>;
>> +             regulator-name = "vmmc3";
>> +             regulator-min-microvolt = <3300000>;
>> +             regulator-max-microvolt = <3300000>;
>> +             regulator-always-on;
>> +             regulator-boot-on;
>> +             enable-active-high;
>> +             gpio = <&pio 7 22 GPIO_ACTIVE_HIGH>;
>> +     };
>
> You can use reg_vcc3v3 from sunxi-common-regulators.dtsi.

This is a GPIO controlled one, not just a fixed regulator.

However, this is a misrepresentation of what is on the board.

PH22 here is connected to the REG_ON pin on the WiFi chip.
So either you represent this as a GPIO toggled fixed
regulator with a source from reg_vcc3v3, and use this as
vmmc on mmc3. Or you use the pwrseq_simple bindings for
this.


ChenYu

>
>> +
>> +};
>> +
>> +&ahci {
>> +     status = "okay";
>> +};
>> +
>> +&codec {
>> +     status = "okay";
>> +};
>> +
>> +&ehci0 {
>> +     status = "okay";
>> +};
>> +
>> +&ehci1 {
>> +     status = "okay";
>> +};
>> +
>> +&ohci0 {
>> +     status = "okay";
>> +};
>> +
>> +&ohci1 {
>> +     status = "okay";
>> +};
>
> Please order your nodes alphabetically.
>
>> +
>> +&gmac {
>> +     pinctrl-names = "default";
>> +     pinctrl-0 = <&gmac_pins_rgmii_a>;
>> +     phy = <&phy1>;
>> +     phy-mode = "rgmii";
>> +     phy-supply = <&reg_gmac_3v3>;
>> +     status = "okay";
>> +
>> +     phy1: ethernet-phy@1 {
>> +             reg = <1>;
>> +     };
>> +};
>> +
>> +&i2c0 {
>> +     pinctrl-names = "default";
>> +     pinctrl-0 = <&i2c0_pins_a>;
>> +     status = "okay";
>> +
>> +     axp209: pmic@34 {
>> +             compatible = "x-powers,axp209";
>> +             reg = <0x34>;
>> +             interrupt-parent = <&nmi_intc>;
>> +             interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
>> +
>> +             interrupt-controller;
>> +             #interrupt-cells = <1>;
>> +     };
>> +};
>> +
>> +&ir0 {
>> +     pinctrl-names = "default";
>> +     pinctrl-0 = <&ir0_rx_pins_a>;
>> +     status = "okay";
>> +};
>> +
>> +&mmc0 {
>> +     pinctrl-names = "default";
>> +     pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapi>;
>> +     vmmc-supply = <&reg_vcc3v3>;
>> +     bus-width = <4>;
>> +     cd-gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; /* PH10 */
>> +     cd-inverted;
>> +     status = "okay";
>> +};
>> +
>> +&mmc3 {
>> +     #address-cells = <1>;
>> +     #size-cells = <0>;
>> +     pinctrl-names = "default";
>> +     pinctrl-0 = <&mmc3_pins_a>;
>> +     vmmc-supply = <&reg_vmmc3>;
>> +     bus-width = <4>;
>> +     non-removable;
>> +     enable-sdio-wakeup;
>> +     status = "okay";
>> +
>> +     brcmf: bcrmf@1 {
>> +             reg = <1>;
>> +             compatible = "brcm,bcm4329-fmac";
>> +             interrupt-parent = <&pio>;
>> +             interrupts = <7 15 IRQ_TYPE_LEVEL_LOW>;
>> +             interrupt-names = "host-wake";
>> +     };
>> +
>> +};
>> +
>> +&mmc3_pins_a {
>> +    /* AP6210 requires pull-up */
>> +     allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
>> +};
>> +
>> +&pio {
>> +     gmac_power_pin_bananapi: gmac_power_pin@0 {
>> +             allwinner,pins = "PH23";
>> +             allwinner,function = "gpio_out";
>> +             allwinner,drive = <SUN4I_PINCTRL_10_MA>;
>> +             allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
>> +     };
>> +
>> +     led_pins_bananapi: led_pins@0 {
>> +             allwinner,pins = "PH24", "PG2";
>> +             allwinner,function = "gpio_out";
>> +             allwinner,drive = <SUN4I_PINCTRL_10_MA>;
>> +             allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
>> +     };
>> +
>> +     mmc0_cd_pin_bananapi: mmc0_cd_pin@0 {
>> +             allwinner,pins = "PH10";
>> +             allwinner,function = "gpio_in";
>> +             allwinner,drive = <SUN4I_PINCTRL_10_MA>;
>> +             allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
>> +     };
>> +
>> +     usb1_vbus_pin_bananapi: usb1_vbus_pin@0 {
>> +             allwinner,pins = "PH0";
>> +             allwinner,function = "gpio_out";
>> +             allwinner,drive = <SUN4I_PINCTRL_10_MA>;
>> +             allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
>> +     };
>> +
>> +     usb2_vbus_pin_bananapi: usb2_vbus_pin@0 {
>> +             allwinner,pins = "PH1";
>> +             allwinner,function = "gpio_out";
>> +             allwinner,drive = <SUN4I_PINCTRL_10_MA>;
>> +             allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
>> +     };
>> +
>> +     vmmc3_pin_bananapi: vmmc3_pin@0 {
>> +             allwinner,pins = "PH22";
>> +             allwinner,function = "gpio_out";
>> +             allwinner,drive = <SUN4I_PINCTRL_10_MA>;
>> +             allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
>> +     };
>> +};
>> +
>> +&reg_usb1_vbus {
>> +     pinctrl-0 = <&usb1_vbus_pin_bananapi>;
>> +     gpio = <&pio 7 0 GPIO_ACTIVE_HIGH>; /* PH0 */
>> +     status = "okay";
>> +};
>> +
>> +&reg_usb2_vbus {
>> +     pinctrl-0 = <&usb2_vbus_pin_bananapi>;
>> +     gpio = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
>> +     status = "okay";
>> +};
>> +
>> +&uart0 {
>> +     pinctrl-names = "default";
>> +     pinctrl-0 = <&uart0_pins_a>;
>> +     status = "okay";
>> +};
>> +
>> +&usbphy {
>> +     usb1_vbus-supply = <&reg_usb1_vbus>;
>> +     usb2_vbus-supply = <&reg_usb2_vbus>;
>> +     status = "okay";
>> +};
>> --
>> 2.8.3
>>
>
> Thanks!
> Maxime
>
> --
> Maxime Ripard, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com

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

* Re: [linux-sunxi] Re: [PATCH] ARM: dts: sun7i: Add dts file for Bananapi M1 Plus board
  2016-05-30 20:26   ` [linux-sunxi] " Bernhard Nortmann
@ 2016-05-31 17:09     ` Maxime Ripard
  2016-06-01  2:40       ` luoyi
  0 siblings, 1 reply; 8+ messages in thread
From: Maxime Ripard @ 2016-05-31 17:09 UTC (permalink / raw)
  To: Bernhard Nortmann
  Cc: luoyi.ly, linux, wens, devicetree, linux-arm-kernel,
	linux-kernel, linux-sunxi

[-- Attachment #1: Type: text/plain, Size: 1295 bytes --]

On Mon, May 30, 2016 at 10:26:21PM +0200, Bernhard Nortmann wrote:
> Am 30.05.2016 um 21:43 schrieb Maxime Ripard:
> >Hi,
> >
> >On Mon, May 30, 2016 at 08:30:13PM +0800, luoyi.ly@gmail.com wrote:
> >>From: luoyi <luoyi.ly@gmail.com>
> >>
> >>Add support for the Bananapi M1 Plus A20 development board from sinovoip.com.cn .
> >>This board features 1G RAM, 2 USB A receptacles, 1 micro USB receptacle for
> >>OTG, 1 micro USB receptacle for power, HDMI, sata, Gbit ethernet, ir receiver,
> >>3.5 mm jack for stero sound out, on board microphone, 40 gpio pins and sdio wifi.
> >What is the difference between the M1+ and the M1?
> 
> The M1+ is an updated version of the original Banana Pi. If you're
> interested in the details, have a look at
> http://linux-sunxi.org/Banana_Pi#Variants .  "BPi-M1+" is SinoVoip's
> counterpart of LeMaker's "Banana Pro", for which a .dts already
> exists. Judging from .fex files, only a single pin assignment seems
> to differ between the two (audio_pa_ctrl, PH26 vs. PH15).

Gee, that's confusing :)

I guess we should just include the banana pro DTB and change that pin
(and the i2s pins Luo was mentionning).

Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

* Re: [linux-sunxi] Re: [PATCH] ARM: dts: sun7i: Add dts file for Bananapi M1 Plus board
  2016-05-31 17:09     ` Maxime Ripard
@ 2016-06-01  2:40       ` luoyi
  2016-06-01 17:58         ` Maxime Ripard
  2016-06-16  7:13         ` Chen-Yu Tsai
  0 siblings, 2 replies; 8+ messages in thread
From: luoyi @ 2016-06-01  2:40 UTC (permalink / raw)
  To: Maxime Ripard
  Cc: Bernhard Nortmann, linux, Chen-Yu Tsai, devicetree,
	linux-arm-kernel, linux-kernel, linux-sunxi

This is the new version of the patch.  and I think maybe every board
should have their own dtb files. and we can you some cpp  macro tricks
to merge their coressponding dts file.

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index e06a5ab..fde407f 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -685,6 +685,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
     sun6i-a31s-yones-toptech-bs1078-v2.dtb
 dtb-$(CONFIG_MACH_SUN7I) += \
     sun7i-a20-bananapi.dtb \
+    sun7i-a20-bananapi-m1-plus.dtb \
     sun7i-a20-bananapro.dtb \
     sun7i-a20-cubieboard2.dtb \
     sun7i-a20-cubietruck.dtb \
diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
new file mode 100644
index 0000000..548ed31
--- /dev/null
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
@@ -0,0 +1,266 @@
+/*
+ * Copyright 2016 Luo Yi <luoyi.ly@gmail.com>
+ *
+ * Thanks to the original work by Hans de Goede <hdegoede@redhat.com>
+ *
+ * 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/arm-gic.h>
+
+/ {
+    model = "Banana Pi BPI-M1-Plus";
+    compatible = "sinovoip,bpi-m1-plus", "allwinner,sun7i-a20";
+
+    aliases {
+        serial0 = &uart0;
+    };
+
+    chosen {
+        stdout-path = "serial0:115200n8";
+    };
+
+    leds {
+        compatible = "gpio-leds";
+        pinctrl-names = "default";
+        pinctrl-0 = <&led_pins_bananapi>;
+
+        green {
+            label = "bananapi:green:usr";
+            gpios = <&pio 7 24 GPIO_ACTIVE_HIGH>;
+        };
+
+        red {
+            label = "bananapi:red:usr";
+            gpios = <&pio 7 25 GPIO_ACTIVE_HIGH>;
+            linux,default-trigger = "default-on";
+        };
+
+    };
+
+    mmc3_pwrseq: mmc3_pwrseq {
+        compatible = "mmc-pwrseq-simple";
+        pinctrl-names = "default";
+        pinctrl-0 = <&mmc3_pwrseq_pin_bananapim1plus>;
+        reset-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 WL-PMU-EN */
+    };
+
+    reg_gmac_3v3: gmac-3v3 {
+        compatible = "regulator-fixed";
+        pinctrl-names = "default";
+        pinctrl-0 = <&gmac_power_pin_bananapi>;
+        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>;
+    };
+
+};
+
+&ahci {
+    status = "okay";
+};
+
+&codec {
+    status = "okay";
+};
+
+&ehci0 {
+    status = "okay";
+};
+
+&ehci1 {
+    status = "okay";
+};
+
+&gmac {
+    pinctrl-names = "default";
+    pinctrl-0 = <&gmac_pins_rgmii_a>;
+    phy = <&phy1>;
+    phy-mode = "rgmii";
+    phy-supply = <&reg_gmac_3v3>;
+    status = "okay";
+
+    phy1: ethernet-phy@1 {
+        reg = <1>;
+    };
+};
+
+&i2c0 {
+    pinctrl-names = "default";
+    pinctrl-0 = <&i2c0_pins_a>;
+    status = "okay";
+
+    axp209: pmic@34 {
+        compatible = "x-powers,axp209";
+        reg = <0x34>;
+        interrupt-parent = <&nmi_intc>;
+        interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+
+        interrupt-controller;
+        #interrupt-cells = <1>;
+    };
+};
+
+&ir0 {
+    pinctrl-names = "default";
+    pinctrl-0 = <&ir0_rx_pins_a>;
+    status = "okay";
+};
+
+&mmc0 {
+    pinctrl-names = "default";
+    pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapi>;
+    vmmc-supply = <&reg_vcc3v3>;
+    bus-width = <4>;
+    cd-gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; /* PH10 */
+    cd-inverted;
+    status = "okay";
+};
+
+&mmc3 {
+
+    #address-cells = <1>;
+    #size-cells = <0>;
+    pinctrl-names = "default";
+    pinctrl-0 = <&mmc3_pins_a>;
+    vmmc-supply = <&reg_vcc3v3>;
+    mmc-pwrseq = <&mmc3_pwrseq>;
+    bus-width = <4>;
+    non-removable;
+    enable-sdio-wakeup;
+    status = "okay";
+
+    brcmf: bcrmf@1 {
+        reg = <1>;
+        compatible = "brcm,bcm4329-fmac";
+        interrupt-parent = <&pio>;
+        interrupts = <7 15 IRQ_TYPE_LEVEL_LOW>;
+        interrupt-names = "host-wake";
+    };
+
+};
+
+&mmc3_pins_a {
+    /* AP6210 requires pull-up */
+    allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+};
+
+&ohci0 {
+    status = "okay";
+};
+
+&ohci1 {
+    status = "okay";
+};
+
+&pio {
+    gmac_power_pin_bananapi: gmac_power_pin@0 {
+        allwinner,pins = "PH23";
+        allwinner,function = "gpio_out";
+        allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+        allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+    };
+
+    led_pins_bananapi: led_pins@0 {
+        allwinner,pins = "PH24", "PG2";
+        allwinner,function = "gpio_out";
+        allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+        allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+    };
+
+    mmc0_cd_pin_bananapi: mmc0_cd_pin@0 {
+        allwinner,pins = "PH10";
+        allwinner,function = "gpio_in";
+        allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+        allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+    };
+
+    mmc3_pwrseq_pin_bananapim1plus: mmc3_pwrseq_pin@0 {
+        allwinner,pins = "PH22";
+        allwinner,function = "gpio_out";
+        allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+        allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+    };
+
+    usb1_vbus_pin_bananapi: usb1_vbus_pin@0 {
+        allwinner,pins = "PH0";
+        allwinner,function = "gpio_out";
+        allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+        allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+    };
+
+    usb2_vbus_pin_bananapi: usb2_vbus_pin@0 {
+        allwinner,pins = "PH1";
+        allwinner,function = "gpio_out";
+        allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+        allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+    };
+
+};
+
+&reg_usb1_vbus {
+    pinctrl-0 = <&usb1_vbus_pin_bananapi>;
+    gpio = <&pio 7 0 GPIO_ACTIVE_HIGH>; /* PH0 */
+    status = "okay";
+};
+
+&reg_usb2_vbus {
+    pinctrl-0 = <&usb2_vbus_pin_bananapi>;
+    gpio = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
+    status = "okay";
+};
+
+&uart0 {
+    pinctrl-names = "default";
+    pinctrl-0 = <&uart0_pins_a>;
+    status = "okay";
+};
+
+&usbphy {
+    usb1_vbus-supply = <&reg_usb1_vbus>;
+    usb2_vbus-supply = <&reg_usb2_vbus>;
+    status = "okay";
+};

2016-06-01 1:09 GMT+08:00 Maxime Ripard <maxime.ripard@free-electrons.com>:
> On Mon, May 30, 2016 at 10:26:21PM +0200, Bernhard Nortmann wrote:
>> Am 30.05.2016 um 21:43 schrieb Maxime Ripard:
>> >Hi,
>> >
>> >On Mon, May 30, 2016 at 08:30:13PM +0800, luoyi.ly@gmail.com wrote:
>> >>From: luoyi <luoyi.ly@gmail.com>
>> >>
>> >>Add support for the Bananapi M1 Plus A20 development board from sinovoip.com.cn .
>> >>This board features 1G RAM, 2 USB A receptacles, 1 micro USB receptacle for
>> >>OTG, 1 micro USB receptacle for power, HDMI, sata, Gbit ethernet, ir receiver,
>> >>3.5 mm jack for stero sound out, on board microphone, 40 gpio pins and sdio wifi.
>> >What is the difference between the M1+ and the M1?
>>
>> The M1+ is an updated version of the original Banana Pi. If you're
>> interested in the details, have a look at
>> http://linux-sunxi.org/Banana_Pi#Variants .  "BPi-M1+" is SinoVoip's
>> counterpart of LeMaker's "Banana Pro", for which a .dts already
>> exists. Judging from .fex files, only a single pin assignment seems
>> to differ between the two (audio_pa_ctrl, PH26 vs. PH15).
>
> Gee, that's confusing :)
>
> I guess we should just include the banana pro DTB and change that pin
> (and the i2s pins Luo was mentionning).
>
> Maxime
>
> --
> Maxime Ripard, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com

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

* Re: [linux-sunxi] Re: [PATCH] ARM: dts: sun7i: Add dts file for Bananapi M1 Plus board
  2016-06-01  2:40       ` luoyi
@ 2016-06-01 17:58         ` Maxime Ripard
  2016-06-16  7:13         ` Chen-Yu Tsai
  1 sibling, 0 replies; 8+ messages in thread
From: Maxime Ripard @ 2016-06-01 17:58 UTC (permalink / raw)
  To: luoyi
  Cc: Bernhard Nortmann, linux, Chen-Yu Tsai, devicetree,
	linux-arm-kernel, linux-kernel, linux-sunxi

[-- Attachment #1: Type: text/plain, Size: 9466 bytes --]

Hi,

On Wed, Jun 01, 2016 at 10:40:18AM +0800, luoyi wrote:
> This is the new version of the patch.  and I think maybe every board
> should have their own dtb files. and we can you some cpp  macro tricks
> to merge their coressponding dts file.

Please submit it as a new patch with send-email, with the version
(using the -v option) and a log of your changes.

> 
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index e06a5ab..fde407f 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -685,6 +685,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
>      sun6i-a31s-yones-toptech-bs1078-v2.dtb
>  dtb-$(CONFIG_MACH_SUN7I) += \
>      sun7i-a20-bananapi.dtb \
> +    sun7i-a20-bananapi-m1-plus.dtb \
>      sun7i-a20-bananapro.dtb \
>      sun7i-a20-cubieboard2.dtb \
>      sun7i-a20-cubietruck.dtb \
> diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
> b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
> new file mode 100644
> index 0000000..548ed31
> --- /dev/null
> +++ b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
> @@ -0,0 +1,266 @@
> +/*
> + * Copyright 2016 Luo Yi <luoyi.ly@gmail.com>
> + *
> + * Thanks to the original work by Hans de Goede <hdegoede@redhat.com>
> + *
> + * 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/arm-gic.h>
> +
> +/ {
> +    model = "Banana Pi BPI-M1-Plus";
> +    compatible = "sinovoip,bpi-m1-plus", "allwinner,sun7i-a20";
> +
> +    aliases {
> +        serial0 = &uart0;
> +    };
> +
> +    chosen {
> +        stdout-path = "serial0:115200n8";
> +    };
> +
> +    leds {
> +        compatible = "gpio-leds";
> +        pinctrl-names = "default";
> +        pinctrl-0 = <&led_pins_bananapi>;
> +
> +        green {
> +            label = "bananapi:green:usr";
> +            gpios = <&pio 7 24 GPIO_ACTIVE_HIGH>;
> +        };
> +
> +        red {
> +            label = "bananapi:red:usr";
> +            gpios = <&pio 7 25 GPIO_ACTIVE_HIGH>;
> +            linux,default-trigger = "default-on";
> +        };
> +
> +    };
> +
> +    mmc3_pwrseq: mmc3_pwrseq {
> +        compatible = "mmc-pwrseq-simple";
> +        pinctrl-names = "default";
> +        pinctrl-0 = <&mmc3_pwrseq_pin_bananapim1plus>;
> +        reset-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 WL-PMU-EN */
> +    };
> +
> +    reg_gmac_3v3: gmac-3v3 {
> +        compatible = "regulator-fixed";
> +        pinctrl-names = "default";
> +        pinctrl-0 = <&gmac_power_pin_bananapi>;
> +        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>;
> +    };
> +
> +};
> +
> +&ahci {
> +    status = "okay";
> +};
> +
> +&codec {
> +    status = "okay";
> +};
> +
> +&ehci0 {
> +    status = "okay";
> +};
> +
> +&ehci1 {
> +    status = "okay";
> +};
> +
> +&gmac {
> +    pinctrl-names = "default";
> +    pinctrl-0 = <&gmac_pins_rgmii_a>;
> +    phy = <&phy1>;
> +    phy-mode = "rgmii";
> +    phy-supply = <&reg_gmac_3v3>;
> +    status = "okay";
> +
> +    phy1: ethernet-phy@1 {
> +        reg = <1>;
> +    };
> +};
> +
> +&i2c0 {
> +    pinctrl-names = "default";
> +    pinctrl-0 = <&i2c0_pins_a>;
> +    status = "okay";
> +
> +    axp209: pmic@34 {
> +        compatible = "x-powers,axp209";
> +        reg = <0x34>;
> +        interrupt-parent = <&nmi_intc>;
> +        interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
> +
> +        interrupt-controller;
> +        #interrupt-cells = <1>;
> +    };
> +};
> +
> +&ir0 {
> +    pinctrl-names = "default";
> +    pinctrl-0 = <&ir0_rx_pins_a>;
> +    status = "okay";
> +};
> +
> +&mmc0 {
> +    pinctrl-names = "default";
> +    pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapi>;
> +    vmmc-supply = <&reg_vcc3v3>;
> +    bus-width = <4>;
> +    cd-gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; /* PH10 */
> +    cd-inverted;
> +    status = "okay";
> +};
> +
> +&mmc3 {
> +
> +    #address-cells = <1>;
> +    #size-cells = <0>;
> +    pinctrl-names = "default";
> +    pinctrl-0 = <&mmc3_pins_a>;
> +    vmmc-supply = <&reg_vcc3v3>;
> +    mmc-pwrseq = <&mmc3_pwrseq>;
> +    bus-width = <4>;
> +    non-removable;
> +    enable-sdio-wakeup;
> +    status = "okay";
> +
> +    brcmf: bcrmf@1 {
> +        reg = <1>;
> +        compatible = "brcm,bcm4329-fmac";
> +        interrupt-parent = <&pio>;
> +        interrupts = <7 15 IRQ_TYPE_LEVEL_LOW>;
> +        interrupt-names = "host-wake";
> +    };
> +
> +};
> +
> +&mmc3_pins_a {
> +    /* AP6210 requires pull-up */
> +    allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
> +};
> +
> +&ohci0 {
> +    status = "okay";
> +};
> +
> +&ohci1 {
> +    status = "okay";
> +};
> +
> +&pio {
> +    gmac_power_pin_bananapi: gmac_power_pin@0 {
> +        allwinner,pins = "PH23";
> +        allwinner,function = "gpio_out";
> +        allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> +        allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> +    };
> +
> +    led_pins_bananapi: led_pins@0 {
> +        allwinner,pins = "PH24", "PG2";
> +        allwinner,function = "gpio_out";
> +        allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> +        allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> +    };
> +
> +    mmc0_cd_pin_bananapi: mmc0_cd_pin@0 {
> +        allwinner,pins = "PH10";
> +        allwinner,function = "gpio_in";
> +        allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> +        allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
> +    };
> +
> +    mmc3_pwrseq_pin_bananapim1plus: mmc3_pwrseq_pin@0 {
> +        allwinner,pins = "PH22";
> +        allwinner,function = "gpio_out";
> +        allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> +        allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> +    };
> +
> +    usb1_vbus_pin_bananapi: usb1_vbus_pin@0 {
> +        allwinner,pins = "PH0";
> +        allwinner,function = "gpio_out";
> +        allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> +        allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> +    };
> +
> +    usb2_vbus_pin_bananapi: usb2_vbus_pin@0 {
> +        allwinner,pins = "PH1";
> +        allwinner,function = "gpio_out";
> +        allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> +        allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> +    };
> +
> +};
> +
> +&reg_usb1_vbus {
> +    pinctrl-0 = <&usb1_vbus_pin_bananapi>;
> +    gpio = <&pio 7 0 GPIO_ACTIVE_HIGH>; /* PH0 */
> +    status = "okay";
> +};
> +
> +&reg_usb2_vbus {
> +    pinctrl-0 = <&usb2_vbus_pin_bananapi>;
> +    gpio = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
> +    status = "okay";
> +};
> +
> +&uart0 {
> +    pinctrl-names = "default";
> +    pinctrl-0 = <&uart0_pins_a>;
> +    status = "okay";
> +};
> +
> +&usbphy {
> +    usb1_vbus-supply = <&reg_usb1_vbus>;
> +    usb2_vbus-supply = <&reg_usb2_vbus>;
> +    status = "okay";
> +};

Please include the bananapro dts to not duplicate all the common parts.

Thanks!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

* Re: [linux-sunxi] Re: [PATCH] ARM: dts: sun7i: Add dts file for Bananapi M1 Plus board
  2016-06-01  2:40       ` luoyi
  2016-06-01 17:58         ` Maxime Ripard
@ 2016-06-16  7:13         ` Chen-Yu Tsai
  1 sibling, 0 replies; 8+ messages in thread
From: Chen-Yu Tsai @ 2016-06-16  7:13 UTC (permalink / raw)
  To: luoyi
  Cc: Maxime Ripard, Bernhard Nortmann, Russell King - ARM Linux,
	Chen-Yu Tsai, devicetree, linux-arm-kernel, linux-kernel,
	linux-sunxi

Hi,

On Wed, Jun 1, 2016 at 10:40 AM, luoyi <luoyi.ly@gmail.com> wrote:
> This is the new version of the patch.  and I think maybe every board
> should have their own dtb files. and we can you some cpp  macro tricks
> to merge their coressponding dts file.
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index e06a5ab..fde407f 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -685,6 +685,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
>      sun6i-a31s-yones-toptech-bs1078-v2.dtb
>  dtb-$(CONFIG_MACH_SUN7I) += \
>      sun7i-a20-bananapi.dtb \
> +    sun7i-a20-bananapi-m1-plus.dtb \
>      sun7i-a20-bananapro.dtb \
>      sun7i-a20-cubieboard2.dtb \
>      sun7i-a20-cubietruck.dtb \
> diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
> b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
> new file mode 100644
> index 0000000..548ed31
> --- /dev/null
> +++ b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
> @@ -0,0 +1,266 @@
> +/*
> + * Copyright 2016 Luo Yi <luoyi.ly@gmail.com>
> + *
> + * Thanks to the original work by Hans de Goede <hdegoede@redhat.com>
> + *
> + * 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/arm-gic.h>
> +
> +/ {
> +    model = "Banana Pi BPI-M1-Plus";
> +    compatible = "sinovoip,bpi-m1-plus", "allwinner,sun7i-a20";
> +
> +    aliases {
> +        serial0 = &uart0;
> +    };
> +
> +    chosen {
> +        stdout-path = "serial0:115200n8";
> +    };
> +
> +    leds {

Extra space at end of line.

> +        compatible = "gpio-leds";
> +        pinctrl-names = "default";
> +        pinctrl-0 = <&led_pins_bananapi>;
> +
> +        green {
> +            label = "bananapi:green:usr";

The led labels should use the board name.

> +            gpios = <&pio 7 24 GPIO_ACTIVE_HIGH>;
> +        };
> +
> +        red {
> +            label = "bananapi:red:usr";
> +            gpios = <&pio 7 25 GPIO_ACTIVE_HIGH>;
> +            linux,default-trigger = "default-on";
> +        };
> +
> +    };
> +
> +    mmc3_pwrseq: mmc3_pwrseq {
> +        compatible = "mmc-pwrseq-simple";
> +        pinctrl-names = "default";
> +        pinctrl-0 = <&mmc3_pwrseq_pin_bananapim1plus>;
> +        reset-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 WL-PMU-EN */
> +    };
> +
> +    reg_gmac_3v3: gmac-3v3 {
> +        compatible = "regulator-fixed";
> +        pinctrl-names = "default";
> +        pinctrl-0 = <&gmac_power_pin_bananapi>;
> +        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>;
> +    };
> +
> +};
> +
> +&ahci {
> +    status = "okay";
> +};
> +
> +&codec {
> +    status = "okay";
> +};
> +
> +&ehci0 {
> +    status = "okay";
> +};
> +
> +&ehci1 {
> +    status = "okay";
> +};
> +
> +&gmac {
> +    pinctrl-names = "default";
> +    pinctrl-0 = <&gmac_pins_rgmii_a>;
> +    phy = <&phy1>;
> +    phy-mode = "rgmii";
> +    phy-supply = <&reg_gmac_3v3>;
> +    status = "okay";
> +
> +    phy1: ethernet-phy@1 {
> +        reg = <1>;
> +    };
> +};
> +
> +&i2c0 {
> +    pinctrl-names = "default";
> +    pinctrl-0 = <&i2c0_pins_a>;
> +    status = "okay";
> +
> +    axp209: pmic@34 {
> +        compatible = "x-powers,axp209";
> +        reg = <0x34>;
> +        interrupt-parent = <&nmi_intc>;
> +        interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
> +
> +        interrupt-controller;
> +        #interrupt-cells = <1>;
> +    };
> +};
> +
> +&ir0 {
> +    pinctrl-names = "default";
> +    pinctrl-0 = <&ir0_rx_pins_a>;
> +    status = "okay";
> +};
> +
> +&mmc0 {
> +    pinctrl-names = "default";
> +    pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapi>;
> +    vmmc-supply = <&reg_vcc3v3>;
> +    bus-width = <4>;
> +    cd-gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; /* PH10 */
> +    cd-inverted;
> +    status = "okay";
> +};
> +
> +&mmc3 {
> +
> +    #address-cells = <1>;
> +    #size-cells = <0>;
> +    pinctrl-names = "default";
> +    pinctrl-0 = <&mmc3_pins_a>;
> +    vmmc-supply = <&reg_vcc3v3>;
> +    mmc-pwrseq = <&mmc3_pwrseq>;
> +    bus-width = <4>;
> +    non-removable;
> +    enable-sdio-wakeup;
> +    status = "okay";
> +
> +    brcmf: bcrmf@1 {
> +        reg = <1>;
> +        compatible = "brcm,bcm4329-fmac";
> +        interrupt-parent = <&pio>;
> +        interrupts = <7 15 IRQ_TYPE_LEVEL_LOW>;
> +        interrupt-names = "host-wake";
> +    };
> +
> +};
> +
> +&mmc3_pins_a {
> +    /* AP6210 requires pull-up */
> +    allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
> +};
> +
> +&ohci0 {
> +    status = "okay";
> +};
> +
> +&ohci1 {
> +    status = "okay";
> +};
> +
> +&pio {
> +    gmac_power_pin_bananapi: gmac_power_pin@0 {
> +        allwinner,pins = "PH23";
> +        allwinner,function = "gpio_out";
> +        allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> +        allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> +    };
> +
> +    led_pins_bananapi: led_pins@0 {
> +        allwinner,pins = "PH24", "PG2";
> +        allwinner,function = "gpio_out";
> +        allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> +        allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> +    };
> +
> +    mmc0_cd_pin_bananapi: mmc0_cd_pin@0 {
> +        allwinner,pins = "PH10";
> +        allwinner,function = "gpio_in";
> +        allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> +        allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
> +    };
> +
> +    mmc3_pwrseq_pin_bananapim1plus: mmc3_pwrseq_pin@0 {
> +        allwinner,pins = "PH22";
> +        allwinner,function = "gpio_out";
> +        allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> +        allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> +    };
> +
> +    usb1_vbus_pin_bananapi: usb1_vbus_pin@0 {
> +        allwinner,pins = "PH0";
> +        allwinner,function = "gpio_out";
> +        allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> +        allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> +    };
> +
> +    usb2_vbus_pin_bananapi: usb2_vbus_pin@0 {
> +        allwinner,pins = "PH1";
> +        allwinner,function = "gpio_out";
> +        allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> +        allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> +    };

The schematics say USB1/2 VBUS is always on. No GPIO
controls them.

> +

Extra line.

> +};
> +
> +&reg_usb1_vbus {
> +    pinctrl-0 = <&usb1_vbus_pin_bananapi>;
> +    gpio = <&pio 7 0 GPIO_ACTIVE_HIGH>; /* PH0 */
> +    status = "okay";
> +};
> +
> +&reg_usb2_vbus {
> +    pinctrl-0 = <&usb2_vbus_pin_bananapi>;
> +    gpio = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
> +    status = "okay";
> +};

See above.

> +
> +&uart0 {
> +    pinctrl-names = "default";
> +    pinctrl-0 = <&uart0_pins_a>;
> +    status = "okay";
> +};
> +
> +&usbphy {
> +    usb1_vbus-supply = <&reg_usb1_vbus>;
> +    usb2_vbus-supply = <&reg_usb2_vbus>;

You can leave these out.

> +    status = "okay";
> +};

Please send this patch, with the above comments fixed, as v3.


Thanks,
ChenYu


> 2016-06-01 1:09 GMT+08:00 Maxime Ripard <maxime.ripard@free-electrons.com>:
>> On Mon, May 30, 2016 at 10:26:21PM +0200, Bernhard Nortmann wrote:
>>> Am 30.05.2016 um 21:43 schrieb Maxime Ripard:
>>> >Hi,
>>> >
>>> >On Mon, May 30, 2016 at 08:30:13PM +0800, luoyi.ly@gmail.com wrote:
>>> >>From: luoyi <luoyi.ly@gmail.com>
>>> >>
>>> >>Add support for the Bananapi M1 Plus A20 development board from sinovoip.com.cn .
>>> >>This board features 1G RAM, 2 USB A receptacles, 1 micro USB receptacle for
>>> >>OTG, 1 micro USB receptacle for power, HDMI, sata, Gbit ethernet, ir receiver,
>>> >>3.5 mm jack for stero sound out, on board microphone, 40 gpio pins and sdio wifi.
>>> >What is the difference between the M1+ and the M1?
>>>
>>> The M1+ is an updated version of the original Banana Pi. If you're
>>> interested in the details, have a look at
>>> http://linux-sunxi.org/Banana_Pi#Variants .  "BPi-M1+" is SinoVoip's
>>> counterpart of LeMaker's "Banana Pro", for which a .dts already
>>> exists. Judging from .fex files, only a single pin assignment seems
>>> to differ between the two (audio_pa_ctrl, PH26 vs. PH15).
>>
>> Gee, that's confusing :)
>>
>> I guess we should just include the banana pro DTB and change that pin
>> (and the i2s pins Luo was mentionning).
>>
>> Maxime
>>
>> --
>> Maxime Ripard, Free Electrons
>> Embedded Linux, Kernel and Android engineering
>> http://free-electrons.com

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

end of thread, other threads:[~2016-06-16  7:14 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-30 12:30 [PATCH] ARM: dts: sun7i: Add dts file for Bananapi M1 Plus board luoyi.ly
2016-05-30 19:43 ` Maxime Ripard
2016-05-30 20:26   ` [linux-sunxi] " Bernhard Nortmann
2016-05-31 17:09     ` Maxime Ripard
2016-06-01  2:40       ` luoyi
2016-06-01 17:58         ` Maxime Ripard
2016-06-16  7:13         ` Chen-Yu Tsai
2016-05-31  3:03   ` Chen-Yu Tsai

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).