diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 10:49:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 10:49:02 -0700 |
| commit | 0bbf211975addc2963b63a41a2eac99928365996 (patch) | |
| tree | 31e830db386e76a53db1b2248dc503be43126924 /arch/arm/mach-tegra/include/mach/pinmux-t2.h | |
| parent | 51e8703bdf12e2481b205096c973a3ab6a8ca18b (diff) | |
| parent | d5fdafd38ca0c28c4648909ce0afd0a5420309ca (diff) | |
| download | talos-op-linux-0bbf211975addc2963b63a41a2eac99928365996.tar.gz talos-op-linux-0bbf211975addc2963b63a41a2eac99928365996.zip | |
Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra
* 'for-linus' of git://android.git.kernel.org/kernel/tegra: (61 commits)
ARM: tegra: trimslice: initialize PCI-e only when running on TrimSlice
ARM: tegra: add PCI Express power gating
ARM: tegra: PCIE minor code refactoring
ARM: Tegra: DMA: Fail safe if initialization fails
ARM: Tegra: Rename clk_dev1/2 to cdev1/2
ARM: Tegra: Rename I2S clocks to match driver name
ARM: Tegra: Make tegra_dma_init a postcore_initcall
ARM: tegra: add seaboard, wario and kaen boards
ARM: tegra: harmony: fix pinmux for MMC slot
ARM: tegra: harmony: register sdhci devices
ARM: tegra: remove stale nvidia atag handler
ARM: tegra: common device resources
ARM: tegra: harmony: move over to tegra_gpio_config
ARM: tegra: add tegra_gpio_table and tegra_gpio_config
ARM: tegra: Hide EMC scaling config behind ARCH_TEGRA
ARM: tegra: Fix typo in TEGRA_IRQ_TO_GPIO
ARM: tegra: common: Enable core clocks
ARM: tegra: timer: Enable timer and rtc clocks
ARM: tegra: Move tegra_common_init to tegra_init_early
ARM: tegra: clock: prevent accidental disables of cpu clock
...
Diffstat (limited to 'arch/arm/mach-tegra/include/mach/pinmux-t2.h')
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/pinmux-t2.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/include/mach/pinmux-t2.h b/arch/arm/mach-tegra/include/mach/pinmux-t2.h index e5b9d740f973..4c2626347263 100644 --- a/arch/arm/mach-tegra/include/mach/pinmux-t2.h +++ b/arch/arm/mach-tegra/include/mach/pinmux-t2.h @@ -167,6 +167,16 @@ enum tegra_drive_pingroup { TEGRA_DRIVE_PINGROUP_XM2D, TEGRA_DRIVE_PINGROUP_XM2CLK, TEGRA_DRIVE_PINGROUP_MEMCOMP, + TEGRA_DRIVE_PINGROUP_SDIO1, + TEGRA_DRIVE_PINGROUP_CRT, + TEGRA_DRIVE_PINGROUP_DDC, + TEGRA_DRIVE_PINGROUP_GMA, + TEGRA_DRIVE_PINGROUP_GMB, + TEGRA_DRIVE_PINGROUP_GMC, + TEGRA_DRIVE_PINGROUP_GMD, + TEGRA_DRIVE_PINGROUP_GME, + TEGRA_DRIVE_PINGROUP_OWR, + TEGRA_DRIVE_PINGROUP_UAD, TEGRA_MAX_DRIVE_PINGROUP, }; |
