From patchwork Fri Jan 19 21:52:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Mayer X-Patchwork-Id: 13524207 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F4219C4725D for ; Fri, 19 Jan 2024 21:53:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2Q7+mxYFB15iUzUDoi2qKtgNYekKDBmNYvM/7f2qfmA=; b=uXUiClO/2bZRKy KeQLiXeDBB3jfg7/GGgARhz+f22w8P2vITG3FAGBRsbJAC8FzzLX7XcoXLw+9GfRKDsnJm0JHnfOM OCWNzjV49GI4FMF79lao3iGbqEC2P33DgYtHe6qbGTc0AqhO4+la9XPGlWH9+yFSS2dWtiiVwZUHP 8uAYW51JQx/Ya+309L9Sa7NXGV7L4Vot+YWwzK2C6ZQOTi+yTiAeMjJtkCGaBEQOZRC/4lq5T9Gkn zlht6TvskcMJdpqdrETdnqVix4E5w0MeDUJRPRAz028VRqw66F72UyxghAZuaMw7HcqOEKJ1SyVZ2 Cytbk5uOGU7n+DsWhznQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rQwnk-006iD7-13; Fri, 19 Jan 2024 21:53:24 +0000 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rQwni-006iAi-18 for linux-arm-kernel@lists.infradead.org; Fri, 19 Jan 2024 21:53:23 +0000 Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-6d9bd8adb9aso240761b3a.0 for ; Fri, 19 Jan 2024 13:53:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1705701197; x=1706305997; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=e3iQb1vl+tt2av6kIa+SOa0cwuFC4+nUXcEhLuomvqc=; b=UqOWvDJK6vjT/2eVPRbiSrTAdWeEpikCoGuA9bna482c7R46lebVAH1Ng+0YTizxL6 QdzIwX83Yi4ww334NFbbnLZERUPFYZ2wMFbmQ6PgogWGXUrz3twlRE3ohzPLZ85mOPGw QTUJuZhJatPkqkyHPr+TtdIrysB8FUiCldwD8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705701197; x=1706305997; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=e3iQb1vl+tt2av6kIa+SOa0cwuFC4+nUXcEhLuomvqc=; b=JQp8SEPBpximVfrIw2StcwJ/xjf/f6Ek6Pi91BUq5//Q31nt5qx204cQX9hLrgqHzf ovBriMXpdoVDgqhdjKsOfBudkPqRG0XJrOJ7aDE8D/1G2qnG+csVuuIRsQaukzlfcUle hVY5MquG5vzy+jgOaGMMGa+50tdCyyc+DjO5AC1GbR1+FxbRrk02ZCpHSHBETWzRsTg2 d5x9BRdI/37+ALmoR9APEmVTC7g9tY5ymtbh5Rzn8L5iiR21YYEXj4J/kW3DckGQW9CG ASKOtWt4E0Z9xNb8WeebG50jqEZj0zIAuD/ao4eVwnxjHNnXFz3z0tSc0VLfVMIl19Ln 6vUg== X-Gm-Message-State: AOJu0Yz6RiF2DlG3RoAOVwhoxNllCRbUH+sgnJWyVuijAP3umgKBGdNg 0FXOy3N0IWu47PIkYXOOyUtvPeqGcsq7G5kPETOYTgqLbJWKu+H3rbGyE7jt0bpvvDJBCE2WY7k aCw== X-Google-Smtp-Source: AGHT+IGJOeudGh/LDX95kyvunwaEN6ukvUq3VCgqlAc5PFouWEfgKBcnQl48s8FXBeJr0q/DMf/WWQ== X-Received: by 2002:a05:6a20:9586:b0:19b:20e7:d6b2 with SMTP id iu6-20020a056a20958600b0019b20e7d6b2mr905782pzb.3.1705701196949; Fri, 19 Jan 2024 13:53:16 -0800 (PST) Received: from lbrmn-mmayer.ric.broadcom.net ([192.19.161.248]) by smtp.gmail.com with ESMTPSA id 13-20020a63194d000000b005cdb499acd0sm3891325pgz.42.2024.01.19.13.53.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jan 2024 13:53:16 -0800 (PST) Received: by lbrmn-mmayer.ric.broadcom.net (Postfix, from userid 1000) id 8AC30898; Fri, 19 Jan 2024 13:53:15 -0800 (PST) From: Markus Mayer To: Krzysztof Kozlowski , Florian Fainelli , Rob Herring , Conor Dooley Cc: Markus Mayer , Linux ARM Kernel List , Device Tree Mailing List Subject: [PATCH v2 4/5] memory: brcmstb_dpfe: introduce version-specific compatible strings Date: Fri, 19 Jan 2024 13:52:27 -0800 Message-ID: <20240119215231.758844-5-mmayer@broadcom.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240119215231.758844-1-mmayer@broadcom.com> References: <20240119215231.758844-1-mmayer@broadcom.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240119_135322_386420_098276EE X-CRM114-Status: GOOD ( 14.40 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Introduce compatible strings brcm,dpfe-cpu-v1 through brcm,dpfe-cpu-v3 to the Broadcom DPFE driver. Signed-off-by: Markus Mayer --- drivers/memory/brcmstb_dpfe.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/memory/brcmstb_dpfe.c b/drivers/memory/brcmstb_dpfe.c index a7ab3d377206..a44a70d028f6 100644 --- a/drivers/memory/brcmstb_dpfe.c +++ b/drivers/memory/brcmstb_dpfe.c @@ -924,7 +924,20 @@ static const struct of_device_id brcmstb_dpfe_of_match[] = { { .compatible = "brcm,bcm7271-dpfe-cpu", .data = &dpfe_api_old_v2 }, { .compatible = "brcm,bcm7278-dpfe-cpu", .data = &dpfe_api_old_v2 }, { .compatible = "brcm,bcm7211-dpfe-cpu", .data = &dpfe_api_new_v2 }, - /* API v3 is the default going forward */ + + /* + * Match the DPFE API flavour based on a versioned compatible string + * that tells us which API version the hardware speaks. + */ + { .compatible = "brcm,dpfe-cpu-v1", .data = &dpfe_api_old_v2 }, + { .compatible = "brcm,dpfe-cpu-v2", .data = &dpfe_api_new_v2 }, + { .compatible = "brcm,dpfe-cpu-v3", .data = &dpfe_api_v3 }, + + /* + * This "default" compatible string should no longer be used. It has + * been removed from the binding but kept here for backward + * compatibility. + */ { .compatible = "brcm,dpfe-cpu", .data = &dpfe_api_v3 }, {} };