diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-05 13:34:21 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-05 13:34:21 +0200 |
| commit | 7b7631791ed9cad14ed0f54376049fab8807ea2c (patch) | |
| tree | 52341281ba5905b78dcb7f69158c4654b8bbffc4 /drivers/gpio | |
| parent | cdfca5dccb21258eccd549604a8481020d5f3e9f (diff) | |
| parent | 4c13cf95b2e37de75b26f2e8770d3b7328e32498 (diff) | |
| download | barebox-7b7631791ed9cad14ed0f54376049fab8807ea2c.tar.gz barebox-7b7631791ed9cad14ed0f54376049fab8807ea2c.tar.xz | |
Merge branch 'for-next/tegra'
Conflicts:
arch/arm/dts/tegra20-colibri.dtsi
arch/arm/dts/tegra20-paz00.dts
arch/arm/dts/tegra20.dtsi
drivers/clk/tegra/clk-periph.c
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpio-tegra.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c index e84c71a234..bab32ee328 100644 --- a/drivers/gpio/gpio-tegra.c +++ b/drivers/gpio/gpio-tegra.c @@ -38,11 +38,6 @@ #define GPIO_MSK_OE(x) (GPIO_REG(x) + config->upper_offset + 0x10) #define GPIO_MSK_OUT(x) (GPIO_REG(x) + config->upper_offset + 0X20) -struct tegra_gpio_bank { - int bank; - int irq; -}; - struct tegra_gpio_soc_config { u32 bank_stride; u32 upper_offset; @@ -180,13 +175,10 @@ static struct tegra_gpio_soc_config tegra20_gpio_config = { .bank_count = 7, }; -static struct platform_device_id tegra_gpio_ids[] = { - { - .name = "tegra20-gpio", - .driver_data = (unsigned long)&tegra20_gpio_config, - }, { - /* sentinel */ - }, +static struct tegra_gpio_soc_config tegra30_gpio_config = { + .bank_stride = 0x100, + .upper_offset = 0x80, + .bank_count = 8, }; static __maybe_unused struct of_device_id tegra_gpio_dt_ids[] = { @@ -194,13 +186,15 @@ static __maybe_unused struct of_device_id tegra_gpio_dt_ids[] = { .compatible = "nvidia,tegra20-gpio", .data = (unsigned long)&tegra20_gpio_config }, { + .compatible = "nvidia,tegra30-gpio", + .data = (unsigned long)&tegra30_gpio_config + }, { /* sentinel */ }, }; static struct driver_d tegra_gpio_driver = { .name = "tegra-gpio", - .id_table = tegra_gpio_ids, .of_compatible = DRV_OF_COMPAT(tegra_gpio_dt_ids), .probe = tegra_gpio_probe, }; |