A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 10:41:38 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge 7xx-iosplit-plat-merge with omap-fixes

Browse source 
Merge branch '7xx-iosplit-plat-merge' into omap-for-linus
This commit is contained in:
Tony Lindgren 2009-11-22 10:08:43 -08:00
commit a76df42a67
272 changed files with 3839 additions and 1655 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/spi/omap2_mcspi.c
View file

@ -35,8 +35,8 @@
#include <linux/spi/spi.h>
#include <mach/dma.h>
#include <mach/clock.h>
#include <plat/dma.h>
#include <plat/clock.h>
#define OMAP2_MCSPI_MAX_FREQ 48000000

10
drivers/spi/omap_uwire.c
View file

@ -51,8 +51,8 @@
#include <asm/io.h>
#include <asm/mach-types.h>
#include <mach/mux.h>
#include <mach/omap730.h> /* OMAP730_IO_CONF registers */
#include <plat/mux.h>
#include <plat/omap7xx.h> /* OMAP7XX_IO_CONF registers */
/* FIXME address is now a platform device resource,
@ -504,7 +504,7 @@ static int __init uwire_probe(struct platform_device *pdev)
}
clk_enable(uwire->ck);
if (cpu_is_omap730())
if (cpu_is_omap7xx())
uwire_idx_shift = 1;
else
uwire_idx_shift = 2;
@ -573,8 +573,8 @@ static int __init omap_uwire_init(void)
}
if (machine_is_omap_perseus2()) {
/* configure pins: MPU_UW_nSCS1, MPU_UW_SDO, MPU_UW_SCLK */
int val = omap_readl(OMAP730_IO_CONF_9) & ~0x00EEE000;
omap_writel(val | 0x00AAA000, OMAP730_IO_CONF_9);
int val = omap_readl(OMAP7XX_IO_CONF_9) & ~0x00EEE000;
omap_writel(val | 0x00AAA000, OMAP7XX_IO_CONF_9);
}
return platform_driver_probe(&uwire_driver, uwire_probe);