Actually sun7i smp conflicts badly with the sun6i smp .. so a stab at a merge:

https://github.com/hramrach/linux-sunxi/commits/sunxi-next

Compile tested.

Thanks

Michal

On 21 December 2013 23:24, Michal Suchanek <[email protected]> wrote:
> You can get the sun7i version here (older version of the branch):
> https://github.com/hramrach/linux-sunxi/commits/sunxi-test
>
> The two commits from mripard and two from cinifr from Dec 1.
>
> Thanks
>
> Michal
>
> On 21 December 2013 23:00, Zalán Blénessy <[email protected]> wrote:
>> Hi Hans!
>>
>> Thanks for all the great work you're doing. I really appreciate it.
>> I've been following your progress, first with the sunxi-test branch and now
>> with the sunxi-next branch.
>>
>> Regrading the sunxi-next branch... as far as I can tell everything seems to
>> be working nice on my A20 Olinuxino micro.
>> (I've enabled USB in the dts file and it works nicely.)
>>
>> However, I think there is one regression compared to the sunxi-test branch:
>> SMP for A20 doesn't work anymore.
>> I'm pretty sure its because the "ARM: sun6i: Add SMP support for the
>> Allwinner A31" only support SUN6I,
>> but wanted to double check with you to be sure that I didn't do anything
>> stupid on my side :).
>>
>> BR, Zalan
>>
>> Den onsdagen den 18:e december 2013 kl. 00:07:17 UTC+1 skrev Hans de Goede:
>>>
>>> Hi All,
>>>
>>> I've been working on getting together all the great work people are
>>> doing for the upstream kernel into one tree. The result is available
>>> here:
>>> https://github.com/jwrdegoede/linux-sunxi/commits/sunxi-next
>>>
>>> This consists of:
>>>
>>> base: 3.13-rc4 +
>>>   Emilio's clk branch
>>>   David's and my mmc work
>>>   Chen's gmac work
>>>   Oliver's ahci work
>>>   sunxi-bits of:
>>> https://git.linaro.org/people/daniel.lezcano/linux.git/shortlog
>>>   https://github.com/mripard/linux/commits/sunxi/core-for-3.14
>>>   https://github.com/mripard/linux/commits/sunxi/dt-for-3.14
>>>   Carlo Caione's rtc work
>>>   Arokux' ehci work
>>>
>>> Compared to my last tree this adds usb (ehci only for now) support, rtc
>>> support, high speed timers and some other bits.
>>>
>>> Note for this to work properly on sun7i and sun5i you also need my
>>> sunxi-next u-boot branch:
>>> https://github.com/jwrdegoede/u-boot-sunxi/commits/sunxi-next
>>>
>>> Regards,
>>>
>>> Hans
>>
>> --
>> You received this message because you are subscribed to the Google Groups
>> "linux-sunxi" group.
>> To unsubscribe from this group and stop receiving emails from it, send an
>> email to [email protected].
>> For more options, visit https://groups.google.com/groups/opt_out.

-- 
You received this message because you are subscribed to the Google Groups 
"linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to