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

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

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

Fixes for omaps for v5.4-rc cycle

More fixes for omap variants:

- Update more panel options in omap2plus_defconfig that got changed
  as we moved to use generic LCD panels

- Remove unused twl_keypad for logicpd-torpedo-som to avoid boot
  time warnings. This is only a cosmetic fix, but at least dmesg output
  is now getting more readable after all the fixes to remove pointless
  warnings

- Fix gpu_cm node name as we still have a non-standard node name
  dependency for clocks. This should eventually get fixed by use
  of domain specific compatible property

- Fix use of i2c-mux-idle-disconnect for m3874-iceboard

- Use level interrupt for omap4 & 5 wlcore to avoid lost edge
  interrupts

* tag 'omap-for-v5.4/fixes-rc3-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: Use level interrupt for omap4 & 5 wlcore
  ARM: dts: am3874-iceboard: Fix 'i2c-mux-idle-disconnect' usage
  ARM: dts: omap5: fix gpu_cm clock provider name
  ARM: dts: logicpd-torpedo-som: Remove twl_keypad
  ARM: omap2plus_defconfig: Fix selected panels after generic panel changes

Link: https://lore.kernel.org/r/pull-1571242890-118432@atomide.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 94aade94 17a9e5bb

arch/arm/boot/dts/am3874-iceboard.dts

+1 −8
Original line number Diff line number Diff line
@@ -111,13 +111,13 @@ 
		reg = <0x70>;

		#address-cells = <1>;

		#size-cells = <0>;

		i2c-mux-idle-disconnect;



		i2c@0 {

			/* FMC A */

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0>;

			i2c-mux-idle-disconnect;

		};



		i2c@1 {
@@ -125,7 +125,6 @@ 
			#address-cells = <1>;

			#size-cells = <0>;

			reg = <1>;

			i2c-mux-idle-disconnect;

		};



		i2c@2 {
@@ -133,7 +132,6 @@ 
			#address-cells = <1>;

			#size-cells = <0>;

			reg = <2>;

			i2c-mux-idle-disconnect;

		};



		i2c@3 {
@@ -141,7 +139,6 @@ 
			#address-cells = <1>;

			#size-cells = <0>;

			reg = <3>;

			i2c-mux-idle-disconnect;

		};



		i2c@4 {
@@ -149,14 +146,12 @@ 
			#address-cells = <1>;

			#size-cells = <0>;

			reg = <4>;

			i2c-mux-idle-disconnect;

		};



		i2c@5 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <5>;

			i2c-mux-idle-disconnect;



			ina230@40 { compatible = "ti,ina230"; reg = <0x40>; shunt-resistor = <5000>; };

			ina230@41 { compatible = "ti,ina230"; reg = <0x41>; shunt-resistor = <5000>; };
@@ -182,14 +177,12 @@ 
			#address-cells = <1>;

			#size-cells = <0>;

			reg = <6>;

			i2c-mux-idle-disconnect;

		};



		i2c@7 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <7>;

			i2c-mux-idle-disconnect;



			u41: pca9575@20 {

				compatible = "nxp,pca9575";

arch/arm/boot/dts/logicpd-torpedo-som.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -192,3 +192,7 @@ 
&twl_gpio {

	ti,use-leds;

};



&twl_keypad {

	status = "disabled";

};

arch/arm/boot/dts/omap4-droid4-xt894.dts

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ 
		compatible = "ti,wl1285", "ti,wl1283";

		reg = <2>;

		/* gpio_100 with gpmc_wait2 pad as wakeirq */

		interrupts-extended = <&gpio4 4 IRQ_TYPE_EDGE_RISING>,

		interrupts-extended = <&gpio4 4 IRQ_TYPE_LEVEL_HIGH>,

				      <&omap4_pmx_core 0x4e>;

		interrupt-names = "irq", "wakeup";

		ref-clock-frequency = <26000000>;

arch/arm/boot/dts/omap4-panda-common.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ 
		compatible = "ti,wl1271";

		reg = <2>;

		/* gpio_53 with gpmc_ncs3 pad as wakeup */

		interrupts-extended = <&gpio2 21 IRQ_TYPE_EDGE_RISING>,

		interrupts-extended = <&gpio2 21 IRQ_TYPE_LEVEL_HIGH>,

				      <&omap4_pmx_core 0x3a>;

		interrupt-names = "irq", "wakeup";

		ref-clock-frequency = <38400000>;

arch/arm/boot/dts/omap4-sdp.dts

+1 −1
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ 
		compatible = "ti,wl1281";

		reg = <2>;

		interrupt-parent = <&gpio1>;

		interrupts = <21 IRQ_TYPE_EDGE_RISING>; /* gpio 53 */

		interrupts = <21 IRQ_TYPE_LEVEL_HIGH>; /* gpio 53 */

		ref-clock-frequency = <26000000>;

		tcxo-clock-frequency = <26000000>;

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE