From patchwork Mon Oct 21 03:38:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1180225 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="Xanf7TY4"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46xN9804blz9sPL for ; Mon, 21 Oct 2019 14:56:11 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 94DC6C21D4A; Mon, 21 Oct 2019 03:41:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id CA276C21DB3; Mon, 21 Oct 2019 03:41:22 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id F3911C21D65; Mon, 21 Oct 2019 03:40:41 +0000 (UTC) Received: from mail-il1-f193.google.com (mail-il1-f193.google.com [209.85.166.193]) by lists.denx.de (Postfix) with ESMTPS id E2CDCC21DD7 for ; Mon, 21 Oct 2019 03:40:40 +0000 (UTC) Received: by mail-il1-f193.google.com with SMTP id f13so10675207ils.11 for ; Sun, 20 Oct 2019 20:40:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NhvklsNz3X6nw8CQ6F5dqk+r3+/k2fbeSK9v27oMUao=; b=Xanf7TY4PTLQk/OzviSsVk3yasV7+tLQZAUrxobXw5Mixww4UZa7icC3HJFEogOvkT xtmBbmsNam3k/KtjbZKl/1wrZZvEMUpUkiN68MQ2L75qLBmuToZBjNJkuCq5WEimvY8m Q6tP2d5VhkkGj7dakaRMPxlarJdJh4UvRSSSU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NhvklsNz3X6nw8CQ6F5dqk+r3+/k2fbeSK9v27oMUao=; b=comfycrlnd6DfuR+RYCn13knKu6s6V3tNr3u3nm8KJCyLifBL+W1jj++Tuh//zFbgC 0tDypwRuzoqgPPREY/c51ngqULi8KeHI4/pmHgLBMMRGqORNvPnBuBhPGCsJ/goNvI1L IkRgl7SgFixLFko9pAUO6uChd1z6zFoYIygENvoHG2HiFL6qlyM54r2S0RKiP5ysai1R jhOR/RIU79eNHh5CHGiXPjuE+vKLIIFx0F11LNJEFYRFBNmpcJy1FK/l4znIK0ZIsaE+ m9xRrc+r9HTIYngO/5cC0SWMCXQk/Oy7sL+Swt6Yob5hZWq0XfIw7/LzBYFd058a1taw KS4Q== X-Gm-Message-State: APjAAAUFEfTX9K8pcr+KgEgg7u4nRBwEOUN03RmHRqLLJui8J6h5WdT+ Hf/NvWV3EYg6EW4lwNvsmvx7LzM//pATXw== X-Google-Smtp-Source: APXvYqxpeTJSDOutOj+Fwo/Q6fM7rnZx3fE5shg1lYnTOjKeO1zRvhEN8Qd7uuzJajfp23QX+QxpkQ== X-Received: by 2002:a92:6510:: with SMTP id z16mr1323246ilb.183.1571629239686; Sun, 20 Oct 2019 20:40:39 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id x14sm1947028ion.67.2019.10.20.20.40.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Oct 2019 20:40:39 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 20 Oct 2019 21:38:43 -0600 Message-Id: <20191021033913.220758-73-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.866.gb869b98d4c-goog In-Reply-To: <20191021033913.220758-22-sjg@chromium.org> References: <20191021033913.220758-22-sjg@chromium.org> MIME-Version: 1.0 Cc: Jagannadha Sutradharudu Teki Subject: [U-Boot] [PATCH v3 078/108] spi: ich: Convert to livetree X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Use dev_get_driver_data() to obtain the device type. It has the same effect and is shorter. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- Changes in v3: None Changes in v2: None drivers/spi/ich.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c index 5b3b3818ded..7c29369a169 100644 --- a/drivers/spi/ich.c +++ b/drivers/spi/ich.c @@ -598,23 +598,11 @@ static int ich_spi_child_pre_probe(struct udevice *dev) static int ich_spi_ofdata_to_platdata(struct udevice *dev) { struct ich_spi_platdata *plat = dev_get_platdata(dev); - int node = dev_of_offset(dev); - int ret; - ret = fdt_node_check_compatible(gd->fdt_blob, node, "intel,ich7-spi"); - if (ret == 0) { - plat->ich_version = ICHV_7; - } else { - ret = fdt_node_check_compatible(gd->fdt_blob, node, - "intel,ich9-spi"); - if (ret == 0) - plat->ich_version = ICHV_9; - } + plat->ich_version = dev_get_driver_data(dev); + plat->lockdown = dev_read_bool(dev, "intel,spi-lock-down"); - plat->lockdown = fdtdec_get_bool(gd->fdt_blob, node, - "intel,spi-lock-down"); - - return ret; + return 0; } static const struct spi_controller_mem_ops ich_controller_mem_ops = { @@ -635,8 +623,8 @@ static const struct dm_spi_ops ich_spi_ops = { }; static const struct udevice_id ich_spi_ids[] = { - { .compatible = "intel,ich7-spi" }, - { .compatible = "intel,ich9-spi" }, + { .compatible = "intel,ich7-spi", ICHV_7 }, + { .compatible = "intel,ich9-spi", ICHV_9 }, { } };