Commit 37d5d32a authored by Andrey Smirnov's avatar Andrey Smirnov Committed by Lorenzo Pieralisi
Browse files

PCI: imx6: Restrict PHY register data to 16-bit 



PHY registers on i.MX6 are 16-bit wide, so we can get rid of explicit
masking if we restrict pcie_phy_read()/pcie_phy_write() to use 'u16'
instead of 'int'. No functional change intended.

Signed-off-by: default avatarAndrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: default avatarLucas Stach <l.stach@pengutronix.de>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: linux-kernel@vger.kernel.org
Cc: linux-pci@vger.kernel.org
parent c2c708bc

drivers/pci/controller/dwc/pci-imx6.c

+6 −7
Original line number Diff line number Diff line
@@ -195,10 +195,10 @@ static int pcie_phy_wait_ack(struct imx6_pcie *imx6_pcie, int addr) 
}



/* Read from the 16-bit PCIe PHY control registers (not memory-mapped) */

static int pcie_phy_read(struct imx6_pcie *imx6_pcie, int addr, int *data)

static int pcie_phy_read(struct imx6_pcie *imx6_pcie, int addr, u16 *data)

{

	struct dw_pcie *pci = imx6_pcie->pci;

	u32 val, phy_ctl;

	u32 phy_ctl;

	int ret;



	ret = pcie_phy_wait_ack(imx6_pcie, addr);
@@ -213,8 +213,7 @@ static int pcie_phy_read(struct imx6_pcie *imx6_pcie, int addr, int *data) 
	if (ret)

		return ret;



	val = dw_pcie_readl_dbi(pci, PCIE_PHY_STAT);

	*data = val & 0xffff;

	*data = dw_pcie_readl_dbi(pci, PCIE_PHY_STAT);



	/* deassert Read signal */

	dw_pcie_writel_dbi(pci, PCIE_PHY_CTRL, 0x00);
@@ -222,7 +221,7 @@ static int pcie_phy_read(struct imx6_pcie *imx6_pcie, int addr, int *data) 
	return pcie_phy_poll_ack(imx6_pcie, false);

}



static int pcie_phy_write(struct imx6_pcie *imx6_pcie, int addr, int data)

static int pcie_phy_write(struct imx6_pcie *imx6_pcie, int addr, u16 data)

{

	struct dw_pcie *pci = imx6_pcie->pci;

	u32 var;
@@ -279,7 +278,7 @@ static int pcie_phy_write(struct imx6_pcie *imx6_pcie, int addr, int data) 


static void imx6_pcie_reset_phy(struct imx6_pcie *imx6_pcie)

{

	u32 tmp;

	u16 tmp;



	if (!(imx6_pcie->drvdata->flags & IMX6_PCIE_FLAG_IMX6_PHY))

		return;
@@ -675,7 +674,7 @@ static int imx6_setup_phy_mpll(struct imx6_pcie *imx6_pcie) 
{

	unsigned long phy_rate = clk_get_rate(imx6_pcie->pcie_phy);

	int mult, div;

	u32 val;

	u16 val;



	if (!(imx6_pcie->drvdata->flags & IMX6_PCIE_FLAG_IMX6_PHY))

		return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE