From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751835AbdJLNrt (ORCPT ); Thu, 12 Oct 2017 09:47:49 -0400 Received: from mail-wm0-f43.google.com ([74.125.82.43]:43641 "EHLO mail-wm0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751339AbdJLNrr (ORCPT ); Thu, 12 Oct 2017 09:47:47 -0400 X-Google-Smtp-Source: AOwi7QDoof5WOYIUbzkAdvS4KOWl+6T/xEmwNXeKa89V3IkAYEMhO1sGLV85H3fisFo8LL+ZPR+B/A== 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: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@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 */ }, }; -- 2.13.6 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jerome Brunet 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> Return-path: Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Kevin Hilman , Carlo Caione Cc: Jerome Brunet , devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-amlogic-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: 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 */ }, }; -- 2.13.6 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 From: jbrunet@baylibre.com (Jerome Brunet) Date: Thu, 12 Oct 2017 15:47:43 +0200 Subject: [PATCH] firmware: meson-sm: use generic compatible Message-ID: <20171012134743.10625-1-jbrunet@baylibre.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.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 */ }, }; -- 2.13.6 From mboxrd@z Thu Jan 1 00:00:00 1970 From: jbrunet@baylibre.com (Jerome Brunet) Date: Thu, 12 Oct 2017 15:47:43 +0200 Subject: [PATCH] firmware: meson-sm: use generic compatible Message-ID: <20171012134743.10625-1-jbrunet@baylibre.com> To: linus-amlogic@lists.infradead.org List-Id: linus-amlogic.lists.infradead.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 */ }, }; -- 2.13.6