redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

net: dsa: mv88e6xxx: rename chip header 

The mv88e6xxx.h is meant to contains the chip structures and data.
Rename it to chip.h, as for other source/header pairs of the driver.

At the same time, ensure that relative header inclusions are separated
by a newline and sorted alphabetically.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
hifive-unleashed-5.1
Vivien Didelot 2017-06-02 17:06:15 -04:00 committed by David S. Miller
parent 2d9888c5b2
commit 4d5f2ba778
13 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/dsa/mv88e6xxx/chip.c
View File

@ -33,7 +33,7 @@
#include <linux/phy.h> #include <linux/phy.h>
#include <net/dsa.h> #include <net/dsa.h>
#include "mv88e6xxx.h" #include "chip.h"
#include "global1.h" #include "global1.h"
#include "global2.h" #include "global2.h"
#include "phy.h" #include "phy.h"

9
drivers/net/dsa/mv88e6xxx/mv88e6xxx.h → drivers/net/dsa/mv88e6xxx/chip.h
View File

@ -1,5 +1,5 @@
/* /*
* Marvell 88e6xxx common definitions * Marvell 88E6xxx Ethernet switch single-chip definition
* *
* Copyright (c) 2008 Marvell Semiconductor * Copyright (c) 2008 Marvell Semiconductor
* *
@ -9,8 +9,8 @@
* (at your option) any later version. * (at your option) any later version.
*/ */
#ifndef __MV88E6XXX_H #ifndef _MV88E6XXX_CHIP_H
#define __MV88E6XXX_H #define _MV88E6XXX_CHIP_H
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/irq.h> #include <linux/irq.h>
@ -924,4 +924,5 @@ int mv88e6xxx_update(struct mv88e6xxx_chip *chip, int addr, int reg,
u16 update); u16 update);
int mv88e6xxx_wait(struct mv88e6xxx_chip *chip, int addr, int reg, u16 mask); int mv88e6xxx_wait(struct mv88e6xxx_chip *chip, int addr, int reg, u16 mask);
struct mii_bus *mv88e6xxx_default_mdio_bus(struct mv88e6xxx_chip *chip); struct mii_bus *mv88e6xxx_default_mdio_bus(struct mv88e6xxx_chip *chip);
#endif
#endif /* _MV88E6XXX_CHIP_H */

2
drivers/net/dsa/mv88e6xxx/global1.c
View File

@ -12,7 +12,7 @@
* (at your option) any later version. * (at your option) any later version.
*/ */
#include "mv88e6xxx.h" #include "chip.h"
#include "global1.h" #include "global1.h"
int mv88e6xxx_g1_read(struct mv88e6xxx_chip *chip, int reg, u16 *val) int mv88e6xxx_g1_read(struct mv88e6xxx_chip *chip, int reg, u16 *val)

2
drivers/net/dsa/mv88e6xxx/global1.h
View File

@ -15,7 +15,7 @@
#ifndef _MV88E6XXX_GLOBAL1_H #ifndef _MV88E6XXX_GLOBAL1_H
#define _MV88E6XXX_GLOBAL1_H #define _MV88E6XXX_GLOBAL1_H
#include "mv88e6xxx.h" #include "chip.h"
int mv88e6xxx_g1_read(struct mv88e6xxx_chip *chip, int reg, u16 *val); int mv88e6xxx_g1_read(struct mv88e6xxx_chip *chip, int reg, u16 *val);
int mv88e6xxx_g1_write(struct mv88e6xxx_chip *chip, int reg, u16 val); int mv88e6xxx_g1_write(struct mv88e6xxx_chip *chip, int reg, u16 val);

2
drivers/net/dsa/mv88e6xxx/global1_atu.c
View File

@ -10,7 +10,7 @@
* (at your option) any later version. * (at your option) any later version.
*/ */
#include "mv88e6xxx.h" #include "chip.h"
#include "global1.h" #include "global1.h"
/* Offset 0x01: ATU FID Register */ /* Offset 0x01: ATU FID Register */

