Author: ian
Date: Sat Feb 15 21:21:57 2014
New Revision: 261946
URL: http://svnweb.freebsd.org/changeset/base/261946
Log:
It turns out Freescale cleverly made the ocotp device compatible across
several different families of SoCs, so move it to the freescale directory
and prefix everything with fsl rather than imx6.
Added:
head/sys/arm/freescale/fsl_ocotp.c
- copied, changed from r261943, head/sys/arm/freescale/imx/imx6_ocotp.c
head/sys/arm/freescale/fsl_ocotpreg.h
- copied, changed from r261943, head/sys/arm/freescale/imx/imx6_ocotpreg.h
head/sys/arm/freescale/fsl_ocotpvar.h
- copied, changed from r261943, head/sys/arm/freescale/imx/imx6_ocotpvar.h
Deleted:
head/sys/arm/freescale/imx/imx6_ocotp.c
head/sys/arm/freescale/imx/imx6_ocotpreg.h
head/sys/arm/freescale/imx/imx6_ocotpvar.h
Modified:
head/sys/arm/freescale/imx/files.imx6
Copied and modified: head/sys/arm/freescale/fsl_ocotp.c (from r261943,
head/sys/arm/freescale/imx/imx6_ocotp.c)
==============================================================================
--- head/sys/arm/freescale/imx/imx6_ocotp.c Sat Feb 15 18:36:31 2014
(r261943, copy source)
+++ head/sys/arm/freescale/fsl_ocotp.c Sat Feb 15 21:21:57 2014
(r261946)
@@ -43,9 +43,8 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
-#include <arm/freescale/imx/imx6_ocotpreg.h>
-#include <arm/freescale/imx/imx6_ocotpvar.h>
-#include <arm/freescale/imx/imx_machdep.h>
+#include <arm/freescale/fsl_ocotpreg.h>
+#include <arm/freescale/fsl_ocotpvar.h>
struct ocotp_softc {
device_t dev;
@@ -112,7 +111,7 @@ ocotp_probe(device_t dev)
if (!ofw_bus_status_okay(dev))
return (ENXIO);
- if (ofw_bus_is_compatible(dev, "fsl,imx6q-ocotp") == 0)
+ if (ofw_bus_is_compatible(dev, "fsl,fslq-ocotp") == 0)
return (ENXIO);
device_set_desc(dev,
@@ -122,14 +121,14 @@ ocotp_probe(device_t dev)
}
uint32_t
-imx6_ocotp_read_4(bus_size_t off)
+fsl_ocotp_read_4(bus_size_t off)
{
if (ocotp_sc == NULL)
- panic("imx6_ocotp_read_4: softc not set!");
+ panic("fsl_ocotp_read_4: softc not set!");
- if (off > IMX6_OCOTP_LAST_REG)
- panic("imx6_ocotp_read_4: offset out of range");
+ if (off > FSL_OCOTP_LAST_REG)
+ panic("fsl_ocotp_read_4: offset out of range");
return (RD4(ocotp_sc, off));
}
Copied and modified: head/sys/arm/freescale/fsl_ocotpreg.h (from r261943,
head/sys/arm/freescale/imx/imx6_ocotpreg.h)
==============================================================================
--- head/sys/arm/freescale/imx/imx6_ocotpreg.h Sat Feb 15 18:36:31 2014
(r261943, copy source)
+++ head/sys/arm/freescale/fsl_ocotpreg.h Sat Feb 15 21:21:57 2014
(r261946)
@@ -26,56 +26,56 @@
* $FreeBSD$
*/
-#ifndef IMX6_OCOTPREG_H
-#define IMX6_OCOTPREG_H
+#ifndef FSL_OCOTPREG_H
+#define FSL_OCOTPREG_H
-#define IMX6_OCOTP_CTRL 0x000
-#define IMX6_OCOTP_CTRL_SET 0x004
-#define IMX6_OCOTP_CTRL_CLR 0x008
-#define IMX6_OCOTP_CTRL_TOG 0x00C
-#define IMX6_OCOTP_TIMING 0x010
-#define IMX6_OCOTP_DATA 0x020
-#define IMX6_OCOTP_READ_CTRL 0x030
-#define IMX6_OCOTP_READ_FUSE_DATA 0x040
-#define IMX6_OCOTP_SW_STICKY 0x050
-#define IMX6_OCOTP_SCS 0x060
-#define IMX6_OCOTP_SCS_SET 0x064
-#define IMX6_OCOTP_SCS_CLR 0x068
-#define IMX6_OCOTP_SCS_TOG 0x06C
-#define IMX6_OCOTP_VERSION 0x090
-#define IMX6_OCOTP_LOCK 0x400
-#define IMX6_OCOTP_CFG0 0x410
-#define IMX6_OCOTP_CFG1 0x420
-#define IMX6_OCOTP_CFG2 0x430
-#define IMX6_OCOTP_CFG3 0x440
-#define IMX6_OCOTP_CFG4 0x450
-#define IMX6_OCOTP_CFG5 0x460
-#define IMX6_OCOTP_CFG6 0x470
-#define IMX6_OCOTP_MEM0 0x480
-#define IMX6_OCOTP_MEM1 0x490
-#define IMX6_OCOTP_MEM2 0x4A0
-#define IMX6_OCOTP_MEM3 0x4B0
-#define IMX6_OCOTP_ANA0 0x4D0
-#define IMX6_OCOTP_ANA1 0x4E0
-#define IMX6_OCOTP_ANA2 0x4F0
-#define IMX6_OCOTP_SRK0 0x580
-#define IMX6_OCOTP_SRK1 0x590
-#define IMX6_OCOTP_SRK2 0x5A0
-#define IMX6_OCOTP_SRK3 0x5B0
-#define IMX6_OCOTP_SRK4 0x5C0
-#define IMX6_OCOTP_SRK5 0x5D0
-#define IMX6_OCOTP_SRK6 0x5E0
-#define IMX6_OCOTP_SRK7 0x5F0
-#define IMX6_OCOTP_HSJC_RESP0 0x600
-#define IMX6_OCOTP_HSJC_RESP1 0x610
-#define IMX6_OCOTP_MAC0 0x620
-#define IMX6_OCOTP_MAC1 0x630
-#define IMX6_OCOTP_GP1 0x660
-#define IMX6_OCOTP_GP2 0x670
-#define IMX6_OCOTP_MISC_CONF 0x6D0
-#define IMX6_OCOTP_FIELD_RETURN 0x6E0
-#define IMX6_OCOTP_SRK_REVOKE 0x6F0
+#define FSL_OCOTP_CTRL 0x000
+#define FSL_OCOTP_CTRL_SET 0x004
+#define FSL_OCOTP_CTRL_CLR 0x008
+#define FSL_OCOTP_CTRL_TOG 0x00C
+#define FSL_OCOTP_TIMING 0x010
+#define FSL_OCOTP_DATA 0x020
+#define FSL_OCOTP_READ_CTRL 0x030
+#define FSL_OCOTP_READ_FUSE_DATA 0x040
+#define FSL_OCOTP_SW_STICKY 0x050
+#define FSL_OCOTP_SCS 0x060
+#define FSL_OCOTP_SCS_SET 0x064
+#define FSL_OCOTP_SCS_CLR 0x068
+#define FSL_OCOTP_SCS_TOG 0x06C
+#define FSL_OCOTP_VERSION 0x090
+#define FSL_OCOTP_LOCK 0x400
+#define FSL_OCOTP_CFG0 0x410
+#define FSL_OCOTP_CFG1 0x420
+#define FSL_OCOTP_CFG2 0x430
+#define FSL_OCOTP_CFG3 0x440
+#define FSL_OCOTP_CFG4 0x450
+#define FSL_OCOTP_CFG5 0x460
+#define FSL_OCOTP_CFG6 0x470
+#define FSL_OCOTP_MEM0 0x480
+#define FSL_OCOTP_MEM1 0x490
+#define FSL_OCOTP_MEM2 0x4A0
+#define FSL_OCOTP_MEM3 0x4B0
+#define FSL_OCOTP_ANA0 0x4D0
+#define FSL_OCOTP_ANA1 0x4E0
+#define FSL_OCOTP_ANA2 0x4F0
+#define FSL_OCOTP_SRK0 0x580
+#define FSL_OCOTP_SRK1 0x590
+#define FSL_OCOTP_SRK2 0x5A0
+#define FSL_OCOTP_SRK3 0x5B0
+#define FSL_OCOTP_SRK4 0x5C0
+#define FSL_OCOTP_SRK5 0x5D0
+#define FSL_OCOTP_SRK6 0x5E0
+#define FSL_OCOTP_SRK7 0x5F0
+#define FSL_OCOTP_HSJC_RESP0 0x600
+#define FSL_OCOTP_HSJC_RESP1 0x610
+#define FSL_OCOTP_MAC0 0x620
+#define FSL_OCOTP_MAC1 0x630
+#define FSL_OCOTP_GP1 0x660
+#define FSL_OCOTP_GP2 0x670
+#define FSL_OCOTP_MISC_CONF 0x6D0
+#define FSL_OCOTP_FIELD_RETURN 0x6E0
+#define FSL_OCOTP_SRK_REVOKE 0x6F0
-#define IMX6_OCOTP_LAST_REG IMX6_OCOTP_SRK_REVOKE
+#define FSL_OCOTP_LAST_REG FSL_OCOTP_SRK_REVOKE
#endif
Copied and modified: head/sys/arm/freescale/fsl_ocotpvar.h (from r261943,
head/sys/arm/freescale/imx/imx6_ocotpvar.h)
==============================================================================
--- head/sys/arm/freescale/imx/imx6_ocotpvar.h Sat Feb 15 18:36:31 2014
(r261943, copy source)
+++ head/sys/arm/freescale/fsl_ocotpvar.h Sat Feb 15 21:21:57 2014
(r261946)
@@ -26,9 +26,9 @@
* $FreeBSD$
*/
-#ifndef IMX6_OCOTPVAR_H
-#define IMX6_OCOTPVAR_H
+#ifndef FSL_OCOTPVAR_H
+#define FSL_OCOTPVAR_H
-uint32_t imx6_ocotp_read_4(bus_size_t _offset);
+uint32_t fsl_ocotp_read_4(bus_size_t _offset);
#endif
Modified: head/sys/arm/freescale/imx/files.imx6
==============================================================================
--- head/sys/arm/freescale/imx/files.imx6 Sat Feb 15 20:45:53 2014
(r261945)
+++ head/sys/arm/freescale/imx/files.imx6 Sat Feb 15 21:21:57 2014
(r261946)
@@ -17,13 +17,12 @@ kern/kern_clocksource.c standard
arm/arm/gic.c standard
arm/arm/pl310.c standard
arm/arm/bus_space-v6.c standard
+arm/freescale/fsl_ocotp.c standard
arm/freescale/imx/common.c standard
arm/freescale/imx/imx6_anatop.c standard
arm/freescale/imx/imx6_ccm.c standard
arm/freescale/imx/imx6_machdep.c standard
arm/freescale/imx/imx6_pl310.c standard
-arm/freescale/imx/imx6_ocotp.c standard
-arm/freescale/imx/imx6_tempmon.c standard
arm/freescale/imx/imx_machdep.c standard
arm/freescale/imx/imx_gpt.c standard
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
