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

Commit a2d48756 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-v4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc 

Pull MMC fixes from Ulf Hansson:
 "Here are a couple of mmc fixes intended for v4.13-rc1.

  I have also included a couple of cleanup patches in this pull request
  for OMAP2+, related to the omap_hsmmc driver. The reason is because of
  the changes are also depending on OMAP SoC specific code, so this
  simplifies how to deal with this.

  Summary:

  MMC host:
   - sunxi: Correct time phase settings
   - omap_hsmmc: Clean up some dead code
   - dw_mmc: Fix message printed for deprecated num-slots DT binding
   - dw_mmc: Fix DT documentation"

* tag 'mmc-v4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  Documentation: dw-mshc: deprecate num-slots
  mmc: dw_mmc: fix the wrong condition check of getting num-slots from DT
  mmc: host: omap_hsmmc: remove unused platform callbacks
  ARM: OMAP2+: hsmmc.c: Remove dead code
  mmc: sunxi: Keep default timing phase settings for new timing mode
parents 0b5477d9 3f5b4b79

Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ Example: 
	};



	dwmmc0@12200000 {

		num-slots = <1>;

		cap-mmc-highspeed;

		cap-sd-highspeed;

		broken-cd;

Documentation/devicetree/bindings/mmc/img-dw-mshc.txt

+0 −1
Original line number Diff line number Diff line
@@ -24,6 +24,5 @@ Example: 


		fifo-depth = <0x20>;

		bus-width = <4>;

		num-slots = <1>;

		disable-wp;

	};

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt

+0 −2
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ Example: 


	/* Board portion */

	dwmmc0@fcd03000 {

		num-slots = <1>;

		vmmc-supply = <&ldo12>;

		fifo-depth = <0x100>;

		pinctrl-names = "default";
@@ -52,7 +51,6 @@ Example: 


	dwmmc_1: dwmmc1@f723e000 {

		compatible = "hisilicon,hi6220-dw-mshc";

		num-slots = <0x1>;

		bus-width = <0x4>;

		disable-wp;

		cap-sd-highspeed;

Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt

+7 −9
Original line number Diff line number Diff line
@@ -12,12 +12,12 @@ Required Properties: 
* #address-cells: should be 1.

* #size-cells: should be 0.



# Slots: The slot specific information are contained within child-nodes with

  each child-node representing a supported slot. There should be atleast one

  child node representing a card slot. The name of the child node representing

  the slot is recommended to be slot@n where n is the unique number of the slot

  connected to the controller. The following are optional properties which

  can be included in the slot child node.

# Slots (DEPRECATED): The slot specific information are contained within

  child-nodes with each child-node representing a supported slot. There should

  be atleast one child node representing a card slot. The name of the child node

  representing the slot is recommended to be slot@n where n is the unique number

  of the slot connected to the controller. The following are optional properties

  which can be included in the slot child node.



	* reg: specifies the physical slot number. The valid values of this

	  property is 0 to (num-slots -1), where num-slots is the value
@@ -63,7 +63,7 @@ Optional properties: 
  clock(cclk_out). If it's not specified, max is 200MHZ and min is 400KHz by default.

	  (Use the "max-frequency" instead of "clock-freq-min-max".)



* num-slots: specifies the number of slots supported by the controller.

* num-slots (DEPRECATED): specifies the number of slots supported by the controller.

  The number of physical slots actually used could be equal or less than the

  value specified by num-slots. If this property is not specified, the value

  of num-slot property is assumed to be 1.
@@ -124,7 +124,6 @@ board specific portions as listed below. 
	dwmmc0@12200000 {

		clock-frequency = <400000000>;

		clock-freq-min-max = <400000 200000000>;

		num-slots = <1>;

		broken-cd;

		fifo-depth = <0x80>;

		card-detect-delay = <200>;
@@ -139,7 +138,6 @@ board specific portions as listed below. 
	dwmmc0@12200000 {

		clock-frequency = <400000000>;

		clock-freq-min-max = <400000 200000000>;

		num-slots = <1>;

		broken-cd;

		fifo-depth = <0x80>;

		card-detect-delay = <200>;

Documentation/devicetree/bindings/mmc/zx-dw-mshc.txt

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ Example: 
		clock-frequency = <50000000>;

		clocks = <&topcrm SD0_AHB>, <&topcrm SD0_WCLK>;

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

		num-slots = <1>;

		max-frequency = <50000000>;

		cap-sdio-irq;

		cap-sd-highspeed;