diff options
| author | James Thomas <james.thomas@codethink.co.uk> | 2014-08-18 16:33:06 +0100 |
|---|---|---|
| committer | James Thomas <james.thomas@codethink.co.uk> | 2014-08-18 16:33:06 +0100 |
| commit | de3664efca390a8d2fe525a583d17772deee8500 (patch) | |
| tree | 8e036ae4a4120ed011cd2fb1faf9e81ad5655697 /include/linux/platform_data/mmc-sdhci-tegra.h | |
| parent | 1f12d2a9854d101f23cce77f6fe8e53814c8a896 (diff) | |
| parent | 123cc68c33ff537748a244f4932640083b4b6825 (diff) | |
| download | linux-de3664efca390a8d2fe525a583d17772deee8500.tar.gz | |
Merge branch 'baserock/james/tegra-3.10' into baserock/arm/tegra-3.10baserock/arm/tegra-3.10
Reviewed by : Paul Sherwood <paul.sherwood@codethink.co.uk>
Reviewed by : Richard Maw <richard.maw@codethink.co.uk>
Merged by : James Thomas <james.thomas@codethink.co.uk>
Diffstat (limited to 'include/linux/platform_data/mmc-sdhci-tegra.h')
| -rw-r--r-- | include/linux/platform_data/mmc-sdhci-tegra.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/platform_data/mmc-sdhci-tegra.h b/include/linux/platform_data/mmc-sdhci-tegra.h index 32de3cc5f1b6..0d5f862f66aa 100644 --- a/include/linux/platform_data/mmc-sdhci-tegra.h +++ b/include/linux/platform_data/mmc-sdhci-tegra.h @@ -1,9 +1,8 @@ /* * Copyright (C) 2009 Palm, Inc. - * Copyright (c) 2013, NVIDIA CORPORATION. All rights reserved. * Author: Yvonne Yip <y@palm.com> * - * Copyright (c) 2013, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2013-2014, NVIDIA CORPORATION. All rights reserved. * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and @@ -64,6 +63,7 @@ struct tegra_sdhci_platform_data { unsigned int calib_3v3_offsets; /* Format to be filled: 0xXXXXPDPU */ unsigned int calib_1v8_offsets; /* Format to be filled: 0xXXXXPDPU */ bool disable_clock_gate; /* no clock gate when true */ + u32 cpu_speedo; }; #endif |