Commit ae6e4598 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Few more fixes for omaps

Just few dts fixes:

- A fix droid4 touchscreen stopping working with lost gpio interrupts

- Also limit omap5 dma range similar to what we've recently done for dra7

* tag 'omap-for-v5.6/fixes-rc6-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: omap5: Add bus_dma_limit for L3 bus
  ARM: dts: omap4-droid4: Fix lost touchscreen interrupts
  ARM: dts: dra7: Add bus_dma_limit for L3 bus
  ARM: dts: N900: fix onenand timings
  ARM: dts: Fix dm814x Ethernet by changing to use rgmii-id mode

Link: https://lore.kernel.org/r/pull-1584575254-461940@atomide.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 05ff1e3f dfa7ea30

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

+2 −2
Original line number Diff line number Diff line
@@ -24,12 +24,12 @@ 


&cpsw_emac0 {

	phy-handle = <&ethphy0>;

	phy-mode = "rgmii";

	phy-mode = "rgmii-id";

};



&cpsw_emac1 {

	phy-handle = <&ethphy1>;

	phy-mode = "rgmii";

	phy-mode = "rgmii-id";

};



&davinci_mdio {

arch/arm/boot/dts/dm8148-t410.dts

+2 −2
Original line number Diff line number Diff line
@@ -33,12 +33,12 @@ 


&cpsw_emac0 {

	phy-handle = <&ethphy0>;

	phy-mode = "rgmii";

	phy-mode = "rgmii-id";

};



&cpsw_emac1 {

	phy-handle = <&ethphy1>;

	phy-mode = "rgmii";

	phy-mode = "rgmii-id";

};



&davinci_mdio {

arch/arm/boot/dts/dra62x-j5eco-evm.dts

+2 −2
Original line number Diff line number Diff line
@@ -24,12 +24,12 @@ 


&cpsw_emac0 {

	phy-handle = <&ethphy0>;

	phy-mode = "rgmii";

	phy-mode = "rgmii-id";

};



&cpsw_emac1 {

	phy-handle = <&ethphy1>;

	phy-mode = "rgmii";

	phy-mode = "rgmii-id";

};



&davinci_mdio {

arch/arm/boot/dts/dra7.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ 
		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0x0 0x0 0x0 0xc0000000>;

		dma-ranges = <0x80000000 0x0 0x80000000 0x80000000>;

		ti,hwmods = "l3_main_1", "l3_main_2";

		reg = <0x0 0x44000000 0x0 0x1000000>,

		      <0x0 0x45000000 0x0 0x1000>;

arch/arm/boot/dts/motorola-mapphone-common.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ 
		reset-gpios = <&gpio6 13 GPIO_ACTIVE_HIGH>; /* gpio173 */



		/* gpio_183 with sys_nirq2 pad as wakeup */

		interrupts-extended = <&gpio6 23 IRQ_TYPE_EDGE_FALLING>,

		interrupts-extended = <&gpio6 23 IRQ_TYPE_LEVEL_LOW>,

				      <&omap4_pmx_core 0x160>;

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

		wakeup-source;

CRA Git | Maintained and supported by SUSTech CRA and CCSE