| Message ID | 1321911851-10091-5-git-send-email-swarren@nvidia.com |
|---|---|
| State | Awaiting Upstream, archived |
| Headers | show |
On 14:44 Mon 21 Nov , Stephen Warren wrote: > Mark any SDHCI controllers that aren't registered by the board files as > disabled in the device-tree files. > > In practice, these controllers: > > * Have nothing hooked up to them at all, or > * For ports intended for SDIO usage, the drivers for anything that might > be attached are not in the device-tree yet. If/when drivers appear, the > SD/MMC port can be re-enabled. > > The only possible exception is TrimSlice's mico SD slot, but that wasn't > enabled in the board files before anyway, and doesn't work when all the > SDHCI controllers are enabled anyway. it will be better to invert the logic just enable what you are supposed too Best Regards, J. -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Jean-Christophe PLAGNIOL-VILLARD wrote at Tuesday, November 22, 2011 1:38 AM: > On 14:44 Mon 21 Nov , Stephen Warren wrote: > > Mark any SDHCI controllers that aren't registered by the board files as > > disabled in the device-tree files. > > > > In practice, these controllers: > > > > * Have nothing hooked up to them at all, or > > * For ports intended for SDIO usage, the drivers for anything that might > > be attached are not in the device-tree yet. If/when drivers appear, the > > SD/MMC port can be re-enabled. > > > > The only possible exception is TrimSlice's mico SD slot, but that wasn't > > enabled in the board files before anyway, and doesn't work when all the > > SDHCI controllers are enabled anyway. > it will be better to invert the logic > > just enable what you are supposed too It used to be that way when the files were first added, but they got switched around this way to match standard practice.
On 08:12 Tue 22 Nov , Stephen Warren wrote: > Jean-Christophe PLAGNIOL-VILLARD wrote at Tuesday, November 22, 2011 1:38 AM: > > On 14:44 Mon 21 Nov , Stephen Warren wrote: > > > Mark any SDHCI controllers that aren't registered by the board files as > > > disabled in the device-tree files. > > > > > > In practice, these controllers: > > > > > > * Have nothing hooked up to them at all, or > > > * For ports intended for SDIO usage, the drivers for anything that might > > > be attached are not in the device-tree yet. If/when drivers appear, the > > > SD/MMC port can be re-enabled. > > > > > > The only possible exception is TrimSlice's mico SD slot, but that wasn't > > > enabled in the board files before anyway, and doesn't work when all the > > > SDHCI controllers are enabled anyway. > > it will be better to invert the logic > > > > just enable what you are supposed too > > It used to be that way when the files were first added, but they got > switched around this way to match standard practice. this is a bad practice because you can enable stuff that a hardware is not supposed to use and this silenty without anyone notice until you test the hardware and you add more line and changeset Best Regrds, J. -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Nov 21, 2011 at 02:44:11PM -0700, Stephen Warren wrote: > Mark any SDHCI controllers that aren't registered by the board files as > disabled in the device-tree files. > > In practice, these controllers: > > * Have nothing hooked up to them at all, or > * For ports intended for SDIO usage, the drivers for anything that might > be attached are not in the device-tree yet. If/when drivers appear, the > SD/MMC port can be re-enabled. > > The only possible exception is TrimSlice's mico SD slot, but that wasn't > enabled in the board files before anyway, and doesn't work when all the > SDHCI controllers are enabled anyway. > > Signed-off-by: Stephen Warren <swarren@nvidia.com> Thanks, applied to for-3.3/boards -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts index ac179a0..80afa1b 100644 --- a/arch/arm/boot/dts/tegra-harmony.dts +++ b/arch/arm/boot/dts/tegra-harmony.dts @@ -67,12 +67,20 @@ status = "disable"; }; + sdhci@c8000000 { + status = "disable"; + }; + sdhci@c8000200 { cd-gpios = <&gpio 69 0>; /* gpio PI5 */ wp-gpios = <&gpio 57 0>; /* gpio PH1 */ power-gpios = <&gpio 155 0>; /* gpio PT3 */ }; + sdhci@c8000400 { + status = "disable"; + }; + sdhci@c8000600 { cd-gpios = <&gpio 58 0>; /* gpio PH2 */ wp-gpios = <&gpio 59 0>; /* gpio PH3 */ diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts index cbb2f08..f552bcc 100644 --- a/arch/arm/boot/dts/tegra-seaboard.dts +++ b/arch/arm/boot/dts/tegra-seaboard.dts @@ -47,6 +47,14 @@ status = "disable"; }; + sdhci@c8000000 { + status = "disable"; + }; + + sdhci@c8000200 { + status = "disable"; + }; + sdhci@c8000400 { cd-gpios = <&gpio 69 0>; /* gpio PI5 */ wp-gpios = <&gpio 57 0>; /* gpio PH1 */ diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts index 6060ce0..3b3ee7d 100644 --- a/arch/arm/boot/dts/tegra-trimslice.dts +++ b/arch/arm/boot/dts/tegra-trimslice.dts @@ -46,6 +46,18 @@ status = "disable"; }; + sdhci@c8000000 { + status = "disable"; + }; + + sdhci@c8000200 { + status = "disable"; + }; + + sdhci@c8000400 { + status = "disable"; + }; + sdhci@c8000600 { cd-gpios = <&gpio 121 0>; wp-gpios = <&gpio 122 0>; diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts index 5ac0aa3..c7d3b87 100644 --- a/arch/arm/boot/dts/tegra-ventana.dts +++ b/arch/arm/boot/dts/tegra-ventana.dts @@ -46,6 +46,14 @@ status = "disable"; }; + sdhci@c8000000 { + status = "disable"; + }; + + sdhci@c8000200 { + status = "disable"; + }; + sdhci@c8000400 { cd-gpios = <&gpio 69 0>; /* gpio PI5 */ wp-gpios = <&gpio 57 0>; /* gpio PH1 */
Mark any SDHCI controllers that aren't registered by the board files as disabled in the device-tree files. In practice, these controllers: * Have nothing hooked up to them at all, or * For ports intended for SDIO usage, the drivers for anything that might be attached are not in the device-tree yet. If/when drivers appear, the SD/MMC port can be re-enabled. The only possible exception is TrimSlice's mico SD slot, but that wasn't enabled in the board files before anyway, and doesn't work when all the SDHCI controllers are enabled anyway. Signed-off-by: Stephen Warren <swarren@nvidia.com> --- arch/arm/boot/dts/tegra-harmony.dts | 8 ++++++++ arch/arm/boot/dts/tegra-seaboard.dts | 8 ++++++++ arch/arm/boot/dts/tegra-trimslice.dts | 12 ++++++++++++ arch/arm/boot/dts/tegra-ventana.dts | 8 ++++++++ 4 files changed, 36 insertions(+), 0 deletions(-)