| Message ID | 1359816246-3979-2-git-send-email-acourbot@nvidia.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, Feb 2, 2013 at 10:44 PM, Alexandre Courbot <acourbot@nvidia.com> wrote: > GPIO address space reservation during early platform initialization is > not needed anymore for Tosa. Remove the calls to gpiochip_reserve() > which is due to be removed. > > Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> > --- > arch/arm/mach-pxa/tosa.c | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c > index 9e7998d..3d91d2e 100644 > --- a/arch/arm/mach-pxa/tosa.c > +++ b/arch/arm/mach-pxa/tosa.c > @@ -927,8 +927,6 @@ static void tosa_restart(char mode, const char *cmd) > > static void __init tosa_init(void) > { > - int dummy; > - > pxa2xx_mfp_config(ARRAY_AND_SIZE(tosa_pin_config)); > > pxa_set_ffuart_info(NULL); > @@ -947,10 +945,6 @@ static void __init tosa_init(void) > /* enable batt_fault */ > PMCR = 0x01; > > - dummy = gpiochip_reserve(TOSA_SCOOP_GPIO_BASE, 12); > - dummy = gpiochip_reserve(TOSA_SCOOP_JC_GPIO_BASE, 12); > - dummy = gpiochip_reserve(TOSA_TC6393XB_GPIO_BASE, 16); > - > pxa_set_mci_info(&tosa_mci_platform_data); > pxa_set_ficp_info(&tosa_ficp_platform_data); > pxa_set_i2c_info(NULL); > -- > 1.8.1.1 > Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com> Linus, Could you help to merge this patch into your gpio git tree? I think that both of them should go through one git tree. Regards Haojian
On Sun, Feb 3, 2013 at 1:29 AM, Haojian Zhuang <haojian.zhuang@gmail.com> wrote: > Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com> Thanks! > Linus, > > Could you help to merge this patch into your gpio git tree? I think > that both of them should go through one git tree. Yep, already merged it. Yours, Linus Walleij
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index 9e7998d..3d91d2e 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c @@ -927,8 +927,6 @@ static void tosa_restart(char mode, const char *cmd) static void __init tosa_init(void) { - int dummy; - pxa2xx_mfp_config(ARRAY_AND_SIZE(tosa_pin_config)); pxa_set_ffuart_info(NULL); @@ -947,10 +945,6 @@ static void __init tosa_init(void) /* enable batt_fault */ PMCR = 0x01; - dummy = gpiochip_reserve(TOSA_SCOOP_GPIO_BASE, 12); - dummy = gpiochip_reserve(TOSA_SCOOP_JC_GPIO_BASE, 12); - dummy = gpiochip_reserve(TOSA_TC6393XB_GPIO_BASE, 16); - pxa_set_mci_info(&tosa_mci_platform_data); pxa_set_ficp_info(&tosa_ficp_platform_data); pxa_set_i2c_info(NULL);
GPIO address space reservation during early platform initialization is not needed anymore for Tosa. Remove the calls to gpiochip_reserve() which is due to be removed. Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> --- arch/arm/mach-pxa/tosa.c | 6 ------ 1 file changed, 6 deletions(-)