| Message ID | 1440429171-2555-2-git-send-email-sjg@chromium.org |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
+Masahiro On 24 August 2015 at 09:12, Simon Glass <sjg@chromium.org> wrote: > 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 >
2015-08-25 0:31 GMT+09:00 Simon Glass <sjg@chromium.org>: > +Masahiro > > > On 24 August 2015 at 09:12, Simon Glass <sjg@chromium.org> wrote: >> 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); This was fixed in my v4. You can drop this unless you want to sort includes. (although I am not a fan of putting <linux/*> at the bottom)
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);
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(-)