Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41c1093f authored by Timur Tabi's avatar Timur Tabi Committed by David S. Miller
Browse files

net: qcom/emac: rename emac_phy to emac_sgmii and move it 



The EMAC has an internal PHY that is often called the "SGMII".  This
SGMII is also connected to an external PHY, which is managed by phylib.
These dual PHYs often cause confusion.  In this case, the data structure
for managing the SGMII was mis-named and located in the wrong header file.

Structure emac_phy is renamed to emac_sgmii to clearly indicate it applies
to the internal PHY only.  It also also moved from emac_phy.h (which
supports the external PHY) to emac_sgmii.h (where it belongs).

To keep the changes minimal, only the structure name is changed, not
the names of any variables of that type.

Signed-off-by: default avatarTimur Tabi <timur@codeaurora.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b9032741

drivers/net/ethernet/qualcomm/emac/emac-phy.c

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 
#include <linux/acpi.h>

#include "emac.h"

#include "emac-mac.h"

#include "emac-phy.h"

#include "emac-sgmii.h"



/* EMAC base register offsets */

#define EMAC_MDIO_CTRL                                        0x001414

drivers/net/ethernet/qualcomm/emac/emac-phy.h

+0 −13
Original line number Diff line number Diff line
@@ -13,19 +13,6 @@ 
#ifndef _EMAC_PHY_H_

#define _EMAC_PHY_H_



typedef int (*emac_sgmii_initialize)(struct emac_adapter *adpt);



/** emac_phy - internal emac phy

 * @base base address

 * @digital per-lane digital block

 * @initialize initialization function

 */

struct emac_phy {

	void __iomem		*base;

	void __iomem		*digital;

	emac_sgmii_initialize	initialize;

};



struct emac_adapter;



int emac_phy_config(struct platform_device *pdev, struct emac_adapter *adpt);

drivers/net/ethernet/qualcomm/emac/emac-sgmii-fsm9900.c

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ static const struct emac_reg_write tx_rx_setting[] = { 


int emac_sgmii_init_fsm9900(struct emac_adapter *adpt)

{

	struct emac_phy *phy = &adpt->phy;

	struct emac_sgmii *phy = &adpt->phy;

	unsigned int i;



	emac_reg_write_all(phy->base, physical_coding_sublayer_programming,

drivers/net/ethernet/qualcomm/emac/emac-sgmii-qdf2400.c

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static const struct emac_reg_write physical_coding_sublayer_programming[] = { 


int emac_sgmii_init_qdf2400(struct emac_adapter *adpt)

{

	struct emac_phy *phy = &adpt->phy;

	struct emac_sgmii *phy = &adpt->phy;

	void __iomem *phy_regs = phy->base;

	void __iomem *laned = phy->digital;

	unsigned int i;

drivers/net/ethernet/qualcomm/emac/emac-sgmii-qdf2432.c

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static const struct emac_reg_write physical_coding_sublayer_programming[] = { 


int emac_sgmii_init_qdf2432(struct emac_adapter *adpt)

{

	struct emac_phy *phy = &adpt->phy;

	struct emac_sgmii *phy = &adpt->phy;

	void __iomem *phy_regs = phy->base;

	void __iomem *laned = phy->digital;

	unsigned int i;