svn commit: r306551 - head/sys/arm/nvidia/tegra124

[Michal Meloun]

Author: mmel
Date: Sat Oct  1 06:50:16 2016
New Revision: 306551
URL: https://svnweb.freebsd.org/changeset/base/306551

Log:
  TEGRA: Fix bindings for cpufreq and coretemp drivers,
  it was broken in r306477.
  Correct a description for coretemp driver.

Modified:
  head/sys/arm/nvidia/tegra124/tegra124_coretemp.c
  head/sys/arm/nvidia/tegra124/tegra124_cpufreq.c

Modified: head/sys/arm/nvidia/tegra124/tegra124_coretemp.c
==============================================================================
--- head/sys/arm/nvidia/tegra124/tegra124_coretemp.c	Sat Oct  1 03:35:03 2016	(r306550)
+++ head/sys/arm/nvidia/tegra124/tegra124_coretemp.c	Sat Oct  1 06:50:16 2016	(r306551)
@@ -179,9 +179,9 @@ static void
 tegra124_coretemp_identify(driver_t *driver, device_t parent)
 {
 
-	if (device_find_child(parent, "tegra124_coretemp", -1) != NULL)
+	if (device_find_child(parent, "coretemp", -1) != NULL)
 		return;
-	if (BUS_ADD_CHILD(parent, 0, "tegra124_coretemp", -1) == NULL)
+	if (BUS_ADD_CHILD(parent, 0, "coretemp", -1) == NULL)
 		device_printf(parent, "add child failed\n");
 }
 
@@ -189,7 +189,7 @@ static int
 tegra124_coretemp_probe(device_t dev)
 {
 
-	device_set_desc(dev, "CPU Frequency Control");
+	device_set_desc(dev, "CPU Thermal Sensor");
 	return (0);
 }
 

Modified: head/sys/arm/nvidia/tegra124/tegra124_cpufreq.c
==============================================================================
--- head/sys/arm/nvidia/tegra124/tegra124_cpufreq.c	Sat Oct  1 03:35:03 2016	(r306550)
+++ head/sys/arm/nvidia/tegra124/tegra124_cpufreq.c	Sat Oct  1 06:50:16 2016	(r306551)
@@ -476,6 +476,8 @@ static void
 tegra124_cpufreq_identify(driver_t *driver, device_t parent)
 {
 
+	if (device_get_unit(parent) != 0)
+		return;
 	if (device_find_child(parent, "tegra124_cpufreq", -1) != NULL)
 		return;
 	if (BUS_ADD_CHILD(parent, 0, "tegra124_cpufreq", -1) == NULL)
@@ -486,8 +488,6 @@ static int
 tegra124_cpufreq_probe(device_t dev)
 {
 
-	if (device_get_unit(dev) != 0)
-		return (ENXIO);
 	device_set_desc(dev, "CPU Frequency Control");
 
 	return (0);
@@ -588,7 +588,7 @@ static device_method_t tegra124_cpufreq_
 };
 
 static devclass_t tegra124_cpufreq_devclass;
-static DEFINE_CLASS_0(cpufreq, tegra124_cpufreq_driver,
+static DEFINE_CLASS_0(tegra124_cpufreq, tegra124_cpufreq_driver,
     tegra124_cpufreq_methods, sizeof(struct tegra124_cpufreq_softc));
 DRIVER_MODULE(tegra124_cpufreq, cpu, tegra124_cpufreq_driver,
     tegra124_cpufreq_devclass, NULL, NULL);