[U-Boot] [PATCH v4 01/33] pinctrl: Correct build errors in the pinctrl_simple

Simon Glass
2015-08-24T15:12:19Z

There are a few minor tweaks needed to get this to build. Add them so that
the simple pinctrl implementation can be used.

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

Changes in v4: None
Changes in v3: None
Changes in v2: None

drivers/pinctrl/pinctrl-uclass.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c
index 853d779..01b0cf8 100644
--- a/drivers/pinctrl/pinctrl-uclass.c
+++ b/drivers/pinctrl/pinctrl-uclass.c
@@ -6,21 +6,21 @@

#include <common.h>
#include <libfdt.h>
-#include <linux/err.h>
-#include <linux/list.h>
#include <dm/device.h>
#include <dm/lists.h>
#include <dm/pinctrl.h>
#include <dm/uclass.h>
+#include <linux/err.h>
+#include <linux/list.h>

DECLARE_GLOBAL_DATA_PTR;

#if CONFIG_IS_ENABLED(PINCTRL_SIMPLE)

-static int pinctrl_select_state(struct udevice *dev, const char *ignored)
+int pinctrl_select_state(struct udevice *dev, const char *ignored)
{
struct udevice *pctldev;
- struct pinconf_ops *ops;
+ const struct pinctrl_ops *ops;
int ret;

ret = uclass_get_device(UCLASS_PINCTRL, 0, &pctldev);
--
2.5.0.457.gab17608