Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de9949a4 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: dts: Fix GPMC Ethernet timings for omap cm-t sbc-t boards for device tree 



Looks like we have wrong GPMC timings we have for the cm-t and
sbc-t boards. This can cause occasional strange errors with at
least doing an rsync of large files or doing apt-get dist-upgrade.

Let's fix the issue in two phases. First let's simplify cm-t and
sbc-t to use the shared omap-gpmc-smsc911x.dtsi to avoid fixing
the issue in multiple places. Then we can fix the timings in
a single place with a follow-up patch.

Cc: Dmitry Lifshitz <lifshitz@compulab.co.il>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 20f670dc

arch/arm/boot/dts/omap3-cm-t3x30.dtsi

+3 −39
Original line number Diff line number Diff line
@@ -10,18 +10,6 @@ 
			cpu0-supply = <&vcc>;

		};

	};



	vddvario: regulator-vddvario {

		compatible = "regulator-fixed";

		regulator-name = "vddvario";

		regulator-always-on;

	};



	vdd33a: regulator-vdd33a {

		compatible = "regulator-fixed";

		regulator-name = "vdd33a";

		regulator-always-on;

	};

};



&omap3_pmx_core {
@@ -51,42 +39,18 @@ 
	};

};



#include "omap-gpmc-smsc911x.dtsi"



&gpmc {

	ranges = <5 0 0x2c000000 0x01000000>;



	smsc1: ethernet@5,0 {

	smsc1: ethernet@gpmc {

		compatible = "smsc,lan9221", "smsc,lan9115";

		pinctrl-names = "default";

		pinctrl-0 = <&smsc1_pins>;

		interrupt-parent = <&gpio6>;

		interrupts = <3 IRQ_TYPE_LEVEL_LOW>;

		reg = <5 0 0xff>;

		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,adv-wr-off-ns = <48>;

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

		gpmc,oe-off-ns = <168>;

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

		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,cycle2cycle-samecsen;

		gpmc,cycle2cycle-diffcsen;

		vddvario-supply = <&vddvario>;

		vdd33a-supply = <&vdd33a>;

		reg-io-width = <4>;

		smsc,save-mac-address;

	};

};

arch/arm/boot/dts/omap3-sb-t35.dtsi

+2 −16
Original line number Diff line number Diff line
@@ -2,20 +2,6 @@ 
 * Common support for CompuLab SB-T35 used on SBC-T3530, SBC-T3517 and SBC-T3730

 */



/ {

	vddvario_sb_t35: regulator-vddvario-sb-t35 {

		compatible = "regulator-fixed";

		regulator-name = "vddvario";

		regulator-always-on;

	};



	vdd33a_sb_t35: regulator-vdd33a-sb-t35 {

		compatible = "regulator-fixed";

		regulator-name = "vdd33a";

		regulator-always-on;

	};

};



&omap3_pmx_core {

	smsc2_pins: pinmux_smsc2_pins {

		pinctrl-single,pins = <
@@ -57,8 +43,8 @@ 
		gpmc,wr-access-ns = <186>;

		gpmc,cycle2cycle-samecsen;

		gpmc,cycle2cycle-diffcsen;

		vddvario-supply = <&vddvario_sb_t35>;

		vdd33a-supply = <&vdd33a_sb_t35>;

		vddvario-supply = <&vddvario>;

		vdd33a-supply = <&vdd33a>;

		reg-io-width = <4>;

		smsc,save-mac-address;

	};

arch/arm/boot/dts/omap3-sbc-t3517.dts

+13 −0
Original line number Diff line number Diff line
@@ -8,6 +8,19 @@ 
/ {

	model = "CompuLab SBC-T3517 with CM-T3517";

	compatible = "compulab,omap3-sbc-t3517", "compulab,omap3-cm-t3517", "ti,am3517", "ti,omap3";



	/* Only one GPMC smsc9220 on SBC-T3517, CM-T3517 uses am35x Ethernet */

	vddvario: regulator-vddvario-sb-t35 {

		compatible = "regulator-fixed";

		regulator-name = "vddvario";

		regulator-always-on;

	};



	vdd33a: regulator-vdd33a-sb-t35 {

		compatible = "regulator-fixed";

		regulator-name = "vdd33a";

		regulator-always-on;

	};

};



&omap3_pmx_core {