[GIT PULL] efm32 cleanups for next

[GIT PULL] efm32 cleanups for next

[Uwe Kleine-König]

Hello,

the following changes since commit 11d73c56b96b4297bd96273e9a22b7c72d13f1fa:

  Merge tag 'dropmachtimexh-v2' of git://git.pengutronix.de/git/ukl/linux into next/cleanup (2014-02-18 22:19:33 -0800)

are available in the git repository at:

  git://git.pengutronix.de/git/ukl/linux.git tags/efm32-next

for you to fetch changes up to c72b549182841e3ce3e4849cd7c9b178615f8224:

  ARM: efm32: drop unused file <mach/timex.h> (2014-02-19 11:50:52 +0100)

----------------------------------------------------------------
Just two simple cleanups for efm32 removing two now unused files.

----------------------------------------------------------------
Uwe Kleine-K?nig (2):
      ARM: efm32: drop unused file entry-macro.S
      ARM: efm32: drop unused file <mach/timex.h>

These changes are trivial enough that I don't expect any opposition, 
so they come at once in the form of a pull request. I will send the two
patches as reply to this mail anyhow.

Best regards
Uwe

 arch/arm/mach-efm32/include/mach/entry-macro.S | 4 ----
 arch/arm/mach-efm32/include/mach/timex.h       | 3 ---
 2 files changed, 7 deletions(-)
 delete mode 100644 arch/arm/mach-efm32/include/mach/entry-macro.S
 delete mode 100644 arch/arm/mach-efm32/include/mach/timex.h

-- 
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[PATCH 1/2] ARM: efm32: drop unused file entry-macro.S

[Uwe Kleine-König]

This file is unused since commit

	e6d159cdf9f7 (ARM: 7890/1: v7-M: drop using mach/entry-macro.S)

which went into v3.14-rc1.

Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
---
 arch/arm/mach-efm32/include/mach/entry-macro.S | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 arch/arm/mach-efm32/include/mach/entry-macro.S

diff --git a/arch/arm/mach-efm32/include/mach/entry-macro.S b/arch/arm/mach-efm32/include/mach/entry-macro.S
deleted file mode 100644
index 322159d5ed91..000000000000
--- a/arch/arm/mach-efm32/include/mach/entry-macro.S
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * Empty file waiting for deletion once <mach/entry-macro.S> isn't needed any
- * more. Patch "ARM: v7-M: drop using mach/entry-macro.S" sitting in next.
- */
-- 
1.8.5.3

[PATCH 2/2] ARM: efm32: drop unused file <mach/timex.h>

[Uwe Kleine-König]

This file is unused since commit

	79f08d9ed217 (ARM: drop <mach/timex.h> for !ARCH_MULTIPLATFORM, too)

.

Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
---
 arch/arm/mach-efm32/include/mach/timex.h | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 arch/arm/mach-efm32/include/mach/timex.h

diff --git a/arch/arm/mach-efm32/include/mach/timex.h b/arch/arm/mach-efm32/include/mach/timex.h
deleted file mode 100644
index 7a8b26da6599..000000000000
--- a/arch/arm/mach-efm32/include/mach/timex.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/*
- * Empty file waiting for deletion once <mach/timex.h> isn't needed any more.
- */
-- 
1.8.5.3

[GIT PULL v2] efm32 cleanups for next

[Uwe Kleine-König]

Hello,

this pull request superseeds the earlier request this mail is a reply
to. Compared to the original one I added another cleanup. Here come the
full details:

The following changes since commit 11d73c56b96b4297bd96273e9a22b7c72d13f1fa:

  Merge tag 'dropmachtimexh-v2' of git://git.pengutronix.de/git/ukl/linux into next/cleanup (2014-02-18 22:19:33 -0800)

are available in the git repository at:

  git://git.pengutronix.de/git/ukl/linux.git tags/efm32-next

for you to fetch changes up to f41b0482d5c1fc05234d54d58931a606ec7a97a2:

  ARM: efm32: drop selecting CLKSRC_MMIO (2014-02-20 09:56:18 +0100)

----------------------------------------------------------------
Just three simple cleanups for efm32 removing two now unused files and a
superflous select by ARCH_EFM32.

