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

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

Merge tag 'omap-for-v4.18/fixes-signed' of... 

Merge tag 'omap-for-v4.18/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Fixes for omap for v4.18-rc cycle

Few dts fixes for regressions for various SoCs and
devices for touchscreen wake, dra7 USB quirk, pinmux
for beaglebone mmc, and emac clock.

Also included is a change for ti-sysc to use kcalloc
that Kees wanted to get into v4.18 as that's the last
one he wanted to fix for improved defense against
allocation overflows.

* tag 'omap-for-v4.18/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  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: am437x: make edt-ft5x06 a wakeup source

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 6d9d0f17 0144eb20

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;

			};

		};

drivers/bus/ti-sysc.c

+4 −4
Original line number Diff line number Diff line
@@ -169,9 +169,9 @@ static int sysc_get_clocks(struct sysc *ddata) 
	const char *name;

	int nr_fck = 0, nr_ick = 0, i, error = 0;



	ddata->clock_roles = devm_kzalloc(ddata->dev,

					  sizeof(*ddata->clock_roles) *

	ddata->clock_roles = devm_kcalloc(ddata->dev,

					  SYSC_MAX_CLOCKS,

					  sizeof(*ddata->clock_roles),

					  GFP_KERNEL);

	if (!ddata->clock_roles)

		return -ENOMEM;
@@ -200,8 +200,8 @@ static int sysc_get_clocks(struct sysc *ddata) 
		return -EINVAL;

	}



	ddata->clocks = devm_kzalloc(ddata->dev,

				     sizeof(*ddata->clocks) * ddata->nr_clocks,

	ddata->clocks = devm_kcalloc(ddata->dev,

				     ddata->nr_clocks, sizeof(*ddata->clocks),

				     GFP_KERNEL);

	if (!ddata->clocks)

		return -ENOMEM;