openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'gcl/gcl-next'

This commit is contained in:
Benjamin Herrenschmidt 2008-10-21 13:14:33 +11:00
parent dfe218b7ef 51d9861e9e
commit c1075fb7ec
3 changed files with 32 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/boot/cuboot-52xx.c
View File

@ -37,6 +37,10 @@ static void platform_fixups(void)
* this can do a simple path lookup. * this can do a simple path lookup.
*/ */
soc = find_node_by_devtype(NULL, "soc"); soc = find_node_by_devtype(NULL, "soc");
if (!soc)
soc = find_node_by_compatible(NULL, "fsl,mpc5200-immr");
if (!soc)
soc = find_node_by_compatible(NULL, "fsl,mpc5200b-immr");
if (soc) { if (soc) {
setprop(soc, "bus-frequency", &bd.bi_ipbfreq, setprop(soc, "bus-frequency", &bd.bi_ipbfreq,
sizeof(bd.bi_ipbfreq)); sizeof(bd.bi_ipbfreq));

7
arch/powerpc/platforms/52xx/mpc52xx_common.c
View File

@ -99,11 +99,14 @@ mpc5200_setup_xlb_arbiter(void)
out_be32(&xlb->master_pri_enable, 0xff); out_be32(&xlb->master_pri_enable, 0xff);
out_be32(&xlb->master_priority, 0x11111111); out_be32(&xlb->master_priority, 0x11111111);
/* Disable XLB pipelining /*
* Disable XLB pipelining
* (cfr errate 292. We could do this only just before ATA PIO * (cfr errate 292. We could do this only just before ATA PIO
* transaction and re-enable it afterwards ...) * transaction and re-enable it afterwards ...)
* Not needed on MPC5200B.
*/ */
out_be32(&xlb->config, in_be32(&xlb->config) | MPC52xx_XLB_CFG_PLDIS); if ((mfspr(SPRN_SVR) & MPC5200_SVR_MASK) == MPC5200_SVR)
out_be32(&xlb->config, in_be32(&xlb->config) | MPC52xx_XLB_CFG_PLDIS);
iounmap(xlb); iounmap(xlb);
} }

57
drivers/net/fec_mpc52xx_phy.c
View File

@ -2,6 +2,7 @@
* Driver for the MPC5200 Fast Ethernet Controller - MDIO bus driver * Driver for the MPC5200 Fast Ethernet Controller - MDIO bus driver
* *
* Copyright (C) 2007 Domen Puncer, Telargo, Inc. * Copyright (C) 2007 Domen Puncer, Telargo, Inc.
* Copyright (C) 2008 Wolfram Sang, Pengutronix
* *
* This file is licensed under the terms of the GNU General Public License * This file is licensed under the terms of the GNU General Public License
* version 2. This program is licensed "as is" without any warranty of any * version 2. This program is licensed "as is" without any warranty of any
@ -21,58 +22,45 @@ struct mpc52xx_fec_mdio_priv {
struct mpc52xx_fec __iomem *regs; struct mpc52xx_fec __iomem *regs;
}; };
static int mpc52xx_fec_mdio_read(struct mii_bus *bus, int phy_id, int reg) static int mpc52xx_fec_mdio_transfer(struct mii_bus *bus, int phy_id,
int reg, u32 value)
{ {
struct mpc52xx_fec_mdio_priv *priv = bus->priv; struct mpc52xx_fec_mdio_priv *priv = bus->priv;
struct mpc52xx_fec __iomem *fec; struct mpc52xx_fec __iomem *fec;
int tries = 100; int tries = 100;
u32 request = FEC_MII_READ_FRAME;
value |= (phy_id << FEC_MII_DATA_PA_SHIFT) & FEC_MII_DATA_PA_MSK;
value |= (reg << FEC_MII_DATA_RA_SHIFT) & FEC_MII_DATA_RA_MSK;
fec = priv->regs; fec = priv->regs;
out_be32(&fec->ievent, FEC_IEVENT_MII); out_be32(&fec->ievent, FEC_IEVENT_MII);
out_be32(&priv->regs->mii_data, value);
request |= (phy_id << FEC_MII_DATA_PA_SHIFT) & FEC_MII_DATA_PA_MSK;
request |= (reg << FEC_MII_DATA_RA_SHIFT) & FEC_MII_DATA_RA_MSK;
out_be32(&priv->regs->mii_data, request);
/* wait for it to finish, this takes about 23 us on lite5200b */ /* wait for it to finish, this takes about 23 us on lite5200b */
while (!(in_be32(&fec->ievent) & FEC_IEVENT_MII) && --tries) while (!(in_be32(&fec->ievent) & FEC_IEVENT_MII) && --tries)
udelay(5); udelay(5);
if (tries == 0) if (!tries)
return -ETIMEDOUT; return -ETIMEDOUT;
return in_be32(&priv->regs->mii_data) & FEC_MII_DATA_DATAMSK; return value & FEC_MII_DATA_OP_RD ?
in_be32(&priv->regs->mii_data) & FEC_MII_DATA_DATAMSK : 0;
} }
static int mpc52xx_fec_mdio_write(struct mii_bus *bus, int phy_id, int reg, u16 data) static int mpc52xx_fec_mdio_read(struct mii_bus *bus, int phy_id, int reg)
{ {
struct mpc52xx_fec_mdio_priv *priv = bus->priv; return mpc52xx_fec_mdio_transfer(bus, phy_id, reg, FEC_MII_READ_FRAME);
struct mpc52xx_fec __iomem *fec;
u32 value = data;
int tries = 100;
fec = priv->regs;
out_be32(&fec->ievent, FEC_IEVENT_MII);
value |= FEC_MII_WRITE_FRAME;
value |= (phy_id << FEC_MII_DATA_PA_SHIFT) & FEC_MII_DATA_PA_MSK;
value |= (reg << FEC_MII_DATA_RA_SHIFT) & FEC_MII_DATA_RA_MSK;
out_be32(&priv->regs->mii_data, value);
/* wait for request to finish */
while (!(in_be32(&fec->ievent) & FEC_IEVENT_MII) && --tries)
udelay(5);
if (tries == 0)
return -ETIMEDOUT;
return 0;
} }
static int mpc52xx_fec_mdio_probe(struct of_device *of, const struct of_device_id *match) static int mpc52xx_fec_mdio_write(struct mii_bus *bus, int phy_id, int reg,
u16 data)
{
return mpc52xx_fec_mdio_transfer(bus, phy_id, reg,
data | FEC_MII_WRITE_FRAME);
}
static int mpc52xx_fec_mdio_probe(struct of_device *of,
const struct of_device_id *match)
{ {
struct device *dev = &of->dev; struct device *dev = &of->dev;
struct device_node *np = of->node; struct device_node *np = of->node;
@ -131,7 +119,8 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of, const struct of_device_i
dev_set_drvdata(dev, bus); dev_set_drvdata(dev, bus);
/* set MII speed */ /* set MII speed */
out_be32(&priv->regs->mii_speed, ((mpc52xx_find_ipb_freq(of->node) >> 20) / 5) << 1); out_be32(&priv->regs->mii_speed,
((mpc52xx_find_ipb_freq(of->node) >> 20) / 5) << 1);
/* enable MII interrupt */ /* enable MII interrupt */
out_be32(&priv->regs->imask, in_be32(&priv->regs->imask) | FEC_IMASK_MII); out_be32(&priv->regs->imask, in_be32(&priv->regs->imask) | FEC_IMASK_MII);