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

Commit 4fbc400c authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'socfpga_fixes_for_3.18' of git://git.rocketboards.org/linux-socfpga-next into fixes 

Merge "SOCFPGA fixes for 3.18" from Dinh Nguyen:

These patches fixes an SMP and SDMMC driver hang during boot up on the
SOCFPGA platform.

Patch "arm: socfpga: fix fetching cpu1start_addr for SMP" fixes the SMP
trampoline code in order for CPU1 to correctly fetch it's cpu1start_addr.

Patch "ARM: dts: socfpga: rename gpio nodes" renames that GPIO node in order
to allow a standard way of specifying status="okay" in the board DTS file.

Patch "ARM: dts: socfpga: Fix SD card detect" fixes a SDMMC driver hang
during boot. The reason for the hang was the deferred probe of the SDMMC
driver was waiting for the GPIO resource that would never come.

Patch "ARM: dts: socfpga: Add a 3.3V fixed regulator node" adds a fixed
regulator node for the SDMMC driver to use.

* tag 'socfpga_fixes_for_3.18' of git://git.rocketboards.org/linux-socfpga-next

:
  ARM: dts: socfpga: Add a 3.3V fixed regulator node
  ARM: dts: socfpga: Fix SD card detect
  ARM: dts: socfpga: rename gpio nodes
  arm: socfpga: fix fetching cpu1start_addr for SMP

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 184f84d9 efb4a44e

arch/arm/boot/dts/socfpga.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ 
			status = "disabled";

		};



		gpio@ff708000 {

		gpio0: gpio@ff708000 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "snps,dw-apb-gpio";
@@ -555,7 +555,7 @@ 
			clocks = <&per_base_clk>;

			status = "disabled";



			gpio0: gpio-controller@0 {

			porta: gpio-controller@0 {

				compatible = "snps,dw-apb-gpio-port";

				gpio-controller;

				#gpio-cells = <2>;
@@ -567,7 +567,7 @@ 
			};

		};



		gpio@ff709000 {

		gpio1: gpio@ff709000 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "snps,dw-apb-gpio";
@@ -575,7 +575,7 @@ 
			clocks = <&per_base_clk>;

			status = "disabled";



			gpio1: gpio-controller@0 {

			portb: gpio-controller@0 {

				compatible = "snps,dw-apb-gpio-port";

				gpio-controller;

				#gpio-cells = <2>;
@@ -587,7 +587,7 @@ 
			};

		};



		gpio@ff70a000 {

		gpio2: gpio@ff70a000 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "snps,dw-apb-gpio";
@@ -595,7 +595,7 @@ 
			clocks = <&per_base_clk>;

			status = "disabled";



			gpio2: gpio-controller@0 {

			portc: gpio-controller@0 {

				compatible = "snps,dw-apb-gpio-port";

				gpio-controller;

				#gpio-cells = <2>;

arch/arm/boot/dts/socfpga_arria5.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
			};

		};



		dwmmc0@ff704000 {

		mmc0: dwmmc0@ff704000 {

			num-slots = <1>;

			broken-cd;

			bus-width = <4>;

arch/arm/boot/dts/socfpga_arria5_socdk.dts

+12 −0
Original line number Diff line number Diff line
@@ -37,6 +37,13 @@ 
		*/

		ethernet0 = &gmac1;

	};



	regulator_3_3v: 3-3-v-regulator {

		compatible = "regulator-fixed";

		regulator-name = "3.3V";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};

};



&gmac1 {
@@ -68,6 +75,11 @@ 
	};

};



&mmc0 {

	vmmc-supply = <&regulator_3_3v>;

	vqmmc-supply = <&regulator_3_3v>;

};



&usb1 {

	status = "okay";

};

arch/arm/boot/dts/socfpga_cyclone5_socdk.dts

+14 −1
Original line number Diff line number Diff line
@@ -37,6 +37,13 @@ 
		 */

		ethernet0 = &gmac1;

	};



	regulator_3_3v: 3-3-v-regulator {

		compatible = "regulator-fixed";

		regulator-name = "3.3V";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};

};



&gmac1 {
@@ -53,6 +60,10 @@ 
	rxc-skew-ps = <2000>;

};



&gpio1 {

	status = "okay";

};



&i2c0 {

	status = "okay";
@@ -69,7 +80,9 @@ 
};



&mmc0 {

	cd-gpios = <&gpio1 18 0>;

	cd-gpios = <&portb 18 0>;

	vmmc-supply = <&regulator_3_3v>;

	vqmmc-supply = <&regulator_3_3v>;

};



&usb1 {

arch/arm/boot/dts/socfpga_cyclone5_sockit.dts

+12 −0
Original line number Diff line number Diff line
@@ -37,6 +37,13 @@ 
		 */

		ethernet0 = &gmac1;

	};



	regulator_3_3v: vcc3p3-regulator {

		compatible = "regulator-fixed";

		regulator-name = "VCC3P3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};

};



&gmac1 {
@@ -53,6 +60,11 @@ 
	rxc-skew-ps = <2000>;

};



&mmc0 {

	vmmc-supply = <&regulator_3_3v>;

	vqmmc-supply = <&regulator_3_3v>;

};



&usb1 {

	status = "okay";

};