From: plagnioj@jcrosoft•com (Jean-Christophe PLAGNIOL-VILLARD)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 02/10] arm: at91: move platfarm_data to include/linux/platform_data/atmel.h
Date: Mon, 12 Nov 2012 15:06:46 +0100 [thread overview]
Message-ID: <20121112140646.GK4576@game.jcrosoft.org> (raw)
In-Reply-To: <CAGhQ9VxgbCGzOPVtQq-LYsEPuyyGjRDfB3jHPtvbHr1xLgntXA@mail.gmail.com>
On 11:54 Sat 10 Nov , Joachim Eastwood wrote:
> Hi Jean-Christophe,
>
> On 7 November 2012 12:22, Jean-Christophe PLAGNIOL-VILLARD
> <plagnioj@jcrosoft•com> wrote:
> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft•com>
> > Cc: Nicolas Ferre <nicolas.ferre@atmel•com>
> > Cc: linux-ide at vger.kernel.org
> > Cc: linux-input at vger.kernel.org
> > Cc: linux-mmc at vger.kernel.org
> > Cc: linux-can at vger.kernel.org
> > Cc: netdev at vger.kernel.org
> > Cc: linux-pcmcia at lists.infradead.org
> > Cc: rtc-linux at googlegroups.com
> > Cc: spi-devel-general at lists.sourceforge.net
> > Cc: linux-serial at vger.kernel.org
> > Cc: linux-usb at vger.kernel.org
> > Cc: linux-fbdev at vger.kernel.org
> > ---
> > HI all,
> >
> > If it's ok with everyone this will go via at91
> > with the patch serie than clean up the include/mach
> >
> > For preparation to switch to arm multiarch kernel
> >
> > Best Regards,
> > J.
> > arch/arm/mach-at91/include/mach/board.h | 55 ----------------------
> > arch/avr32/mach-at32ap/include/mach/board.h | 7 ---
> > drivers/ata/pata_at91.c | 2 +-
> > drivers/input/touchscreen/atmel_tsadcc.c | 2 +-
> > drivers/mmc/host/atmel-mci.c | 2 +-
> > drivers/net/can/at91_can.c | 3 +-
> > drivers/net/ethernet/cadence/at91_ether.c | 2 +-
> > drivers/pcmcia/at91_cf.c | 2 +-
> > drivers/rtc/rtc-at91sam9.c | 2 +-
> > drivers/spi/spi-atmel.c | 2 +-
> > drivers/tty/serial/atmel_serial.c | 2 +-
> > drivers/usb/gadget/at91_udc.c | 2 +-
> > drivers/usb/gadget/atmel_usba_udc.c | 2 +-
> > drivers/usb/host/ohci-at91.c | 2 +-
> > drivers/video/atmel_lcdfb.c | 2 +-
> > include/linux/platform_data/atmel.h | 67 +++++++++++++++++++++++++++
> > 16 files changed, 80 insertions(+), 76 deletions(-)
>
> <snip>
>
> > diff --git a/drivers/net/ethernet/cadence/at91_ether.c b/drivers/net/ethernet/cadence/at91_ether.c
> > index 4e980a7..35fc6edb 100644
> > --- a/drivers/net/ethernet/cadence/at91_ether.c
> > +++ b/drivers/net/ethernet/cadence/at91_ether.c
> > @@ -31,6 +31,7 @@
> > #include <linux/clk.h>
> > #include <linux/gfp.h>
> > #include <linux/phy.h>
> > +#include <linux/platform_data/atmel.h>
> >
> > #include <asm/io.h>
> > #include <asm/uaccess.h>
> > @@ -38,7 +39,6 @@
> >
> > #include <mach/at91rm9200_emac.h>
> > #include <asm/gpio.h>
> > -#include <mach/board.h>
> >
> > #include "at91_ether.h"
>
> The at91_ether driver in net-next does not need to be change since it
> all mach includes has already been removed by other patches and it
> includes linux/platform_data/macb.h directly.
>
> What tree was these patches based on?
> The at91_ether driver changes has been in linux-next for a long while now.
the conflict is minor easy to handle and the cleanup need to go first on arm soc so this is
based on rc3
Best Regards,
J.
next prev parent reply other threads:[~2012-11-12 14:06 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-07 11:12 arm: at91: mach header cleanup Jean-Christophe PLAGNIOL-VILLARD
2012-11-07 11:22 ` [PATCH 01/10] arm: at91: drop machine defconfig Jean-Christophe PLAGNIOL-VILLARD
2012-11-07 11:22 ` [PATCH 02/10] arm: at91: move platfarm_data to include/linux/platform_data/atmel.h Jean-Christophe PLAGNIOL-VILLARD
2012-11-07 12:20 ` Marc Kleine-Budde
2012-11-10 8:42 ` Dmitry Torokhov
2012-11-10 10:54 ` Joachim Eastwood
2012-11-12 14:06 ` Jean-Christophe PLAGNIOL-VILLARD [this message]
2012-11-07 11:22 ` [PATCH 03/10] arm: at91 move board.h to arch/arm/mach-at91 Jean-Christophe PLAGNIOL-VILLARD
2012-11-07 11:22 ` [PATCH 04/10] arm: at91 move at91_aic.h " Jean-Christophe PLAGNIOL-VILLARD
2012-11-07 11:22 ` [PATCH 05/10] arn: at91: move at91_tc.h " Jean-Christophe PLAGNIOL-VILLARD
2012-11-12 10:57 ` Nicolas Ferre
2012-11-07 11:22 ` [PATCH 06/10] arm: at91: move board header " Jean-Christophe PLAGNIOL-VILLARD
2012-11-07 11:22 ` [PATCH 07/10] arm: at91: move at91_shdwc.h " Jean-Christophe PLAGNIOL-VILLARD
2012-11-07 11:22 ` [PATCH 08/10] arm: at91: move pit define to the driver Jean-Christophe PLAGNIOL-VILLARD
2012-11-07 11:22 ` [PATCH 09/10] arm: at91: move reset controller header to arm/arm/mach-at91 Jean-Christophe PLAGNIOL-VILLARD
2012-11-07 11:22 ` [PATCH 10/10] arm: at91: move at91rm9200 rtc header in drivers/rtc Jean-Christophe PLAGNIOL-VILLARD
2012-11-12 21:47 ` arm: at91: mach header cleanup Arnd Bergmann
2012-11-17 15:32 ` Joachim Eastwood
2012-11-17 22:02 ` Jean-Christophe PLAGNIOL-VILLARD
2012-11-17 22:05 ` [PATCH 1/1] atmel: move ATMEL_MAX_UART to platform_data/atmel.h Jean-Christophe PLAGNIOL-VILLARD
2012-11-19 9:09 ` Nicolas Ferre
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121112140646.GK4576@game.jcrosoft.org \
--to=plagnioj@jcrosoft$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox