KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

generic: rtl8366_smi: rename debugfs Kconfig symbol

Browse source 
SVN-Revision: 31915
This commit is contained in:
Gabor Juhos 2012-05-27 17:09:43 +00:00
parent 466ef30173
commit 9217115687
5 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
target/linux/generic/config-3.3
View file

@ -2305,8 +2305,8 @@ CONFIG_RTC_LIB=y
# CONFIG_RTL8306_PHY is not set # CONFIG_RTL8306_PHY is not set
# CONFIG_RTL8366RB_PHY is not set # CONFIG_RTL8366RB_PHY is not set
# CONFIG_RTL8366S_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_RTL8367_PHY is not set
# CONFIG_RTS_PSTOR is not set # CONFIG_RTS_PSTOR is not set
CONFIG_RT_MUTEXES=y CONFIG_RT_MUTEXES=y

6
target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
View file

@ -17,7 +17,7 @@
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/rtl8366.h> #include <linux/rtl8366.h>
#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS #ifdef CONFIG_RTL8366_SMI_DEBUG_FS
#include <linux/debugfs.h> #include <linux/debugfs.h>
#endif #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_RTL8366S_PHY_DEBUG_FS #ifdef CONFIG_RTL8366_SMI_DEBUG_FS
int rtl8366_debugfs_open(struct inode *inode, struct file *file) int rtl8366_debugfs_open(struct inode *inode, struct file *file)
{ {
file->private_data = inode->i_private; file->private_data = inode->i_private;
@ -890,7 +890,7 @@ static void rtl8366_debugfs_remove(struct rtl8366_smi *smi)
#else #else
static inline void rtl8366_debugfs_init(struct rtl8366_smi *smi) {} static inline void rtl8366_debugfs_init(struct rtl8366_smi *smi) {}
static inline void rtl8366_debugfs_remove(struct rtl8366_smi *smi) {} static inline void rtl8366_debugfs_remove(struct rtl8366_smi *smi) {}
#endif /* CONFIG_RTL8366S_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)
{ {

4
target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
View file

@ -52,7 +52,7 @@ struct rtl8366_smi {
int vlan4k_enabled; int vlan4k_enabled;
char buf[4096]; char buf[4096];
#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS #ifdef CONFIG_RTL8366_SMI_DEBUG_FS
struct dentry *debugfs_root; struct dentry *debugfs_root;
u16 dbg_reg; u16 dbg_reg;
u8 dbg_vlan_4k_page; 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_vlan(struct rtl8366_smi *smi, int enable);
int rtl8366_enable_all_ports(struct rtl8366_smi *smi, int enable); int rtl8366_enable_all_ports(struct rtl8366_smi *smi, int enable);
#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS #ifdef CONFIG_RTL8366_SMI_DEBUG_FS
int rtl8366_debugfs_open(struct inode *inode, struct file *file); int rtl8366_debugfs_open(struct inode *inode, struct file *file);
#endif #endif

13
target/linux/generic/patches-3.3/726-phy_rtl8366.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig
@@ -168,6 +168,31 @@ config MDIO_OCTEON @@ -168,6 +168,30 @@ 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 +config RTL8366S_PHY
+ tristate "Driver for the Realtek RTL8366S switch" + tristate "Driver for the Realtek RTL8366S switch"
+ select SWCONFIG + select SWCONFIG
@ -21,12 +26,6 @@
+ tristate "Driver for the Realtek RTL8366RB switch" + tristate "Driver for the Realtek RTL8366RB switch"
+ select SWCONFIG + 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 # RTL8366_SMI
+ +
endif # PHYLIB endif # PHYLIB

8
target/linux/generic/patches-3.3/727-phy-rtl8367.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig
@@ -185,6 +185,10 @@ config RTL8366RB_PHY @@ -190,6 +190,10 @@ config RTL8366RB_PHY
tristate "Driver for the Realtek RTL8366RB switch" tristate "Driver for the Realtek RTL8366RB switch"
select SWCONFIG select SWCONFIG
@ -8,9 +8,9 @@
+ tristate "Driver for the Realtek RTL8367R/M switches" + tristate "Driver for the Realtek RTL8367R/M switches"
+ select SWCONFIG + select SWCONFIG
+ +
config RTL8366S_PHY_DEBUG_FS endif # RTL8366_SMI
bool "RTL8366 switch driver DEBUG_FS support"
depends on RTL8366S_PHY || RTL8366RB_PHY endif # PHYLIB
--- a/drivers/net/phy/Makefile --- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile
@@ -25,6 +25,7 @@ obj-$(CONFIG_RTL8306_PHY) += rtl8306.o @@ -25,6 +25,7 @@ obj-$(CONFIG_RTL8306_PHY) += rtl8306.o