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

Commit 1f6c926c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC fixes from Olof Johansson:
 "Final batch of SoC fixes

  A few fixes that have trickled in over the last week, all fixing minor
  errors in devicetrees -- UART pin assignment on Allwinner H3,
  correcting number of SATA ports on a Marvell-based Linkstation
  platform and a display clock fix for Freescale/NXP i.MX7D that fixes a
  freeze when starting up X"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: dts: orion5x: fix number of sata port for linkstation ls-gl
  ARM: dts: imx7d: fix LCDIF clock assignment
  dts: sun8i-h3: correct UART3 pin definitions
parents 75147120 038ccb3e

arch/arm/boot/dts/imx7s.dtsi

+2 −3
Original line number Original line Diff line number Diff line
@@ -643,9 +643,8 @@ 
				reg = <0x30730000 0x10000>;

				reg = <0x30730000 0x10000>;

				interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;

				interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX7D_LCDIF_PIXEL_ROOT_CLK>,

				clocks = <&clks IMX7D_LCDIF_PIXEL_ROOT_CLK>,

					<&clks IMX7D_CLK_DUMMY>,

					<&clks IMX7D_LCDIF_PIXEL_ROOT_CLK>;

					<&clks IMX7D_CLK_DUMMY>;

				clock-names = "pix", "axi";

				clock-names = "pix", "axi", "disp_axi";

				status = "disabled";

				status = "disabled";

			};

			};

		};

		};

arch/arm/boot/dts/orion5x-linkstation-lsgl.dts

+4 −0
Original line number Original line Diff line number Diff line
@@ -82,6 +82,10 @@ 
	gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;

	gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;

};

};





&sata {

	nr-ports = <2>;

};



&ehci1 {

&ehci1 {

	status = "okay";

	status = "okay";

};
 
};

arch/arm/boot/dts/sun8i-h3.dtsi

+1 −1
Original line number Original line Diff line number Diff line
@@ -410,7 +410,7 @@ 
			};

			};





			uart3_pins: uart3 {

			uart3_pins: uart3 {

				allwinner,pins = "PG13", "PG14";

				allwinner,pins = "PA13", "PA14";

				allwinner,function = "uart3";

				allwinner,function = "uart3";

				allwinner,drive = <SUN4I_PINCTRL_10_MA>;

				allwinner,drive = <SUN4I_PINCTRL_10_MA>;

				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;