Unverified Commit 846e24dc authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v5.18/fixes-take2' of... 

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

Fixes for omaps

Few regression fixes for omap variants. These mostly fix issues related to
warnings added for system suspend, and some devicetree issues:

- Make ti-sysc driver quirks for gpt12 timer omap3 specific to fix
  timer clock disabling for am335x system suspend

- Fix new system suspend warning for dra7 vpe caused by trying to
  use register bits not wired for vpe

- Fix mmc boot order for omap3-gta04 that has no mmc2 or 3 wired

- Add missing touchscreen properties for am3

- Fix pin muxing for logicpd-som-lv and am3517-evm to not depend on
  earlier bootloader versions

- Fix refcount leak for omap_gic_of_init

* tag 'omap-for-v5.18/fixes-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: logicpd-som-lv: Fix wrong pinmuxing on OMAP35
  ARM: dts: am3517-evm: Fix misc pinmuxing
  ARM: dts: am33xx-l4: Add missing touchscreen clock properties
  ARM: dts: Fix mmc order for omap3-gta04
  ARM: dts: dra7: Fix suspend warning for vpe powerdomain
  bus: ti-sysc: Make omap3 gpt12 quirk handling SoC specific
  ARM: OMAP2+: Fix refcount leak in omap_gic_of_init
  iommu/omap: Fix regression in probe for NULL pointer dereference

Link: https://lore.kernel.org/r/pull-1650543308-836725@atomide.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 90f21460 46ff3df8

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

+2 −0
Original line number Diff line number Diff line
@@ -263,6 +263,8 @@ 
				compatible = "ti,am3359-tscadc";

				reg = <0x0 0x1000>;

				interrupts = <16>;

				clocks = <&adc_tsc_fck>;

				clock-names = "fck";

				status = "disabled";

				dmas = <&edma 53 0>, <&edma 57 0>;

				dma-names = "fifo0", "fifo1";

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

+40 −5
Original line number Diff line number Diff line
@@ -161,6 +161,8 @@ 


	/* HS USB Host PHY on PORT 1 */

	hsusb1_phy: hsusb1_phy {

		pinctrl-names = "default";

		pinctrl-0 = <&hsusb1_rst_pins>;

		compatible = "usb-nop-xceiv";

		reset-gpios = <&gpio2 25 GPIO_ACTIVE_LOW>; /* gpio_57 */

		#phy-cells = <0>;
@@ -168,6 +170,8 @@ 
};



&davinci_emac {

	pinctrl-names = "default";

	pinctrl-0 = <&ethernet_pins>;

	status = "okay";

};
@@ -193,6 +197,8 @@ 
};



&i2c2 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c2_pins>;

	clock-frequency = <400000>;

	/* User DIP swithes [1:8] / User LEDS [1:2] */

	tca6416: gpio@21 {
@@ -205,6 +211,8 @@ 
};



&i2c3 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c3_pins>;

	clock-frequency = <400000>;

};
@@ -223,6 +231,8 @@ 
};



&usbhshost {

	pinctrl-names = "default";

	pinctrl-0 = <&hsusb1_pins>;

	port1-mode = "ehci-phy";

};
@@ -231,8 +241,35 @@ 
};



