* [PATCH v2 0/4] sh_eth: Remove obsolete platform_device_id entries
@ 2015-10-07 8:14 ` Geert Uytterhoeven
0 siblings, 0 replies; 18+ messages in thread
From: Geert Uytterhoeven @ 2015-10-07 8:14 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev, linux-sh, Geert Uytterhoeven
Hi David,
Since commit 3d7608e4c169af03 ("ARM: shmobile: bockw: remove legacy
board file and config"), which is now in arm-soc/for-next, shmobile SoCs
are only supported in generic DT-only ARM multi-platform builds.
The sh_eth driver doesn't need to match platform devices by name
anymore, hence this series removes the corresponding platform_device_id
entries.
Changes since v1:
- Protect some data and functions by #ifdef CONFIG_OF to silence
unused compiler warnings on SH,
- New patches 3 and 4.
Thanks!
Geert Uytterhoeven (4):
sh_eth: Remove obsolete r7s72100-ether platform_device_id entry
sh_eth: Remove obsolete r8a779x-ether platform_device_id entries
sh_eth: Remove obsolete r8a7740-gether platform_device_id entry
sh_eth: Remove obsolete r8a777x-ether platform_device_id entry
drivers/net/ethernet/renesas/sh_eth.c | 213 +++++++++++++++++-----------------
1 file changed, 104 insertions(+), 109 deletions(-)
--
1.9.1
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 0/4] sh_eth: Remove obsolete platform_device_id entries
@ 2015-10-07 8:14 ` Geert Uytterhoeven
0 siblings, 0 replies; 18+ messages in thread
From: Geert Uytterhoeven @ 2015-10-07 8:14 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev, linux-sh, Geert Uytterhoeven
Hi David,
Since commit 3d7608e4c169af03 ("ARM: shmobile: bockw: remove legacy
board file and config"), which is now in arm-soc/for-next, shmobile SoCs
are only supported in generic DT-only ARM multi-platform builds.
The sh_eth driver doesn't need to match platform devices by name
anymore, hence this series removes the corresponding platform_device_id
entries.
Changes since v1:
- Protect some data and functions by #ifdef CONFIG_OF to silence
unused compiler warnings on SH,
- New patches 3 and 4.
Thanks!
Geert Uytterhoeven (4):
sh_eth: Remove obsolete r7s72100-ether platform_device_id entry
sh_eth: Remove obsolete r8a779x-ether platform_device_id entries
sh_eth: Remove obsolete r8a7740-gether platform_device_id entry
sh_eth: Remove obsolete r8a777x-ether platform_device_id entry
drivers/net/ethernet/renesas/sh_eth.c | 213 +++++++++++++++++-----------------
1 file changed, 104 insertions(+), 109 deletions(-)
--
1.9.1
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 1/4] sh_eth: Remove obsolete r7s72100-ether platform_device_id entry
2015-10-07 8:14 ` Geert Uytterhoeven
@ 2015-10-07 8:14 ` Geert Uytterhoeven
-1 siblings, 0 replies; 18+ messages in thread
From: Geert Uytterhoeven @ 2015-10-07 8:14 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev, linux-sh, Geert Uytterhoeven
Since commit 05104c266ae9a167 ("ARM: shmobile: r7s72100: genmai: Remove
legacy board file"), r7s72100 is only supported in generic DT-only ARM
multi-platform builds. The driver doesn't need to match platform
devices by name anymore, hence remove the corresponding
platform_device_id entry.
Protect r7s72100_data by #ifdef CONFIG_OF as it's now referenced on DT
platforms only. Move it to a more logical position, in front of the
r8a777x support, so we can have a single #ifdef covering all r7s* and
r8a* support soon. This requires moving a helper function, too.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
---
v2:
- Add Acked-by,
- Protect r7s72100_data by #ifdef CONFIG_OF to silence a compiler
warning on SH,
- Move r7s72100_data.
---
drivers/net/ethernet/renesas/sh_eth.c | 83 ++++++++++++++++++-----------------
1 file changed, 42 insertions(+), 41 deletions(-)
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 257ea713b4c1..1bff9e21d920 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -449,6 +449,48 @@ static void sh_eth_set_duplex(struct net_device *ndev)
sh_eth_write(ndev, sh_eth_read(ndev, ECMR) & ~ECMR_DM, ECMR);
}
+static void sh_eth_chip_reset(struct net_device *ndev)
+{
+ struct sh_eth_private *mdp = netdev_priv(ndev);
+
+ /* reset device */
+ sh_eth_tsu_write(mdp, ARSTR_ARSTR, ARSTR);
+ mdelay(1);
+}
+
+#ifdef CONFIG_OF
+/* R7S72100 */
+static struct sh_eth_cpu_data r7s72100_data = {
+ .chip_reset = sh_eth_chip_reset,
+ .set_duplex = sh_eth_set_duplex,
+
+ .register_type = SH_ETH_REG_FAST_RZ,
+
+ .ecsr_value = ECSR_ICD,
+ .ecsipr_value = ECSIPR_ICDIP,
+ .eesipr_value = 0xff7f009f,
+
+ .tx_check = EESR_TC1 | EESR_FTC,
+ .eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT |
+ EESR_RFE | EESR_RDE | EESR_RFRMER | EESR_TFE |
+ EESR_TDE | EESR_ECI,
+ .fdr_value = 0x0000070f,
+
+ .no_psr = 1,
+ .apr = 1,
+ .mpr = 1,
+ .tpauser = 1,
+ .hw_swap = 1,
+ .rpadir = 1,
+ .rpadir_value = 2 << 16,
+ .no_trimd = 1,
+ .no_ade = 1,
+ .hw_crc = 1,
+ .tsu = 1,
+ .shift_rd0 = 1,
+};
+#endif /* CONFIG_OF */
+
/* There is CPU dependent code */
static void sh_eth_set_rate_r8a777x(struct net_device *ndev)
{
@@ -671,15 +713,6 @@ static struct sh_eth_cpu_data sh7757_data_giga = {
.tsu = 1,
};
-static void sh_eth_chip_reset(struct net_device *ndev)
-{
- struct sh_eth_private *mdp = netdev_priv(ndev);
-
- /* reset device */
- sh_eth_tsu_write(mdp, ARSTR_ARSTR, ARSTR);
- mdelay(1);
-}
-
static void sh_eth_set_rate_gether(struct net_device *ndev)
{
struct sh_eth_private *mdp = netdev_priv(ndev);
@@ -799,37 +832,6 @@ static struct sh_eth_cpu_data r8a7740_data = {
.shift_rd0 = 1,
};
-/* R7S72100 */
-static struct sh_eth_cpu_data r7s72100_data = {
- .chip_reset = sh_eth_chip_reset,
- .set_duplex = sh_eth_set_duplex,
-
- .register_type = SH_ETH_REG_FAST_RZ,
-
- .ecsr_value = ECSR_ICD,
- .ecsipr_value = ECSIPR_ICDIP,
- .eesipr_value = 0xff7f009f,
-
- .tx_check = EESR_TC1 | EESR_FTC,
- .eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT |
- EESR_RFE | EESR_RDE | EESR_RFRMER | EESR_TFE |
- EESR_TDE | EESR_ECI,
- .fdr_value = 0x0000070f,
-
- .no_psr = 1,
- .apr = 1,
- .mpr = 1,
- .tpauser = 1,
- .hw_swap = 1,
- .rpadir = 1,
- .rpadir_value = 2 << 16,
- .no_trimd = 1,
- .no_ade = 1,
- .hw_crc = 1,
- .tsu = 1,
- .shift_rd0 = 1,
-};
-
static struct sh_eth_cpu_data sh7619_data = {
.register_type = SH_ETH_REG_FAST_SH3_SH2,
@@ -3301,7 +3303,6 @@ static struct platform_device_id sh_eth_id_table[] = {
{ "sh7757-ether", (kernel_ulong_t)&sh7757_data },
{ "sh7757-gether", (kernel_ulong_t)&sh7757_data_giga },
{ "sh7763-gether", (kernel_ulong_t)&sh7763_data },
- { "r7s72100-ether", (kernel_ulong_t)&r7s72100_data },
{ "r8a7740-gether", (kernel_ulong_t)&r8a7740_data },
{ "r8a777x-ether", (kernel_ulong_t)&r8a777x_data },
{ "r8a7790-ether", (kernel_ulong_t)&r8a779x_data },
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2 1/4] sh_eth: Remove obsolete r7s72100-ether platform_device_id entry
@ 2015-10-07 8:14 ` Geert Uytterhoeven
0 siblings, 0 replies; 18+ messages in thread
From: Geert Uytterhoeven @ 2015-10-07 8:14 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev, linux-sh, Geert Uytterhoeven
Since commit 05104c266ae9a167 ("ARM: shmobile: r7s72100: genmai: Remove
legacy board file"), r7s72100 is only supported in generic DT-only ARM
multi-platform builds. The driver doesn't need to match platform
devices by name anymore, hence remove the corresponding
platform_device_id entry.
Protect r7s72100_data by #ifdef CONFIG_OF as it's now referenced on DT
platforms only. Move it to a more logical position, in front of the
r8a777x support, so we can have a single #ifdef covering all r7s* and
r8a* support soon. This requires moving a helper function, too.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
---
v2:
- Add Acked-by,
- Protect r7s72100_data by #ifdef CONFIG_OF to silence a compiler
warning on SH,
- Move r7s72100_data.
---
drivers/net/ethernet/renesas/sh_eth.c | 83 ++++++++++++++++++-----------------
1 file changed, 42 insertions(+), 41 deletions(-)
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 257ea713b4c1..1bff9e21d920 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -449,6 +449,48 @@ static void sh_eth_set_duplex(struct net_device *ndev)
sh_eth_write(ndev, sh_eth_read(ndev, ECMR) & ~ECMR_DM, ECMR);
}
+static void sh_eth_chip_reset(struct net_device *ndev)
+{
+ struct sh_eth_private *mdp = netdev_priv(ndev);
+
+ /* reset device */
+ sh_eth_tsu_write(mdp, ARSTR_ARSTR, ARSTR);
+ mdelay(1);
+}
+
+#ifdef CONFIG_OF
+/* R7S72100 */
+static struct sh_eth_cpu_data r7s72100_data = {
+ .chip_reset = sh_eth_chip_reset,
+ .set_duplex = sh_eth_set_duplex,
+
+ .register_type = SH_ETH_REG_FAST_RZ,
+
+ .ecsr_value = ECSR_ICD,
+ .ecsipr_value = ECSIPR_ICDIP,
+ .eesipr_value = 0xff7f009f,
+
+ .tx_check = EESR_TC1 | EESR_FTC,
+ .eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT |
+ EESR_RFE | EESR_RDE | EESR_RFRMER | EESR_TFE |
+ EESR_TDE | EESR_ECI,
+ .fdr_value = 0x0000070f,
+
+ .no_psr = 1,
+ .apr = 1,
+ .mpr = 1,
+ .tpauser = 1,
+ .hw_swap = 1,
+ .rpadir = 1,
+ .rpadir_value = 2 << 16,
+ .no_trimd = 1,
+ .no_ade = 1,
+ .hw_crc = 1,
+ .tsu = 1,
+ .shift_rd0 = 1,
+};
+#endif /* CONFIG_OF */
+
/* There is CPU dependent code */
static void sh_eth_set_rate_r8a777x(struct net_device *ndev)
{
@@ -671,15 +713,6 @@ static struct sh_eth_cpu_data sh7757_data_giga = {
.tsu = 1,
};
-static void sh_eth_chip_reset(struct net_device *ndev)
-{
- struct sh_eth_private *mdp = netdev_priv(ndev);
-
- /* reset device */
- sh_eth_tsu_write(mdp, ARSTR_ARSTR, ARSTR);
- mdelay(1);
-}
-
static void sh_eth_set_rate_gether(struct net_device *ndev)
{
struct sh_eth_private *mdp = netdev_priv(ndev);
@@ -799,37 +832,6 @@ static struct sh_eth_cpu_data r8a7740_data = {
.shift_rd0 = 1,
};
-/* R7S72100 */
-static struct sh_eth_cpu_data r7s72100_data = {
- .chip_reset = sh_eth_chip_reset,
- .set_duplex = sh_eth_set_duplex,
-
- .register_type = SH_ETH_REG_FAST_RZ,
-
- .ecsr_value = ECSR_ICD,
- .ecsipr_value = ECSIPR_ICDIP,
- .eesipr_value = 0xff7f009f,
-
- .tx_check = EESR_TC1 | EESR_FTC,
- .eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT |
- EESR_RFE | EESR_RDE | EESR_RFRMER | EESR_TFE |
- EESR_TDE | EESR_ECI,
- .fdr_value = 0x0000070f,
-
- .no_psr = 1,
- .apr = 1,
- .mpr = 1,
- .tpauser = 1,
- .hw_swap = 1,
- .rpadir = 1,
- .rpadir_value = 2 << 16,
- .no_trimd = 1,
- .no_ade = 1,
- .hw_crc = 1,
- .tsu = 1,
- .shift_rd0 = 1,
-};
-
static struct sh_eth_cpu_data sh7619_data = {
.register_type = SH_ETH_REG_FAST_SH3_SH2,
@@ -3301,7 +3303,6 @@ static struct platform_device_id sh_eth_id_table[] = {
{ "sh7757-ether", (kernel_ulong_t)&sh7757_data },
{ "sh7757-gether", (kernel_ulong_t)&sh7757_data_giga },
{ "sh7763-gether", (kernel_ulong_t)&sh7763_data },
- { "r7s72100-ether", (kernel_ulong_t)&r7s72100_data },
{ "r8a7740-gether", (kernel_ulong_t)&r8a7740_data },
{ "r8a777x-ether", (kernel_ulong_t)&r8a777x_data },
{ "r8a7790-ether", (kernel_ulong_t)&r8a779x_data },
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2 2/4] sh_eth: Remove obsolete r8a779x-ether platform_device_id entries
2015-10-07 8:14 ` Geert Uytterhoeven
@ 2015-10-07 8:14 ` Geert Uytterhoeven
-1 siblings, 0 replies; 18+ messages in thread
From: Geert Uytterhoeven @ 2015-10-07 8:14 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev, linux-sh, Geert Uytterhoeven
Since commit a483dcbfa21f919c ("ARM: shmobile: lager: Remove legacy
board support"), R-Car Gen2 SoCs are only supported in generic DT-only
ARM multi-platform builds. The driver doesn't need to match platform
devices by name anymore, hence remove the corresponding
platform_device_id entry.
Protect r8a779x_data by #ifdef CONFIG_OF as it's now referenced on DT
platforms only.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
---
v2:
- Add Acked-by,
- Protect r8a779x_data by #ifdef CONFIG_OF to silence a compiler
warning on SH.
---
drivers/net/ethernet/renesas/sh_eth.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 1bff9e21d920..029ea449f901 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -531,6 +531,7 @@ static struct sh_eth_cpu_data r8a777x_data = {
.hw_swap = 1,
};
+#ifdef CONFIG_OF
/* R8A7790/1 */
static struct sh_eth_cpu_data r8a779x_data = {
.set_duplex = sh_eth_set_duplex,
@@ -556,6 +557,7 @@ static struct sh_eth_cpu_data r8a779x_data = {
.hw_swap = 1,
.rmiimode = 1,
};
+#endif /* CONFIG_OF */
static void sh_eth_set_rate_sh7724(struct net_device *ndev)
{
@@ -3305,10 +3307,6 @@ static struct platform_device_id sh_eth_id_table[] = {
{ "sh7763-gether", (kernel_ulong_t)&sh7763_data },
{ "r8a7740-gether", (kernel_ulong_t)&r8a7740_data },
{ "r8a777x-ether", (kernel_ulong_t)&r8a777x_data },
- { "r8a7790-ether", (kernel_ulong_t)&r8a779x_data },
- { "r8a7791-ether", (kernel_ulong_t)&r8a779x_data },
- { "r8a7793-ether", (kernel_ulong_t)&r8a779x_data },
- { "r8a7794-ether", (kernel_ulong_t)&r8a779x_data },
{ }
};
MODULE_DEVICE_TABLE(platform, sh_eth_id_table);
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2 2/4] sh_eth: Remove obsolete r8a779x-ether platform_device_id entries
@ 2015-10-07 8:14 ` Geert Uytterhoeven
0 siblings, 0 replies; 18+ messages in thread
From: Geert Uytterhoeven @ 2015-10-07 8:14 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev, linux-sh, Geert Uytterhoeven
Since commit a483dcbfa21f919c ("ARM: shmobile: lager: Remove legacy
board support"), R-Car Gen2 SoCs are only supported in generic DT-only
ARM multi-platform builds. The driver doesn't need to match platform
devices by name anymore, hence remove the corresponding
platform_device_id entry.
Protect r8a779x_data by #ifdef CONFIG_OF as it's now referenced on DT
platforms only.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
---
v2:
- Add Acked-by,
- Protect r8a779x_data by #ifdef CONFIG_OF to silence a compiler
warning on SH.
---
drivers/net/ethernet/renesas/sh_eth.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 1bff9e21d920..029ea449f901 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -531,6 +531,7 @@ static struct sh_eth_cpu_data r8a777x_data = {
.hw_swap = 1,
};
+#ifdef CONFIG_OF
/* R8A7790/1 */
static struct sh_eth_cpu_data r8a779x_data = {
.set_duplex = sh_eth_set_duplex,
@@ -556,6 +557,7 @@ static struct sh_eth_cpu_data r8a779x_data = {
.hw_swap = 1,
.rmiimode = 1,
};
+#endif /* CONFIG_OF */
static void sh_eth_set_rate_sh7724(struct net_device *ndev)
{
@@ -3305,10 +3307,6 @@ static struct platform_device_id sh_eth_id_table[] = {
{ "sh7763-gether", (kernel_ulong_t)&sh7763_data },
{ "r8a7740-gether", (kernel_ulong_t)&r8a7740_data },
{ "r8a777x-ether", (kernel_ulong_t)&r8a777x_data },
- { "r8a7790-ether", (kernel_ulong_t)&r8a779x_data },
- { "r8a7791-ether", (kernel_ulong_t)&r8a779x_data },
- { "r8a7793-ether", (kernel_ulong_t)&r8a779x_data },
- { "r8a7794-ether", (kernel_ulong_t)&r8a779x_data },
{ }
};
MODULE_DEVICE_TABLE(platform, sh_eth_id_table);
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2 3/4] sh_eth: Remove obsolete r8a7740-gether platform_device_id entry
2015-10-07 8:14 ` Geert Uytterhoeven
@ 2015-10-07 8:14 ` Geert Uytterhoeven
-1 siblings, 0 replies; 18+ messages in thread
From: Geert Uytterhoeven @ 2015-10-07 8:14 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev, linux-sh, Geert Uytterhoeven
Since commit 1fa59bda21c7fa36 ("ARM: shmobile: Remove legacy board code
for Armadillo-800 EVA"), r8a7740 is only supported in generic DT-only
ARM multi-platform builds. The driver doesn't need to match platform
devices by name anymore, hence remove the corresponding
platform_device_id entry.
Protect r8a7740_data by #ifdef CONFIG_OF as it's now referenced on DT
platforms only. Move it to a more logical position, in front of the
r8a777x support, so we can have a single #ifdef covering all r7s* and
r8a* support soon. This requires moving a few helper functions, too.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
- New.
---
drivers/net/ethernet/renesas/sh_eth.c | 125 +++++++++++++++++-----------------
1 file changed, 62 insertions(+), 63 deletions(-)
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 029ea449f901..6395d2fc2bd8 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -458,6 +458,25 @@ static void sh_eth_chip_reset(struct net_device *ndev)
mdelay(1);
}
+static void sh_eth_set_rate_gether(struct net_device *ndev)
+{
+ struct sh_eth_private *mdp = netdev_priv(ndev);
+
+ switch (mdp->speed) {
+ case 10: /* 10BASE */
+ sh_eth_write(ndev, GECMR_10, GECMR);
+ break;
+ case 100:/* 100BASE */
+ sh_eth_write(ndev, GECMR_100, GECMR);
+ break;
+ case 1000: /* 1000BASE */
+ sh_eth_write(ndev, GECMR_1000, GECMR);
+ break;
+ default:
+ break;
+ }
+}
+
#ifdef CONFIG_OF
/* R7S72100 */
static struct sh_eth_cpu_data r7s72100_data = {
@@ -489,6 +508,49 @@ static struct sh_eth_cpu_data r7s72100_data = {
.tsu = 1,
.shift_rd0 = 1,
};
+
+static void sh_eth_chip_reset_r8a7740(struct net_device *ndev)
+{
+ struct sh_eth_private *mdp = netdev_priv(ndev);
+
+ /* reset device */
+ sh_eth_tsu_write(mdp, ARSTR_ARSTR, ARSTR);
+ mdelay(1);
+
+ sh_eth_select_mii(ndev);
+}
+
+/* R8A7740 */
+static struct sh_eth_cpu_data r8a7740_data = {
+ .chip_reset = sh_eth_chip_reset_r8a7740,
+ .set_duplex = sh_eth_set_duplex,
+ .set_rate = sh_eth_set_rate_gether,
+
+ .register_type = SH_ETH_REG_GIGABIT,
+
+ .ecsr_value = ECSR_ICD | ECSR_MPD,
+ .ecsipr_value = ECSIPR_LCHNGIP | ECSIPR_ICDIP | ECSIPR_MPDIP,
+ .eesipr_value = DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff,
+
+ .tx_check = EESR_TC1 | EESR_FTC,
+ .eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT |
+ EESR_RFE | EESR_RDE | EESR_RFRMER | EESR_TFE |
+ EESR_TDE | EESR_ECI,
+ .fdr_value = 0x0000070f,
+
+ .apr = 1,
+ .mpr = 1,
+ .tpauser = 1,
+ .bculr = 1,
+ .hw_swap = 1,
+ .rpadir = 1,
+ .rpadir_value = 2 << 16,
+ .no_trimd = 1,
+ .no_ade = 1,
+ .tsu = 1,
+ .select_mii = 1,
+ .shift_rd0 = 1,
+};
#endif /* CONFIG_OF */
/* There is CPU dependent code */
@@ -715,25 +777,6 @@ static struct sh_eth_cpu_data sh7757_data_giga = {
.tsu = 1,
};
-static void sh_eth_set_rate_gether(struct net_device *ndev)
-{
- struct sh_eth_private *mdp = netdev_priv(ndev);
-
- switch (mdp->speed) {
- case 10: /* 10BASE */
- sh_eth_write(ndev, GECMR_10, GECMR);
- break;
- case 100:/* 100BASE */
- sh_eth_write(ndev, GECMR_100, GECMR);
- break;
- case 1000: /* 1000BASE */
- sh_eth_write(ndev, GECMR_1000, GECMR);
- break;
- default:
- break;
- }
-}
-
/* SH7734 */
static struct sh_eth_cpu_data sh7734_data = {
.chip_reset = sh_eth_chip_reset,
@@ -791,49 +834,6 @@ static struct sh_eth_cpu_data sh7763_data = {
.irq_flags = IRQF_SHARED,
};
-static void sh_eth_chip_reset_r8a7740(struct net_device *ndev)
-{
- struct sh_eth_private *mdp = netdev_priv(ndev);
-
- /* reset device */
- sh_eth_tsu_write(mdp, ARSTR_ARSTR, ARSTR);
- mdelay(1);
-
- sh_eth_select_mii(ndev);
-}
-
-/* R8A7740 */
-static struct sh_eth_cpu_data r8a7740_data = {
- .chip_reset = sh_eth_chip_reset_r8a7740,
- .set_duplex = sh_eth_set_duplex,
- .set_rate = sh_eth_set_rate_gether,
-
- .register_type = SH_ETH_REG_GIGABIT,
-
- .ecsr_value = ECSR_ICD | ECSR_MPD,
- .ecsipr_value = ECSIPR_LCHNGIP | ECSIPR_ICDIP | ECSIPR_MPDIP,
- .eesipr_value = DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff,
-
- .tx_check = EESR_TC1 | EESR_FTC,
- .eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT |
- EESR_RFE | EESR_RDE | EESR_RFRMER | EESR_TFE |
- EESR_TDE | EESR_ECI,
- .fdr_value = 0x0000070f,
-
- .apr = 1,
- .mpr = 1,
- .tpauser = 1,
- .bculr = 1,
- .hw_swap = 1,
- .rpadir = 1,
- .rpadir_value = 2 << 16,
- .no_trimd = 1,
- .no_ade = 1,
- .tsu = 1,
- .select_mii = 1,
- .shift_rd0 = 1,
-};
-
static struct sh_eth_cpu_data sh7619_data = {
.register_type = SH_ETH_REG_FAST_SH3_SH2,
@@ -3305,7 +3305,6 @@ static struct platform_device_id sh_eth_id_table[] = {
{ "sh7757-ether", (kernel_ulong_t)&sh7757_data },
{ "sh7757-gether", (kernel_ulong_t)&sh7757_data_giga },
{ "sh7763-gether", (kernel_ulong_t)&sh7763_data },
- { "r8a7740-gether", (kernel_ulong_t)&r8a7740_data },
{ "r8a777x-ether", (kernel_ulong_t)&r8a777x_data },
{ }
};
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2 3/4] sh_eth: Remove obsolete r8a7740-gether platform_device_id entry
@ 2015-10-07 8:14 ` Geert Uytterhoeven
0 siblings, 0 replies; 18+ messages in thread
From: Geert Uytterhoeven @ 2015-10-07 8:14 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev, linux-sh, Geert Uytterhoeven
Since commit 1fa59bda21c7fa36 ("ARM: shmobile: Remove legacy board code
for Armadillo-800 EVA"), r8a7740 is only supported in generic DT-only
ARM multi-platform builds. The driver doesn't need to match platform
devices by name anymore, hence remove the corresponding
platform_device_id entry.
Protect r8a7740_data by #ifdef CONFIG_OF as it's now referenced on DT
platforms only. Move it to a more logical position, in front of the
r8a777x support, so we can have a single #ifdef covering all r7s* and
r8a* support soon. This requires moving a few helper functions, too.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
- New.
---
drivers/net/ethernet/renesas/sh_eth.c | 125 +++++++++++++++++-----------------
1 file changed, 62 insertions(+), 63 deletions(-)
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 029ea449f901..6395d2fc2bd8 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -458,6 +458,25 @@ static void sh_eth_chip_reset(struct net_device *ndev)
mdelay(1);
}
+static void sh_eth_set_rate_gether(struct net_device *ndev)
+{
+ struct sh_eth_private *mdp = netdev_priv(ndev);
+
+ switch (mdp->speed) {
+ case 10: /* 10BASE */
+ sh_eth_write(ndev, GECMR_10, GECMR);
+ break;
+ case 100:/* 100BASE */
+ sh_eth_write(ndev, GECMR_100, GECMR);
+ break;
+ case 1000: /* 1000BASE */
+ sh_eth_write(ndev, GECMR_1000, GECMR);
+ break;
+ default:
+ break;
+ }
+}
+
#ifdef CONFIG_OF
/* R7S72100 */
static struct sh_eth_cpu_data r7s72100_data = {
@@ -489,6 +508,49 @@ static struct sh_eth_cpu_data r7s72100_data = {
.tsu = 1,
.shift_rd0 = 1,
};
+
+static void sh_eth_chip_reset_r8a7740(struct net_device *ndev)
+{
+ struct sh_eth_private *mdp = netdev_priv(ndev);
+
+ /* reset device */
+ sh_eth_tsu_write(mdp, ARSTR_ARSTR, ARSTR);
+ mdelay(1);
+
+ sh_eth_select_mii(ndev);
+}
+
+/* R8A7740 */
+static struct sh_eth_cpu_data r8a7740_data = {
+ .chip_reset = sh_eth_chip_reset_r8a7740,
+ .set_duplex = sh_eth_set_duplex,
+ .set_rate = sh_eth_set_rate_gether,
+
+ .register_type = SH_ETH_REG_GIGABIT,
+
+ .ecsr_value = ECSR_ICD | ECSR_MPD,
+ .ecsipr_value = ECSIPR_LCHNGIP | ECSIPR_ICDIP | ECSIPR_MPDIP,
+ .eesipr_value = DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff,
+
+ .tx_check = EESR_TC1 | EESR_FTC,
+ .eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT |
+ EESR_RFE | EESR_RDE | EESR_RFRMER | EESR_TFE |
+ EESR_TDE | EESR_ECI,
+ .fdr_value = 0x0000070f,
+
+ .apr = 1,
+ .mpr = 1,
+ .tpauser = 1,
+ .bculr = 1,
+ .hw_swap = 1,
+ .rpadir = 1,
+ .rpadir_value = 2 << 16,
+ .no_trimd = 1,
+ .no_ade = 1,
+ .tsu = 1,
+ .select_mii = 1,
+ .shift_rd0 = 1,
+};
#endif /* CONFIG_OF */
/* There is CPU dependent code */
@@ -715,25 +777,6 @@ static struct sh_eth_cpu_data sh7757_data_giga = {
.tsu = 1,
};
-static void sh_eth_set_rate_gether(struct net_device *ndev)
-{
- struct sh_eth_private *mdp = netdev_priv(ndev);
-
- switch (mdp->speed) {
- case 10: /* 10BASE */
- sh_eth_write(ndev, GECMR_10, GECMR);
- break;
- case 100:/* 100BASE */
- sh_eth_write(ndev, GECMR_100, GECMR);
- break;
- case 1000: /* 1000BASE */
- sh_eth_write(ndev, GECMR_1000, GECMR);
- break;
- default:
- break;
- }
-}
-
/* SH7734 */
static struct sh_eth_cpu_data sh7734_data = {
.chip_reset = sh_eth_chip_reset,
@@ -791,49 +834,6 @@ static struct sh_eth_cpu_data sh7763_data = {
.irq_flags = IRQF_SHARED,
};
-static void sh_eth_chip_reset_r8a7740(struct net_device *ndev)
-{
- struct sh_eth_private *mdp = netdev_priv(ndev);
-
- /* reset device */
- sh_eth_tsu_write(mdp, ARSTR_ARSTR, ARSTR);
- mdelay(1);
-
- sh_eth_select_mii(ndev);
-}
-
-/* R8A7740 */
-static struct sh_eth_cpu_data r8a7740_data = {
- .chip_reset = sh_eth_chip_reset_r8a7740,
- .set_duplex = sh_eth_set_duplex,
- .set_rate = sh_eth_set_rate_gether,
-
- .register_type = SH_ETH_REG_GIGABIT,
-
- .ecsr_value = ECSR_ICD | ECSR_MPD,
- .ecsipr_value = ECSIPR_LCHNGIP | ECSIPR_ICDIP | ECSIPR_MPDIP,
- .eesipr_value = DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff,
-
- .tx_check = EESR_TC1 | EESR_FTC,
- .eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT |
- EESR_RFE | EESR_RDE | EESR_RFRMER | EESR_TFE |
- EESR_TDE | EESR_ECI,
- .fdr_value = 0x0000070f,
-
- .apr = 1,
- .mpr = 1,
- .tpauser = 1,
- .bculr = 1,
- .hw_swap = 1,
- .rpadir = 1,
- .rpadir_value = 2 << 16,
- .no_trimd = 1,
- .no_ade = 1,
- .tsu = 1,
- .select_mii = 1,
- .shift_rd0 = 1,
-};
-
static struct sh_eth_cpu_data sh7619_data = {
.register_type = SH_ETH_REG_FAST_SH3_SH2,
@@ -3305,7 +3305,6 @@ static struct platform_device_id sh_eth_id_table[] = {
{ "sh7757-ether", (kernel_ulong_t)&sh7757_data },
{ "sh7757-gether", (kernel_ulong_t)&sh7757_data_giga },
{ "sh7763-gether", (kernel_ulong_t)&sh7763_data },
- { "r8a7740-gether", (kernel_ulong_t)&r8a7740_data },
{ "r8a777x-ether", (kernel_ulong_t)&r8a777x_data },
{ }
};
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2 4/4] sh_eth: Remove obsolete r8a777x-ether platform_device_id entry
2015-10-07 8:14 ` Geert Uytterhoeven
@ 2015-10-07 8:14 ` Geert Uytterhoeven
-1 siblings, 0 replies; 18+ messages in thread
From: Geert Uytterhoeven @ 2015-10-07 8:14 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev, linux-sh, Geert Uytterhoeven
Since commit 3d7608e4c169af03 ("ARM: shmobile: bockw: remove legacy
board file and config"), R-Car Gen1 SoCs are only supported in generic
DT-only ARM multi-platform builds. The driver doesn't need to match
platform devices by name anymore, hence remove the corresponding
platform_device_id entry.
Protect sh_eth_set_rate_r8a777x() and r8a777x_data by #ifdef CONFIG_OF,
as they're now referenced on DT platforms only.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
Commit 3d7608e4c169af03 is now in arm-soc/for-next.
v2:
- New.
---
drivers/net/ethernet/renesas/sh_eth.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 6395d2fc2bd8..48a3192f4af2 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -551,7 +551,6 @@ static struct sh_eth_cpu_data r8a7740_data = {
.select_mii = 1,
.shift_rd0 = 1,
};
-#endif /* CONFIG_OF */
/* There is CPU dependent code */
static void sh_eth_set_rate_r8a777x(struct net_device *ndev)
@@ -593,7 +592,6 @@ static struct sh_eth_cpu_data r8a777x_data = {
.hw_swap = 1,
};
-#ifdef CONFIG_OF
/* R8A7790/1 */
static struct sh_eth_cpu_data r8a779x_data = {
.set_duplex = sh_eth_set_duplex,
@@ -3305,7 +3303,6 @@ static struct platform_device_id sh_eth_id_table[] = {
{ "sh7757-ether", (kernel_ulong_t)&sh7757_data },
{ "sh7757-gether", (kernel_ulong_t)&sh7757_data_giga },
{ "sh7763-gether", (kernel_ulong_t)&sh7763_data },
- { "r8a777x-ether", (kernel_ulong_t)&r8a777x_data },
{ }
};
MODULE_DEVICE_TABLE(platform, sh_eth_id_table);
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2 4/4] sh_eth: Remove obsolete r8a777x-ether platform_device_id entry
@ 2015-10-07 8:14 ` Geert Uytterhoeven
0 siblings, 0 replies; 18+ messages in thread
From: Geert Uytterhoeven @ 2015-10-07 8:14 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev, linux-sh, Geert Uytterhoeven
Since commit 3d7608e4c169af03 ("ARM: shmobile: bockw: remove legacy
board file and config"), R-Car Gen1 SoCs are only supported in generic
DT-only ARM multi-platform builds. The driver doesn't need to match
platform devices by name anymore, hence remove the corresponding
platform_device_id entry.
Protect sh_eth_set_rate_r8a777x() and r8a777x_data by #ifdef CONFIG_OF,
as they're now referenced on DT platforms only.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
Commit 3d7608e4c169af03 is now in arm-soc/for-next.
v2:
- New.
---
drivers/net/ethernet/renesas/sh_eth.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 6395d2fc2bd8..48a3192f4af2 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -551,7 +551,6 @@ static struct sh_eth_cpu_data r8a7740_data = {
.select_mii = 1,
.shift_rd0 = 1,
};
-#endif /* CONFIG_OF */
/* There is CPU dependent code */
static void sh_eth_set_rate_r8a777x(struct net_device *ndev)
@@ -593,7 +592,6 @@ static struct sh_eth_cpu_data r8a777x_data = {
.hw_swap = 1,
};
-#ifdef CONFIG_OF
/* R8A7790/1 */
static struct sh_eth_cpu_data r8a779x_data = {
.set_duplex = sh_eth_set_duplex,
@@ -3305,7 +3303,6 @@ static struct platform_device_id sh_eth_id_table[] = {
{ "sh7757-ether", (kernel_ulong_t)&sh7757_data },
{ "sh7757-gether", (kernel_ulong_t)&sh7757_data_giga },
{ "sh7763-gether", (kernel_ulong_t)&sh7763_data },
- { "r8a777x-ether", (kernel_ulong_t)&r8a777x_data },
{ }
};
MODULE_DEVICE_TABLE(platform, sh_eth_id_table);
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH v2 4/4] sh_eth: Remove obsolete r8a777x-ether platform_device_id entry
2015-10-07 8:14 ` Geert Uytterhoeven
@ 2015-10-08 2:07 ` Simon Horman
-1 siblings, 0 replies; 18+ messages in thread
From: Simon Horman @ 2015-10-08 2:07 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: David S. Miller, netdev, linux-sh
On Wed, Oct 07, 2015 at 10:14:17AM +0200, Geert Uytterhoeven wrote:
> Since commit 3d7608e4c169af03 ("ARM: shmobile: bockw: remove legacy
> board file and config"), R-Car Gen1 SoCs are only supported in generic
> DT-only ARM multi-platform builds. The driver doesn't need to match
> platform devices by name anymore, hence remove the corresponding
> platform_device_id entry.
>
> Protect sh_eth_set_rate_r8a777x() and r8a777x_data by #ifdef CONFIG_OF,
> as they're now referenced on DT platforms only.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 4/4] sh_eth: Remove obsolete r8a777x-ether platform_device_id entry
@ 2015-10-08 2:07 ` Simon Horman
0 siblings, 0 replies; 18+ messages in thread
From: Simon Horman @ 2015-10-08 2:07 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: David S. Miller, netdev, linux-sh
On Wed, Oct 07, 2015 at 10:14:17AM +0200, Geert Uytterhoeven wrote:
> Since commit 3d7608e4c169af03 ("ARM: shmobile: bockw: remove legacy
> board file and config"), R-Car Gen1 SoCs are only supported in generic
> DT-only ARM multi-platform builds. The driver doesn't need to match
> platform devices by name anymore, hence remove the corresponding
> platform_device_id entry.
>
> Protect sh_eth_set_rate_r8a777x() and r8a777x_data by #ifdef CONFIG_OF,
> as they're now referenced on DT platforms only.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 3/4] sh_eth: Remove obsolete r8a7740-gether platform_device_id entry
2015-10-07 8:14 ` Geert Uytterhoeven
@ 2015-10-08 2:07 ` Simon Horman
-1 siblings, 0 replies; 18+ messages in thread
From: Simon Horman @ 2015-10-08 2:07 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: David S. Miller, netdev, linux-sh
On Wed, Oct 07, 2015 at 10:14:16AM +0200, Geert Uytterhoeven wrote:
> Since commit 1fa59bda21c7fa36 ("ARM: shmobile: Remove legacy board code
> for Armadillo-800 EVA"), r8a7740 is only supported in generic DT-only
> ARM multi-platform builds. The driver doesn't need to match platform
> devices by name anymore, hence remove the corresponding
> platform_device_id entry.
>
> Protect r8a7740_data by #ifdef CONFIG_OF as it's now referenced on DT
> platforms only. Move it to a more logical position, in front of the
> r8a777x support, so we can have a single #ifdef covering all r7s* and
> r8a* support soon. This requires moving a few helper functions, too.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 3/4] sh_eth: Remove obsolete r8a7740-gether platform_device_id entry
@ 2015-10-08 2:07 ` Simon Horman
0 siblings, 0 replies; 18+ messages in thread
From: Simon Horman @ 2015-10-08 2:07 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: David S. Miller, netdev, linux-sh
On Wed, Oct 07, 2015 at 10:14:16AM +0200, Geert Uytterhoeven wrote:
> Since commit 1fa59bda21c7fa36 ("ARM: shmobile: Remove legacy board code
> for Armadillo-800 EVA"), r8a7740 is only supported in generic DT-only
> ARM multi-platform builds. The driver doesn't need to match platform
> devices by name anymore, hence remove the corresponding
> platform_device_id entry.
>
> Protect r8a7740_data by #ifdef CONFIG_OF as it's now referenced on DT
> platforms only. Move it to a more logical position, in front of the
> r8a777x support, so we can have a single #ifdef covering all r7s* and
> r8a* support soon. This requires moving a few helper functions, too.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 0/4] sh_eth: Remove obsolete platform_device_id entries
2015-10-07 8:14 ` Geert Uytterhoeven
@ 2015-10-08 12:10 ` David Miller
-1 siblings, 0 replies; 18+ messages in thread
From: David Miller @ 2015-10-08 11:54 UTC (permalink / raw)
To: geert+renesas; +Cc: netdev, linux-sh
From: Geert Uytterhoeven <geert+renesas@glider.be>
Date: Wed, 7 Oct 2015 10:14:13 +0200
> Since commit 3d7608e4c169af03 ("ARM: shmobile: bockw: remove legacy
> board file and config"), which is now in arm-soc/for-next, shmobile SoCs
> are only supported in generic DT-only ARM multi-platform builds.
> The sh_eth driver doesn't need to match platform devices by name
> anymore, hence this series removes the corresponding platform_device_id
> entries.
>
> Changes since v1:
> - Protect some data and functions by #ifdef CONFIG_OF to silence
> unused compiler warnings on SH,
> - New patches 3 and 4.
Since that commit isn't in any of my trees why don't you merge this
via arm-soc/for-next?
Thanks.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 0/4] sh_eth: Remove obsolete platform_device_id entries
@ 2015-10-08 12:10 ` David Miller
0 siblings, 0 replies; 18+ messages in thread
From: David Miller @ 2015-10-08 12:10 UTC (permalink / raw)
To: geert+renesas; +Cc: netdev, linux-sh
From: Geert Uytterhoeven <geert+renesas@glider.be>
Date: Wed, 7 Oct 2015 10:14:13 +0200
> Since commit 3d7608e4c169af03 ("ARM: shmobile: bockw: remove legacy
> board file and config"), which is now in arm-soc/for-next, shmobile SoCs
> are only supported in generic DT-only ARM multi-platform builds.
> The sh_eth driver doesn't need to match platform devices by name
> anymore, hence this series removes the corresponding platform_device_id
> entries.
>
> Changes since v1:
> - Protect some data and functions by #ifdef CONFIG_OF to silence
> unused compiler warnings on SH,
> - New patches 3 and 4.
Since that commit isn't in any of my trees why don't you merge this
via arm-soc/for-next?
Thanks.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 0/4] sh_eth: Remove obsolete platform_device_id entries
2015-10-08 12:10 ` David Miller
@ 2015-10-08 13:49 ` Geert Uytterhoeven
-1 siblings, 0 replies; 18+ messages in thread
From: Geert Uytterhoeven @ 2015-10-08 13:49 UTC (permalink / raw)
To: David Miller; +Cc: Geert Uytterhoeven, netdev, Linux-sh list, Arnd Bergmann
Hi David,
[CC Arnd wearing the arm-soc merge hat]
On Thu, Oct 8, 2015 at 2:10 PM, David Miller <davem@davemloft.net> wrote:
> From: Geert Uytterhoeven <geert+renesas@glider.be>
> Date: Wed, 7 Oct 2015 10:14:13 +0200
>
>> Since commit 3d7608e4c169af03 ("ARM: shmobile: bockw: remove legacy
>> board file and config"), which is now in arm-soc/for-next, shmobile SoCs
>> are only supported in generic DT-only ARM multi-platform builds.
>> The sh_eth driver doesn't need to match platform devices by name
>> anymore, hence this series removes the corresponding platform_device_id
>> entries.
>>
>> Changes since v1:
>> - Protect some data and functions by #ifdef CONFIG_OF to silence
>> unused compiler warnings on SH,
>> - New patches 3 and 4.
>
> Since that commit isn't in any of my trees why don't you merge this
> via arm-soc/for-next?
This series just changes the sh_eth driver. There's no direct dependency on
the arm-soc changes. Hence I think the sh_eth changes should go in through
the netdev tree.
Thanks!
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 0/4] sh_eth: Remove obsolete platform_device_id entries
@ 2015-10-08 13:49 ` Geert Uytterhoeven
0 siblings, 0 replies; 18+ messages in thread
From: Geert Uytterhoeven @ 2015-10-08 13:49 UTC (permalink / raw)
To: David Miller; +Cc: Geert Uytterhoeven, netdev, Linux-sh list, Arnd Bergmann
Hi David,
[CC Arnd wearing the arm-soc merge hat]
On Thu, Oct 8, 2015 at 2:10 PM, David Miller <davem@davemloft.net> wrote:
> From: Geert Uytterhoeven <geert+renesas@glider.be>
> Date: Wed, 7 Oct 2015 10:14:13 +0200
>
>> Since commit 3d7608e4c169af03 ("ARM: shmobile: bockw: remove legacy
>> board file and config"), which is now in arm-soc/for-next, shmobile SoCs
>> are only supported in generic DT-only ARM multi-platform builds.
>> The sh_eth driver doesn't need to match platform devices by name
>> anymore, hence this series removes the corresponding platform_device_id
>> entries.
>>
>> Changes since v1:
>> - Protect some data and functions by #ifdef CONFIG_OF to silence
>> unused compiler warnings on SH,
>> - New patches 3 and 4.
>
> Since that commit isn't in any of my trees why don't you merge this
> via arm-soc/for-next?
This series just changes the sh_eth driver. There's no direct dependency on
the arm-soc changes. Hence I think the sh_eth changes should go in through
the netdev tree.
Thanks!
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2015-10-08 13:49 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-07 8:14 [PATCH v2 0/4] sh_eth: Remove obsolete platform_device_id entries Geert Uytterhoeven
2015-10-07 8:14 ` Geert Uytterhoeven
2015-10-07 8:14 ` [PATCH v2 1/4] sh_eth: Remove obsolete r7s72100-ether platform_device_id entry Geert Uytterhoeven
2015-10-07 8:14 ` Geert Uytterhoeven
2015-10-07 8:14 ` [PATCH v2 2/4] sh_eth: Remove obsolete r8a779x-ether platform_device_id entries Geert Uytterhoeven
2015-10-07 8:14 ` Geert Uytterhoeven
2015-10-07 8:14 ` [PATCH v2 3/4] sh_eth: Remove obsolete r8a7740-gether platform_device_id entry Geert Uytterhoeven
2015-10-07 8:14 ` Geert Uytterhoeven
2015-10-08 2:07 ` Simon Horman
2015-10-08 2:07 ` Simon Horman
2015-10-07 8:14 ` [PATCH v2 4/4] sh_eth: Remove obsolete r8a777x-ether " Geert Uytterhoeven
2015-10-07 8:14 ` Geert Uytterhoeven
2015-10-08 2:07 ` Simon Horman
2015-10-08 2:07 ` Simon Horman
2015-10-08 11:54 ` [PATCH v2 0/4] sh_eth: Remove obsolete platform_device_id entries David Miller
2015-10-08 12:10 ` David Miller
2015-10-08 13:49 ` Geert Uytterhoeven
2015-10-08 13:49 ` Geert Uytterhoeven
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.