diff options
Diffstat (limited to 'packages/kexecboot/linux-kexecboot-2.6.24/tosa/0020-Provide-dew-device-clock-backports-from-2.6.24-git.patch')
| -rw-r--r-- | packages/kexecboot/linux-kexecboot-2.6.24/tosa/0020-Provide-dew-device-clock-backports-from-2.6.24-git.patch | 257 |
1 files changed, 0 insertions, 257 deletions
diff --git a/packages/kexecboot/linux-kexecboot-2.6.24/tosa/0020-Provide-dew-device-clock-backports-from-2.6.24-git.patch b/packages/kexecboot/linux-kexecboot-2.6.24/tosa/0020-Provide-dew-device-clock-backports-from-2.6.24-git.patch deleted file mode 100644 index 0a42bc5855..0000000000 --- a/packages/kexecboot/linux-kexecboot-2.6.24/tosa/0020-Provide-dew-device-clock-backports-from-2.6.24-git.patch +++ /dev/null @@ -1,257 +0,0 @@ -From ee8ca5742e0000dd2369ef4d328c2c1117276a3b Mon Sep 17 00:00:00 2001 -From: Dmitry Baryshkov <dbaryshkov@gmail.com> -Date: Mon, 4 Feb 2008 02:56:28 +0300 -Subject: [PATCH 20/64] Provide dew device/clock backports from 2.6.24-git - -Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> ---- - arch/arm/Kconfig | 1 + - arch/arm/mach-pxa/devices.h | 12 ++++++++++++ - arch/arm/mach-pxa/pxa25x.c | 18 ++++++++++++------ - arch/arm/mach-pxa/pxa27x.c | 22 ++++++++++++++++------ - arch/arm/mach-pxa/pxa3xx.c | 30 ++++++++++++++++++++++++++++++ - kernel/Makefile | 1 + - 6 files changed, 72 insertions(+), 12 deletions(-) - -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 1be7182..10faf9c 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -367,6 +367,7 @@ config ARCH_SA1100 - select ARCH_DISCONTIGMEM_ENABLE - select ARCH_MTD_XIP - select GENERIC_GPIO -+ select GENERIC_TIME - help - Support for StrongARM 11x0 based boards. - -diff --git a/arch/arm/mach-pxa/devices.h b/arch/arm/mach-pxa/devices.h -index 94c8d5c..96c7c89 100644 ---- a/arch/arm/mach-pxa/devices.h -+++ b/arch/arm/mach-pxa/devices.h -@@ -1,4 +1,6 @@ - extern struct platform_device pxa_device_mci; -+extern struct platform_device pxa3xx_device_mci2; -+extern struct platform_device pxa3xx_device_mci3; - extern struct platform_device pxa_device_udc; - extern struct platform_device pxa_device_fb; - extern struct platform_device pxa_device_ffuart; -@@ -12,3 +14,13 @@ extern struct platform_device pxa_device_rtc; - - extern struct platform_device pxa27x_device_i2c_power; - extern struct platform_device pxa27x_device_ohci; -+ -+extern struct platform_device pxa25x_device_ssp; -+extern struct platform_device pxa25x_device_nssp; -+extern struct platform_device pxa25x_device_assp; -+extern struct platform_device pxa27x_device_ssp1; -+extern struct platform_device pxa27x_device_ssp2; -+extern struct platform_device pxa27x_device_ssp3; -+extern struct platform_device pxa3xx_device_ssp4; -+ -+void __init pxa_register_device(struct platform_device *dev, void *data); -diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c -index 006a6e0..5988d99 100644 ---- a/arch/arm/mach-pxa/pxa25x.c -+++ b/arch/arm/mach-pxa/pxa25x.c -@@ -123,12 +123,15 @@ static struct clk pxa25x_clks[] = { - INIT_CKEN("UDCCLK", USB, 47923000, 5, &pxa_device_udc.dev), - INIT_CKEN("MMCCLK", MMC, 19169000, 0, &pxa_device_mci.dev), - INIT_CKEN("I2CCLK", I2C, 31949000, 0, &pxa_device_i2c.dev), -+ -+ INIT_CKEN("SSPCLK", SSP, 3686400, 0, &pxa25x_device_ssp.dev), -+ INIT_CKEN("SSPCLK", NSSP, 3686400, 0, &pxa25x_device_nssp.dev), -+ INIT_CKEN("SSPCLK", ASSP, 3686400, 0, &pxa25x_device_assp.dev), -+ - /* - INIT_CKEN("PWMCLK", PWM0, 3686400, 0, NULL), - INIT_CKEN("PWMCLK", PWM0, 3686400, 0, NULL), -- INIT_CKEN("SSPCLK", SSP, 3686400, 0, NULL), - INIT_CKEN("I2SCLK", I2S, 14745600, 0, NULL), -- INIT_CKEN("NSSPCLK", NSSP, 3686400, 0, NULL), - */ - INIT_CKEN("FICPCLK", FICP, 47923000, 0, NULL), - }; -@@ -216,8 +219,6 @@ static void pxa25x_cpu_pm_restore(unsigned long *sleep_save) - - static void pxa25x_cpu_pm_enter(suspend_state_t state) - { -- CKEN = 0; -- - switch (state) { - case PM_SUSPEND_MEM: - /* set resume return address */ -@@ -239,6 +240,8 @@ static void __init pxa25x_init_pm(void) - { - pxa_cpu_pm_fns = &pxa25x_cpu_pm_fns; - } -+#else -+static inline void pxa25x_init_pm(void) {} - #endif - - /* PXA25x: supports wakeup from GPIO0..GPIO15 and RTC alarm -@@ -300,6 +303,9 @@ static struct platform_device *pxa25x_devices[] __initdata = { - &pxa_device_i2s, - &pxa_device_ficp, - &pxa_device_rtc, -+ &pxa25x_device_ssp, -+ &pxa25x_device_nssp, -+ &pxa25x_device_assp, - }; - - static int __init pxa25x_init(void) -@@ -315,9 +321,9 @@ static int __init pxa25x_init(void) - - if ((ret = pxa_init_dma(16))) - return ret; --#ifdef CONFIG_PM -+ - pxa25x_init_pm(); --#endif -+ - ret = platform_add_devices(pxa25x_devices, - ARRAY_SIZE(pxa25x_devices)); - } -diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c -index 8e126e6..30ca4fd 100644 ---- a/arch/arm/mach-pxa/pxa27x.c -+++ b/arch/arm/mach-pxa/pxa27x.c -@@ -150,11 +150,12 @@ static struct clk pxa27x_clks[] = { - INIT_CKEN("I2CCLK", PWRI2C, 13000000, 0, &pxa27x_device_i2c_power.dev), - INIT_CKEN("KBDCLK", KEYPAD, 32768, 0, NULL), - -+ INIT_CKEN("SSPCLK", SSP1, 13000000, 0, &pxa27x_device_ssp1.dev), -+ INIT_CKEN("SSPCLK", SSP2, 13000000, 0, &pxa27x_device_ssp2.dev), -+ INIT_CKEN("SSPCLK", SSP3, 13000000, 0, &pxa27x_device_ssp3.dev), -+ - /* - INIT_CKEN("PWMCLK", PWM0, 13000000, 0, NULL), -- INIT_CKEN("SSPCLK", SSP1, 13000000, 0, NULL), -- INIT_CKEN("SSPCLK", SSP2, 13000000, 0, NULL), -- INIT_CKEN("SSPCLK", SSP3, 13000000, 0, NULL), - INIT_CKEN("MSLCLK", MSL, 48000000, 0, NULL), - INIT_CKEN("USIMCLK", USIM, 48000000, 0, NULL), - INIT_CKEN("MSTKCLK", MEMSTK, 19500000, 0, NULL), -@@ -304,6 +305,8 @@ static void __init pxa27x_init_pm(void) - { - pxa_cpu_pm_fns = &pxa27x_cpu_pm_fns; - } -+#else -+static inline void pxa27x_init_pm(void) {} - #endif - - /* PXA27x: Various gpios can issue wakeup events. This logic only -@@ -423,6 +426,11 @@ struct platform_device pxa27x_device_i2c_power = { - .num_resources = ARRAY_SIZE(i2c_power_resources), - }; - -+void __init pxa_set_i2c_power_info(struct i2c_pxa_platform_data *info) -+{ -+ pxa27x_device_i2c_power.dev.platform_data = info; -+} -+ - static struct platform_device *devices[] __initdata = { - &pxa_device_mci, - &pxa_device_udc, -@@ -435,7 +443,9 @@ static struct platform_device *devices[] __initdata = { - &pxa_device_ficp, - &pxa_device_rtc, - &pxa27x_device_i2c_power, -- &pxa27x_device_ohci, -+ &pxa27x_device_ssp1, -+ &pxa27x_device_ssp2, -+ &pxa27x_device_ssp3, - }; - - static int __init pxa27x_init(void) -@@ -446,9 +456,9 @@ static int __init pxa27x_init(void) - - if ((ret = pxa_init_dma(32))) - return ret; --#ifdef CONFIG_PM -+ - pxa27x_init_pm(); --#endif -+ - ret = platform_add_devices(devices, ARRAY_SIZE(devices)); - } - return ret; -diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c -index 61d9c9d..ccab9da 100644 ---- a/arch/arm/mach-pxa/pxa3xx.c -+++ b/arch/arm/mach-pxa/pxa3xx.c -@@ -189,8 +189,31 @@ static struct clk pxa3xx_clks[] = { - - PXA3xx_CKEN("I2CCLK", I2C, 32842000, 0, &pxa_device_i2c.dev), - PXA3xx_CKEN("UDCCLK", UDC, 48000000, 5, &pxa_device_udc.dev), -+ PXA3xx_CKEN("USBCLK", USBH, 48000000, 0, &pxa27x_device_ohci.dev), -+ -+ PXA3xx_CKEN("SSPCLK", SSP1, 13000000, 0, &pxa27x_device_ssp1.dev), -+ PXA3xx_CKEN("SSPCLK", SSP2, 13000000, 0, &pxa27x_device_ssp2.dev), -+ PXA3xx_CKEN("SSPCLK", SSP3, 13000000, 0, &pxa27x_device_ssp3.dev), -+ PXA3xx_CKEN("SSPCLK", SSP4, 13000000, 0, &pxa3xx_device_ssp4.dev), -+ -+ PXA3xx_CKEN("MMCCLK", MMC1, 19500000, 0, &pxa_device_mci.dev), -+ PXA3xx_CKEN("MMCCLK", MMC2, 19500000, 0, &pxa3xx_device_mci2.dev), -+ PXA3xx_CKEN("MMCCLK", MMC3, 19500000, 0, &pxa3xx_device_mci3.dev), - }; - -+#ifdef CONFIG_PM -+#define SLEEP_SAVE_SIZE 4 -+ -+#define ISRAM_START 0x5c000000 -+#define ISRAM_SIZE SZ_256K -+ -+static inline void pxa3xx_init_pm(void) {} -+static inline void pxa3xx_init_irq_pm(void) {} -+#else -+static inline void pxa3xx_init_pm(void) {} -+static inline void pxa3xx_init_irq_pm(void) {} -+#endif -+ - void __init pxa3xx_init_irq(void) - { - /* enable CP6 access */ -@@ -202,6 +225,7 @@ void __init pxa3xx_init_irq(void) - pxa_init_irq_low(); - pxa_init_irq_high(); - pxa_init_irq_gpio(128); -+ pxa3xx_init_irq_pm(); - } - - /* -@@ -219,6 +243,10 @@ static struct platform_device *devices[] __initdata = { - &pxa_device_i2s, - &pxa_device_ficp, - &pxa_device_rtc, -+ &pxa27x_device_ssp1, -+ &pxa27x_device_ssp2, -+ &pxa27x_device_ssp3, -+ &pxa3xx_device_ssp4, - }; - - static int __init pxa3xx_init(void) -@@ -231,6 +259,8 @@ static int __init pxa3xx_init(void) - if ((ret = pxa_init_dma(32))) - return ret; - -+ pxa3xx_init_pm(); -+ - return platform_add_devices(devices, ARRAY_SIZE(devices)); - } - return 0; -diff --git a/kernel/Makefile b/kernel/Makefile -index dfa9695..6d9a87c 100644 ---- a/kernel/Makefile -+++ b/kernel/Makefile -@@ -57,6 +57,7 @@ obj-$(CONFIG_SYSCTL) += utsname_sysctl.o - obj-$(CONFIG_TASK_DELAY_ACCT) += delayacct.o - obj-$(CONFIG_TASKSTATS) += taskstats.o tsacct.o - obj-$(CONFIG_MARKERS) += marker.o -+obj-$(CONFIG_LATENCYTOP) += latencytop.o - - ifneq ($(CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER),y) - # According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is --- -1.5.3.8 - |