Merge tag 'v2021.01-rc5' into next

[platform/kernel/u-boot.git] / drivers / misc / cros_ec_spi.c

diff --git a/drivers/misc/cros_ec_spi.c b/drivers/misc/cros_ec_spi.c
index 0686925..bbc9630 100644 (file)
--- a/drivers/misc/cros_ec_spi.c
+++ b/drivers/misc/cros_ec_spi.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Chromium OS cros_ec driver - SPI interface
  *
  * Copyright (c) 2012 The Chromium OS Authors.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -17,14 +16,13 @@
 #include <cros_ec.h>
 #include <dm.h>
 #include <errno.h>
+#include <log.h>
 #include <spi.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 int cros_ec_spi_packet(struct udevice *udev, int out_bytes, int in_bytes)
 {
        struct cros_ec_dev *dev = dev_get_uclass_priv(udev);
-       struct spi_slave *slave = dev_get_parentdata(dev->dev);
+       struct spi_slave *slave = dev_get_parent_priv(dev->dev);
        ulong start;
        uint8_t byte;
        int rv;
@@ -84,7 +82,7 @@ int cros_ec_spi_command(struct udevice *udev, uint8_t cmd, int cmd_version,
                     uint8_t **dinp, int din_len)
 {
        struct cros_ec_dev *dev = dev_get_uclass_priv(udev);
-       struct spi_slave *slave = dev_get_parentdata(dev->dev);
+       struct spi_slave *slave = dev_get_parent_priv(dev->dev);
        int in_bytes = din_len + 4;     /* status, length, checksum, trailer */
        uint8_t *out;
        uint8_t *p;
@@ -186,8 +184,8 @@ static const struct udevice_id cros_ec_ids[] = {
        { }
 };
 
-U_BOOT_DRIVER(cros_ec_spi) = {
-       .name           = "cros_ec_spi",
+U_BOOT_DRIVER(google_cros_ec_spi) = {
+       .name           = "google_cros_ec_spi",
        .id             = UCLASS_CROS_EC,
        .of_match       = cros_ec_ids,
        .probe          = cros_ec_probe,