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

Commit 1e63dca7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-4.2-rc3' of git://git.linaro.org/people/ulf.hansson/mmc 

Pull MMC fixes from Ulf Hansson:
 "Here are some mmc fixes intended for v4.2 rc4.

  Note, most of the changes are for the sdhci-esdhc-imx controller,
  which also required us to modify some related DTS files.  Those
  changes have been acked by the SoC maintainer.

  MMC core:
   - Fix a reference inbalance issue for power_ro_lock_show() sysfs handler

  MMC host:
   - omap_hsmmc: Fix IRQ errorhandling for CD, DTO, and CRC
   - sdhci: Prevent a kernel panic while using DMA
   - mtk-sd: Let it depend on HAS_DMA to prevent build errors
   - sdhci-esdhc: Make 8BIT bus work
   - sdhci-esdhc-imx: Fix some regressions for DT based platforms
   - sdhci-pxav3: Fix a regression for DT based platforms"

* tag 'mmc-4.2-rc3' of git://git.linaro.org/people/ulf.hansson/mmc:
  mmc: sdhci-pxav3: fix platform_data is not initialized
  dts: mmc: fsl-imx-esdhc: remove fsl,cd-controller support
  mmc: sdhci-esdhc-imx: clear f_max in boarddata
  mmc: sdhci-esdhc-imx: remove duplicated dts parsing
  mmc: sdhci: make max-frequency property in device tree work
  mmc: sdhci-esdhc-imx: move all non dt probe code into one function
  mmc: sdhci-esdhc-imx: fix cd regression for dt platform
  dts: imx7: fix sd card gpio polarity specified in device tree
  dts: imx25: fix sd card gpio polarity specified in device tree
  dts: imx6: fix sd card gpio polarity specified in device tree
  dts: imx53: fix sd card gpio polarity specified in device tree
  dts: imx51: fix sd card gpio polarity specified in device tree
  mmc: sdhci-esdhc: Make 8BIT bus work
  mmc: block: Add missing mmc_blk_put() in power_ro_lock_show()
  mmc: MMC_MTK should depend on HAS_DMA
  mmc: sdhci check parameters before call dma_free_coherent
  mmc: omap_hsmmc: Handle BADA, DEB and CEB interrupts
  mmc: omap_hsmmc: Fix DTO and DCRC handling
parents a52bd79e 9cd76049

Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt

+0 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ Required properties: 
	       "fsl,imx6sx-usdhc"



Optional properties:

- fsl,cd-controller : Indicate to use controller internal card detection

- fsl,wp-controller : Indicate to use controller internal write protection

- fsl,delay-line : Specify the number of delay cells for override mode.

  This is used to set the clock delay for DLL(Delay Line) on override mode
@@ -35,7 +34,6 @@ esdhc@70004000 { 
	compatible = "fsl,imx51-esdhc";

	reg = <0x70004000 0x4000>;

	interrupts = <1>;

	fsl,cd-controller;

	fsl,wp-controller;

};

arch/arm/boot/dts/imx25-pdk.dts

+3 −2
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 */



/dts-v1/;

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/input.h>

#include "imx25.dtsi"
@@ -114,8 +115,8 @@ 
&esdhc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_esdhc1>;

	cd-gpios = <&gpio2 1 0>;

	wp-gpios = <&gpio2 0 0>;

	cd-gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;

	wp-gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>;

	status = "okay";

};

arch/arm/boot/dts/imx51-apf51dev.dts

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ 
&esdhc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_esdhc1>;

	cd-gpios = <&gpio2 29 GPIO_ACTIVE_HIGH>;

	cd-gpios = <&gpio2 29 GPIO_ACTIVE_LOW>;

	bus-width = <4>;

	status = "okay";

};

arch/arm/boot/dts/imx53-ard.dts

+2 −2
Original line number Diff line number Diff line
@@ -103,8 +103,8 @@ 
&esdhc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_esdhc1>;

	cd-gpios = <&gpio1 1 0>;

	wp-gpios = <&gpio1 9 0>;

	cd-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;

	wp-gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;

	status = "okay";

};

arch/arm/boot/dts/imx53-m53evk.dts

+2 −2
Original line number Diff line number Diff line
@@ -124,8 +124,8 @@ 
&esdhc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_esdhc1>;

	cd-gpios = <&gpio1 1 0>;

	wp-gpios = <&gpio1 9 0>;

	cd-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;

	wp-gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;

	status = "okay";

};