svn commit: r271330 - stable/10/sys/arm/freescale/imx

[Ian Lepore]

Author: ian
Date: Tue Sep  9 19:47:35 2014
New Revision: 271330
URL: http://svnweb.freebsd.org/changeset/base/271330

Log:
  MFC r270065:
  
    Move the imx6 sysctl temperature info to hw.imx6 where all the other
    soc-wide info lives.  It was under dev.imx6_anatop.0.
  
  Approved by:	re(gjb)

Modified:
  stable/10/sys/arm/freescale/imx/imx6_anatop.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/arm/freescale/imx/imx6_anatop.c
==============================================================================
--- stable/10/sys/arm/freescale/imx/imx6_anatop.c	Tue Sep  9 19:26:55 2014	(r271329)
+++ stable/10/sys/arm/freescale/imx/imx6_anatop.c	Tue Sep  9 19:47:35 2014	(r271330)
@@ -561,7 +561,6 @@ static void
 initialize_tempmon(struct imx6_anatop_softc *sc)
 {
 	uint32_t cal;
-	struct sysctl_ctx_list *ctx;
 
 	/*
 	 * Fetch calibration data: a sensor count at room temperature (25C),
@@ -605,11 +604,10 @@ initialize_tempmon(struct imx6_anatop_so
 	callout_reset_sbt(&sc->temp_throttle_callout, sc->temp_throttle_delay, 
 	    0, tempmon_throttle_check, sc, 0);
 
-	ctx = device_get_sysctl_ctx(sc->dev);
-	SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(device_get_sysctl_tree(sc->dev)),
+	SYSCTL_ADD_PROC(NULL, SYSCTL_STATIC_CHILDREN(_hw_imx6), 
 	    OID_AUTO, "temperature", CTLTYPE_INT | CTLFLAG_RD, sc, 0,
 	    temp_sysctl_handler, "IK", "Current die temperature");
-	SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(device_get_sysctl_tree(sc->dev)),
+	SYSCTL_ADD_PROC(NULL, SYSCTL_STATIC_CHILDREN(_hw_imx6), 
 	    OID_AUTO, "throttle_temperature", CTLTYPE_INT | CTLFLAG_RW, sc,
 	    0, temp_throttle_sysctl_handler, "IK", 
 	    "Throttle CPU when exceeding this temperature");