diff options
| author | Joseph Lo <josephl@nvidia.com> | 2013-04-03 14:34:39 -0600 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2013-04-04 17:17:43 -0600 |
| commit | 7a2617a64dac0ce559bee0710704aa7d51f4e92a (patch) | |
| tree | 96f0240797a2c69b1c976e280bd6955e7f111979 | |
| parent | 9be1e13e6e53048cce6135c823226f1198ee1725 (diff) | |
| download | linux-7a2617a64dac0ce559bee0710704aa7d51f4e92a.tar.gz linux-7a2617a64dac0ce559bee0710704aa7d51f4e92a.tar.bz2 linux-7a2617a64dac0ce559bee0710704aa7d51f4e92a.zip | |
ARM: tegra: add non-removable and keep-power-in-suspend property for MMC
This patch adds "non-removable" property of MMC host where the eMMC device
is for Tegra platform.
And the "keep-power-in-suspend" property was used for the SDIO device that
need this to go into suspend mode (e.g. BRCM43xx series).
Signed-off-by: Joseph Lo <josephl@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
| -rw-r--r-- | arch/arm/boot/dts/tegra114-dalmore.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra20-paz00.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra20-seaboard.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra20-ventana.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra20-whistler.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra30-beaver.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra30-cardhu-a02.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra30-cardhu-a04.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra30-cardhu.dtsi | 1 |
9 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts index f111e3b03ef3..72c1f27af7f3 100644 --- a/arch/arm/boot/dts/tegra114-dalmore.dts +++ b/arch/arm/boot/dts/tegra114-dalmore.dts @@ -836,6 +836,7 @@ sdhci@78000600 { bus-width = <8>; status = "okay"; + non-removable; }; clocks { diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts index c421db498058..3bd8448b59f5 100644 --- a/arch/arm/boot/dts/tegra20-paz00.dts +++ b/arch/arm/boot/dts/tegra20-paz00.dts @@ -445,6 +445,7 @@ sdhci@c8000600 { status = "okay"; bus-width = <8>; + non-removable; }; clocks { diff --git a/arch/arm/boot/dts/tegra20-seaboard.dts b/arch/arm/boot/dts/tegra20-seaboard.dts index b8f0400823e5..6bf4ee75efde 100644 --- a/arch/arm/boot/dts/tegra20-seaboard.dts +++ b/arch/arm/boot/dts/tegra20-seaboard.dts @@ -580,6 +580,7 @@ status = "okay"; power-gpios = <&gpio 86 0>; /* gpio PK6 */ bus-width = <4>; + keep-power-in-suspend; }; sdhci@c8000400 { @@ -593,6 +594,7 @@ sdhci@c8000600 { status = "okay"; bus-width = <8>; + non-removable; }; clocks { diff --git a/arch/arm/boot/dts/tegra20-ventana.dts b/arch/arm/boot/dts/tegra20-ventana.dts index 5688d9f367fd..bdc07b567f25 100644 --- a/arch/arm/boot/dts/tegra20-ventana.dts +++ b/arch/arm/boot/dts/tegra20-ventana.dts @@ -516,6 +516,7 @@ status = "okay"; power-gpios = <&gpio 86 0>; /* gpio PK6 */ bus-width = <4>; + keep-power-in-suspend; }; sdhci@c8000400 { @@ -529,6 +530,7 @@ sdhci@c8000600 { status = "okay"; bus-width = <8>; + non-removable; }; clocks { diff --git a/arch/arm/boot/dts/tegra20-whistler.dts b/arch/arm/boot/dts/tegra20-whistler.dts index 47c7a822a9b2..b3fc47384e7d 100644 --- a/arch/arm/boot/dts/tegra20-whistler.dts +++ b/arch/arm/boot/dts/tegra20-whistler.dts @@ -518,6 +518,7 @@ sdhci@c8000600 { status = "okay"; bus-width = <8>; + non-removable; }; clocks { diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts index 6248b2445b32..a930d19aeb30 100644 --- a/arch/arm/boot/dts/tegra30-beaver.dts +++ b/arch/arm/boot/dts/tegra30-beaver.dts @@ -266,6 +266,7 @@ sdhci@78000600 { status = "okay"; bus-width = <8>; + non-removable; }; clocks { diff --git a/arch/arm/boot/dts/tegra30-cardhu-a02.dts b/arch/arm/boot/dts/tegra30-cardhu-a02.dts index adc88aa50eb6..e392bd2dab9b 100644 --- a/arch/arm/boot/dts/tegra30-cardhu-a02.dts +++ b/arch/arm/boot/dts/tegra30-cardhu-a02.dts @@ -88,6 +88,7 @@ status = "okay"; power-gpios = <&gpio 28 0>; /* gpio PD4 */ bus-width = <4>; + keep-power-in-suspend; }; }; diff --git a/arch/arm/boot/dts/tegra30-cardhu-a04.dts b/arch/arm/boot/dts/tegra30-cardhu-a04.dts index 08163e145d57..d0db6c7e774f 100644 --- a/arch/arm/boot/dts/tegra30-cardhu-a04.dts +++ b/arch/arm/boot/dts/tegra30-cardhu-a04.dts @@ -100,5 +100,6 @@ status = "okay"; power-gpios = <&gpio 27 0>; /* gpio PD3 */ bus-width = <4>; + keep-power-in-suspend; }; }; diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi index 7edd51e059ae..0e97c7499008 100644 --- a/arch/arm/boot/dts/tegra30-cardhu.dtsi +++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi @@ -320,6 +320,7 @@ sdhci@78000600 { status = "okay"; bus-width = <8>; + non-removable; }; clocks { |