[PATCH 3/7] ARM: ux500: Standardise Pinctrl compatible string for Nomadik based platforms

Linus Walleij linus.walleij at linaro.org
Tue May 28 10:25:55 EDT 2013


On Wed, May 22, 2013 at 4:22 PM, Lee Jones <lee.jones at linaro.org> wrote:

> Signed-off-by: Lee Jones <lee.jones at linaro.org>
> ---
>  arch/arm/mach-nomadik/cpu-8815.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-nomadik/cpu-8815.c b/arch/arm/mach-nomadik/cpu-8815.c
> index 59f6ff5..316fe82 100644
> --- a/arch/arm/mach-nomadik/cpu-8815.c
> +++ b/arch/arm/mach-nomadik/cpu-8815.c
> @@ -288,7 +288,7 @@ static struct of_dev_auxdata cpu8815_auxdata_lookup[] __initdata = {
>                 "gpio.2", NULL),
>         OF_DEV_AUXDATA("st,nomadik-gpio", NOMADIK_GPIO3_BASE,
>                 "gpio.3", NULL),
> -       OF_DEV_AUXDATA("stericsson,nmk-pinctrl-stn8815", 0,
> +       OF_DEV_AUXDATA("stericsson,stn8815-pinctrl", 0,
>                 "pinctrl-stn8815", NULL),
>         OF_DEV_AUXDATA("arm,primecell", NOMADIK_UART0_BASE,
>                 "uart0", NULL),

I've dropped this platform data in the HEAD (now also in ARM SoC)
after moving the pinctrl configuration to the DTS, so this no longer
applies.

Yours,
Linus Walleij



More information about the linux-arm-kernel mailing list