From 1afe8a0726b3e55b9467211b6dc9ea6b604f55e7 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 24 Jul 2011 14:40:23 +0000 Subject: [PATCH] rtl8366: unify rtl8366s and rtl8366rb platform data SVN-Revision: 27754 --- .../files/arch/mips/ar71xx/mach-dir-825-b1.c | 6 +++--- .../files/arch/mips/ar71xx/mach-nbg460n.c | 4 ++-- .../files/arch/mips/ar71xx/mach-tl-wr1043nd.c | 4 ++-- .../files/arch/mips/ar71xx/mach-wndr3700.c | 4 ++-- .../arch/mips/ar71xx/mach-wzr-hp-g300nh.c | 14 ++++--------- .../generic/files/drivers/net/phy/rtl8366rb.c | 4 ++-- .../generic/files/drivers/net/phy/rtl8366s.c | 6 +++--- .../include/linux/{rtl8366s.h => rtl8366.h} | 16 +++++++------- .../generic/files/include/linux/rtl8366rb.h | 21 ------------------- .../arch/mips/ralink/rt288x/mach-rt-n15.c | 4 ++-- .../arch/mips/ralink/rt305x/mach-f5d8235-v2.c | 4 ++-- 11 files changed, 31 insertions(+), 56 deletions(-) rename target/linux/generic/files/include/linux/{rtl8366s.h => rtl8366.h} (56%) delete mode 100644 target/linux/generic/files/include/linux/rtl8366rb.h diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c index 84fb184c0b..25eb26a6f6 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include @@ -131,11 +131,11 @@ static struct gpio_keys_button dir825b1_gpio_keys[] __initdata = { } }; -static struct rtl8366s_initval dir825b1_rtl8366s_initvals[] = { +static struct rtl8366_initval dir825b1_rtl8366s_initvals[] = { { .reg = 0x06, .val = 0x0108 }, }; -static struct rtl8366s_platform_data dir825b1_rtl8366s_data = { +static struct rtl8366_platform_data dir825b1_rtl8366s_data = { .gpio_sda = DIR825B1_GPIO_RTL8366_SDA, .gpio_sck = DIR825B1_GPIO_RTL8366_SCK, .num_initvals = ARRAY_SIZE(dir825b1_rtl8366s_initvals), diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-nbg460n.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-nbg460n.c index 7d8161811a..e1d959243a 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-nbg460n.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-nbg460n.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include @@ -166,7 +166,7 @@ static void __devinit nbg460n_i2c_init(void) } -static struct rtl8366s_platform_data nbg460n_rtl8366s_data = { +static struct rtl8366_platform_data nbg460n_rtl8366s_data = { .gpio_sda = NBG460N_GPIO_RTL8366_SDA, .gpio_sck = NBG460N_GPIO_RTL8366_SCK, }; diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c index 1cf0168486..77262d7394 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include "machtype.h" @@ -109,7 +109,7 @@ static struct gpio_keys_button tl_wr1043nd_gpio_keys[] __initdata = { } }; -static struct rtl8366rb_platform_data tl_wr1043nd_rtl8366rb_data = { +static struct rtl8366_platform_data tl_wr1043nd_rtl8366rb_data = { .gpio_sda = TL_WR1043ND_GPIO_RTL8366_SDA, .gpio_sck = TL_WR1043ND_GPIO_RTL8366_SCK, }; diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c index 15bc05535d..0df9c7f024 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include @@ -205,7 +205,7 @@ static struct gpio_keys_button wndr3700_gpio_keys[] __initdata = { } }; -static struct rtl8366s_platform_data wndr3700_rtl8366s_data = { +static struct rtl8366_platform_data wndr3700_rtl8366s_data = { .gpio_sda = WNDR3700_GPIO_RTL8366_SDA, .gpio_sck = WNDR3700_GPIO_RTL8366_SCK, }; diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c index 13a17db470..35f2165827 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c @@ -12,8 +12,7 @@ #include #include #include -#include -#include +#include #include #include @@ -214,7 +213,7 @@ static struct platform_device wzrhpg300nh_74hc153_device = { } }; -static struct rtl8366s_platform_data wzrhpg300nh_rtl8366s_data = { +static struct rtl8366_platform_data wzrhpg300nh_rtl8366_data = { .gpio_sda = WZRHPG300NH_GPIO_RTL8366_SDA, .gpio_sck = WZRHPG300NH_GPIO_RTL8366_SCK, }; @@ -223,20 +222,15 @@ static struct platform_device wzrhpg300nh_rtl8366s_device = { .name = RTL8366S_DRIVER_NAME, .id = -1, .dev = { - .platform_data = &wzrhpg300nh_rtl8366s_data, + .platform_data = &wzrhpg300nh_rtl8366_data, } }; -static struct rtl8366rb_platform_data wzrhpg301nh_rtl8366rb_data = { - .gpio_sda = WZRHPG300NH_GPIO_RTL8366_SDA, - .gpio_sck = WZRHPG300NH_GPIO_RTL8366_SCK, -}; - static struct platform_device wzrhpg301nh_rtl8366rb_device = { .name = RTL8366RB_DRIVER_NAME, .id = -1, .dev = { - .platform_data = &wzrhpg301nh_rtl8366rb_data, + .platform_data = &wzrhpg300nh_rtl8366_data, } }; diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c index 640ed5136d..c95368148d 100644 --- a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c +++ b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include "rtl8366_smi.h" @@ -1224,7 +1224,7 @@ static struct rtl8366_smi_ops rtl8366rb_smi_ops = { static int __devinit rtl8366rb_probe(struct platform_device *pdev) { static int rtl8366_smi_version_printed; - struct rtl8366rb_platform_data *pdata; + struct rtl8366_platform_data *pdata; struct rtl8366_smi *smi; int err; diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366s.c b/target/linux/generic/files/drivers/net/phy/rtl8366s.c index 3f3d6f6ac3..8fa1ed186a 100644 --- a/target/linux/generic/files/drivers/net/phy/rtl8366s.c +++ b/target/linux/generic/files/drivers/net/phy/rtl8366s.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include "rtl8366_smi.h" @@ -250,7 +250,7 @@ static int rtl8366s_reset_chip(struct rtl8366_smi *smi) static int rtl8366s_hw_init(struct rtl8366_smi *smi) { - struct rtl8366s_platform_data *pdata; + struct rtl8366_platform_data *pdata; int err; pdata = smi->parent->platform_data; @@ -1053,7 +1053,7 @@ static struct rtl8366_smi_ops rtl8366s_smi_ops = { static int __devinit rtl8366s_probe(struct platform_device *pdev) { static int rtl8366_smi_version_printed; - struct rtl8366s_platform_data *pdata; + struct rtl8366_platform_data *pdata; struct rtl8366_smi *smi; int err; diff --git a/target/linux/generic/files/include/linux/rtl8366s.h b/target/linux/generic/files/include/linux/rtl8366.h similarity index 56% rename from target/linux/generic/files/include/linux/rtl8366s.h rename to target/linux/generic/files/include/linux/rtl8366.h index 7d5daa4817..654d42e609 100644 --- a/target/linux/generic/files/include/linux/rtl8366s.h +++ b/target/linux/generic/files/include/linux/rtl8366.h @@ -1,5 +1,5 @@ /* - * Platform data definition for the Realtek RTL8366S ethernet switch driver + * Platform data definition for the Realtek RTL8366RB/S ethernet switch driver * * Copyright (C) 2009-2010 Gabor Juhos * @@ -8,21 +8,23 @@ * by the Free Software Foundation. */ -#ifndef _RTL8366S_H -#define _RTL8366S_H +#ifndef _RTL8366_H +#define _RTL8366_H +#define RTL8366_DRIVER_NAME "rtl8366" #define RTL8366S_DRIVER_NAME "rtl8366s" +#define RTL8366RB_DRIVER_NAME "rtl8366rb" -struct rtl8366s_initval { +struct rtl8366_initval { unsigned reg; u16 val; }; -struct rtl8366s_platform_data { +struct rtl8366_platform_data { unsigned gpio_sda; unsigned gpio_sck; unsigned num_initvals; - struct rtl8366s_initval *initvals; + struct rtl8366_initval *initvals; }; -#endif /* _RTL8366_SMI_H */ +#endif /* _RTL8366_H */ diff --git a/target/linux/generic/files/include/linux/rtl8366rb.h b/target/linux/generic/files/include/linux/rtl8366rb.h deleted file mode 100644 index 053e2ec04f..0000000000 --- a/target/linux/generic/files/include/linux/rtl8366rb.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Platform data definition for the Realtek RTL8366S ethernet switch driver - * - * Copyright (C) 2009-2010 Gabor Juhos - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published - * by the Free Software Foundation. - */ - -#ifndef _RTL8366RB_H -#define _RTL8366RB_H - -#define RTL8366RB_DRIVER_NAME "rtl8366rb" - -struct rtl8366rb_platform_data { - unsigned gpio_sda; - unsigned gpio_sck; -}; - -#endif /* _RTL8366RB_SMI_H */ diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-rt-n15.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-rt-n15.c index 066667e775..fb048912c2 100644 --- a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-rt-n15.c +++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-rt-n15.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include @@ -100,7 +100,7 @@ static struct gpio_button rt_n15_gpio_buttons[] __initdata = { } }; -static struct rtl8366s_platform_data rt_n15_rtl8366s_data = { +static struct rtl8366_platform_data rt_n15_rtl8366s_data = { .gpio_sda = RT_N15_GPIO_RTL8366_SDA, .gpio_sck = RT_N15_GPIO_RTL8366_SCK, }; diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-f5d8235-v2.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-f5d8235-v2.c index e8c0297d17..b4062818ee 100644 --- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-f5d8235-v2.c +++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-f5d8235-v2.c @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include @@ -109,7 +109,7 @@ static struct physmap_flash_data f5d8235v2_flash_data = { }; -static struct rtl8366rb_platform_data f5d8235v2_switch_data = { +static struct rtl8366_platform_data f5d8235v2_switch_data = { .gpio_sda = RT305X_GPIO_I2C_SD, .gpio_sck = RT305X_GPIO_I2C_SCLK, }; -- 2.30.2