diff options
| author | Tom Rini <trini@ti.com> | 2014-05-22 14:29:41 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-05-22 14:29:41 -0400 |
| commit | f6ed9d50949eb290744bf7606e30763582e2d44b (patch) | |
| tree | 659cd954a4b4075c7227ea6d1d6ec768b0a2d78a /arch/arm/include/asm/arch-tegra | |
| parent | 8e3812859670fda61b98458864fa9f014fcd3dcc (diff) | |
| parent | 05d134b084590684bcf4d832c0035952727b7cd9 (diff) | |
| download | talos-obmc-uboot-f6ed9d50949eb290744bf7606e30763582e2d44b.tar.gz talos-obmc-uboot-f6ed9d50949eb290744bf7606e30763582e2d44b.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/include/asm/arch-tegra')
| -rw-r--r-- | arch/arm/include/asm/arch-tegra/gpio.h | 20 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-tegra/pinmux.h | 5 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-tegra/tegra_mmc.h | 2 |
3 files changed, 25 insertions, 2 deletions
diff --git a/arch/arm/include/asm/arch-tegra/gpio.h b/arch/arm/include/asm/arch-tegra/gpio.h index d97190dd7c..44cd455699 100644 --- a/arch/arm/include/asm/arch-tegra/gpio.h +++ b/arch/arm/include/asm/arch-tegra/gpio.h @@ -14,11 +14,31 @@ #define GPIO_FULLPORT(x) ((x) >> 3) #define GPIO_BIT(x) ((x) & 0x7) +enum tegra_gpio_init { + TEGRA_GPIO_INIT_IN, + TEGRA_GPIO_INIT_OUT0, + TEGRA_GPIO_INIT_OUT1, +}; + +struct tegra_gpio_config { + u32 gpio:16; + u32 init:2; +}; + /* * Tegra-specific GPIO API */ +/** + * Configure a list of GPIOs + * + * @param config List of GPIO configurations + * @param len Number of config items in list + */ +void gpio_config_table(const struct tegra_gpio_config *config, int len); + void gpio_info(void); #define gpio_status() gpio_info() + #endif /* TEGRA_GPIO_H_ */ diff --git a/arch/arm/include/asm/arch-tegra/pinmux.h b/arch/arm/include/asm/arch-tegra/pinmux.h index 035159d665..da477697bf 100644 --- a/arch/arm/include/asm/arch-tegra/pinmux.h +++ b/arch/arm/include/asm/arch-tegra/pinmux.h @@ -80,6 +80,11 @@ struct pmux_pingrp_config { #endif }; +#if !defined(CONFIG_TEGRA20) && !defined(CONFIG_TEGRA30) +/* Set the pinmux CLAMP_INPUTS_WHEN_TRISTATED bit */ +void pinmux_set_tristate_input_clamping(void); +#endif + /* Set the mux function for a pin group */ void pinmux_set_func(enum pmux_pingrp pin, enum pmux_func func); diff --git a/arch/arm/include/asm/arch-tegra/tegra_mmc.h b/arch/arm/include/asm/arch-tegra/tegra_mmc.h index 310bbd7df9..84e7b5553d 100644 --- a/arch/arm/include/asm/arch-tegra/tegra_mmc.h +++ b/arch/arm/include/asm/arch-tegra/tegra_mmc.h @@ -14,8 +14,6 @@ /* for mmc_config definition */ #include <mmc.h> -#define MAX_HOSTS 4 /* Max number of 'hosts'/controllers */ - #ifndef __ASSEMBLY__ struct tegra_mmc { unsigned int sysad; /* _SYSTEM_ADDRESS_0 */ |
