diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-09-25 19:53:39 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-09-25 19:53:39 +0400 |
| commit | 14b62fb0159a77989708370ca8c8ba5db55c1dab (patch) | |
| tree | ebac8083a32c738074797e0a6ae50e5ffe41eb83 /include/linux | |
| parent | e36087998a3b01f3c6c93fa9465e40103f427315 (diff) | |
| parent | d37aba521379203b740a2929e6e6f6bd2485f5d7 (diff) | |
| download | linux-14b62fb0159a77989708370ca8c8ba5db55c1dab.tar.xz | |
Merge tag 'tegra-for-3.18-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/soc
Pull "ARM: tegra: core SoC code changes for 3.18" from Stephen Warren:
the primary change here gets its address information from DT rather than
iomap.h. This removes one more user of iomap.h, and will help allow the
code to move to a location that can be shared between arch/arm and
arch/arm64.
An unused header file was also removed.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'tegra-for-3.18-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
ARM: tegra: remove unused tegra_emc.h
ARM: tegra: Initialize flow controller from DT
of: Add NVIDIA Tegra flow controller bindings
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/platform_data/tegra_emc.h | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/include/linux/platform_data/tegra_emc.h b/include/linux/platform_data/tegra_emc.h deleted file mode 100644 index df67505e98f8..000000000000 --- a/include/linux/platform_data/tegra_emc.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2011 Google, Inc. - * - * Author: - * Colin Cross <ccross@android.com> - * Olof Johansson <olof@lixom.net> - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and - * may be copied, distributed, and modified under those terms. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - */ - -#ifndef __TEGRA_EMC_H_ -#define __TEGRA_EMC_H_ - -#define TEGRA_EMC_NUM_REGS 46 - -struct tegra_emc_table { - unsigned long rate; - u32 regs[TEGRA_EMC_NUM_REGS]; -}; - -struct tegra_emc_pdata { - int num_tables; - struct tegra_emc_table *tables; -}; - -#endif |