mbox

[GIT,PULL] at91: fixes for 3.7-rc7

Message ID 50AA5ED5.8090901@atmel.com
State New
Headers show

Pull-request

git://github.com/at91linux/linux-at91.git tags/at91-fixes

Message

Nicolas Ferre Nov. 19, 2012, 4:31 p.m. UTC
Arnd, Olof,

Here is another "fixes" pull request for AT91. It enables the sd/mmc driver
for Device Tree enabled platforms. Those patches where part of a series that
was split in two for reaching upstream: the MMC part is already in Linus' tree
and this is the arm-soc part.
I have placed these patches on top of the fixes that you already have for AT91.

The following changes since commit 641f3ce64b050961d454a0716bb6dbf528315aac:

  ARM: at91/usbh: fix overcurrent gpio setup (2012-11-16 10:46:29 +0100)

are available in the git repository at:

  git://github.com/at91linux/linux-at91.git tags/at91-fixes

for you to fetch changes up to 83ce1c55cfb639438c2516cb05f3b8ee472023e5:

  ARM: at91/dts: add nodes for atmel hsmci controllers for atmel boards (2012-11-19 17:02:40 +0100)

----------------------------------------------------------------
Add entries for enabling the use of sd/mmc driver on AT91.
Those entries where missing for device tree use on these
platforms.

----------------------------------------------------------------
Ludovic Desroches (3):
      ARM: at91: add clocks for DT entries
      ARM: at91/dts: add nodes for atmel hsmci controllers for atmel SOCs
      ARM: at91/dts: add nodes for atmel hsmci controllers for atmel boards

 arch/arm/boot/dts/at91sam9260.dtsi          |  9 +++++++++
 arch/arm/boot/dts/at91sam9263.dtsi          | 18 ++++++++++++++++++
 arch/arm/boot/dts/at91sam9263ek.dts         | 10 ++++++++++
 arch/arm/boot/dts/at91sam9g20ek_2mmc.dts    | 12 ++++++++++++
 arch/arm/boot/dts/at91sam9g20ek_common.dtsi |  9 +++++++++
 arch/arm/boot/dts/at91sam9g25ek.dts         | 18 ++++++++++++++++++
 arch/arm/boot/dts/at91sam9g45.dtsi          | 18 ++++++++++++++++++
 arch/arm/boot/dts/at91sam9m10g45ek.dts      | 19 +++++++++++++++++++
 arch/arm/boot/dts/at91sam9n12.dtsi          |  9 +++++++++
 arch/arm/boot/dts/at91sam9n12ek.dts         |  9 +++++++++
 arch/arm/boot/dts/at91sam9x5.dtsi           | 18 ++++++++++++++++++
 arch/arm/mach-at91/at91sam9260.c            |  1 +
 arch/arm/mach-at91/at91sam9263.c            |  2 ++
 arch/arm/mach-at91/at91sam9g45.c            |  2 ++
 arch/arm/mach-at91/at91sam9n12.c            |  1 +
 arch/arm/mach-at91/at91sam9x5.c             |  2 ++
 16 files changed, 157 insertions(+)

Comments

Olof Johansson Nov. 19, 2012, 4:52 p.m. UTC | #1
Hi Nicolas,

On Mon, Nov 19, 2012 at 8:31 AM, Nicolas Ferre <nicolas.ferre@atmel.com> wrote:
> Arnd, Olof,
>
> Here is another "fixes" pull request for AT91. It enables the sd/mmc driver
> for Device Tree enabled platforms. Those patches where part of a series that
> was split in two for reaching upstream: the MMC part is already in Linus' tree
> and this is the arm-soc part.
> I have placed these patches on top of the fixes that you already have for AT91.

What regressions do these fixes resolve?

It looks more like they are DT-enablement patches to me, and thus 3.8
material, not 3.7. I'll be happy to queue them up in next/dt though.

Thanks,

-Olof
Nicolas Ferre Nov. 19, 2012, 5:29 p.m. UTC | #2
On 11/19/2012 05:52 PM, Olof Johansson :
> Hi Nicolas,
> 
> On Mon, Nov 19, 2012 at 8:31 AM, Nicolas Ferre <nicolas.ferre@atmel.com> wrote:
>> Arnd, Olof,
>>
>> Here is another "fixes" pull request for AT91. It enables the sd/mmc driver
>> for Device Tree enabled platforms. Those patches where part of a series that
>> was split in two for reaching upstream: the MMC part is already in Linus' tree
>> and this is the arm-soc part.
>> I have placed these patches on top of the fixes that you already have for AT91.
> 
> What regressions do these fixes resolve?
> 
> It looks more like they are DT-enablement patches to me, and thus 3.8
> material, not 3.7. I'll be happy to queue them up in next/dt though.

Hi Olof,

You are right, it does not strictly fixes a regression and we were late
for including these patches which are around since end of July...
I still sent this pull-request to enable more people to use device tree
on AT91 for the upcoming release.

If you do not take it for 3.7, maybe we will have to queue these patches
on top of our AT91 pinctrl work (on Linus Walleij side), so, you do need
to queue this one for the moment...

Best regards,
Linus Walleij Nov. 20, 2012, 6:47 p.m. UTC | #3
On Mon, Nov 19, 2012 at 6:29 PM, Nicolas Ferre <nicolas.ferre@atmel.com> wrote:

> If you do not take it for 3.7, maybe we will have to queue these patches
> on top of our AT91 pinctrl work (on Linus Walleij side), so, you do need
> to queue this one for the moment...

Tell me what the outcome is, if I should merge some stuff on top
of my pinctrl tree just send me the patches...

Yours,
Linus Walleij
Jean-Christophe PLAGNIOL-VILLARD Nov. 20, 2012, 8 p.m. UTC | #4
On 19:47 Tue 20 Nov     , Linus Walleij wrote:
> On Mon, Nov 19, 2012 at 6:29 PM, Nicolas Ferre <nicolas.ferre@atmel.com> wrote:
> 
> > If you do not take it for 3.7, maybe we will have to queue these patches
> > on top of our AT91 pinctrl work (on Linus Walleij side), so, you do need
> > to queue this one for the moment...
> 
> Tell me what the outcome is, if I should merge some stuff on top
> of my pinctrl tree just send me the patches...
I send you the pull with  few patch for pinctrl

Best Regards,
J.