lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/17] ARM: orion5x: remove dsa_chip_data references
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    This is no longer used anywhere, which means we can kill off
    one link to gpio numbers.

    Cc: Andrew Lunn <andrew@lunn.ch>
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    ---
    arch/arm/mach-orion5x/common.c | 10 --------
    arch/arm/mach-orion5x/common.h | 2 --
    arch/arm/plat-orion/common.c | 31 -----------------------
    arch/arm/plat-orion/include/plat/common.h | 3 ---
    4 files changed, 46 deletions(-)

    diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c
    index 2e711b7252c6..df056d60b675 100644
    --- a/arch/arm/mach-orion5x/common.c
    +++ b/arch/arm/mach-orion5x/common.c
    @@ -18,7 +18,6 @@
    #include <linux/delay.h>
    #include <linux/clk-provider.h>
    #include <linux/cpu.h>
    -#include <linux/platform_data/dsa.h>
    #include <asm/page.h>
    #include <asm/setup.h>
    #include <asm/system_misc.h>
    @@ -100,15 +99,6 @@ void __init orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data)
    }


    -/*****************************************************************************
    - * Ethernet switch
    - ****************************************************************************/
    -void __init orion5x_eth_switch_init(struct dsa_chip_data *d)
    -{
    - orion_ge00_switch_init(d);
    -}
    -
    -
    /*****************************************************************************
    * I2C
    ****************************************************************************/
    diff --git a/arch/arm/mach-orion5x/common.h b/arch/arm/mach-orion5x/common.h
    index eb96009e21c4..f2e0577bf50f 100644
    --- a/arch/arm/mach-orion5x/common.h
    +++ b/arch/arm/mach-orion5x/common.h
    @@ -4,7 +4,6 @@

    #include <linux/reboot.h>

    -struct dsa_chip_data;
    struct mv643xx_eth_platform_data;
    struct mv_sata_platform_data;

    @@ -42,7 +41,6 @@ void orion5x_setup_wins(void);
    void orion5x_ehci0_init(void);
    void orion5x_ehci1_init(void);
    void orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data);
    -void orion5x_eth_switch_init(struct dsa_chip_data *d);
    void orion5x_i2c_init(void);
    void orion5x_sata_init(struct mv_sata_platform_data *sata_data);
    void orion5x_spi_init(void);
    diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
    index 8647cb80a93b..cabe98386245 100644
    --- a/arch/arm/plat-orion/common.c
    +++ b/arch/arm/plat-orion/common.c
    @@ -18,7 +18,6 @@
    #include <linux/clkdev.h>
    #include <linux/mv643xx_eth.h>
    #include <linux/mv643xx_i2c.h>
    -#include <linux/platform_data/dsa.h>
    #include <linux/platform_data/dma-mv_xor.h>
    #include <linux/platform_data/usb-ehci-orion.h>
    #include <plat/common.h>
    @@ -468,36 +467,6 @@ void __init orion_ge11_init(struct mv643xx_eth_platform_data *eth_data,
    eth_data, &orion_ge11);
    }

    -#ifdef CONFIG_ARCH_ORION5X
    -/*****************************************************************************
    - * Ethernet switch
    - ****************************************************************************/
    -static __initdata struct mdio_board_info orion_ge00_switch_board_info = {
    - .bus_id = "orion-mii",
    - .modalias = "mv88e6085",
    -};
    -
    -void __init orion_ge00_switch_init(struct dsa_chip_data *d)
    -{
    - unsigned int i;
    -
    - if (!IS_BUILTIN(CONFIG_PHYLIB))
    - return;
    -
    - for (i = 0; i < ARRAY_SIZE(d->port_names); i++) {
    - if (!strcmp(d->port_names[i], "cpu")) {
    - d->netdev[i] = &orion_ge00.dev;
    - break;
    - }
    - }
    -
    - orion_ge00_switch_board_info.mdio_addr = d->sw_addr;
    - orion_ge00_switch_board_info.platform_data = d;
    -
    - mdiobus_register_board_info(&orion_ge00_switch_board_info, 1);
    -}
    -#endif
    -
    /*****************************************************************************
    * I2C
    ****************************************************************************/
    diff --git a/arch/arm/plat-orion/include/plat/common.h b/arch/arm/plat-orion/include/plat/common.h
    index 3647d3b33c20..d2aad95d20cb 100644
    --- a/arch/arm/plat-orion/include/plat/common.h
    +++ b/arch/arm/plat-orion/include/plat/common.h
    @@ -12,7 +12,6 @@
    #include <linux/mv643xx_eth.h>
    #include <linux/platform_data/usb-ehci-orion.h>

    -struct dsa_chip_data;
    struct mv_sata_platform_data;

    void __init orion_uart0_init(void __iomem *membase,
    @@ -57,8 +56,6 @@ void __init orion_ge11_init(struct mv643xx_eth_platform_data *eth_data,
    unsigned long mapbase,
    unsigned long irq);

    -void __init orion_ge00_switch_init(struct dsa_chip_data *d);
    -
    void __init orion_i2c_init(unsigned long mapbase,
    unsigned long irq,
    unsigned long freq_m);
    --
    2.29.2
    \
     
     \ /
      Last update: 2022-10-19 17:20    [W:4.209 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site