Message ID | 20191206213936.v6.66.I10916bc38eb7b44e59e68879c9a97e5349247bdd@changeid |
---|---|
State | Accepted |
Commit | 702b28a163ea8f6b80c9a850e8884a66bd059727 |
Delegated to: | Bin Meng |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) 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="RF2WLDaS"; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47VHKG608dz9sPL for <incoming@patchwork.ozlabs.org>; Sat, 7 Dec 2019 15:58:26 +1100 (AEDT) Received: from phobos.denx.de (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 66E4481701; Sat, 7 Dec 2019 05:51:17 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="RF2WLDaS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 228C38176A; Sat, 7 Dec 2019 05:51:16 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x144.google.com (mail-il1-x144.google.com [IPv6:2607:f8b0:4864:20::144]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 86292816F7 for <u-boot@lists.denx.de>; Sat, 7 Dec 2019 05:51:13 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x144.google.com with SMTP id b15so8151941iln.3 for <u-boot@lists.denx.de>; Fri, 06 Dec 2019 20:51:13 -0800 (PST) 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=u7cv4caDZoJeSZnToYjtXdemRgYothqfWeODNnKxpbE=; b=RF2WLDaSEfRDhnGy58Ulcdr/OB/u0tanG4Y/hum7OylseMy9GWqbdIDO9Ix0W8vD8c Ov+o0lde42WM0kDBiam3epnXVPfE70HD81K7qqneDp0FfSEU6pmo79S1pzQPRmpz+6Bl HHOpH8qqxuVPfIOtp82MdHgn/rtEi3t9t51rk= 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=u7cv4caDZoJeSZnToYjtXdemRgYothqfWeODNnKxpbE=; b=HYQXFMDPLy2FV59WGMZOaxF1WrTvsQDjEh37ylvuZsZs+RQiygMrgmBQqAxO1cMn53 GydUpwTYmZxlG6pv0gbquoV6jUlxa3uZv9c23rC8OKQwaEAtCh3yge7pZxmzLNyFUGq9 RkKUZMPyzCuZwJveFH/cEcwumDSMG7wqc9ea1qZ/OGtF4MnYdexEoOgfb15vLlRi1Npb peoNamSv6unG/Lh9mLCUWhyvT6/IRoLWdL/dEfylfy3CupnqvQFMlo3HRVf06t6DUyTf UdlVliU9iiy9Eo8jlXpobucJ7sncsQgpatKuVn0CxpRM0KmGDUws110KRxUy3qaCR11f Pdng== X-Gm-Message-State: APjAAAV76iiN3yJ3NSTXYh37SukSRiPz/p0eGfYAyRFwOSquZS0tDqji jeI41sBJ/G3dka5RvX5t5+6yIgqtqgA= X-Google-Smtp-Source: APXvYqzbk6RwjX8JHULEpycuNPGSct1Z+vxZg0CrhJ3xNbqeDi1nnBWBbI+jPIKlm62HWxVaMV5wWw== X-Received: by 2002:a92:5d88:: with SMTP id e8mr10357161ilg.106.1575694272321; Fri, 06 Dec 2019 20:51:12 -0800 (PST) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id o7sm4549410ilo.58.2019.12.06.20.51.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Dec 2019 20:51:11 -0800 (PST) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Subject: [PATCH v6 066/102] spi: ich: Convert to livetree Date: Fri, 6 Dec 2019 21:42:39 -0700 Message-Id: <20191206213936.v6.66.I10916bc38eb7b44e59e68879c9a97e5349247bdd@changeid> X-Mailer: git-send-email 2.24.0.393.g34dc348eaf-goog In-Reply-To: <20191207044315.51770-1-sjg@chromium.org> References: <20191207044315.51770-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Cc: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean |
Series |
x86: Add initial support for apollolake
|
expand
|
On Sat, Dec 7, 2019 at 12:51 PM Simon Glass <sjg@chromium.org> wrote: > > Use dev_get_driver_data() to obtain the device type. It has the same > effect and is shorter. > > Signed-off-by: Simon Glass <sjg@chromium.org> > Reviewed-by: Bin Meng <bmeng.cn@gmail.com> > --- > > Changes in v6: None > Changes in v5: None > Changes in v4: None > Changes in v3: None > Changes in v2: None > > drivers/spi/ich.c | 22 +++++----------------- > 1 file changed, 5 insertions(+), 17 deletions(-) > applied to u-boot-x86/next, thanks!
diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c index 4d61be02ec..6460144560 100644 --- a/drivers/spi/ich.c +++ b/drivers/spi/ich.c @@ -597,28 +597,16 @@ static int ich_spi_ofdata_to_platdata(struct udevice *dev) { struct ich_spi_platdata *plat = dev_get_platdata(dev); struct ich_spi_priv *priv = dev_get_priv(dev); - int node = dev_of_offset(dev); - int ret; /* Find a PCH if there is one */ uclass_first_device(UCLASS_PCH, &priv->pch); if (!priv->pch) priv->pch = dev_get_parent(dev); - 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 = { @@ -639,8 +627,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 }, { } };