rtl8366: unify rtl8366s and rtl8366rb platform data

SVN-Revision: 27754

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 84fb184c0bc424343050654e9d46c28ff0bec58b..25eb26a6f643da3072296a3185dd35127c63d76d 100644 (file)
--- 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 <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/delay.h>
-#include <linux/rtl8366s.h>
+#include <linux/rtl8366.h>
 
 #include <asm/mach-ar71xx/ar71xx.h>
 
@@ -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 7d8161811a574f1a1ca09577099f99f3a1154801..e1d959243a24bc625797164e49bd208c40d43dc3 100644 (file)
--- 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 <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/delay.h>
-#include <linux/rtl8366s.h>
+#include <linux/rtl8366.h>
 
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
@@ -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 1cf01684863b0ba66f9d4d677f084442220375e2..77262d73945a13b2d84586d8e0978495b200d776 100644 (file)
--- 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 <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/platform_device.h>
-#include <linux/rtl8366rb.h>
+#include <linux/rtl8366.h>
 #include <asm/mach-ar71xx/ar71xx.h>
 
 #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 15bc05535dd8cef7d2533cbde73ddf8d1b933109..0df9c7f02415eab0d8c8d6ebaf75831f075935fb 100644 (file)
--- 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 <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/delay.h>
-#include <linux/rtl8366s.h>
+#include <linux/rtl8366.h>
 
 #include <asm/mach-ar71xx/ar71xx.h>
 
@@ -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 13a17db470b84703cf545e95f65d4acd34aa0eb9..35f2165827f37ba46938953e4e96f82af0b37903 100644 (file)
--- 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 <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/nxp_74hc153.h>
-#include <linux/rtl8366s.h>
-#include <linux/rtl8366rb.h>
+#include <linux/rtl8366.h>
 
 #include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>
@@ -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 640ed5136d41aead91331cad348abf45fbb14eac..c95368148d356c2cf4b4d9a0cf5ec5f9e6e0c273 100644 (file)
--- 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 <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/skbuff.h>
-#include <linux/rtl8366rb.h>
+#include <linux/rtl8366.h>
 
 #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 3f3d6f6ac316d9e4917f892a146adf8145c9b772..8fa1ed186a69e8c5fe6346a2b51b726e49085889 100644 (file)
--- 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 <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/skbuff.h>
-#include <linux/rtl8366s.h>
+#include <linux/rtl8366.h>
 
 #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/rtl8366.h b/target/linux/generic/files/include/linux/rtl8366.h
new file mode 100644 (file)
index 0000000..654d42e
--- /dev/null
+++ b/target/linux/generic/files/include/linux/rtl8366.h
@@ -0,0 +1,30 @@
+/*
+ * Platform data definition for the Realtek RTL8366RB/S ethernet switch driver
+ *
+ * Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * 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 _RTL8366_H
+#define _RTL8366_H
+
+#define RTL8366_DRIVER_NAME    "rtl8366"
+#define RTL8366S_DRIVER_NAME   "rtl8366s"
+#define RTL8366RB_DRIVER_NAME  "rtl8366rb"
+
+struct rtl8366_initval {
+       unsigned        reg;
+       u16             val;
+};
+
+struct rtl8366_platform_data {
+       unsigned        gpio_sda;
+       unsigned        gpio_sck;
+       unsigned        num_initvals;
+       struct rtl8366_initval *initvals;
+};
+
+#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 (file)
index 053e2ec..0000000
--- 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 <juhosg@openwrt.org>
- *
- * 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/generic/files/include/linux/rtl8366s.h b/target/linux/generic/files/include/linux/rtl8366s.h
deleted file mode 100644 (file)
index 7d5daa4..0000000
--- a/target/linux/generic/files/include/linux/rtl8366s.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Platform data definition for the Realtek RTL8366S ethernet switch driver
- *
- * Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
- *
- * 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 _RTL8366S_H
-#define _RTL8366S_H
-
-#define RTL8366S_DRIVER_NAME   "rtl8366s"
-
-struct rtl8366s_initval {
-       unsigned        reg;
-       u16             val;
-};
-
-struct rtl8366s_platform_data {
-       unsigned        gpio_sda;
-       unsigned        gpio_sck;
-       unsigned        num_initvals;
-       struct rtl8366s_initval *initvals;
-};
-
-#endif /*  _RTL8366_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 066667e7757d82595091c055bd6a4977514ffe9e..fb048912c2419c84fb57b3147c9f60eaacdfce93 100644 (file)
--- 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 <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
-#include <linux/rtl8366s.h>
+#include <linux/rtl8366.h>
 #include <linux/ethtool.h>
 
 #include <asm/mach-ralink/machine.h>
@@ -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 e8c0297d1756fc8116a1dafb63d6d6dcc370585b..b4062818ee2e0cb05a68117d4bfd16f2077b3837 100644 (file)
--- 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 <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 
-#include <linux/rtl8366rb.h>
+#include <linux/rtl8366.h>
 
 #include <asm/mach-ralink/machine.h>
 #include <asm/mach-ralink/dev-gpio-buttons.h>
@@ -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,
 };