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

Merge tag 'omap-for-v4.18/dt-sdhci-signed' of... 

Merge tag 'omap-for-v4.18/dt-sdhci-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Device tree changes for omap variants for SDHCI

This series adds the devicetree configuration needed for pinctrl on
dra7 variants to use the SDHCI SDIO driver instead of mmc-omap-hs
driver. To use SDHCI, both the pins and the iodelay needs to be
configured.

This series is based on the related SDHCI drivers changes on a branch
set up by Ulf.

* tag 'omap-for-v4.18/dt-sdhci-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

: (28 commits)
  Documentation: ARM: Add new MMC requirements for DRA7/K2G
  ARM: dts: dra7: Add high speed modes capability to MMC1/MMC2 dt node
  ARM: dts: dra7: Use sdhci-omap programming model
  ARM: dts: dra76-evm: Add wilink8 wlan support
  ARM: dts: dra7-evm: Add wilink8 wlan support
  ARM: dts: dra7-evm: Model EVM_3V6 regulator
  ARM: dts: dra72-evm-common: Add wilink8 wlan support
  ARM: dts: am57xx-beagle-x15/am57xx-idk: Fix pinctrl-names
  ARM: dts: am574x-idk: Add pinmux configuration for MMC
  ARM: dts: dra71-evm: Use pinctrl group from dra7-mmc-iodelay.dtsi to select pulldown
  ARM: dts: am57xx-idk: Use pinctrl group from dra7-mmc-iodelay.dtsi to select pulldown
  ARM: dts: dra7-mmc-iodelay: Add a new pinctrl group for clk line without pullup
  ARM: dts: dra71-evm: Add "vqmmc-supply" property for mmc2
  ARM: dts: dra72-evm-common: Remove mmc specific pinmux
  mmc: sdhci-omap: Get IODelay values for 3.3v DDR mode
  dt-bindings: sdhci-omap: Add pinctrl bindings
  mmc: sdhci-omap: Add sdhci_omap specific ops for enable_sdio_irq
  mmc: sdhci-omap: Add support for MMC/SD controller in k2g SoC
  dt-bindings: sdhci-omap: Add K2G specific binding
  mmc: sdhci-omap: Workaround for Errata i834
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 09411939 24a6f1f6

Documentation/arm/OMAP/README

+4 −0
Original line number Diff line number Diff line
@@ -5,3 +5,7 @@ KERNEL NEW DEPENDENCIES 
v4.3+		Update is needed for custom .config files to make sure

		CONFIG_REGULATOR_PBIAS is enabled for MMC1 to work

		properly.



v4.18+		Update is needed for custom .config files to make sure

		CONFIG_MMC_SDHCI_OMAP is enabled for all MMC instances

		to work in DRA7 and K2G based boards.

Documentation/devicetree/bindings/mmc/sdhci-omap.txt

+7 −0
Original line number Diff line number Diff line
@@ -4,7 +4,14 @@ Refer to mmc.txt for standard MMC bindings. 


Required properties:

- compatible: Should be "ti,dra7-sdhci" for DRA7 and DRA72 controllers

	      Should be "ti,k2g-sdhci" for K2G

- ti,hwmods: Must be "mmc<n>", <n> is controller instance starting 1

	     (Not required for K2G).

- pinctrl-names: Should be subset of "default", "hs", "sdr12", "sdr25", "sdr50",

		 "ddr50-rev11", "sdr104-rev11", "ddr50", "sdr104",

		 "ddr_1_8v-rev11", "ddr_1_8v" or "ddr_3_3v", "hs200_1_8v-rev11",

		 "hs200_1_8v",

- pinctrl-<n> : Pinctrl states as described in bindings/pinctrl/pinctrl-bindings.txt



