[0/5] fpga: ts73xx and iCE40 support
diff mbox

Message ID 20170227221426.4176-1-atull@kernel.org
State Accepted
Headers show

Commit Message

Alan Tull Feb. 27, 2017, 10:14 p.m. UTC
Hi Greg,

Please take these patches that add FPGA suppport
for ts73xx and iCE0 FPGAs.  I've done small fixups.

drivers/fpga/ice40-spi.c:
 fix printf format s/%ld/%d/ in 2 places

drivers/fpga/ts73xx-fpga.c:
 remove error message in probe. 

More details on the fixups:


Alan

Florian Fainelli (2):
  FPGA: Add TS-7300 FPGA manager
  ARM: ep93xx: Register ts73xx-fpga manager driver for TS-7300

Joel Holdsworth (3):
  of: Add vendor prefix for Lattice Semiconductor
  Documentation: Add binding document for Lattice iCE40 FPGA manager
  fpga: Add support for Lattice iCE40 FPGAs

 .../bindings/fpga/lattice-ice40-fpga-mgr.txt       |  21 +++
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 arch/arm/mach-ep93xx/ts72xx.c                      |  26 +++
 drivers/fpga/Kconfig                               |  13 ++
 drivers/fpga/Makefile                              |   2 +
 drivers/fpga/ice40-spi.c                           | 207 +++++++++++++++++++++
 drivers/fpga/ts73xx-fpga.c                         | 156 ++++++++++++++++
 7 files changed, 426 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/fpga/lattice-ice40-fpga-mgr.txt
 create mode 100644 drivers/fpga/ice40-spi.c
 create mode 100644 drivers/fpga/ts73xx-fpga.c

Patch
diff mbox

diff --git a/drivers/fpga/ice40-spi.c b/drivers/fpga/ice40-spi.c
index 6a4194be9f00..7fca82023062 100644
--- a/drivers/fpga/ice40-spi.c
+++ b/drivers/fpga/ice40-spi.c
@@ -163,14 +163,14 @@  static int ice40_fpga_probe(struct spi_device *spi)
        priv->cdone = devm_gpiod_get(dev, "cdone", GPIOD_IN);
        if (IS_ERR(priv->cdone)) {
                ret = PTR_ERR(priv->cdone);
-               dev_err(dev, "Failed to get CDONE GPIO: %ld\n", ret);
+               dev_err(dev, "Failed to get CDONE GPIO: %d\n", ret);
                return ret;
        }
 
        priv->reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH);
        if (IS_ERR(priv->reset)) {
                ret = PTR_ERR(priv->reset);
-               dev_err(dev, "Failed to get CRESET_B GPIO: %ld\n", ret);
+               dev_err(dev, "Failed to get CRESET_B GPIO: %d\n", ret);
                return ret;
        }
 
diff --git a/drivers/fpga/ts73xx-fpga.c b/drivers/fpga/ts73xx-fpga.c
index 5acdbcfe447b..f6a96b42e2ca 100644
--- a/drivers/fpga/ts73xx-fpga.c
+++ b/drivers/fpga/ts73xx-fpga.c
@@ -117,7 +117,6 @@  static int ts73xx_fpga_probe(struct platform_device *pdev)
        struct device *kdev = &pdev->dev;
        struct ts73xx_fpga_priv *priv;
        struct resource *res;
-       int err;
 
        priv = devm_kzalloc(kdev, sizeof(*priv), GFP_KERNEL);
        if (!priv)
@@ -132,14 +131,8 @@  static int ts73xx_fpga_probe(struct platform_device *pdev)
                return PTR_ERR(priv->io_base);
        }
 
-       err = fpga_mgr_register(kdev, "TS-73xx FPGA Manager",
-                               &ts73xx_fpga_ops, priv);
-       if (err) {
-               dev_err(kdev, "failed to register FPGA manager\n");
-               return err;
-       }
-
-       return err;
+       return fpga_mgr_register(kdev, "TS-73xx FPGA Manager",
+                                &ts73xx_fpga_ops, priv);
 }
 
 static int ts73xx_fpga_remove(struct platform_device *pdev)