Commit 27ad6129 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v5.6/fixes-rc3-signed' of... 

Merge tag 'omap-for-v5.6/fixes-rc3-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes

Few fixes for omaps for v5.6-rc cycle

This series of changes contains few code fixes for issues
recently discovered:

- A build fix for ARMv6 only configs when CONFIG_HAVE_ARM_SMCCC is
  not set

- A fix for ti-sysc quirk handling for 1-wire hdq reset

And a handful of dts fixes that I had queued up and should
have already sent earlier instead of waiting for the code
fixes to get sorted out:

- Fix naming of vsys_3v3 regulator for dra7-evm

- Fix incorrect OPP node names for am437x-idk-evm

- Fix IPU1 mux clock parent source for dra7

- Add missing PWM property for dra7 timers 13 to 16

- Add missing dma-ranges for dra7 PCIe nodes

- Fix mmc3 max-frequency for dra76x

* tag 'omap-for-v5.6/fixes-rc3-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Fix compile if CONFIG_HAVE_ARM_SMCCC is not set
  arm: dts: dra76x: Fix mmc3 max-frequency
  ARM: dts: dra7: Add "dma-ranges" property to PCIe RC DT nodes
  bus: ti-sysc: Fix 1-wire reset quirk
  ARM: dts: dra7-l4: mark timer13-16 as pwm capable
  ARM: dts: dra7xx-clocks: Fixup IPU1 mux clock parent source
  ARM: dts: am437x-idk-evm: Fix incorrect OPP node names
  ARM: dts: dra7-evm: Rename evm_3v3 regulator to vsys_3v3

Link: https://lore.kernel.org/r/pull-1582903541-589933@atomide.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f9a15f39 51c22d7b

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

+2 −2
Original line number Diff line number Diff line
@@ -526,11 +526,11 @@ 
	 * Supply voltage supervisor on board will not allow opp50 so

	 * disable it and set opp100 as suspend OPP.

	 */

	opp50@300000000 {

	opp50-300000000 {

		status = "disabled";

	};



	opp100@600000000 {

	opp100-600000000 {

		opp-suspend;

	};

};

arch/arm/boot/dts/dra7-evm.dts

+2 −2
Original line number Diff line number Diff line
@@ -61,10 +61,10 @@ 
		regulator-max-microvolt = <1800000>;

	};



	evm_3v3: fixedregulator-evm3v3 {

	vsys_3v3: fixedregulator-vsys3v3 {

		/* Output of Cntlr A of TPS43351-Q1 on dra7-evm */

		compatible = "regulator-fixed";

		regulator-name = "evm_3v3";

		regulator-name = "vsys_3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&evm_12v0>;

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

+4 −0
Original line number Diff line number Diff line
@@ -3474,6 +3474,7 @@ 
				clocks = <&l4per3_clkctrl DRA7_L4PER3_TIMER13_CLKCTRL 24>;

				clock-names = "fck";

				interrupts = <GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH>;

				ti,timer-pwm;

			};

		};
@@ -3501,6 +3502,7 @@ 
				clocks = <&l4per3_clkctrl DRA7_L4PER3_TIMER14_CLKCTRL 24>;

				clock-names = "fck";

				interrupts = <GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH>;

				ti,timer-pwm;

			};

		};
@@ -3528,6 +3530,7 @@ 
				clocks = <&l4per3_clkctrl DRA7_L4PER3_TIMER15_CLKCTRL 24>;

				clock-names = "fck";

				interrupts = <GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH>;

				ti,timer-pwm;

			};

		};
@@ -3555,6 +3558,7 @@ 
				clocks = <&l4per3_clkctrl DRA7_L4PER3_TIMER16_CLKCTRL 24>;

				clock-names = "fck";

				interrupts = <GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH>;

				ti,timer-pwm;

			};

		};

arch/arm/boot/dts/dra7.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ 
				device_type = "pci";

				ranges = <0x81000000 0 0          0x03000 0 0x00010000

					  0x82000000 0 0x20013000 0x13000 0 0xffed000>;

				dma-ranges = <0x02000000 0x0 0x00000000 0x00000000 0x1 0x00000000>;

				bus-range = <0x00 0xff>;

				#interrupt-cells = <1>;

				num-lanes = <1>;
@@ -238,6 +239,7 @@ 
				device_type = "pci";

				ranges = <0x81000000 0 0          0x03000 0 0x00010000

					  0x82000000 0 0x30013000 0x13000 0 0xffed000>;

				dma-ranges = <0x02000000 0x0 0x00000000 0x00000000 0x1 0x00000000>;

				bus-range = <0x00 0xff>;

				#interrupt-cells = <1>;

				num-lanes = <1>;

arch/arm/boot/dts/dra76x.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -128,3 +128,8 @@ 
&usb4_tm {

	status = "disabled";

};



&mmc3 {

	/* dra76x is not affected by i887 */

	max-frequency = <96000000>;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE