1 From 6b8c64eb90e5d958f32524ff2d0571b3b6ac92df Mon Sep 17 00:00:00 2001
2 From: Marek Vasut <marex@denx.de>
3 Date: Mon, 21 Dec 2015 00:42:01 -0600
4 Subject: [PATCH 3/5] ARM: socfpga: dts: Enable MMC support at correct place in
7 The socfpga.dtsi explicitly enabled MMC support, but not all boards are
8 equiped with an MMC card. There are setups which only have QSPI NOR.
9 Therefore, disable the MMC support on socfpga.dtsi level and enable it
12 Signed-off-by: Marek Vasut <marex@denx.de>
13 Cc: Alan Tull <atull@altera.com>
14 Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
15 Cc: Marek Vasut <marex@denx.de>
16 Cc: Olof Johansson <olof@lixom.net>
17 Cc: Thor Thayer <tthayer@altera.com>
18 Cc: Vince Bridgers <vbridgers2013@gmail.com>
19 Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
21 arch/arm/boot/dts/socfpga.dtsi | 1 +
22 arch/arm/boot/dts/socfpga_arria5_socdk.dts | 1 +
23 arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts | 1 +
24 arch/arm/boot/dts/socfpga_cyclone5_socdk.dts | 1 +
25 arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 1 +
26 5 files changed, 5 insertions(+)
28 diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi
29 index 39c470e..3ed4abd 100644
30 --- a/arch/arm/boot/dts/socfpga.dtsi
31 +++ b/arch/arm/boot/dts/socfpga.dtsi
34 clocks = <&l4_mp_clk>, <&sdmmc_clk_divided>;
35 clock-names = "biu", "ciu";
36 + status = "disabled";
39 ocram: sram@ffff0000 {
40 diff --git a/arch/arm/boot/dts/socfpga_arria5_socdk.dts b/arch/arm/boot/dts/socfpga_arria5_socdk.dts
41 index a75a666..3c88678 100644
42 --- a/arch/arm/boot/dts/socfpga_arria5_socdk.dts
43 +++ b/arch/arm/boot/dts/socfpga_arria5_socdk.dts
46 vmmc-supply = <®ulator_3_3v>;
47 vqmmc-supply = <®ulator_3_3v>;
52 diff --git a/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts b/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts
53 index 555e9ca..afea364 100644
54 --- a/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts
55 +++ b/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts
58 vmmc-supply = <®ulator_3_3v>;
59 vqmmc-supply = <®ulator_3_3v>;
64 diff --git a/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts b/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts
65 index d4d0a28..15e43f4 100644
66 --- a/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts
67 +++ b/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts
69 cd-gpios = <&portb 18 0>;
70 vmmc-supply = <®ulator_3_3v>;
71 vqmmc-supply = <®ulator_3_3v>;
76 diff --git a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
77 index 48bf651..b61f22f 100644
78 --- a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
79 +++ b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
82 vmmc-supply = <®ulator_3_3v>;
83 vqmmc-supply = <®ulator_3_3v>;