| Message ID | 20190212172853.57502-1-christoph.muellner@theobroma-systems.com |
|---|---|
| State | Accepted |
| Commit | 174538845b1490d05a8c97c49088c54f4365551c |
| Delegated to: | Simon Glass |
| Headers | show |
| Series | [U-Boot,v1] dm: pinctrl: Remove obsolete function pinctrl_decode_pin_config_dm(). | expand |
On Tue, 12 Feb 2019 at 18:29, Christoph Muellner <christoph.muellner@theobroma-systems.com> wrote: > > This reverts commit 5ff776889212c080e3d1a33634ac904405ed6845. > > As noted in the comment, the function pinctrl_decode_pin_config_dm() > only served as a temporary solution. > > Since the function has no users anymore, we can remove it again. > > Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com> > > --- > > drivers/pinctrl/pinctrl-uclass.c | 22 ---------------------- > include/dm/pinctrl.h | 12 ------------ > 2 files changed, 34 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
Hi Simon, any plans to get this merged? Thanks, Christoph > On 14.02.2019, at 02:54, Simon Glass <sjg@chromium.org> wrote: > > On Tue, 12 Feb 2019 at 18:29, Christoph Muellner > <christoph.muellner@theobroma-systems.com> wrote: >> >> This reverts commit 5ff776889212c080e3d1a33634ac904405ed6845. >> >> As noted in the comment, the function pinctrl_decode_pin_config_dm() >> only served as a temporary solution. >> >> Since the function has no users anymore, we can remove it again. >> >> Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com> >> >> --- >> >> drivers/pinctrl/pinctrl-uclass.c | 22 ---------------------- >> include/dm/pinctrl.h | 12 ------------ >> 2 files changed, 34 deletions(-) > > Reviewed-by: Simon Glass <sjg@chromium.org>
Hi, On Fri, 5 Apr 2019 at 05:43, Christoph Müllner <christoph.muellner@theobroma-systems.com> wrote: > > Hi Simon, > > any plans to get this merged? Yes, Kever should do it. - Simon > > Thanks, > Christoph > > > On 14.02.2019, at 02:54, Simon Glass <sjg@chromium.org> wrote: > > > > On Tue, 12 Feb 2019 at 18:29, Christoph Muellner > > <christoph.muellner@theobroma-systems.com> wrote: > >> > >> This reverts commit 5ff776889212c080e3d1a33634ac904405ed6845. > >> > >> As noted in the comment, the function pinctrl_decode_pin_config_dm() > >> only served as a temporary solution. > >> > >> Since the function has no users anymore, we can remove it again. > >> > >> Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com> > >> > >> --- > >> > >> drivers/pinctrl/pinctrl-uclass.c | 22 ---------------------- > >> include/dm/pinctrl.h | 12 ------------ > >> 2 files changed, 34 deletions(-) > > > > Reviewed-by: Simon Glass <sjg@chromium.org> >
Hi Simon, On 05/09/2019 11:52 AM, Simon Glass wrote: > Hi, > > On Fri, 5 Apr 2019 at 05:43, Christoph Müllner > <christoph.muellner@theobroma-systems.com> wrote: >> Hi Simon, >> >> any plans to get this merged? > Yes, Kever should do it. OK, I will take this. I didn't notice this before you send this patch, it does not in rockchip related files and look like it delegate to your name, while the origin patch(need to revert) is from rockchip tree. Please cc me if there are similar case, or else I may miss it. Thanks, - Kever > > - Simon > >> Thanks, >> Christoph >> >>> On 14.02.2019, at 02:54, Simon Glass <sjg@chromium.org> wrote: >>> >>> On Tue, 12 Feb 2019 at 18:29, Christoph Muellner >>> <christoph.muellner@theobroma-systems.com> wrote: >>>> This reverts commit 5ff776889212c080e3d1a33634ac904405ed6845. >>>> >>>> As noted in the comment, the function pinctrl_decode_pin_config_dm() >>>> only served as a temporary solution. >>>> >>>> Since the function has no users anymore, we can remove it again. >>>> >>>> Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com> >>>> >>>> --- >>>> >>>> drivers/pinctrl/pinctrl-uclass.c | 22 ---------------------- >>>> include/dm/pinctrl.h | 12 ------------ >>>> 2 files changed, 34 deletions(-) >>> Reviewed-by: Simon Glass <sjg@chromium.org>
Hi Christoph, Could you re-send this patch with re-base on top of master, because there is a conflict when I try to merge it. Thanks, - Kever On 05/09/2019 11:52 AM, Simon Glass wrote: > Hi, > > On Fri, 5 Apr 2019 at 05:43, Christoph Müllner > <christoph.muellner@theobroma-systems.com> wrote: >> Hi Simon, >> >> any plans to get this merged? > Yes, Kever should do it. > > - Simon > >> Thanks, >> Christoph >> >>> On 14.02.2019, at 02:54, Simon Glass <sjg@chromium.org> wrote: >>> >>> On Tue, 12 Feb 2019 at 18:29, Christoph Muellner >>> <christoph.muellner@theobroma-systems.com> wrote: >>>> This reverts commit 5ff776889212c080e3d1a33634ac904405ed6845. >>>> >>>> As noted in the comment, the function pinctrl_decode_pin_config_dm() >>>> only served as a temporary solution. >>>> >>>> Since the function has no users anymore, we can remove it again. >>>> >>>> Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com> >>>> >>>> --- >>>> >>>> drivers/pinctrl/pinctrl-uclass.c | 22 ---------------------- >>>> include/dm/pinctrl.h | 12 ------------ >>>> 2 files changed, 34 deletions(-) >>> Reviewed-by: Simon Glass <sjg@chromium.org>
Hi Christoph, Could you re-send this patch with re-base on top of master, because there is a conflict when I try to merge it. Thanks, - Kever On 05/09/2019 11:52 AM, Simon Glass wrote: > Hi, > > On Fri, 5 Apr 2019 at 05:43, Christoph Müllner > <christoph.muellner@theobroma-systems.com> wrote: >> Hi Simon, >> >> any plans to get this merged? > Yes, Kever should do it. > > - Simon > >> Thanks, >> Christoph >> >>> On 14.02.2019, at 02:54, Simon Glass <sjg@chromium.org> wrote: >>> >>> On Tue, 12 Feb 2019 at 18:29, Christoph Muellner >>> <christoph.muellner@theobroma-systems.com> wrote: >>>> This reverts commit 5ff776889212c080e3d1a33634ac904405ed6845. >>>> >>>> As noted in the comment, the function pinctrl_decode_pin_config_dm() >>>> only served as a temporary solution. >>>> >>>> Since the function has no users anymore, we can remove it again. >>>> >>>> Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com> >>>> >>>> --- >>>> >>>> drivers/pinctrl/pinctrl-uclass.c | 22 ---------------------- >>>> include/dm/pinctrl.h | 12 ------------ >>>> 2 files changed, 34 deletions(-) >>> Reviewed-by: Simon Glass <sjg@chromium.org>
Hi Kever, sorry for the delay. Will do within the next couple of days. Thanks, Christoph On 09.05.19 12:46, Kever Yang wrote: > Hi Christoph, > > Could you re-send this patch with re-base on top of master, > > because there is a conflict when I try to merge it. > > > Thanks, > - Kever > On 05/09/2019 11:52 AM, Simon Glass wrote: >> Hi, >> >> On Fri, 5 Apr 2019 at 05:43, Christoph Müllner >> <christoph.muellner@theobroma-systems.com> wrote: >>> Hi Simon, >>> >>> any plans to get this merged? >> Yes, Kever should do it. >> >> - Simon >> >>> Thanks, >>> Christoph >>> >>>> On 14.02.2019, at 02:54, Simon Glass <sjg@chromium.org> wrote: >>>> >>>> On Tue, 12 Feb 2019 at 18:29, Christoph Muellner >>>> <christoph.muellner@theobroma-systems.com> wrote: >>>>> This reverts commit 5ff776889212c080e3d1a33634ac904405ed6845. >>>>> >>>>> As noted in the comment, the function pinctrl_decode_pin_config_dm() >>>>> only served as a temporary solution. >>>>> >>>>> Since the function has no users anymore, we can remove it again. >>>>> >>>>> Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com> >>>>> >>>>> --- >>>>> >>>>> drivers/pinctrl/pinctrl-uclass.c | 22 ---------------------- >>>>> include/dm/pinctrl.h | 12 ------------ >>>>> 2 files changed, 34 deletions(-) >>>> Reviewed-by: Simon Glass <sjg@chromium.org> > > >
diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c index 0e3260afd1..6db0445067 100644 --- a/drivers/pinctrl/pinctrl-uclass.c +++ b/drivers/pinctrl/pinctrl-uclass.c @@ -27,28 +27,6 @@ int pinctrl_decode_pin_config(const void *blob, int node) return flags; } -/* - * TODO: this function is temporary for v2019.01. - * It should be renamed to pinctrl_decode_pin_config(), - * the original pinctrl_decode_pin_config() function should - * be removed and all callers of the original function should - * be migrated to use the new one. - */ -int pinctrl_decode_pin_config_dm(struct udevice *dev) -{ - int pinconfig = 0; - - if (dev->uclass->uc_drv->id != UCLASS_PINCONFIG) - return -EINVAL; - - if (dev_read_bool(dev, "bias-pull-up")) - pinconfig |= 1 << PIN_CONFIG_BIAS_PULL_UP; - else if (dev_read_bool(dev, "bias-pull-down")) - pinconfig |= 1 << PIN_CONFIG_BIAS_PULL_DOWN; - - return pinconfig; -} - #if CONFIG_IS_ENABLED(PINCTRL_FULL) /** * pinctrl_config_one() - apply pinctrl settings for a single node diff --git a/include/dm/pinctrl.h b/include/dm/pinctrl.h index ff2b82e7c2..63a7d55b88 100644 --- a/include/dm/pinctrl.h +++ b/include/dm/pinctrl.h @@ -355,18 +355,6 @@ int pinctrl_get_periph_id(struct udevice *dev, struct udevice *periph); int pinctrl_decode_pin_config(const void *blob, int node); /** - * pinctrl_decode_pin_config_dm() - decode pin configuration flags - * - * This decodes some of the PIN_CONFIG values into flags, with each value - * being (1 << pin_cfg). This does not support things with values like the - * slew rate. - * - * @pinconfig: Pinconfig udevice - * @return decoded flag value, or -ve on error - */ -int pinctrl_decode_pin_config_dm(struct udevice *dev); - -/** * pinctrl_get_gpio_mux() - get the mux value for a particular GPIO * * This allows the raw mux value for a GPIO to be obtained. It is
This reverts commit 5ff776889212c080e3d1a33634ac904405ed6845. As noted in the comment, the function pinctrl_decode_pin_config_dm() only served as a temporary solution. Since the function has no users anymore, we can remove it again. Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com> --- drivers/pinctrl/pinctrl-uclass.c | 22 ---------------------- include/dm/pinctrl.h | 12 ------------ 2 files changed, 34 deletions(-)