| Message ID | 1423697580-15354-2-git-send-email-sjg@chromium.org |
|---|---|
| State | Accepted |
| Delegated to: | Simon Glass |
| Headers | show |
On 02/12/2015 12:32 AM, Simon Glass wrote: > With driver model the number of PIO ports is defined by platform data, so > remove it from the header file. > > Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Andreas Bießmann <andreas.devel@googlemail.com> > --- > > Changes in v3: > - Split out the ATMEL_PIO_PORTS change into its own patch > > Changes in v2: None > > arch/arm/include/asm/arch-at91/at91_pio.h | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/arch/arm/include/asm/arch-at91/at91_pio.h b/arch/arm/include/asm/arch-at91/at91_pio.h > index 50464ff..3012278 100644 > --- a/arch/arm/include/asm/arch-at91/at91_pio.h > +++ b/arch/arm/include/asm/arch-at91/at91_pio.h > @@ -114,14 +114,10 @@ typedef union at91_pio { > at91_port_t pioa; > at91_port_t piob; > at91_port_t pioc; > - #if (ATMEL_PIO_PORTS > 3) > - at91_port_t piod; > - #endif > - #if (ATMEL_PIO_PORTS > 4) > - at91_port_t pioe; > - #endif > - } ; > - at91_port_t port[ATMEL_PIO_PORTS]; > + at91_port_t piod; /* not present in all hardware */ > + at91_port_t pioe;/* not present in all hardware */ > + }; > + at91_port_t port[5]; > } at91_pio_t; > > #ifdef CONFIG_AT91_GPIO >
On 12 February 2015 at 02:14, Andreas Bießmann <andreas.devel@googlemail.com> wrote: > On 02/12/2015 12:32 AM, Simon Glass wrote: >> With driver model the number of PIO ports is defined by platform data, so >> remove it from the header file. >> >> Signed-off-by: Simon Glass <sjg@chromium.org> > > Acked-by: Andreas Bießmann <andreas.devel@googlemail.com> Applied to u-boot-dm.
diff --git a/arch/arm/include/asm/arch-at91/at91_pio.h b/arch/arm/include/asm/arch-at91/at91_pio.h index 50464ff..3012278 100644 --- a/arch/arm/include/asm/arch-at91/at91_pio.h +++ b/arch/arm/include/asm/arch-at91/at91_pio.h @@ -114,14 +114,10 @@ typedef union at91_pio { at91_port_t pioa; at91_port_t piob; at91_port_t pioc; - #if (ATMEL_PIO_PORTS > 3) - at91_port_t piod; - #endif - #if (ATMEL_PIO_PORTS > 4) - at91_port_t pioe; - #endif - } ; - at91_port_t port[ATMEL_PIO_PORTS]; + at91_port_t piod; /* not present in all hardware */ + at91_port_t pioe;/* not present in all hardware */ + }; + at91_port_t port[5]; } at91_pio_t; #ifdef CONFIG_AT91_GPIO
With driver model the number of PIO ports is defined by platform data, so remove it from the header file. Signed-off-by: Simon Glass <sjg@chromium.org> --- Changes in v3: - Split out the ATMEL_PIO_PORTS change into its own patch Changes in v2: None arch/arm/include/asm/arch-at91/at91_pio.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)