2
drivers/net/dsa/mv88e6xxx/global1_vtu.c
View File

@ -11,7 +11,7 @@
* (at your option) any later version. * (at your option) any later version.
*/ */
#include "mv88e6xxx.h" #include "chip.h"
#include "global1.h" #include "global1.h"
/* Offset 0x02: VTU FID Register */ /* Offset 0x02: VTU FID Register */

3
drivers/net/dsa/mv88e6xxx/global2.c
View File

@ -15,7 +15,8 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irqdomain.h> #include <linux/irqdomain.h>
#include "mv88e6xxx.h"
#include "chip.h"
#include "global2.h" #include "global2.h"
#define ADDR_GLOBAL2 0x1c #define ADDR_GLOBAL2 0x1c

2
drivers/net/dsa/mv88e6xxx/global2.h
View File

@ -15,7 +15,7 @@
#ifndef _MV88E6XXX_GLOBAL2_H #ifndef _MV88E6XXX_GLOBAL2_H
#define _MV88E6XXX_GLOBAL2_H #define _MV88E6XXX_GLOBAL2_H
#include "mv88e6xxx.h" #include "chip.h"
#ifdef CONFIG_NET_DSA_MV88E6XXX_GLOBAL2 #ifdef CONFIG_NET_DSA_MV88E6XXX_GLOBAL2

2
drivers/net/dsa/mv88e6xxx/phy.c
View File

@ -15,7 +15,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <net/dsa.h> #include <net/dsa.h>
#include "mv88e6xxx.h" #include "chip.h"
#include "phy.h" #include "phy.h"
int mv88e6165_phy_read(struct mv88e6xxx_chip *chip, struct mii_bus *bus, int mv88e6165_phy_read(struct mv88e6xxx_chip *chip, struct mii_bus *bus,

3
drivers/net/dsa/mv88e6xxx/port.c
View File

@ -13,7 +13,8 @@
*/ */
#include <linux/phy.h> #include <linux/phy.h>
#include "mv88e6xxx.h"
#include "chip.h"
#include "port.h" #include "port.h"
int mv88e6xxx_port_read(struct mv88e6xxx_chip *chip, int port, int reg, int mv88e6xxx_port_read(struct mv88e6xxx_chip *chip, int port, int reg,

2
drivers/net/dsa/mv88e6xxx/port.h
View File

@ -15,7 +15,7 @@
#ifndef _MV88E6XXX_PORT_H #ifndef _MV88E6XXX_PORT_H
#define _MV88E6XXX_PORT_H #define _MV88E6XXX_PORT_H
#include "mv88e6xxx.h" #include "chip.h"
int mv88e6xxx_port_read(struct mv88e6xxx_chip *chip, int port, int reg, int mv88e6xxx_port_read(struct mv88e6xxx_chip *chip, int port, int reg,
u16 *val); u16 *val);

2
drivers/net/dsa/mv88e6xxx/serdes.c
View File

@ -13,8 +13,8 @@
#include <linux/mii.h> #include <linux/mii.h>
#include "chip.h"
#include "global2.h" #include "global2.h"
#include "mv88e6xxx.h"
#include "phy.h" #include "phy.h"
#include "port.h" #include "port.h"
#include "serdes.h" #include "serdes.h"

2
drivers/net/dsa/mv88e6xxx/serdes.h
View File

@ -14,7 +14,7 @@
#ifndef _MV88E6XXX_SERDES_H #ifndef _MV88E6XXX_SERDES_H
#define _MV88E6XXX_SERDES_H #define _MV88E6XXX_SERDES_H
#include "mv88e6xxx.h" #include "chip.h"
#define MV88E6352_ADDR_SERDES 0x0f #define MV88E6352_ADDR_SERDES 0x0f
#define MV88E6352_SERDES_PAGE_FIBER 0x01 #define MV88E6352_SERDES_PAGE_FIBER 0x01