linux-amlogic.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: carlo@caione.org (Carlo Caione)
To: linus-amlogic@lists.infradead.org
Subject: [PATCH v3 6/6] ARM64: dts: amlogic: gxbb: Enable NVMEM
Date: Sat, 27 Aug 2016 15:43:48 +0200	[thread overview]
Message-ID: <1472305428-16874-7-git-send-email-carlo@caione.org> (raw)
In-Reply-To: <1472305428-16874-1-git-send-email-carlo@caione.org>

From: Carlo Caione <carlo@endlessm.com>

Add the NVMEM device node in the DTSI.

Signed-off-by: Carlo Caione <carlo@endlessm.com>
---
 arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 18 ++++++++++++++++++
 drivers/firmware/meson/meson_sm.c           |  3 ++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
index ca428e8..aea8fd6 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
@@ -105,6 +105,24 @@
 		};
 	};
 
+	efuse: efuse {
+		compatible = "amlogic,meson-gxbb-efuse";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		sn: sn at 14 {
+			reg = <0x14 0x10>;
+		};
+
+		eth_mac: eth_mac at 34 {
+			reg = <0x34 0x10>;
+		};
+
+		bid: bid at 46 {
+			reg = <0x46 0x30>;
+		};
+	};
+
 	timer {
 		compatible = "arm,armv8-timer";
 		interrupts = <GIC_PPI 13
diff --git a/drivers/firmware/meson/meson_sm.c b/drivers/firmware/meson/meson_sm.c
index bba594e..b0d2549 100644
--- a/drivers/firmware/meson/meson_sm.c
+++ b/drivers/firmware/meson/meson_sm.c
@@ -21,6 +21,7 @@
 #include <linux/of_device.h>
 #include <linux/printk.h>
 #include <linux/types.h>
+#include <linux/sizes.h>
 
 #include <linux/firmware/meson/meson_sm.h>
 
@@ -38,7 +39,7 @@ struct meson_sm_chip {
 };
 
 struct meson_sm_chip gxbb_chip = {
-	.shmem_size		= 0x1000,
+	.shmem_size		= SZ_4K,
 	.cmd_shmem_in_base	= 0x82000020,
 	.cmd_shmem_out_base	= 0x82000021,
 	.cmd = {
-- 
2.7.4

  parent reply	other threads:[~2016-08-27 13:43 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-27 13:43 [PATCH v3 0/6] Add Amlogic secure monitor and NVMEM drivers Carlo Caione
2016-08-27 13:43 ` [PATCH v3 1/6] firmware: Amlogic: Add secure monitor driver Carlo Caione
2016-08-27 13:43 ` [PATCH v3 2/6] documentation: Add secure monitor bindings documentation Carlo Caione
2016-08-27 13:43 ` [PATCH v3 3/6] ARM64: dts: amlogic: gxbb: Enable secure monitor Carlo Caione
2016-08-27 13:43 ` [PATCH v3 4/6] nvmem: amlogic: Add Amlogic Meson EFUSE driver Carlo Caione
2016-08-27 13:43 ` [PATCH v3 5/6] documentation: Add nvmem bindings documentation Carlo Caione
2016-08-27 13:43 ` Carlo Caione [this message]
2016-09-01 21:26   ` [PATCH v3 6/6] ARM64: dts: amlogic: gxbb: Enable NVMEM Kevin Hilman
2016-09-01 21:28     ` Carlo Caione
2016-08-27 13:47 ` [PATCH v3 0/6] Add Amlogic secure monitor and NVMEM drivers Carlo Caione
2016-09-01 21:27   ` Kevin Hilman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1472305428-16874-7-git-send-email-carlo@caione.org \
    --to=carlo@caione.org \
    --cc=linus-amlogic@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).