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

Merge tag 'socfpga_dts_for_v4.5_part_2' of... 

Merge tag 'socfpga_dts_for_v4.5_part_2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/dt

SoCFPGA DTS update for v4.5, part 2
- clean up mcvevk dts file, replace space with tab
- Disable SDMMC node in base socfpga.dtsi file

* tag 'socfpga_dts_for_v4.5_part_2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux

:
  ARM: socfpga: dts: Enable MMC support at correct place in the DT
  ARM: socfpga: Repair incorrectly applied MCV patch

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 84658cbd 91f69147

arch/arm/boot/dts/socfpga.dtsi

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

			clocks = <&l4_mp_clk>, <&sdmmc_clk_divided>;

			clock-names = "biu", "ciu";

			status = "disabled";

		};



		ocram: sram@ffff0000 {

arch/arm/boot/dts/socfpga_arria5_socdk.dts

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ 
&mmc0 {

	vmmc-supply = <&regulator_3_3v>;

	vqmmc-supply = <&regulator_3_3v>;

	status = "okay";

};



&usb1 {

arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ 
&mmc0 {

	vmmc-supply = <&regulator_3_3v>;

	vqmmc-supply = <&regulator_3_3v>;

	status = "okay";

};



&uart0 {

arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi

+10 −9
Original line number Diff line number Diff line
@@ -30,4 +30,5 @@ 


&mmc0 {	/* On-SoM eMMC */

	bus-width = <8>;

	status = "okay";

};

arch/arm/boot/dts/socfpga_cyclone5_socdk.dts

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ 
	cd-gpios = <&portb 18 0>;

	vmmc-supply = <&regulator_3_3v>;

	vqmmc-supply = <&regulator_3_3v>;

	status = "okay";

};



&usb1 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE