From patchwork Fri May 11 22:02:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 10395447 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0A2D360170 for ; Fri, 11 May 2018 22:04:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E4AFF28FE0 for ; Fri, 11 May 2018 22:04:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D87B528FE2; Fri, 11 May 2018 22:04:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7945228FE0 for ; Fri, 11 May 2018 22:04:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=Lyp0bejFmfdAABKs0bD5xUJ1rTg3GU4xTkCpgXQ6vHU=; b=E/a5KnmiPrz42sxDIS+TJ03+8r zxTIS6nnPmBLxcoOoy8uLXdwU3Dgm0n1rdBnDjta/wFuoriZSDgocojQqmd/Jny0NocEP1ecHD/h1 IpeEwCWVczmHeOJKteQzcVmfwNivLuKPCiORhnNGIE8Dj+bhIrEyNs3F70saTn0dypWPThUT2pWqK 2b1vDTYIMHf3m3jpP6hWti+dh3QoTD6q4GuylbPbWYTkZ0AQxk3IzV7AU2zFNeBhos1eeetyAxApz q6PcqbRuiyGYWOd0nhiul303HdbxO8wscDXujqTDAZ3cbWs+9o/1tEIUgQDV3mHnE0KNEdUdvDHPz LTyBSZWQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fHG9b-0001Mr-QT; Fri, 11 May 2018 22:04:43 +0000 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fHG8C-0000dS-WA for linux-arm-kernel@lists.infradead.org; Fri, 11 May 2018 22:03:18 +0000 Received: by mail-pf0-x242.google.com with SMTP id x9-v6so3311091pfm.2 for ; Fri, 11 May 2018 15:03:06 -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=9GG6R/Yg6y+F5KMKD6PeCoumED2ZkuLEgKXurPvTF8I=; b=kXdun+6fDTiO6pSylAhJcS3PeL4b2oG82iMIid0hl42Er7unE/xWZ5t85iKC8NoknV PYNrw4fWvUmUZu0kVefMSWWtdqBRFOKKzXv5M+q2KT6LtfbGuVp98UwVcUrHDqXu3TH+ etJ9xwCnpvtc8a+sa8tTczopcQ+N4yL75GS50ybkAEHCOo0jrrQN5gqO2+yfwSaxuDOi koYwdDbeJgEeIiHfIPrAx4HN0hg608+w9U6xNz4Z7LLXxvZyqBs93q5fZPLjezIcAPnx McT772J2MliuIzOvda8sNEQTO3Kn5au26nrCQ2sjC20A5AHmoS/PhwbehaXRHktSH0qE FTkw== 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=9GG6R/Yg6y+F5KMKD6PeCoumED2ZkuLEgKXurPvTF8I=; b=jxX7yBcaJLeK4G+O3Xprygo7eHD+xidqy0SzN6VUU2GkZOGkX7wnjceh4w+Kz/v78Q DVoH+Kxaj5pmFhaJb2API9HuK+iAOwUt3WWBhsSNGMJvUDyRBk6U5XQL2Lr6te0xWwFz vtOhzihbt18yWDXWGlsrngmKq6/LL7t/adA3VdTue6t/Wq2Xh8EmXojrLneawy3qz/xk AJjdsyHFX0Xt0KBMOEjeH24odG0mJeIXifrVOTxHY4xkQG3ErxN4WXhXEMGLNUl2ktD6 QsoHlCCq5E0PT0TiGnbbRMnh9R0liUFW12c6Rc3sKyBdZEjjzjD66ukRcQyzyILFWBD/ aEHQ== X-Gm-Message-State: ALKqPwf54DQzEYA2IJLybNPYbM56JgY63X2XmFQfl/YxDDnIuDmqEQgw zld7krVJzSX+jn8T6+9VHbl8IJYt X-Google-Smtp-Source: AB8JxZrmQn/YgpUOIU3EpCFp0jr4xo0G3byeLzfwnYHDaEPwsFGp/7jHv6DVabdGDbSbgs4ZQEaDfg== X-Received: by 2002:a62:9b8d:: with SMTP id e13-v6mr515413pfk.157.1526076185999; Fri, 11 May 2018 15:03:05 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id r8-v6sm6311637pgn.2.2018.05.11.15.03.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 May 2018 15:03:05 -0700 (PDT) From: Florian Fainelli To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] soc: bcm: brcmstb: Add missing DDR MEMC compatible strings Date: Fri, 11 May 2018 15:02:42 -0700 Message-Id: <20180511220242.837-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180511220242.837-1-f.fainelli@gmail.com> References: <20180511220242.837-1-f.fainelli@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180511_150317_098674_7016416B X-CRM114-Status: GOOD ( 14.90 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , Florian Fainelli , open list , Rob Herring , "maintainer:BROADCOM BCM7XXX ARM ARCHITECTURE" , Justin Chen , Gregory Fong , Doug Berger , Brian Norris MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP We would not be matching the following chip/compatible strings combinations, which would lead to not setting the warm boot flag correctly, fix that: 7260A0/B0: brcm,brcmstb-memc-ddr-rev-b.2.1 7255A0: brcm,brcmstb-memc-ddr-rev-b.2.3 7278Bx: brcm,brcmstb-memc-ddr-rev-b.3.1 The B2.1 core (which is in 7260 A0 and B0) doesn't have the SHIMPHY_ADDR_CNTL_0_DDR_PAD_CNTRL setup in the memsys init code, nor does it have the warm boot flag re-definition on entry. Those changes were for B2.2 and later MEMSYS cores. Fall back to the previous S2/S3 entry method for these specific chips. Fixes: 0b741b8234c8 ("soc: bcm: brcmstb: Add support for S2/S3/S5 suspend states (ARM)") Signed-off-by: Florian Fainelli Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/arm/bcm/brcm,brcmstb.txt | 3 +++ drivers/soc/bcm/brcmstb/pm/pm-arm.c | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,brcmstb.txt b/Documentation/devicetree/bindings/arm/bcm/brcm,brcmstb.txt index fb762059e68e..104cc9b41df4 100644 --- a/Documentation/devicetree/bindings/arm/bcm/brcm,brcmstb.txt +++ b/Documentation/devicetree/bindings/arm/bcm/brcm,brcmstb.txt @@ -189,8 +189,11 @@ Power-Down (SRPD), among other things. Required properties: - compatible : should contain one of these + "brcm,brcmstb-memc-ddr-rev-b.2.1" "brcm,brcmstb-memc-ddr-rev-b.2.2" + "brcm,brcmstb-memc-ddr-rev-b.2.3" "brcm,brcmstb-memc-ddr-rev-b.3.0" + "brcm,brcmstb-memc-ddr-rev-b.3.1" "brcm,brcmstb-memc-ddr" - reg : the MEMC DDR register range diff --git a/drivers/soc/bcm/brcmstb/pm/pm-arm.c b/drivers/soc/bcm/brcmstb/pm/pm-arm.c index ade724677238..a5577dd5eb08 100644 --- a/drivers/soc/bcm/brcmstb/pm/pm-arm.c +++ b/drivers/soc/bcm/brcmstb/pm/pm-arm.c @@ -627,14 +627,26 @@ static const struct of_device_id ddr_shimphy_dt_ids[] = { }; static const struct of_device_id brcmstb_memc_of_match[] = { + { + .compatible = "brcm,brcmstb-memc-ddr-rev-b.2.1", + .data = &ddr_seq, + }, { .compatible = "brcm,brcmstb-memc-ddr-rev-b.2.2", .data = &ddr_seq_b22, }, + { + .compatible = "brcm,brcmstb-memc-ddr-rev-b.2.3", + .data = &ddr_seq_b22, + }, { .compatible = "brcm,brcmstb-memc-ddr-rev-b.3.0", .data = &ddr_seq_b22, }, + { + .compatible = "brcm,brcmstb-memc-ddr-rev-b.3.1", + .data = &ddr_seq_b22, + }, { .compatible = "brcm,brcmstb-memc-ddr", .data = &ddr_seq,