diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-04-25 14:33:27 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-04-26 11:25:14 -0700 |
| commit | 5d875e826db6160dc11a9ca9bc7b6c80bf6a68e4 (patch) | |
| tree | 8513eeb70507f80b780cd18ad1f96faa3712a820 /arch/arm | |
| parent | b6426b90fd99bf82114465a12ff7e4da2a4c982e (diff) | |
Revert "ARM: tegra: spi: spi slave device related additions"
This reverts commit b1b863de1b1a83f8f9edd8e8e6172d3aa55f3f60.
Conflicts:
arch/arm/mach-tegra/tegra2_clocks.c
Change-Id: I29c3479fb34ec22472f449ea8c8744643e25b219
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-tegra/devices.c | 10 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/devices.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/tegra2_clocks.c | 1 |
3 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/mach-tegra/devices.c b/arch/arm/mach-tegra/devices.c index 0929e7dd6a55..c2a1b7f4d828 100644 --- a/arch/arm/mach-tegra/devices.c +++ b/arch/arm/mach-tegra/devices.c @@ -173,16 +173,6 @@ static struct resource spi_resource4[] = { }, }; -struct platform_device tegra_spi_slave_device1 = { - .name = "tegra_spi_slave", - .id = 0, - .resource = spi_resource1, - .num_resources = ARRAY_SIZE(spi_resource1), - .dev = { - .coherent_dma_mask = 0xffffffff, - }, -}; - struct platform_device tegra_spi_device1 = { .name = "spi_tegra", .id = 0, diff --git a/arch/arm/mach-tegra/devices.h b/arch/arm/mach-tegra/devices.h index 3d73cbce711b..ca5934965a11 100644 --- a/arch/arm/mach-tegra/devices.h +++ b/arch/arm/mach-tegra/devices.h @@ -31,7 +31,6 @@ 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_slave_device1; extern struct platform_device tegra_spi_device1; extern struct platform_device tegra_spi_device2; extern struct platform_device tegra_spi_device3; diff --git a/arch/arm/mach-tegra/tegra2_clocks.c b/arch/arm/mach-tegra/tegra2_clocks.c index fedcfaefdecb..67022f8d1c69 100644 --- a/arch/arm/mach-tegra/tegra2_clocks.c +++ b/arch/arm/mach-tegra/tegra2_clocks.c @@ -2137,7 +2137,6 @@ struct clk_duplicate tegra_clk_duplicates[] = { CLK_DUPLICATE("mpe", "tegra_grhost", "mpe"), CLK_DUPLICATE("cop", "tegra-avp", "cop"), CLK_DUPLICATE("vde", "tegra-aes", "vde"), - CLK_DUPLICATE("sbc1", "tegra_spi_slave.0", NULL), CLK_DUPLICATE("bsea", "tegra-aes", "bsea"), }; |