socsvn commit: r237892 - in soc2012/aleek/beaglexm-armv6/sys:
arm/ti/am37x boot/fdt/dts
aleek at FreeBSD.org
aleek at FreeBSD.org
Mon Jun 18 13:32:57 UTC 2012
Author: aleek
Date: Mon Jun 18 13:32:54 2012
New Revision: 237892
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237892
Log:
extended prcm driver
Modified:
soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_prcm.c
soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts
Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_prcm.c
==============================================================================
--- soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_prcm.c Mon Jun 18 12:45:35 2012 (r237891)
+++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_prcm.c Mon Jun 18 13:32:54 2012 (r237892)
@@ -47,6 +47,12 @@
#include <machine/resource.h>
#include <machine/intr.h>
+#include <dev/fdt/fdt_common.h>
+#include <dev/ofw/openfirm.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+#include <machine/fdt.h>
+
#include <arm/ti/tivar.h>
#include <arm/ti/ti_prcm.h>
#include <arm/ti/am37x/am37x_reg.h>
@@ -137,7 +143,7 @@
struct omap3_prcm_softc {
struct resource *res[2];
bus_space_tag_t prm_bst, cm_bst;
- bus_space_tag_t prm_bsh, cm_bsh;
+ bus_space_handle_t prm_bsh, cm_bsh;
};
static struct resource_spec omap3_prcm_spec[] = {
@@ -166,8 +172,14 @@
static int
omap3_clk_generic_accessible(struct ti_clock_dev *clkdev);
+static int
+omap3_clk_gptimer_get_source_freq(struct ti_clock_dev *clkdev, unsigned int *freq);
+static int
+omap3_clk_gptimer_set_source(struct ti_clock_dev *clkdev, clk_src_t clksrc);
+static int
+omap3_clk_generic_get_source_freq(struct ti_clock_dev *clkdev, unsigned int *freq);
@@ -222,7 +234,7 @@
}
-const struct ti_clock_dev omap_clk_devmap[] = {
+const struct ti_clock_dev ti_clk_devmap[] = {
/* System clock */
{ .id = SYS_CLK,
@@ -241,7 +253,6 @@
.clk_get_source_freq = omap3_clk_get_arm_fclk_freq,
},
-
/* UART device clocks */
OMAP3_GENERIC_CLOCK_DEV(UART1_CLK),
OMAP3_GENERIC_CLOCK_DEV(UART2_CLK),
@@ -303,7 +314,7 @@
*
*/
-struct omap3_clk_details {
+struct ti_clk_details {
clk_ident_t id;
int32_t src_freq;
@@ -325,7 +336,7 @@
.bit_offset = (bit), \
}
-static const struct omap3_clk_details g_omap3_clk_details[] = {
+static const struct ti_clk_details g_omap3_clk_details[] = {
/* UART */
OMAP3_GENERIC_CLOCK_DETAILS(UART1_CLK, FREQ_48MHZ, CORE_CM_OFFSET,
@@ -460,6 +471,34 @@
return (0);
}
+static int
+omap3_clk_gptimer_get_source_freq(struct ti_clock_dev *clkdev, unsigned int *freq)
+{
+
+ return (0);
+}
+
+static int
+omap3_clk_gptimer_set_source(struct ti_clock_dev *clkdev, clk_src_t clksrc)
+{
+
+ return (0);
+}
+
+static int
+omap3_clk_generic_get_source_freq(struct ti_clock_dev *clkdev, unsigned int *freq)
+{
+
+ return (0);
+}
+
+
+
+
+
+
+
+
/**
* omap3_clk_init - add a child item to the root omap3 device
@@ -474,6 +513,7 @@
void
omap3_clk_init(device_t dev, int prio)
{
+#if 0
device_t kid;
struct omap_ivar *ivar;
@@ -503,12 +543,13 @@
OMAP35XX_CM_HWBASE, 0x2000);
bus_set_resource(kid, SYS_RES_MEMORY, PRM_INSTANCE_MEM_REGION,
OMAP35XX_PRM_HWBASE, 0x2000);
+#endif
}
static int
omap3_prcm_probe(device_t dev)
{
- if (ofw_bus_is_compatible(dev, "am37x,prcm")) {
+ if (ofw_bus_is_compatible(dev, "ti,omap3_prcm")) {
device_set_desc(dev, "OMAP3 Power and Clock Management");
return(BUS_PROBE_DEFAULT);
}
Modified: soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts
==============================================================================
--- soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Mon Jun 18 12:45:35 2012 (r237891)
+++ soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Mon Jun 18 13:32:54 2012 (r237892)
@@ -70,7 +70,7 @@
};
prcm at 48004000 {
- compatible = "am37x,omap3_prcm";
+ compatible = "ti,omap3_prcm";
#address-cells = <1>;
#size-cells = <1>;
reg = < 0x48004000 0x2000
More information about the svn-soc-all
mailing list