Fix Meson64/C2 patches and add 8188EU driver there too
This commit is contained in:
parent
dd7cabd05e
commit
e21a34c2f9
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm64 4.14.10 Kernel Configuration
|
||||
# Linux/arm64 4.14.14 Kernel Configuration
|
||||
#
|
||||
CONFIG_ARM64=y
|
||||
CONFIG_64BIT=y
|
||||
@ -1988,6 +1988,7 @@ CONFIG_ATH10K_USB=m
|
||||
# CONFIG_ATH10K_DEBUGFS is not set
|
||||
CONFIG_WCN36XX=m
|
||||
# CONFIG_WCN36XX_DEBUGFS is not set
|
||||
CONFIG_RTL8188EU=m
|
||||
CONFIG_WLAN_VENDOR_ATMEL=y
|
||||
# CONFIG_AT76C50X_USB is not set
|
||||
CONFIG_WLAN_VENDOR_BROADCOM=y
|
||||
|
||||
@ -2,22 +2,15 @@ diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/eth
|
||||
index f63c2ddced3c..8e8add8c6ed3 100644
|
||||
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
||||
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
||||
@@ -364,9 +364,18 @@ static void stmmac_eee_ctrl_timer(struct timer_list *t)
|
||||
bool stmmac_eee_init(struct stmmac_priv *priv)
|
||||
{
|
||||
struct net_device *ndev = priv->dev;
|
||||
+ int interface = priv->plat->interface;
|
||||
unsigned long flags;
|
||||
bool ret = false;
|
||||
|
||||
+ if ((interface != PHY_INTERFACE_MODE_MII) &&
|
||||
+ (interface != PHY_INTERFACE_MODE_GMII) &&
|
||||
+ (interface != PHY_INTERFACE_MODE_RGMII) &&
|
||||
+ (interface != PHY_INTERFACE_MODE_RGMII_ID) &&
|
||||
+ (interface != PHY_INTERFACE_MODE_RGMII_TXID) &&
|
||||
+ (interface != PHY_INTERFACE_MODE_RGMII_RXID))
|
||||
+ goto out;
|
||||
+
|
||||
@@ -370,7 +370,10 @@ bool stmmac_eee_init(struct stmmac_priv *priv)
|
||||
|
||||
if ((interface != PHY_INTERFACE_MODE_MII) &&
|
||||
(interface != PHY_INTERFACE_MODE_GMII) &&
|
||||
- !phy_interface_mode_is_rgmii(interface))
|
||||
+ (interface != PHY_INTERFACE_MODE_RGMII) &&
|
||||
+ (interface != PHY_INTERFACE_MODE_RGMII_ID) &&
|
||||
+ (interface != PHY_INTERFACE_MODE_RGMII_TXID) &&
|
||||
+ (interface != PHY_INTERFACE_MODE_RGMII_RXID))
|
||||
goto out;
|
||||
|
||||
/* Using PCS we cannot dial with the phy registers at this stage
|
||||
* so we do not support extra feature like EEE.
|
||||
*/
|
||||
|
||||
@ -0,0 +1,24 @@
|
||||
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
|
||||
index 95cdb48fad061..db9ee74578012 100644
|
||||
--- a/drivers/net/wireless/Kconfig
|
||||
+++ b/drivers/net/wireless/Kconfig
|
||||
@@ -32,6 +32,7 @@ config WIRELESS_WDS
|
||||
|
||||
source "drivers/net/wireless/admtek/Kconfig"
|
||||
source "drivers/net/wireless/ath/Kconfig"
|
||||
+source "drivers/net/wireless/rtl8188eu/Kconfig"
|
||||
source "drivers/net/wireless/atmel/Kconfig"
|
||||
source "drivers/net/wireless/broadcom/Kconfig"
|
||||
source "drivers/net/wireless/cisco/Kconfig"
|
||||
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
|
||||
index edeb51f6fa551..2c4d8522929bf 100644
|
||||
--- a/drivers/net/wireless/Makefile
|
||||
+++ b/drivers/net/wireless/Makefile
|
||||
@@ -5,6 +5,7 @@
|
||||
|
||||
obj-$(CONFIG_WLAN_VENDOR_ADMTEK) += admtek/
|
||||
obj-$(CONFIG_WLAN_VENDOR_ATH) += ath/
|
||||
+obj-$(CONFIG_RTL8188EU) += rtl8188eu/
|
||||
obj-$(CONFIG_WLAN_VENDOR_ATMEL) += atmel/
|
||||
obj-$(CONFIG_WLAN_VENDOR_BROADCOM) += broadcom/
|
||||
obj-$(CONFIG_WLAN_VENDOR_CISCO) += cisco/
|
||||
315820
patch/kernel/meson64-next/91-02-rtl8188eu.patch
Normal file
315820
patch/kernel/meson64-next/91-02-rtl8188eu.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -2,22 +2,15 @@ diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/eth
|
||||
index f63c2ddced3c..8e8add8c6ed3 100644
|
||||
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
||||
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
||||
@@ -364,9 +364,18 @@ static void stmmac_eee_ctrl_timer(struct timer_list *t)
|
||||
bool stmmac_eee_init(struct stmmac_priv *priv)
|
||||
{
|
||||
struct net_device *ndev = priv->dev;
|
||||
+ int interface = priv->plat->interface;
|
||||
unsigned long flags;
|
||||
bool ret = false;
|
||||
|
||||
+ if ((interface != PHY_INTERFACE_MODE_MII) &&
|
||||
+ (interface != PHY_INTERFACE_MODE_GMII) &&
|
||||
+ (interface != PHY_INTERFACE_MODE_RGMII) &&
|
||||
+ (interface != PHY_INTERFACE_MODE_RGMII_ID) &&
|
||||
+ (interface != PHY_INTERFACE_MODE_RGMII_TXID) &&
|
||||
+ (interface != PHY_INTERFACE_MODE_RGMII_RXID))
|
||||
+ goto out;
|
||||
+
|
||||
@@ -370,7 +370,10 @@ bool stmmac_eee_init(struct stmmac_priv *priv)
|
||||
|
||||
if ((interface != PHY_INTERFACE_MODE_MII) &&
|
||||
(interface != PHY_INTERFACE_MODE_GMII) &&
|
||||
- !phy_interface_mode_is_rgmii(interface))
|
||||
+ (interface != PHY_INTERFACE_MODE_RGMII) &&
|
||||
+ (interface != PHY_INTERFACE_MODE_RGMII_ID) &&
|
||||
+ (interface != PHY_INTERFACE_MODE_RGMII_TXID) &&
|
||||
+ (interface != PHY_INTERFACE_MODE_RGMII_RXID))
|
||||
goto out;
|
||||
|
||||
/* Using PCS we cannot dial with the phy registers at this stage
|
||||
* so we do not support extra feature like EEE.
|
||||
*/
|
||||
|
||||
@ -0,0 +1,24 @@
|
||||
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
|
||||
index 95cdb48fad061..db9ee74578012 100644
|
||||
--- a/drivers/net/wireless/Kconfig
|
||||
+++ b/drivers/net/wireless/Kconfig
|
||||
@@ -32,6 +32,7 @@ config WIRELESS_WDS
|
||||
|
||||
source "drivers/net/wireless/admtek/Kconfig"
|
||||
source "drivers/net/wireless/ath/Kconfig"
|
||||
+source "drivers/net/wireless/rtl8188eu/Kconfig"
|
||||
source "drivers/net/wireless/atmel/Kconfig"
|
||||
source "drivers/net/wireless/broadcom/Kconfig"
|
||||
source "drivers/net/wireless/cisco/Kconfig"
|
||||
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
|
||||
index edeb51f6fa551..2c4d8522929bf 100644
|
||||
--- a/drivers/net/wireless/Makefile
|
||||
+++ b/drivers/net/wireless/Makefile
|
||||
@@ -5,6 +5,7 @@
|
||||
|
||||
obj-$(CONFIG_WLAN_VENDOR_ADMTEK) += admtek/
|
||||
obj-$(CONFIG_WLAN_VENDOR_ATH) += ath/
|
||||
+obj-$(CONFIG_RTL8188EU) += rtl8188eu/
|
||||
obj-$(CONFIG_WLAN_VENDOR_ATMEL) += atmel/
|
||||
obj-$(CONFIG_WLAN_VENDOR_BROADCOM) += broadcom/
|
||||
obj-$(CONFIG_WLAN_VENDOR_CISCO) += cisco/
|
||||
315820
patch/kernel/odroidc2-next/91-02-rtl8188eu.patch
Normal file
315820
patch/kernel/odroidc2-next/91-02-rtl8188eu.patch
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user