socsvn commit: r240068 - in soc2012/aleek/beaglexm-armv6/sys:
arm/conf arm/ti/am37x arm/ti/twl boot/fdt/dts
aleek at FreeBSD.org
aleek at FreeBSD.org
Sat Aug 4 13:03:35 UTC 2012
Author: aleek
Date: Sat Aug 4 13:03:32 2012
New Revision: 240068
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240068
Log:
added warm reset support (not yet working)
Modified:
soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM
soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_prcm.c
soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/files.beagleboardxm
soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c
soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts
Modified: soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM
==============================================================================
--- soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM Sat Aug 4 08:06:37 2012 (r240067)
+++ soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM Sat Aug 4 13:03:32 2012 (r240068)
@@ -82,7 +82,7 @@
device mmcsd # mmc/sd flash cards
# Boot device is 2nd slice on MMC/SD card
-options ROOTDEVNAME=\"msdosfs:mmcsd0s2\"
+options ROOTDEVNAME=\"msdosfs:mmcsd0s3\"
# Console and misc
@@ -98,6 +98,8 @@
device iic
device ti_i2c
device twl
+device twl_vreg
+device twl_clks
# GPIO
device gpio
Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_prcm.c
==============================================================================
--- soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_prcm.c Sat Aug 4 08:06:37 2012 (r240067)
+++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_prcm.c Sat Aug 4 13:03:32 2012 (r240068)
@@ -1036,6 +1036,12 @@
#endif
}
+static void
+omap3_prcm_reset(void)
+{
+ prm_write_4( CORE_PRM_OFFSET + 0x50, (1<<2));
+}
+
static int
omap3_prcm_probe(device_t dev)
{
@@ -1067,6 +1073,8 @@
sc->prm_bsh = rman_get_bushandle(sc->res[1]);
omap3_prcm_sc = sc;
+ ti_cpu_reset = omap3_prcm_reset;
+
return (0);
}
Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/files.beagleboardxm
==============================================================================
--- soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/files.beagleboardxm Sat Aug 4 08:06:37 2012 (r240067)
+++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/files.beagleboardxm Sat Aug 4 13:03:32 2012 (r240068)
@@ -2,5 +2,5 @@
#arm/ti/am37x/am37x_pmic.c optional am37x_pmic
arm/ti/twl/twl.c optional twl
-arm/ti/twl/twl_vreg.c optional twl #twl_vreg
-arm/ti/twl/twl_clks.c optional twl #twl_clks
+arm/ti/twl/twl_vreg.c optional twl twl_vreg
+arm/ti/twl/twl_clks.c optional twl twl_clks
Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c
==============================================================================
--- soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c Sat Aug 4 08:06:37 2012 (r240067)
+++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/twl/twl_vreg.c Sat Aug 4 13:03:32 2012 (r240068)
@@ -75,7 +75,7 @@
#include "twl.h"
#include "twl_vreg.h"
-static int twl_vreg_debug = 1;
+static int twl_vreg_debug = 10;
/*
@@ -885,6 +885,7 @@
int len = 0, prop_len;
+ device_printf( sc->sc_dev, "%s:%d\n", __FUNCTION__, __LINE__ );
/* Add the regulators from the list */
walker = ®ulators[0];
while (walker->name != NULL) {
@@ -899,12 +900,14 @@
walker++;
}
+ device_printf( sc->sc_dev, "%s:%d\n", __FUNCTION__, __LINE__ );
/* Check if the FDT is telling us to set any voltages */
child = ofw_bus_get_node(sc->sc_pdev);
if (child) {
prop_len = OF_getprop(child, "voltage-regulators", rnames, sizeof(rnames));
+ device_printf( sc->sc_dev, "prop_len: %d\n", prop_len );
while (len < prop_len) {
name = rnames + len;
len += strlen(name) + 1;
@@ -956,6 +959,7 @@
struct twl_vreg_softc *sc;
sc = device_get_softc((device_t)dev);
+ device_printf( sc->sc_dev, "%s:%d\n", __FUNCTION__, __LINE__ );
TWL_VREG_XLOCK(sc);
@@ -999,6 +1003,7 @@
/* We have to wait until interrupts are enabled. I2C read and write
* only works if the interrupts are available.
*/
+ device_printf( sc->sc_dev, "%s:%d\n", __FUNCTION__, __LINE__ );
sc->sc_init_hook.ich_func = twl_vreg_init;
sc->sc_init_hook.ich_arg = dev;
Modified: soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts
==============================================================================
--- soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Sat Aug 4 08:06:37 2012 (r240067)
+++ soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Sat Aug 4 13:03:32 2012 (r240068)
@@ -195,9 +195,9 @@
interrupts = <56>;
interrupt-parent = <&AINTC>;
i2c-device-id = <1>;
- pmic at 24 {
+ pmic at 48 {
compatible = "ti,twl4030";
- reg = <0x24>;
+ reg = <0x48>;
};
};
More information about the svn-soc-all
mailing list