socsvn commit: r238922 - in soc2012/aleek/beaglexm-armv6/sys:
arm/conf arm/ti arm/ti/am37x boot/fdt/dts
aleek at FreeBSD.org
aleek at FreeBSD.org
Tue Jul 3 17:27:05 UTC 2012
Author: aleek
Date: Tue Jul 3 17:27:02 2012
New Revision: 238922
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238922
Log:
attaching mmc driver - still not 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/ti_mmchs.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 Tue Jul 3 16:49:38 2012 (r238921)
+++ soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM Tue Jul 3 17:27:02 2012 (r238922)
@@ -81,7 +81,7 @@
device mmcsd # mmc/sd flash cards
# Boot device is 2nd slice on MMC/SD card
-#options ROOTDEVNAME=\"ufs:mmcsd0s2\"
+options ROOTDEVNAME=\"ufs:mmcsd0s2\"
# Console and misc
@@ -127,7 +127,7 @@
options FDT_DTB_STATIC
makeoptions FDT_DTS_FILE=beagleboardxm.dts
-options MD_ROOT
-options MD_ROOT_SIZE=8192
-makeoptions MFS_IMAGE=/home/alek/beaglexm-armv6/arm.ramfs
-options ROOTDEVNAME=\"ufs:md0\"
+#options MD_ROOT
+#options MD_ROOT_SIZE=8192
+#makeoptions MFS_IMAGE=/home/alek/beaglexm-armv6/arm.ramfs
+#options ROOTDEVNAME=\"ufs:md0\"
Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_prcm.c
==============================================================================
--- soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_prcm.c Tue Jul 3 16:49:38 2012 (r238921)
+++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_prcm.c Tue Jul 3 17:27:02 2012 (r238922)
@@ -384,10 +384,10 @@
0x00, 0x10, 0x20, 11),
OMAP3_GENERIC_CLOCK_DETAILS(GPTIMER11_CLK, -1, CORE_CM_OFFSET,
0x00, 0x10, 0x20, 12),
-#if 0
/* HSMMC (MMC1 and MMC2 can have different input clocks) */
OMAP3_GENERIC_CLOCK_DETAILS(MMC1_CLK, FREQ_96MHZ, CORE_CM_OFFSET,
0x00, 0x10, 0x20, 24),
+#if 0
OMAP3_GENERIC_CLOCK_DETAILS(MMC2_CLK, FREQ_96MHZ, CORE_CM_OFFSET,
0x00, 0x10, 0x20, 25),
OMAP3_GENERIC_CLOCK_DETAILS(MMC3_CLK, FREQ_96MHZ, CORE_CM_OFFSET,
@@ -587,7 +587,15 @@
return (ETIMEDOUT);
}
#endif
- return (0);
+
+ for( unsigned int i=0; i< MAX_MODULE_ENABLE_WAIT; ++i )
+ {
+ if( ( cm_read_4( clk_details->idlest_offset ) & (1UL << clk_details->bit_offset) ) == 0 )
+ {
+ return (0);
+ }
+ }
+ return (ETIMEDOUT);
}
static int
@@ -644,7 +652,7 @@
}
static int
-omap3_clk_gptimer_get_source_freq(struct ti_clock_dev *clkdev, unsigned int *freq)
+omap3_clk_generic_get_source_freq(struct ti_clock_dev *clkdev, unsigned int *freq)
{
const struct ti_clk_details* clk_details = omap3_clk_details(clkdev->id);
@@ -703,7 +711,7 @@
}
static int
-omap3_clk_generic_get_source_freq(struct ti_clock_dev *clkdev, unsigned int *freq)
+omap3_clk_gptimer_get_source_freq(struct ti_clock_dev *clkdev, unsigned int *freq)
{
const struct ti_clk_details* clk_details = omap3_clk_details(clkdev->id);
uint32_t bit, regoff;
Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_mmchs.c
==============================================================================
--- soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_mmchs.c Tue Jul 3 16:49:38 2012 (r238921)
+++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_mmchs.c Tue Jul 3 17:27:02 2012 (r238922)
@@ -1604,7 +1604,6 @@
if (sc->sc_mem_res == NULL)
panic("%s: Cannot map registers", device_get_name(dev));
- device_printf( dev, "%s:%d\n", __FILE__, __LINE__ );
/* Allocate an IRQ resource for the MMC controller */
rid = 0;
sc->sc_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
@@ -1612,7 +1611,6 @@
if (sc->sc_irq_res == NULL)
goto errout;
- device_printf( dev, "%s:%d\n", __FILE__, __LINE__ );
/* Allocate DMA tags and maps */
err = bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0,
BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL,
@@ -1621,12 +1619,10 @@
if (err != 0)
goto errout;
- device_printf( dev, "%s:%d\n", __FILE__, __LINE__ );
err = bus_dmamap_create(sc->sc_dmatag, 0, &sc->sc_dmamap);
if (err != 0)
goto errout;
- device_printf( dev, "%s:%d\n", __FILE__, __LINE__ );
/* Initialise the DMA channels to be used by the controller */
err = ti_mmchs_init_dma_channels(sc);
if (err != 0)
@@ -1703,8 +1699,8 @@
device_printf(dev, "missing mmchs-device-id attribute in FDT\n");
return (ENXIO);
}
- sc->device_id = fdt32_to_cpu(did);
- device_printf( dev, "Device id: %d\n", did );
+ sc->device_id = 1; //fdt32_to_cpu(did);
+ device_printf( dev, "Device id: %u\n", sc->device_id );
/* Initiate the mtex lock */
TI_MMCHS_LOCK_INIT(sc);
@@ -1743,16 +1739,13 @@
#endif
/* Activate the device */
- device_printf( dev, "Activating the device...\n" );
err = ti_mmchs_activate(dev);
if (err)
goto out;
- device_printf( dev, "Initializing the device...\n" );
/* Initialise the controller */
ti_mmchs_hw_init(dev);
- device_printf( dev, "Setting up interrupt the device...\n" );
/* Activate the interrupt and attach a handler */
err = bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_MISC | INTR_MPSAFE,
NULL, ti_mmchs_intr, sc, &sc->sc_irq_h);
@@ -1768,7 +1761,6 @@
device_add_child(dev, "mmc", 0);
device_set_ivars(dev, &sc->host);
- device_printf( dev, "Attaching to bus...\n" );
err = bus_generic_attach(dev);
out:
Modified: soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts
==============================================================================
--- soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Tue Jul 3 16:49:38 2012 (r238921)
+++ soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Tue Jul 3 17:27:02 2012 (r238922)
@@ -151,8 +151,6 @@
interrupt-parent = <&AINTC>;
mmchs-device-id = <1>;
};
-
-
i2c0: i2c at 48070000 {
More information about the svn-soc-all
mailing list