diff mbox series

[net-next,02/13] net: dsa: realtek-smi: move to subdirectory

Message ID 20211216201342.25587-3-luizluca@gmail.com (mailing list archive)
State Superseded
Delegated to: Netdev Maintainers
Headers show
Series net: dsa: realtek: MDIO interface and RTL8367S | expand

Checks

Context Check Description
netdev/tree_selection success Clearly marked for net-next
netdev/fixes_present success Fixes tag not required for -next series
netdev/subject_prefix success Link
netdev/cover_letter success Series has a cover letter
netdev/patch_count success Link
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 0 this patch: 0
netdev/cc_maintainers warning 2 maintainers not CCed: kuba@kernel.org davem@davemloft.net
netdev/build_clang success Errors and warnings before: 0 this patch: 0
netdev/module_param success Was 0 now: 0
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 0 this patch: 0
netdev/checkpatch warning WARNING: please write a paragraph that describes the config symbol fully
netdev/kdoc fail Errors and warnings before: 0 this patch: 21
netdev/source_inline success Was 0 now: 0

Commit Message

Luiz Angelo Daros de Luca Dec. 16, 2021, 8:13 p.m. UTC 
From: Luiz Angelo Daros de Luca <luizluca@gmail.com>

Tested-by: Arınç ÜNAL <arinc.unal@arinc9.com>
Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
---
 MAINTAINERS                                   |  3 +--
 drivers/net/dsa/Kconfig                       | 12 +-----------
 drivers/net/dsa/Makefile                      |  3 +--
 drivers/net/dsa/realtek/Kconfig               | 19 +++++++++++++++++++
 drivers/net/dsa/realtek/Makefile              |  3 +++
 .../net/dsa/{ => realtek}/realtek-smi-core.c  |  0
 .../net/dsa/{ => realtek}/realtek-smi-core.h  |  0
 drivers/net/dsa/{ => realtek}/rtl8365mb.c     |  0
 drivers/net/dsa/{ => realtek}/rtl8366.c       |  0
 drivers/net/dsa/{ => realtek}/rtl8366rb.c     |  0
 10 files changed, 25 insertions(+), 15 deletions(-)
 create mode 100644 drivers/net/dsa/realtek/Kconfig
 create mode 100644 drivers/net/dsa/realtek/Makefile
 rename drivers/net/dsa/{ => realtek}/realtek-smi-core.c (100%)
 rename drivers/net/dsa/{ => realtek}/realtek-smi-core.h (100%)
 rename drivers/net/dsa/{ => realtek}/rtl8365mb.c (100%)
 rename drivers/net/dsa/{ => realtek}/rtl8366.c (100%)
 rename drivers/net/dsa/{ => realtek}/rtl8366rb.c (100%)

Comments

Alvin Šipraga Dec. 16, 2021, 11:21 p.m. UTC | #1 
On 12/16/21 21:13, luizluca@gmail.com wrote:
> From: Luiz Angelo Daros de Luca <luizluca@gmail.com>
> 
> Tested-by: Arınç ÜNAL <arinc.unal@arinc9.com>
> Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
> ---

Reviewed-by: Alvin Šipraga <alsi@bang-olufsen.dk>

