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

Commit 927867a4 authored Jan 16, 2017 by Olof Johansson

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

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

Allwinner fixes for 4.10

A few fixes here and there to enable the build of some DT leftover, prevent
display issues or setup a proper muxing.

* tag 'sunxi-fixes-for-4.10' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux

:
  ARM: dts: sunxi: Change node name for pwrseq pin on Olinuxino-lime2-emmc
  ARM: dts: sun8i: Support DTB build for NanoPi M1
  ARM: dts: sun6i: hummingbird: Enable display engine again
  ARM: dts: sun6i: Disable display pipeline by default

Signed-off-by: Olof Johansson <olof@lixom.net>

parents a11f4706 3116d376

arch/arm/boot/dts/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -846,6 +846,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \
		sun8i-a83t-allwinner-h8homlet-v2.dtb \
		sun8i-a83t-cubietruck-plus.dtb \
		sun8i-h3-bananapi-m2-plus.dtb \
		sun8i-h3-nanopi-m1.dtb \
		sun8i-h3-nanopi-neo.dtb \
		sun8i-h3-orangepi-2.dtb \
		sun8i-h3-orangepi-lite.dtb \

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -140,6 +140,10 @@
		cpu-supply = <&reg_dcdc3>;
		};

		&de {
		status = "okay";
		};

		&ehci0 {
		status = "okay";
		};

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -234,6 +234,7 @@
		de: display-engine {
		compatible = "allwinner,sun6i-a31-display-engine";
		allwinner,pipelines = <&fe0>;
		status = "disabled";
		};

		soc@01c00000 {

arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@
		};

		&pio {
		mmc2_pins_nrst: mmc2@0 {
		mmc2_pins_nrst: mmc2-rst-pin {
		allwinner,pins = "PC16";
		allwinner,function = "gpio_out";
		allwinner,drive = <SUN4I_PINCTRL_10_MA>;