[PATCH] spi: mvebu: fix baudrate selection for Armada 370/XP

[PATCH] spi: mvebu: fix baudrate selection for Armada 370/XP

[Uwe Kleine-König]

There are two problems that made the driver choose the wrong baudrate
calculation algorithm:

a) The compatible used on 370/XP isn't marvell,armada-370-xp-spi but
   marvell,armada-370-spi or marvell,armada-xp-spi respectively.
b) The probe function uses
   	match = of_match_node(mvebu_spi_dt_ids, dev->device_node);
   to determine the right algorithm. As the devices are also compatible
   to marvell,orion-spi and this comes first in mvebu_spi_dt_ids[]
   it's always the older Orion algorithm that is used.

This patch fixes both problems.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/spi/mvebu_spi.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/spi/mvebu_spi.c b/drivers/spi/mvebu_spi.c
index ee7b212962f7..e340686bd676 100644
--- a/drivers/spi/mvebu_spi.c
+++ b/drivers/spi/mvebu_spi.c
@@ -317,16 +317,18 @@ err_transfer:
 }
 
 static struct of_device_id mvebu_spi_dt_ids[] = {
-	{ .compatible = "marvell,orion-spi",
-	  .data = &mvebu_spi_set_baudrate },
 #if defined(CONFIG_ARCH_ARMADA_370) || defined(CONFIG_ARCH_ARMADA_XP)
-	{ .compatible = "marvell,armada-370-xp-spi",
+	{ .compatible = "marvell,armada-370-spi",
+	  .data = &armada_370_xp_spi_set_baudrate },
+	{ .compatible = "marvell,armada-xp-spi",
 	  .data = &armada_370_xp_spi_set_baudrate },
 #endif
 #if defined(CONFIG_ARCH_DOVE)
 	{ .compatible = "marvell,dove-spi",
 	  .data = &dove_spi_set_baudrate },
 #endif
+	{ .compatible = "marvell,orion-spi",
+	  .data = &mvebu_spi_set_baudrate },
 	{ }
 };
 
-- 
2.10.2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] spi: mvebu: fix baudrate selection for Armada 370/XP

[Sascha Hauer]

On Wed, Dec 07, 2016 at 04:59:00PM +0100, Uwe Kleine-König wrote:
> There are two problems that made the driver choose the wrong baudrate
> calculation algorithm:
> 
> a) The compatible used on 370/XP isn't marvell,armada-370-xp-spi but
>    marvell,armada-370-spi or marvell,armada-xp-spi respectively.
> b) The probe function uses
>    	match = of_match_node(mvebu_spi_dt_ids, dev->device_node);
>    to determine the right algorithm. As the devices are also compatible
>    to marvell,orion-spi and this comes first in mvebu_spi_dt_ids[]
>    it's always the older Orion algorithm that is used.
> 
> This patch fixes both problems.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Applied, thanks

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox