domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rtl8366: unify rtl8366s and rtl8366rb platform data

Browse Source 
SVN-Revision: 27754
This commit is contained in:
Felix Fietkau
2011-07-24 14:40:23 +00:00
parent 00dd85d8f6
commit 1afe8a0726
11 changed files with 31 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/generic/files/drivers/net/phy/rtl8366rb.c
View File

@@ -16,7 +16,7 @@
#include <linux/platform_device.h>
#include <linux/delay.h>
#include <linux/skbuff.h>
#include <linux/rtl8366rb.h>
#include <linux/rtl8366.h>
#include "rtl8366_smi.h"
@@ -1224,7 +1224,7 @@ static struct rtl8366_smi_ops rtl8366rb_smi_ops = {
static int __devinit rtl8366rb_probe(struct platform_device *pdev)
{
static int rtl8366_smi_version_printed;
struct rtl8366rb_platform_data *pdata;
struct rtl8366_platform_data *pdata;
struct rtl8366_smi *smi;
int err;

6
target/linux/generic/files/drivers/net/phy/rtl8366s.c
View File

@@ -15,7 +15,7 @@
#include <linux/platform_device.h>
#include <linux/delay.h>
#include <linux/skbuff.h>
#include <linux/rtl8366s.h>
#include <linux/rtl8366.h>
#include "rtl8366_smi.h"
@@ -250,7 +250,7 @@ static int rtl8366s_reset_chip(struct rtl8366_smi *smi)
static int rtl8366s_hw_init(struct rtl8366_smi *smi)
{
struct rtl8366s_platform_data *pdata;
struct rtl8366_platform_data *pdata;
int err;
pdata = smi->parent->platform_data;
@@ -1053,7 +1053,7 @@ static struct rtl8366_smi_ops rtl8366s_smi_ops = {
static int __devinit rtl8366s_probe(struct platform_device *pdev)
{
static int rtl8366_smi_version_printed;
struct rtl8366s_platform_data *pdata;
struct rtl8366_platform_data *pdata;
struct rtl8366_smi *smi;
int err;

16
target/linux/generic/files/include/linux/rtl8366s.h → target/linux/generic/files/include/linux/rtl8366.h
View File

@@ -1,5 +1,5 @@
/*
* Platform data definition for the Realtek RTL8366S ethernet switch driver
* Platform data definition for the Realtek RTL8366RB/S ethernet switch driver
*
* Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
*
@@ -8,21 +8,23 @@
* by the Free Software Foundation.
*/
#ifndef _RTL8366S_H
#define _RTL8366S_H
#ifndef _RTL8366_H
#define _RTL8366_H
#define RTL8366_DRIVER_NAME "rtl8366"
#define RTL8366S_DRIVER_NAME "rtl8366s"
#define RTL8366RB_DRIVER_NAME "rtl8366rb"
struct rtl8366s_initval {
struct rtl8366_initval {
unsigned reg;
u16 val;
};
struct rtl8366s_platform_data {
struct rtl8366_platform_data {
unsigned gpio_sda;
unsigned gpio_sck;
unsigned num_initvals;
struct rtl8366s_initval *initvals;
struct rtl8366_initval *initvals;
};
#endif /* _RTL8366_SMI_H */
#endif /* _RTL8366_H */

21
target/linux/generic/files/include/linux/rtl8366rb.h
View File

@@ -1,21 +0,0 @@
/*
* Platform data definition for the Realtek RTL8366S ethernet switch driver
*
* Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 as published
* by the Free Software Foundation.
*/
#ifndef _RTL8366RB_H
#define _RTL8366RB_H
#define RTL8366RB_DRIVER_NAME "rtl8366rb"
struct rtl8366rb_platform_data {
unsigned gpio_sda;
unsigned gpio_sck;
};
#endif /* _RTL8366RB_SMI_H */