*** sun7i-a20-bananapi.dts	2015-12-10 07:09:01.000000000 +0200
--- sun7i-a20-bananapi-m1-plus.dts	2015-12-10 07:09:01.000000000 +0200
***************
*** 1,7 ****
  /*
!  * Copyright 2014 Hans de Goede <[email protected]>
!  *
!  * Hans de Goede <[email protected]>
   *
   * 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
--- 1,5 ----
  /*
!  * Copyright 2015 Hans de Goede <[email protected]>
   *
   * 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
***************
*** 45,58 ****
  /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-M1";
! 	compatible = "sinovoip,bpi-m1", "allwinner,sun7i-a20";

  	aliases {
  		serial0 = &uart0;
--- 43,54 ----
  /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;
***************
*** 70,79 ****
--- 66,82 ----
  		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";
+
  		};
  	};

***************
*** 88,93 ****
--- 91,109 ----
  		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 {
***************
*** 161,167 ****
--- 177,219 ----
  	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 = <15 8>;
+ 		interrupt-names = "host-wake";
+ 	};
+ */
+ };
+
  &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";
***************
*** 169,183 ****
  		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
  	};

! 	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";
  		allwinner,function = "gpio_out";
  		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
  		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
--- 221,242 ----
  		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>;
***************
*** 185,194 ****
--- 244,257 ----
  };

  &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";
  };