Commit 9a2044fc authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v3.15/fixes-gpmc' of... 

Merge tag 'omap-for-v3.15/fixes-gpmc' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Merge fixes from Tony Lindgren:

Mostly fixes for occasional memory corruption caused by bad
timings for smc911x LAN9220 (and potentially LAN9221) devices
that were noted on a cm-t3730 system. Also fix THUMB mode
for SMP, and mailbox related warnings when booted with device
tree.

* tag 'omap-for-v3.15/fixes-gpmc' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: dts: AM3517: Disable absent IPs inherited from OMAP3
  ARM: dts: OMAP2: Fix interrupts for OMAP2420 mailbox
  ARM: dts: OMAP5: Add mailbox dt node to fix boot warning
  ARM: OMAP5: Switch to THUMB mode if needed on secondary CPU
  ARM: dts: am437x-gp-evm: Do not reset gpio5
  ARM: dts: omap3-igep0020: use SMSC9221 timings
  ARM: dts: Fix GPMC timings for LAN9220
  ARM: dts: Fix GPMC Ethernet timings for omap cm-t sbc-t boards for device tree
  ARM: dts: Fix bad OTG muxing for cm-t boards

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 12e8e595 4c051603

arch/arm/boot/dts/am3517.dtsi

+16 −0
Original line number Diff line number Diff line
@@ -62,5 +62,21 @@ 
	};

};



&iva {

	status = "disabled";

};



&mailbox {

	status = "disabled";

};



&mmu_isp {

	status = "disabled";

};



&smartreflex_mpu_iva {

	status = "disabled";

};



/include/ "am35xx-clocks.dtsi"

/include/ "omap36xx-am35xx-omap3430es2plus-clocks.dtsi"

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

+5 −0
Original line number Diff line number Diff line
@@ -117,6 +117,11 @@ 
	status = "okay";

};



&gpio5 {

	status = "okay";

	ti,no-reset-on-init;

};



&mmc1 {

	status = "okay";

	vmmc-supply = <&vmmcsd_fixed>;

arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi

+8 −11
Original line number Diff line number Diff line
@@ -24,11 +24,10 @@ 
		compatible = "smsc,lan9221", "smsc,lan9115";

		bank-width = <2>;

		gpmc,mux-add-data;

		gpmc,cs-on-ns = <0>;

		gpmc,cs-rd-off-ns = <186>;

		gpmc,cs-wr-off-ns = <186>;

		gpmc,adv-on-ns = <12>;

		gpmc,adv-rd-off-ns = <48>;

		gpmc,cs-on-ns = <1>;

		gpmc,cs-rd-off-ns = <180>;

		gpmc,cs-wr-off-ns = <180>;

		gpmc,adv-rd-off-ns = <18>;

		gpmc,adv-wr-off-ns = <48>;

		gpmc,oe-on-ns = <54>;

		gpmc,oe-off-ns = <168>;
@@ -36,12 +35,10 @@ 
		gpmc,we-off-ns = <168>;

		gpmc,rd-cycle-ns = <186>;

		gpmc,wr-cycle-ns = <186>;

		gpmc,access-ns = <114>;

		gpmc,page-burst-access-ns = <6>;

		gpmc,bus-turnaround-ns = <12>;

		gpmc,cycle2cycle-delay-ns = <18>;

		gpmc,wr-data-mux-bus-ns = <90>;

		gpmc,wr-access-ns = <186>;

		gpmc,access-ns = <144>;

		gpmc,page-burst-access-ns = <24>;

		gpmc,bus-turnaround-ns = <90>;

		gpmc,cycle2cycle-delay-ns = <90>;

		gpmc,cycle2cycle-samecsen;

		gpmc,cycle2cycle-diffcsen;

		vddvario-supply = <&vddvario>;

arch/arm/boot/dts/omap2.dtsi

+0 −7
Original line number Diff line number Diff line
@@ -71,13 +71,6 @@ 
			interrupts = <58>;

		};



		mailbox: mailbox@48094000 {

			compatible = "ti,omap2-mailbox";

			ti,hwmods = "mailbox";

			reg = <0x48094000 0x200>;

			interrupts = <26>;

		};



		intc: interrupt-controller@1 {

			compatible = "ti,omap2-intc";

			interrupt-controller;

arch/arm/boot/dts/omap2420.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -125,6 +125,14 @@ 
			dma-names = "tx", "rx";

		};



		mailbox: mailbox@48094000 {

			compatible = "ti,omap2-mailbox";

			reg = <0x48094000 0x200>;

			interrupts = <26>, <34>;

			interrupt-names = "dsp", "iva";

			ti,hwmods = "mailbox";

		};



		timer1: timer@48028000 {

			compatible = "ti,omap2420-timer";

			reg = <0x48028000 0x400>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE