diff options
author | Florian Fainelli <f.fainelli@gmail.com> | 2017-09-19 21:03:46 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-09-20 18:57:02 -0400 |
commit | 637ae0f44580040702b53e8f0593a5a5fb00473e (patch) | |
tree | 4c25d975fe0e05850bd562da403e685b80a6a845 /arch/blackfin | |
parent | 5c1adf606d6ff519b5c1b9b22b8055f161dd98dd (diff) |
blackfin: ezbrd: Remove non-functional DSA/KSZ8893M code
There is no in tree driver for the KSZ8893M switch driver, so just get rid of
the code in that board file.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/blackfin')
-rw-r--r-- | arch/blackfin/mach-bf518/boards/ezbrd.c | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/arch/blackfin/mach-bf518/boards/ezbrd.c b/arch/blackfin/mach-bf518/boards/ezbrd.c index d022112927c2..c51d1b810ac3 100644 --- a/arch/blackfin/mach-bf518/boards/ezbrd.c +++ b/arch/blackfin/mach-bf518/boards/ezbrd.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <asm/dpmc.h> | 25 | #include <asm/dpmc.h> |
26 | #include <asm/bfin_sdh.h> | 26 | #include <asm/bfin_sdh.h> |
27 | #include <linux/spi/ad7877.h> | 27 | #include <linux/spi/ad7877.h> |
28 | #include <net/dsa.h> | ||
29 | 28 | ||
30 | /* | 29 | /* |
31 | * Name the Board for the /proc/cpuinfo | 30 | * Name the Board for the /proc/cpuinfo |
@@ -105,11 +104,7 @@ static const unsigned short bfin_mac_peripherals[] = { | |||
105 | 104 | ||
106 | static struct bfin_phydev_platform_data bfin_phydev_data[] = { | 105 | static struct bfin_phydev_platform_data bfin_phydev_data[] = { |
107 | { | 106 | { |
108 | #if IS_ENABLED(CONFIG_NET_DSA_KSZ8893M) | ||
109 | .addr = 3, | ||
110 | #else | ||
111 | .addr = 1, | 107 | .addr = 1, |
112 | #endif | ||
113 | .irq = IRQ_MAC_PHYINT, | 108 | .irq = IRQ_MAC_PHYINT, |
114 | }, | 109 | }, |
115 | }; | 110 | }; |
@@ -119,9 +114,6 @@ static struct bfin_mii_bus_platform_data bfin_mii_bus_data = { | |||
119 | .phydev_data = bfin_phydev_data, | 114 | .phydev_data = bfin_phydev_data, |
120 | .phy_mode = PHY_INTERFACE_MODE_MII, | 115 | .phy_mode = PHY_INTERFACE_MODE_MII, |
121 | .mac_peripherals = bfin_mac_peripherals, | 116 | .mac_peripherals = bfin_mac_peripherals, |
122 | #if IS_ENABLED(CONFIG_NET_DSA_KSZ8893M) | ||
123 | .phy_mask = 0xfff7, /* Only probe the port phy connect to the on chip MAC */ | ||
124 | #endif | ||
125 | .vlan1_mask = 1, | 117 | .vlan1_mask = 1, |
126 | .vlan2_mask = 2, | 118 | .vlan2_mask = 2, |
127 | }; | 119 | }; |
@@ -140,29 +132,6 @@ static struct platform_device bfin_mac_device = { | |||
140 | } | 132 | } |
141 | }; | 133 | }; |
142 | 134 | ||
143 | #if IS_ENABLED(CONFIG_NET_DSA_KSZ8893M) | ||
144 | static struct dsa_chip_data ksz8893m_switch_chip_data = { | ||
145 | .mii_bus = &bfin_mii_bus.dev, | ||
146 | .port_names = { | ||
147 | NULL, | ||
148 | "eth%d", | ||
149 | "eth%d", | ||
150 | "cpu", | ||
151 | }, | ||
152 | }; | ||
153 | static struct dsa_platform_data ksz8893m_switch_data = { | ||
154 | .nr_chips = 1, | ||
155 | .netdev = &bfin_mac_device.dev, | ||
156 | .chip = &ksz8893m_switch_chip_data, | ||
157 | }; | ||
158 | |||
159 | static struct platform_device ksz8893m_switch_device = { | ||
160 | .name = "dsa", | ||
161 | .id = 0, | ||
162 | .num_resources = 0, | ||
163 | .dev.platform_data = &ksz8893m_switch_data, | ||
164 | }; | ||
165 | #endif | ||
166 | #endif | 135 | #endif |
167 | 136 | ||
168 | #if IS_ENABLED(CONFIG_MTD_M25P80) | 137 | #if IS_ENABLED(CONFIG_MTD_M25P80) |
@@ -228,19 +197,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
228 | }, | 197 | }, |
229 | #endif | 198 | #endif |
230 | 199 | ||
231 | #if IS_ENABLED(CONFIG_BFIN_MAC) | ||
232 | #if IS_ENABLED(CONFIG_NET_DSA_KSZ8893M) | ||
233 | { | ||
234 | .modalias = "ksz8893m", | ||
235 | .max_speed_hz = 5000000, | ||
236 | .bus_num = 0, | ||
237 | .chip_select = 1, | ||
238 | .platform_data = NULL, | ||
239 | .mode = SPI_MODE_3, | ||
240 | }, | ||
241 | #endif | ||
242 | #endif | ||
243 | |||
244 | #if IS_ENABLED(CONFIG_MMC_SPI) | 200 | #if IS_ENABLED(CONFIG_MMC_SPI) |
245 | { | 201 | { |
246 | .modalias = "mmc_spi", | 202 | .modalias = "mmc_spi", |
@@ -714,9 +670,6 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
714 | #if IS_ENABLED(CONFIG_BFIN_MAC) | 670 | #if IS_ENABLED(CONFIG_BFIN_MAC) |
715 | &bfin_mii_bus, | 671 | &bfin_mii_bus, |
716 | &bfin_mac_device, | 672 | &bfin_mac_device, |
717 | #if IS_ENABLED(CONFIG_NET_DSA_KSZ8893M) | ||
718 | &ksz8893m_switch_device, | ||
719 | #endif | ||
720 | #endif | 673 | #endif |
721 | 674 | ||
722 | #if IS_ENABLED(CONFIG_SPI_BFIN5XX) | 675 | #if IS_ENABLED(CONFIG_SPI_BFIN5XX) |