[PATCH 0/8] Armada XP pinctrl consolidation and ix4-300d fixes

[Benoit Masson]

Le 6 oct. 2014 à 18:13, Sebastian Hesselbarth <sebastian.hesselbarth at gmail.com> a écrit :

> On 10/06/2014 01:11 AM, Benoit Masson wrote:
>> Le 3 oct. 2014 à 17:41, Sebastian Hesselbarth <sebastian.hesselbarth at gmail.com> a écrit :
>>> On 10/03/2014 05:29 PM, Benoit Masson wrote:
>>>> Le 3 oct. 2014 à 17:06, Sebastian Hesselbarth <sebastian.hesselbarth at gmail.com> a écrit :
>>>>> On 10/03/2014 04:11 PM, Jason Cooper wrote:
>>>>>> On Sun, Sep 21, 2014 at 04:11:23PM +0200, Benoit Masson wrote:
>>>>>>>> Le 19 sept. 2014 à 22:14, Sebastian Hesselbarth <sebastian.hesselbarth at gmail.com> a écrit :
>>> [...]
>>>>>>>> Patches are based on v3.17-rc1 and intended for v3.18 but I am not in
>>>>>>>> a hurry. I only compile tested this, so a formal Tested-by from Benoit
>>>>>>>> for the ix4 and any other Armada XP board would be great.
>>>>>>> 
>>>>>>> I'm not sure what to test since I only receive some patch from the
>>>>>>> series of 8. Should I get all 8 or only those you sent me. I'll be
>>>>>>> able to test during next week.
>>>>>> 
>>>>>> Did you ever get a chance to test this series?
>>>>> 
>>>>> Uhm, I never prepared a branch for Benoit to test. I have pushed the
>>>>> patches with Thomas Acked-by's and renamed eeprom node based on
>>>>> v3.17-rc1 to
>>>>> 
>>>>> https://github.com/shesselba/linux-dove.git devel/mvebu-ix4
>>>>> 
>>> [...]
>> Maybe I missed something ? is this branch you sent me a bare fork
>> from mainline 3.17 ? does it includes the armada XP step A0 patch ?
> 
> Benoit,
> 
Hi,
> I prepared more branches with the series
> - on top of v3.17 release:
> https://github.com/shesselba/linux-dove.git devel/mvebu-ix4_v3.17
> 
> - on top of next-20141003 (i.e. what will become v3.18-rc1):
> https://github.com/shesselba/linux-dove.git devel/mvebu-ix4_next-20141003
> 
> It would be great, if you can test in this order:
> - vanilla v3.17
> - mvebu-ix4_v3.17
> - mvebu-ix4_next-20141003
> 
All the 3 branch works WHEN APPLYING A0 patch (below), with both my custom kernel config and the arch/arm/configs/mvebu_v7_defconfig

The reason why it didn't worked last time was that apparently the A0 patch (copied) below was not merged into 3.17 :(

This means that ix4-300d support is broken on 3.17 because of the A0 stepping patch not merged.

patch (from Andrew Lunn Acked-by Gregory Clement is missing:

---
 arch/arm/mach-mvebu/board-v7.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-mvebu/board-v7.c b/arch/arm/mach-mvebu/board-v7.c
index b2524d6..b1e148d 100644
--- a/arch/arm/mach-mvebu/board-v7.c
+++ b/arch/arm/mach-mvebu/board-v7.c
@@ -174,7 +174,7 @@ static void __init thermal_quirk(void)
 
 static void __init mvebu_dt_init(void)
 {
-	if (of_machine_is_compatible("plathome,openblocks-ax3-4"))
+	if (of_machine_is_compatible("marvell,armadaxp"))
 		i2c_quirk();
 	if (of_machine_is_compatible("marvell,a375-db")) {
 		external_abort_quirk();
-- 
1.9.1
> If any branch fails, you can stop and please report back.
> 
> I also have the ix4 but I need more time for a full setup like you
> already seem to have ready. Again, there is no hurry, take your time.
> 
> Thanks!
> 
> Sebastian