Commit 3dc064d2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "Lots of small fixes for Arm SoCs this time, nothing too worrying:

   - omap/beaglebone boot regression fix in gpt12 timer

   - revert for i.mx8 soc driver breaking as a platform_driver

   - kexec/kdump fixes for op-tee

   - various fixes for incorrect DT settings on imx, mvebu, omap, stm32,
     and tegra causing problems.

   - device tree fixes for static checks in nomadik, versatile, stm32

   - code fixes for issues found in build testing and with static
     checking on tegra, ixp4xx, imx, omap"

* tag 'soc-fixes-5.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (36 commits)
  soc: ixp4xx/qmgr: fix invalid __iomem access
  soc: ixp4xx: fix printing resources
  ARM: ixp4xx: goramo_mlr depends on old PCI driver
  ARM: ixp4xx: fix compile-testing soc drivers
  soc/tegra: Make regulator couplers depend on CONFIG_REGULATOR
  ARM: dts: nomadik: Fix up interrupt controller node names
  ARM: dts: stm32: Fix touchscreen IRQ line assignment on DHCOM
  ARM: dts: stm32: Disable LAN8710 EDPD on DHCOM
  ARM: dts: stm32: Prefer HW RTC on DHCOM SoM
  omap5-board-common: remove not physically existing vdds_1v8_main fixed-regulator
  ARM: dts: am437x-l4: fix typo in can@0 node
  ARM: dts: am43x-epos-evm: Reduce i2c0 bus speed for tps65218
  bus: ti-sysc: AM3: RNG is GP only
  ARM: omap2+: hwmod: fix potential NULL pointer access
  arm64: dts: armada-3720-turris-mox: remove mrvl,i2c-fast-mode
  arm64: dts: armada-3720-turris-mox: fixed indices for the SDHC controllers
  ARM: dts: imx: Swap M53Menlo pinctrl_power_button/pinctrl_power_out pins
  ARM: imx: fix missing 3rd argument in macro imx_mmdc_perf_init
  ARM: dts: colibri-imx6ull: limit SDIO clock to 25MHz
  arm64: dts: ls1028: sl28: fix networking for variant 2
  ...
parents 73f25536 19c1eb36

arch/arm/boot/dts/am437x-l4.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1595,7 +1595,7 @@ dcan1: can@0 { 
				compatible = "ti,am4372-d_can", "ti,am3352-d_can";

				reg = <0x0 0x2000>;

				clocks = <&dcan1_fck>;

				clock-name = "fck";

				clock-names = "fck";

				syscon-raminit = <&scm_conf 0x644 1>;

				interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;

				status = "disabled";

arch/arm/boot/dts/am43x-epos-evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ &i2c0 { 
	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;

	clock-frequency = <400000>;

	clock-frequency = <100000>;



	tps65218: tps65218@24 {

		reg = <0x24>;

arch/arm/boot/dts/imx53-m53menlo.dts

+2 −2
Original line number Diff line number Diff line
@@ -388,13 +388,13 @@ MX53_PAD_LVDS0_TX3_P__LDB_LVDS0_TX3 0x80000000 


		pinctrl_power_button: powerbutgrp {

			fsl,pins = <

				MX53_PAD_SD2_DATA2__GPIO1_13		0x1e4

				MX53_PAD_SD2_DATA0__GPIO1_15		0x1e4

			>;

		};



		pinctrl_power_out: poweroutgrp {

			fsl,pins = <

				MX53_PAD_SD2_DATA0__GPIO1_15		0x1e4

				MX53_PAD_SD2_DATA2__GPIO1_13		0x1e4

			>;

		};

arch/arm/boot/dts/imx6qdl-sr-som.dtsi

+7 −1
Original line number Diff line number Diff line
@@ -54,7 +54,13 @@ &fec { 
	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_microsom_enet_ar8035>;

	phy-mode = "rgmii-id";

	phy-reset-duration = <2>;



	/*

	 * The PHY seems to require a long-enough reset duration to avoid

	 * some rare issues where the PHY gets stuck in an inconsistent and

	 * non-functional state at boot-up. 10ms proved to be fine .

	 */

	phy-reset-duration = <10>;

	phy-reset-gpios = <&gpio4 15 GPIO_ACTIVE_LOW>;

	status = "okay";

arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ &usdhc2 { 
	assigned-clock-rates = <0>, <198000000>;

	cap-power-off-card;

	keep-power-in-suspend;

	max-frequency = <25000000>;

	mmc-pwrseq = <&wifi_pwrseq>;

	no-1-8-v;

	non-removable;