&omap3_pmx_core {

	pinctrl-names = "default";

	pinctrl-0 = <&hsusb1_rst_pins>;



	ethernet_pins: pinmux_ethernet_pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x21fe, PIN_INPUT | MUX_MODE0) /* rmii_mdio_data */

			OMAP3_CORE1_IOPAD(0x2200, MUX_MODE0) /* rmii_mdio_clk */

			OMAP3_CORE1_IOPAD(0x2202, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rmii_rxd0 */

			OMAP3_CORE1_IOPAD(0x2204, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rmii_rxd1 */

			OMAP3_CORE1_IOPAD(0x2206, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rmii_crs_dv */

			OMAP3_CORE1_IOPAD(0x2208, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* rmii_rxer */

			OMAP3_CORE1_IOPAD(0x220a, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* rmii_txd0 */

			OMAP3_CORE1_IOPAD(0x220c, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* rmii_txd1 */

			OMAP3_CORE1_IOPAD(0x220e, PIN_OUTPUT_PULLDOWN |MUX_MODE0) /* rmii_txen */

			OMAP3_CORE1_IOPAD(0x2210, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rmii_50mhz_clk */

		>;

	};



	i2c2_pins: pinmux_i2c2_pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x21be, PIN_INPUT_PULLUP | MUX_MODE0)  /* i2c2_scl */

			OMAP3_CORE1_IOPAD(0x21c0, PIN_INPUT_PULLUP | MUX_MODE0)  /* i2c2_sda */

		>;

	};



	i2c3_pins: pinmux_i2c3_pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x21c2, PIN_INPUT_PULLUP | MUX_MODE0)  /* i2c3_scl */

			OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT_PULLUP | MUX_MODE0)  /* i2c3_sda */

		>;

	};



	leds_pins: pinmux_leds_pins {

		pinctrl-single,pins = <
@@ -300,8 +337,6 @@ 
};



&omap3_pmx_core2 {

	pinctrl-names = "default";

	pinctrl-0 = <&hsusb1_pins>;



	hsusb1_pins: pinmux_hsusb1_pins {

		pinctrl-single,pins = <

arch/arm/boot/dts/am3517-som.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ 
};



&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins>;

	clock-frequency = <400000>;



	s35390a: s35390a@30 {
@@ -179,6 +181,13 @@ 


&omap3_pmx_core {



	i2c1_pins: pinmux_i2c1_pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x21ba, PIN_INPUT_PULLUP | MUX_MODE0)  /* i2c1_scl */

			OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT_PULLUP | MUX_MODE0)  /* i2c1_sda */

		>;

	};



	wl12xx_buffer_pins: pinmux_wl12xx_buffer_pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x2156, PIN_OUTPUT | MUX_MODE4)  /* mmc1_dat7.gpio_129 */

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

+2 −2
Original line number Diff line number Diff line
@@ -4188,11 +4188,11 @@ 
			reg = <0x1d0010 0x4>;

			reg-names = "sysc";

			ti,sysc-midle = <SYSC_IDLE_FORCE>,

					<SYSC_IDLE_NO>,

					<SYSC_IDLE_SMART>;

					<SYSC_IDLE_NO>;

			ti,sysc-sidle = <SYSC_IDLE_FORCE>,

					<SYSC_IDLE_NO>,

					<SYSC_IDLE_SMART>;

			power-domains = <&prm_vpe>;

			clocks = <&vpe_clkctrl DRA7_VPE_VPE_CLKCTRL 0>;

			clock-names = "fck";

			#address-cells = <1>;

arch/arm/boot/dts/logicpd-som-lv-35xx-devkit.dts

+15 −0
Original line number Diff line number Diff line
@@ -11,3 +11,18 @@ 
	model = "LogicPD Zoom OMAP35xx SOM-LV Development Kit";

	compatible = "logicpd,dm3730-som-lv-devkit", "ti,omap3430", "ti,omap3";

};



&omap3_pmx_core2 {

	pinctrl-names = "default";

	pinctrl-0 = <&hsusb2_2_pins>;

	hsusb2_2_pins: pinmux_hsusb2_2_pins {

		pinctrl-single,pins = <

			OMAP3430_CORE2_IOPAD(0x25f0, PIN_OUTPUT | MUX_MODE3)            /* etk_d10.hsusb2_clk */

			OMAP3430_CORE2_IOPAD(0x25f2, PIN_OUTPUT | MUX_MODE3)            /* etk_d11.hsusb2_stp */

			OMAP3430_CORE2_IOPAD(0x25f4, PIN_INPUT_PULLDOWN | MUX_MODE3)    /* etk_d12.hsusb2_dir */

			OMAP3430_CORE2_IOPAD(0x25f6, PIN_INPUT_PULLDOWN | MUX_MODE3)    /* etk_d13.hsusb2_nxt */

			OMAP3430_CORE2_IOPAD(0x25f8, PIN_INPUT_PULLDOWN | MUX_MODE3)    /* etk_d14.hsusb2_data0 */

			OMAP3430_CORE2_IOPAD(0x25fa, PIN_INPUT_PULLDOWN | MUX_MODE3)    /* etk_d15.hsusb2_data1 */

		>;

	};

};