| Message ID | 1418994659-5222-2-git-send-email-padma.v@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 19.12.2014 22:10, Padmavathi Venna wrote: > Audio IPs on Exynos7 require gpios available in AUDIO > pin controller block. So adding the AUDIO pinctrl support. > > Signed-off-by: Padmavathi Venna <padma.v@samsung.com> > --- > .../bindings/pinctrl/samsung-pinctrl.txt | 1 + > drivers/pinctrl/samsung/pinctrl-exynos.c | 10 ++++++++++ > 2 files changed, 11 insertions(+), 0 deletions(-) Acked-by: Tomasz Figa <tomasz.figa@gmail.com> Best regards, Tomasz
On Fri, Dec 19, 2014 at 2:10 PM, Padmavathi Venna <padma.v@samsung.com> wrote: > Audio IPs on Exynos7 require gpios available in AUDIO > pin controller block. So adding the AUDIO pinctrl support. > > Signed-off-by: Padmavathi Venna <padma.v@samsung.com> (...) > --- a/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt > +++ b/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt > @@ -181,6 +181,7 @@ Aliases for controllers compatible with "samsung,exynos7-pinctrl": > - pinctrl6: pin controller of FSYS0 block, > - pinctrl7: pin controller of FSYS1 block, > - pinctrl8: pin controller of BUS1 block, > +- pinctrl9: pin controller of AUDIO block, This doesn't apply at all, the list has never been in the document merged upstream. Please prepare this patch rebased on a *CLEAN* upstream tree and resend. Include Tomasz ACK on your repost. Yours, Linus Walleij
Hi Linus, 2015-01-14 20:40 GMT+09:00 Linus Walleij <linus.walleij@linaro.org>: > On Fri, Dec 19, 2014 at 2:10 PM, Padmavathi Venna <padma.v@samsung.com> wrote: > >> Audio IPs on Exynos7 require gpios available in AUDIO >> pin controller block. So adding the AUDIO pinctrl support. >> >> Signed-off-by: Padmavathi Venna <padma.v@samsung.com> > (...) >> --- a/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt >> +++ b/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt >> @@ -181,6 +181,7 @@ Aliases for controllers compatible with "samsung,exynos7-pinctrl": >> - pinctrl6: pin controller of FSYS0 block, >> - pinctrl7: pin controller of FSYS1 block, >> - pinctrl8: pin controller of BUS1 block, >> +- pinctrl9: pin controller of AUDIO block, > > This doesn't apply at all, the list has never been in the document merged > upstream. I believe this patch depends on patch [1], which was mentioned in cover letter and which you seem to have applied two days ago. If it still doesn't apply, please let me know if I should collect the patches myself and prepare a pull request for you. [1] https://patchwork.kernel.org/patch/5467321/ Best regards, Tomasz
On Wed, Jan 14, 2015 at 3:27 PM, Tomasz Figa <tomasz.figa@gmail.com> wrote: > 2015-01-14 20:40 GMT+09:00 Linus Walleij <linus.walleij@linaro.org>: >> On Fri, Dec 19, 2014 at 2:10 PM, Padmavathi Venna <padma.v@samsung.com> wrote: >> >>> Audio IPs on Exynos7 require gpios available in AUDIO >>> pin controller block. So adding the AUDIO pinctrl support. >>> >>> Signed-off-by: Padmavathi Venna <padma.v@samsung.com> >> (...) >>> --- a/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt >>> +++ b/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt >>> @@ -181,6 +181,7 @@ Aliases for controllers compatible with "samsung,exynos7-pinctrl": >>> - pinctrl6: pin controller of FSYS0 block, >>> - pinctrl7: pin controller of FSYS1 block, >>> - pinctrl8: pin controller of BUS1 block, >>> +- pinctrl9: pin controller of AUDIO block, >> >> This doesn't apply at all, the list has never been in the document merged >> upstream. > > I believe this patch depends on patch [1], which was mentioned in > cover letter and which you seem to have applied two days ago. If it > still doesn't apply, please let me know if I should collect the > patches myself and prepare a pull request for you. > > [1] https://patchwork.kernel.org/patch/5467321/ It applied when I tried it now, sorry I must have screwed up or something :( Patch applied! Yours, Linus Walleij
diff --git a/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt index c88ba35..9d2a995 100644 --- a/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt @@ -181,6 +181,7 @@ Aliases for controllers compatible with "samsung,exynos7-pinctrl": - pinctrl6: pin controller of FSYS0 block, - pinctrl7: pin controller of FSYS1 block, - pinctrl8: pin controller of BUS1 block, +- pinctrl9: pin controller of AUDIO block, Example: A pin-controller node with pin banks: diff --git a/drivers/pinctrl/samsung/pinctrl-exynos.c b/drivers/pinctrl/samsung/pinctrl-exynos.c index 2a85cb4..c8f83f9 100644 --- a/drivers/pinctrl/samsung/pinctrl-exynos.c +++ b/drivers/pinctrl/samsung/pinctrl-exynos.c @@ -1314,6 +1314,11 @@ static const struct samsung_pin_bank_data exynos7_pin_banks8[] __initconst = { EXYNOS_PIN_BANK_EINTG(3, 0x140, "gpv6", 0x24), }; +static const struct samsung_pin_bank_data exynos7_pin_banks9[] __initconst = { + EXYNOS_PIN_BANK_EINTG(7, 0x000, "gpz0", 0x00), + EXYNOS_PIN_BANK_EINTG(4, 0x020, "gpz1", 0x04), +}; + const struct samsung_pin_ctrl exynos7_pin_ctrl[] __initconst = { { /* pin-controller instance 0 Alive data */ @@ -1361,5 +1366,10 @@ const struct samsung_pin_ctrl exynos7_pin_ctrl[] __initconst = { .pin_banks = exynos7_pin_banks8, .nr_banks = ARRAY_SIZE(exynos7_pin_banks8), .eint_gpio_init = exynos_eint_gpio_init, + }, { + /* pin-controller instance 9 AUD data */ + .pin_banks = exynos7_pin_banks9, + .nr_banks = ARRAY_SIZE(exynos7_pin_banks9), + .eint_gpio_init = exynos_eint_gpio_init, }, };
Audio IPs on Exynos7 require gpios available in AUDIO pin controller block. So adding the AUDIO pinctrl support. Signed-off-by: Padmavathi Venna <padma.v@samsung.com> --- .../bindings/pinctrl/samsung-pinctrl.txt | 1 + drivers/pinctrl/samsung/pinctrl-exynos.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 0 deletions(-)