hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rtl8366_smi: store GPIO numbers directly in the rtl8366_smi struct 

SVN-Revision: 19275
owl
Gabor Juhos 2010-01-22 17:37:47 +00:00
parent ab278275ee
commit a1247d2f83
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
target/linux/ar71xx/files/drivers/net/phy/rtl8366_smi.c
View File

@ -210,7 +210,8 @@ static const char *MIBCOUNTERS[] = {
struct rtl8366_smi { struct rtl8366_smi {
struct device *parent; struct device *parent;
struct rtl8366_smi_platform_data *pdata; unsigned int gpio_sda;
unsigned int gpio_sck;
spinlock_t lock; spinlock_t lock;
struct mii_bus *mii_bus; struct mii_bus *mii_bus;
struct switch_dev dev; struct switch_dev dev;
@ -237,8 +238,8 @@ static inline void rtl8366_smi_clk_delay(struct rtl8366_smi *smi)
static void rtl8366_smi_start(struct rtl8366_smi *smi) static void rtl8366_smi_start(struct rtl8366_smi *smi)
{ {
unsigned int sda = smi->pdata->gpio_sda; unsigned int sda = smi->gpio_sda;
unsigned int sck = smi->pdata->gpio_sck; unsigned int sck = smi->gpio_sck;
/* /*
* Set GPIO pins to output mode, with initial state: * Set GPIO pins to output mode, with initial state:
@ -266,8 +267,8 @@ static void rtl8366_smi_start(struct rtl8366_smi *smi)
static void rtl8366_smi_stop(struct rtl8366_smi *smi) static void rtl8366_smi_stop(struct rtl8366_smi *smi)
{ {
unsigned int sda = smi->pdata->gpio_sda; unsigned int sda = smi->gpio_sda;
unsigned int sck = smi->pdata->gpio_sck; unsigned int sck = smi->gpio_sck;
rtl8366_smi_clk_delay(smi); rtl8366_smi_clk_delay(smi);
gpio_set_value(sda, 0); gpio_set_value(sda, 0);
@ -294,8 +295,8 @@ static void rtl8366_smi_stop(struct rtl8366_smi *smi)
static void rtl8366_smi_write_bits(struct rtl8366_smi *smi, u32 data, u32 len) static void rtl8366_smi_write_bits(struct rtl8366_smi *smi, u32 data, u32 len)
{ {
unsigned int sda = smi->pdata->gpio_sda; unsigned int sda = smi->gpio_sda;
unsigned int sck = smi->pdata->gpio_sck; unsigned int sck = smi->gpio_sck;
for (; len > 0; len--) { for (; len > 0; len--) {
rtl8366_smi_clk_delay(smi); rtl8366_smi_clk_delay(smi);
@ -316,8 +317,8 @@ static void rtl8366_smi_write_bits(struct rtl8366_smi *smi, u32 data, u32 len)
static void rtl8366_smi_read_bits(struct rtl8366_smi *smi, u32 len, u32 *data) static void rtl8366_smi_read_bits(struct rtl8366_smi *smi, u32 len, u32 *data)
{ {
unsigned int sda = smi->pdata->gpio_sda; unsigned int sda = smi->gpio_sda;
unsigned int sck = smi->pdata->gpio_sck; unsigned int sck = smi->gpio_sck;
gpio_direction_input(sda); gpio_direction_input(sda);
@ -1825,28 +1826,30 @@ static int __init rtl8366_smi_probe(struct platform_device *pdev)
goto err_out; goto err_out;
} }
err = gpio_request(pdata->gpio_sda, dev_name(&pdev->dev)); smi->gpio_sda = pdata->gpio_sda;
smi->gpio_sck = pdata->gpio_sck;
err = gpio_request(smi->gpio_sda, dev_name(&pdev->dev));
if (err) { if (err) {
dev_err(&pdev->dev, "gpio_request failed for %u, err=%d\n", dev_err(&pdev->dev, "gpio_request failed for %u, err=%d\n",
pdata->gpio_sda, err); smi->gpio_sda, err);
goto err_free_smi; goto err_free_smi;
} }
err = gpio_request(pdata->gpio_sck, dev_name(&pdev->dev)); err = gpio_request(smi->gpio_sck, dev_name(&pdev->dev));
if (err) { if (err) {
dev_err(&pdev->dev, "gpio_request failed for %u, err=%d\n", dev_err(&pdev->dev, "gpio_request failed for %u, err=%d\n",
pdata->gpio_sck, err); smi->gpio_sck, err);
goto err_free_sda; goto err_free_sda;
} }
smi->parent = &pdev->dev; smi->parent = &pdev->dev;
smi->pdata = pdata;
spin_lock_init(&smi->lock); spin_lock_init(&smi->lock);
platform_set_drvdata(pdev, smi); platform_set_drvdata(pdev, smi);
dev_info(&pdev->dev, "using GPIO pins %u (SDA) and %u (SCK)\n", dev_info(&pdev->dev, "using GPIO pins %u (SDA) and %u (SCK)\n",
pdata->gpio_sda, pdata->gpio_sck); smi->gpio_sda, smi->gpio_sck);
err = rtl8366_smi_setup(smi); err = rtl8366_smi_setup(smi);
if (err) if (err)
@ -1906,16 +1909,12 @@ static int __devexit rtl8366_smi_remove(struct platform_device *pdev)
struct rtl8366_smi *smi = platform_get_drvdata(pdev); struct rtl8366_smi *smi = platform_get_drvdata(pdev);
if (smi) { if (smi) {
struct rtl8366_smi_platform_data *pdata;
pdata = pdev->dev.platform_data;
rtl8366_smi_switch_cleanup(smi); rtl8366_smi_switch_cleanup(smi);
rtl8366_debugfs_remove(smi); rtl8366_debugfs_remove(smi);
rtl8366_smi_mii_cleanup(smi); rtl8366_smi_mii_cleanup(smi);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
gpio_free(pdata->gpio_sck); gpio_free(smi->gpio_sck);
gpio_free(pdata->gpio_sda); gpio_free(smi->gpio_sda);
kfree(smi); kfree(smi);
} }