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

Commit ca04b3cc 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:
 "A small collection of fixes, sort of the usual at this point, all for
  i.MX or OMAP:

   - Enable ULPI drivers on i.MX to avoid a hang

   - Pinctrl fix for touchscreen on i.MX51 ZII RDU1

   - Fixes for ethernet clock references on am3517

   - mmc0 write protect detection fix for am335x

   - kzalloc->kcalloc conversion in an OMAP driver

   - USB metastability fix for USB on dra7

   - Fix touchscreen wakeup on am437x"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: imx_v4_v5_defconfig: Select ULPI support
  ARM: imx_v6_v7_defconfig: Select ULPI support
  ARM: dts: omap3: Fix am3517 mdio and emac clock references
  ARM: dts: am335x-bone-common: Fix mmc0 Write Protect
  bus: ti-sysc: Use 2-factor allocator arguments
  ARM: dts: dra7: Disable metastability workaround for USB2
  ARM: dts: imx51-zii-rdu1: fix touchscreen pinctrl
  ARM: dts: am437x: make edt-ft5x06 a wakeup source
parents 23adbe6f f0463f36

arch/arm/boot/dts/am335x-bone-common.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -168,7 +168,6 @@ 
			AM33XX_IOPAD(0x8f0, PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc0_dat3.mmc0_dat3 */

			AM33XX_IOPAD(0x904, PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc0_cmd.mmc0_cmd */

			AM33XX_IOPAD(0x900, PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc0_clk.mmc0_clk */

			AM33XX_IOPAD(0x9a0, PIN_INPUT | MUX_MODE4)		/* mcasp0_aclkr.mmc0_sdwp */

		>;

	};

arch/arm/boot/dts/am3517.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ 
			ti,davinci-ctrl-ram-size = <0x2000>;

			ti,davinci-rmii-en = /bits/ 8 <1>;

			local-mac-address = [ 00 00 00 00 00 00 ];

			clocks = <&emac_ick>;

			clock-names = "ick";

		};



		davinci_mdio: ethernet@5c030000 {
@@ -49,6 +51,8 @@ 
			bus_freq = <1000000>;

			#address-cells = <1>;

			#size-cells = <0>;

			clocks = <&emac_fck>;

			clock-names = "fck";

		};



		uart4: serial@4809e000 {

arch/arm/boot/dts/am437x-sk-evm.dts

+2 −0
Original line number Diff line number Diff line
@@ -610,6 +610,8 @@ 


		touchscreen-size-x = <480>;

		touchscreen-size-y = <272>;



		wakeup-source;

	};



	tlv320aic3106: tlv320aic3106@1b {

arch/arm/boot/dts/dra7.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1580,7 +1580,6 @@ 
				dr_mode = "otg";

				snps,dis_u3_susphy_quirk;

				snps,dis_u2_susphy_quirk;

				snps,dis_metastability_quirk;

			};

		};
@@ -1608,6 +1607,7 @@ 
				dr_mode = "otg";

				snps,dis_u3_susphy_quirk;

				snps,dis_u2_susphy_quirk;

				snps,dis_metastability_quirk;

			};

		};

arch/arm/boot/dts/imx51-zii-rdu1.dts

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


	pinctrl_ts: tsgrp {

		fsl,pins = <

			MX51_PAD_CSI1_D8__GPIO3_12		0x85

			MX51_PAD_CSI1_D8__GPIO3_12		0x04

			MX51_PAD_CSI1_D9__GPIO3_13		0x85

		>;

	};