>   MAINTAINERS                                   |  3 +--
>   drivers/net/dsa/Kconfig                       | 12 +-----------
>   drivers/net/dsa/Makefile                      |  3 +--
>   drivers/net/dsa/realtek/Kconfig               | 19 +++++++++++++++++++
>   drivers/net/dsa/realtek/Makefile              |  3 +++
>   .../net/dsa/{ => realtek}/realtek-smi-core.c  |  0
>   .../net/dsa/{ => realtek}/realtek-smi-core.h  |  0
>   drivers/net/dsa/{ => realtek}/rtl8365mb.c     |  0
>   drivers/net/dsa/{ => realtek}/rtl8366.c       |  0
>   drivers/net/dsa/{ => realtek}/rtl8366rb.c     |  0
>   10 files changed, 25 insertions(+), 15 deletions(-)
>   create mode 100644 drivers/net/dsa/realtek/Kconfig
>   create mode 100644 drivers/net/dsa/realtek/Makefile
>   rename drivers/net/dsa/{ => realtek}/realtek-smi-core.c (100%)
>   rename drivers/net/dsa/{ => realtek}/realtek-smi-core.h (100%)
>   rename drivers/net/dsa/{ => realtek}/rtl8365mb.c (100%)
>   rename drivers/net/dsa/{ => realtek}/rtl8366.c (100%)
>   rename drivers/net/dsa/{ => realtek}/rtl8366rb.c (100%)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 19d6fccf1205..a8f949b368a8 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -16153,8 +16153,7 @@ REALTEK RTL83xx SMI DSA ROUTER CHIPS
>   M:	Linus Walleij <linus.walleij@linaro.org>
>   S:	Maintained
>   F:	Documentation/devicetree/bindings/net/dsa/realtek-smi.txt
> -F:	drivers/net/dsa/realtek-smi*
> -F:	drivers/net/dsa/rtl83*
> +F:	drivers/net/dsa/realtek/*
>   
>   REALTEK WIRELESS DRIVER (rtlwifi family)
>   M:	Ping-Ke Shih <pkshih@realtek.com>
> diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig
> index 7b1457a6e327..1251caf0f638 100644
> --- a/drivers/net/dsa/Kconfig
> +++ b/drivers/net/dsa/Kconfig
> @@ -67,17 +67,7 @@ config NET_DSA_QCA8K
>   	  This enables support for the Qualcomm Atheros QCA8K Ethernet
>   	  switch chips.
>   
> -config NET_DSA_REALTEK_SMI
> -	tristate "Realtek SMI Ethernet switch family support"
> -	select NET_DSA_TAG_RTL4_A
> -	select NET_DSA_TAG_RTL8_4
> -	select FIXED_PHY
> -	select IRQ_DOMAIN
> -	select REALTEK_PHY
> -	select REGMAP
> -	help
> -	  This enables support for the Realtek SMI-based switch
> -	  chips, currently only RTL8366RB.
> +source "drivers/net/dsa/realtek/Kconfig"
>   
>   config NET_DSA_SMSC_LAN9303
>   	tristate
> diff --git a/drivers/net/dsa/Makefile b/drivers/net/dsa/Makefile
> index 8da1569a34e6..e73838c12256 100644
> --- a/drivers/net/dsa/Makefile
> +++ b/drivers/net/dsa/Makefile
> @@ -9,8 +9,6 @@ obj-$(CONFIG_NET_DSA_LANTIQ_GSWIP) += lantiq_gswip.o
>   obj-$(CONFIG_NET_DSA_MT7530)	+= mt7530.o
>   obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o
>   obj-$(CONFIG_NET_DSA_QCA8K)	+= qca8k.o
> -obj-$(CONFIG_NET_DSA_REALTEK_SMI) += realtek-smi.o
> -realtek-smi-objs		:= realtek-smi-core.o rtl8366.o rtl8366rb.o rtl8365mb.o
>   obj-$(CONFIG_NET_DSA_SMSC_LAN9303) += lan9303-core.o
>   obj-$(CONFIG_NET_DSA_SMSC_LAN9303_I2C) += lan9303_i2c.o
>   obj-$(CONFIG_NET_DSA_SMSC_LAN9303_MDIO) += lan9303_mdio.o
> @@ -23,5 +21,6 @@ obj-y				+= microchip/
>   obj-y				+= mv88e6xxx/
>   obj-y				+= ocelot/
>   obj-y				+= qca/
> +obj-y				+= realtek/
>   obj-y				+= sja1105/
>   obj-y				+= xrs700x/
> diff --git a/drivers/net/dsa/realtek/Kconfig b/drivers/net/dsa/realtek/Kconfig
> new file mode 100644
> index 000000000000..bbc6e918baa6
> --- /dev/null
> +++ b/drivers/net/dsa/realtek/Kconfig
> @@ -0,0 +1,19 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +menuconfig NET_DSA_REALTEK
> +	tristate "Realtek Ethernet switch family support"
> +	depends on NET_DSA
> +	select NET_DSA_TAG_RTL4_A
> +	select NET_DSA_TAG_RTL8_4
> +	select FIXED_PHY
> +	select IRQ_DOMAIN
> +	select REALTEK_PHY
> +	select REGMAP
> +	help
> +	  Select to enable support for Realtek Ethernet switch chips.
> +
> +config NET_DSA_REALTEK_SMI
> +	tristate "Realtek SMI connected switch driver"
> +	depends on NET_DSA_REALTEK
> +	default y
> +	help
> +	  Select to enable support for registering switches connected through SMI.
> diff --git a/drivers/net/dsa/realtek/Makefile b/drivers/net/dsa/realtek/Makefile
> new file mode 100644
> index 000000000000..323b921bfce0
> --- /dev/null
> +++ b/drivers/net/dsa/realtek/Makefile
> @@ -0,0 +1,3 @@
> +# SPDX-License-Identifier: GPL-2.0
> +obj-$(CONFIG_NET_DSA_REALTEK_SMI) 	+= realtek-smi.o
> +realtek-smi-objs			:= realtek-smi-core.o rtl8366.o rtl8366rb.o rtl8365mb.o
> diff --git a/drivers/net/dsa/realtek-smi-core.c b/drivers/net/dsa/realtek/realtek-smi-core.c
> similarity index 100%
> rename from drivers/net/dsa/realtek-smi-core.c
> rename to drivers/net/dsa/realtek/realtek-smi-core.c
> diff --git a/drivers/net/dsa/realtek-smi-core.h b/drivers/net/dsa/realtek/realtek-smi-core.h
> similarity index 100%
> rename from drivers/net/dsa/realtek-smi-core.h
> rename to drivers/net/dsa/realtek/realtek-smi-core.h
> diff --git a/drivers/net/dsa/rtl8365mb.c b/drivers/net/dsa/realtek/rtl8365mb.c
> similarity index 100%
> rename from drivers/net/dsa/rtl8365mb.c
> rename to drivers/net/dsa/realtek/rtl8365mb.c
> diff --git a/drivers/net/dsa/rtl8366.c b/drivers/net/dsa/realtek/rtl8366.c
> similarity index 100%
> rename from drivers/net/dsa/rtl8366.c
> rename to drivers/net/dsa/realtek/rtl8366.c
> diff --git a/drivers/net/dsa/rtl8366rb.c b/drivers/net/dsa/realtek/rtl8366rb.c
> similarity index 100%
> rename from drivers/net/dsa/rtl8366rb.c
> rename to drivers/net/dsa/realtek/rtl8366rb.c
Linus Walleij Dec. 18, 2021, 2:41 a.m. UTC | #2 
On Thu, Dec 16, 2021 at 9:14 PM <luizluca@gmail.com> wrote:

> From: Luiz Angelo Daros de Luca <luizluca@gmail.com>
>
> Tested-by: Arınç ÜNAL <arinc.unal@arinc9.com>
> Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij
diff mbox series

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index 19d6fccf1205..a8f949b368a8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -16153,8 +16153,7 @@  REALTEK RTL83xx SMI DSA ROUTER CHIPS
 M:	Linus Walleij <linus.walleij@linaro.org>
 S:	Maintained
 F:	Documentation/devicetree/bindings/net/dsa/realtek-smi.txt
-F:	drivers/net/dsa/realtek-smi*
-F:	drivers/net/dsa/rtl83*
+F:	drivers/net/dsa/realtek/*
 
 REALTEK WIRELESS DRIVER (rtlwifi family)
 M:	Ping-Ke Shih <pkshih@realtek.com>
diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig
index 7b1457a6e327..1251caf0f638 100644
--- a/drivers/net/dsa/Kconfig
+++ b/drivers/net/dsa/Kconfig
@@ -67,17 +67,7 @@  config NET_DSA_QCA8K
 	  This enables support for the Qualcomm Atheros QCA8K Ethernet
 	  switch chips.
 
-config NET_DSA_REALTEK_SMI
-	tristate "Realtek SMI Ethernet switch family support"
-	select NET_DSA_TAG_RTL4_A
-	select NET_DSA_TAG_RTL8_4
-	select FIXED_PHY
-	select IRQ_DOMAIN
-	select REALTEK_PHY
-	select REGMAP
-	help
-	  This enables support for the Realtek SMI-based switch
-	  chips, currently only RTL8366RB.
+source "drivers/net/dsa/realtek/Kconfig"
 
 config NET_DSA_SMSC_LAN9303
 	tristate
diff --git a/drivers/net/dsa/Makefile b/drivers/net/dsa/Makefile
index 8da1569a34e6..e73838c12256 100644
--- a/drivers/net/dsa/Makefile
+++ b/drivers/net/dsa/Makefile
@@ -9,8 +9,6 @@  obj-$(CONFIG_NET_DSA_LANTIQ_GSWIP) += lantiq_gswip.o
 obj-$(CONFIG_NET_DSA_MT7530)	+= mt7530.o
 obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o
 obj-$(CONFIG_NET_DSA_QCA8K)	+= qca8k.o
-obj-$(CONFIG_NET_DSA_REALTEK_SMI) += realtek-smi.o
-realtek-smi-objs		:= realtek-smi-core.o rtl8366.o rtl8366rb.o rtl8365mb.o
 obj-$(CONFIG_NET_DSA_SMSC_LAN9303) += lan9303-core.o
 obj-$(CONFIG_NET_DSA_SMSC_LAN9303_I2C) += lan9303_i2c.o
 obj-$(CONFIG_NET_DSA_SMSC_LAN9303_MDIO) += lan9303_mdio.o
@@ -23,5 +21,6 @@  obj-y				+= microchip/
 obj-y				+= mv88e6xxx/
 obj-y				+= ocelot/
 obj-y				+= qca/
+obj-y				+= realtek/
 obj-y				+= sja1105/
 obj-y				+= xrs700x/
diff --git a/drivers/net/dsa/realtek/Kconfig b/drivers/net/dsa/realtek/Kconfig
new file mode 100644
index 000000000000..bbc6e918baa6
--- /dev/null
+++ b/drivers/net/dsa/realtek/Kconfig
@@ -0,0 +1,19 @@ 
+# SPDX-License-Identifier: GPL-2.0-only
+menuconfig NET_DSA_REALTEK
+	tristate "Realtek Ethernet switch family support"
+	depends on NET_DSA
+	select NET_DSA_TAG_RTL4_A
+	select NET_DSA_TAG_RTL8_4
+	select FIXED_PHY
+	select IRQ_DOMAIN
+	select REALTEK_PHY
+	select REGMAP
+	help
+	  Select to enable support for Realtek Ethernet switch chips.
+
+config NET_DSA_REALTEK_SMI
+	tristate "Realtek SMI connected switch driver"
+	depends on NET_DSA_REALTEK
+	default y
+	help
+	  Select to enable support for registering switches connected through SMI.
diff --git a/drivers/net/dsa/realtek/Makefile b/drivers/net/dsa/realtek/Makefile
new file mode 100644
index 000000000000..323b921bfce0
--- /dev/null
+++ b/drivers/net/dsa/realtek/Makefile
@@ -0,0 +1,3 @@ 
+# SPDX-License-Identifier: GPL-2.0
+obj-$(CONFIG_NET_DSA_REALTEK_SMI) 	+= realtek-smi.o
+realtek-smi-objs			:= realtek-smi-core.o rtl8366.o rtl8366rb.o rtl8365mb.o
diff --git a/drivers/net/dsa/realtek-smi-core.c b/drivers/net/dsa/realtek/realtek-smi-core.c
similarity index 100%
rename from drivers/net/dsa/realtek-smi-core.c
rename to drivers/net/dsa/realtek/realtek-smi-core.c
diff --git a/drivers/net/dsa/realtek-smi-core.h b/drivers/net/dsa/realtek/realtek-smi-core.h
similarity index 100%
rename from drivers/net/dsa/realtek-smi-core.h
rename to drivers/net/dsa/realtek/realtek-smi-core.h
diff --git a/drivers/net/dsa/rtl8365mb.c b/drivers/net/dsa/realtek/rtl8365mb.c
similarity index 100%
rename from drivers/net/dsa/rtl8365mb.c
rename to drivers/net/dsa/realtek/rtl8365mb.c
diff --git a/drivers/net/dsa/rtl8366.c b/drivers/net/dsa/realtek/rtl8366.c
similarity index 100%
rename from drivers/net/dsa/rtl8366.c
rename to drivers/net/dsa/realtek/rtl8366.c
diff --git a/drivers/net/dsa/rtl8366rb.c b/drivers/net/dsa/realtek/rtl8366rb.c
similarity index 100%
rename from drivers/net/dsa/rtl8366rb.c
rename to drivers/net/dsa/realtek/rtl8366rb.c