Example:

	mmc1: mmc@4809c000 {

arch/arm/boot/dts/am571x-idk.dts

+3 −2
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include "dra72x.dtsi"

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

#include <dt-bindings/interrupt-controller/irq.h>

#include "dra7-mmc-iodelay.dtsi"

#include "dra72x-mmc-iodelay.dtsi"

#include "am57xx-idk-common.dtsi"
@@ -102,7 +103,7 @@ &pcie1_ep { 


&mmc1 {

	pinctrl-names = "default", "hs", "sdr12", "sdr25", "sdr50", "ddr50", "sdr104";

	pinctrl-0 = <&mmc1_pins_default>;

	pinctrl-0 = <&mmc1_pins_default_no_clk_pu>;

	pinctrl-1 = <&mmc1_pins_hs>;

	pinctrl-2 = <&mmc1_pins_sdr12>;

	pinctrl-3 = <&mmc1_pins_sdr25>;
@@ -112,7 +113,7 @@ &mmc1 { 
};



&mmc2 {

	pinctrl-names = "default", "hs", "ddr_1_8v";

	pinctrl-names = "default", "hs", "ddr_3_3v";

	pinctrl-0 = <&mmc2_pins_default>;

	pinctrl-1 = <&mmc2_pins_hs>;

	pinctrl-2 = <&mmc2_pins_ddr_rev20 &mmc2_iodelay_ddr_conf>;

arch/arm/boot/dts/am572x-idk.dts

+3 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
/dts-v1/;



#include "dra74x.dtsi"

#include "dra7-mmc-iodelay.dtsi"

#include "dra74x-mmc-iodelay.dtsi"

#include "am572x-idk-common.dtsi"
@@ -20,7 +21,7 @@ / { 


&mmc1 {

	pinctrl-names = "default", "hs", "sdr12", "sdr25", "sdr50", "ddr50", "sdr104";

	pinctrl-0 = <&mmc1_pins_default>;

	pinctrl-0 = <&mmc1_pins_default_no_clk_pu>;

	pinctrl-1 = <&mmc1_pins_hs>;

	pinctrl-2 = <&mmc1_pins_sdr12>;

	pinctrl-3 = <&mmc1_pins_sdr25>;
@@ -30,7 +31,7 @@ &mmc1 { 
};



&mmc2 {

	pinctrl-names = "default", "hs", "ddr_1_8v";

	pinctrl-names = "default", "hs", "ddr_3_3v";

	pinctrl-0 = <&mmc2_pins_default>;

	pinctrl-1 = <&mmc2_pins_hs>;

	pinctrl-2 = <&mmc2_pins_ddr_rev20>;

arch/arm/boot/dts/am574x-idk.dts

+20 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
/dts-v1/;



#include "dra76x.dtsi"

#include "dra7-mmc-iodelay.dtsi"

#include "dra76x-mmc-iodelay.dtsi"

#include "am572x-idk-common.dtsi"



/ {
@@ -20,3 +22,21 @@ m25p80@0 { 
		spi-max-frequency = <96000000>;

	};

};



&mmc1 {

	pinctrl-names = "default", "hs", "sdr12", "sdr25", "sdr50", "ddr50", "sdr104";

	pinctrl-0 = <&mmc1_pins_default_no_clk_pu>;

	pinctrl-1 = <&mmc1_pins_hs>;

	pinctrl-2 = <&mmc1_pins_default>;

	pinctrl-3 = <&mmc1_pins_hs>;

	pinctrl-4 = <&mmc1_pins_sdr50>;

	pinctrl-5 = <&mmc1_pins_ddr50 &mmc1_iodelay_ddr_conf>;

	pinctrl-6 = <&mmc1_pins_ddr50 &mmc1_iodelay_sdr104_conf>;

};



&mmc2 {

	pinctrl-names = "default", "hs", "ddr_3_3v";

	pinctrl-0 = <&mmc2_pins_default>;

	pinctrl-1 = <&mmc2_pins_default>;

	pinctrl-2 = <&mmc2_pins_default>;

};