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

Commit 6bf99a6c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Merge tag 'sunxi-fixes-for-4.14' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into fixes

Pull "Allwinner fixes for 4.14" from Maxime Ripard:

Two fixes, one for the A31 DRM binding, and one for a missing regulator on
the pine MMC controller.

* tag 'sunxi-fixes-for-4.14' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  ARM: dts: sun6i: Fix endpoint IDs in second display pipeline
  arm64: allwinner: a64: pine64: Use dcdc1 regulator for mmc0
parents 716479a3 a231d278

arch/arm/boot/dts/sun6i-a31.dtsi

+8 −8
Original line number Diff line number Diff line
@@ -311,8 +311,8 @@ 
					#size-cells = <0>;

					reg = <0>;



					tcon1_in_drc1: endpoint@0 {

						reg = <0>;

					tcon1_in_drc1: endpoint@1 {

						reg = <1>;

						remote-endpoint = <&drc1_out_tcon1>;

					};

				};
@@ -1012,8 +1012,8 @@ 
					#size-cells = <0>;

					reg = <1>;



					be1_out_drc1: endpoint@0 {

						reg = <0>;

					be1_out_drc1: endpoint@1 {

						reg = <1>;

						remote-endpoint = <&drc1_in_be1>;

					};

				};
@@ -1042,8 +1042,8 @@ 
					#size-cells = <0>;

					reg = <0>;



					drc1_in_be1: endpoint@0 {

						reg = <0>;

					drc1_in_be1: endpoint@1 {

						reg = <1>;

						remote-endpoint = <&be1_out_drc1>;

					};

				};
@@ -1053,8 +1053,8 @@ 
					#size-cells = <0>;

					reg = <1>;



					drc1_out_tcon1: endpoint@0 {

						reg = <0>;

					drc1_out_tcon1: endpoint@1 {

						reg = <1>;

						remote-endpoint = <&tcon1_in_drc1>;

					};

				};

arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts

+1 −8
Original line number Diff line number Diff line
@@ -61,13 +61,6 @@ 
	chosen {

		stdout-path = "serial0:115200n8";

	};



	reg_vcc3v3: vcc3v3 {

		compatible = "regulator-fixed";

		regulator-name = "vcc3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};

};



&ehci0 {
@@ -91,7 +84,7 @@ 
&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_vcc3v3>;

	vmmc-supply = <&reg_dcdc1>;

	cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;

	cd-inverted;

	disable-wp;