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

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

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

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

Merge "Allwinner fixes for 3.19" from Maxime Ripard:

Allwinner fixes for 3.19

A few minor fixes for the 3.19 kernel:
  - The 8250 uart driver now respects the aliases, which pointed out that we
    were using them wrong. Fixed them.
  - The simplefb pipeline that was used on the A10 caused flickering and
    tearing, and rendered it pretty much useless. Added a new simplefb node
    with another pipeline that removes this issue. Note that we need to keep
    the old node because u-boot 2015.01 uses it.
  - Added a fix for the USB phy node on sun4i/sun5i

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

:
  ARM: sunxi: dt: Fix aliases
  ARM: dts: sun4i: Add simplefb node with de_fe0-de_be0-lcd0-hdmi pipeline
  ARM: dts: sun6i: ippo-q8h-v5: Fix serial0 alias
  ARM: dts: sunxi: Fix usb-phy support for sun4i/sun5i

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 4b3415c9 117a2cc3

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

+10 −10
Original line number Diff line number Diff line
@@ -17,14 +17,6 @@ 


	aliases {

		ethernet0 = &emac;

		serial0 = &uart0;

		serial1 = &uart1;

		serial2 = &uart2;

		serial3 = &uart3;

		serial4 = &uart4;

		serial5 = &uart5;

		serial6 = &uart6;

		serial7 = &uart7;

	};



	chosen {
@@ -39,6 +31,14 @@ 
				 <&ahb_gates 44>;

			status = "disabled";

		};



		framebuffer@1 {

			compatible = "allwinner,simple-framebuffer", "simple-framebuffer";

			allwinner,pipeline = "de_fe0-de_be0-lcd0-hdmi";

			clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,

				 <&ahb_gates 44>, <&ahb_gates 46>;

			status = "disabled";

		};

	};



	cpus {
@@ -438,8 +438,8 @@ 
			reg-names = "phy_ctrl", "pmu1", "pmu2";

			clocks = <&usb_clk 8>;

			clock-names = "usb_phy";

			resets = <&usb_clk 1>, <&usb_clk 2>;

			reset-names = "usb1_reset", "usb2_reset";

			resets = <&usb_clk 0>, <&usb_clk 1>, <&usb_clk 2>;

			reset-names = "usb0_reset", "usb1_reset", "usb2_reset";

			status = "disabled";

		};

arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts

+6 −0
Original line number Diff line number Diff line
@@ -55,6 +55,12 @@ 
	model = "Olimex A10s-Olinuxino Micro";

	compatible = "olimex,a10s-olinuxino-micro", "allwinner,sun5i-a10s";



	aliases {

		serial0 = &uart0;

		serial1 = &uart2;

		serial2 = &uart3;

	};



	soc@01c00000 {

		emac: ethernet@01c0b000 {

			pinctrl-names = "default";

arch/arm/boot/dts/sun5i-a10s.dtsi

+2 −6
Original line number Diff line number Diff line
@@ -18,10 +18,6 @@ 


	aliases {

		ethernet0 = &emac;

		serial0 = &uart0;

		serial1 = &uart1;

		serial2 = &uart2;

		serial3 = &uart3;

	};



	chosen {
@@ -390,8 +386,8 @@ 
			reg-names = "phy_ctrl", "pmu1";

			clocks = <&usb_clk 8>;

			clock-names = "usb_phy";

			resets = <&usb_clk 1>;

			reset-names = "usb1_reset";

			resets = <&usb_clk 0>, <&usb_clk 1>;

			reset-names = "usb0_reset", "usb1_reset";

			status = "disabled";

		};

arch/arm/boot/dts/sun5i-a13-hsg-h702.dts

+4 −0
Original line number Diff line number Diff line
@@ -53,6 +53,10 @@ 
	model = "HSG H702";

	compatible = "hsg,h702", "allwinner,sun5i-a13";



	aliases {

		serial0 = &uart1;

	};



	soc@01c00000 {

		mmc0: mmc@01c0f000 {

			pinctrl-names = "default";

arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts

+4 −0
Original line number Diff line number Diff line
@@ -54,6 +54,10 @@ 
	model = "Olimex A13-Olinuxino Micro";

	compatible = "olimex,a13-olinuxino-micro", "allwinner,sun5i-a13";



	aliases {

		serial0 = &uart1;

	};



	soc@01c00000 {

		mmc0: mmc@01c0f000 {

			pinctrl-names = "default";