projects
/
openwrt
/
svn-archive
/
archive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a2c5ad6
)
generic: rtl8366_smi: rename debugfs Kconfig symbol
author
Gabor Juhos
<juhosg@openwrt.org>
Sun, 27 May 2012 17:09:43 +0000
(17:09 +0000)
committer
Gabor Juhos
<juhosg@openwrt.org>
Sun, 27 May 2012 17:09:43 +0000
(17:09 +0000)
SVN-Revision: 31915
target/linux/generic/config-3.3
patch
|
blob
|
history
target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
patch
|
blob
|
history
target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
patch
|
blob
|
history
target/linux/generic/patches-3.3/726-phy_rtl8366.patch
patch
|
blob
|
history
target/linux/generic/patches-3.3/727-phy-rtl8367.patch
patch
|
blob
|
history
diff --git
a/target/linux/generic/config-3.3
b/target/linux/generic/config-3.3
index 0e7078b66e54998fd12549217a499054414fa3de..c8886ff0eee963b6231a9a3172a9c711329c8460 100644
(file)
--- a/
target/linux/generic/config-3.3
+++ b/
target/linux/generic/config-3.3
@@
-2305,8
+2305,8
@@
CONFIG_RTC_LIB=y
# CONFIG_RTL8306_PHY is not set
# CONFIG_RTL8366RB_PHY is not set
# CONFIG_RTL8366S_PHY is not set
# CONFIG_RTL8306_PHY is not set
# CONFIG_RTL8366RB_PHY is not set
# CONFIG_RTL8366S_PHY is not set
-# CONFIG_RTL8366S_PHY_DEBUG_FS is not set
# CONFIG_RTL8366_SMI is not set
# CONFIG_RTL8366_SMI is not set
+# CONFIG_RTL8366_SMI_DEBUG_FS is not set
# CONFIG_RTL8367_PHY is not set
# CONFIG_RTS_PSTOR is not set
CONFIG_RT_MUTEXES=y
# CONFIG_RTL8367_PHY is not set
# CONFIG_RTS_PSTOR is not set
CONFIG_RT_MUTEXES=y
diff --git
a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
index 271e2b513a347b73594e40df46565be3ad9df70d..7f5abd49ca5e29f9c60f5321d334d13c4f79bba3 100644
(file)
--- a/
target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
+++ b/
target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
@@
-17,7
+17,7
@@
#include <linux/skbuff.h>
#include <linux/rtl8366.h>
#include <linux/skbuff.h>
#include <linux/rtl8366.h>
-#ifdef CONFIG_RTL8366
S_PHY
_DEBUG_FS
+#ifdef CONFIG_RTL8366
_SMI
_DEBUG_FS
#include <linux/debugfs.h>
#endif
#include <linux/debugfs.h>
#endif
@@
-579,7
+579,7
@@
static int rtl8366_init_vlan(struct rtl8366_smi *smi)
return rtl8366_enable_vlan(smi, 1);
}
return rtl8366_enable_vlan(smi, 1);
}
-#ifdef CONFIG_RTL8366
S_PHY
_DEBUG_FS
+#ifdef CONFIG_RTL8366
_SMI
_DEBUG_FS
int rtl8366_debugfs_open(struct inode *inode, struct file *file)
{
file->private_data = inode->i_private;
int rtl8366_debugfs_open(struct inode *inode, struct file *file)
{
file->private_data = inode->i_private;
@@
-890,7
+890,7
@@
static void rtl8366_debugfs_remove(struct rtl8366_smi *smi)
#else
static inline void rtl8366_debugfs_init(struct rtl8366_smi *smi) {}
static inline void rtl8366_debugfs_remove(struct rtl8366_smi *smi) {}
#else
static inline void rtl8366_debugfs_init(struct rtl8366_smi *smi) {}
static inline void rtl8366_debugfs_remove(struct rtl8366_smi *smi) {}
-#endif /* CONFIG_RTL8366
S_PHY
_DEBUG_FS */
+#endif /* CONFIG_RTL8366
_SMI
_DEBUG_FS */
static int rtl8366_smi_mii_init(struct rtl8366_smi *smi)
{
static int rtl8366_smi_mii_init(struct rtl8366_smi *smi)
{
diff --git
a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
index 5c60a3093fcb0439f03e2dd6faf614e0eeba82f8..ea5e6dbd6c8a0c9da62848863d8cec6edca4e553 100644
(file)
--- a/
target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
+++ b/
target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
@@
-52,7
+52,7
@@
struct rtl8366_smi {
int vlan4k_enabled;
char buf[4096];
int vlan4k_enabled;
char buf[4096];
-#ifdef CONFIG_RTL8366
S_PHY
_DEBUG_FS
+#ifdef CONFIG_RTL8366
_SMI
_DEBUG_FS
struct dentry *debugfs_root;
u16 dbg_reg;
u8 dbg_vlan_4k_page;
struct dentry *debugfs_root;
u16 dbg_reg;
u8 dbg_vlan_4k_page;
@@
-112,7
+112,7
@@
int rtl8366_reset_vlan(struct rtl8366_smi *smi);
int rtl8366_enable_vlan(struct rtl8366_smi *smi, int enable);
int rtl8366_enable_all_ports(struct rtl8366_smi *smi, int enable);
int rtl8366_enable_vlan(struct rtl8366_smi *smi, int enable);
int rtl8366_enable_all_ports(struct rtl8366_smi *smi, int enable);
-#ifdef CONFIG_RTL8366
S_PHY
_DEBUG_FS
+#ifdef CONFIG_RTL8366
_SMI
_DEBUG_FS
int rtl8366_debugfs_open(struct inode *inode, struct file *file);
#endif
int rtl8366_debugfs_open(struct inode *inode, struct file *file);
#endif
diff --git
a/target/linux/generic/patches-3.3/726-phy_rtl8366.patch
b/target/linux/generic/patches-3.3/726-phy_rtl8366.patch
index fee8b7886054d48b18edb418d15e21dc787d4035..d258e4b56441de62bdac2398d8d7a9c1bf7aa14d 100644
(file)
--- a/
target/linux/generic/patches-3.3/726-phy_rtl8366.patch
+++ b/
target/linux/generic/patches-3.3/726-phy_rtl8366.patch
@@
-1,6
+1,6
@@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -168,6 +168,3
1
@@ config MDIO_OCTEON
+@@ -168,6 +168,3
0
@@ config MDIO_OCTEON
If in doubt, say Y.
If in doubt, say Y.
@@
-13,6
+13,11
@@
+
+if RTL8366_SMI
+
+
+if RTL8366_SMI
+
++config RTL8366_SMI_DEBUG_FS
++ bool "RTL8366 SMI interface debugfs support"
++ depends on DEBUG_FS
++ default n
++
+config RTL8366S_PHY
+ tristate "Driver for the Realtek RTL8366S switch"
+ select SWCONFIG
+config RTL8366S_PHY
+ tristate "Driver for the Realtek RTL8366S switch"
+ select SWCONFIG
@@
-21,12
+26,6
@@
+ tristate "Driver for the Realtek RTL8366RB switch"
+ select SWCONFIG
+
+ tristate "Driver for the Realtek RTL8366RB switch"
+ select SWCONFIG
+
-+config RTL8366S_PHY_DEBUG_FS
-+ bool "RTL8366 switch driver DEBUG_FS support"
-+ depends on RTL8366S_PHY || RTL8366RB_PHY
-+ depends on DEBUG_FS
-+ default n
-+
+endif # RTL8366_SMI
+
endif # PHYLIB
+endif # RTL8366_SMI
+
endif # PHYLIB
diff --git
a/target/linux/generic/patches-3.3/727-phy-rtl8367.patch
b/target/linux/generic/patches-3.3/727-phy-rtl8367.patch
index 3af61019104eb3ab754582052eb8c6d3d4189dbc..a24f497c9b2ec6b799b6726f14dd42642ac07c28 100644
(file)
--- a/
target/linux/generic/patches-3.3/727-phy-rtl8367.patch
+++ b/
target/linux/generic/patches-3.3/727-phy-rtl8367.patch
@@
-1,6
+1,6
@@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -1
85,6 +185
,10 @@ config RTL8366RB_PHY
+@@ -1
90,6 +190
,10 @@ config RTL8366RB_PHY
tristate "Driver for the Realtek RTL8366RB switch"
select SWCONFIG
tristate "Driver for the Realtek RTL8366RB switch"
select SWCONFIG
@@
-8,9
+8,9
@@
+ tristate "Driver for the Realtek RTL8367R/M switches"
+ select SWCONFIG
+
+ tristate "Driver for the Realtek RTL8367R/M switches"
+ select SWCONFIG
+
- config RTL8366S_PHY_DEBUG_FS
- bool "RTL8366 switch driver DEBUG_FS support"
- depends on RTL8366S_PHY || RTL8366RB_PHY
+ endif # RTL8366_SMI
+
+ endif # PHYLIB
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -25,6 +25,7 @@ obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -25,6 +25,7 @@ obj-$(CONFIG_RTL8306_PHY) += rtl8306.o