| Message ID | 1450395544-9890-1-git-send-email-marex@denx.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, 17 Dec 2015, Marek Vasut wrote: > The socfpga.dtsi explicitly enabled MMC support, but not all boards are > equiped with an MMC card. There are setups which only have QSPI NOR. > Therefore, disable the MMC support on socfpga.dtsi level and enable it > on per-board basis. > > Signed-off-by: Marek Vasut <marex@denx.de> > Cc: Alan Tull <atull@altera.com> > Cc: Dinh Nguyen <dinguyen@opensource.altera.com> > Cc: Marek Vasut <marex@denx.de> > Cc: Olof Johansson <olof@lixom.net> > Cc: Thor Thayer <tthayer@altera.com> > Cc: Vince Bridgers <vbridgers2013@gmail.com> > --- > arch/arm/boot/dts/socfpga.dtsi | 1 + <snip> > diff --git a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts > index 54ed3f9..1a0c726 100644 > --- a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts > +++ b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts > @@ -172,6 +172,7 @@ > &mmc0 { > vmmc-supply = <®ulator_3_3v>; > vqmmc-supply = <®ulator_3_3v>; > + status = "okay"; > }; > > &qspi { This part doesn't apply to any of the upstream branches. "&qspi" has not been enabled yet, unless I have missed that patch? Can you please rebase this patch to my branch: git://git.kernel.org:pub/scm/linux/kernel/git/dinguyen/linux.git socfpga_for_next_v4.5_dts Thanks,, Dinh
On Friday, December 18, 2015 at 01:45:50 PM, Dinh Nguyen wrote: > On Thu, 17 Dec 2015, Marek Vasut wrote: > > The socfpga.dtsi explicitly enabled MMC support, but not all boards are > > equiped with an MMC card. There are setups which only have QSPI NOR. > > Therefore, disable the MMC support on socfpga.dtsi level and enable it > > on per-board basis. > > > > Signed-off-by: Marek Vasut <marex@denx.de> > > Cc: Alan Tull <atull@altera.com> > > Cc: Dinh Nguyen <dinguyen@opensource.altera.com> > > Cc: Marek Vasut <marex@denx.de> > > Cc: Olof Johansson <olof@lixom.net> > > Cc: Thor Thayer <tthayer@altera.com> > > Cc: Vince Bridgers <vbridgers2013@gmail.com> > > --- > > > > arch/arm/boot/dts/socfpga.dtsi | 1 + > > <snip> > > > diff --git a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts > > b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts index 54ed3f9..1a0c726 > > 100644 > > --- a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts > > +++ b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts > > @@ -172,6 +172,7 @@ > > > > &mmc0 { > > > > vmmc-supply = <®ulator_3_3v>; > > vqmmc-supply = <®ulator_3_3v>; > > > > + status = "okay"; > > > > }; > > > > &qspi { > > This part doesn't apply to any of the upstream branches. "&qspi" has not > been enabled yet, unless I have missed that patch? Can you please rebase > this patch to my branch: V2 is out, should be better. I'm still working on the QSPI and had this patch way too high in the queue, sorry about that ;-) > git://git.kernel.org:pub/scm/linux/kernel/git/dinguyen/linux.git > socfpga_for_next_v4.5_dts > > Thanks,, > Dinh Best regards, Marek Vasut
diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi index cffea91..ebcd081 100644 --- a/arch/arm/boot/dts/socfpga.dtsi +++ b/arch/arm/boot/dts/socfpga.dtsi @@ -677,6 +677,7 @@ #size-cells = <0>; clocks = <&l4_mp_clk>, <&sdmmc_clk_divided>; clock-names = "biu", "ciu"; + status = "disabled"; }; ocram: sram@ffff0000 { diff --git a/arch/arm/boot/dts/socfpga_arria5_socdk.dts b/arch/arm/boot/dts/socfpga_arria5_socdk.dts index a75a666..3c88678 100644 --- a/arch/arm/boot/dts/socfpga_arria5_socdk.dts +++ b/arch/arm/boot/dts/socfpga_arria5_socdk.dts @@ -79,6 +79,7 @@ &mmc0 { vmmc-supply = <®ulator_3_3v>; vqmmc-supply = <®ulator_3_3v>; + status = "okay"; }; &usb1 { diff --git a/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts b/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts index 555e9ca..afea364 100644 --- a/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts +++ b/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts @@ -100,6 +100,7 @@ &mmc0 { vmmc-supply = <®ulator_3_3v>; vqmmc-supply = <®ulator_3_3v>; + status = "okay"; }; &uart0 { diff --git a/arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi b/arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi index baecd98..f86f9c0 100644 --- a/arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi +++ b/arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi @@ -30,4 +30,5 @@ &mmc0 { /* On-SoM eMMC */ bus-width = <8>; + status = "okay"; }; diff --git a/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts b/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts index d4d0a28..15e43f4 100644 --- a/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts +++ b/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts @@ -84,6 +84,7 @@ cd-gpios = <&portb 18 0>; vmmc-supply = <®ulator_3_3v>; vqmmc-supply = <®ulator_3_3v>; + status = "okay"; }; &usb1 { diff --git a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts index 54ed3f9..1a0c726 100644 --- a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts +++ b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts @@ -172,6 +172,7 @@ &mmc0 { vmmc-supply = <®ulator_3_3v>; vqmmc-supply = <®ulator_3_3v>; + status = "okay"; }; &qspi {
The socfpga.dtsi explicitly enabled MMC support, but not all boards are equiped with an MMC card. There are setups which only have QSPI NOR. Therefore, disable the MMC support on socfpga.dtsi level and enable it on per-board basis. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Alan Tull <atull@altera.com> Cc: Dinh Nguyen <dinguyen@opensource.altera.com> Cc: Marek Vasut <marex@denx.de> Cc: Olof Johansson <olof@lixom.net> Cc: Thor Thayer <tthayer@altera.com> Cc: Vince Bridgers <vbridgers2013@gmail.com> --- arch/arm/boot/dts/socfpga.dtsi | 1 + arch/arm/boot/dts/socfpga_arria5_socdk.dts | 1 + arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts | 1 + arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi | 1 + arch/arm/boot/dts/socfpga_cyclone5_socdk.dts | 1 + arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 1 + 6 files changed, 6 insertions(+) NOTE: This should not cause any trouble, since I checked all the boards for the presence of the HPS SD card slot / eMMC.