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

kernel: add reset control support to rtl8366 driver

Browse source 
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin 2018-05-24 00:23:16 +02:00
parent 5a6a32ad9b
commit f7aa08595d
4 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd.c
View file

@ -83,7 +83,7 @@ static struct gpio_keys_button tl_wr1043nd_gpio_keys[] __initdata = {
} }
}; };
static void tl_wr1043nd_rtl8366rb_hw_reset(bool active) static void tl_wr1043nd_rtl8366rb_hw_reset(struct rtl8366_smi *smi, bool active)
{ {
if (active) if (active)
ath79_device_reset_set(AR71XX_RESET_GE0_PHY); ath79_device_reset_set(AR71XX_RESET_GE0_PHY);
@ -110,7 +110,7 @@ static void __init tl_wr1043nd_setup(void)
u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00); u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000); u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
tl_wr1043nd_rtl8366rb_hw_reset(true); tl_wr1043nd_rtl8366rb_hw_reset(NULL, true);
ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0); ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
ath79_eth0_data.mii_bus_dev = &tl_wr1043nd_rtl8366rb_device.dev; ath79_eth0_data.mii_bus_dev = &tl_wr1043nd_rtl8366rb_device.dev;

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

@ -319,9 +319,9 @@ EXPORT_SYMBOL_GPL(rtl8366_smi_rmwr);
static int rtl8366_reset(struct rtl8366_smi *smi) static int rtl8366_reset(struct rtl8366_smi *smi)
{ {
if (smi->hw_reset) { if (smi->hw_reset) {
smi->hw_reset(true); smi->hw_reset(smi, true);
msleep(RTL8366_SMI_HW_STOP_DELAY); msleep(RTL8366_SMI_HW_STOP_DELAY);
smi->hw_reset(false); smi->hw_reset(smi, false);
msleep(RTL8366_SMI_HW_START_DELAY); msleep(RTL8366_SMI_HW_START_DELAY);
return 0; return 0;
} }
@ -1300,7 +1300,7 @@ static int __rtl8366_smi_init(struct rtl8366_smi *smi, const char *name)
/* start the switch */ /* start the switch */
if (smi->hw_reset) { if (smi->hw_reset) {
smi->hw_reset(false); smi->hw_reset(smi, false);
msleep(RTL8366_SMI_HW_START_DELAY); msleep(RTL8366_SMI_HW_START_DELAY);
} }
@ -1315,7 +1315,7 @@ static int __rtl8366_smi_init(struct rtl8366_smi *smi, const char *name)
static void __rtl8366_smi_cleanup(struct rtl8366_smi *smi) static void __rtl8366_smi_cleanup(struct rtl8366_smi *smi)
{ {
if (smi->hw_reset) if (smi->hw_reset)
smi->hw_reset(true); smi->hw_reset(smi, true);
gpio_free(smi->gpio_sck); gpio_free(smi->gpio_sck);
gpio_free(smi->gpio_sda); gpio_free(smi->gpio_sda);
@ -1425,6 +1425,14 @@ void rtl8366_smi_cleanup(struct rtl8366_smi *smi)
EXPORT_SYMBOL_GPL(rtl8366_smi_cleanup); EXPORT_SYMBOL_GPL(rtl8366_smi_cleanup);
#ifdef CONFIG_OF #ifdef CONFIG_OF
static void rtl8366_smi_reset(struct rtl8366_smi *smi, bool active)
{
if (active)
reset_control_assert(smi->reset);
else
reset_control_deassert(smi->reset);
}
int rtl8366_smi_probe_of(struct platform_device *pdev, struct rtl8366_smi *smi) int rtl8366_smi_probe_of(struct platform_device *pdev, struct rtl8366_smi *smi)
{ {
int sck = of_get_named_gpio(pdev->dev.of_node, "gpio-sck", 0); int sck = of_get_named_gpio(pdev->dev.of_node, "gpio-sck", 0);
@ -1437,6 +1445,9 @@ int rtl8366_smi_probe_of(struct platform_device *pdev, struct rtl8366_smi *smi)
smi->gpio_sda = sda; smi->gpio_sda = sda;
smi->gpio_sck = sck; smi->gpio_sck = sck;
smi->reset = devm_reset_control_get(&pdev->dev, "switch");
if (!IS_ERR(smi->reset))
smi->hw_reset = rtl8366_smi_reset;
return 0; return 0;
} }

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

@ -14,6 +14,7 @@
#include <linux/phy.h> #include <linux/phy.h>
#include <linux/switch.h> #include <linux/switch.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/reset.h>
struct rtl8366_smi_ops; struct rtl8366_smi_ops;
struct rtl8366_vlan_ops; struct rtl8366_vlan_ops;
@ -33,7 +34,7 @@ struct rtl8366_smi {
struct device *parent; struct device *parent;
unsigned int gpio_sda; unsigned int gpio_sda;
unsigned int gpio_sck; unsigned int gpio_sck;
void (*hw_reset)(bool active); void (*hw_reset)(struct rtl8366_smi *smi, bool active);
unsigned int clk_delay; /* ns */ unsigned int clk_delay; /* ns */
u8 cmd_read; u8 cmd_read;
u8 cmd_write; u8 cmd_write;
@ -54,6 +55,9 @@ struct rtl8366_smi {
int vlan4k_enabled; int vlan4k_enabled;
char buf[4096]; char buf[4096];
struct reset_control *reset;
#ifdef CONFIG_RTL8366_SMI_DEBUG_FS #ifdef CONFIG_RTL8366_SMI_DEBUG_FS
struct dentry *debugfs_root; struct dentry *debugfs_root;
u16 dbg_reg; u16 dbg_reg;

4
target/linux/generic/files/include/linux/rtl8366.h
View file

@ -15,6 +15,8 @@
#define RTL8366S_DRIVER_NAME "rtl8366s" #define RTL8366S_DRIVER_NAME "rtl8366s"
#define RTL8366RB_DRIVER_NAME "rtl8366rb" #define RTL8366RB_DRIVER_NAME "rtl8366rb"
struct rtl8366_smi;
enum rtl8366_type { enum rtl8366_type {
RTL8366_TYPE_UNKNOWN, RTL8366_TYPE_UNKNOWN,
RTL8366_TYPE_S, RTL8366_TYPE_S,
@ -29,7 +31,7 @@ struct rtl8366_initval {
struct rtl8366_platform_data { struct rtl8366_platform_data {
unsigned gpio_sda; unsigned gpio_sda;
unsigned gpio_sck; unsigned gpio_sck;
void (*hw_reset)(bool active); void (*hw_reset)(struct rtl8366_smi *smi, bool active);
unsigned num_initvals; unsigned num_initvals;
struct rtl8366_initval *initvals; struct rtl8366_initval *initvals;