Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bbad2093 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-fixes-for-4.16' of... 

Merge tag 'sunxi-fixes-for-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into fixes

Pull "Allwinner Fixes for 4.16" from Maxime Ripard:

The first and second patches fix the regulator support for the Bananapi M2
board.

The last one updates my email address in MAINTAINERS.

* tag 'sunxi-fixes-for-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  MAINTAINERS: update email address for Maxime Ripard
  ARM: dts: sun6i: a31s: bpi-m2: add missing regulators
  ARM: dts: sun6i: a31s: bpi-m2: improve pmic properties
parents 66f3731f 0a815fc9

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -1152,7 +1152,7 @@ S: Maintained 
F:	drivers/clk/sunxi/



ARM/Allwinner sunXi SoC support

M:	Maxime Ripard <maxime.ripard@free-electrons.com>

M:	Maxime Ripard <maxime.ripard@bootlin.com>

M:	Chen-Yu Tsai <wens@csie.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained
@@ -4626,7 +4626,7 @@ F: include/uapi/drm/drm* 
F:	include/linux/vga*



DRM DRIVERS FOR ALLWINNER A10

M:	Maxime Ripard  <maxime.ripard@free-electrons.com>

M:	Maxime Ripard  <maxime.ripard@bootlin.com>

L:	dri-devel@lists.freedesktop.org

S:	Supported

F:	drivers/gpu/drm/sun4i/

arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts

+60 −3
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 


/dts-v1/;

#include "sun6i-a31s.dtsi"

#include "sunxi-common-regulators.dtsi"

#include <dt-bindings/gpio/gpio.h>



/ {
@@ -99,6 +98,7 @@ 
	pinctrl-0 = <&gmac_pins_rgmii_a>, <&gmac_phy_reset_pin_bpi_m2>;

	phy = <&phy1>;

	phy-mode = "rgmii";

	phy-supply = <&reg_dldo1>;

	snps,reset-gpio = <&pio 0 21 GPIO_ACTIVE_HIGH>; /* PA21 */

	snps,reset-active-low;

	snps,reset-delays-us = <0 10000 30000>;
@@ -118,7 +118,7 @@ 
&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bpi_m2>;

	vmmc-supply = <&reg_vcc3v0>;

	vmmc-supply = <&reg_dcdc1>;

	bus-width = <4>;

	cd-gpios = <&pio 0 4 GPIO_ACTIVE_HIGH>; /* PA4 */

	cd-inverted;
@@ -132,7 +132,7 @@ 
&mmc2 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc2_pins_a>;

	vmmc-supply = <&reg_vcc3v0>;

	vmmc-supply = <&reg_aldo1>;

	mmc-pwrseq = <&mmc2_pwrseq>;

	bus-width = <4>;

	non-removable;
@@ -163,6 +163,8 @@ 
		reg = <0x68>;

		interrupt-parent = <&nmi_intc>;

		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;

		eldoin-supply = <&reg_dcdc1>;

		x-powers,drive-vbus-en;

	};

};
@@ -193,7 +195,28 @@ 


#include "axp22x.dtsi"



&reg_aldo1 {

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-wifi";

};



&reg_aldo2 {

	regulator-always-on;

	regulator-min-microvolt = <2500000>;

	regulator-max-microvolt = <2500000>;

	regulator-name = "vcc-gmac";

};



&reg_aldo3 {

	regulator-always-on;

	regulator-min-microvolt = <3000000>;

	regulator-max-microvolt = <3000000>;

	regulator-name = "avcc";

};



&reg_dc5ldo {

	regulator-always-on;

	regulator-min-microvolt = <700000>;

	regulator-max-microvolt = <1320000>;

	regulator-name = "vdd-cpus";
@@ -233,6 +256,40 @@ 
	regulator-name = "vcc-dram";

};



&reg_dldo1 {

	regulator-min-microvolt = <3000000>;

	regulator-max-microvolt = <3000000>;

	regulator-name = "vcc-mac";

};



&reg_dldo2 {

	regulator-min-microvolt = <2800000>;

	regulator-max-microvolt = <2800000>;

	regulator-name = "avdd-csi";

};



&reg_dldo3 {

	regulator-always-on;

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-pb";

};



&reg_eldo1 {

	regulator-min-microvolt = <1800000>;

	regulator-max-microvolt = <1800000>;

	regulator-name = "vdd-csi";

	status = "okay";

};



&reg_ldo_io1 {

	regulator-always-on;

	regulator-min-microvolt = <1800000>;

	regulator-max-microvolt = <1800000>;

	regulator-name = "vcc-pm-cpus";

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;