From patchwork Thu Oct 12 13:47:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 10002051 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 5353160325 for ; Thu, 12 Oct 2017 13:48:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4314828DBD for ; Thu, 12 Oct 2017 13:48:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3730628DE3; Thu, 12 Oct 2017 13:48:43 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 DECDF28DBD for ; Thu, 12 Oct 2017 13:48:42 +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: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:In-Reply-To: References:List-Owner; bh=bNTcpJXnpBv224T7wk46rqVKwxoc91Yx9OBi5fJde8s=; b=IDW A/wv4Fc1G61vmkCYxfknNXUmRbs5aTT/tpg6gGPxnGnq/ut3PnezB6VDHC6fgYwajF7CX/lHeES0W VStq8xaTJD0uBJud1IfnO6c1qUivQNkGX+NMX6tqG04M6EcUK2Y9ez2AFZM+YRlmJV/oqGDaQqxac 9Fdk2BjoaVgGFYaMiZ4OaLbDwEbYK4vAQH0vid6jeaatbovbCNke+vBFy5xlbOmbxl+zBk3Vcsx+a ZGA45rNsRtDR91BYEB+miiWKfL2+Vyq3rnO2uZ+VOtthVrHi/kaLtsfpzQhkHjX53/salqutd/tIE 9JH7m+nUBfVO2tKYmQzBN5TYESCtu2g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1e2dqe-0002Q7-SE; Thu, 12 Oct 2017 13:48:28 +0000 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e2dqK-0001sr-EH for linux-amlogic@lists.infradead.org; Thu, 12 Oct 2017 13:48:14 +0000 Received: by mail-wm0-x231.google.com with SMTP id m72so24106296wmc.0 for ; Thu, 12 Oct 2017 06:47:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=DNy6AKpInNJT//SV1euRunaevri6Ds4f9+Q+9A10WL8=; b=YeY/Fa9VfRQgiiRDpkA+igff9SDG4hZAortuaEUtn5RRzvzvG6Bz/cnGWOptjhnXYh gUVijREVmf5/oYtsHHaG04T6miT4pwXvgLbDJxuIjx9P4a1ICB64l/+NLtgQbaeQxpOl DAqd7iDCNEeE1Rs+iO1rrzBfg9Sw/rV+2wCB2mp2RnEwrW58iAXbjFMjwQcEw4RQIbOc mpMj9iZzsaMFDaOQlC1rqAuZY+o/9TgeNTqjjtEkDaFMhc0gZSLsE1wkZfnY4W0GYaGo 4tkAU4XOeK02hR7QxTmG50N7Vh8uwoa3224BUwgaRvmc68PxqjFFvknL3epVHqoA5E/L 9jQg== 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; bh=DNy6AKpInNJT//SV1euRunaevri6Ds4f9+Q+9A10WL8=; b=BbYHE7U5JqHJyLPP52x8CmZxEF0hwWq2yLM7XunGHYwJwwicl/Q6IHjk3qxJ2XtO23 CmYu/s2BCgetZysnMETVG3SP8FazTb1VJHSrNMoj04fOXZpol8nSTY7+lQID6yvG3syp aJ13w2TXnIZOMXVgyruD27jLv206f2BidpXbLTKO0SXspT4GLnu86OsXAclpKMkmYOg1 kFouc8sZuMYVXtJuEEUpZ494pMDNIaW77IG7p2GSyqkFtzP+aMSHbIRAPAqwXy8jevmj mScJMtk00Pisb5DoMPeQXR1J7vysADh5TkHQJ+xMovYAjkjNR1Qw0ci+pBqcw3Zr7RD0 fG8Q== X-Gm-Message-State: AMCzsaVcHENhyuGO8FL1jpmM7OjkV/jLRZyVGdkFjWxVi3DGMNMDmQW2 VvEvn072/IVkN3J7VumveLot6g== X-Google-Smtp-Source: AOwi7QDoof5WOYIUbzkAdvS4KOWl+6T/xEmwNXeKa89V3IkAYEMhO1sGLV85H3fisFo8LL+ZPR+B/A== X-Received: by 10.223.134.25 with SMTP id 25mr2399120wrv.186.1507816066450; Thu, 12 Oct 2017 06:47:46 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id o20sm18210907wro.71.2017.10.12.06.47.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 12 Oct 2017 06:47:45 -0700 (PDT) From: Jerome Brunet To: Kevin Hilman , Carlo Caione Subject: [PATCH] firmware: meson-sm: use generic compatible Date: Thu, 12 Oct 2017 15:47:43 +0200 Message-Id: <20171012134743.10625-1-jbrunet@baylibre.com> X-Mailer: git-send-email 2.13.6 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171012_064808_704914_9B45B677 X-CRM114-Status: GOOD ( 10.37 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jerome Brunet MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The meson secure monitor seems to be compatible with more SoCs than initially thought. Let's use the most generic compatible he have in DT instead of the gxbb specific one Signed-off-by: Jerome Brunet --- Documentation/devicetree/bindings/firmware/meson/meson_sm.txt | 4 ++-- drivers/firmware/meson/meson_sm.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/firmware/meson/meson_sm.txt b/Documentation/devicetree/bindings/firmware/meson/meson_sm.txt index c248cd44f727..13a7815ac2b9 100644 --- a/Documentation/devicetree/bindings/firmware/meson/meson_sm.txt +++ b/Documentation/devicetree/bindings/firmware/meson/meson_sm.txt @@ -4,12 +4,12 @@ In the Amlogic SoCs the Secure Monitor code is used to provide access to the NVMEM, enable JTAG, set USB boot, etc... Required properties for the secure monitor node: -- compatible: Should be "amlogic,meson-gxbb-sm" +- compatible: Should be "amlogic,meson-gx-sm" Example: firmware { sm: secure-monitor { - compatible = "amlogic,meson-gxbb-sm"; + compatible = "amlogic,meson-gx-sm"; }; }; diff --git a/drivers/firmware/meson/meson_sm.c b/drivers/firmware/meson/meson_sm.c index ff204421117b..c83f7be2b1f4 100644 --- a/drivers/firmware/meson/meson_sm.c +++ b/drivers/firmware/meson/meson_sm.c @@ -38,7 +38,7 @@ struct meson_sm_chip { struct meson_sm_cmd cmd[]; }; -struct meson_sm_chip gxbb_chip = { +struct meson_sm_chip gx_chip = { .shmem_size = SZ_4K, .cmd_shmem_in_base = 0x82000020, .cmd_shmem_out_base = 0x82000021, @@ -213,7 +213,7 @@ int meson_sm_call_write(void *buffer, unsigned int size, unsigned int cmd_index, EXPORT_SYMBOL(meson_sm_call_write); static const struct of_device_id meson_sm_ids[] = { - { .compatible = "amlogic,meson-gxbb-sm", .data = &gxbb_chip }, + { .compatible = "amlogic,meson-gx-sm", .data = &gx_chip }, { /* sentinel */ }, };