----------------------------------------------------------------
BTW, I based this on armsoc/cleanup because this is the first commit
that allows to remove efm32's <mach/timex.h> (which is the last one in
the tree).

Uwe Kleine-K?nig (3):
      ARM: efm32: drop unused file entry-macro.S
      ARM: efm32: drop unused file <mach/timex.h>
      ARM: efm32: drop selecting CLKSRC_MMIO

 arch/arm/Kconfig                               | 3 ---
 arch/arm/mach-efm32/include/mach/entry-macro.S | 4 ----
 arch/arm/mach-efm32/include/mach/timex.h       | 3 ---
 3 files changed, 10 deletions(-)
 delete mode 100644 arch/arm/mach-efm32/include/mach/entry-macro.S
 delete mode 100644 arch/arm/mach-efm32/include/mach/timex.h
-- 
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[GIT PULL v2] efm32 cleanups for next

[Olof Johansson]

On Thu, Feb 20, 2014 at 08:54:52PM +0100, Uwe Kleine-K?nig wrote:
> Hello,
> 
> this pull request superseeds the earlier request this mail is a reply
> to. Compared to the original one I added another cleanup. Here come the
> full details:
> 
> The following changes since commit 11d73c56b96b4297bd96273e9a22b7c72d13f1fa:
> 
>   Merge tag 'dropmachtimexh-v2' of git://git.pengutronix.de/git/ukl/linux into next/cleanup (2014-02-18 22:19:33 -0800)
> 
> are available in the git repository at:
> 
>   git://git.pengutronix.de/git/ukl/linux.git tags/efm32-next
> 
> for you to fetch changes up to f41b0482d5c1fc05234d54d58931a606ec7a97a2:
> 
>   ARM: efm32: drop selecting CLKSRC_MMIO (2014-02-20 09:56:18 +0100)
> 
> ----------------------------------------------------------------
> Just three simple cleanups for efm32 removing two now unused files and a
> superflous select by ARCH_EFM32.
> 
> ----------------------------------------------------------------
> BTW, I based this on armsoc/cleanup because this is the first commit
> that allows to remove efm32's <mach/timex.h> (which is the last one in
> the tree).

