mirror of
https://github.com/torvalds/linux.git
synced 2024-11-18 01:51:53 +00:00
ce53044c68
These changes are specific to some driver that may be used by multiple boards or socs. The most significant change in here is the move of the samsung iommu code from a platform specific in-kernel interface to the generic iommu subsystem. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJPuevXAAoJEIwa5zzehBx3D8YQAKfoY3TFjJ9KmJgk69/pc7cf Of0rvX+35NezGFljIyRdspz+DsV+vhJravwdVxOagRKvVBOb9qnZIXnl3gkLnTw4 dCVMFMqCwXhBeXlXCzHSeRmt2+4/fmJnr7jr4xh9omOAJ9BZv5ftmKNW4zP5wr1L +9HBwzkxlVisR4NCz2q66YBjsV2dXA3dv2hZxEFkUdQFYJGqZoUXLYHF9yno20i3 knKNXEyAFYFUKHiFVBQJ1tYGmZlaIjw14g+GTqzZay2Pi/HjUXfrPd0VwNkBzZf/ H1N3/cf4GJ2+K/zYqh+H/Xjf/Fjkp1dFNhlUQ7+l5Jwbu7C1B2euvwTO4OaqrfdD 7eqG3+uIKhPO2Z8ZySLFgx4ghybtwgZrAwOjsa+ymTugqPbiWYB/zZR1iWu5DMk/ TnNb6P3ciP+WMpoMFh1kXRc/eCCCHtuQ0rLRxizSX6HIpxWvjYFNLH7L3wS+KtlB 7vsS764d1JFW318bsdBi+V/LWRVXeSWWetTzdzDcM/Syz3ZqfPy7e3Ge6qx0lvYe 5ojgzKwVqpJenZdt91UC16cMXNqDTzmZObz6LOCmVm1mB5kYSgEHYxAQQvuGFjXT 28kGyBQNsBboJGaYh2O/CTsVXnHnaPXrtDDWMDacWNwwPYnnA2L8lUNfAg1DgA1j Z6CO8Knfct01EpQLtybK =hgkg -----END PGP SIGNATURE----- Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull arm-soc driver specific updates from Olof Johansson: "These changes are specific to some driver that may be used by multiple boards or socs. The most significant change in here is the move of the samsung iommu code from a platform specific in-kernel interface to the generic iommu subsystem." Fix up trivial conflicts in arch/arm/mach-exynos/Kconfig * tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (28 commits) mmc: dt: Consolidate DT bindings iommu/exynos: Add iommu driver for EXYNOS Platforms ARM: davinci: optimize the DMA ISR ARM: davinci: implement DEBUG_LL port choice ARM: tegra: Add SMMU enabler in AHB ARM: tegra: Add Tegra AHB driver Input: pxa27x_keypad add choice to set direct_key_mask Input: pxa27x_keypad direct key may be low active Input: pxa27x_keypad bug fix for direct_key_mask Input: pxa27x_keypad keep clock on as wakeup source ARM: dt: tegra: pinmux changes for USB ULPI ARM: tegra: add USB ULPI PHY reset GPIO to device tree ARM: tegra: don't hard-code USB ULPI PHY reset_gpio ARM: tegra: change pll_p_out4's rate to 24MHz ARM: tegra: fix pclk rate ARM: tegra: reparent sclk to pll_c_out1 ARM: tegra: Add pllc clock init table ARM: dt: tegra cardhu: basic audio support ARM: dt: tegra30.dtsi: Add audio-related nodes ARM: tegra: add AUXDATA required for audio ...
61 lines
2.2 KiB
C
61 lines
2.2 KiB
C
/*
|
|
* Copyright (C) 2010,2011 Google, Inc.
|
|
*
|
|
* Author:
|
|
* Colin Cross <ccross@android.com>
|
|
* Erik Gilling <ccross@android.com>
|
|
*
|
|
* 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 __MACH_TEGRA_DEVICES_H
|
|
#define __MACH_TEGRA_DEVICES_H
|
|
|
|
#include <linux/platform_device.h>
|
|
#include <linux/platform_data/tegra_usb.h>
|
|
|
|
#include <mach/usb_phy.h>
|
|
|
|
extern struct tegra_ulpi_config tegra_ehci2_ulpi_phy_config;
|
|
|
|
extern struct tegra_ehci_platform_data tegra_ehci1_pdata;
|
|
extern struct tegra_ehci_platform_data tegra_ehci2_pdata;
|
|
extern struct tegra_ehci_platform_data tegra_ehci3_pdata;
|
|
|
|
extern struct platform_device tegra_gpio_device;
|
|
extern struct platform_device tegra_pinmux_device;
|
|
extern struct platform_device tegra_sdhci_device1;
|
|
extern struct platform_device tegra_sdhci_device2;
|
|
extern struct platform_device tegra_sdhci_device3;
|
|
extern struct platform_device tegra_sdhci_device4;
|
|
extern struct platform_device tegra_i2c_device1;
|
|
extern struct platform_device tegra_i2c_device2;
|
|
extern struct platform_device tegra_i2c_device3;
|
|
extern struct platform_device tegra_i2c_device4;
|
|
extern struct platform_device tegra_spi_device1;
|
|
extern struct platform_device tegra_spi_device2;
|
|
extern struct platform_device tegra_spi_device3;
|
|
extern struct platform_device tegra_spi_device4;
|
|
extern struct platform_device tegra_ehci1_device;
|
|
extern struct platform_device tegra_ehci2_device;
|
|
extern struct platform_device tegra_ehci3_device;
|
|
extern struct platform_device tegra_uarta_device;
|
|
extern struct platform_device tegra_uartb_device;
|
|
extern struct platform_device tegra_uartc_device;
|
|
extern struct platform_device tegra_uartd_device;
|
|
extern struct platform_device tegra_uarte_device;
|
|
extern struct platform_device tegra_pmu_device;
|
|
extern struct platform_device tegra_i2s_device1;
|
|
extern struct platform_device tegra_i2s_device2;
|
|
extern struct platform_device tegra_das_device;
|
|
|
|
#endif
|