| Message ID | 20171130004510.23887-6-lukma@denx.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wednesday, November 29, 2017 5:45 PM, Lukasz Majewski wrote: > This patch extends readability of ts72xx.c code. > > Signed-off-by: Lukasz Majewski <lukma@denx.de> > --- > Changes for v2: > - New patch > --- > arch/arm/mach-ep93xx/ts72xx.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) This patch does not apply to linux-next. > diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c index a6e473b3dcf6..2e8fcc6e87b6 100644 > --- a/arch/arm/mach-ep93xx/ts72xx.c > +++ b/arch/arm/mach-ep93xx/ts72xx.c > @@ -28,6 +28,9 @@ > #include "soc.h" > #include "ts72xx.h" > > +/********************************************************************** > +*** > + * IO map > + > +*********************************************************************** > +**/ There is also something funny with the patch. The lines above appear to be getting split incorrectly. The same thing is seen in PATCH 6/6. Please rebase the series against linux-next and I'll take another look at is. Thanks, Hartley
Hello Hartley! On Thu, 30 Nov 2017 17:23:02 +0000 Hartley Sweeten <HartleyS@visionengravers.com> wrote: > > +/********************************************************************** > > +*** > > + * IO map > > + > > +*********************************************************************** > > +**/ > > There is also something funny with the patch. The lines above appear to be getting split incorrectly. That's definitely not the case, I can apply the patch to 4.14 just fine and there is no funny wrapping. But you are right about the rest, it should be re-based.
diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c index a6e473b3dcf6..2e8fcc6e87b6 100644 --- a/arch/arm/mach-ep93xx/ts72xx.c +++ b/arch/arm/mach-ep93xx/ts72xx.c @@ -28,6 +28,9 @@ #include "soc.h" #include "ts72xx.h" +/************************************************************************* + * IO map + *************************************************************************/ static struct map_desc ts72xx_io_desc[] __initdata = { { .virtual = (unsigned long)TS72XX_OPTIONS_VIRT_BASE, @@ -189,6 +192,9 @@ static struct platform_device ts72xx_rtc_device = { .num_resources = ARRAY_SIZE(ts72xx_rtc_resources), }; +/************************************************************************* + * WATCHDOG + *************************************************************************/ static struct resource ts72xx_wdt_resources[] = { DEFINE_RES_MEM(TS72XX_WDT_CONTROL_PHYS_BASE, SZ_4K), DEFINE_RES_MEM(TS72XX_WDT_FEED_PHYS_BASE, SZ_4K), @@ -201,10 +207,16 @@ static struct platform_device ts72xx_wdt_device = { .resource = ts72xx_wdt_resources, }; +/************************************************************************* + * ETH + *************************************************************************/ static struct ep93xx_eth_data __initdata ts72xx_eth_data = { .phy_id = 1, }; +/************************************************************************* + * TS72XX support code + *************************************************************************/ #if IS_ENABLED(CONFIG_FPGA_MGR_TS73XX) /* Relative to EP93XX_CS1_PHYS_BASE */
This patch extends readability of ts72xx.c code. Signed-off-by: Lukasz Majewski <lukma@denx.de> --- Changes for v2: - New patch --- arch/arm/mach-ep93xx/ts72xx.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)