diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-04-25 14:33:27 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:42:01 -0800 |
| commit | 7d8324d8f3dfc27407d7514fcbd605649c9bd210 (patch) | |
| tree | d6451cda6b46f010ddf8ecddf0c2fa7ac528630e /arch | |
| parent | 521292060f39284108d06978b4f117abe088f005 (diff) | |
Revert "ARM: tegra: spi: spi slave device related additions"
This reverts commit b1b863de1b1a83f8f9edd8e8e6172d3aa55f3f60.
Conflicts:
arch/arm/mach-tegra/tegra2_clocks.c
Original-Change-Id: I29c3479fb34ec22472f449ea8c8744643e25b219
Rebase-Id: R495b37a5f80b161558bce9e31ab13eae53f19cc3
Diffstat (limited to 'arch')
| -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 f89c912f68e4..6597465a1fee 100644 --- a/arch/arm/mach-tegra/devices.c +++ b/arch/arm/mach-tegra/devices.c @@ -191,16 +191,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 a73810ffc59a..be76fe151286 100644 --- a/arch/arm/mach-tegra/devices.h +++ b/arch/arm/mach-tegra/devices.h @@ -29,7 +29,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 2795cb565a38..f0222bd4d59e 100644 --- a/arch/arm/mach-tegra/tegra2_clocks.c +++ b/arch/arm/mach-tegra/tegra2_clocks.c @@ -2332,7 +2332,6 @@ struct clk_duplicate tegra_clk_duplicates[] = { CLK_DUPLICATE("cop", "tegra-avp", "cop"), CLK_DUPLICATE("vde", "tegra-aes", "vde"), CLK_DUPLICATE("twd", "smp_twd", NULL), - CLK_DUPLICATE("sbc1", "tegra_spi_slave.0", NULL), CLK_DUPLICATE("bsea", "tegra-aes", "bsea"), }; |