summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/files
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-07-24 14:40:23 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-07-24 14:40:23 +0000
commitde950268134cc6c5ac25a650c1809859a9d99637 (patch)
treed5839c75cf629598433927343a2e09462cdd0da0 /target/linux/generic/files
parent32dec7075aae5cc6ef1e4394dc94fed1767b848e (diff)
rtl8366: unify rtl8366s and rtl8366rb platform data
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27754 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/files')
-rw-r--r--target/linux/generic/files/drivers/net/phy/rtl8366rb.c4
-rw-r--r--target/linux/generic/files/drivers/net/phy/rtl8366s.c6
-rw-r--r--target/linux/generic/files/include/linux/rtl8366.h (renamed from target/linux/generic/files/include/linux/rtl8366s.h)16
-rw-r--r--target/linux/generic/files/include/linux/rtl8366rb.h21
4 files changed, 14 insertions, 33 deletions
diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
index 640ed5136..c95368148 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 <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 3f3d6f6ac..8fa1ed186 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 <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/rtl8366s.h b/target/linux/generic/files/include/linux/rtl8366.h
index 7d5daa481..654d42e60 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 <juhosg@openwrt.org>
*
@@ -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 053e2ec04..000000000
--- 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 */