Skip to contentSkip to conversation

Allwinner fixes for 3.15

GIT PULL Maxime Ripard 2 participants 3 messages May 8, 2014 – May 11, 2014

lore
Share & tools
lore
#0 lore raw

The following changes since commit c9eaa447e77efe77b7fa4c953bd62de8297fd6c5:

Linux 3.15-rc1 (2014-04-13 14:18:35 -0700)

are available in the git repository at:

https://github.com/mripard/linux.git

for you to fetch changes up to 84e108fc7b23310fb6d93a657e47181d64ab6e93:

ARM: sunxi: Enable GMAC in sunxi_defconfig (2014-05-01 17:07:42 -0700)

----------------------------------------------------------------
Set of fixes for the Allwinner support for 3.15

Some minor things, the major thing being the enabling of the GMAC driver in sunxi_defconfig that will un-break Olof's autobooters.

----------------------------------------------------------------
Emilio L?pez (1):
ARM: sun7i: fix PLL4 clock and add PLL8

Maxime Ripard (2):
ARM: sun7i: Fix i2c4 base address
ARM: sunxi: Enable GMAC in sunxi_defconfig

 arch/arm/boot/dts/sun7i-a20.dtsi | 14 +++++++++++---
 arch/arm/configs/sunxi_defconfig |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)
Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140508/beb51225/attachment.sig>
#1 lore raw
Quoted 7 lines · Maxime Ripard

The following changes since commit c9eaa447e77efe77b7fa4c953bd62de8297fd6c5:

Linux 3.15-rc1 (2014-04-13 14:18:35 -0700)

are available in the git repository at:

https://github.com/mripard/linux.git

This doesn't seem right.

However, I found a tag tags/sunxi-fixes-for-3.15 for 84e108fc7b23310fb6d93a657e47181d64ab6e93 in your repo, so I merged that. Please check your scripts.

Quoted 3 lines

for you to fetch changes up to 84e108fc7b23310fb6d93a657e47181d64ab6e93:

ARM: sunxi: Enable GMAC in sunxi_defconfig (2014-05-01 17:07:42 -0700)

Merged.

-Olof

#2 lore raw
Quoted 7 lines · Olof Johansson
Quoted 6 lines · Maxime Ripard

The following changes since commit c9eaa447e77efe77b7fa4c953bd62de8297fd6c5:

Linux 3.15-rc1 (2014-04-13 14:18:35 -0700)

are available in the git repository at:

Quoted 7 lines
Quoted 1 line

https://github.com/mripard/linux.git

This doesn't seem right.

However, I found a tag tags/sunxi-fixes-for-3.15 for 84e108fc7b23310fb6d93a657e47181d64ab6e93 in your repo, so I merged that. Please check your scripts.

Hmmm, odd indeed. I'll double-check to see where I might have screwed this up. Sorry.

Quoted 5 lines
Quoted 3 lines

for you to fetch changes up to 84e108fc7b23310fb6d93a657e47181d64ab6e93:

ARM: sunxi: Enable GMAC in sunxi_defconfig (2014-05-01 17:07:42 -0700)

Merged.

Thanks!
Maxime

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140511/9f5bb78c/attachment.sig>