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

Commit f2c56aac authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Allwinner fixes for 4.17

Here is a bunch of fixes for merge issues, typos and wrong clocks being
described for simplefb, resulting in non-working displays.

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

:
  ARM: sun8i: v3s: fix spelling mistake: "disbaled" -> "disabled"
  ARM: dts: sun4i: Fix incorrect clocks for displays
  ARM: dts: sun8i: h3: Re-enable EMAC on Orange Pi One

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 771c577c d89ad4f0

arch/arm/boot/dts/sun4i-a10.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ 
			allwinner,pipeline = "de_fe0-de_be0-lcd0-hdmi";

			clocks = <&ccu CLK_AHB_LCD0>, <&ccu CLK_AHB_HDMI0>,

				 <&ccu CLK_AHB_DE_BE0>, <&ccu CLK_AHB_DE_FE0>,

				 <&ccu CLK_DE_BE0>, <&ccu CLK_AHB_DE_FE0>,

				 <&ccu CLK_DE_BE0>, <&ccu CLK_DE_FE0>,

				 <&ccu CLK_TCON0_CH1>, <&ccu CLK_HDMI>,

				 <&ccu CLK_DRAM_DE_FE0>, <&ccu CLK_DRAM_DE_BE0>;

			status = "disabled";
@@ -88,7 +88,7 @@ 
			allwinner,pipeline = "de_fe0-de_be0-lcd0";

			clocks = <&ccu CLK_AHB_LCD0>, <&ccu CLK_AHB_DE_BE0>,

				 <&ccu CLK_AHB_DE_FE0>, <&ccu CLK_DE_BE0>,

				 <&ccu CLK_AHB_DE_FE0>, <&ccu CLK_TCON0_CH0>,

				 <&ccu CLK_DE_FE0>, <&ccu CLK_TCON0_CH0>,

				 <&ccu CLK_DRAM_DE_FE0>, <&ccu CLK_DRAM_DE_BE0>;

			status = "disabled";

		};
@@ -99,7 +99,7 @@ 
			allwinner,pipeline = "de_fe0-de_be0-lcd0-tve0";

			clocks = <&ccu CLK_AHB_TVE0>, <&ccu CLK_AHB_LCD0>,

				 <&ccu CLK_AHB_DE_BE0>, <&ccu CLK_AHB_DE_FE0>,

				 <&ccu CLK_DE_BE0>, <&ccu CLK_AHB_DE_FE0>,

				 <&ccu CLK_DE_BE0>, <&ccu CLK_DE_FE0>,

				 <&ccu CLK_TCON0_CH1>, <&ccu CLK_DRAM_TVE0>,

				 <&ccu CLK_DRAM_DE_FE0>, <&ccu CLK_DRAM_DE_BE0>;

			status = "disabled";

arch/arm/boot/dts/sun8i-h3-orangepi-one.dts

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ 
	phy-handle = <&int_mii_phy>;

	phy-mode = "mii";

	allwinner,leds-active-low;

	status = "okay";

};



&hdmi {

arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 


	leds {

		/* The LEDs use PG0~2 pins, which conflict with MMC1 */

		status = "disbaled";

		status = "disabled";

	};

};