[src/trunk]: src/sys/arch/arm/imx forgot to commit about changes of ccm

[ryo <ryo%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ec6fb618673a
branches:  trunk
changeset: 332742:ec6fb618673a
user:      ryo <ryo%NetBSD.org@localhost>
date:      Tue Oct 07 09:32:47 2014 +0000

description:
forgot to commit about changes of ccm

diffstat:

 sys/arch/arm/imx/imx6var.h |  21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diffs (54 lines):

diff -r b4431fe69244 -r ec6fb618673a sys/arch/arm/imx/imx6var.h
--- a/sys/arch/arm/imx/imx6var.h        Tue Oct 07 08:45:02 2014 +0000
+++ b/sys/arch/arm/imx/imx6var.h        Tue Oct 07 09:32:47 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: imx6var.h,v 1.1 2014/09/25 05:05:28 ryo Exp $  */
+/*     $NetBSD: imx6var.h,v 1.2 2014/10/07 09:32:47 ryo Exp $  */
 
 /*
  * Copyright (c) 2014 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@
  */
 
 #ifndef _ARM_IMX_IMX6VAR_H
-#define        _ARM_IMX_IMX6VAR_H
+#define _ARM_IMX_IMX6VAR_H
 
 #include <sys/cdefs.h>
 
@@ -46,15 +46,10 @@
 extern bus_space_tag_t imx6_armcore_bst;
 extern bus_space_handle_t imx6_armcore_bsh;
 
-/* gpio utility functions in imxgpio.c */
-void gpio_set_direction(uint32_t, uint32_t);
-void gpio_data_write(uint32_t, uint32_t);
-bool gpio_data_read(uint32_t);
-
 /* iomux utility functions in imx6_iomux.c */
 struct iomux_conf {
        u_int pin;
-#define        IOMUX_CONF_EOT  ((u_int)(-1))
+#define IOMUX_CONF_EOT ((u_int)(-1))
        u_short mux;
        u_short pad;
 };
@@ -69,8 +64,18 @@
 /* imx6_board.c */
 void imx6_bootstrap(vaddr_t);
 psize_t imx6_memprobe(void);
+uint32_t imx6_armrootclk(void);
 void imx6_reset(void) __dead;
 void imx6_device_register(device_t, void *);
 void imx6_cpu_hatch(struct cpu_info *);
+uint32_t imx6_chip_id(void);
+#define CHIPID_MINOR_MASK              0x000000ff
+#define CHIPID_MAJOR_MASK              0x00ffff00
+#define CHIPID_MAJOR_IMX6SL            0x00600000
+#define CHIPID_MAJOR_IMX6DL            0x00610000
+#define CHIPID_MAJOR_IMX6SOLO          0x00620000
+#define CHIPID_MAJOR_IMX6Q             0x00630000
+#define IMX6_CHIPID_MAJOR(v)           ((v) & CHIPID_MAJOR_MASK)
+#define IMX6_CHIPID_MINOR(v)           ((v) & CHIPID_MINOR_MASK)
 
 #endif /* _ARM_IMX_IMX6VAR_H */