From patchwork Mon Oct 29 19:25:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Goldschmidt X-Patchwork-Id: 990513 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GUtoIaid"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42kPjz0nD4z9sC2 for ; Tue, 30 Oct 2018 06:27:03 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id C293BC2206B; Mon, 29 Oct 2018 19:26:04 +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=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, 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 96F3CC22076; Mon, 29 Oct 2018 19:25:56 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 96DA4C2206E; Mon, 29 Oct 2018 19:25:53 +0000 (UTC) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by lists.denx.de (Postfix) with ESMTPS id 5465FC22064 for ; Mon, 29 Oct 2018 19:25:49 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id t10-v6so9964955wrn.10 for ; Mon, 29 Oct 2018 12:25:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hJGEQVD6o2+NenZheCj00u2T60K1BjTFrjIr7cXeVmA=; b=GUtoIaidh3vDcDZpnSKKhBO9wJWcf+ttc0ZR0XmCXm7M2ccMM3WXa2zps9hixbRfNm qmBLkzin3qCaODXOP6f2ig9k7dSg/uwNMQJ7VmXQ6ZSy6VChsduLuTOYrdd34TNqy6ZD iS4ARZMSTAu3SmMC/Wxew7sWtgpuopk+RJ17g1Vbu5KiQf5BIWSct9espbl3a/ZUlafL g6MwJeMlLbOBNmCDSkvMXU4x7F1E36DJR6Q3LnytbU8JZ70wynrZ4YTo6SeKwmBJVb43 xMuI4zc3+y7RnFJede++hpLb8s7dYS2ZsX+sq70E/7+YPESSQKyO+E7x+CcEE8ZZPsc7 JJ/w== 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; bh=hJGEQVD6o2+NenZheCj00u2T60K1BjTFrjIr7cXeVmA=; b=JXfkyClJjp/Sep9worMbQfybGgTt1SzDreFEVIr8HddvQ0eJOZndE96p0+86obb0hy 0iYAOvcxylcNL1zqGYdnZFPoy/TORD23PuGLy7Qct/ztGRyolvkByOsG1dzrCm1ty8kZ oEdBx34sfL325pN+oW/GcklL36OCyXFLqdn/UmH/E4Qgds1CP0odgHcF/GEep6g1esIh GFLU/1paP3IkAd5kO7EifggFaX9inf57LfpSG2pWMGMfHQVNZuIFSdhm4aLHMXjF7ABK bDzaDvdNk4uZPc5hDeoe2nQ9qWyb/wfmMlo/36cnBudLqgObDgfAe/mj2Ti8EEXifd58 P51g== X-Gm-Message-State: AGRZ1gIXxrZFatbXIFPgc5MuxMOd3p0wQHP6mmfuKJ70bdm8Drfj4Po7 8Pka0XwTExMVxyV8zkXSXD8= X-Google-Smtp-Source: AJdET5eRawFabtqNsCr8dfRJjhUQFnLldceewOTa4rXiHzC1fQQ/RNZjTMtI+wceqaA1p9/63PCSHQ== X-Received: by 2002:adf:e50f:: with SMTP id j15-v6mr15880534wrm.94.1540841148979; Mon, 29 Oct 2018 12:25:48 -0700 (PDT) Received: from ubuntu.home ([2a02:8071:6a3:700:b405:737c:e363:dcb1]) by smtp.gmail.com with ESMTPSA id q185-v6sm4492794wmg.45.2018.10.29.12.25.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Oct 2018 12:25:47 -0700 (PDT) From: Simon Goldschmidt To: Marek Vasut , u-boot@lists.denx.de Date: Mon, 29 Oct 2018 20:25:32 +0100 Message-Id: <20181029192533.9118-3-simon.k.r.goldschmidt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181029192533.9118-1-simon.k.r.goldschmidt@gmail.com> References: <20181029192533.9118-1-simon.k.r.goldschmidt@gmail.com> Cc: Jason Rush , Jagan Teki Subject: [U-Boot] [PATCH v1 2/3] spi: cadence_qspi: use "cdns, qspi-nor" as compatible 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Linux uses "cdns,qspi-nor" as compatible string for the cadence qspi driver. To support Linux device trees, add this compatible to the U-Boot driver while keeping the old "cadence,qspi" for backwards compatibility for U-Boot device trees until all are fixed. Also update the binding docs accordingly. Signed-off-by: Simon Goldschmidt --- doc/device-tree-bindings/spi/spi-cadence.txt | 3 ++- drivers/spi/cadence_qspi.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/device-tree-bindings/spi/spi-cadence.txt b/doc/device-tree-bindings/spi/spi-cadence.txt index 74c82080fc..d7b30d5cff 100644 --- a/doc/device-tree-bindings/spi/spi-cadence.txt +++ b/doc/device-tree-bindings/spi/spi-cadence.txt @@ -2,7 +2,8 @@ Cadence QSPI controller device tree bindings -------------------------------------------- Required properties: -- compatible : should be "cadence,qspi". +- compatible : should be "cdns,qspi-nor" ("cadence,qspi" is supported + for compatibility to older U-Boot devicetrees only) - reg : 1.Physical base address and size of SPI registers map. 2. Physical base address & size of NOR Flash. - clocks : Clock phandles (see clock bindings for details). diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c index 29db6fa368..fef740beaa 100644 --- a/drivers/spi/cadence_qspi.c +++ b/drivers/spi/cadence_qspi.c @@ -329,7 +329,8 @@ static const struct dm_spi_ops cadence_spi_ops = { }; static const struct udevice_id cadence_spi_ids[] = { - { .compatible = "cadence,qspi" }, + { .compatible = "cdns,qspi-nor" }, + { .compatible = "cadence,qspi" }, /* U-Boot specific */ { } };