Merge patch series "net: ksz9477: add support for KSZ GbE switches using SPI bus"

[J-u-boot.git] / drivers / spi / atmel_spi.c

diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index 702e22535811e4a0cd38908cbffbb56edecf0972..aaf3eddae423998589dc98b3edf9e1b01b5b53a4 100644 (file)
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -2,7 +2,6 @@
 /*
  * Copyright (C) 2007 Atmel Corporation
  */
-#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <fdtdec.h>
@@ -17,6 +16,7 @@
 #include <asm/gpio.h>
 #endif
 #include <linux/bitops.h>
+#include <linux/printk.h>
 
 /*
  * Register definitions for the Atmel AT32/AT91 SPI Controller
@@ -125,7 +125,7 @@ static int atmel_spi_claim_bus(struct udevice *dev)
        struct atmel_spi_priv *priv = dev_get_priv(bus);
        struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev);
        struct at91_spi *reg_base = bus_plat->regs;
-       u32 cs = slave_plat->cs;
+       u32 cs = slave_plat->cs[0];
        u32 freq = priv->freq;
        u32 scbr, csrx, mode;
 
@@ -174,7 +174,7 @@ static void atmel_spi_cs_activate(struct udevice *dev)
        struct udevice *bus = dev_get_parent(dev);
        struct atmel_spi_priv *priv = dev_get_priv(bus);
        struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev);
-       u32 cs = slave_plat->cs;
+       u32 cs = slave_plat->cs[0];
 
        if (!dm_gpio_is_valid(&priv->cs_gpios[cs]))
                return;
@@ -189,7 +189,7 @@ static void atmel_spi_cs_deactivate(struct udevice *dev)
        struct udevice *bus = dev_get_parent(dev);
        struct atmel_spi_priv *priv = dev_get_priv(bus);
        struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev);
-       u32 cs = slave_plat->cs;
+       u32 cs = slave_plat->cs[0];
 
        if (!dm_gpio_is_valid(&priv->cs_gpios[cs]))
                return;
@@ -337,8 +337,6 @@ static int atmel_spi_enable_clk(struct udevice *bus)
 
        priv->bus_clk_rate = clk_rate;
 
-       clk_free(&clk);
-
        return 0;
 }