mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH v2 09/10] ARM: VFxxx: Detect cpu variant on start
Date: Fri, 20 Apr 2018 18:05:37 -0700	[thread overview]
Message-ID: <20180421010538.16488-10-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20180421010538.16488-1-andrew.smirnov@gmail.com>

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 arch/arm/mach-imx/Makefile               |  1 +
 arch/arm/mach-imx/imx.c                  |  2 +-
 arch/arm/mach-imx/include/mach/generic.h |  1 +
 arch/arm/mach-imx/vf610.c                | 47 ++++++++++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/mach-imx/vf610.c

diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index 8ec846cce..160ed4b08 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -15,6 +15,7 @@ obj-$(CONFIG_ARCH_IMX6) += imx6.o usb-imx6.o
 CFLAGS_imx6.o := -march=armv7-a
 lwl-$(CONFIG_ARCH_IMX6) += imx6-mmdc.o
 obj-$(CONFIG_ARCH_IMX7) += imx7.o
+obj-$(CONFIG_ARCH_VF610) += vf610.o
 obj-$(CONFIG_ARCH_IMX_XLOAD) += xload.o
 obj-$(CONFIG_IMX_IIM)	+= iim.o
 obj-$(CONFIG_IMX_OCOTP)	+= ocotp.o
diff --git a/arch/arm/mach-imx/imx.c b/arch/arm/mach-imx/imx.c
index 32d8e11a7..bf15f0b06 100644
--- a/arch/arm/mach-imx/imx.c
+++ b/arch/arm/mach-imx/imx.c
@@ -119,7 +119,7 @@ static int imx_init(void)
 	else if (cpu_is_mx7())
 		ret = imx7_init();
 	else if (cpu_is_vf610())
-		ret = 0;
+		ret = vf610_init();
 	else
 		return -EINVAL;
 
diff --git a/arch/arm/mach-imx/include/mach/generic.h b/arch/arm/mach-imx/include/mach/generic.h
index dedb4bbf0..ad9d9cb02 100644
--- a/arch/arm/mach-imx/include/mach/generic.h
+++ b/arch/arm/mach-imx/include/mach/generic.h
@@ -36,6 +36,7 @@ int imx51_init(void);
 int imx53_init(void);
 int imx6_init(void);
 int imx7_init(void);
+int vf610_init(void);
 
 int imx1_devices_init(void);
 int imx21_devices_init(void);
diff --git a/arch/arm/mach-imx/vf610.c b/arch/arm/mach-imx/vf610.c
new file mode 100644
index 000000000..c2d02632f
--- /dev/null
+++ b/arch/arm/mach-imx/vf610.c
@@ -0,0 +1,47 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <init.h>
+#include <common.h>
+#include <io.h>
+#include <linux/sizes.h>
+#include <mach/generic.h>
+#include <mach/revision.h>
+#include <mach/vf610.h>
+
+int vf610_init(void)
+{
+	const char *cputypestr;
+	void __iomem *src = IOMEM(VF610_SRC_BASE_ADDR);
+
+	switch (vf610_cpu_type()) {
+	case VF610_CPUTYPE_VF610:
+		cputypestr = "VF610";
+		break;
+	case VF610_CPUTYPE_VF600:
+		cputypestr = "VF600";
+		break;
+	case VF610_CPUTYPE_VF510:
+		cputypestr = "VF510";
+		break;
+	case VF610_CPUTYPE_VF500:
+		cputypestr = "VF500";
+		break;
+	default:
+		cputypestr = "unknown VFxxx";
+		break;
+	}
+
+	imx_set_silicon_revision(cputypestr, vf610_cpu_revision());
+	return 0;
+}
-- 
2.14.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2018-04-21  1:06 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-21  1:05 [PATCH v2 00/10] i.MX reset reason detection support Andrey Smirnov
2018-04-21  1:05 ` [PATCH v2 01/10] common: reset_source: Add the notion of "reset source instance" Andrey Smirnov
2018-04-21  1:05 ` [PATCH v2 02/10] ARM: i.MX: Add infrastructure to record SoC reset reason Andrey Smirnov
2018-04-21  1:05 ` [PATCH v2 03/10] ARM: i.MX6: Record reset reason as a part of startup Andrey Smirnov
2018-05-02 14:42   ` Jan Lübbe
2018-05-02 17:46     ` Andrey Smirnov
2018-05-03  7:36       ` Jan Lübbe
2018-04-21  1:05 ` [PATCH v2 04/10] ARM: i.MX7: " Andrey Smirnov
2018-04-21  1:05 ` [PATCH v2 05/10] common: reset_source: Introduce reset_source_name() Andrey Smirnov
2018-04-21  1:05 ` [PATCH v2 06/10] ARM: i.MX: Log detected reset reason Andrey Smirnov
2018-04-21  1:05 ` [PATCH v2 07/10] ARM: i.MX: Print "revision unknown" if that is the case Andrey Smirnov
2018-04-21  1:05 ` [PATCH v2 08/10] ARM: VFxxx: Add code to detect cpu variant Andrey Smirnov
2018-04-21  1:05 ` Andrey Smirnov [this message]
2018-04-21  1:05 ` [PATCH v2 10/10] ARM: VFxxx: Record reset reason as a part of startup Andrey Smirnov
2018-04-26 12:54 ` [PATCH v2 00/10] i.MX reset reason detection support Sascha Hauer

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=20180421010538.16488-10-andrew.smirnov@gmail.com \
    --to=andrew.smirnov@gmail.com \
    --cc=barebox@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