lkml.org 
[lkml]   [2022]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 0597/1126] net: dsa: realtek-smi: move to subdirectory
    Date
    From: Luiz Angelo Daros de Luca <luizluca@gmail.com>

    [ Upstream commit 319a70a5fea9590e9431dd57f56191996c4787f4 ]

    Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
    Tested-by: Arınç ÜNAL <arinc.unal@arinc9.com>
    Reviewed-by: Alvin Šipraga <alsi@bang-olufsen.dk>
    Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
    Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
    Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    MAINTAINERS | 3 +--
    drivers/net/dsa/Kconfig | 12 +----------
    drivers/net/dsa/Makefile | 3 +--
    drivers/net/dsa/realtek/Kconfig | 20 +++++++++++++++++++
    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, 26 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 cd0f68d4a34a..d9b2f1731ee0 100644
    --- a/MAINTAINERS
    +++ b/MAINTAINERS
    @@ -16373,8 +16373,7 @@ M: Linus Walleij <linus.walleij@linaro.org>
    M: Alvin Šipraga <alsi@bang-olufsen.dk>
    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 0029d279616f..37a3dabdce31 100644
    --- a/drivers/net/dsa/Kconfig
    +++ b/drivers/net/dsa/Kconfig
    @@ -68,17 +68,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..1c62212fb0ec
    --- /dev/null
    +++ b/drivers/net/dsa/realtek/Kconfig
    @@ -0,0 +1,20 @@
    +# 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
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-04-05 14:41    [W:2.735 / U:0.852 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site