diff options
| author | Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2018-01-04 16:26:46 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-08 14:10:33 -0500 |
| commit | e3e49ca9b033adbc99aca25db4b46b0eadd7cfb9 (patch) | |
| tree | eb4e2a1dd3c714e6bc84663a9e14b0d6a767f333 | |
| parent | e2d922185c47b08c5f8579b431a14d5bc4f06e37 (diff) | |
sh_eth: remove sh_eth_plat_data::edmac_endian
Since the commit 888cc8c20cf ("sh_eth: remove EDMAC_BIG_ENDIAN") (geez,
I didn't realize that was 2 years ago!) the initializers in the SuperH
platform code for the 'sh_eth_plat_data::edmac_endian' stopped to matter,
so we can remove that field for good (not sure if it was ever useful --
SH7786 Ether has been reported to have the same EDMAC descriptor/register
endiannes as configured for the SuperH CPU)...
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | arch/sh/boards/board-espt.c | 1 | ||||
| -rw-r--r-- | arch/sh/boards/board-sh7757lcr.c | 4 | ||||
| -rw-r--r-- | arch/sh/boards/mach-ecovec24/setup.c | 1 | ||||
| -rw-r--r-- | arch/sh/boards/mach-se/7724/setup.c | 1 | ||||
| -rw-r--r-- | arch/sh/boards/mach-sh7763rdp/setup.c | 1 | ||||
| -rw-r--r-- | arch/sh/kernel/cpu/sh2/setup-sh7619.c | 1 | ||||
| -rw-r--r-- | include/linux/sh_eth.h | 3 |
7 files changed, 0 insertions, 12 deletions
diff --git a/arch/sh/boards/board-espt.c b/arch/sh/boards/board-espt.c index 7291e2f11a47..4d6be53058d6 100644 --- a/arch/sh/boards/board-espt.c +++ b/arch/sh/boards/board-espt.c | |||
| @@ -79,7 +79,6 @@ static struct resource sh_eth_resources[] = { | |||
| 79 | 79 | ||
| 80 | static struct sh_eth_plat_data sh7763_eth_pdata = { | 80 | static struct sh_eth_plat_data sh7763_eth_pdata = { |
| 81 | .phy = 0, | 81 | .phy = 0, |
| 82 | .edmac_endian = EDMAC_LITTLE_ENDIAN, | ||
| 83 | .phy_interface = PHY_INTERFACE_MODE_MII, | 82 | .phy_interface = PHY_INTERFACE_MODE_MII, |
| 84 | }; | 83 | }; |
| 85 | 84 | ||
diff --git a/arch/sh/boards/board-sh7757lcr.c b/arch/sh/boards/board-sh7757lcr.c index 0104c8199c48..1bde08dc067d 100644 --- a/arch/sh/boards/board-sh7757lcr.c +++ b/arch/sh/boards/board-sh7757lcr.c | |||
| @@ -76,7 +76,6 @@ static struct resource sh_eth0_resources[] = { | |||
| 76 | 76 | ||
| 77 | static struct sh_eth_plat_data sh7757_eth0_pdata = { | 77 | static struct sh_eth_plat_data sh7757_eth0_pdata = { |
| 78 | .phy = 1, | 78 | .phy = 1, |
| 79 | .edmac_endian = EDMAC_LITTLE_ENDIAN, | ||
| 80 | .set_mdio_gate = sh7757_eth_set_mdio_gate, | 79 | .set_mdio_gate = sh7757_eth_set_mdio_gate, |
| 81 | }; | 80 | }; |
| 82 | 81 | ||
| @@ -104,7 +103,6 @@ static struct resource sh_eth1_resources[] = { | |||
| 104 | 103 | ||
| 105 | static struct sh_eth_plat_data sh7757_eth1_pdata = { | 104 | static struct sh_eth_plat_data sh7757_eth1_pdata = { |
| 106 | .phy = 1, | 105 | .phy = 1, |
| 107 | .edmac_endian = EDMAC_LITTLE_ENDIAN, | ||
| 108 | .set_mdio_gate = sh7757_eth_set_mdio_gate, | 106 | .set_mdio_gate = sh7757_eth_set_mdio_gate, |
| 109 | }; | 107 | }; |
| 110 | 108 | ||
| @@ -148,7 +146,6 @@ static struct resource sh_eth_giga0_resources[] = { | |||
| 148 | 146 | ||
| 149 | static struct sh_eth_plat_data sh7757_eth_giga0_pdata = { | 147 | static struct sh_eth_plat_data sh7757_eth_giga0_pdata = { |
| 150 | .phy = 18, | 148 | .phy = 18, |
| 151 | .edmac_endian = EDMAC_LITTLE_ENDIAN, | ||
| 152 | .set_mdio_gate = sh7757_eth_giga_set_mdio_gate, | 149 | .set_mdio_gate = sh7757_eth_giga_set_mdio_gate, |
| 153 | .phy_interface = PHY_INTERFACE_MODE_RGMII_ID, | 150 | .phy_interface = PHY_INTERFACE_MODE_RGMII_ID, |
| 154 | }; | 151 | }; |
| @@ -182,7 +179,6 @@ static struct resource sh_eth_giga1_resources[] = { | |||
| 182 | 179 | ||
| 183 | static struct sh_eth_plat_data sh7757_eth_giga1_pdata = { | 180 | static struct sh_eth_plat_data sh7757_eth_giga1_pdata = { |
| 184 | .phy = 19, | 181 | .phy = 19, |
| 185 | .edmac_endian = EDMAC_LITTLE_ENDIAN, | ||
| 186 | .set_mdio_gate = sh7757_eth_giga_set_mdio_gate, | 182 | .set_mdio_gate = sh7757_eth_giga_set_mdio_gate, |
| 187 | .phy_interface = PHY_INTERFACE_MODE_RGMII_ID, | 183 | .phy_interface = PHY_INTERFACE_MODE_RGMII_ID, |
| 188 | }; | 184 | }; |
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c index 1faf6cb93dcb..6f929abe0b50 100644 --- a/arch/sh/boards/mach-ecovec24/setup.c +++ b/arch/sh/boards/mach-ecovec24/setup.c | |||
| @@ -159,7 +159,6 @@ static struct resource sh_eth_resources[] = { | |||
| 159 | 159 | ||
| 160 | static struct sh_eth_plat_data sh_eth_plat = { | 160 | static struct sh_eth_plat_data sh_eth_plat = { |
| 161 | .phy = 0x1f, /* SMSC LAN8700 */ | 161 | .phy = 0x1f, /* SMSC LAN8700 */ |
| 162 | .edmac_endian = EDMAC_LITTLE_ENDIAN, | ||
| 163 | .phy_interface = PHY_INTERFACE_MODE_MII, | 162 | .phy_interface = PHY_INTERFACE_MODE_MII, |
| 164 | .ether_link_active_low = 1 | 163 | .ether_link_active_low = 1 |
| 165 | }; | 164 | }; |
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c index f1fecd395679..255952555656 100644 --- a/arch/sh/boards/mach-se/7724/setup.c +++ b/arch/sh/boards/mach-se/7724/setup.c | |||
| @@ -374,7 +374,6 @@ static struct resource sh_eth_resources[] = { | |||
| 374 | 374 | ||
| 375 | static struct sh_eth_plat_data sh_eth_plat = { | 375 | static struct sh_eth_plat_data sh_eth_plat = { |
| 376 | .phy = 0x1f, /* SMSC LAN8187 */ | 376 | .phy = 0x1f, /* SMSC LAN8187 */ |
| 377 | .edmac_endian = EDMAC_LITTLE_ENDIAN, | ||
| 378 | .phy_interface = PHY_INTERFACE_MODE_MII, | 377 | .phy_interface = PHY_INTERFACE_MODE_MII, |
| 379 | }; | 378 | }; |
| 380 | 379 | ||
diff --git a/arch/sh/boards/mach-sh7763rdp/setup.c b/arch/sh/boards/mach-sh7763rdp/setup.c index 2c8fb04685d4..6e62686b81b1 100644 --- a/arch/sh/boards/mach-sh7763rdp/setup.c +++ b/arch/sh/boards/mach-sh7763rdp/setup.c | |||
| @@ -87,7 +87,6 @@ static struct resource sh_eth_resources[] = { | |||
| 87 | 87 | ||
| 88 | static struct sh_eth_plat_data sh7763_eth_pdata = { | 88 | static struct sh_eth_plat_data sh7763_eth_pdata = { |
| 89 | .phy = 1, | 89 | .phy = 1, |
| 90 | .edmac_endian = EDMAC_LITTLE_ENDIAN, | ||
| 91 | .phy_interface = PHY_INTERFACE_MODE_MII, | 90 | .phy_interface = PHY_INTERFACE_MODE_MII, |
| 92 | }; | 91 | }; |
| 93 | 92 | ||
diff --git a/arch/sh/kernel/cpu/sh2/setup-sh7619.c b/arch/sh/kernel/cpu/sh2/setup-sh7619.c index 95796ad00fbe..d08db08dec38 100644 --- a/arch/sh/kernel/cpu/sh2/setup-sh7619.c +++ b/arch/sh/kernel/cpu/sh2/setup-sh7619.c | |||
| @@ -122,7 +122,6 @@ static struct platform_device scif2_device = { | |||
| 122 | 122 | ||
| 123 | static struct sh_eth_plat_data eth_platform_data = { | 123 | static struct sh_eth_plat_data eth_platform_data = { |
| 124 | .phy = 1, | 124 | .phy = 1, |
| 125 | .edmac_endian = EDMAC_LITTLE_ENDIAN, | ||
| 126 | .phy_interface = PHY_INTERFACE_MODE_MII, | 125 | .phy_interface = PHY_INTERFACE_MODE_MII, |
| 127 | }; | 126 | }; |
| 128 | 127 | ||
diff --git a/include/linux/sh_eth.h b/include/linux/sh_eth.h index ff3642d267f7..dd5d69323701 100644 --- a/include/linux/sh_eth.h +++ b/include/linux/sh_eth.h | |||
| @@ -5,12 +5,9 @@ | |||
| 5 | #include <linux/phy.h> | 5 | #include <linux/phy.h> |
| 6 | #include <linux/if_ether.h> | 6 | #include <linux/if_ether.h> |
| 7 | 7 | ||
| 8 | enum {EDMAC_LITTLE_ENDIAN}; | ||
| 9 | |||
| 10 | struct sh_eth_plat_data { | 8 | struct sh_eth_plat_data { |
| 11 | int phy; | 9 | int phy; |
| 12 | int phy_irq; | 10 | int phy_irq; |
| 13 | int edmac_endian; | ||
| 14 | phy_interface_t phy_interface; | 11 | phy_interface_t phy_interface; |
| 15 | void (*set_mdio_gate)(void *addr); | 12 | void (*set_mdio_gate)(void *addr); |
| 16 | 13 | ||
