diff options
| author | dipen <dpatel@marvell.com> | 2012-11-13 11:14:34 -0500 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2019-07-22 19:40:01 +0200 |
| commit | 53eaf675ab7af2145db03952995823cfda76925f (patch) | |
| tree | f8763c295578d56cc0a499e066a4adfa3b8979c9 | |
| parent | 10e83db9798e72c45e6ea28c9a53f7711467c40d (diff) | |
| download | linux-mmp3-dell-ariel-53eaf675ab7af2145db03952995823cfda76925f.tar.gz | |
MMP3: QSEVEN enabling 26MHz from files instead of config
Modified usb init not to call plls for 26Mhz as
kernel crashes during boot. Also added 26Mhz compilation
from files and not in the config
Signed-off-by: dipen <dpatel@marvell.com>
| -rw-r--r-- | arch/arm/configs/qseven_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-mmp/clock-mmp3.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mmp/devices.c | 3 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/configs/qseven_defconfig b/arch/arm/configs/qseven_defconfig index 60057ccf185080..cbaa325441905a 100644 --- a/arch/arm/configs/qseven_defconfig +++ b/arch/arm/configs/qseven_defconfig @@ -55,7 +55,6 @@ CONFIG_SYSVIPC_SYSCTL=y # CONFIG_TASKSTATS is not set # CONFIG_AUDIT is not set CONFIG_HAVE_GENERIC_HARDIRQS=y -CONFIG_MMP3_QSEVEN_26MHZ=y # # IRQ subsystem diff --git a/arch/arm/mach-mmp/clock-mmp3.c b/arch/arm/mach-mmp/clock-mmp3.c index 0c3cedda794656..98f0ac3be28fae 100644 --- a/arch/arm/mach-mmp/clock-mmp3.c +++ b/arch/arm/mach-mmp/clock-mmp3.c @@ -44,7 +44,7 @@ #define MMP3_PROTECT_CC3(x) ((x) & 0x0effff1f) #define MMP3_PROTECT_BUSCLKRST(x) ((x) & 0x000001c3) #define MMP3_PROTECT_FCCR(x) ((x) & 0xff83ffff) - +#define CONFIG_MMP3_QSEVEN_26MHZ /* Dynamic Frequency Change Part */ enum { diff --git a/arch/arm/mach-mmp/devices.c b/arch/arm/mach-mmp/devices.c index 9dbecfe73c9757..d228d4781fd85f 100644 --- a/arch/arm/mach-mmp/devices.c +++ b/arch/arm/mach-mmp/devices.c @@ -23,6 +23,7 @@ #include <mach/regs-icu.h> #include <mach/addr-map.h> +#define CONFIG_MMP3_QSEVEN_26MHZ int __init pxa_register_device(struct pxa_device_desc *desc, void *data, size_t size) @@ -717,7 +718,7 @@ int mmp3_fsic_phy_init(unsigned int base) return -ENOMEM; } - pxa_usb_phy_init(otgphy); + /*pxa_usb_phy_init(otgphy);*/ iounmap((void __iomem *)otgphy); |