Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS updates from Ralf Baechle: "More hardware support across the field including a bunch of device drivers. The highlight however really are further steps towards device tree. This has been sitting in -next for ages. All MIPS _defconfigs have been tested to boot or where I don't have hardware available, to at least build fine." * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (77 commits) MIPS: Loongson 1B: Add defconfig MIPS: Loongson 1B: Add board support MIPS: Netlogic: early console fix MIPS: Netlogic: Fix indentation of smpboot.S MIPS: Netlogic: remove cpu_has_dc_aliases define for XLP MIPS: Netlogic: Remove unused pcibios_fixups MIPS: Netlogic: Add XLP SoC devices in FDT MIPS: Netlogic: Add IRQ mappings for more devices MIPS: Netlogic: USB support for XLP MIPS: Netlogic: XLP PCIe controller support. MIPS: Netlogic: Platform changes for XLR/XLS I2C MIPS: Netlogic: Platform NAND/NOR flash support MIPS: Netlogic: Platform changes for XLS USB MIPS: Netlogic: Remove NETLOGIC_ prefix MIPS: Netlogic: SMP wakeup code update MIPS: Netlogic: Update comments in smpboot.S MIPS: BCM63XX: Add 96328avng reference board MIPS: Expose PCIe drivers for MIPS MIPS: BCM63XX: Add PCIe Support for BCM6328 MIPS: BCM63XX: Move the PCI initialization into its own function ...
This commit is contained in:
Linus Torvalds
@@ -3,14 +3,17 @@
|
||||
* License. See the file "COPYING" in the main directory of this archive
|
||||
* for more details.
|
||||
*
|
||||
* Copyright (C) 2009 Cavium Networks
|
||||
* Copyright (C) 2009,2011 Cavium, Inc.
|
||||
*/
|
||||
|
||||
#include <linux/gfp.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/of_mdio.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/gfp.h>
|
||||
#include <linux/phy.h>
|
||||
#include <linux/io.h>
|
||||
|
||||
#include <asm/octeon/octeon.h>
|
||||
#include <asm/octeon/cvmx-smix-defs.h>
|
||||
@@ -18,9 +21,17 @@
|
||||
#define DRV_VERSION "1.0"
|
||||
#define DRV_DESCRIPTION "Cavium Networks Octeon SMI/MDIO driver"
|
||||
|
||||
#define SMI_CMD 0x0
|
||||
#define SMI_WR_DAT 0x8
|
||||
#define SMI_RD_DAT 0x10
|
||||
#define SMI_CLK 0x18
|
||||
#define SMI_EN 0x20
|
||||
|
||||
struct octeon_mdiobus {
|
||||
struct mii_bus *mii_bus;
|
||||
int unit;
|
||||
u64 register_base;
|
||||
resource_size_t mdio_phys;
|
||||
resource_size_t regsize;
|
||||
int phy_irq[PHY_MAX_ADDR];
|
||||
};
|
||||
|
||||
@@ -35,15 +46,15 @@ static int octeon_mdiobus_read(struct mii_bus *bus, int phy_id, int regnum)
|
||||
smi_cmd.s.phy_op = 1; /* MDIO_CLAUSE_22_READ */
|
||||
smi_cmd.s.phy_adr = phy_id;
|
||||
smi_cmd.s.reg_adr = regnum;
|
||||
cvmx_write_csr(CVMX_SMIX_CMD(p->unit), smi_cmd.u64);
|
||||
cvmx_write_csr(p->register_base + SMI_CMD, smi_cmd.u64);
|
||||
|
||||
do {
|
||||
/*
|
||||
* Wait 1000 clocks so we don't saturate the RSL bus
|
||||
* doing reads.
|
||||
*/
|
||||
cvmx_wait(1000);
|
||||
smi_rd.u64 = cvmx_read_csr(CVMX_SMIX_RD_DAT(p->unit));
|
||||
__delay(1000);
|
||||
smi_rd.u64 = cvmx_read_csr(p->register_base + SMI_RD_DAT);
|
||||
} while (smi_rd.s.pending && --timeout);
|
||||
|
||||
if (smi_rd.s.val)
|
||||
@@ -62,21 +73,21 @@ static int octeon_mdiobus_write(struct mii_bus *bus, int phy_id,
|
||||
|
||||
smi_wr.u64 = 0;
|
||||
smi_wr.s.dat = val;
|
||||
cvmx_write_csr(CVMX_SMIX_WR_DAT(p->unit), smi_wr.u64);
|
||||
cvmx_write_csr(p->register_base + SMI_WR_DAT, smi_wr.u64);
|
||||
|
||||
smi_cmd.u64 = 0;
|
||||
smi_cmd.s.phy_op = 0; /* MDIO_CLAUSE_22_WRITE */
|
||||
smi_cmd.s.phy_adr = phy_id;
|
||||
smi_cmd.s.reg_adr = regnum;
|
||||
cvmx_write_csr(CVMX_SMIX_CMD(p->unit), smi_cmd.u64);
|
||||
cvmx_write_csr(p->register_base + SMI_CMD, smi_cmd.u64);
|
||||
|
||||
do {
|
||||
/*
|
||||
* Wait 1000 clocks so we don't saturate the RSL bus
|
||||
* doing reads.
|
||||
*/
|
||||
cvmx_wait(1000);
|
||||
smi_wr.u64 = cvmx_read_csr(CVMX_SMIX_WR_DAT(p->unit));
|
||||
__delay(1000);
|
||||
smi_wr.u64 = cvmx_read_csr(p->register_base + SMI_WR_DAT);
|
||||
} while (smi_wr.s.pending && --timeout);
|
||||
|
||||
if (timeout <= 0)
|
||||
@@ -88,38 +99,44 @@ static int octeon_mdiobus_write(struct mii_bus *bus, int phy_id,
|
||||
static int __devinit octeon_mdiobus_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct octeon_mdiobus *bus;
|
||||
struct resource *res_mem;
|
||||
union cvmx_smix_en smi_en;
|
||||
int i;
|
||||
int err = -ENOENT;
|
||||
|
||||
bus = devm_kzalloc(&pdev->dev, sizeof(*bus), GFP_KERNEL);
|
||||
if (!bus)
|
||||
return -ENOMEM;
|
||||
|
||||
/* The platform_device id is our unit number. */
|
||||
bus->unit = pdev->id;
|
||||
res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
|
||||
if (res_mem == NULL) {
|
||||
dev_err(&pdev->dev, "found no memory resource\n");
|
||||
err = -ENXIO;
|
||||
goto fail;
|
||||
}
|
||||
bus->mdio_phys = res_mem->start;
|
||||
bus->regsize = resource_size(res_mem);
|
||||
if (!devm_request_mem_region(&pdev->dev, bus->mdio_phys, bus->regsize,
|
||||
res_mem->name)) {
|
||||
dev_err(&pdev->dev, "request_mem_region failed\n");
|
||||
goto fail;
|
||||
}
|
||||
bus->register_base =
|
||||
(u64)devm_ioremap(&pdev->dev, bus->mdio_phys, bus->regsize);
|
||||
|
||||
bus->mii_bus = mdiobus_alloc();
|
||||
|
||||
if (!bus->mii_bus)
|
||||
goto err;
|
||||
goto fail;
|
||||
|
||||
smi_en.u64 = 0;
|
||||
smi_en.s.en = 1;
|
||||
cvmx_write_csr(CVMX_SMIX_EN(bus->unit), smi_en.u64);
|
||||
|
||||
/*
|
||||
* Standard Octeon evaluation boards don't support phy
|
||||
* interrupts, we need to poll.
|
||||
*/
|
||||
for (i = 0; i < PHY_MAX_ADDR; i++)
|
||||
bus->phy_irq[i] = PHY_POLL;
|
||||
cvmx_write_csr(bus->register_base + SMI_EN, smi_en.u64);
|
||||
|
||||
bus->mii_bus->priv = bus;
|
||||
bus->mii_bus->irq = bus->phy_irq;
|
||||
bus->mii_bus->name = "mdio-octeon";
|
||||
snprintf(bus->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
|
||||
bus->mii_bus->name, bus->unit);
|
||||
snprintf(bus->mii_bus->id, MII_BUS_ID_SIZE, "%llx", bus->register_base);
|
||||
bus->mii_bus->parent = &pdev->dev;
|
||||
|
||||
bus->mii_bus->read = octeon_mdiobus_read;
|
||||
@@ -127,20 +144,18 @@ static int __devinit octeon_mdiobus_probe(struct platform_device *pdev)
|
||||
|
||||
dev_set_drvdata(&pdev->dev, bus);
|
||||
|
||||
err = mdiobus_register(bus->mii_bus);
|
||||
err = of_mdiobus_register(bus->mii_bus, pdev->dev.of_node);
|
||||
if (err)
|
||||
goto err_register;
|
||||
goto fail_register;
|
||||
|
||||
dev_info(&pdev->dev, "Version " DRV_VERSION "\n");
|
||||
|
||||
return 0;
|
||||
err_register:
|
||||
fail_register:
|
||||
mdiobus_free(bus->mii_bus);
|
||||
|
||||
err:
|
||||
devm_kfree(&pdev->dev, bus);
|
||||
fail:
|
||||
smi_en.u64 = 0;
|
||||
cvmx_write_csr(CVMX_SMIX_EN(bus->unit), smi_en.u64);
|
||||
cvmx_write_csr(bus->register_base + SMI_EN, smi_en.u64);
|
||||
return err;
|
||||
}
|
||||
|
||||
@@ -154,14 +169,23 @@ static int __devexit octeon_mdiobus_remove(struct platform_device *pdev)
|
||||
mdiobus_unregister(bus->mii_bus);
|
||||
mdiobus_free(bus->mii_bus);
|
||||
smi_en.u64 = 0;
|
||||
cvmx_write_csr(CVMX_SMIX_EN(bus->unit), smi_en.u64);
|
||||
cvmx_write_csr(bus->register_base + SMI_EN, smi_en.u64);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct of_device_id octeon_mdiobus_match[] = {
|
||||
{
|
||||
.compatible = "cavium,octeon-3860-mdio",
|
||||
},
|
||||
{},
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, octeon_mdiobus_match);
|
||||
|
||||
static struct platform_driver octeon_mdiobus_driver = {
|
||||
.driver = {
|
||||
.name = "mdio-octeon",
|
||||
.owner = THIS_MODULE,
|
||||
.of_match_table = octeon_mdiobus_match,
|
||||
},
|
||||
.probe = octeon_mdiobus_probe,
|
||||
.remove = __devexit_p(octeon_mdiobus_remove),
|
||||
|
||||
Reference in New Issue
Block a user