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: 824865 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=devicetree-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="YeY/Fa9V"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yCXGt1yQvz9t3B for ; Fri, 13 Oct 2017 00:47:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751394AbdJLNrs (ORCPT ); Thu, 12 Oct 2017 09:47:48 -0400 Received: from mail-wm0-f44.google.com ([74.125.82.44]:43641 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751356AbdJLNrr (ORCPT ); Thu, 12 Oct 2017 09:47:47 -0400 Received: by mail-wm0-f44.google.com with SMTP id m72so24106295wmc.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=hKicBM8iiMr4gvGvEmaSnIRWTyFG5GdLpB+TuYyD7fnAz9whFa91oUHNR0NMeZaBau CIqwclJ4OFF5lz11iu3a/+5aa/wquodYrpL/6tMinXQpAkynzjqBqSCZghfs8AZnNwNw 1v/MkxygI+wZo9fqi9c1ffjr96K7GyA4BO2KdlbuBDJcUWasPtcf4h3B8X8Hq6Rabks1 6o5iqghm30Zi6DtWmcK6fEVEkJ/fU3bLdKBWMQH9HeIjTmfdYiiyHZeZF1VQaLzhjrgd hw2KOisLWLJiJpi8sdsGdiBuAPzPdKYb/BaQuwsC+UCGxfc9c0zlSJxPfFsX7B3VsVkk t+MQ== X-Gm-Message-State: AMCzsaUT7JoD2GtwZd/Pj/SukMPt5+yvEJn+tNzN0Lfh80qZTdO4HFOb mZY/qfxatwpUs1IX9v3InIN+pw== 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 Cc: Jerome Brunet , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org 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 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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 */ }, };