Module Name: src
Committed By: jmcneill
Date: Fri Jan 2 00:50:56 UTC 2015
Modified Files:
src/sys/arch/evbarm/rockchip: rockchip_machdep.c
Log Message:
Enable LDO2 for HDMI driver.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/rockchip/rockchip_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/rockchip/rockchip_machdep.c
diff -u src/sys/arch/evbarm/rockchip/rockchip_machdep.c:1.12 src/sys/arch/evbarm/rockchip/rockchip_machdep.c:1.13
--- src/sys/arch/evbarm/rockchip/rockchip_machdep.c:1.12 Tue Dec 30 03:53:52 2014
+++ src/sys/arch/evbarm/rockchip/rockchip_machdep.c Fri Jan 2 00:50:56 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rockchip_machdep.c,v 1.12 2014/12/30 03:53:52 jmcneill Exp $ */
+/* $NetBSD: rockchip_machdep.c,v 1.13 2015/01/02 00:50:56 jmcneill Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rockchip_machdep.c,v 1.12 2014/12/30 03:53:52 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rockchip_machdep.c,v 1.13 2015/01/02 00:50:56 jmcneill Exp $");
#include "opt_machdep.h"
#include "opt_ddb.h"
@@ -143,6 +143,7 @@ __KERNEL_RCSID(0, "$NetBSD: rockchip_mac
#include "ukbd.h"
#endif
#include "arml2cc.h"
+#include "act8846pm.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -182,6 +183,8 @@ __KERNEL_RCSID(0, "$NetBSD: rockchip_mac
#include <dev/ic/ns16550reg.h>
#include <dev/ic/comreg.h>
+#include <dev/i2c/act8846.h>
+
#include <arm/rockchip/rockchip_reg.h>
#include <arm/rockchip/rockchip_crureg.h>
#include <arm/rockchip/rockchip_var.h>
@@ -750,4 +753,16 @@ rockchip_device_register(device_t self,
return;
}
#endif
+
+ if (device_is_a(self, "ithdmi")) {
+#if NACT8846PM > 0
+ device_t pmic = device_find_by_driver_unit("act8846pm", 0);
+ if (pmic == NULL)
+ return;
+ struct act8846_ctrl *ctrl = act8846_lookup(pmic, "LDO2");
+ if (ctrl == NULL)
+ return;
+ act8846_enable(ctrl);
+#endif
+ }
}
