commit 90a28470fc11c86c64b8f413d23a5c8fcff45a04
author Simon Glass <sjg@chromium.org> Thu Jan 21 19:44:12 2016 -0700
committer Simon Glass <sjg@chromium.org> Thu Jan 21 20:42:36 2016 -0700
tree 1dfe8622bc8f0334b1f192fddab90ffa359f9a2a
parent e15af8e2cdb169b59945145a118a344b52d0ffa2

rockchip: spi: Remove the explicit pinctrl setting

The correct pinctrl is handled automatically so we don't need to do it in
the driver. The exception is when we want to use a different chip select
(other than 0). But this isn't used at present.

Signed-off-by: Simon Glass <sjg@chromium.org>

drivers/spi/rk_spi.c

diff --git a/drivers/spi/rk_spi.c b/drivers/spi/rk_spi.c
index 412fa8b..9eff423 100644
--- a/drivers/spi/rk_spi.c
+++ b/drivers/spi/rk_spi.c
@@ -27,8 +27,6 @@
 #define DEBUG_RK_SPI	0
 
 struct rockchip_spi_platdata {
-	int periph_id;
-	struct udevice *pinctrl;
 	s32 frequency;		/* Default clock frequency, -1 for none */
 	fdt_addr_t base;
 	uint deactivate_delay_us;	/* Delay to wait after deactivate */
@@ -139,17 +137,7 @@
 	int ret;
 
 	plat->base = dev_get_addr(bus);
-	ret = uclass_get_device(UCLASS_PINCTRL, 0, &plat->pinctrl);
-	if (ret)
-		return ret;
-	ret = pinctrl_get_periph_id(plat->pinctrl, bus);
 
-	if (ret < 0) {
-		debug("%s: Could not get peripheral ID for %s: %d\n", __func__,
-		      bus->name, ret);
-		return ret;
-	}
-	plat->periph_id = ret;
 	ret = clk_get_by_index(bus, 0, &priv->clk);
 	if (ret < 0) {
 		debug("%s: Could not get clock for %s: %d\n", __func__,
@@ -164,8 +152,8 @@
 					"spi-deactivate-delay", 0);
 	plat->activate_delay_us = fdtdec_get_int(blob, node,
 						 "spi-activate-delay", 0);
-	debug("%s: base=%x, periph_id=%d, max-frequency=%d, deactivate_delay=%d\n",
-	      __func__, (uint)plat->base, plat->periph_id, plat->frequency,
+	debug("%s: base=%x, max-frequency=%d, deactivate_delay=%d\n",
+	      __func__, (uint)plat->base, plat->frequency,
 	      plat->deactivate_delay_us);
 
 	return 0;
@@ -207,11 +195,6 @@
 	struct rockchip_spi *regs = priv->regs;
 	u8 spi_dfs, spi_tf;
 	uint ctrlr0;
-#if !CONFIG_IS_ENABLED(PINCTRL_FULL)
-	struct rockchip_spi_platdata *plat = dev_get_platdata(bus);
-	struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev);
-	int ret;
-#endif
 
 	/* Disable the SPI hardware */
 	rkspi_enable_chip(regs, 0);
@@ -273,13 +256,6 @@
 	ctrlr0 |= (priv->tmode & TMOD_MASK) << TMOD_SHIFT;
 
 	writel(ctrlr0, &regs->ctrlr0);
-#if !CONFIG_IS_ENABLED(PINCTRL_FULL)
-	ret = pinctrl_request(plat->pinctrl, plat->periph_id, slave_plat->cs);
-	if (ret) {
-		debug("%s: Cannot request pinctrl: %d\n", __func__, ret);
-		return ret;
-	}
-#endif
 
 	return 0;
 }