We ask you to never base your branches on top of our next/* contents, since it
happens that it will be rebuilt. Instead you should base your branch on top of
the topic branch in question, i.e. your timex-removal branch.

Please respin.


-Olof

[GIT PULL v2] efm32 cleanups for next

[Uwe Kleine-König]

Hello Olof,

On Fri, Feb 21, 2014 at 04:38:53PM -0800, Olof Johansson wrote:
> On Thu, Feb 20, 2014 at 08:54:52PM +0100, Uwe Kleine-K?nig wrote:
> > Hello,
> > 
> > this pull request superseeds the earlier request this mail is a reply
> > to. Compared to the original one I added another cleanup. Here come the
> > full details:
> > 
> > The following changes since commit 11d73c56b96b4297bd96273e9a22b7c72d13f1fa:
> > 
> >   Merge tag 'dropmachtimexh-v2' of git://git.pengutronix.de/git/ukl/linux into next/cleanup (2014-02-18 22:19:33 -0800)
> > 
> > are available in the git repository at:
> > 
> >   git://git.pengutronix.de/git/ukl/linux.git tags/efm32-next
> > 
> > for you to fetch changes up to f41b0482d5c1fc05234d54d58931a606ec7a97a2:
> > 
> >   ARM: efm32: drop selecting CLKSRC_MMIO (2014-02-20 09:56:18 +0100)
> > 
> > ----------------------------------------------------------------
> > Just three simple cleanups for efm32 removing two now unused files and a
> > superflous select by ARCH_EFM32.
> > 
> > ----------------------------------------------------------------
> > BTW, I based this on armsoc/cleanup because this is the first commit
> > that allows to remove efm32's <mach/timex.h> (which is the last one in
> > the tree).
> 
> We ask you to never base your branches on top of our next/* contents, since it
> happens that it will be rebuilt. Instead you should base your branch on top of
> the topic branch in question, i.e. your timex-removal branch.
my timex-removal branch isn't enough, because it bases on v3.13-rc1
which does neither have arch/arm/mach-efm32 nor the commits that allow
to drop the select CLKSRC_MMIO nor the commit that allows to drop
<mach/entry-macro.S>.

That's why I wrote that armsoc/[next/]cleanup is the first commit that
makes my cleanups possible.

The only options I see are:
 1) merge v3.14-rc1 into my timex-series myself and base on that;
 2) wait until my timex-series enters a tree with >= 3.14-rc1 that is
    stable; or
 3) drop commit "ARM: efm32: drop unused file <mach/timex.h>" for now
    and base the rest on top of 3.14-rc1.

I did 2) assuming that next/cleanup is stable. Actually this isn't much
different from 1) because the commit I based my changes on is just
3.14-rc1 + your merge of my series. So even if you want to redo
next/cleanup throwing out some merges different than mine it shouldn't
be too hard to keep the merge you did.

The details are:

 - "ARM: efm32: drop selecting CLKSRC_MMIO" depends on
	09ca27579ee5 (clocksource: time-efm32: Select CLKSRC_MMIO)
   which is in v3.13-rc5;
 - "ARM: efm32: drop unused file <mach/timex.h>" depends on
	79f08d9ed217 (ARM: drop <mach/timex.h> for !ARCH_MULTIPLATFORM, too)
	6d85e2b0b6be (ARM: new platform for Energy Micro's EFM32 Cortex-M3 SoCs)
   so I need v3.14-rc1 + dropmachtimexh-v2 for it;
 - "ARM: efm32: drop unused file entry-macro.S" depends on
	e6d159cdf9f7 (ARM: 7890/1: v7-M: drop using mach/entry-macro.S)
   which is in v3.14-rc1.

Please advice,
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[GIT PULL v2] efm32 cleanups for next

[Olof Johansson]

On Sat, Feb 22, 2014 at 10:58 AM, Uwe Kleine-K?nig
<u.kleine-koenig@pengutronix.de> wrote:
> Hello Olof,
>
> On Fri, Feb 21, 2014 at 04:38:53PM -0800, Olof Johansson wrote:
>> On Thu, Feb 20, 2014 at 08:54:52PM +0100, Uwe Kleine-K?nig wrote:
>> > Hello,
>> >
>> > this pull request superseeds the earlier request this mail is a reply
>> > to. Compared to the original one I added another cleanup. Here come the
>> > full details:
>> >
>> > The following changes since commit 11d73c56b96b4297bd96273e9a22b7c72d13f1fa:
>> >
>> >   Merge tag 'dropmachtimexh-v2' of git://git.pengutronix.de/git/ukl/linux into next/cleanup (2014-02-18 22:19:33 -0800)
>> >
>> > are available in the git repository at:
>> >
>> >   git://git.pengutronix.de/git/ukl/linux.git tags/efm32-next
>> >
>> > for you to fetch changes up to f41b0482d5c1fc05234d54d58931a606ec7a97a2:
>> >
>> >   ARM: efm32: drop selecting CLKSRC_MMIO (2014-02-20 09:56:18 +0100)
>> >
>> > ----------------------------------------------------------------
>> > Just three simple cleanups for efm32 removing two now unused files and a
>> > superflous select by ARCH_EFM32.
>> >
>> > ----------------------------------------------------------------
>> > BTW, I based this on armsoc/cleanup because this is the first commit
>> > that allows to remove efm32's <mach/timex.h> (which is the last one in
>> > the tree).
>>
>> We ask you to never base your branches on top of our next/* contents, since it
>> happens that it will be rebuilt. Instead you should base your branch on top of
>> the topic branch in question, i.e. your timex-removal branch.
> my timex-removal branch isn't enough, because it bases on v3.13-rc1
> which does neither have arch/arm/mach-efm32 nor the commits that allow
> to drop the select CLKSRC_MMIO nor the commit that allows to drop
> <mach/entry-macro.S>.
>
> That's why I wrote that armsoc/[next/]cleanup is the first commit that
> makes my cleanups possible.
>
> The only options I see are:
>  1) merge v3.14-rc1 into my timex-series myself and base on that;
>  2) wait until my timex-series enters a tree with >= 3.14-rc1 that is
>     stable; or
>  3) drop commit "ARM: efm32: drop unused file <mach/timex.h>" for now
>     and base the rest on top of 3.14-rc1.
>
> I did 2) assuming that next/cleanup is stable. Actually this isn't much
> different from 1) because the commit I based my changes on is just
> 3.14-rc1 + your merge of my series. So even if you want to redo
> next/cleanup throwing out some merges different than mine it shouldn't
> be too hard to keep the merge you did.
>
> The details are:
>
>  - "ARM: efm32: drop selecting CLKSRC_MMIO" depends on
>         09ca27579ee5 (clocksource: time-efm32: Select CLKSRC_MMIO)
>    which is in v3.13-rc5;
>  - "ARM: efm32: drop unused file <mach/timex.h>" depends on
>         79f08d9ed217 (ARM: drop <mach/timex.h> for !ARCH_MULTIPLATFORM, too)
>         6d85e2b0b6be (ARM: new platform for Energy Micro's EFM32 Cortex-M3 SoCs)
>    so I need v3.14-rc1 + dropmachtimexh-v2 for it;
>  - "ARM: efm32: drop unused file entry-macro.S" depends on
>         e6d159cdf9f7 (ARM: 7890/1: v7-M: drop using mach/entry-macro.S)
>    which is in v3.14-rc1.
>
> Please advice,

Ok, it's probably easiest to just apply the patches directly for us,
so I'll do that.

If your branch is in linux-next through your own tree then you should
drop it once the patches hit our tree. I'll likely do this later today
at some point.


-Olof

[GIT PULL v3] efm32 cleanups for next

[Uwe Kleine-König]

Hello Olof,

On Sun, Feb 23, 2014 at 05:51:51AM -0800, Olof Johansson wrote:
> Ok, it's probably easiest to just apply the patches directly for us,
> so I'll do that.
> 
> If your branch is in linux-next through your own tree then you should
> drop it once the patches hit our tree. I'll likely do this later today
> at some point.
It seems you didn't come around doing that yet. So I prepared a new pull
request in the hope to make it easier for you.

The following changes since commit 38dbfb59d1175ef458d006556061adeaa8751b72:

  Linus 3.14-rc1 (2014-02-02 16:42:13 -0800)

are available in the git repository at:

  git://git.pengutronix.de/git/ukl/linux.git tags/efm32-next

for you to fetch changes up to d5d5ce952a66c32abf36a6fdf2a1ba6cb8da9b93:

  ARM: efm32: drop unused file <mach/timex.h> (2014-02-24 10:07:27 +0100)

----------------------------------------------------------------
Just three simple cleanups for efm32 removing two now unused files and a
superflous select by ARCH_EFM32.

As these cleanups have dependencies on both v3.14-rc1 and my timex.h cleanup
(which is based on v3.13-rc1) this pull request also included a merge of my
cleanup tag which is already in armsoc/next/cleanup.

----------------------------------------------------------------
Uwe Kleine-K?nig (4):
      ARM: efm32: drop unused file entry-macro.S
      ARM: efm32: drop selecting CLKSRC_MMIO
      Merge tag 'dropmachtimexh-v2' of git://git.pengutronix.de/git/ukl/linux
      ARM: efm32: drop unused file <mach/timex.h>

plus the changes you already have in armsoc/next/cleanup that come in
with my dropmachtimexh-v2 series.

The diffstat was trimmed by hand to skip the dropmachtimexh-v2 tag
because I didn't find the right invokation to git-request-pull to do
the right thing:

 arch/arm/Kconfig                                   |  3 --
 arch/arm/mach-efm32/include/mach/entry-macro.S     |  4 --
 arch/arm/mach-efm32/include/mach/timex.h           |  3 --
 3 files changed, 10 deletions(-)

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[GIT PULL v3] efm32 cleanups for next

[Arnd Bergmann]

On Monday 24 February 2014, Uwe Kleine-K?nig wrote:
> Just three simple cleanups for efm32 removing two now unused files and a
> superflous select by ARCH_EFM32.
> 
> As these cleanups have dependencies on both v3.14-rc1 and my timex.h cleanup
> (which is based on v3.13-rc1) this pull request also included a merge of my
> cleanup tag which is already in armsoc/next/cleanup.
> 


Pulled into next/cleanup,

Thanks.

FWIW, I have a number of small efm32 bug fixes, most of them related to something
breaking with ARMv7-M in combination with random Kconfig options. I hope to get
around to sending them to you for testing soon.

	Arnd