* [PATCH 00/33] Removing dead code
@ 2010-06-30 15:53 Christoph Egger
2010-06-30 15:53 ` Christoph Egger
` (37 more replies)
0 siblings, 38 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:53 UTC (permalink / raw)
To: linux-arm-kernel
Hi all!
As part of the VAMOS[0] research project at the University of
Erlangen we are looking at multiple integrity errors in linux'
configuration system.
I've been running a check on the arch/arm sourcetree for
config Items not defined in Kconfig and found 33 such cases. Sourcecode
blocks depending on these Items are not reachable from a vanilla
kernel -- dead code. I've seen such dead blocks made on purpose
e.g. while integrating new features into the kernel but generally
they're just useless.
Each of the patches in this patchset removes on such dead
config Item, I'd be glad if you consider applying them. I've been
doing deeper analysis of such issues before and can do so again but
I'm not so sure they were fastly usefull. Unfortunately arm doesn't
allow some allyesconfig build covering all of that code so I couldn't
build-test all of them, sorry for that.
Please keep me informed of this patch getting confirmed /
merged so we can keep track of it.
Regards
Christoph Egger
[0] http://vamos1.informatik.uni-erlangen.de/
Christoph Egger (33):
Removing dead MTD_NAND_AT91_BUSWIDTH_16
Removing dead ARCH_DAVINCI_TNETV107X
Removing dead OMAP_MUX_ERRORS
Removing dead MSM7X00A_IDLE
Removing dead OMAP_IR
Removing dead SHARPSL_LOCOMO
Removing dead CPU_S3C2400
Removing dead SA1101
Removing dead MAGICV
Removing dead VIDEO_AT91_ISI
Removing dead OMAP_DSP
Removing dead OMAP_STI
Replacing LEDS_OMAP_DEBUG with OMAP_DEBUG_LEDS
Removing dead SDMA_IRAM
Removing dead PROCESSOR_NS9750
Removing dead APM
Removing dead SX1_OLD_FLASH
Removing dead OMAP_ARM_96MHZ
Removing dead MACH_OMAP_H4_OTG
Removing dead MACH_OMAP2_H4_USB1
Removing dead OMAP2_VENC_OUT_TYPE_SVIDEO,
OMAP2_VENC_OUT_TYPE_COMPOSITE
Removing dead MPU_{BRIDGE,TESLA}_IOMMU
Removing dead BACKLIGHT_CORGI
Removing dead ARCH_GUMSTIX_ORIG
Removing dead CORGI_SSP_DEPRECATED
Removing dead XSCALE_CACHE_ERRATA
Removing dead IDE_PXA_CF
Removing dead CPU_S3C24XX
Removing dead SND_SOC_SMDK2443_WM9710
Removing dead S3C_DEV_ADC
Removing dead MACH_U300_BS26
Removing dead CPU_ICACHE_STREAMING_DISABLE
Removing dead MACH_U300_USE_I2S_AS_MASTER
arch/arm/mach-at91/at572d940hf_devices.c | 73 --
arch/arm/mach-at91/at91sam9263_devices.c | 49 --
arch/arm/mach-at91/board-at572d940hf_ek.c | 4 -
arch/arm/mach-at91/board-sam9m10g45ek.c | 4 -
arch/arm/mach-davinci/include/mach/cputype.h | 6 -
arch/arm/mach-msm/idle.S | 13 -
arch/arm/mach-ns9xxx/gpio.c | 8 -
arch/arm/mach-omap1/board-h2.c | 18 -
arch/arm/mach-omap1/board-nokia770.c | 132 ----
arch/arm/mach-omap1/board-palmte.c | 84 ---
arch/arm/mach-omap1/board-sx1.c | 26 -
arch/arm/mach-omap1/devices.c | 72 --
arch/arm/mach-omap1/mcbsp.c | 3 -
arch/arm/mach-omap1/mux.c | 5 -
arch/arm/mach-omap1/opp_data.c | 3 -
arch/arm/mach-omap2/board-h4.c | 26 -
arch/arm/mach-omap2/board-omap3stalker.c | 5 -
arch/arm/mach-omap2/devices.c | 57 --
arch/arm/mach-omap2/omap-iommu.c | 22 -
arch/arm/mach-pxa/corgi_pm.c | 2 -
arch/arm/mach-pxa/include/mach/gumstix.h | 12 +-
arch/arm/mach-pxa/sharpsl_pm.c | 20 -
arch/arm/mach-pxa/sleep.S | 7 -
arch/arm/mach-pxa/spitz_pm.c | 2 -
arch/arm/mach-pxa/trizeps4.c | 6 +-
arch/arm/mach-s3c2410/include/mach/gpio-fns.h | 5 -
arch/arm/mach-s3c2410/include/mach/gpio.h | 4 -
arch/arm/mach-s3c2410/include/mach/regs-gpio.h | 4 -
arch/arm/mach-s3c2443/mach-smdk2443.c | 7 -
arch/arm/mach-s5pv210/cpu.c | 4 -
arch/arm/mach-sa1100/include/mach/SA-1101.h | 925 ------------------------
arch/arm/mach-sa1100/include/mach/hardware.h | 4 -
arch/arm/mach-sa1100/include/mach/irqs.h | 2 -
arch/arm/mach-u300/clock.c | 91 ---
arch/arm/mach-u300/core.c | 7 -
arch/arm/mm/proc-arm925.S | 3 -
arch/arm/plat-mxc/include/mach/mx51.h | 4 -
arch/arm/plat-omap/Kconfig | 2 +-
arch/arm/plat-omap/debug-leds.c | 2 +-
arch/arm/plat-omap/devices.c | 62 --
arch/arm/plat-omap/include/plat/dsp_common.h | 40 -
arch/arm/plat-s3c24xx/cpu.c | 15 -
arch/arm/plat-s3c24xx/include/plat/s3c2400.h | 31 -
43 files changed, 4 insertions(+), 1867 deletions(-)
delete mode 100644 arch/arm/mach-sa1100/include/mach/SA-1101.h
delete mode 100644 arch/arm/plat-omap/include/plat/dsp_common.h
delete mode 100644 arch/arm/plat-s3c24xx/include/plat/s3c2400.h
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 01/33] Removing dead MTD_NAND_AT91_BUSWIDTH_16
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
@ 2010-06-30 15:53 ` Christoph Egger
2010-06-30 15:54 ` [PATCH 03/33] Removing dead OMAP_MUX_ERRORS Christoph Egger
` (36 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:53 UTC (permalink / raw)
To: Russell King, Andrew Victor, Antonio R. Costa, Nicolas Ferre,
Dmitry Torokhov, Andrea Gelmini, linux-arm-kernel, linux-kernel
Cc: vamos
MTD_NAND_AT91_BUSWIDTH_16 doesn't exist in Kconfig, therefore removing
all references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-at91/board-at572d940hf_ek.c | 4 ----
arch/arm/mach-at91/board-sam9m10g45ek.c | 4 ----
2 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-at91/board-at572d940hf_ek.c b/arch/arm/mach-at91/board-at572d940hf_ek.c
index 5daff27..889a442 100644
--- a/arch/arm/mach-at91/board-at572d940hf_ek.c
+++ b/arch/arm/mach-at91/board-at572d940hf_ek.c
@@ -216,11 +216,7 @@ static struct atmel_nand_data __initdata eb_nand_data = {
/* .rdy_pin = AT91_PIN_PC16, */
.enable_pin = AT91_PIN_PA15,
.partition_info = nand_partitions,
-#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
- .bus_width_16 = 1,
-#else
.bus_width_16 = 0,
-#endif
};
static struct sam9_smc_config __initdata eb_nand_smc_config = {
diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c
index ee80059..49ef850 100644
--- a/arch/arm/mach-at91/board-sam9m10g45ek.c
+++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
@@ -135,11 +135,7 @@ static struct atmel_nand_data __initdata ek_nand_data = {
.rdy_pin = AT91_PIN_PC8,
.enable_pin = AT91_PIN_PC14,
.partition_info = nand_partitions,
-#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
- .bus_width_16 = 1,
-#else
.bus_width_16 = 0,
-#endif
};
static struct sam9_smc_config __initdata ek_nand_smc_config = {
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 01/33] Removing dead MTD_NAND_AT91_BUSWIDTH_16
@ 2010-06-30 15:53 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:53 UTC (permalink / raw)
To: linux-arm-kernel
MTD_NAND_AT91_BUSWIDTH_16 doesn't exist in Kconfig, therefore removing
all references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-at91/board-at572d940hf_ek.c | 4 ----
arch/arm/mach-at91/board-sam9m10g45ek.c | 4 ----
2 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-at91/board-at572d940hf_ek.c b/arch/arm/mach-at91/board-at572d940hf_ek.c
index 5daff27..889a442 100644
--- a/arch/arm/mach-at91/board-at572d940hf_ek.c
+++ b/arch/arm/mach-at91/board-at572d940hf_ek.c
@@ -216,11 +216,7 @@ static struct atmel_nand_data __initdata eb_nand_data = {
/* .rdy_pin = AT91_PIN_PC16, */
.enable_pin = AT91_PIN_PA15,
.partition_info = nand_partitions,
-#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
- .bus_width_16 = 1,
-#else
.bus_width_16 = 0,
-#endif
};
static struct sam9_smc_config __initdata eb_nand_smc_config = {
diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c
index ee80059..49ef850 100644
--- a/arch/arm/mach-at91/board-sam9m10g45ek.c
+++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
@@ -135,11 +135,7 @@ static struct atmel_nand_data __initdata ek_nand_data = {
.rdy_pin = AT91_PIN_PC8,
.enable_pin = AT91_PIN_PC14,
.partition_info = nand_partitions,
-#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
- .bus_width_16 = 1,
-#else
.bus_width_16 = 0,
-#endif
};
static struct sam9_smc_config __initdata ek_nand_smc_config = {
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 03/33] Removing dead OMAP_MUX_ERRORS
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
@ 2010-06-30 15:54 ` Christoph Egger
2010-06-30 15:54 ` [PATCH 03/33] Removing dead OMAP_MUX_ERRORS Christoph Egger
` (36 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:54 UTC (permalink / raw)
To: Tony Lindgren, Russell King, Cory Maccarrone,
Zebediah C. McClure, Alistair Buxton, linux-omap,
linux-arm-kernel, linux-kernel
Cc: vamos
OMAP_MUX_ERRORS doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap1/mux.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c
index 8434137..1ddb02c 100644
--- a/arch/arm/mach-omap1/mux.c
+++ b/arch/arm/mach-omap1/mux.c
@@ -439,12 +439,7 @@ int __init_or_module omap1_cfg_reg(const struct pin_config *cfg)
cfg->pull_name, cfg->pull_reg, pull_orig, pull);
}
#endif
-
-#ifdef CONFIG_OMAP_MUX_ERRORS
- return warn ? -ETXTBSY : 0;
-#else
return 0;
-#endif
}
int __init omap1_mux_init(void)
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 03/33] Removing dead OMAP_MUX_ERRORS
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
2010-06-30 15:53 ` Christoph Egger
@ 2010-06-30 15:54 ` Christoph Egger
2010-06-30 15:54 ` Christoph Egger
` (35 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:54 UTC (permalink / raw)
To: Tony Lindgren, Russell King, Cory Maccarrone,
Zebediah C. McClure, Alistair Buxton
Cc: vamos
OMAP_MUX_ERRORS doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap1/mux.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c
index 8434137..1ddb02c 100644
--- a/arch/arm/mach-omap1/mux.c
+++ b/arch/arm/mach-omap1/mux.c
@@ -439,12 +439,7 @@ int __init_or_module omap1_cfg_reg(const struct pin_config *cfg)
cfg->pull_name, cfg->pull_reg, pull_orig, pull);
}
#endif
-
-#ifdef CONFIG_OMAP_MUX_ERRORS
- return warn ? -ETXTBSY : 0;
-#else
return 0;
-#endif
}
int __init omap1_mux_init(void)
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 03/33] Removing dead OMAP_MUX_ERRORS
@ 2010-06-30 15:54 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:54 UTC (permalink / raw)
To: linux-arm-kernel
OMAP_MUX_ERRORS doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap1/mux.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c
index 8434137..1ddb02c 100644
--- a/arch/arm/mach-omap1/mux.c
+++ b/arch/arm/mach-omap1/mux.c
@@ -439,12 +439,7 @@ int __init_or_module omap1_cfg_reg(const struct pin_config *cfg)
cfg->pull_name, cfg->pull_reg, pull_orig, pull);
}
#endif
-
-#ifdef CONFIG_OMAP_MUX_ERRORS
- return warn ? -ETXTBSY : 0;
-#else
return 0;
-#endif
}
int __init omap1_mux_init(void)
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 04/33] Removing dead MSM7X00A_IDLE
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
@ 2010-06-30 15:55 ` Christoph Egger
2010-06-30 15:54 ` [PATCH 03/33] Removing dead OMAP_MUX_ERRORS Christoph Egger
` (36 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:55 UTC (permalink / raw)
To: David Brown, Daniel Walker, Bryan Huntsman, Russell King,
linux-arm-msm, linux-arm-kernel, linux-kernel
Cc: vamos
MSM7X00A_IDLE doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-msm/idle.S | 13 -------------
1 files changed, 0 insertions(+), 13 deletions(-)
diff --git a/arch/arm/mach-msm/idle.S b/arch/arm/mach-msm/idle.S
index 6a94f05..d8e8027 100644
--- a/arch/arm/mach-msm/idle.S
+++ b/arch/arm/mach-msm/idle.S
@@ -20,17 +20,4 @@
#include <asm/assembler.h>
ENTRY(arch_idle)
-#ifdef CONFIG_MSM7X00A_IDLE
- mrc p15, 0, r1, c1, c0, 0 /* read current CR */
- bic r0, r1, #(1 << 2) /* clear dcache bit */
- bic r0, r0, #(1 << 12) /* clear icache bit */
- mcr p15, 0, r0, c1, c0, 0 /* disable d/i cache */
-
- mov r0, #0 /* prepare wfi value */
- mcr p15, 0, r0, c7, c10, 0 /* flush the cache */
- mcr p15, 0, r0, c7, c10, 4 /* memory barrier */
- mcr p15, 0, r0, c7, c0, 4 /* wait for interrupt */
-
- mcr p15, 0, r1, c1, c0, 0 /* restore d/i cache */
-#endif
mov pc, lr
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 04/33] Removing dead MSM7X00A_IDLE
@ 2010-06-30 15:55 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:55 UTC (permalink / raw)
To: linux-arm-kernel
MSM7X00A_IDLE doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-msm/idle.S | 13 -------------
1 files changed, 0 insertions(+), 13 deletions(-)
diff --git a/arch/arm/mach-msm/idle.S b/arch/arm/mach-msm/idle.S
index 6a94f05..d8e8027 100644
--- a/arch/arm/mach-msm/idle.S
+++ b/arch/arm/mach-msm/idle.S
@@ -20,17 +20,4 @@
#include <asm/assembler.h>
ENTRY(arch_idle)
-#ifdef CONFIG_MSM7X00A_IDLE
- mrc p15, 0, r1, c1, c0, 0 /* read current CR */
- bic r0, r1, #(1 << 2) /* clear dcache bit */
- bic r0, r0, #(1 << 12) /* clear icache bit */
- mcr p15, 0, r0, c1, c0, 0 /* disable d/i cache */
-
- mov r0, #0 /* prepare wfi value */
- mcr p15, 0, r0, c7, c10, 0 /* flush the cache */
- mcr p15, 0, r0, c7, c10, 4 /* memory barrier */
- mcr p15, 0, r0, c7, c0, 4 /* wait for interrupt */
-
- mcr p15, 0, r1, c1, c0, 0 /* restore d/i cache */
-#endif
mov pc, lr
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 05/33] Removing dead OMAP_IR
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
@ 2010-06-30 15:55 ` Christoph Egger
2010-06-30 15:54 ` [PATCH 03/33] Removing dead OMAP_MUX_ERRORS Christoph Egger
` (36 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:55 UTC (permalink / raw)
To: Tony Lindgren, Russell King, Ladislav Michl, Kalle Valo,
Kevin Hilman, Paul Walmsley, Santosh Shilimkar, linux-omap,
linux-arm-kernel, linux-kernel
Cc: vamos
OMAP_IR doesn't exist in Kconfig, therefore removing all references
for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap1/board-h2.c | 18 ------------------
arch/arm/mach-omap2/board-h4.c | 4 ----
2 files changed, 0 insertions(+), 22 deletions(-)
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index d1100e4..d7640d3 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -292,15 +292,6 @@ static struct platform_device h2_kp_device = {
#define H2_IRDA_FIRSEL_GPIO_PIN 17
-#if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE)
-static int h2_transceiver_mode(struct device *dev, int state)
-{
- /* SIR when low, else MIR/FIR when HIGH */
- gpio_set_value(H2_IRDA_FIRSEL_GPIO_PIN, !(state & IR_SIRMODE));
- return 0;
-}
-#endif
-
static struct omap_irda_config h2_irda_data = {
.transceiver_cap = IR_SIRMODE | IR_MIRMODE | IR_FIRMODE,
.rx_channel = OMAP_DMA_UART3_RX,
@@ -437,15 +428,6 @@ static void __init h2_init(void)
/* omap_cfg_reg(U19_ARMIO1); */ /* CD */
omap_cfg_reg(BALLOUT_V8_ARMIO3); /* WP */
- /* Irda */
-#if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE)
- omap_writel(omap_readl(FUNC_MUX_CTRL_A) | 7, FUNC_MUX_CTRL_A);
- if (gpio_request(H2_IRDA_FIRSEL_GPIO_PIN, "IRDA mode") < 0)
- BUG();
- gpio_direction_output(H2_IRDA_FIRSEL_GPIO_PIN, 0);
- h2_irda_data.transceiver_mode = h2_transceiver_mode;
-#endif
-
platform_add_devices(h2_devices, ARRAY_SIZE(h2_devices));
omap_board_config = h2_config;
omap_board_config_size = ARRAY_SIZE(h2_config);
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
index 0665f2c..ce4292b 100644
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@ -345,10 +345,6 @@ static void __init omap_h4_init(void)
* You have to mux them off in device drivers later on
* if not needed.
*/
-#if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE)
- omap_cfg_reg(K15_24XX_UART3_TX);
- omap_cfg_reg(K14_24XX_UART3_RX);
-#endif
#if defined(CONFIG_KEYBOARD_OMAP) || defined(CONFIG_KEYBOARD_OMAP_MODULE)
if (omap_has_menelaus()) {
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 05/33] Removing dead OMAP_IR
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
` (3 preceding siblings ...)
2010-06-30 15:55 ` Christoph Egger
@ 2010-06-30 15:55 ` Christoph Egger
2010-06-30 15:55 ` Christoph Egger
` (32 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:55 UTC (permalink / raw)
To: Tony Lindgren, Russell King, Ladislav Michl, Kalle Valo, Kevin Hilman
Cc: vamos
OMAP_IR doesn't exist in Kconfig, therefore removing all references
for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap1/board-h2.c | 18 ------------------
arch/arm/mach-omap2/board-h4.c | 4 ----
2 files changed, 0 insertions(+), 22 deletions(-)
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index d1100e4..d7640d3 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -292,15 +292,6 @@ static struct platform_device h2_kp_device = {
#define H2_IRDA_FIRSEL_GPIO_PIN 17
-#if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE)
-static int h2_transceiver_mode(struct device *dev, int state)
-{
- /* SIR when low, else MIR/FIR when HIGH */
- gpio_set_value(H2_IRDA_FIRSEL_GPIO_PIN, !(state & IR_SIRMODE));
- return 0;
-}
-#endif
-
static struct omap_irda_config h2_irda_data = {
.transceiver_cap = IR_SIRMODE | IR_MIRMODE | IR_FIRMODE,
.rx_channel = OMAP_DMA_UART3_RX,
@@ -437,15 +428,6 @@ static void __init h2_init(void)
/* omap_cfg_reg(U19_ARMIO1); */ /* CD */
omap_cfg_reg(BALLOUT_V8_ARMIO3); /* WP */
- /* Irda */
-#if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE)
- omap_writel(omap_readl(FUNC_MUX_CTRL_A) | 7, FUNC_MUX_CTRL_A);
- if (gpio_request(H2_IRDA_FIRSEL_GPIO_PIN, "IRDA mode") < 0)
- BUG();
- gpio_direction_output(H2_IRDA_FIRSEL_GPIO_PIN, 0);
- h2_irda_data.transceiver_mode = h2_transceiver_mode;
-#endif
-
platform_add_devices(h2_devices, ARRAY_SIZE(h2_devices));
omap_board_config = h2_config;
omap_board_config_size = ARRAY_SIZE(h2_config);
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
index 0665f2c..ce4292b 100644
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@ -345,10 +345,6 @@ static void __init omap_h4_init(void)
* You have to mux them off in device drivers later on
* if not needed.
*/
-#if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE)
- omap_cfg_reg(K15_24XX_UART3_TX);
- omap_cfg_reg(K14_24XX_UART3_RX);
-#endif
#if defined(CONFIG_KEYBOARD_OMAP) || defined(CONFIG_KEYBOARD_OMAP_MODULE)
if (omap_has_menelaus()) {
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 05/33] Removing dead OMAP_IR
@ 2010-06-30 15:55 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:55 UTC (permalink / raw)
To: linux-arm-kernel
OMAP_IR doesn't exist in Kconfig, therefore removing all references
for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap1/board-h2.c | 18 ------------------
arch/arm/mach-omap2/board-h4.c | 4 ----
2 files changed, 0 insertions(+), 22 deletions(-)
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index d1100e4..d7640d3 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -292,15 +292,6 @@ static struct platform_device h2_kp_device = {
#define H2_IRDA_FIRSEL_GPIO_PIN 17
-#if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE)
-static int h2_transceiver_mode(struct device *dev, int state)
-{
- /* SIR when low, else MIR/FIR when HIGH */
- gpio_set_value(H2_IRDA_FIRSEL_GPIO_PIN, !(state & IR_SIRMODE));
- return 0;
-}
-#endif
-
static struct omap_irda_config h2_irda_data = {
.transceiver_cap = IR_SIRMODE | IR_MIRMODE | IR_FIRMODE,
.rx_channel = OMAP_DMA_UART3_RX,
@@ -437,15 +428,6 @@ static void __init h2_init(void)
/* omap_cfg_reg(U19_ARMIO1); */ /* CD */
omap_cfg_reg(BALLOUT_V8_ARMIO3); /* WP */
- /* Irda */
-#if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE)
- omap_writel(omap_readl(FUNC_MUX_CTRL_A) | 7, FUNC_MUX_CTRL_A);
- if (gpio_request(H2_IRDA_FIRSEL_GPIO_PIN, "IRDA mode") < 0)
- BUG();
- gpio_direction_output(H2_IRDA_FIRSEL_GPIO_PIN, 0);
- h2_irda_data.transceiver_mode = h2_transceiver_mode;
-#endif
-
platform_add_devices(h2_devices, ARRAY_SIZE(h2_devices));
omap_board_config = h2_config;
omap_board_config_size = ARRAY_SIZE(h2_config);
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
index 0665f2c..ce4292b 100644
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@ -345,10 +345,6 @@ static void __init omap_h4_init(void)
* You have to mux them off in device drivers later on
* if not needed.
*/
-#if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE)
- omap_cfg_reg(K15_24XX_UART3_TX);
- omap_cfg_reg(K14_24XX_UART3_RX);
-#endif
#if defined(CONFIG_KEYBOARD_OMAP) || defined(CONFIG_KEYBOARD_OMAP_MODULE)
if (omap_has_menelaus()) {
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 06/33] Removing dead SHARPSL_LOCOMO
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
@ 2010-06-30 15:55 ` Christoph Egger
2010-06-30 15:54 ` [PATCH 03/33] Removing dead OMAP_MUX_ERRORS Christoph Egger
` (36 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:55 UTC (permalink / raw)
To: Russell King, Eric Miao, linux-arm-kernel, linux-kernel; +Cc: vamos
SHARPSL_LOCOMO doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-sa1100/include/mach/irqs.h | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-sa1100/include/mach/irqs.h b/arch/arm/mach-sa1100/include/mach/irqs.h
index 8c8845b..123c6c9 100644
--- a/arch/arm/mach-sa1100/include/mach/irqs.h
+++ b/arch/arm/mach-sa1100/include/mach/irqs.h
@@ -77,8 +77,6 @@
*/
#ifdef CONFIG_SA1111
#define NR_IRQS (IRQ_BOARD_END + 55)
-#elif defined(CONFIG_SHARPSL_LOCOMO)
-#define NR_IRQS (IRQ_BOARD_START + 4)
#else
#define NR_IRQS (IRQ_BOARD_START)
#endif
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 06/33] Removing dead SHARPSL_LOCOMO
@ 2010-06-30 15:55 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:55 UTC (permalink / raw)
To: linux-arm-kernel
SHARPSL_LOCOMO doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-sa1100/include/mach/irqs.h | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-sa1100/include/mach/irqs.h b/arch/arm/mach-sa1100/include/mach/irqs.h
index 8c8845b..123c6c9 100644
--- a/arch/arm/mach-sa1100/include/mach/irqs.h
+++ b/arch/arm/mach-sa1100/include/mach/irqs.h
@@ -77,8 +77,6 @@
*/
#ifdef CONFIG_SA1111
#define NR_IRQS (IRQ_BOARD_END + 55)
-#elif defined(CONFIG_SHARPSL_LOCOMO)
-#define NR_IRQS (IRQ_BOARD_START + 4)
#else
#define NR_IRQS (IRQ_BOARD_START)
#endif
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 07/33] Removing dead CPU_S3C2400
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
@ 2010-06-30 15:56 ` Christoph Egger
2010-06-30 15:54 ` [PATCH 03/33] Removing dead OMAP_MUX_ERRORS Christoph Egger
` (36 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:56 UTC (permalink / raw)
To: Vincent Sanders, Ben Dooks, Russell King, Simtec Linux Team,
Mark Brown, Yauhen Kharuzhy, Jassi Brar, Harald Welte,
Nelson Castillo, Andy Green, linux-arm-kernel, linux-kernel
Cc: vamos
CPU_S3C2400 doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-s3c2410/include/mach/gpio-fns.h | 5 ----
arch/arm/mach-s3c2410/include/mach/regs-gpio.h | 4 ---
arch/arm/plat-s3c24xx/cpu.c | 15 -----------
arch/arm/plat-s3c24xx/include/plat/s3c2400.h | 31 ------------------------
4 files changed, 0 insertions(+), 55 deletions(-)
delete mode 100644 arch/arm/plat-s3c24xx/include/plat/s3c2400.h
diff --git a/arch/arm/mach-s3c2410/include/mach/gpio-fns.h b/arch/arm/mach-s3c2410/include/mach/gpio-fns.h
index f453c4f..fdee4be 100644
--- a/arch/arm/mach-s3c2410/include/mach/gpio-fns.h
+++ b/arch/arm/mach-s3c2410/include/mach/gpio-fns.h
@@ -52,11 +52,6 @@ extern unsigned int s3c2410_gpio_getcfg(unsigned int pin);
extern int s3c2410_gpio_getirq(unsigned int pin);
-#ifdef CONFIG_CPU_S3C2400
-
-extern int s3c2400_gpio_getirq(unsigned int pin);
-
-#endif /* CONFIG_CPU_S3C2400 */
/* s3c2410_gpio_irqfilter
*
diff --git a/arch/arm/mach-s3c2410/include/mach/regs-gpio.h b/arch/arm/mach-s3c2410/include/mach/regs-gpio.h
index a0a89d4..d4a3ad7 100644
--- a/arch/arm/mach-s3c2410/include/mach/regs-gpio.h
+++ b/arch/arm/mach-s3c2410/include/mach/regs-gpio.h
@@ -16,11 +16,7 @@
#include <mach/gpio-nrs.h>
-#ifdef CONFIG_CPU_S3C2400
-#define S3C24XX_MISCCR S3C2400_MISCCR
-#else
#define S3C24XX_MISCCR S3C24XX_GPIOREG2(0x80)
-#endif /* CONFIG_CPU_S3C2400 */
/* general configuration options */
diff --git a/arch/arm/plat-s3c24xx/cpu.c b/arch/arm/plat-s3c24xx/cpu.c
index 76d0858..edbbbe7 100644
--- a/arch/arm/plat-s3c24xx/cpu.c
+++ b/arch/arm/plat-s3c24xx/cpu.c
@@ -46,7 +46,6 @@
#include <plat/cpu.h>
#include <plat/devs.h>
#include <plat/clock.h>
-#include <plat/s3c2400.h>
#include <plat/s3c2410.h>
#include <plat/s3c2412.h>
#include <plat/s3c2416.h>
@@ -55,7 +54,6 @@
/* table of supported CPUs */
-static const char name_s3c2400[] = "S3C2400";
static const char name_s3c2410[] = "S3C2410";
static const char name_s3c2412[] = "S3C2412";
static const char name_s3c2416[] = "S3C2416/S3C2450";
@@ -157,15 +155,6 @@ static struct cpu_table cpu_ids[] __initdata = {
.init = s3c2443_init,
.name = name_s3c2443,
},
- {
- .idcode = 0x0, /* S3C2400 doesn't have an idcode */
- .idmask = 0xffffffff,
- .map_io = s3c2400_map_io,
- .init_clocks = s3c2400_init_clocks,
- .init_uarts = s3c2400_init_uarts,
- .init = s3c2400_init,
- .name = name_s3c2400
- },
};
/* minimal IO mapping */
@@ -200,11 +189,7 @@ static unsigned long s3c24xx_read_idcode_v5(void)
static unsigned long s3c24xx_read_idcode_v4(void)
{
-#ifndef CONFIG_CPU_S3C2400
return __raw_readl(S3C2410_GSTATUS1);
-#else
- return 0UL;
-#endif
}
/* Hook for arm_pm_restart to ensure we execute the reset code
diff --git a/arch/arm/plat-s3c24xx/include/plat/s3c2400.h b/arch/arm/plat-s3c24xx/include/plat/s3c2400.h
deleted file mode 100644
index b3feaea..0000000
--- a/arch/arm/plat-s3c24xx/include/plat/s3c2400.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* linux/include/asm-arm/plat-s3c24xx/s3c2400.h
- *
- * Copyright (c) 2004 Simtec Electronics
- * Ben Dooks <ben@simtec.co.uk>
- *
- * Header file for S3C2400 cpu support
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Modifications:
- * 09-Fev-2006 LCVR First version, based on s3c2410.h
-*/
-
-#ifdef CONFIG_CPU_S3C2400
-
-extern int s3c2400_init(void);
-
-extern void s3c2400_map_io(void);
-
-extern void s3c2400_init_uarts(struct s3c2410_uartcfg *cfg, int no);
-
-extern void s3c2400_init_clocks(int xtal);
-
-#else
-#define s3c2400_init_clocks NULL
-#define s3c2400_init_uarts NULL
-#define s3c2400_map_io NULL
-#define s3c2400_init NULL
-#endif
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 07/33] Removing dead CPU_S3C2400
@ 2010-06-30 15:56 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:56 UTC (permalink / raw)
To: linux-arm-kernel
CPU_S3C2400 doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-s3c2410/include/mach/gpio-fns.h | 5 ----
arch/arm/mach-s3c2410/include/mach/regs-gpio.h | 4 ---
arch/arm/plat-s3c24xx/cpu.c | 15 -----------
arch/arm/plat-s3c24xx/include/plat/s3c2400.h | 31 ------------------------
4 files changed, 0 insertions(+), 55 deletions(-)
delete mode 100644 arch/arm/plat-s3c24xx/include/plat/s3c2400.h
diff --git a/arch/arm/mach-s3c2410/include/mach/gpio-fns.h b/arch/arm/mach-s3c2410/include/mach/gpio-fns.h
index f453c4f..fdee4be 100644
--- a/arch/arm/mach-s3c2410/include/mach/gpio-fns.h
+++ b/arch/arm/mach-s3c2410/include/mach/gpio-fns.h
@@ -52,11 +52,6 @@ extern unsigned int s3c2410_gpio_getcfg(unsigned int pin);
extern int s3c2410_gpio_getirq(unsigned int pin);
-#ifdef CONFIG_CPU_S3C2400
-
-extern int s3c2400_gpio_getirq(unsigned int pin);
-
-#endif /* CONFIG_CPU_S3C2400 */
/* s3c2410_gpio_irqfilter
*
diff --git a/arch/arm/mach-s3c2410/include/mach/regs-gpio.h b/arch/arm/mach-s3c2410/include/mach/regs-gpio.h
index a0a89d4..d4a3ad7 100644
--- a/arch/arm/mach-s3c2410/include/mach/regs-gpio.h
+++ b/arch/arm/mach-s3c2410/include/mach/regs-gpio.h
@@ -16,11 +16,7 @@
#include <mach/gpio-nrs.h>
-#ifdef CONFIG_CPU_S3C2400
-#define S3C24XX_MISCCR S3C2400_MISCCR
-#else
#define S3C24XX_MISCCR S3C24XX_GPIOREG2(0x80)
-#endif /* CONFIG_CPU_S3C2400 */
/* general configuration options */
diff --git a/arch/arm/plat-s3c24xx/cpu.c b/arch/arm/plat-s3c24xx/cpu.c
index 76d0858..edbbbe7 100644
--- a/arch/arm/plat-s3c24xx/cpu.c
+++ b/arch/arm/plat-s3c24xx/cpu.c
@@ -46,7 +46,6 @@
#include <plat/cpu.h>
#include <plat/devs.h>
#include <plat/clock.h>
-#include <plat/s3c2400.h>
#include <plat/s3c2410.h>
#include <plat/s3c2412.h>
#include <plat/s3c2416.h>
@@ -55,7 +54,6 @@
/* table of supported CPUs */
-static const char name_s3c2400[] = "S3C2400";
static const char name_s3c2410[] = "S3C2410";
static const char name_s3c2412[] = "S3C2412";
static const char name_s3c2416[] = "S3C2416/S3C2450";
@@ -157,15 +155,6 @@ static struct cpu_table cpu_ids[] __initdata = {
.init = s3c2443_init,
.name = name_s3c2443,
},
- {
- .idcode = 0x0, /* S3C2400 doesn't have an idcode */
- .idmask = 0xffffffff,
- .map_io = s3c2400_map_io,
- .init_clocks = s3c2400_init_clocks,
- .init_uarts = s3c2400_init_uarts,
- .init = s3c2400_init,
- .name = name_s3c2400
- },
};
/* minimal IO mapping */
@@ -200,11 +189,7 @@ static unsigned long s3c24xx_read_idcode_v5(void)
static unsigned long s3c24xx_read_idcode_v4(void)
{
-#ifndef CONFIG_CPU_S3C2400
return __raw_readl(S3C2410_GSTATUS1);
-#else
- return 0UL;
-#endif
}
/* Hook for arm_pm_restart to ensure we execute the reset code
diff --git a/arch/arm/plat-s3c24xx/include/plat/s3c2400.h b/arch/arm/plat-s3c24xx/include/plat/s3c2400.h
deleted file mode 100644
index b3feaea..0000000
--- a/arch/arm/plat-s3c24xx/include/plat/s3c2400.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* linux/include/asm-arm/plat-s3c24xx/s3c2400.h
- *
- * Copyright (c) 2004 Simtec Electronics
- * Ben Dooks <ben@simtec.co.uk>
- *
- * Header file for S3C2400 cpu support
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Modifications:
- * 09-Fev-2006 LCVR First version, based on s3c2410.h
-*/
-
-#ifdef CONFIG_CPU_S3C2400
-
-extern int s3c2400_init(void);
-
-extern void s3c2400_map_io(void);
-
-extern void s3c2400_init_uarts(struct s3c2410_uartcfg *cfg, int no);
-
-extern void s3c2400_init_clocks(int xtal);
-
-#else
-#define s3c2400_init_clocks NULL
-#define s3c2400_init_uarts NULL
-#define s3c2400_map_io NULL
-#define s3c2400_init NULL
-#endif
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 08/33] Removing dead SA1101
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
@ 2010-06-30 15:56 ` Christoph Egger
2010-06-30 15:54 ` [PATCH 03/33] Removing dead OMAP_MUX_ERRORS Christoph Egger
` (36 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:56 UTC (permalink / raw)
To: Russell King, Nicolas Pitre, linux-arm-kernel, linux-kernel; +Cc: vamos
SA1101 doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-sa1100/include/mach/SA-1101.h | 925 --------------------------
arch/arm/mach-sa1100/include/mach/hardware.h | 4 -
2 files changed, 0 insertions(+), 929 deletions(-)
delete mode 100644 arch/arm/mach-sa1100/include/mach/SA-1101.h
diff --git a/arch/arm/mach-sa1100/include/mach/SA-1101.h b/arch/arm/mach-sa1100/include/mach/SA-1101.h
deleted file mode 100644
index 5d2ad7d..0000000
--- a/arch/arm/mach-sa1100/include/mach/SA-1101.h
+++ /dev/null
@@ -1,925 +0,0 @@
-/*
- * SA-1101.h
- *
- * Copyright (c) Peter Danielsson 1999
- *
- * Definition of constants related to the sa1101
- * support chip for the sa1100
- *
- */
-
-
-/* Be sure that virtual mapping is defined right */
-#ifndef __ASM_ARCH_HARDWARE_H
-#error You must include hardware.h not SA-1101.h
-#endif
-
-#ifndef SA1101_BASE
-#error You must define SA-1101 physical base address
-#endif
-
-#ifndef LANGUAGE
-# ifdef __ASSEMBLY__
-# define LANGUAGE Assembly
-# else
-# define LANGUAGE C
-# endif
-#endif
-
-/*
- * We have mapped the sa1101 depending on the value of SA1101_BASE.
- * It then appears from 0xf4000000.
- */
-
-#define SA1101_p2v( x ) ((x) - SA1101_BASE + 0xf4000000)
-#define SA1101_v2p( x ) ((x) - 0xf4000000 + SA1101_BASE)
-
-#ifndef SA1101_p2v
-#define SA1101_p2v(PhAdd) (PhAdd)
-#endif
-
-#include <mach/bitfield.h>
-
-#define C 0
-#define Assembly 1
-
-
-/*
- * Memory map
- */
-
-#define __SHMEM_CONTROL0 0x00000000
-#define __SYSTEM_CONTROL1 0x00000400
-#define __ARBITER 0x00020000
-#define __SYSTEM_CONTROL2 0x00040000
-#define __SYSTEM_CONTROL3 0x00060000
-#define __PARALLEL_PORT 0x00080000
-#define __VIDMEM_CONTROL 0x00100000
-#define __UPDATE_FIFO 0x00120000
-#define __SHMEM_CONTROL1 0x00140000
-#define __INTERRUPT_CONTROL 0x00160000
-#define __USB_CONTROL 0x00180000
-#define __TRACK_INTERFACE 0x001a0000
-#define __MOUSE_INTERFACE 0x001b0000
-#define __KEYPAD_INTERFACE 0x001c0000
-#define __PCMCIA_INTERFACE 0x001e0000
-#define __VGA_CONTROL 0x00200000
-#define __GPIO_INTERFACE 0x00300000
-
-/*
- * Macro that calculates real address for registers in the SA-1101
- */
-
-#define _SA1101( x ) ((x) + SA1101_BASE)
-
-/*
- * Interface and shared memory controller registers
- *
- * Registers
- * SKCR SA-1101 control register (read/write)
- * SMCR Shared Memory Controller Register
- * SNPR Snoop Register
- */
-
-#define _SKCR _SA1101( 0x00000000 ) /* SA-1101 Control Reg. */
-#define _SMCR _SA1101( 0x00140000 ) /* Shared Mem. Control Reg. */
-#define _SNPR _SA1101( 0x00140400 ) /* Snoop Reg. */
-
-#if LANGUAGE == C
-#define SKCR (*((volatile Word *) SA1101_p2v (_SKCR)))
-#define SMCR (*((volatile Word *) SA1101_p2v (_SMCR)))
-#define SNPR (*((volatile Word *) SA1101_p2v (_SNPR)))
-
-#define SKCR_PLLEn 0x0001 /* Enable On-Chip PLL */
-#define SKCR_BCLKEn 0x0002 /* Enables BCLK */
-#define SKCR_Sleep 0x0004 /* Sleep Mode */
-#define SKCR_IRefEn 0x0008 /* DAC Iref input enable */
-#define SKCR_VCOON 0x0010 /* VCO bias */
-#define SKCR_ScanTestEn 0x0020 /* Enables scan test */
-#define SKCR_ClockTestEn 0x0040 /* Enables clock test */
-
-#define SMCR_DCAC Fld(2,0) /* Number of column address bits */
-#define SMCR_DRAC Fld(2,2) /* Number of row address bits */
-#define SMCR_ArbiterBias 0x0008 /* favor video or USB */
-#define SMCR_TopVidMem Fld(4,5) /* Top 4 bits of vidmem addr. */
-
-#define SMCR_ColAdrBits( x ) /* col. addr bits 8..11 */ \
- (( (x) - 8 ) << FShft (SMCR_DCAC))
-#define SMCR_RowAdrBits( x ) /* row addr bits 9..12 */\
- (( (x) - 9 ) << FShft (SMCR_DRAC))
-
-#define SNPR_VFBstart Fld(12,0) /* Video frame buffer addr */
-#define SNPR_VFBsize Fld(11,12) /* Video frame buffer size */
-#define SNPR_WholeBank (1 << 23) /* Whole bank bit */
-#define SNPR_BankSelect Fld(2,27) /* Bank select */
-#define SNPR_SnoopEn (1 << 31) /* Enable snoop operation */
-
-#define SNPR_Set_VFBsize( x ) /* set frame buffer size (in kb) */ \
- ( (x) << FShft (SNPR_VFBsize))
-#define SNPR_Select_Bank(x) /* select bank 0 or 1 */ \
- (( (x) + 1 ) << FShft (SNPR_BankSelect ))
-
-#endif /* LANGUAGE == C */
-
-/*
- * Video Memory Controller
- *
- * Registers
- * VMCCR Configuration register
- * VMCAR VMC address register
- * VMCDR VMC data register
- *
- */
-
-#define _VMCCR _SA1101( 0x00100000 ) /* Configuration register */
-#define _VMCAR _SA1101( 0x00101000 ) /* VMC address register */
-#define _VMCDR _SA1101( 0x00101400 ) /* VMC data register */
-
-#if LANGUAGE == C
-#define VMCCR (*((volatile Word *) SA1101_p2v (_VMCCR)))
-#define VMCAR (*((volatile Word *) SA1101_p2v (_VMCAR)))
-#define VMCDR (*((volatile Word *) SA1101_p2v (_VMCDR)))
-
-#define VMCCR_RefreshEn 0x0000 /* Enable memory refresh */
-#define VMCCR_Config 0x0001 /* DRAM size */
-#define VMCCR_RefPeriod Fld(2,3) /* Refresh period */
-#define VMCCR_StaleDataWait Fld(4,5) /* Stale FIFO data timeout counter */
-#define VMCCR_SleepState (1<<9) /* State of interface pins in sleep*/
-#define VMCCR_RefTest (1<<10) /* refresh test */
-#define VMCCR_RefLow Fld(6,11) /* refresh low counter */
-#define VMCCR_RefHigh Fld(7,17) /* refresh high counter */
-#define VMCCR_SDTCTest Fld(7,24) /* stale data timeout counter */
-#define VMCCR_ForceSelfRef (1<<31) /* Force self refresh */
-
-#endif LANGUAGE == C
-
-
-/* Update FIFO
- *
- * Registers
- * UFCR Update FIFO Control Register
- * UFSR Update FIFO Status Register
- * UFLVLR update FIFO level register
- * UFDR update FIFO data register
- */
-
-#define _UFCR _SA1101(0x00120000) /* Update FIFO Control Reg. */
-#define _UFSR _SA1101(0x00120400) /* Update FIFO Status Reg. */
-#define _UFLVLR _SA1101(0x00120800) /* Update FIFO level reg. */
-#define _UFDR _SA1101(0x00120c00) /* Update FIFO data reg. */
-
-#if LANGUAGE == C
-
-#define UFCR (*((volatile Word *) SA1101_p2v (_UFCR)))
-#define UFSR (*((volatile Word *) SA1101_p2v (_UFSR)))
-#define UFLVLR (*((volatile Word *) SA1101_p2v (_UFLVLR)))
-#define UFDR (*((volatile Word *) SA1101_p2v (_UFDR)))
-
-
-#define UFCR_FifoThreshhold Fld(7,0) /* Level for FifoGTn flag */
-
-#define UFSR_FifoGTnFlag 0x01 /* FifoGTn flag */#define UFSR_FifoEmpty 0x80 /* FIFO is empty */
-
-#endif /* LANGUAGE == C */
-
-/* System Controller
- *
- * Registers
- * SKPCR Power Control Register
- * SKCDR Clock Divider Register
- * DACDR1 DAC1 Data register
- * DACDR2 DAC2 Data register
- */
-
-#define _SKPCR _SA1101(0x00000400)
-#define _SKCDR _SA1101(0x00040000)
-#define _DACDR1 _SA1101(0x00060000)
-#define _DACDR2 _SA1101(0x00060400)
-
-#if LANGUAGE == C
-#define SKPCR (*((volatile Word *) SA1101_p2v (_SKPCR)))
-#define SKCDR (*((volatile Word *) SA1101_p2v (_SKCDR)))
-#define DACDR1 (*((volatile Word *) SA1101_p2v (_DACDR1)))
-#define DACDR2 (*((volatile Word *) SA1101_p2v (_DACDR2)))
-
-#define SKPCR_UCLKEn 0x01 /* USB Enable */
-#define SKPCR_PCLKEn 0x02 /* PS/2 Enable */
-#define SKPCR_ICLKEn 0x04 /* Interrupt Controller Enable */
-#define SKPCR_VCLKEn 0x08 /* Video Controller Enable */
-#define SKPCR_PICLKEn 0x10 /* parallel port Enable */
-#define SKPCR_DCLKEn 0x20 /* DACs Enable */
-#define SKPCR_nKPADEn 0x40 /* Multiplexer */
-
-#define SKCDR_PLLMul Fld(7,0) /* PLL Multiplier */
-#define SKCDR_VCLKEn Fld(2,7) /* Video controller clock divider */
-#define SKDCR_BCLKEn (1<<9) /* BCLK Divider */
-#define SKDCR_UTESTCLKEn (1<<10) /* Route USB clock during test mode */
-#define SKDCR_DivRValue Fld(6,11) /* Input clock divider for PLL */
-#define SKDCR_DivNValue Fld(5,17) /* Output clock divider for PLL */
-#define SKDCR_PLLRSH Fld(3,22) /* PLL bandwidth control */
-#define SKDCR_ChargePump (1<<25) /* Charge pump control */
-#define SKDCR_ClkTestMode (1<<26) /* Clock output test mode */
-#define SKDCR_ClkTestEn (1<<27) /* Test clock generator */
-#define SKDCR_ClkJitterCntl Fld(3,28) /* video clock jitter compensation */
-
-#define DACDR_DACCount Fld(8,0) /* Count value */
-#define DACDR1_DACCount DACDR_DACCount
-#define DACDR2_DACCount DACDR_DACCount
-
-#endif /* LANGUAGE == C */
-
-/*
- * Parallel Port Interface
- *
- * Registers
- * IEEE_Config IEEE mode selection and programmable attributes
- * IEEE_Control Controls the states of IEEE port control outputs
- * IEEE_Data Forward transfer data register
- * IEEE_Addr Forward transfer address register
- * IEEE_Status Port IO signal status register
- * IEEE_IntStatus Port interrupts status register
- * IEEE_FifoLevels Rx and Tx FIFO interrupt generation levels
- * IEEE_InitTime Forward timeout counter initial value
- * IEEE_TimerStatus Forward timeout counter current value
- * IEEE_FifoReset Reset forward transfer FIFO
- * IEEE_ReloadValue Counter reload value
- * IEEE_TestControl Control testmode
- * IEEE_TestDataIn Test data register
- * IEEE_TestDataInEn Enable test data
- * IEEE_TestCtrlIn Test control signals
- * IEEE_TestCtrlInEn Enable test control signals
- * IEEE_TestDataStat Current data bus value
- *
- */
-
-/*
- * The control registers are defined as offsets from a base address
- */
-
-#define _IEEE( x ) _SA1101( (x) + __PARALLEL_PORT )
-
-#define _IEEE_Config _IEEE( 0x0000 )
-#define _IEEE_Control _IEEE( 0x0400 )
-#define _IEEE_Data _IEEE( 0x4000 )
-#define _IEEE_Addr _IEEE( 0x0800 )
-#define _IEEE_Status _IEEE( 0x0c00 )
-#define _IEEE_IntStatus _IEEE( 0x1000 )
-#define _IEEE_FifoLevels _IEEE( 0x1400 )
-#define _IEEE_InitTime _IEEE( 0x1800 )
-#define _IEEE_TimerStatus _IEEE( 0x1c00 )
-#define _IEEE_FifoReset _IEEE( 0x2000 )
-#define _IEEE_ReloadValue _IEEE( 0x3c00 )
-#define _IEEE_TestControl _IEEE( 0x2400 )
-#define _IEEE_TestDataIn _IEEE( 0x2800 )
-#define _IEEE_TestDataInEn _IEEE( 0x2c00 )
-#define _IEEE_TestCtrlIn _IEEE( 0x3000 )
-#define _IEEE_TestCtrlInEn _IEEE( 0x3400 )
-#define _IEEE_TestDataStat _IEEE( 0x3800 )
-
-
-#if LANGUAGE == C
-#define IEEE_Config (*((volatile Word *) SA1101_p2v (_IEEE_Config)))
-#define IEEE_Control (*((volatile Word *) SA1101_p2v (_IEEE_Control)))
-#define IEEE_Data (*((volatile Word *) SA1101_p2v (_IEEE_Data)))
-#define IEEE_Addr (*((volatile Word *) SA1101_p2v (_IEEE_Addr)))
-#define IEEE_Status (*((volatile Word *) SA1101_p2v (_IEEE_Status)))
-#define IEEE_IntStatus (*((volatile Word *) SA1101_p2v (_IEEE_IntStatus)))
-#define IEEE_FifoLevels (*((volatile Word *) SA1101_p2v (_IEEE_FifoLevels)))
-#define IEEE_InitTime (*((volatile Word *) SA1101_p2v (_IEEE_InitTime)))
-#define IEEE_TimerStatus (*((volatile Word *) SA1101_p2v (_IEEE_TimerStatus)))
-#define IEEE_FifoReset (*((volatile Word *) SA1101_p2v (_IEEE_FifoReset)))
-#define IEEE_ReloadValue (*((volatile Word *) SA1101_p2v (_IEEE_ReloadValue)))
-#define IEEE_TestControl (*((volatile Word *) SA1101_p2v (_IEEE_TestControl)))
-#define IEEE_TestDataIn (*((volatile Word *) SA1101_p2v (_IEEE_TestDataIn)))
-#define IEEE_TestDataInEn (*((volatile Word *) SA1101_p2v (_IEEE_TestDataInEn)))
-#define IEEE_TestCtrlIn (*((volatile Word *) SA1101_p2v (_IEEE_TestCtrlIn)))
-#define IEEE_TestCtrlInEn (*((volatile Word *) SA1101_p2v (_IEEE_TestCtrlInEn)))
-#define IEEE_TestDataStat (*((volatile Word *) SA1101_p2v (_IEEE_TestDataStat)))
-
-
-#define IEEE_Config_M Fld(3,0) /* Mode select */
-#define IEEE_Config_D 0x04 /* FIFO access enable */
-#define IEEE_Config_B 0x08 /* 9-bit word enable */
-#define IEEE_Config_T 0x10 /* Data transfer enable */
-#define IEEE_Config_A 0x20 /* Data transfer direction */
-#define IEEE_Config_E 0x40 /* Timer enable */
-#define IEEE_Control_A 0x08 /* AutoFd output */
-#define IEEE_Control_E 0x04 /* Selectin output */
-#define IEEE_Control_T 0x02 /* Strobe output */
-#define IEEE_Control_I 0x01 /* Port init output */
-#define IEEE_Data_C (1<<31) /* Byte count */
-#define IEEE_Data_Db Fld(9,16) /* Data byte 2 */
-#define IEEE_Data_Da Fld(9,0) /* Data byte 1 */
-#define IEEE_Addr_A Fld(8,0) /* forward address transfer byte */
-#define IEEE_Status_A 0x0100 /* nAutoFd port output status */
-#define IEEE_Status_E 0x0080 /* nSelectIn port output status */
-#define IEEE_Status_T 0x0040 /* nStrobe port output status */
-#define IEEE_Status_I 0x0020 /* nInit port output status */
-#define IEEE_Status_B 0x0010 /* Busy port inout status */
-#define IEEE_Status_S 0x0008 /* Select port input status */
-#define IEEE_Status_K 0x0004 /* nAck port input status */
-#define IEEE_Status_F 0x0002 /* nFault port input status */
-#define IEEE_Status_R 0x0001 /* pError port input status */
-
-#define IEEE_IntStatus_IntReqDat 0x0100
-#define IEEE_IntStatus_IntReqEmp 0x0080
-#define IEEE_IntStatus_IntReqInt 0x0040
-#define IEEE_IntStatus_IntReqRav 0x0020
-#define IEEE_IntStatus_IntReqTim 0x0010
-#define IEEE_IntStatus_RevAddrComp 0x0008
-#define IEEE_IntStatus_RevDataComp 0x0004
-#define IEEE_IntStatus_FwdAddrComp 0x0002
-#define IEEE_IntStatus_FwdDataComp 0x0001
-#define IEEE_FifoLevels_RevFifoLevel 2
-#define IEEE_FifoLevels_FwdFifoLevel 1
-#define IEEE_InitTime_TimValInit Fld(22,0)
-#define IEEE_TimerStatus_TimValStat Fld(22,0)
-#define IEEE_ReloadValue_Reload Fld(4,0)
-
-#define IEEE_TestControl_RegClk 0x04
-#define IEEE_TestControl_ClockSelect Fld(2,1)
-#define IEEE_TestControl_TimerTestModeEn 0x01
-#define IEEE_TestCtrlIn_PError 0x10
-#define IEEE_TestCtrlIn_nFault 0x08
-#define IEEE_TestCtrlIn_nAck 0x04
-#define IEEE_TestCtrlIn_PSel 0x02
-#define IEEE_TestCtrlIn_Busy 0x01
-
-#endif /* LANGUAGE == C */
-
-/*
- * VGA Controller
- *
- * Registers
- * VideoControl Video Control Register
- * VgaTiming0 VGA Timing Register 0
- * VgaTiming1 VGA Timing Register 1
- * VgaTiming2 VGA Timing Register 2
- * VgaTiming3 VGA Timing Register 3
- * VgaBorder VGA Border Color Register
- * VgaDBAR VGADMA Base Address Register
- * VgaDCAR VGADMA Channel Current Address Register
- * VgaStatus VGA Status Register
- * VgaInterruptMask VGA Interrupt Mask Register
- * VgaPalette VGA Palette Registers
- * DacControl DAC Control Register
- * VgaTest VGA Controller Test Register
- */
-
-#define _VGA( x ) _SA1101( ( x ) + __VGA_CONTROL )
-
-#define _VideoControl _VGA( 0x0000 )
-#define _VgaTiming0 _VGA( 0x0400 )
-#define _VgaTiming1 _VGA( 0x0800 )
-#define _VgaTiming2 _VGA( 0x0c00 )
-#define _VgaTiming3 _VGA( 0x1000 )
-#define _VgaBorder _VGA( 0x1400 )
-#define _VgaDBAR _VGA( 0x1800 )
-#define _VgaDCAR _VGA( 0x1c00 )
-#define _VgaStatus _VGA( 0x2000 )
-#define _VgaInterruptMask _VGA( 0x2400 )
-#define _VgaPalette _VGA( 0x40000 )
-#define _DacControl _VGA( 0x3000 )
-#define _VgaTest _VGA( 0x2c00 )
-
-#if (LANGUAGE == C)
-#define VideoControl (*((volatile Word *) SA1101_p2v (_VideoControl)))
-#define VgaTiming0 (*((volatile Word *) SA1101_p2v (_VgaTiming0)))
-#define VgaTiming1 (*((volatile Word *) SA1101_p2v (_VgaTiming1)))
-#define VgaTiming2 (*((volatile Word *) SA1101_p2v (_VgaTiming2)))
-#define VgaTiming3 (*((volatile Word *) SA1101_p2v (_VgaTiming3)))
-#define VgaBorder (*((volatile Word *) SA1101_p2v (_VgaBorder)))
-#define VgaDBAR (*((volatile Word *) SA1101_p2v (_VgaDBAR)))
-#define VgaDCAR (*((volatile Word *) SA1101_p2v (_VgaDCAR)))
-#define VgaStatus (*((volatile Word *) SA1101_p2v (_VgaStatus)))
-#define VgaInterruptMask (*((volatile Word *) SA1101_p2v (_VgaInterruptMask)))
-#define VgaPalette (*((volatile Word *) SA1101_p2v (_VgaPalette)))
-#define DacControl (*((volatile Word *) SA1101_p2v (_DacControl)))
-#define VgaTest (*((volatile Word *) SA1101_p2v (_VgaTest)))
-
-#define VideoControl_VgaEn 0x00000000
-#define VideoControl_BGR 0x00000001
-#define VideoControl_VCompVal Fld(2,2)
-#define VideoControl_VgaReq Fld(4,4)
-#define VideoControl_VBurstL Fld(4,8)
-#define VideoControl_VMode (1<<12)
-#define VideoControl_PalRead (1<<13)
-
-#define VgaTiming0_PPL Fld(6,2)
-#define VgaTiming0_HSW Fld(8,8)
-#define VgaTiming0_HFP Fld(8,16)
-#define VgaTiming0_HBP Fld(8,24)
-
-#define VgaTiming1_LPS Fld(10,0)
-#define VgaTiming1_VSW Fld(6,10)
-#define VgaTiming1_VFP Fld(8,16)
-#define VgaTiming1_VBP Fld(8,24)
-
-#define VgaTiming2_IVS 0x01
-#define VgaTiming2_IHS 0x02
-#define VgaTiming2_CVS 0x04
-#define VgaTiming2_CHS 0x08
-
-#define VgaTiming3_HBS Fld(8,0)
-#define VgaTiming3_HBE Fld(8,8)
-#define VgaTiming3_VBS Fld(8,16)
-#define VgaTiming3_VBE Fld(8,24)
-
-#define VgaBorder_BCOL Fld(24,0)
-
-#define VgaStatus_VFUF 0x01
-#define VgaStatus_VNext 0x02
-#define VgaStatus_VComp 0x04
-
-#define VgaInterruptMask_VFUFMask 0x00
-#define VgaInterruptMask_VNextMask 0x01
-#define VgaInterruptMask_VCompMask 0x02
-
-#define VgaPalette_R Fld(8,0)
-#define VgaPalette_G Fld(8,8)
-#define VgaPalette_B Fld(8,16)
-
-#define DacControl_DACON 0x0001
-#define DacControl_COMPON 0x0002
-#define DacControl_PEDON 0x0004
-#define DacControl_RTrim Fld(5,4)
-#define DacControl_GTrim Fld(5,9)
-#define DacControl_BTrim Fld(5,14)
-
-#define VgaTest_TDAC 0x00
-#define VgaTest_Datatest Fld(4,1)
-#define VgaTest_DACTESTDAC 0x10
-#define VgaTest_DACTESTOUT Fld(3,5)
-
-#endif /* LANGUAGE == C */
-
-/*
- * USB Host Interface Controller
- *
- * Registers
- * Revision
- * Control
- * CommandStatus
- * InterruptStatus
- * InterruptEnable
- * HCCA
- * PeriodCurrentED
- * ControlHeadED
- * BulkHeadED
- * BulkCurrentED
- * DoneHead
- * FmInterval
- * FmRemaining
- * FmNumber
- * PeriodicStart
- * LSThreshold
- * RhDescriptorA
- * RhDescriptorB
- * RhStatus
- * RhPortStatus
- * USBStatus
- * USBReset
- * USTAR
- * USWER
- * USRFR
- * USNFR
- * USTCSR
- * USSR
- *
- */
-
-#define _USB( x ) _SA1101( ( x ) + __USB_CONTROL )
-
-
-#define _Revision _USB( 0x0000 )
-#define _Control _USB( 0x0888 )
-#define _CommandStatus _USB( 0x0c00 )
-#define _InterruptStatus _USB( 0x1000 )
-#define _InterruptEnable _USB( 0x1400 )
-#define _HCCA _USB( 0x1800 )
-#define _PeriodCurrentED _USB( 0x1c00 )
-#define _ControlHeadED _USB( 0x2000 )
-#define _BulkHeadED _USB( 0x2800 )
-#define _BulkCurrentED _USB( 0x2c00 )
-#define _DoneHead _USB( 0x3000 )
-#define _FmInterval _USB( 0x3400 )
-#define _FmRemaining _USB( 0x3800 )
-#define _FmNumber _USB( 0x3c00 )
-#define _PeriodicStart _USB( 0x4000 )
-#define _LSThreshold _USB( 0x4400 )
-#define _RhDescriptorA _USB( 0x4800 )
-#define _RhDescriptorB _USB( 0x4c00 )
-#define _RhStatus _USB( 0x5000 )
-#define _RhPortStatus _USB( 0x5400 )
-#define _USBStatus _USB( 0x11800 )
-#define _USBReset _USB( 0x11c00 )
-
-#define _USTAR _USB( 0x10400 )
-#define _USWER _USB( 0x10800 )
-#define _USRFR _USB( 0x10c00 )
-#define _USNFR _USB( 0x11000 )
-#define _USTCSR _USB( 0x11400 )
-#define _USSR _USB( 0x11800 )
-
-
-#if (LANGUAGE == C)
-
-#define Revision (*((volatile Word *) SA1101_p2v (_Revision)))
-#define Control (*((volatile Word *) SA1101_p2v (_Control)))
-#define CommandStatus (*((volatile Word *) SA1101_p2v (_CommandStatus)))
-#define InterruptStatus (*((volatile Word *) SA1101_p2v (_InterruptStatus)))
-#define InterruptEnable (*((volatile Word *) SA1101_p2v (_InterruptEnable)))
-#define HCCA (*((volatile Word *) SA1101_p2v (_HCCA)))
-#define PeriodCurrentED (*((volatile Word *) SA1101_p2v (_PeriodCurrentED)))
-#define ControlHeadED (*((volatile Word *) SA1101_p2v (_ControlHeadED)))
-#define BulkHeadED (*((volatile Word *) SA1101_p2v (_BulkHeadED)))
-#define BulkCurrentED (*((volatile Word *) SA1101_p2v (_BulkCurrentED)))
-#define DoneHead (*((volatile Word *) SA1101_p2v (_DoneHead)))
-#define FmInterval (*((volatile Word *) SA1101_p2v (_FmInterval)))
-#define FmRemaining (*((volatile Word *) SA1101_p2v (_FmRemaining)))
-#define FmNumber (*((volatile Word *) SA1101_p2v (_FmNumber)))
-#define PeriodicStart (*((volatile Word *) SA1101_p2v (_PeriodicStart)))
-#define LSThreshold (*((volatile Word *) SA1101_p2v (_LSThreshold)))
-#define RhDescriptorA (*((volatile Word *) SA1101_p2v (_RhDescriptorA)))
-#define RhDescriptorB (*((volatile Word *) SA1101_p2v (_RhDescriptorB)))
-#define RhStatus (*((volatile Word *) SA1101_p2v (_RhStatus)))
-#define RhPortStatus (*((volatile Word *) SA1101_p2v (_RhPortStatus)))
-#define USBStatus (*((volatile Word *) SA1101_p2v (_USBStatus)))
-#define USBReset (*((volatile Word *) SA1101_p2v (_USBReset)))
-#define USTAR (*((volatile Word *) SA1101_p2v (_USTAR)))
-#define USWER (*((volatile Word *) SA1101_p2v (_USWER)))
-#define USRFR (*((volatile Word *) SA1101_p2v (_USRFR)))
-#define USNFR (*((volatile Word *) SA1101_p2v (_USNFR)))
-#define USTCSR (*((volatile Word *) SA1101_p2v (_USTCSR)))
-#define USSR (*((volatile Word *) SA1101_p2v (_USSR)))
-
-
-#define USBStatus_IrqHciRmtWkp (1<<7)
-#define USBStatus_IrqHciBuffAcc (1<<8)
-#define USBStatus_nIrqHciM (1<<9)
-#define USBStatus_nHciMFClr (1<<10)
-
-#define USBReset_ForceIfReset 0x01
-#define USBReset_ForceHcReset 0x02
-#define USBReset_ClkGenReset 0x04
-
-#define USTCR_RdBstCntrl Fld(3,0)
-#define USTCR_ByteEnable Fld(4,3)
-#define USTCR_WriteEn (1<<7)
-#define USTCR_FifoCir (1<<8)
-#define USTCR_TestXferSel (1<<9)
-#define USTCR_FifoCirAtEnd (1<<10)
-#define USTCR_nSimScaleDownClk (1<<11)
-
-#define USSR_nAppMDEmpty 0x01
-#define USSR_nAppMDFirst 0x02
-#define USSR_nAppMDLast 0x04
-#define USSR_nAppMDFull 0x08
-#define USSR_nAppMAFull 0x10
-#define USSR_XferReq 0x20
-#define USSR_XferEnd 0x40
-
-#endif /* LANGUAGE == C */
-
-
-/*
- * Interrupt Controller
- *
- * Registers
- * INTTEST0 Test register 0
- * INTTEST1 Test register 1
- * INTENABLE0 Interrupt Enable register 0
- * INTENABLE1 Interrupt Enable register 1
- * INTPOL0 Interrupt Polarity selection 0
- * INTPOL1 Interrupt Polarity selection 1
- * INTTSTSEL Interrupt source selection
- * INTSTATCLR0 Interrupt Status 0
- * INTSTATCLR1 Interrupt Status 1
- * INTSET0 Interrupt Set 0
- * INTSET1 Interrupt Set 1
- */
-
-#define _INT( x ) _SA1101( ( x ) + __INTERRUPT_CONTROL)
-
-#define _INTTEST0 _INT( 0x1000 )
-#define _INTTEST1 _INT( 0x1400 )
-#define _INTENABLE0 _INT( 0x2000 )
-#define _INTENABLE1 _INT( 0x2400 )
-#define _INTPOL0 _INT( 0x3000 )
-#define _INTPOL1 _INT( 0x3400 )
-#define _INTTSTSEL _INT( 0x5000 )
-#define _INTSTATCLR0 _INT( 0x6000 )
-#define _INTSTATCLR1 _INT( 0x6400 )
-#define _INTSET0 _INT( 0x7000 )
-#define _INTSET1 _INT( 0x7400 )
-
-#if ( LANGUAGE == C )
-#define INTTEST0 (*((volatile Word *) SA1101_p2v (_INTTEST0)))
-#define INTTEST1 (*((volatile Word *) SA1101_p2v (_INTTEST1)))
-#define INTENABLE0 (*((volatile Word *) SA1101_p2v (_INTENABLE0)))
-#define INTENABLE1 (*((volatile Word *) SA1101_p2v (_INTENABLE1)))
-#define INTPOL0 (*((volatile Word *) SA1101_p2v (_INTPOL0)))
-#define INTPOL1 (*((volatile Word *) SA1101_p2v (_INTPOL1)))
-#define INTTSTSEL (*((volatile Word *) SA1101_p2v (_INTTSTSEL)))
-#define INTSTATCLR0 (*((volatile Word *) SA1101_p2v (_INTSTATCLR0)))
-#define INTSTATCLR1 (*((volatile Word *) SA1101_p2v (_INTSTATCLR1)))
-#define INTSET0 (*((volatile Word *) SA1101_p2v (_INTSET0)))
-#define INTSET1 (*((volatile Word *) SA1101_p2v (_INTSET1)))
-
-#endif /* LANGUAGE == C */
-
-/*
- * PS/2 Trackpad and Mouse Interfaces
- *
- * Registers (prefix kbd applies to trackpad interface, mse to mouse)
- * KBDCR Control Register
- * KBDSTAT Status Register
- * KBDDATA Transmit/Receive Data register
- * KBDCLKDIV Clock Division Register
- * KBDPRECNT Clock Precount Register
- * KBDTEST1 Test register 1
- * KBDTEST2 Test register 2
- * KBDTEST3 Test register 3
- * KBDTEST4 Test register 4
- * MSECR
- * MSESTAT
- * MSEDATA
- * MSECLKDIV
- * MSEPRECNT
- * MSETEST1
- * MSETEST2
- * MSETEST3
- * MSETEST4
- *
- */
-
-#define _KBD( x ) _SA1101( ( x ) + __TRACK_INTERFACE )
-#define _MSE( x ) _SA1101( ( x ) + __MOUSE_INTERFACE )
-
-#define _KBDCR _KBD( 0x0000 )
-#define _KBDSTAT _KBD( 0x0400 )
-#define _KBDDATA _KBD( 0x0800 )
-#define _KBDCLKDIV _KBD( 0x0c00 )
-#define _KBDPRECNT _KBD( 0x1000 )
-#define _KBDTEST1 _KBD( 0x2000 )
-#define _KBDTEST2 _KBD( 0x2400 )
-#define _KBDTEST3 _KBD( 0x2800 )
-#define _KBDTEST4 _KBD( 0x2c00 )
-#define _MSECR _MSE( 0x0000 )
-#define _MSESTAT _MSE( 0x0400 )
-#define _MSEDATA _MSE( 0x0800 )
-#define _MSECLKDIV _MSE( 0x0c00 )
-#define _MSEPRECNT _MSE( 0x1000 )
-#define _MSETEST1 _MSE( 0x2000 )
-#define _MSETEST2 _MSE( 0x2400 )
-#define _MSETEST3 _MSE( 0x2800 )
-#define _MSETEST4 _MSE( 0x2c00 )
-
-#if ( LANGUAGE == C )
-
-#define KBDCR (*((volatile Word *) SA1101_p2v (_KBDCR)))
-#define KBDSTAT (*((volatile Word *) SA1101_p2v (_KBDSTAT)))
-#define KBDDATA (*((volatile Word *) SA1101_p2v (_KBDDATA)))
-#define KBDCLKDIV (*((volatile Word *) SA1101_p2v (_KBDCLKDIV)))
-#define KBDPRECNT (*((volatile Word *) SA1101_p2v (_KBDPRECNT)))
-#define KBDTEST1 (*((volatile Word *) SA1101_p2v (_KBDTEST1)))
-#define KBDTEST2 (*((volatile Word *) SA1101_p2v (_KBDTEST2)))
-#define KBDTEST3 (*((volatile Word *) SA1101_p2v (_KBDTEST3)))
-#define KBDTEST4 (*((volatile Word *) SA1101_p2v (_KBDTEST4)))
-#define MSECR (*((volatile Word *) SA1101_p2v (_MSECR)))
-#define MSESTAT (*((volatile Word *) SA1101_p2v (_MSESTAT)))
-#define MSEDATA (*((volatile Word *) SA1101_p2v (_MSEDATA)))
-#define MSECLKDIV (*((volatile Word *) SA1101_p2v (_MSECLKDIV)))
-#define MSEPRECNT (*((volatile Word *) SA1101_p2v (_MSEPRECNT)))
-#define MSETEST1 (*((volatile Word *) SA1101_p2v (_MSETEST1)))
-#define MSETEST2 (*((volatile Word *) SA1101_p2v (_MSETEST2)))
-#define MSETEST3 (*((volatile Word *) SA1101_p2v (_MSETEST3)))
-#define MSETEST4 (*((volatile Word *) SA1101_p2v (_MSETEST4)))
-
-
-#define KBDCR_ENA 0x08
-#define KBDCR_FKD 0x02
-#define KBDCR_FKC 0x01
-
-#define KBDSTAT_TXE 0x80
-#define KBDSTAT_TXB 0x40
-#define KBDSTAT_RXF 0x20
-#define KBDSTAT_RXB 0x10
-#define KBDSTAT_ENA 0x08
-#define KBDSTAT_RXP 0x04
-#define KBDSTAT_KBD 0x02
-#define KBDSTAT_KBC 0x01
-
-#define KBDCLKDIV_DivVal Fld(4,0)
-
-#define MSECR_ENA 0x08
-#define MSECR_FKD 0x02
-#define MSECR_FKC 0x01
-
-#define MSESTAT_TXE 0x80
-#define MSESTAT_TXB 0x40
-#define MSESTAT_RXF 0x20
-#define MSESTAT_RXB 0x10
-#define MSESTAT_ENA 0x08
-#define MSESTAT_RXP 0x04
-#define MSESTAT_MSD 0x02
-#define MSESTAT_MSC 0x01
-
-#define MSECLKDIV_DivVal Fld(4,0)
-
-#define KBDTEST1_CD 0x80
-#define KBDTEST1_RC1 0x40
-#define KBDTEST1_MC 0x20
-#define KBDTEST1_C Fld(2,3)
-#define KBDTEST1_T2 0x40
-#define KBDTEST1_T1 0x20
-#define KBDTEST1_T0 0x10
-#define KBDTEST2_TICBnRES 0x08
-#define KBDTEST2_RKC 0x04
-#define KBDTEST2_RKD 0x02
-#define KBDTEST2_SEL 0x01
-#define KBDTEST3_ms_16 0x80
-#define KBDTEST3_us_64 0x40
-#define KBDTEST3_us_16 0x20
-#define KBDTEST3_DIV8 0x10
-#define KBDTEST3_DIn 0x08
-#define KBDTEST3_CIn 0x04
-#define KBDTEST3_KD 0x02
-#define KBDTEST3_KC 0x01
-#define KBDTEST4_BC12 0x80
-#define KBDTEST4_BC11 0x40
-#define KBDTEST4_TRES 0x20
-#define KBDTEST4_CLKOE 0x10
-#define KBDTEST4_CRES 0x08
-#define KBDTEST4_RXB 0x04
-#define KBDTEST4_TXB 0x02
-#define KBDTEST4_SRX 0x01
-
-#define MSETEST1_CD 0x80
-#define MSETEST1_RC1 0x40
-#define MSETEST1_MC 0x20
-#define MSETEST1_C Fld(2,3)
-#define MSETEST1_T2 0x40
-#define MSETEST1_T1 0x20
-#define MSETEST1_T0 0x10
-#define MSETEST2_TICBnRES 0x08
-#define MSETEST2_RKC 0x04
-#define MSETEST2_RKD 0x02
-#define MSETEST2_SEL 0x01
-#define MSETEST3_ms_16 0x80
-#define MSETEST3_us_64 0x40
-#define MSETEST3_us_16 0x20
-#define MSETEST3_DIV8 0x10
-#define MSETEST3_DIn 0x08
-#define MSETEST3_CIn 0x04
-#define MSETEST3_KD 0x02
-#define MSETEST3_KC 0x01
-#define MSETEST4_BC12 0x80
-#define MSETEST4_BC11 0x40
-#define MSETEST4_TRES 0x20
-#define MSETEST4_CLKOE 0x10
-#define MSETEST4_CRES 0x08
-#define MSETEST4_RXB 0x04
-#define MSETEST4_TXB 0x02
-#define MSETEST4_SRX 0x01
-
-#endif /* LANGUAGE == C */
-
-
-/*
- * General-Purpose I/O Interface
- *
- * Registers
- * PADWR Port A Data Write Register
- * PBDWR Port B Data Write Register
- * PADRR Port A Data Read Register
- * PBDRR Port B Data Read Register
- * PADDR Port A Data Direction Register
- * PBDDR Port B Data Direction Register
- * PASSR Port A Sleep State Register
- * PBSSR Port B Sleep State Register
- *
- */
-
-#define _PIO( x ) _SA1101( ( x ) + __GPIO_INTERFACE )
-
-#define _PADWR _PIO( 0x0000 )
-#define _PBDWR _PIO( 0x0400 )
-#define _PADRR _PIO( 0x0000 )
-#define _PBDRR _PIO( 0x0400 )
-#define _PADDR _PIO( 0x0800 )
-#define _PBDDR _PIO( 0x0c00 )
-#define _PASSR _PIO( 0x1000 )
-#define _PBSSR _PIO( 0x1400 )
-
-
-#if ( LANGUAGE == C )
-
-
-#define PADWR (*((volatile Word *) SA1101_p2v (_PADWR)))
-#define PBDWR (*((volatile Word *) SA1101_p2v (_PBDWR)))
-#define PADRR (*((volatile Word *) SA1101_p2v (_PADRR)))
-#define PBDRR (*((volatile Word *) SA1101_p2v (_PBDRR)))
-#define PADDR (*((volatile Word *) SA1101_p2v (_PADDR)))
-#define PBDDR (*((volatile Word *) SA1101_p2v (_PBDDR)))
-#define PASSR (*((volatile Word *) SA1101_p2v (_PASSR)))
-#define PBSSR (*((volatile Word *) SA1101_p2v (_PBSSR)))
-
-#endif
-
-
-
-/*
- * Keypad Interface
- *
- * Registers
- * PXDWR
- * PXDRR
- * PYDWR
- * PYDRR
- *
- */
-
-#define _KEYPAD( x ) _SA1101( ( x ) + __KEYPAD_INTERFACE )
-
-#define _PXDWR _KEYPAD( 0x0000 )
-#define _PXDRR _KEYPAD( 0x0000 )
-#define _PYDWR _KEYPAD( 0x0400 )
-#define _PYDRR _KEYPAD( 0x0400 )
-
-#if ( LANGUAGE == C )
-
-
-#define PXDWR (*((volatile Word *) SA1101_p2v (_PXDWR)))
-#define PXDRR (*((volatile Word *) SA1101_p2v (_PXDRR)))
-#define PYDWR (*((volatile Word *) SA1101_p2v (_PYDWR)))
-#define PYDRR (*((volatile Word *) SA1101_p2v (_PYDRR)))
-
-#endif
-
-
-
-/*
- * PCMCIA Interface
- *
- * Registers
- * PCSR Status Register
- * PCCR Control Register
- * PCSSR Sleep State Register
- *
- */
-
-#define _CARD( x ) _SA1101( ( x ) + __PCMCIA_INTERFACE )
-
-#define _PCSR _CARD( 0x0000 )
-#define _PCCR _CARD( 0x0400 )
-#define _PCSSR _CARD( 0x0800 )
-
-#if ( LANGUAGE == C )
-#define PCSR (*((volatile Word *) SA1101_p2v (_PCSR)))
-#define PCCR (*((volatile Word *) SA1101_p2v (_PCCR)))
-#define PCSSR (*((volatile Word *) SA1101_p2v (_PCSSR)))
-
-#define PCSR_S0_ready 0x0001
-#define PCSR_S1_ready 0x0002
-#define PCSR_S0_detected 0x0004
-#define PCSR_S1_detected 0x0008
-#define PCSR_S0_VS1 0x0010
-#define PCSR_S0_VS2 0x0020
-#define PCSR_S1_VS1 0x0040
-#define PCSR_S1_VS2 0x0080
-#define PCSR_S0_WP 0x0100
-#define PCSR_S1_WP 0x0200
-#define PCSR_S0_BVD1_nSTSCHG 0x0400
-#define PCSR_S0_BVD2_nSPKR 0x0800
-#define PCSR_S1_BVD1_nSTSCHG 0x1000
-#define PCSR_S1_BVD2_nSPKR 0x2000
-
-#define PCCR_S0_VPP0 0x0001
-#define PCCR_S0_VPP1 0x0002
-#define PCCR_S0_VCC0 0x0004
-#define PCCR_S0_VCC1 0x0008
-#define PCCR_S1_VPP0 0x0010
-#define PCCR_S1_VPP1 0x0020
-#define PCCR_S1_VCC0 0x0040
-#define PCCR_S1_VCC1 0x0080
-#define PCCR_S0_reset 0x0100
-#define PCCR_S1_reset 0x0200
-#define PCCR_S0_float 0x0400
-#define PCCR_S1_float 0x0800
-
-#define PCSSR_S0_VCC0 0x0001
-#define PCSSR_S0_VCC1 0x0002
-#define PCSSR_S0_VPP0 0x0004
-#define PCSSR_S0_VPP1 0x0008
-#define PCSSR_S0_control 0x0010
-#define PCSSR_S1_VCC0 0x0020
-#define PCSSR_S1_VCC1 0x0040
-#define PCSSR_S1_VPP0 0x0080
-#define PCSSR_S1_VPP1 0x0100
-#define PCSSR_S1_control 0x0200
-
-#endif
-
-#undef C
-#undef Assembly
diff --git a/arch/arm/mach-sa1100/include/mach/hardware.h b/arch/arm/mach-sa1100/include/mach/hardware.h
index 99f5856..ee5d2bb 100644
--- a/arch/arm/mach-sa1100/include/mach/hardware.h
+++ b/arch/arm/mach-sa1100/include/mach/hardware.h
@@ -72,8 +72,4 @@ static inline unsigned long get_clock_tick_rate(void)
#include "SA-1100.h"
-#ifdef CONFIG_SA1101
-#include "SA-1101.h"
-#endif
-
#endif /* _ASM_ARCH_HARDWARE_H */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 08/33] Removing dead SA1101
@ 2010-06-30 15:56 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:56 UTC (permalink / raw)
To: linux-arm-kernel
SA1101 doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-sa1100/include/mach/SA-1101.h | 925 --------------------------
arch/arm/mach-sa1100/include/mach/hardware.h | 4 -
2 files changed, 0 insertions(+), 929 deletions(-)
delete mode 100644 arch/arm/mach-sa1100/include/mach/SA-1101.h
diff --git a/arch/arm/mach-sa1100/include/mach/SA-1101.h b/arch/arm/mach-sa1100/include/mach/SA-1101.h
deleted file mode 100644
index 5d2ad7d..0000000
--- a/arch/arm/mach-sa1100/include/mach/SA-1101.h
+++ /dev/null
@@ -1,925 +0,0 @@
-/*
- * SA-1101.h
- *
- * Copyright (c) Peter Danielsson 1999
- *
- * Definition of constants related to the sa1101
- * support chip for the sa1100
- *
- */
-
-
-/* Be sure that virtual mapping is defined right */
-#ifndef __ASM_ARCH_HARDWARE_H
-#error You must include hardware.h not SA-1101.h
-#endif
-
-#ifndef SA1101_BASE
-#error You must define SA-1101 physical base address
-#endif
-
-#ifndef LANGUAGE
-# ifdef __ASSEMBLY__
-# define LANGUAGE Assembly
-# else
-# define LANGUAGE C
-# endif
-#endif
-
-/*
- * We have mapped the sa1101 depending on the value of SA1101_BASE.
- * It then appears from 0xf4000000.
- */
-
-#define SA1101_p2v( x ) ((x) - SA1101_BASE + 0xf4000000)
-#define SA1101_v2p( x ) ((x) - 0xf4000000 + SA1101_BASE)
-
-#ifndef SA1101_p2v
-#define SA1101_p2v(PhAdd) (PhAdd)
-#endif
-
-#include <mach/bitfield.h>
-
-#define C 0
-#define Assembly 1
-
-
-/*
- * Memory map
- */
-
-#define __SHMEM_CONTROL0 0x00000000
-#define __SYSTEM_CONTROL1 0x00000400
-#define __ARBITER 0x00020000
-#define __SYSTEM_CONTROL2 0x00040000
-#define __SYSTEM_CONTROL3 0x00060000
-#define __PARALLEL_PORT 0x00080000
-#define __VIDMEM_CONTROL 0x00100000
-#define __UPDATE_FIFO 0x00120000
-#define __SHMEM_CONTROL1 0x00140000
-#define __INTERRUPT_CONTROL 0x00160000
-#define __USB_CONTROL 0x00180000
-#define __TRACK_INTERFACE 0x001a0000
-#define __MOUSE_INTERFACE 0x001b0000
-#define __KEYPAD_INTERFACE 0x001c0000
-#define __PCMCIA_INTERFACE 0x001e0000
-#define __VGA_CONTROL 0x00200000
-#define __GPIO_INTERFACE 0x00300000
-
-/*
- * Macro that calculates real address for registers in the SA-1101
- */
-
-#define _SA1101( x ) ((x) + SA1101_BASE)
-
-/*
- * Interface and shared memory controller registers
- *
- * Registers
- * SKCR SA-1101 control register (read/write)
- * SMCR Shared Memory Controller Register
- * SNPR Snoop Register
- */
-
-#define _SKCR _SA1101( 0x00000000 ) /* SA-1101 Control Reg. */
-#define _SMCR _SA1101( 0x00140000 ) /* Shared Mem. Control Reg. */
-#define _SNPR _SA1101( 0x00140400 ) /* Snoop Reg. */
-
-#if LANGUAGE == C
-#define SKCR (*((volatile Word *) SA1101_p2v (_SKCR)))
-#define SMCR (*((volatile Word *) SA1101_p2v (_SMCR)))
-#define SNPR (*((volatile Word *) SA1101_p2v (_SNPR)))
-
-#define SKCR_PLLEn 0x0001 /* Enable On-Chip PLL */
-#define SKCR_BCLKEn 0x0002 /* Enables BCLK */
-#define SKCR_Sleep 0x0004 /* Sleep Mode */
-#define SKCR_IRefEn 0x0008 /* DAC Iref input enable */
-#define SKCR_VCOON 0x0010 /* VCO bias */
-#define SKCR_ScanTestEn 0x0020 /* Enables scan test */
-#define SKCR_ClockTestEn 0x0040 /* Enables clock test */
-
-#define SMCR_DCAC Fld(2,0) /* Number of column address bits */
-#define SMCR_DRAC Fld(2,2) /* Number of row address bits */
-#define SMCR_ArbiterBias 0x0008 /* favor video or USB */
-#define SMCR_TopVidMem Fld(4,5) /* Top 4 bits of vidmem addr. */
-
-#define SMCR_ColAdrBits( x ) /* col. addr bits 8..11 */ \
- (( (x) - 8 ) << FShft (SMCR_DCAC))
-#define SMCR_RowAdrBits( x ) /* row addr bits 9..12 */\
- (( (x) - 9 ) << FShft (SMCR_DRAC))
-
-#define SNPR_VFBstart Fld(12,0) /* Video frame buffer addr */
-#define SNPR_VFBsize Fld(11,12) /* Video frame buffer size */
-#define SNPR_WholeBank (1 << 23) /* Whole bank bit */
-#define SNPR_BankSelect Fld(2,27) /* Bank select */
-#define SNPR_SnoopEn (1 << 31) /* Enable snoop operation */
-
-#define SNPR_Set_VFBsize( x ) /* set frame buffer size (in kb) */ \
- ( (x) << FShft (SNPR_VFBsize))
-#define SNPR_Select_Bank(x) /* select bank 0 or 1 */ \
- (( (x) + 1 ) << FShft (SNPR_BankSelect ))
-
-#endif /* LANGUAGE == C */
-
-/*
- * Video Memory Controller
- *
- * Registers
- * VMCCR Configuration register
- * VMCAR VMC address register
- * VMCDR VMC data register
- *
- */
-
-#define _VMCCR _SA1101( 0x00100000 ) /* Configuration register */
-#define _VMCAR _SA1101( 0x00101000 ) /* VMC address register */
-#define _VMCDR _SA1101( 0x00101400 ) /* VMC data register */
-
-#if LANGUAGE == C
-#define VMCCR (*((volatile Word *) SA1101_p2v (_VMCCR)))
-#define VMCAR (*((volatile Word *) SA1101_p2v (_VMCAR)))
-#define VMCDR (*((volatile Word *) SA1101_p2v (_VMCDR)))
-
-#define VMCCR_RefreshEn 0x0000 /* Enable memory refresh */
-#define VMCCR_Config 0x0001 /* DRAM size */
-#define VMCCR_RefPeriod Fld(2,3) /* Refresh period */
-#define VMCCR_StaleDataWait Fld(4,5) /* Stale FIFO data timeout counter */
-#define VMCCR_SleepState (1<<9) /* State of interface pins in sleep*/
-#define VMCCR_RefTest (1<<10) /* refresh test */
-#define VMCCR_RefLow Fld(6,11) /* refresh low counter */
-#define VMCCR_RefHigh Fld(7,17) /* refresh high counter */
-#define VMCCR_SDTCTest Fld(7,24) /* stale data timeout counter */
-#define VMCCR_ForceSelfRef (1<<31) /* Force self refresh */
-
-#endif LANGUAGE == C
-
-
-/* Update FIFO
- *
- * Registers
- * UFCR Update FIFO Control Register
- * UFSR Update FIFO Status Register
- * UFLVLR update FIFO level register
- * UFDR update FIFO data register
- */
-
-#define _UFCR _SA1101(0x00120000) /* Update FIFO Control Reg. */
-#define _UFSR _SA1101(0x00120400) /* Update FIFO Status Reg. */
-#define _UFLVLR _SA1101(0x00120800) /* Update FIFO level reg. */
-#define _UFDR _SA1101(0x00120c00) /* Update FIFO data reg. */
-
-#if LANGUAGE == C
-
-#define UFCR (*((volatile Word *) SA1101_p2v (_UFCR)))
-#define UFSR (*((volatile Word *) SA1101_p2v (_UFSR)))
-#define UFLVLR (*((volatile Word *) SA1101_p2v (_UFLVLR)))
-#define UFDR (*((volatile Word *) SA1101_p2v (_UFDR)))
-
-
-#define UFCR_FifoThreshhold Fld(7,0) /* Level for FifoGTn flag */
-
-#define UFSR_FifoGTnFlag 0x01 /* FifoGTn flag */#define UFSR_FifoEmpty 0x80 /* FIFO is empty */
-
-#endif /* LANGUAGE == C */
-
-/* System Controller
- *
- * Registers
- * SKPCR Power Control Register
- * SKCDR Clock Divider Register
- * DACDR1 DAC1 Data register
- * DACDR2 DAC2 Data register
- */
-
-#define _SKPCR _SA1101(0x00000400)
-#define _SKCDR _SA1101(0x00040000)
-#define _DACDR1 _SA1101(0x00060000)
-#define _DACDR2 _SA1101(0x00060400)
-
-#if LANGUAGE == C
-#define SKPCR (*((volatile Word *) SA1101_p2v (_SKPCR)))
-#define SKCDR (*((volatile Word *) SA1101_p2v (_SKCDR)))
-#define DACDR1 (*((volatile Word *) SA1101_p2v (_DACDR1)))
-#define DACDR2 (*((volatile Word *) SA1101_p2v (_DACDR2)))
-
-#define SKPCR_UCLKEn 0x01 /* USB Enable */
-#define SKPCR_PCLKEn 0x02 /* PS/2 Enable */
-#define SKPCR_ICLKEn 0x04 /* Interrupt Controller Enable */
-#define SKPCR_VCLKEn 0x08 /* Video Controller Enable */
-#define SKPCR_PICLKEn 0x10 /* parallel port Enable */
-#define SKPCR_DCLKEn 0x20 /* DACs Enable */
-#define SKPCR_nKPADEn 0x40 /* Multiplexer */
-
-#define SKCDR_PLLMul Fld(7,0) /* PLL Multiplier */
-#define SKCDR_VCLKEn Fld(2,7) /* Video controller clock divider */
-#define SKDCR_BCLKEn (1<<9) /* BCLK Divider */
-#define SKDCR_UTESTCLKEn (1<<10) /* Route USB clock during test mode */
-#define SKDCR_DivRValue Fld(6,11) /* Input clock divider for PLL */
-#define SKDCR_DivNValue Fld(5,17) /* Output clock divider for PLL */
-#define SKDCR_PLLRSH Fld(3,22) /* PLL bandwidth control */
-#define SKDCR_ChargePump (1<<25) /* Charge pump control */
-#define SKDCR_ClkTestMode (1<<26) /* Clock output test mode */
-#define SKDCR_ClkTestEn (1<<27) /* Test clock generator */
-#define SKDCR_ClkJitterCntl Fld(3,28) /* video clock jitter compensation */
-
-#define DACDR_DACCount Fld(8,0) /* Count value */
-#define DACDR1_DACCount DACDR_DACCount
-#define DACDR2_DACCount DACDR_DACCount
-
-#endif /* LANGUAGE == C */
-
-/*
- * Parallel Port Interface
- *
- * Registers
- * IEEE_Config IEEE mode selection and programmable attributes
- * IEEE_Control Controls the states of IEEE port control outputs
- * IEEE_Data Forward transfer data register
- * IEEE_Addr Forward transfer address register
- * IEEE_Status Port IO signal status register
- * IEEE_IntStatus Port interrupts status register
- * IEEE_FifoLevels Rx and Tx FIFO interrupt generation levels
- * IEEE_InitTime Forward timeout counter initial value
- * IEEE_TimerStatus Forward timeout counter current value
- * IEEE_FifoReset Reset forward transfer FIFO
- * IEEE_ReloadValue Counter reload value
- * IEEE_TestControl Control testmode
- * IEEE_TestDataIn Test data register
- * IEEE_TestDataInEn Enable test data
- * IEEE_TestCtrlIn Test control signals
- * IEEE_TestCtrlInEn Enable test control signals
- * IEEE_TestDataStat Current data bus value
- *
- */
-
-/*
- * The control registers are defined as offsets from a base address
- */
-
-#define _IEEE( x ) _SA1101( (x) + __PARALLEL_PORT )
-
-#define _IEEE_Config _IEEE( 0x0000 )
-#define _IEEE_Control _IEEE( 0x0400 )
-#define _IEEE_Data _IEEE( 0x4000 )
-#define _IEEE_Addr _IEEE( 0x0800 )
-#define _IEEE_Status _IEEE( 0x0c00 )
-#define _IEEE_IntStatus _IEEE( 0x1000 )
-#define _IEEE_FifoLevels _IEEE( 0x1400 )
-#define _IEEE_InitTime _IEEE( 0x1800 )
-#define _IEEE_TimerStatus _IEEE( 0x1c00 )
-#define _IEEE_FifoReset _IEEE( 0x2000 )
-#define _IEEE_ReloadValue _IEEE( 0x3c00 )
-#define _IEEE_TestControl _IEEE( 0x2400 )
-#define _IEEE_TestDataIn _IEEE( 0x2800 )
-#define _IEEE_TestDataInEn _IEEE( 0x2c00 )
-#define _IEEE_TestCtrlIn _IEEE( 0x3000 )
-#define _IEEE_TestCtrlInEn _IEEE( 0x3400 )
-#define _IEEE_TestDataStat _IEEE( 0x3800 )
-
-
-#if LANGUAGE == C
-#define IEEE_Config (*((volatile Word *) SA1101_p2v (_IEEE_Config)))
-#define IEEE_Control (*((volatile Word *) SA1101_p2v (_IEEE_Control)))
-#define IEEE_Data (*((volatile Word *) SA1101_p2v (_IEEE_Data)))
-#define IEEE_Addr (*((volatile Word *) SA1101_p2v (_IEEE_Addr)))
-#define IEEE_Status (*((volatile Word *) SA1101_p2v (_IEEE_Status)))
-#define IEEE_IntStatus (*((volatile Word *) SA1101_p2v (_IEEE_IntStatus)))
-#define IEEE_FifoLevels (*((volatile Word *) SA1101_p2v (_IEEE_FifoLevels)))
-#define IEEE_InitTime (*((volatile Word *) SA1101_p2v (_IEEE_InitTime)))
-#define IEEE_TimerStatus (*((volatile Word *) SA1101_p2v (_IEEE_TimerStatus)))
-#define IEEE_FifoReset (*((volatile Word *) SA1101_p2v (_IEEE_FifoReset)))
-#define IEEE_ReloadValue (*((volatile Word *) SA1101_p2v (_IEEE_ReloadValue)))
-#define IEEE_TestControl (*((volatile Word *) SA1101_p2v (_IEEE_TestControl)))
-#define IEEE_TestDataIn (*((volatile Word *) SA1101_p2v (_IEEE_TestDataIn)))
-#define IEEE_TestDataInEn (*((volatile Word *) SA1101_p2v (_IEEE_TestDataInEn)))
-#define IEEE_TestCtrlIn (*((volatile Word *) SA1101_p2v (_IEEE_TestCtrlIn)))
-#define IEEE_TestCtrlInEn (*((volatile Word *) SA1101_p2v (_IEEE_TestCtrlInEn)))
-#define IEEE_TestDataStat (*((volatile Word *) SA1101_p2v (_IEEE_TestDataStat)))
-
-
-#define IEEE_Config_M Fld(3,0) /* Mode select */
-#define IEEE_Config_D 0x04 /* FIFO access enable */
-#define IEEE_Config_B 0x08 /* 9-bit word enable */
-#define IEEE_Config_T 0x10 /* Data transfer enable */
-#define IEEE_Config_A 0x20 /* Data transfer direction */
-#define IEEE_Config_E 0x40 /* Timer enable */
-#define IEEE_Control_A 0x08 /* AutoFd output */
-#define IEEE_Control_E 0x04 /* Selectin output */
-#define IEEE_Control_T 0x02 /* Strobe output */
-#define IEEE_Control_I 0x01 /* Port init output */
-#define IEEE_Data_C (1<<31) /* Byte count */
-#define IEEE_Data_Db Fld(9,16) /* Data byte 2 */
-#define IEEE_Data_Da Fld(9,0) /* Data byte 1 */
-#define IEEE_Addr_A Fld(8,0) /* forward address transfer byte */
-#define IEEE_Status_A 0x0100 /* nAutoFd port output status */
-#define IEEE_Status_E 0x0080 /* nSelectIn port output status */
-#define IEEE_Status_T 0x0040 /* nStrobe port output status */
-#define IEEE_Status_I 0x0020 /* nInit port output status */
-#define IEEE_Status_B 0x0010 /* Busy port inout status */
-#define IEEE_Status_S 0x0008 /* Select port input status */
-#define IEEE_Status_K 0x0004 /* nAck port input status */
-#define IEEE_Status_F 0x0002 /* nFault port input status */
-#define IEEE_Status_R 0x0001 /* pError port input status */
-
-#define IEEE_IntStatus_IntReqDat 0x0100
-#define IEEE_IntStatus_IntReqEmp 0x0080
-#define IEEE_IntStatus_IntReqInt 0x0040
-#define IEEE_IntStatus_IntReqRav 0x0020
-#define IEEE_IntStatus_IntReqTim 0x0010
-#define IEEE_IntStatus_RevAddrComp 0x0008
-#define IEEE_IntStatus_RevDataComp 0x0004
-#define IEEE_IntStatus_FwdAddrComp 0x0002
-#define IEEE_IntStatus_FwdDataComp 0x0001
-#define IEEE_FifoLevels_RevFifoLevel 2
-#define IEEE_FifoLevels_FwdFifoLevel 1
-#define IEEE_InitTime_TimValInit Fld(22,0)
-#define IEEE_TimerStatus_TimValStat Fld(22,0)
-#define IEEE_ReloadValue_Reload Fld(4,0)
-
-#define IEEE_TestControl_RegClk 0x04
-#define IEEE_TestControl_ClockSelect Fld(2,1)
-#define IEEE_TestControl_TimerTestModeEn 0x01
-#define IEEE_TestCtrlIn_PError 0x10
-#define IEEE_TestCtrlIn_nFault 0x08
-#define IEEE_TestCtrlIn_nAck 0x04
-#define IEEE_TestCtrlIn_PSel 0x02
-#define IEEE_TestCtrlIn_Busy 0x01
-
-#endif /* LANGUAGE == C */
-
-/*
- * VGA Controller
- *
- * Registers
- * VideoControl Video Control Register
- * VgaTiming0 VGA Timing Register 0
- * VgaTiming1 VGA Timing Register 1
- * VgaTiming2 VGA Timing Register 2
- * VgaTiming3 VGA Timing Register 3
- * VgaBorder VGA Border Color Register
- * VgaDBAR VGADMA Base Address Register
- * VgaDCAR VGADMA Channel Current Address Register
- * VgaStatus VGA Status Register
- * VgaInterruptMask VGA Interrupt Mask Register
- * VgaPalette VGA Palette Registers
- * DacControl DAC Control Register
- * VgaTest VGA Controller Test Register
- */
-
-#define _VGA( x ) _SA1101( ( x ) + __VGA_CONTROL )
-
-#define _VideoControl _VGA( 0x0000 )
-#define _VgaTiming0 _VGA( 0x0400 )
-#define _VgaTiming1 _VGA( 0x0800 )
-#define _VgaTiming2 _VGA( 0x0c00 )
-#define _VgaTiming3 _VGA( 0x1000 )
-#define _VgaBorder _VGA( 0x1400 )
-#define _VgaDBAR _VGA( 0x1800 )
-#define _VgaDCAR _VGA( 0x1c00 )
-#define _VgaStatus _VGA( 0x2000 )
-#define _VgaInterruptMask _VGA( 0x2400 )
-#define _VgaPalette _VGA( 0x40000 )
-#define _DacControl _VGA( 0x3000 )
-#define _VgaTest _VGA( 0x2c00 )
-
-#if (LANGUAGE == C)
-#define VideoControl (*((volatile Word *) SA1101_p2v (_VideoControl)))
-#define VgaTiming0 (*((volatile Word *) SA1101_p2v (_VgaTiming0)))
-#define VgaTiming1 (*((volatile Word *) SA1101_p2v (_VgaTiming1)))
-#define VgaTiming2 (*((volatile Word *) SA1101_p2v (_VgaTiming2)))
-#define VgaTiming3 (*((volatile Word *) SA1101_p2v (_VgaTiming3)))
-#define VgaBorder (*((volatile Word *) SA1101_p2v (_VgaBorder)))
-#define VgaDBAR (*((volatile Word *) SA1101_p2v (_VgaDBAR)))
-#define VgaDCAR (*((volatile Word *) SA1101_p2v (_VgaDCAR)))
-#define VgaStatus (*((volatile Word *) SA1101_p2v (_VgaStatus)))
-#define VgaInterruptMask (*((volatile Word *) SA1101_p2v (_VgaInterruptMask)))
-#define VgaPalette (*((volatile Word *) SA1101_p2v (_VgaPalette)))
-#define DacControl (*((volatile Word *) SA1101_p2v (_DacControl)))
-#define VgaTest (*((volatile Word *) SA1101_p2v (_VgaTest)))
-
-#define VideoControl_VgaEn 0x00000000
-#define VideoControl_BGR 0x00000001
-#define VideoControl_VCompVal Fld(2,2)
-#define VideoControl_VgaReq Fld(4,4)
-#define VideoControl_VBurstL Fld(4,8)
-#define VideoControl_VMode (1<<12)
-#define VideoControl_PalRead (1<<13)
-
-#define VgaTiming0_PPL Fld(6,2)
-#define VgaTiming0_HSW Fld(8,8)
-#define VgaTiming0_HFP Fld(8,16)
-#define VgaTiming0_HBP Fld(8,24)
-
-#define VgaTiming1_LPS Fld(10,0)
-#define VgaTiming1_VSW Fld(6,10)
-#define VgaTiming1_VFP Fld(8,16)
-#define VgaTiming1_VBP Fld(8,24)
-
-#define VgaTiming2_IVS 0x01
-#define VgaTiming2_IHS 0x02
-#define VgaTiming2_CVS 0x04
-#define VgaTiming2_CHS 0x08
-
-#define VgaTiming3_HBS Fld(8,0)
-#define VgaTiming3_HBE Fld(8,8)
-#define VgaTiming3_VBS Fld(8,16)
-#define VgaTiming3_VBE Fld(8,24)
-
-#define VgaBorder_BCOL Fld(24,0)
-
-#define VgaStatus_VFUF 0x01
-#define VgaStatus_VNext 0x02
-#define VgaStatus_VComp 0x04
-
-#define VgaInterruptMask_VFUFMask 0x00
-#define VgaInterruptMask_VNextMask 0x01
-#define VgaInterruptMask_VCompMask 0x02
-
-#define VgaPalette_R Fld(8,0)
-#define VgaPalette_G Fld(8,8)
-#define VgaPalette_B Fld(8,16)
-
-#define DacControl_DACON 0x0001
-#define DacControl_COMPON 0x0002
-#define DacControl_PEDON 0x0004
-#define DacControl_RTrim Fld(5,4)
-#define DacControl_GTrim Fld(5,9)
-#define DacControl_BTrim Fld(5,14)
-
-#define VgaTest_TDAC 0x00
-#define VgaTest_Datatest Fld(4,1)
-#define VgaTest_DACTESTDAC 0x10
-#define VgaTest_DACTESTOUT Fld(3,5)
-
-#endif /* LANGUAGE == C */
-
-/*
- * USB Host Interface Controller
- *
- * Registers
- * Revision
- * Control
- * CommandStatus
- * InterruptStatus
- * InterruptEnable
- * HCCA
- * PeriodCurrentED
- * ControlHeadED
- * BulkHeadED
- * BulkCurrentED
- * DoneHead
- * FmInterval
- * FmRemaining
- * FmNumber
- * PeriodicStart
- * LSThreshold
- * RhDescriptorA
- * RhDescriptorB
- * RhStatus
- * RhPortStatus
- * USBStatus
- * USBReset
- * USTAR
- * USWER
- * USRFR
- * USNFR
- * USTCSR
- * USSR
- *
- */
-
-#define _USB( x ) _SA1101( ( x ) + __USB_CONTROL )
-
-
-#define _Revision _USB( 0x0000 )
-#define _Control _USB( 0x0888 )
-#define _CommandStatus _USB( 0x0c00 )
-#define _InterruptStatus _USB( 0x1000 )
-#define _InterruptEnable _USB( 0x1400 )
-#define _HCCA _USB( 0x1800 )
-#define _PeriodCurrentED _USB( 0x1c00 )
-#define _ControlHeadED _USB( 0x2000 )
-#define _BulkHeadED _USB( 0x2800 )
-#define _BulkCurrentED _USB( 0x2c00 )
-#define _DoneHead _USB( 0x3000 )
-#define _FmInterval _USB( 0x3400 )
-#define _FmRemaining _USB( 0x3800 )
-#define _FmNumber _USB( 0x3c00 )
-#define _PeriodicStart _USB( 0x4000 )
-#define _LSThreshold _USB( 0x4400 )
-#define _RhDescriptorA _USB( 0x4800 )
-#define _RhDescriptorB _USB( 0x4c00 )
-#define _RhStatus _USB( 0x5000 )
-#define _RhPortStatus _USB( 0x5400 )
-#define _USBStatus _USB( 0x11800 )
-#define _USBReset _USB( 0x11c00 )
-
-#define _USTAR _USB( 0x10400 )
-#define _USWER _USB( 0x10800 )
-#define _USRFR _USB( 0x10c00 )
-#define _USNFR _USB( 0x11000 )
-#define _USTCSR _USB( 0x11400 )
-#define _USSR _USB( 0x11800 )
-
-
-#if (LANGUAGE == C)
-
-#define Revision (*((volatile Word *) SA1101_p2v (_Revision)))
-#define Control (*((volatile Word *) SA1101_p2v (_Control)))
-#define CommandStatus (*((volatile Word *) SA1101_p2v (_CommandStatus)))
-#define InterruptStatus (*((volatile Word *) SA1101_p2v (_InterruptStatus)))
-#define InterruptEnable (*((volatile Word *) SA1101_p2v (_InterruptEnable)))
-#define HCCA (*((volatile Word *) SA1101_p2v (_HCCA)))
-#define PeriodCurrentED (*((volatile Word *) SA1101_p2v (_PeriodCurrentED)))
-#define ControlHeadED (*((volatile Word *) SA1101_p2v (_ControlHeadED)))
-#define BulkHeadED (*((volatile Word *) SA1101_p2v (_BulkHeadED)))
-#define BulkCurrentED (*((volatile Word *) SA1101_p2v (_BulkCurrentED)))
-#define DoneHead (*((volatile Word *) SA1101_p2v (_DoneHead)))
-#define FmInterval (*((volatile Word *) SA1101_p2v (_FmInterval)))
-#define FmRemaining (*((volatile Word *) SA1101_p2v (_FmRemaining)))
-#define FmNumber (*((volatile Word *) SA1101_p2v (_FmNumber)))
-#define PeriodicStart (*((volatile Word *) SA1101_p2v (_PeriodicStart)))
-#define LSThreshold (*((volatile Word *) SA1101_p2v (_LSThreshold)))
-#define RhDescriptorA (*((volatile Word *) SA1101_p2v (_RhDescriptorA)))
-#define RhDescriptorB (*((volatile Word *) SA1101_p2v (_RhDescriptorB)))
-#define RhStatus (*((volatile Word *) SA1101_p2v (_RhStatus)))
-#define RhPortStatus (*((volatile Word *) SA1101_p2v (_RhPortStatus)))
-#define USBStatus (*((volatile Word *) SA1101_p2v (_USBStatus)))
-#define USBReset (*((volatile Word *) SA1101_p2v (_USBReset)))
-#define USTAR (*((volatile Word *) SA1101_p2v (_USTAR)))
-#define USWER (*((volatile Word *) SA1101_p2v (_USWER)))
-#define USRFR (*((volatile Word *) SA1101_p2v (_USRFR)))
-#define USNFR (*((volatile Word *) SA1101_p2v (_USNFR)))
-#define USTCSR (*((volatile Word *) SA1101_p2v (_USTCSR)))
-#define USSR (*((volatile Word *) SA1101_p2v (_USSR)))
-
-
-#define USBStatus_IrqHciRmtWkp (1<<7)
-#define USBStatus_IrqHciBuffAcc (1<<8)
-#define USBStatus_nIrqHciM (1<<9)
-#define USBStatus_nHciMFClr (1<<10)
-
-#define USBReset_ForceIfReset 0x01
-#define USBReset_ForceHcReset 0x02
-#define USBReset_ClkGenReset 0x04
-
-#define USTCR_RdBstCntrl Fld(3,0)
-#define USTCR_ByteEnable Fld(4,3)
-#define USTCR_WriteEn (1<<7)
-#define USTCR_FifoCir (1<<8)
-#define USTCR_TestXferSel (1<<9)
-#define USTCR_FifoCirAtEnd (1<<10)
-#define USTCR_nSimScaleDownClk (1<<11)
-
-#define USSR_nAppMDEmpty 0x01
-#define USSR_nAppMDFirst 0x02
-#define USSR_nAppMDLast 0x04
-#define USSR_nAppMDFull 0x08
-#define USSR_nAppMAFull 0x10
-#define USSR_XferReq 0x20
-#define USSR_XferEnd 0x40
-
-#endif /* LANGUAGE == C */
-
-
-/*
- * Interrupt Controller
- *
- * Registers
- * INTTEST0 Test register 0
- * INTTEST1 Test register 1
- * INTENABLE0 Interrupt Enable register 0
- * INTENABLE1 Interrupt Enable register 1
- * INTPOL0 Interrupt Polarity selection 0
- * INTPOL1 Interrupt Polarity selection 1
- * INTTSTSEL Interrupt source selection
- * INTSTATCLR0 Interrupt Status 0
- * INTSTATCLR1 Interrupt Status 1
- * INTSET0 Interrupt Set 0
- * INTSET1 Interrupt Set 1
- */
-
-#define _INT( x ) _SA1101( ( x ) + __INTERRUPT_CONTROL)
-
-#define _INTTEST0 _INT( 0x1000 )
-#define _INTTEST1 _INT( 0x1400 )
-#define _INTENABLE0 _INT( 0x2000 )
-#define _INTENABLE1 _INT( 0x2400 )
-#define _INTPOL0 _INT( 0x3000 )
-#define _INTPOL1 _INT( 0x3400 )
-#define _INTTSTSEL _INT( 0x5000 )
-#define _INTSTATCLR0 _INT( 0x6000 )
-#define _INTSTATCLR1 _INT( 0x6400 )
-#define _INTSET0 _INT( 0x7000 )
-#define _INTSET1 _INT( 0x7400 )
-
-#if ( LANGUAGE == C )
-#define INTTEST0 (*((volatile Word *) SA1101_p2v (_INTTEST0)))
-#define INTTEST1 (*((volatile Word *) SA1101_p2v (_INTTEST1)))
-#define INTENABLE0 (*((volatile Word *) SA1101_p2v (_INTENABLE0)))
-#define INTENABLE1 (*((volatile Word *) SA1101_p2v (_INTENABLE1)))
-#define INTPOL0 (*((volatile Word *) SA1101_p2v (_INTPOL0)))
-#define INTPOL1 (*((volatile Word *) SA1101_p2v (_INTPOL1)))
-#define INTTSTSEL (*((volatile Word *) SA1101_p2v (_INTTSTSEL)))
-#define INTSTATCLR0 (*((volatile Word *) SA1101_p2v (_INTSTATCLR0)))
-#define INTSTATCLR1 (*((volatile Word *) SA1101_p2v (_INTSTATCLR1)))
-#define INTSET0 (*((volatile Word *) SA1101_p2v (_INTSET0)))
-#define INTSET1 (*((volatile Word *) SA1101_p2v (_INTSET1)))
-
-#endif /* LANGUAGE == C */
-
-/*
- * PS/2 Trackpad and Mouse Interfaces
- *
- * Registers (prefix kbd applies to trackpad interface, mse to mouse)
- * KBDCR Control Register
- * KBDSTAT Status Register
- * KBDDATA Transmit/Receive Data register
- * KBDCLKDIV Clock Division Register
- * KBDPRECNT Clock Precount Register
- * KBDTEST1 Test register 1
- * KBDTEST2 Test register 2
- * KBDTEST3 Test register 3
- * KBDTEST4 Test register 4
- * MSECR
- * MSESTAT
- * MSEDATA
- * MSECLKDIV
- * MSEPRECNT
- * MSETEST1
- * MSETEST2
- * MSETEST3
- * MSETEST4
- *
- */
-
-#define _KBD( x ) _SA1101( ( x ) + __TRACK_INTERFACE )
-#define _MSE( x ) _SA1101( ( x ) + __MOUSE_INTERFACE )
-
-#define _KBDCR _KBD( 0x0000 )
-#define _KBDSTAT _KBD( 0x0400 )
-#define _KBDDATA _KBD( 0x0800 )
-#define _KBDCLKDIV _KBD( 0x0c00 )
-#define _KBDPRECNT _KBD( 0x1000 )
-#define _KBDTEST1 _KBD( 0x2000 )
-#define _KBDTEST2 _KBD( 0x2400 )
-#define _KBDTEST3 _KBD( 0x2800 )
-#define _KBDTEST4 _KBD( 0x2c00 )
-#define _MSECR _MSE( 0x0000 )
-#define _MSESTAT _MSE( 0x0400 )
-#define _MSEDATA _MSE( 0x0800 )
-#define _MSECLKDIV _MSE( 0x0c00 )
-#define _MSEPRECNT _MSE( 0x1000 )
-#define _MSETEST1 _MSE( 0x2000 )
-#define _MSETEST2 _MSE( 0x2400 )
-#define _MSETEST3 _MSE( 0x2800 )
-#define _MSETEST4 _MSE( 0x2c00 )
-
-#if ( LANGUAGE == C )
-
-#define KBDCR (*((volatile Word *) SA1101_p2v (_KBDCR)))
-#define KBDSTAT (*((volatile Word *) SA1101_p2v (_KBDSTAT)))
-#define KBDDATA (*((volatile Word *) SA1101_p2v (_KBDDATA)))
-#define KBDCLKDIV (*((volatile Word *) SA1101_p2v (_KBDCLKDIV)))
-#define KBDPRECNT (*((volatile Word *) SA1101_p2v (_KBDPRECNT)))
-#define KBDTEST1 (*((volatile Word *) SA1101_p2v (_KBDTEST1)))
-#define KBDTEST2 (*((volatile Word *) SA1101_p2v (_KBDTEST2)))
-#define KBDTEST3 (*((volatile Word *) SA1101_p2v (_KBDTEST3)))
-#define KBDTEST4 (*((volatile Word *) SA1101_p2v (_KBDTEST4)))
-#define MSECR (*((volatile Word *) SA1101_p2v (_MSECR)))
-#define MSESTAT (*((volatile Word *) SA1101_p2v (_MSESTAT)))
-#define MSEDATA (*((volatile Word *) SA1101_p2v (_MSEDATA)))
-#define MSECLKDIV (*((volatile Word *) SA1101_p2v (_MSECLKDIV)))
-#define MSEPRECNT (*((volatile Word *) SA1101_p2v (_MSEPRECNT)))
-#define MSETEST1 (*((volatile Word *) SA1101_p2v (_MSETEST1)))
-#define MSETEST2 (*((volatile Word *) SA1101_p2v (_MSETEST2)))
-#define MSETEST3 (*((volatile Word *) SA1101_p2v (_MSETEST3)))
-#define MSETEST4 (*((volatile Word *) SA1101_p2v (_MSETEST4)))
-
-
-#define KBDCR_ENA 0x08
-#define KBDCR_FKD 0x02
-#define KBDCR_FKC 0x01
-
-#define KBDSTAT_TXE 0x80
-#define KBDSTAT_TXB 0x40
-#define KBDSTAT_RXF 0x20
-#define KBDSTAT_RXB 0x10
-#define KBDSTAT_ENA 0x08
-#define KBDSTAT_RXP 0x04
-#define KBDSTAT_KBD 0x02
-#define KBDSTAT_KBC 0x01
-
-#define KBDCLKDIV_DivVal Fld(4,0)
-
-#define MSECR_ENA 0x08
-#define MSECR_FKD 0x02
-#define MSECR_FKC 0x01
-
-#define MSESTAT_TXE 0x80
-#define MSESTAT_TXB 0x40
-#define MSESTAT_RXF 0x20
-#define MSESTAT_RXB 0x10
-#define MSESTAT_ENA 0x08
-#define MSESTAT_RXP 0x04
-#define MSESTAT_MSD 0x02
-#define MSESTAT_MSC 0x01
-
-#define MSECLKDIV_DivVal Fld(4,0)
-
-#define KBDTEST1_CD 0x80
-#define KBDTEST1_RC1 0x40
-#define KBDTEST1_MC 0x20
-#define KBDTEST1_C Fld(2,3)
-#define KBDTEST1_T2 0x40
-#define KBDTEST1_T1 0x20
-#define KBDTEST1_T0 0x10
-#define KBDTEST2_TICBnRES 0x08
-#define KBDTEST2_RKC 0x04
-#define KBDTEST2_RKD 0x02
-#define KBDTEST2_SEL 0x01
-#define KBDTEST3_ms_16 0x80
-#define KBDTEST3_us_64 0x40
-#define KBDTEST3_us_16 0x20
-#define KBDTEST3_DIV8 0x10
-#define KBDTEST3_DIn 0x08
-#define KBDTEST3_CIn 0x04
-#define KBDTEST3_KD 0x02
-#define KBDTEST3_KC 0x01
-#define KBDTEST4_BC12 0x80
-#define KBDTEST4_BC11 0x40
-#define KBDTEST4_TRES 0x20
-#define KBDTEST4_CLKOE 0x10
-#define KBDTEST4_CRES 0x08
-#define KBDTEST4_RXB 0x04
-#define KBDTEST4_TXB 0x02
-#define KBDTEST4_SRX 0x01
-
-#define MSETEST1_CD 0x80
-#define MSETEST1_RC1 0x40
-#define MSETEST1_MC 0x20
-#define MSETEST1_C Fld(2,3)
-#define MSETEST1_T2 0x40
-#define MSETEST1_T1 0x20
-#define MSETEST1_T0 0x10
-#define MSETEST2_TICBnRES 0x08
-#define MSETEST2_RKC 0x04
-#define MSETEST2_RKD 0x02
-#define MSETEST2_SEL 0x01
-#define MSETEST3_ms_16 0x80
-#define MSETEST3_us_64 0x40
-#define MSETEST3_us_16 0x20
-#define MSETEST3_DIV8 0x10
-#define MSETEST3_DIn 0x08
-#define MSETEST3_CIn 0x04
-#define MSETEST3_KD 0x02
-#define MSETEST3_KC 0x01
-#define MSETEST4_BC12 0x80
-#define MSETEST4_BC11 0x40
-#define MSETEST4_TRES 0x20
-#define MSETEST4_CLKOE 0x10
-#define MSETEST4_CRES 0x08
-#define MSETEST4_RXB 0x04
-#define MSETEST4_TXB 0x02
-#define MSETEST4_SRX 0x01
-
-#endif /* LANGUAGE == C */
-
-
-/*
- * General-Purpose I/O Interface
- *
- * Registers
- * PADWR Port A Data Write Register
- * PBDWR Port B Data Write Register
- * PADRR Port A Data Read Register
- * PBDRR Port B Data Read Register
- * PADDR Port A Data Direction Register
- * PBDDR Port B Data Direction Register
- * PASSR Port A Sleep State Register
- * PBSSR Port B Sleep State Register
- *
- */
-
-#define _PIO( x ) _SA1101( ( x ) + __GPIO_INTERFACE )
-
-#define _PADWR _PIO( 0x0000 )
-#define _PBDWR _PIO( 0x0400 )
-#define _PADRR _PIO( 0x0000 )
-#define _PBDRR _PIO( 0x0400 )
-#define _PADDR _PIO( 0x0800 )
-#define _PBDDR _PIO( 0x0c00 )
-#define _PASSR _PIO( 0x1000 )
-#define _PBSSR _PIO( 0x1400 )
-
-
-#if ( LANGUAGE == C )
-
-
-#define PADWR (*((volatile Word *) SA1101_p2v (_PADWR)))
-#define PBDWR (*((volatile Word *) SA1101_p2v (_PBDWR)))
-#define PADRR (*((volatile Word *) SA1101_p2v (_PADRR)))
-#define PBDRR (*((volatile Word *) SA1101_p2v (_PBDRR)))
-#define PADDR (*((volatile Word *) SA1101_p2v (_PADDR)))
-#define PBDDR (*((volatile Word *) SA1101_p2v (_PBDDR)))
-#define PASSR (*((volatile Word *) SA1101_p2v (_PASSR)))
-#define PBSSR (*((volatile Word *) SA1101_p2v (_PBSSR)))
-
-#endif
-
-
-
-/*
- * Keypad Interface
- *
- * Registers
- * PXDWR
- * PXDRR
- * PYDWR
- * PYDRR
- *
- */
-
-#define _KEYPAD( x ) _SA1101( ( x ) + __KEYPAD_INTERFACE )
-
-#define _PXDWR _KEYPAD( 0x0000 )
-#define _PXDRR _KEYPAD( 0x0000 )
-#define _PYDWR _KEYPAD( 0x0400 )
-#define _PYDRR _KEYPAD( 0x0400 )
-
-#if ( LANGUAGE == C )
-
-
-#define PXDWR (*((volatile Word *) SA1101_p2v (_PXDWR)))
-#define PXDRR (*((volatile Word *) SA1101_p2v (_PXDRR)))
-#define PYDWR (*((volatile Word *) SA1101_p2v (_PYDWR)))
-#define PYDRR (*((volatile Word *) SA1101_p2v (_PYDRR)))
-
-#endif
-
-
-
-/*
- * PCMCIA Interface
- *
- * Registers
- * PCSR Status Register
- * PCCR Control Register
- * PCSSR Sleep State Register
- *
- */
-
-#define _CARD( x ) _SA1101( ( x ) + __PCMCIA_INTERFACE )
-
-#define _PCSR _CARD( 0x0000 )
-#define _PCCR _CARD( 0x0400 )
-#define _PCSSR _CARD( 0x0800 )
-
-#if ( LANGUAGE == C )
-#define PCSR (*((volatile Word *) SA1101_p2v (_PCSR)))
-#define PCCR (*((volatile Word *) SA1101_p2v (_PCCR)))
-#define PCSSR (*((volatile Word *) SA1101_p2v (_PCSSR)))
-
-#define PCSR_S0_ready 0x0001
-#define PCSR_S1_ready 0x0002
-#define PCSR_S0_detected 0x0004
-#define PCSR_S1_detected 0x0008
-#define PCSR_S0_VS1 0x0010
-#define PCSR_S0_VS2 0x0020
-#define PCSR_S1_VS1 0x0040
-#define PCSR_S1_VS2 0x0080
-#define PCSR_S0_WP 0x0100
-#define PCSR_S1_WP 0x0200
-#define PCSR_S0_BVD1_nSTSCHG 0x0400
-#define PCSR_S0_BVD2_nSPKR 0x0800
-#define PCSR_S1_BVD1_nSTSCHG 0x1000
-#define PCSR_S1_BVD2_nSPKR 0x2000
-
-#define PCCR_S0_VPP0 0x0001
-#define PCCR_S0_VPP1 0x0002
-#define PCCR_S0_VCC0 0x0004
-#define PCCR_S0_VCC1 0x0008
-#define PCCR_S1_VPP0 0x0010
-#define PCCR_S1_VPP1 0x0020
-#define PCCR_S1_VCC0 0x0040
-#define PCCR_S1_VCC1 0x0080
-#define PCCR_S0_reset 0x0100
-#define PCCR_S1_reset 0x0200
-#define PCCR_S0_float 0x0400
-#define PCCR_S1_float 0x0800
-
-#define PCSSR_S0_VCC0 0x0001
-#define PCSSR_S0_VCC1 0x0002
-#define PCSSR_S0_VPP0 0x0004
-#define PCSSR_S0_VPP1 0x0008
-#define PCSSR_S0_control 0x0010
-#define PCSSR_S1_VCC0 0x0020
-#define PCSSR_S1_VCC1 0x0040
-#define PCSSR_S1_VPP0 0x0080
-#define PCSSR_S1_VPP1 0x0100
-#define PCSSR_S1_control 0x0200
-
-#endif
-
-#undef C
-#undef Assembly
diff --git a/arch/arm/mach-sa1100/include/mach/hardware.h b/arch/arm/mach-sa1100/include/mach/hardware.h
index 99f5856..ee5d2bb 100644
--- a/arch/arm/mach-sa1100/include/mach/hardware.h
+++ b/arch/arm/mach-sa1100/include/mach/hardware.h
@@ -72,8 +72,4 @@ static inline unsigned long get_clock_tick_rate(void)
#include "SA-1100.h"
-#ifdef CONFIG_SA1101
-#include "SA-1101.h"
-#endif
-
#endif /* _ASM_ARCH_HARDWARE_H */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 09/33] Removing dead MAGICV
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
@ 2010-06-30 15:56 ` Christoph Egger
2010-06-30 15:54 ` [PATCH 03/33] Removing dead OMAP_MUX_ERRORS Christoph Egger
` (36 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:56 UTC (permalink / raw)
To: Russell King, Andrew Victor, Antonio R. Costa, linux-arm-kernel,
linux-kernel
Cc: vamos
MAGICV doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-at91/at572d940hf_devices.c | 73 ------------------------------
1 files changed, 0 insertions(+), 73 deletions(-)
diff --git a/arch/arm/mach-at91/at572d940hf_devices.c b/arch/arm/mach-at91/at572d940hf_devices.c
index 0fc20a2..bff703e 100644
--- a/arch/arm/mach-at91/at572d940hf_devices.c
+++ b/arch/arm/mach-at91/at572d940hf_devices.c
@@ -878,80 +878,7 @@ void __init at91_set_serial_console(unsigned portnr) {}
void __init at91_add_device_serial(void) {}
#endif
-
-/* --------------------------------------------------------------------
- * mAgic
- * -------------------------------------------------------------------- */
-
-#ifdef CONFIG_MAGICV
-static struct resource mAgic_resources[] = {
- {
- .start = AT91_MAGIC_PM_BASE,
- .end = AT91_MAGIC_PM_BASE + AT91_MAGIC_PM_SIZE - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = AT91_MAGIC_DM_I_BASE,
- .end = AT91_MAGIC_DM_I_BASE + AT91_MAGIC_DM_I_SIZE - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = AT91_MAGIC_DM_F_BASE,
- .end = AT91_MAGIC_DM_F_BASE + AT91_MAGIC_DM_F_SIZE - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = AT91_MAGIC_DM_DB_BASE,
- .end = AT91_MAGIC_DM_DB_BASE + AT91_MAGIC_DM_DB_SIZE - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = AT91_MAGIC_REGS_BASE,
- .end = AT91_MAGIC_REGS_BASE + AT91_MAGIC_REGS_SIZE - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = AT91_MAGIC_EXTPAGE_BASE,
- .end = AT91_MAGIC_EXTPAGE_BASE + AT91_MAGIC_EXTPAGE_SIZE - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = AT572D940HF_ID_MSIRQ0,
- .end = AT572D940HF_ID_MSIRQ0,
- .flags = IORESOURCE_IRQ,
- },
- {
- .start = AT572D940HF_ID_MHALT,
- .end = AT572D940HF_ID_MHALT,
- .flags = IORESOURCE_IRQ,
- },
- {
- .start = AT572D940HF_ID_MEXC,
- .end = AT572D940HF_ID_MEXC,
- .flags = IORESOURCE_IRQ,
- },
- {
- .start = AT572D940HF_ID_MEDMA,
- .end = AT572D940HF_ID_MEDMA,
- .flags = IORESOURCE_IRQ,
- },
-};
-
-static struct platform_device mAgic_device = {
- .name = "mAgic",
- .id = -1,
- .num_resources = ARRAY_SIZE(mAgic_resources),
- .resource = mAgic_resources,
-};
-
-void __init at91_add_device_mAgic(void)
-{
- platform_device_register(&mAgic_device);
-}
-#else
void __init at91_add_device_mAgic(void) {}
-#endif
-
/* -------------------------------------------------------------------- */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 09/33] Removing dead MAGICV
@ 2010-06-30 15:56 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:56 UTC (permalink / raw)
To: linux-arm-kernel
MAGICV doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-at91/at572d940hf_devices.c | 73 ------------------------------
1 files changed, 0 insertions(+), 73 deletions(-)
diff --git a/arch/arm/mach-at91/at572d940hf_devices.c b/arch/arm/mach-at91/at572d940hf_devices.c
index 0fc20a2..bff703e 100644
--- a/arch/arm/mach-at91/at572d940hf_devices.c
+++ b/arch/arm/mach-at91/at572d940hf_devices.c
@@ -878,80 +878,7 @@ void __init at91_set_serial_console(unsigned portnr) {}
void __init at91_add_device_serial(void) {}
#endif
-
-/* --------------------------------------------------------------------
- * mAgic
- * -------------------------------------------------------------------- */
-
-#ifdef CONFIG_MAGICV
-static struct resource mAgic_resources[] = {
- {
- .start = AT91_MAGIC_PM_BASE,
- .end = AT91_MAGIC_PM_BASE + AT91_MAGIC_PM_SIZE - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = AT91_MAGIC_DM_I_BASE,
- .end = AT91_MAGIC_DM_I_BASE + AT91_MAGIC_DM_I_SIZE - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = AT91_MAGIC_DM_F_BASE,
- .end = AT91_MAGIC_DM_F_BASE + AT91_MAGIC_DM_F_SIZE - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = AT91_MAGIC_DM_DB_BASE,
- .end = AT91_MAGIC_DM_DB_BASE + AT91_MAGIC_DM_DB_SIZE - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = AT91_MAGIC_REGS_BASE,
- .end = AT91_MAGIC_REGS_BASE + AT91_MAGIC_REGS_SIZE - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = AT91_MAGIC_EXTPAGE_BASE,
- .end = AT91_MAGIC_EXTPAGE_BASE + AT91_MAGIC_EXTPAGE_SIZE - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = AT572D940HF_ID_MSIRQ0,
- .end = AT572D940HF_ID_MSIRQ0,
- .flags = IORESOURCE_IRQ,
- },
- {
- .start = AT572D940HF_ID_MHALT,
- .end = AT572D940HF_ID_MHALT,
- .flags = IORESOURCE_IRQ,
- },
- {
- .start = AT572D940HF_ID_MEXC,
- .end = AT572D940HF_ID_MEXC,
- .flags = IORESOURCE_IRQ,
- },
- {
- .start = AT572D940HF_ID_MEDMA,
- .end = AT572D940HF_ID_MEDMA,
- .flags = IORESOURCE_IRQ,
- },
-};
-
-static struct platform_device mAgic_device = {
- .name = "mAgic",
- .id = -1,
- .num_resources = ARRAY_SIZE(mAgic_resources),
- .resource = mAgic_resources,
-};
-
-void __init at91_add_device_mAgic(void)
-{
- platform_device_register(&mAgic_device);
-}
-#else
void __init at91_add_device_mAgic(void) {}
-#endif
-
/* -------------------------------------------------------------------- */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 10/33] Removing dead VIDEO_AT91_ISI
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
@ 2010-06-30 15:57 ` Christoph Egger
2010-06-30 15:54 ` [PATCH 03/33] Removing dead OMAP_MUX_ERRORS Christoph Egger
` (36 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:57 UTC (permalink / raw)
To: Russell King, David S. Miller, Hans J. Koch, Wolfgang Grandegger,
Sedji Gaouaou, linux-arm-kernel, linux-kernel
Cc: vamos
VIDEO_AT91_ISI doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-at91/at91sam9263_devices.c | 49 ------------------------------
1 files changed, 0 insertions(+), 49 deletions(-)
diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c
index fb5c23a..511d348 100644
--- a/arch/arm/mach-at91/at91sam9263_devices.c
+++ b/arch/arm/mach-at91/at91sam9263_devices.c
@@ -862,56 +862,7 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)
void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) {}
#endif
-
-/* --------------------------------------------------------------------
- * Image Sensor Interface
- * -------------------------------------------------------------------- */
-
-#if defined(CONFIG_VIDEO_AT91_ISI) || defined(CONFIG_VIDEO_AT91_ISI_MODULE)
-
-struct resource isi_resources[] = {
- [0] = {
- .start = AT91SAM9263_BASE_ISI,
- .end = AT91SAM9263_BASE_ISI + SZ_16K - 1,
- .flags = IORESOURCE_MEM,
- },
- [1] = {
- .start = AT91SAM9263_ID_ISI,
- .end = AT91SAM9263_ID_ISI,
- .flags = IORESOURCE_IRQ,
- },
-};
-
-static struct platform_device at91sam9263_isi_device = {
- .name = "at91_isi",
- .id = -1,
- .resource = isi_resources,
- .num_resources = ARRAY_SIZE(isi_resources),
-};
-
-void __init at91_add_device_isi(void)
-{
- at91_set_A_periph(AT91_PIN_PE0, 0); /* ISI_D0 */
- at91_set_A_periph(AT91_PIN_PE1, 0); /* ISI_D1 */
- at91_set_A_periph(AT91_PIN_PE2, 0); /* ISI_D2 */
- at91_set_A_periph(AT91_PIN_PE3, 0); /* ISI_D3 */
- at91_set_A_periph(AT91_PIN_PE4, 0); /* ISI_D4 */
- at91_set_A_periph(AT91_PIN_PE5, 0); /* ISI_D5 */
- at91_set_A_periph(AT91_PIN_PE6, 0); /* ISI_D6 */
- at91_set_A_periph(AT91_PIN_PE7, 0); /* ISI_D7 */
- at91_set_A_periph(AT91_PIN_PE8, 0); /* ISI_PCK */
- at91_set_A_periph(AT91_PIN_PE9, 0); /* ISI_HSYNC */
- at91_set_A_periph(AT91_PIN_PE10, 0); /* ISI_VSYNC */
- at91_set_B_periph(AT91_PIN_PE11, 0); /* ISI_MCK (PCK3) */
- at91_set_B_periph(AT91_PIN_PE12, 0); /* ISI_PD8 */
- at91_set_B_periph(AT91_PIN_PE13, 0); /* ISI_PD9 */
- at91_set_B_periph(AT91_PIN_PE14, 0); /* ISI_PD10 */
- at91_set_B_periph(AT91_PIN_PE15, 0); /* ISI_PD11 */
-}
-#else
void __init at91_add_device_isi(void) {}
-#endif
-
/* --------------------------------------------------------------------
* Timer/Counter block
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 10/33] Removing dead VIDEO_AT91_ISI
@ 2010-06-30 15:57 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:57 UTC (permalink / raw)
To: linux-arm-kernel
VIDEO_AT91_ISI doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-at91/at91sam9263_devices.c | 49 ------------------------------
1 files changed, 0 insertions(+), 49 deletions(-)
diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c
index fb5c23a..511d348 100644
--- a/arch/arm/mach-at91/at91sam9263_devices.c
+++ b/arch/arm/mach-at91/at91sam9263_devices.c
@@ -862,56 +862,7 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)
void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) {}
#endif
-
-/* --------------------------------------------------------------------
- * Image Sensor Interface
- * -------------------------------------------------------------------- */
-
-#if defined(CONFIG_VIDEO_AT91_ISI) || defined(CONFIG_VIDEO_AT91_ISI_MODULE)
-
-struct resource isi_resources[] = {
- [0] = {
- .start = AT91SAM9263_BASE_ISI,
- .end = AT91SAM9263_BASE_ISI + SZ_16K - 1,
- .flags = IORESOURCE_MEM,
- },
- [1] = {
- .start = AT91SAM9263_ID_ISI,
- .end = AT91SAM9263_ID_ISI,
- .flags = IORESOURCE_IRQ,
- },
-};
-
-static struct platform_device at91sam9263_isi_device = {
- .name = "at91_isi",
- .id = -1,
- .resource = isi_resources,
- .num_resources = ARRAY_SIZE(isi_resources),
-};
-
-void __init at91_add_device_isi(void)
-{
- at91_set_A_periph(AT91_PIN_PE0, 0); /* ISI_D0 */
- at91_set_A_periph(AT91_PIN_PE1, 0); /* ISI_D1 */
- at91_set_A_periph(AT91_PIN_PE2, 0); /* ISI_D2 */
- at91_set_A_periph(AT91_PIN_PE3, 0); /* ISI_D3 */
- at91_set_A_periph(AT91_PIN_PE4, 0); /* ISI_D4 */
- at91_set_A_periph(AT91_PIN_PE5, 0); /* ISI_D5 */
- at91_set_A_periph(AT91_PIN_PE6, 0); /* ISI_D6 */
- at91_set_A_periph(AT91_PIN_PE7, 0); /* ISI_D7 */
- at91_set_A_periph(AT91_PIN_PE8, 0); /* ISI_PCK */
- at91_set_A_periph(AT91_PIN_PE9, 0); /* ISI_HSYNC */
- at91_set_A_periph(AT91_PIN_PE10, 0); /* ISI_VSYNC */
- at91_set_B_periph(AT91_PIN_PE11, 0); /* ISI_MCK (PCK3) */
- at91_set_B_periph(AT91_PIN_PE12, 0); /* ISI_PD8 */
- at91_set_B_periph(AT91_PIN_PE13, 0); /* ISI_PD9 */
- at91_set_B_periph(AT91_PIN_PE14, 0); /* ISI_PD10 */
- at91_set_B_periph(AT91_PIN_PE15, 0); /* ISI_PD11 */
-}
-#else
void __init at91_add_device_isi(void) {}
-#endif
-
/* --------------------------------------------------------------------
* Timer/Counter block
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 11/33] Removing dead OMAP_DSP
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
@ 2010-06-30 15:57 ` Christoph Egger
2010-06-30 15:54 ` [PATCH 03/33] Removing dead OMAP_MUX_ERRORS Christoph Egger
` (36 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:57 UTC (permalink / raw)
To: Tony Lindgren, Russell King, Tomi Valkeinen, Cory Maccarrone,
Felipe Balbi, Zebediah C. McClure, Alistair Buxton,
Janusz Krzysztofik, Jorge Eduardo Candelaria, Santosh Shilimkar,
linux-omap, linux-arm-kernel, linux-kernel
Cc: vamos
OMAP_DSP doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap1/board-nokia770.c | 132 --------------------------
arch/arm/mach-omap1/devices.c | 37 -------
arch/arm/mach-omap1/mcbsp.c | 3 -
arch/arm/plat-omap/devices.c | 62 ------------
arch/arm/plat-omap/include/plat/dsp_common.h | 40 --------
5 files changed, 0 insertions(+), 274 deletions(-)
delete mode 100644 arch/arm/plat-omap/include/plat/dsp_common.h
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index 71e1a3f..825b4c8 100644
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -242,138 +242,6 @@ static inline void nokia770_mmc_init(void)
}
#endif
-#if defined(CONFIG_OMAP_DSP)
-/*
- * audio power control
- */
-#define HEADPHONE_GPIO 14
-#define AMPLIFIER_CTRL_GPIO 58
-
-static struct clk *dspxor_ck;
-static DEFINE_MUTEX(audio_pwr_lock);
-/*
- * audio_pwr_state
- * +--+-------------------------+---------------------------------------+
- * |-1|down |power-up request -> 0 |
- * +--+-------------------------+---------------------------------------+
- * | 0|up |power-down(1) request -> 1 |
- * | | |power-down(2) request -> (ignore) |
- * +--+-------------------------+---------------------------------------+
- * | 1|up, |power-up request -> 0 |
- * | |received down(1) request |power-down(2) request -> -1 |
- * +--+-------------------------+---------------------------------------+
- */
-static int audio_pwr_state = -1;
-
-static inline void aic23_power_up(void)
-{
-}
-static inline void aic23_power_down(void)
-{
-}
-
-/*
- * audio_pwr_up / down should be called under audio_pwr_lock
- */
-static void nokia770_audio_pwr_up(void)
-{
- clk_enable(dspxor_ck);
-
- /* Turn on codec */
- aic23_power_up();
-
- if (gpio_get_value(HEADPHONE_GPIO))
- /* HP not connected, turn on amplifier */
- gpio_set_value(AMPLIFIER_CTRL_GPIO, 1);
- else
- /* HP connected, do not turn on amplifier */
- printk("HP connected\n");
-}
-
-static void codec_delayed_power_down(struct work_struct *work)
-{
- mutex_lock(&audio_pwr_lock);
- if (audio_pwr_state == -1)
- aic23_power_down();
- clk_disable(dspxor_ck);
- mutex_unlock(&audio_pwr_lock);
-}
-
-static DECLARE_DELAYED_WORK(codec_power_down_work, codec_delayed_power_down);
-
-static void nokia770_audio_pwr_down(void)
-{
- /* Turn off amplifier */
- gpio_set_value(AMPLIFIER_CTRL_GPIO, 0);
-
- /* Turn off codec: schedule delayed work */
- schedule_delayed_work(&codec_power_down_work, HZ / 20); /* 50ms */
-}
-
-static int
-nokia770_audio_pwr_up_request(struct dsp_kfunc_device *kdev, int stage)
-{
- mutex_lock(&audio_pwr_lock);
- if (audio_pwr_state == -1)
- nokia770_audio_pwr_up();
- /* force audio_pwr_state = 0, even if it was 1. */
- audio_pwr_state = 0;
- mutex_unlock(&audio_pwr_lock);
- return 0;
-}
-
-static int
-nokia770_audio_pwr_down_request(struct dsp_kfunc_device *kdev, int stage)
-{
- mutex_lock(&audio_pwr_lock);
- switch (stage) {
- case 1:
- if (audio_pwr_state == 0)
- audio_pwr_state = 1;
- break;
- case 2:
- if (audio_pwr_state == 1) {
- nokia770_audio_pwr_down();
- audio_pwr_state = -1;
- }
- break;
- }
- mutex_unlock(&audio_pwr_lock);
- return 0;
-}
-
-static struct dsp_kfunc_device nokia770_audio_device = {
- .name = "audio",
- .type = DSP_KFUNC_DEV_TYPE_AUDIO,
- .enable = nokia770_audio_pwr_up_request,
- .disable = nokia770_audio_pwr_down_request,
-};
-
-static __init int omap_dsp_init(void)
-{
- int ret;
-
- dspxor_ck = clk_get(0, "dspxor_ck");
- if (IS_ERR(dspxor_ck)) {
- printk(KERN_ERR "couldn't acquire dspxor_ck\n");
- return PTR_ERR(dspxor_ck);
- }
-
- ret = dsp_kfunc_device_register(&nokia770_audio_device);
- if (ret) {
- printk(KERN_ERR
- "KFUNC device registration faild: %s\n",
- nokia770_audio_device.name);
- goto out;
- }
- return 0;
- out:
- return ret;
-}
-#else
-#define omap_dsp_init() do {} while (0)
-#endif /* CONFIG_OMAP_DSP */
-
static void __init omap_nokia770_init(void)
{
platform_add_devices(nokia770_devices, ARRAY_SIZE(nokia770_devices));
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index 379100c..c00d602 100644
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -63,44 +63,7 @@ static void omap_init_rtc(void)
static inline void omap_init_rtc(void) {}
#endif
-#if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE)
-
-#if defined(CONFIG_ARCH_OMAP15XX)
-# define OMAP1_MBOX_SIZE 0x23
-# define INT_DSP_MAILBOX1 INT_1510_DSP_MAILBOX1
-#elif defined(CONFIG_ARCH_OMAP16XX)
-# define OMAP1_MBOX_SIZE 0x2f
-# define INT_DSP_MAILBOX1 INT_1610_DSP_MAILBOX1
-#endif
-
-#define OMAP1_MBOX_BASE OMAP16XX_MAILBOX_BASE
-
-static struct resource mbox_resources[] = {
- {
- .start = OMAP1_MBOX_BASE,
- .end = OMAP1_MBOX_BASE + OMAP1_MBOX_SIZE,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = INT_DSP_MAILBOX1,
- .flags = IORESOURCE_IRQ,
- },
-};
-
-static struct platform_device mbox_device = {
- .name = "omap1-mailbox",
- .id = -1,
- .num_resources = ARRAY_SIZE(mbox_resources),
- .resource = mbox_resources,
-};
-
-static inline void omap_init_mbox(void)
-{
- platform_device_register(&mbox_device);
-}
-#else
static inline void omap_init_mbox(void) { }
-#endif
/*-------------------------------------------------------------------------*/
diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c
index e9bdff1..b3a796a 100644
--- a/arch/arm/mach-omap1/mcbsp.c
+++ b/arch/arm/mach-omap1/mcbsp.c
@@ -23,7 +23,6 @@
#include <plat/mux.h>
#include <plat/cpu.h>
#include <plat/mcbsp.h>
-#include <plat/dsp_common.h>
#define DPS_RSTCT2_PER_EN (1 << 0)
#define DSP_RSTCT2_WD_PER_EN (1 << 1)
@@ -46,7 +45,6 @@ static void omap1_mcbsp_request(unsigned int id)
clk_enable(api_clk);
clk_enable(dsp_clk);
- omap_dsp_request_mem();
/*
* DSP external peripheral reset
* FIXME: This should be moved to dsp code
@@ -62,7 +60,6 @@ static void omap1_mcbsp_free(unsigned int id)
{
if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) {
if (--dsp_use == 0) {
- omap_dsp_release_mem();
if (!IS_ERR(api_clk)) {
clk_disable(api_clk);
clk_put(api_clk);
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
index 95677d1..a3997ec 100644
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@ -31,67 +31,6 @@
#include <plat/dsp_common.h>
#include <plat/omap44xx.h>
-#if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE)
-
-static struct dsp_platform_data dsp_pdata = {
- .kdev_list = LIST_HEAD_INIT(dsp_pdata.kdev_list),
-};
-
-static struct resource omap_dsp_resources[] = {
- {
- .name = "dsp_mmu",
- .start = -1,
- .flags = IORESOURCE_IRQ,
- },
-};
-
-static struct platform_device omap_dsp_device = {
- .name = "dsp",
- .id = -1,
- .num_resources = ARRAY_SIZE(omap_dsp_resources),
- .resource = omap_dsp_resources,
- .dev = {
- .platform_data = &dsp_pdata,
- },
-};
-
-static inline void omap_init_dsp(void)
-{
- struct resource *res;
- int irq;
-
- if (cpu_is_omap15xx())
- irq = INT_1510_DSP_MMU;
- else if (cpu_is_omap16xx())
- irq = INT_1610_DSP_MMU;
- else if (cpu_is_omap24xx())
- irq = INT_24XX_DSP_MMU;
-
- res = platform_get_resource_byname(&omap_dsp_device,
- IORESOURCE_IRQ, "dsp_mmu");
- res->start = irq;
-
- platform_device_register(&omap_dsp_device);
-}
-
-int dsp_kfunc_device_register(struct dsp_kfunc_device *kdev)
-{
- static DEFINE_MUTEX(dsp_pdata_lock);
-
- spin_lock_init(&kdev->lock);
-
- mutex_lock(&dsp_pdata_lock);
- list_add_tail(&kdev->entry, &dsp_pdata.kdev_list);
- mutex_unlock(&dsp_pdata_lock);
-
- return 0;
-}
-EXPORT_SYMBOL(dsp_kfunc_device_register);
-
-#else
-static inline void omap_init_dsp(void) { }
-#endif /* CONFIG_OMAP_DSP */
-
/*-------------------------------------------------------------------------*/
#if defined(CONFIG_KEYBOARD_OMAP) || defined(CONFIG_KEYBOARD_OMAP_MODULE)
@@ -419,7 +358,6 @@ static int __init omap_init_devices(void)
/* please keep these calls, and their implementations above,
* in alphabetical order so they're easier to sort through.
*/
- omap_init_dsp();
omap_init_kp();
omap_init_rng();
omap_init_mcpdm();
diff --git a/arch/arm/plat-omap/include/plat/dsp_common.h b/arch/arm/plat-omap/include/plat/dsp_common.h
deleted file mode 100644
index da97736..0000000
--- a/arch/arm/plat-omap/include/plat/dsp_common.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of OMAP DSP driver (DSP Gateway version 3.3.1)
- *
- * Copyright (C) 2004-2006 Nokia Corporation. All rights reserved.
- *
- * Contact: Toshihiro Kobayashi <toshihiro.kobayashi@nokia.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- */
-
-#ifndef ASM_ARCH_DSP_COMMON_H
-#define ASM_ARCH_DSP_COMMON_H
-
-#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_OMAP_MMU_FWK)
-extern void omap_dsp_request_mpui(void);
-extern void omap_dsp_release_mpui(void);
-extern int omap_dsp_request_mem(void);
-extern int omap_dsp_release_mem(void);
-#else
-static inline int omap_dsp_request_mem(void)
-{
- return 0;
-}
-#define omap_dsp_release_mem() do {} while (0)
-#endif
-
-#endif /* ASM_ARCH_DSP_COMMON_H */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 11/33] Removing dead OMAP_DSP
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
` (10 preceding siblings ...)
2010-06-30 15:57 ` Christoph Egger
@ 2010-06-30 15:57 ` Christoph Egger
2010-06-30 15:57 ` Christoph Egger
` (25 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:57 UTC (permalink / raw)
To: Tony Lindgren, Russell King, Tomi Valkeinen, Cory Maccarrone,
Felipe Balbi
Cc: vamos
OMAP_DSP doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap1/board-nokia770.c | 132 --------------------------
arch/arm/mach-omap1/devices.c | 37 -------
arch/arm/mach-omap1/mcbsp.c | 3 -
arch/arm/plat-omap/devices.c | 62 ------------
arch/arm/plat-omap/include/plat/dsp_common.h | 40 --------
5 files changed, 0 insertions(+), 274 deletions(-)
delete mode 100644 arch/arm/plat-omap/include/plat/dsp_common.h
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index 71e1a3f..825b4c8 100644
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -242,138 +242,6 @@ static inline void nokia770_mmc_init(void)
}
#endif
-#if defined(CONFIG_OMAP_DSP)
-/*
- * audio power control
- */
-#define HEADPHONE_GPIO 14
-#define AMPLIFIER_CTRL_GPIO 58
-
-static struct clk *dspxor_ck;
-static DEFINE_MUTEX(audio_pwr_lock);
-/*
- * audio_pwr_state
- * +--+-------------------------+---------------------------------------+
- * |-1|down |power-up request -> 0 |
- * +--+-------------------------+---------------------------------------+
- * | 0|up |power-down(1) request -> 1 |
- * | | |power-down(2) request -> (ignore) |
- * +--+-------------------------+---------------------------------------+
- * | 1|up, |power-up request -> 0 |
- * | |received down(1) request |power-down(2) request -> -1 |
- * +--+-------------------------+---------------------------------------+
- */
-static int audio_pwr_state = -1;
-
-static inline void aic23_power_up(void)
-{
-}
-static inline void aic23_power_down(void)
-{
-}
-
-/*
- * audio_pwr_up / down should be called under audio_pwr_lock
- */
-static void nokia770_audio_pwr_up(void)
-{
- clk_enable(dspxor_ck);
-
- /* Turn on codec */
- aic23_power_up();
-
- if (gpio_get_value(HEADPHONE_GPIO))
- /* HP not connected, turn on amplifier */
- gpio_set_value(AMPLIFIER_CTRL_GPIO, 1);
- else
- /* HP connected, do not turn on amplifier */
- printk("HP connected\n");
-}
-
-static void codec_delayed_power_down(struct work_struct *work)
-{
- mutex_lock(&audio_pwr_lock);
- if (audio_pwr_state == -1)
- aic23_power_down();
- clk_disable(dspxor_ck);
- mutex_unlock(&audio_pwr_lock);
-}
-
-static DECLARE_DELAYED_WORK(codec_power_down_work, codec_delayed_power_down);
-
-static void nokia770_audio_pwr_down(void)
-{
- /* Turn off amplifier */
- gpio_set_value(AMPLIFIER_CTRL_GPIO, 0);
-
- /* Turn off codec: schedule delayed work */
- schedule_delayed_work(&codec_power_down_work, HZ / 20); /* 50ms */
-}
-
-static int
-nokia770_audio_pwr_up_request(struct dsp_kfunc_device *kdev, int stage)
-{
- mutex_lock(&audio_pwr_lock);
- if (audio_pwr_state == -1)
- nokia770_audio_pwr_up();
- /* force audio_pwr_state = 0, even if it was 1. */
- audio_pwr_state = 0;
- mutex_unlock(&audio_pwr_lock);
- return 0;
-}
-
-static int
-nokia770_audio_pwr_down_request(struct dsp_kfunc_device *kdev, int stage)
-{
- mutex_lock(&audio_pwr_lock);
- switch (stage) {
- case 1:
- if (audio_pwr_state == 0)
- audio_pwr_state = 1;
- break;
- case 2:
- if (audio_pwr_state == 1) {
- nokia770_audio_pwr_down();
- audio_pwr_state = -1;
- }
- break;
- }
- mutex_unlock(&audio_pwr_lock);
- return 0;
-}
-
-static struct dsp_kfunc_device nokia770_audio_device = {
- .name = "audio",
- .type = DSP_KFUNC_DEV_TYPE_AUDIO,
- .enable = nokia770_audio_pwr_up_request,
- .disable = nokia770_audio_pwr_down_request,
-};
-
-static __init int omap_dsp_init(void)
-{
- int ret;
-
- dspxor_ck = clk_get(0, "dspxor_ck");
- if (IS_ERR(dspxor_ck)) {
- printk(KERN_ERR "couldn't acquire dspxor_ck\n");
- return PTR_ERR(dspxor_ck);
- }
-
- ret = dsp_kfunc_device_register(&nokia770_audio_device);
- if (ret) {
- printk(KERN_ERR
- "KFUNC device registration faild: %s\n",
- nokia770_audio_device.name);
- goto out;
- }
- return 0;
- out:
- return ret;
-}
-#else
-#define omap_dsp_init() do {} while (0)
-#endif /* CONFIG_OMAP_DSP */
-
static void __init omap_nokia770_init(void)
{
platform_add_devices(nokia770_devices, ARRAY_SIZE(nokia770_devices));
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index 379100c..c00d602 100644
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -63,44 +63,7 @@ static void omap_init_rtc(void)
static inline void omap_init_rtc(void) {}
#endif
-#if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE)
-
-#if defined(CONFIG_ARCH_OMAP15XX)
-# define OMAP1_MBOX_SIZE 0x23
-# define INT_DSP_MAILBOX1 INT_1510_DSP_MAILBOX1
-#elif defined(CONFIG_ARCH_OMAP16XX)
-# define OMAP1_MBOX_SIZE 0x2f
-# define INT_DSP_MAILBOX1 INT_1610_DSP_MAILBOX1
-#endif
-
-#define OMAP1_MBOX_BASE OMAP16XX_MAILBOX_BASE
-
-static struct resource mbox_resources[] = {
- {
- .start = OMAP1_MBOX_BASE,
- .end = OMAP1_MBOX_BASE + OMAP1_MBOX_SIZE,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = INT_DSP_MAILBOX1,
- .flags = IORESOURCE_IRQ,
- },
-};
-
-static struct platform_device mbox_device = {
- .name = "omap1-mailbox",
- .id = -1,
- .num_resources = ARRAY_SIZE(mbox_resources),
- .resource = mbox_resources,
-};
-
-static inline void omap_init_mbox(void)
-{
- platform_device_register(&mbox_device);
-}
-#else
static inline void omap_init_mbox(void) { }
-#endif
/*-------------------------------------------------------------------------*/
diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c
index e9bdff1..b3a796a 100644
--- a/arch/arm/mach-omap1/mcbsp.c
+++ b/arch/arm/mach-omap1/mcbsp.c
@@ -23,7 +23,6 @@
#include <plat/mux.h>
#include <plat/cpu.h>
#include <plat/mcbsp.h>
-#include <plat/dsp_common.h>
#define DPS_RSTCT2_PER_EN (1 << 0)
#define DSP_RSTCT2_WD_PER_EN (1 << 1)
@@ -46,7 +45,6 @@ static void omap1_mcbsp_request(unsigned int id)
clk_enable(api_clk);
clk_enable(dsp_clk);
- omap_dsp_request_mem();
/*
* DSP external peripheral reset
* FIXME: This should be moved to dsp code
@@ -62,7 +60,6 @@ static void omap1_mcbsp_free(unsigned int id)
{
if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) {
if (--dsp_use == 0) {
- omap_dsp_release_mem();
if (!IS_ERR(api_clk)) {
clk_disable(api_clk);
clk_put(api_clk);
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
index 95677d1..a3997ec 100644
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@ -31,67 +31,6 @@
#include <plat/dsp_common.h>
#include <plat/omap44xx.h>
-#if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE)
-
-static struct dsp_platform_data dsp_pdata = {
- .kdev_list = LIST_HEAD_INIT(dsp_pdata.kdev_list),
-};
-
-static struct resource omap_dsp_resources[] = {
- {
- .name = "dsp_mmu",
- .start = -1,
- .flags = IORESOURCE_IRQ,
- },
-};
-
-static struct platform_device omap_dsp_device = {
- .name = "dsp",
- .id = -1,
- .num_resources = ARRAY_SIZE(omap_dsp_resources),
- .resource = omap_dsp_resources,
- .dev = {
- .platform_data = &dsp_pdata,
- },
-};
-
-static inline void omap_init_dsp(void)
-{
- struct resource *res;
- int irq;
-
- if (cpu_is_omap15xx())
- irq = INT_1510_DSP_MMU;
- else if (cpu_is_omap16xx())
- irq = INT_1610_DSP_MMU;
- else if (cpu_is_omap24xx())
- irq = INT_24XX_DSP_MMU;
-
- res = platform_get_resource_byname(&omap_dsp_device,
- IORESOURCE_IRQ, "dsp_mmu");
- res->start = irq;
-
- platform_device_register(&omap_dsp_device);
-}
-
-int dsp_kfunc_device_register(struct dsp_kfunc_device *kdev)
-{
- static DEFINE_MUTEX(dsp_pdata_lock);
-
- spin_lock_init(&kdev->lock);
-
- mutex_lock(&dsp_pdata_lock);
- list_add_tail(&kdev->entry, &dsp_pdata.kdev_list);
- mutex_unlock(&dsp_pdata_lock);
-
- return 0;
-}
-EXPORT_SYMBOL(dsp_kfunc_device_register);
-
-#else
-static inline void omap_init_dsp(void) { }
-#endif /* CONFIG_OMAP_DSP */
-
/*-------------------------------------------------------------------------*/
#if defined(CONFIG_KEYBOARD_OMAP) || defined(CONFIG_KEYBOARD_OMAP_MODULE)
@@ -419,7 +358,6 @@ static int __init omap_init_devices(void)
/* please keep these calls, and their implementations above,
* in alphabetical order so they're easier to sort through.
*/
- omap_init_dsp();
omap_init_kp();
omap_init_rng();
omap_init_mcpdm();
diff --git a/arch/arm/plat-omap/include/plat/dsp_common.h b/arch/arm/plat-omap/include/plat/dsp_common.h
deleted file mode 100644
index da97736..0000000
--- a/arch/arm/plat-omap/include/plat/dsp_common.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of OMAP DSP driver (DSP Gateway version 3.3.1)
- *
- * Copyright (C) 2004-2006 Nokia Corporation. All rights reserved.
- *
- * Contact: Toshihiro Kobayashi <toshihiro.kobayashi@nokia.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- */
-
-#ifndef ASM_ARCH_DSP_COMMON_H
-#define ASM_ARCH_DSP_COMMON_H
-
-#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_OMAP_MMU_FWK)
-extern void omap_dsp_request_mpui(void);
-extern void omap_dsp_release_mpui(void);
-extern int omap_dsp_request_mem(void);
-extern int omap_dsp_release_mem(void);
-#else
-static inline int omap_dsp_request_mem(void)
-{
- return 0;
-}
-#define omap_dsp_release_mem() do {} while (0)
-#endif
-
-#endif /* ASM_ARCH_DSP_COMMON_H */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 11/33] Removing dead OMAP_DSP
@ 2010-06-30 15:57 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:57 UTC (permalink / raw)
To: linux-arm-kernel
OMAP_DSP doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap1/board-nokia770.c | 132 --------------------------
arch/arm/mach-omap1/devices.c | 37 -------
arch/arm/mach-omap1/mcbsp.c | 3 -
arch/arm/plat-omap/devices.c | 62 ------------
arch/arm/plat-omap/include/plat/dsp_common.h | 40 --------
5 files changed, 0 insertions(+), 274 deletions(-)
delete mode 100644 arch/arm/plat-omap/include/plat/dsp_common.h
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index 71e1a3f..825b4c8 100644
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -242,138 +242,6 @@ static inline void nokia770_mmc_init(void)
}
#endif
-#if defined(CONFIG_OMAP_DSP)
-/*
- * audio power control
- */
-#define HEADPHONE_GPIO 14
-#define AMPLIFIER_CTRL_GPIO 58
-
-static struct clk *dspxor_ck;
-static DEFINE_MUTEX(audio_pwr_lock);
-/*
- * audio_pwr_state
- * +--+-------------------------+---------------------------------------+
- * |-1|down |power-up request -> 0 |
- * +--+-------------------------+---------------------------------------+
- * | 0|up |power-down(1) request -> 1 |
- * | | |power-down(2) request -> (ignore) |
- * +--+-------------------------+---------------------------------------+
- * | 1|up, |power-up request -> 0 |
- * | |received down(1) request |power-down(2) request -> -1 |
- * +--+-------------------------+---------------------------------------+
- */
-static int audio_pwr_state = -1;
-
-static inline void aic23_power_up(void)
-{
-}
-static inline void aic23_power_down(void)
-{
-}
-
-/*
- * audio_pwr_up / down should be called under audio_pwr_lock
- */
-static void nokia770_audio_pwr_up(void)
-{
- clk_enable(dspxor_ck);
-
- /* Turn on codec */
- aic23_power_up();
-
- if (gpio_get_value(HEADPHONE_GPIO))
- /* HP not connected, turn on amplifier */
- gpio_set_value(AMPLIFIER_CTRL_GPIO, 1);
- else
- /* HP connected, do not turn on amplifier */
- printk("HP connected\n");
-}
-
-static void codec_delayed_power_down(struct work_struct *work)
-{
- mutex_lock(&audio_pwr_lock);
- if (audio_pwr_state == -1)
- aic23_power_down();
- clk_disable(dspxor_ck);
- mutex_unlock(&audio_pwr_lock);
-}
-
-static DECLARE_DELAYED_WORK(codec_power_down_work, codec_delayed_power_down);
-
-static void nokia770_audio_pwr_down(void)
-{
- /* Turn off amplifier */
- gpio_set_value(AMPLIFIER_CTRL_GPIO, 0);
-
- /* Turn off codec: schedule delayed work */
- schedule_delayed_work(&codec_power_down_work, HZ / 20); /* 50ms */
-}
-
-static int
-nokia770_audio_pwr_up_request(struct dsp_kfunc_device *kdev, int stage)
-{
- mutex_lock(&audio_pwr_lock);
- if (audio_pwr_state == -1)
- nokia770_audio_pwr_up();
- /* force audio_pwr_state = 0, even if it was 1. */
- audio_pwr_state = 0;
- mutex_unlock(&audio_pwr_lock);
- return 0;
-}
-
-static int
-nokia770_audio_pwr_down_request(struct dsp_kfunc_device *kdev, int stage)
-{
- mutex_lock(&audio_pwr_lock);
- switch (stage) {
- case 1:
- if (audio_pwr_state == 0)
- audio_pwr_state = 1;
- break;
- case 2:
- if (audio_pwr_state == 1) {
- nokia770_audio_pwr_down();
- audio_pwr_state = -1;
- }
- break;
- }
- mutex_unlock(&audio_pwr_lock);
- return 0;
-}
-
-static struct dsp_kfunc_device nokia770_audio_device = {
- .name = "audio",
- .type = DSP_KFUNC_DEV_TYPE_AUDIO,
- .enable = nokia770_audio_pwr_up_request,
- .disable = nokia770_audio_pwr_down_request,
-};
-
-static __init int omap_dsp_init(void)
-{
- int ret;
-
- dspxor_ck = clk_get(0, "dspxor_ck");
- if (IS_ERR(dspxor_ck)) {
- printk(KERN_ERR "couldn't acquire dspxor_ck\n");
- return PTR_ERR(dspxor_ck);
- }
-
- ret = dsp_kfunc_device_register(&nokia770_audio_device);
- if (ret) {
- printk(KERN_ERR
- "KFUNC device registration faild: %s\n",
- nokia770_audio_device.name);
- goto out;
- }
- return 0;
- out:
- return ret;
-}
-#else
-#define omap_dsp_init() do {} while (0)
-#endif /* CONFIG_OMAP_DSP */
-
static void __init omap_nokia770_init(void)
{
platform_add_devices(nokia770_devices, ARRAY_SIZE(nokia770_devices));
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index 379100c..c00d602 100644
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -63,44 +63,7 @@ static void omap_init_rtc(void)
static inline void omap_init_rtc(void) {}
#endif
-#if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE)
-
-#if defined(CONFIG_ARCH_OMAP15XX)
-# define OMAP1_MBOX_SIZE 0x23
-# define INT_DSP_MAILBOX1 INT_1510_DSP_MAILBOX1
-#elif defined(CONFIG_ARCH_OMAP16XX)
-# define OMAP1_MBOX_SIZE 0x2f
-# define INT_DSP_MAILBOX1 INT_1610_DSP_MAILBOX1
-#endif
-
-#define OMAP1_MBOX_BASE OMAP16XX_MAILBOX_BASE
-
-static struct resource mbox_resources[] = {
- {
- .start = OMAP1_MBOX_BASE,
- .end = OMAP1_MBOX_BASE + OMAP1_MBOX_SIZE,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = INT_DSP_MAILBOX1,
- .flags = IORESOURCE_IRQ,
- },
-};
-
-static struct platform_device mbox_device = {
- .name = "omap1-mailbox",
- .id = -1,
- .num_resources = ARRAY_SIZE(mbox_resources),
- .resource = mbox_resources,
-};
-
-static inline void omap_init_mbox(void)
-{
- platform_device_register(&mbox_device);
-}
-#else
static inline void omap_init_mbox(void) { }
-#endif
/*-------------------------------------------------------------------------*/
diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c
index e9bdff1..b3a796a 100644
--- a/arch/arm/mach-omap1/mcbsp.c
+++ b/arch/arm/mach-omap1/mcbsp.c
@@ -23,7 +23,6 @@
#include <plat/mux.h>
#include <plat/cpu.h>
#include <plat/mcbsp.h>
-#include <plat/dsp_common.h>
#define DPS_RSTCT2_PER_EN (1 << 0)
#define DSP_RSTCT2_WD_PER_EN (1 << 1)
@@ -46,7 +45,6 @@ static void omap1_mcbsp_request(unsigned int id)
clk_enable(api_clk);
clk_enable(dsp_clk);
- omap_dsp_request_mem();
/*
* DSP external peripheral reset
* FIXME: This should be moved to dsp code
@@ -62,7 +60,6 @@ static void omap1_mcbsp_free(unsigned int id)
{
if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) {
if (--dsp_use == 0) {
- omap_dsp_release_mem();
if (!IS_ERR(api_clk)) {
clk_disable(api_clk);
clk_put(api_clk);
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
index 95677d1..a3997ec 100644
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@ -31,67 +31,6 @@
#include <plat/dsp_common.h>
#include <plat/omap44xx.h>
-#if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE)
-
-static struct dsp_platform_data dsp_pdata = {
- .kdev_list = LIST_HEAD_INIT(dsp_pdata.kdev_list),
-};
-
-static struct resource omap_dsp_resources[] = {
- {
- .name = "dsp_mmu",
- .start = -1,
- .flags = IORESOURCE_IRQ,
- },
-};
-
-static struct platform_device omap_dsp_device = {
- .name = "dsp",
- .id = -1,
- .num_resources = ARRAY_SIZE(omap_dsp_resources),
- .resource = omap_dsp_resources,
- .dev = {
- .platform_data = &dsp_pdata,
- },
-};
-
-static inline void omap_init_dsp(void)
-{
- struct resource *res;
- int irq;
-
- if (cpu_is_omap15xx())
- irq = INT_1510_DSP_MMU;
- else if (cpu_is_omap16xx())
- irq = INT_1610_DSP_MMU;
- else if (cpu_is_omap24xx())
- irq = INT_24XX_DSP_MMU;
-
- res = platform_get_resource_byname(&omap_dsp_device,
- IORESOURCE_IRQ, "dsp_mmu");
- res->start = irq;
-
- platform_device_register(&omap_dsp_device);
-}
-
-int dsp_kfunc_device_register(struct dsp_kfunc_device *kdev)
-{
- static DEFINE_MUTEX(dsp_pdata_lock);
-
- spin_lock_init(&kdev->lock);
-
- mutex_lock(&dsp_pdata_lock);
- list_add_tail(&kdev->entry, &dsp_pdata.kdev_list);
- mutex_unlock(&dsp_pdata_lock);
-
- return 0;
-}
-EXPORT_SYMBOL(dsp_kfunc_device_register);
-
-#else
-static inline void omap_init_dsp(void) { }
-#endif /* CONFIG_OMAP_DSP */
-
/*-------------------------------------------------------------------------*/
#if defined(CONFIG_KEYBOARD_OMAP) || defined(CONFIG_KEYBOARD_OMAP_MODULE)
@@ -419,7 +358,6 @@ static int __init omap_init_devices(void)
/* please keep these calls, and their implementations above,
* in alphabetical order so they're easier to sort through.
*/
- omap_init_dsp();
omap_init_kp();
omap_init_rng();
omap_init_mcpdm();
diff --git a/arch/arm/plat-omap/include/plat/dsp_common.h b/arch/arm/plat-omap/include/plat/dsp_common.h
deleted file mode 100644
index da97736..0000000
--- a/arch/arm/plat-omap/include/plat/dsp_common.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of OMAP DSP driver (DSP Gateway version 3.3.1)
- *
- * Copyright (C) 2004-2006 Nokia Corporation. All rights reserved.
- *
- * Contact: Toshihiro Kobayashi <toshihiro.kobayashi@nokia.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- */
-
-#ifndef ASM_ARCH_DSP_COMMON_H
-#define ASM_ARCH_DSP_COMMON_H
-
-#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_OMAP_MMU_FWK)
-extern void omap_dsp_request_mpui(void);
-extern void omap_dsp_release_mpui(void);
-extern int omap_dsp_request_mem(void);
-extern int omap_dsp_release_mem(void);
-#else
-static inline int omap_dsp_request_mem(void)
-{
- return 0;
-}
-#define omap_dsp_release_mem() do {} while (0)
-#endif
-
-#endif /* ASM_ARCH_DSP_COMMON_H */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 12/33] Removing dead OMAP_STI
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
@ 2010-06-30 15:57 ` Christoph Egger
2010-06-30 15:54 ` [PATCH 03/33] Removing dead OMAP_MUX_ERRORS Christoph Egger
` (36 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:57 UTC (permalink / raw)
To: Tony Lindgren, Russell King, Cory Maccarrone, Felipe Balbi,
Madhusudhan Chikkature, Andrew Morton, Dmitry Kasatkin,
Herbert Xu, linux-omap, linux-arm-kernel, linux-kernel
Cc: vamos
OMAP_STI doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap1/devices.c | 35 -------------------------
arch/arm/mach-omap2/devices.c | 57 -----------------------------------------
2 files changed, 0 insertions(+), 92 deletions(-)
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index c00d602..aa07256 100644
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -193,42 +193,7 @@ static inline void omap_init_spi100k(void)
/*-------------------------------------------------------------------------*/
-#if defined(CONFIG_OMAP_STI)
-
-#define OMAP1_STI_BASE 0xfffea000
-#define OMAP1_STI_CHANNEL_BASE (OMAP1_STI_BASE + 0x400)
-
-static struct resource sti_resources[] = {
- {
- .start = OMAP1_STI_BASE,
- .end = OMAP1_STI_BASE + SZ_1K - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = OMAP1_STI_CHANNEL_BASE,
- .end = OMAP1_STI_CHANNEL_BASE + SZ_1K - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = INT_1610_STI,
- .flags = IORESOURCE_IRQ,
- }
-};
-
-static struct platform_device sti_device = {
- .name = "sti",
- .id = -1,
- .num_resources = ARRAY_SIZE(sti_resources),
- .resource = sti_resources,
-};
-
-static inline void omap_init_sti(void)
-{
- platform_device_register(&sti_device);
-}
-#else
static inline void omap_init_sti(void) {}
-#endif
/*-------------------------------------------------------------------------*/
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 03e6c9e..b9c1f98 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -230,64 +230,7 @@ static inline void omap_init_mbox(void)
static inline void omap_init_mbox(void) { }
#endif /* CONFIG_OMAP_MBOX_FWK */
-#if defined(CONFIG_OMAP_STI)
-
-#if defined(CONFIG_ARCH_OMAP2)
-
-#define OMAP2_STI_BASE 0x48068000
-#define OMAP2_STI_CHANNEL_BASE 0x54000000
-#define OMAP2_STI_IRQ 4
-
-static struct resource sti_resources[] = {
- {
- .start = OMAP2_STI_BASE,
- .end = OMAP2_STI_BASE + 0x7ff,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = OMAP2_STI_CHANNEL_BASE,
- .end = OMAP2_STI_CHANNEL_BASE + SZ_64K - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = OMAP2_STI_IRQ,
- .flags = IORESOURCE_IRQ,
- }
-};
-#elif defined(CONFIG_ARCH_OMAP3)
-
-#define OMAP3_SDTI_BASE 0x54500000
-#define OMAP3_SDTI_CHANNEL_BASE 0x54600000
-
-static struct resource sti_resources[] = {
- {
- .start = OMAP3_SDTI_BASE,
- .end = OMAP3_SDTI_BASE + 0xFFF,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = OMAP3_SDTI_CHANNEL_BASE,
- .end = OMAP3_SDTI_CHANNEL_BASE + SZ_1M - 1,
- .flags = IORESOURCE_MEM,
- }
-};
-
-#endif
-
-static struct platform_device sti_device = {
- .name = "sti",
- .id = -1,
- .num_resources = ARRAY_SIZE(sti_resources),
- .resource = sti_resources,
-};
-
-static inline void omap_init_sti(void)
-{
- platform_device_register(&sti_device);
-}
-#else
static inline void omap_init_sti(void) {}
-#endif
#if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE)
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 12/33] Removing dead OMAP_STI
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
` (12 preceding siblings ...)
2010-06-30 15:57 ` Christoph Egger
@ 2010-06-30 15:57 ` Christoph Egger
2010-06-30 15:57 ` Christoph Egger
` (23 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:57 UTC (permalink / raw)
To: Tony Lindgren, Russell King, Cory Maccarrone, Felipe Balbi,
Madhusudhan Chikkature
Cc: vamos
OMAP_STI doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap1/devices.c | 35 -------------------------
arch/arm/mach-omap2/devices.c | 57 -----------------------------------------
2 files changed, 0 insertions(+), 92 deletions(-)
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index c00d602..aa07256 100644
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -193,42 +193,7 @@ static inline void omap_init_spi100k(void)
/*-------------------------------------------------------------------------*/
-#if defined(CONFIG_OMAP_STI)
-
-#define OMAP1_STI_BASE 0xfffea000
-#define OMAP1_STI_CHANNEL_BASE (OMAP1_STI_BASE + 0x400)
-
-static struct resource sti_resources[] = {
- {
- .start = OMAP1_STI_BASE,
- .end = OMAP1_STI_BASE + SZ_1K - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = OMAP1_STI_CHANNEL_BASE,
- .end = OMAP1_STI_CHANNEL_BASE + SZ_1K - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = INT_1610_STI,
- .flags = IORESOURCE_IRQ,
- }
-};
-
-static struct platform_device sti_device = {
- .name = "sti",
- .id = -1,
- .num_resources = ARRAY_SIZE(sti_resources),
- .resource = sti_resources,
-};
-
-static inline void omap_init_sti(void)
-{
- platform_device_register(&sti_device);
-}
-#else
static inline void omap_init_sti(void) {}
-#endif
/*-------------------------------------------------------------------------*/
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 03e6c9e..b9c1f98 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -230,64 +230,7 @@ static inline void omap_init_mbox(void)
static inline void omap_init_mbox(void) { }
#endif /* CONFIG_OMAP_MBOX_FWK */
-#if defined(CONFIG_OMAP_STI)
-
-#if defined(CONFIG_ARCH_OMAP2)
-
-#define OMAP2_STI_BASE 0x48068000
-#define OMAP2_STI_CHANNEL_BASE 0x54000000
-#define OMAP2_STI_IRQ 4
-
-static struct resource sti_resources[] = {
- {
- .start = OMAP2_STI_BASE,
- .end = OMAP2_STI_BASE + 0x7ff,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = OMAP2_STI_CHANNEL_BASE,
- .end = OMAP2_STI_CHANNEL_BASE + SZ_64K - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = OMAP2_STI_IRQ,
- .flags = IORESOURCE_IRQ,
- }
-};
-#elif defined(CONFIG_ARCH_OMAP3)
-
-#define OMAP3_SDTI_BASE 0x54500000
-#define OMAP3_SDTI_CHANNEL_BASE 0x54600000
-
-static struct resource sti_resources[] = {
- {
- .start = OMAP3_SDTI_BASE,
- .end = OMAP3_SDTI_BASE + 0xFFF,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = OMAP3_SDTI_CHANNEL_BASE,
- .end = OMAP3_SDTI_CHANNEL_BASE + SZ_1M - 1,
- .flags = IORESOURCE_MEM,
- }
-};
-
-#endif
-
-static struct platform_device sti_device = {
- .name = "sti",
- .id = -1,
- .num_resources = ARRAY_SIZE(sti_resources),
- .resource = sti_resources,
-};
-
-static inline void omap_init_sti(void)
-{
- platform_device_register(&sti_device);
-}
-#else
static inline void omap_init_sti(void) {}
-#endif
#if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE)
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 12/33] Removing dead OMAP_STI
@ 2010-06-30 15:57 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:57 UTC (permalink / raw)
To: linux-arm-kernel
OMAP_STI doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap1/devices.c | 35 -------------------------
arch/arm/mach-omap2/devices.c | 57 -----------------------------------------
2 files changed, 0 insertions(+), 92 deletions(-)
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index c00d602..aa07256 100644
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -193,42 +193,7 @@ static inline void omap_init_spi100k(void)
/*-------------------------------------------------------------------------*/
-#if defined(CONFIG_OMAP_STI)
-
-#define OMAP1_STI_BASE 0xfffea000
-#define OMAP1_STI_CHANNEL_BASE (OMAP1_STI_BASE + 0x400)
-
-static struct resource sti_resources[] = {
- {
- .start = OMAP1_STI_BASE,
- .end = OMAP1_STI_BASE + SZ_1K - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = OMAP1_STI_CHANNEL_BASE,
- .end = OMAP1_STI_CHANNEL_BASE + SZ_1K - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = INT_1610_STI,
- .flags = IORESOURCE_IRQ,
- }
-};
-
-static struct platform_device sti_device = {
- .name = "sti",
- .id = -1,
- .num_resources = ARRAY_SIZE(sti_resources),
- .resource = sti_resources,
-};
-
-static inline void omap_init_sti(void)
-{
- platform_device_register(&sti_device);
-}
-#else
static inline void omap_init_sti(void) {}
-#endif
/*-------------------------------------------------------------------------*/
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 03e6c9e..b9c1f98 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -230,64 +230,7 @@ static inline void omap_init_mbox(void)
static inline void omap_init_mbox(void) { }
#endif /* CONFIG_OMAP_MBOX_FWK */
-#if defined(CONFIG_OMAP_STI)
-
-#if defined(CONFIG_ARCH_OMAP2)
-
-#define OMAP2_STI_BASE 0x48068000
-#define OMAP2_STI_CHANNEL_BASE 0x54000000
-#define OMAP2_STI_IRQ 4
-
-static struct resource sti_resources[] = {
- {
- .start = OMAP2_STI_BASE,
- .end = OMAP2_STI_BASE + 0x7ff,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = OMAP2_STI_CHANNEL_BASE,
- .end = OMAP2_STI_CHANNEL_BASE + SZ_64K - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = OMAP2_STI_IRQ,
- .flags = IORESOURCE_IRQ,
- }
-};
-#elif defined(CONFIG_ARCH_OMAP3)
-
-#define OMAP3_SDTI_BASE 0x54500000
-#define OMAP3_SDTI_CHANNEL_BASE 0x54600000
-
-static struct resource sti_resources[] = {
- {
- .start = OMAP3_SDTI_BASE,
- .end = OMAP3_SDTI_BASE + 0xFFF,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = OMAP3_SDTI_CHANNEL_BASE,
- .end = OMAP3_SDTI_CHANNEL_BASE + SZ_1M - 1,
- .flags = IORESOURCE_MEM,
- }
-};
-
-#endif
-
-static struct platform_device sti_device = {
- .name = "sti",
- .id = -1,
- .num_resources = ARRAY_SIZE(sti_resources),
- .resource = sti_resources,
-};
-
-static inline void omap_init_sti(void)
-{
- platform_device_register(&sti_device);
-}
-#else
static inline void omap_init_sti(void) {}
-#endif
#if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE)
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 13/33] Replacing LEDS_OMAP_DEBUG with OMAP_DEBUG_LEDS
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
2010-06-30 15:53 ` Christoph Egger
@ 2010-06-30 15:58 ` Christoph Egger
2010-06-30 15:54 ` Christoph Egger
` (35 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:58 UTC (permalink / raw)
To: Tony Lindgren, Russell King, Paul Walmsley, Kevin Hilman,
Tero Kristo, Hiroshi DOYU, Pavel Machek, Andrew Morton,
Magnus Damm, Alexey Dobriyan, linux-omap, linux-arm-kernel,
linux-kernel
Cc: vamos
LEDS_OMAP_DEBUG doesn't exist in Kconfig, therefore replacing all
references for it with OMAP_DEBUG_LEDS from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/plat-omap/Kconfig | 2 +-
arch/arm/plat-omap/debug-leds.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index 78b49a6..a5337c8 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -51,7 +51,7 @@ config OMAP_DEBUG_DEVICES
config OMAP_DEBUG_LEDS
bool
depends on OMAP_DEBUG_DEVICES
- default y if LEDS || LEDS_OMAP_DEBUG
+ default y if LEDS
config OMAP_RESET_CLOCKS
bool "Reset unused clocks during boot"
diff --git a/arch/arm/plat-omap/debug-leds.c b/arch/arm/plat-omap/debug-leds.c
index 53fcef7..fc05b10 100644
--- a/arch/arm/plat-omap/debug-leds.c
+++ b/arch/arm/plat-omap/debug-leds.c
@@ -39,7 +39,7 @@ static struct h2p2_dbg_fpga __iomem *fpga;
static u16 led_state, hw_led_state;
-#ifdef CONFIG_LEDS_OMAP_DEBUG
+#ifdef CONFIG_OMAP_DEBUG_LEDS
#define new_led_api() 1
#else
#define new_led_api() 0
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 13/33] Replacing LEDS_OMAP_DEBUG with OMAP_DEBUG_LEDS
@ 2010-06-30 15:58 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:58 UTC (permalink / raw)
To: Tony Lindgren, Russell King, Paul Walmsley, Kevin Hilman, Tero Kristo
Cc: vamos
LEDS_OMAP_DEBUG doesn't exist in Kconfig, therefore replacing all
references for it with OMAP_DEBUG_LEDS from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/plat-omap/Kconfig | 2 +-
arch/arm/plat-omap/debug-leds.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index 78b49a6..a5337c8 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -51,7 +51,7 @@ config OMAP_DEBUG_DEVICES
config OMAP_DEBUG_LEDS
bool
depends on OMAP_DEBUG_DEVICES
- default y if LEDS || LEDS_OMAP_DEBUG
+ default y if LEDS
config OMAP_RESET_CLOCKS
bool "Reset unused clocks during boot"
diff --git a/arch/arm/plat-omap/debug-leds.c b/arch/arm/plat-omap/debug-leds.c
index 53fcef7..fc05b10 100644
--- a/arch/arm/plat-omap/debug-leds.c
+++ b/arch/arm/plat-omap/debug-leds.c
@@ -39,7 +39,7 @@ static struct h2p2_dbg_fpga __iomem *fpga;
static u16 led_state, hw_led_state;
-#ifdef CONFIG_LEDS_OMAP_DEBUG
+#ifdef CONFIG_OMAP_DEBUG_LEDS
#define new_led_api() 1
#else
#define new_led_api() 0
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 13/33] Replacing LEDS_OMAP_DEBUG with OMAP_DEBUG_LEDS
@ 2010-06-30 15:58 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:58 UTC (permalink / raw)
To: linux-arm-kernel
LEDS_OMAP_DEBUG doesn't exist in Kconfig, therefore replacing all
references for it with OMAP_DEBUG_LEDS from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/plat-omap/Kconfig | 2 +-
arch/arm/plat-omap/debug-leds.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index 78b49a6..a5337c8 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -51,7 +51,7 @@ config OMAP_DEBUG_DEVICES
config OMAP_DEBUG_LEDS
bool
depends on OMAP_DEBUG_DEVICES
- default y if LEDS || LEDS_OMAP_DEBUG
+ default y if LEDS
config OMAP_RESET_CLOCKS
bool "Reset unused clocks during boot"
diff --git a/arch/arm/plat-omap/debug-leds.c b/arch/arm/plat-omap/debug-leds.c
index 53fcef7..fc05b10 100644
--- a/arch/arm/plat-omap/debug-leds.c
+++ b/arch/arm/plat-omap/debug-leds.c
@@ -39,7 +39,7 @@ static struct h2p2_dbg_fpga __iomem *fpga;
static u16 led_state, hw_led_state;
-#ifdef CONFIG_LEDS_OMAP_DEBUG
+#ifdef CONFIG_OMAP_DEBUG_LEDS
#define new_led_api() 1
#else
#define new_led_api() 0
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 14/33] Removing dead SDMA_IRAM
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
@ 2010-06-30 15:58 ` Christoph Egger
2010-06-30 15:54 ` [PATCH 03/33] Removing dead OMAP_MUX_ERRORS Christoph Egger
` (36 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:58 UTC (permalink / raw)
To: Sascha Hauer, Russell King, Amit Kucheria, linux-arm-kernel,
linux-kernel
Cc: vamos
SDMA_IRAM doesn't exist in Kconfig, therefore removing all references
for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/plat-mxc/include/mach/mx51.h | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/arch/arm/plat-mxc/include/mach/mx51.h b/arch/arm/plat-mxc/include/mach/mx51.h
index 5aad344..fd5ec07 100644
--- a/arch/arm/plat-mxc/include/mach/mx51.h
+++ b/arch/arm/plat-mxc/include/mach/mx51.h
@@ -149,11 +149,7 @@
#define MX51_MXC_DMA_CHANNEL_SSI1_RX MXC_DMA_DYNAMIC_CHANNEL
#define MX51_MXC_DMA_CHANNEL_SSI1_TX MXC_DMA_DYNAMIC_CHANNEL
#define MX51_MXC_DMA_CHANNEL_SSI2_RX MXC_DMA_DYNAMIC_CHANNEL
-#ifdef CONFIG_SDMA_IRAM
-#define MX51_MXC_DMA_CHANNEL_SSI2_TX (MX51_MXC_DMA_CHANNEL_IRAM + 1)
-#else /*CONFIG_SDMA_IRAM */
#define MX51_MXC_DMA_CHANNEL_SSI2_TX MXC_DMA_DYNAMIC_CHANNEL
-#endif /*CONFIG_SDMA_IRAM */
#define MX51_MXC_DMA_CHANNEL_CSPI1_RX MXC_DMA_DYNAMIC_CHANNEL
#define MX51_MXC_DMA_CHANNEL_CSPI1_TX MXC_DMA_DYNAMIC_CHANNEL
#define MX51_MXC_DMA_CHANNEL_CSPI2_RX MXC_DMA_DYNAMIC_CHANNEL
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 14/33] Removing dead SDMA_IRAM
@ 2010-06-30 15:58 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:58 UTC (permalink / raw)
To: linux-arm-kernel
SDMA_IRAM doesn't exist in Kconfig, therefore removing all references
for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/plat-mxc/include/mach/mx51.h | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/arch/arm/plat-mxc/include/mach/mx51.h b/arch/arm/plat-mxc/include/mach/mx51.h
index 5aad344..fd5ec07 100644
--- a/arch/arm/plat-mxc/include/mach/mx51.h
+++ b/arch/arm/plat-mxc/include/mach/mx51.h
@@ -149,11 +149,7 @@
#define MX51_MXC_DMA_CHANNEL_SSI1_RX MXC_DMA_DYNAMIC_CHANNEL
#define MX51_MXC_DMA_CHANNEL_SSI1_TX MXC_DMA_DYNAMIC_CHANNEL
#define MX51_MXC_DMA_CHANNEL_SSI2_RX MXC_DMA_DYNAMIC_CHANNEL
-#ifdef CONFIG_SDMA_IRAM
-#define MX51_MXC_DMA_CHANNEL_SSI2_TX (MX51_MXC_DMA_CHANNEL_IRAM + 1)
-#else /*CONFIG_SDMA_IRAM */
#define MX51_MXC_DMA_CHANNEL_SSI2_TX MXC_DMA_DYNAMIC_CHANNEL
-#endif /*CONFIG_SDMA_IRAM */
#define MX51_MXC_DMA_CHANNEL_CSPI1_RX MXC_DMA_DYNAMIC_CHANNEL
#define MX51_MXC_DMA_CHANNEL_CSPI1_TX MXC_DMA_DYNAMIC_CHANNEL
#define MX51_MXC_DMA_CHANNEL_CSPI2_RX MXC_DMA_DYNAMIC_CHANNEL
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 15/33] Removing dead PROCESSOR_NS9750
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
@ 2010-06-30 15:58 ` Christoph Egger
2010-06-30 15:54 ` [PATCH 03/33] Removing dead OMAP_MUX_ERRORS Christoph Egger
` (36 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:58 UTC (permalink / raw)
To: Russell King, linux-arm-kernel, linux-kernel; +Cc: vamos
PROCESSOR_NS9750 doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-ns9xxx/gpio.c | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-ns9xxx/gpio.c b/arch/arm/mach-ns9xxx/gpio.c
index 5503ca0..58f4f50 100644
--- a/arch/arm/mach-ns9xxx/gpio.c
+++ b/arch/arm/mach-ns9xxx/gpio.c
@@ -25,9 +25,6 @@
#if defined(CONFIG_PROCESSOR_NS9360)
#define GPIO_MAX 72
-#elif defined(CONFIG_PROCESSOR_NS9750)
-#define GPIO_MAX 49
-#endif
/* protects BBU_GCONFx and BBU_GCTRLx */
static spinlock_t gpio_lock = __SPIN_LOCK_UNLOCKED(gpio_lock);
@@ -42,11 +39,6 @@ static inline int ns9xxx_valid_gpio(unsigned gpio)
return gpio <= 72;
else
#endif
-#if defined(CONFIG_PROCESSOR_NS9750)
- if (processor_is_ns9750())
- return gpio <= 49;
- else
-#endif
{
BUG();
return 0;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 15/33] Removing dead PROCESSOR_NS9750
@ 2010-06-30 15:58 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:58 UTC (permalink / raw)
To: linux-arm-kernel
PROCESSOR_NS9750 doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-ns9xxx/gpio.c | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-ns9xxx/gpio.c b/arch/arm/mach-ns9xxx/gpio.c
index 5503ca0..58f4f50 100644
--- a/arch/arm/mach-ns9xxx/gpio.c
+++ b/arch/arm/mach-ns9xxx/gpio.c
@@ -25,9 +25,6 @@
#if defined(CONFIG_PROCESSOR_NS9360)
#define GPIO_MAX 72
-#elif defined(CONFIG_PROCESSOR_NS9750)
-#define GPIO_MAX 49
-#endif
/* protects BBU_GCONFx and BBU_GCTRLx */
static spinlock_t gpio_lock = __SPIN_LOCK_UNLOCKED(gpio_lock);
@@ -42,11 +39,6 @@ static inline int ns9xxx_valid_gpio(unsigned gpio)
return gpio <= 72;
else
#endif
-#if defined(CONFIG_PROCESSOR_NS9750)
- if (processor_is_ns9750())
- return gpio <= 49;
- else
-#endif
{
BUG();
return 0;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 16/33] Removing dead APM
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
@ 2010-06-30 15:59 ` Christoph Egger
2010-06-30 15:54 ` [PATCH 03/33] Removing dead OMAP_MUX_ERRORS Christoph Egger
` (36 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:59 UTC (permalink / raw)
To: Tony Lindgren, Russell King, Kalle Valo, Ladislav Michl,
Janusz Krzysztofik, Kevin Hilman, linux-omap, linux-arm-kernel,
linux-kernel
Cc: vamos
APM doesn't exist in Kconfig, therefore removing all references for it
from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap1/board-palmte.c | 84 ------------------------------------
1 files changed, 0 insertions(+), 84 deletions(-)
diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c
index 569b4c9..23bb0c9 100644
--- a/arch/arm/mach-omap1/board-palmte.c
+++ b/arch/arm/mach-omap1/board-palmte.c
@@ -213,90 +213,6 @@ static struct omap_lcd_config palmte_lcd_config __initdata = {
.ctrl_name = "internal",
};
-#ifdef CONFIG_APM
-/*
- * Values measured in 10 minute intervals averaged over 10 samples.
- * May differ slightly from device to device but should be accurate
- * enough to give basic idea of battery life left and trigger
- * potential alerts.
- */
-static const int palmte_battery_sample[] = {
- 2194, 2157, 2138, 2120,
- 2104, 2089, 2075, 2061,
- 2048, 2038, 2026, 2016,
- 2008, 1998, 1989, 1980,
- 1970, 1958, 1945, 1928,
- 1910, 1888, 1860, 1827,
- 1791, 1751, 1709, 1656,
-};
-
-#define INTERVAL 10
-#define BATTERY_HIGH_TRESHOLD 66
-#define BATTERY_LOW_TRESHOLD 33
-
-static void palmte_get_power_status(struct apm_power_info *info, int *battery)
-{
- int charging, batt, hi, lo, mid;
-
- charging = !gpio_get_value(PALMTE_DC_GPIO);
- batt = battery[0];
- if (charging)
- batt -= 60;
-
- hi = ARRAY_SIZE(palmte_battery_sample);
- lo = 0;
-
- info->battery_flag = 0;
- info->units = APM_UNITS_MINS;
-
- if (batt > palmte_battery_sample[lo]) {
- info->battery_life = 100;
- info->time = INTERVAL * ARRAY_SIZE(palmte_battery_sample);
- } else if (batt <= palmte_battery_sample[hi - 1]) {
- info->battery_life = 0;
- info->time = 0;
- } else {
- while (hi > lo + 1) {
- mid = (hi + lo) >> 1;
- if (batt <= palmte_battery_sample[mid])
- lo = mid;
- else
- hi = mid;
- }
-
- mid = palmte_battery_sample[lo] - palmte_battery_sample[hi];
- hi = palmte_battery_sample[lo] - batt;
- info->battery_life = 100 - (100 * lo + 100 * hi / mid) /
- ARRAY_SIZE(palmte_battery_sample);
- info->time = INTERVAL * (ARRAY_SIZE(palmte_battery_sample) -
- lo) - INTERVAL * hi / mid;
- }
-
- if (charging) {
- info->ac_line_status = APM_AC_ONLINE;
- info->battery_status = APM_BATTERY_STATUS_CHARGING;
- info->battery_flag |= APM_BATTERY_FLAG_CHARGING;
- } else {
- info->ac_line_status = APM_AC_OFFLINE;
- if (info->battery_life > BATTERY_HIGH_TRESHOLD)
- info->battery_status = APM_BATTERY_STATUS_HIGH;
- else if (info->battery_life > BATTERY_LOW_TRESHOLD)
- info->battery_status = APM_BATTERY_STATUS_LOW;
- else
- info->battery_status = APM_BATTERY_STATUS_CRITICAL;
- }
-
- if (info->battery_life > BATTERY_HIGH_TRESHOLD)
- info->battery_flag |= APM_BATTERY_FLAG_HIGH;
- else if (info->battery_life > BATTERY_LOW_TRESHOLD)
- info->battery_flag |= APM_BATTERY_FLAG_LOW;
- else
- info->battery_flag |= APM_BATTERY_FLAG_CRITICAL;
-}
-#else
-#define palmte_get_power_status NULL
-#endif
-
static struct omap_board_config_kernel palmte_config[] __initdata = {
{ OMAP_TAG_LCD, &palmte_lcd_config },
};
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 16/33] Removing dead APM
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
` (18 preceding siblings ...)
2010-06-30 15:59 ` Christoph Egger
@ 2010-06-30 15:59 ` Christoph Egger
2010-06-30 15:59 ` Christoph Egger
` (17 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:59 UTC (permalink / raw)
To: Tony Lindgren, Russell King, Kalle Valo, Ladislav Michl,
Janusz Krzysztofik
Cc: vamos
APM doesn't exist in Kconfig, therefore removing all references for it
from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap1/board-palmte.c | 84 ------------------------------------
1 files changed, 0 insertions(+), 84 deletions(-)
diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c
index 569b4c9..23bb0c9 100644
--- a/arch/arm/mach-omap1/board-palmte.c
+++ b/arch/arm/mach-omap1/board-palmte.c
@@ -213,90 +213,6 @@ static struct omap_lcd_config palmte_lcd_config __initdata = {
.ctrl_name = "internal",
};
-#ifdef CONFIG_APM
-/*
- * Values measured in 10 minute intervals averaged over 10 samples.
- * May differ slightly from device to device but should be accurate
- * enough to give basic idea of battery life left and trigger
- * potential alerts.
- */
-static const int palmte_battery_sample[] = {
- 2194, 2157, 2138, 2120,
- 2104, 2089, 2075, 2061,
- 2048, 2038, 2026, 2016,
- 2008, 1998, 1989, 1980,
- 1970, 1958, 1945, 1928,
- 1910, 1888, 1860, 1827,
- 1791, 1751, 1709, 1656,
-};
-
-#define INTERVAL 10
-#define BATTERY_HIGH_TRESHOLD 66
-#define BATTERY_LOW_TRESHOLD 33
-
-static void palmte_get_power_status(struct apm_power_info *info, int *battery)
-{
- int charging, batt, hi, lo, mid;
-
- charging = !gpio_get_value(PALMTE_DC_GPIO);
- batt = battery[0];
- if (charging)
- batt -= 60;
-
- hi = ARRAY_SIZE(palmte_battery_sample);
- lo = 0;
-
- info->battery_flag = 0;
- info->units = APM_UNITS_MINS;
-
- if (batt > palmte_battery_sample[lo]) {
- info->battery_life = 100;
- info->time = INTERVAL * ARRAY_SIZE(palmte_battery_sample);
- } else if (batt <= palmte_battery_sample[hi - 1]) {
- info->battery_life = 0;
- info->time = 0;
- } else {
- while (hi > lo + 1) {
- mid = (hi + lo) >> 1;
- if (batt <= palmte_battery_sample[mid])
- lo = mid;
- else
- hi = mid;
- }
-
- mid = palmte_battery_sample[lo] - palmte_battery_sample[hi];
- hi = palmte_battery_sample[lo] - batt;
- info->battery_life = 100 - (100 * lo + 100 * hi / mid) /
- ARRAY_SIZE(palmte_battery_sample);
- info->time = INTERVAL * (ARRAY_SIZE(palmte_battery_sample) -
- lo) - INTERVAL * hi / mid;
- }
-
- if (charging) {
- info->ac_line_status = APM_AC_ONLINE;
- info->battery_status = APM_BATTERY_STATUS_CHARGING;
- info->battery_flag |= APM_BATTERY_FLAG_CHARGING;
- } else {
- info->ac_line_status = APM_AC_OFFLINE;
- if (info->battery_life > BATTERY_HIGH_TRESHOLD)
- info->battery_status = APM_BATTERY_STATUS_HIGH;
- else if (info->battery_life > BATTERY_LOW_TRESHOLD)
- info->battery_status = APM_BATTERY_STATUS_LOW;
- else
- info->battery_status = APM_BATTERY_STATUS_CRITICAL;
- }
-
- if (info->battery_life > BATTERY_HIGH_TRESHOLD)
- info->battery_flag |= APM_BATTERY_FLAG_HIGH;
- else if (info->battery_life > BATTERY_LOW_TRESHOLD)
- info->battery_flag |= APM_BATTERY_FLAG_LOW;
- else
- info->battery_flag |= APM_BATTERY_FLAG_CRITICAL;
-}
-#else
-#define palmte_get_power_status NULL
-#endif
-
static struct omap_board_config_kernel palmte_config[] __initdata = {
{ OMAP_TAG_LCD, &palmte_lcd_config },
};
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 16/33] Removing dead APM
@ 2010-06-30 15:59 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:59 UTC (permalink / raw)
To: linux-arm-kernel
APM doesn't exist in Kconfig, therefore removing all references for it
from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap1/board-palmte.c | 84 ------------------------------------
1 files changed, 0 insertions(+), 84 deletions(-)
diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c
index 569b4c9..23bb0c9 100644
--- a/arch/arm/mach-omap1/board-palmte.c
+++ b/arch/arm/mach-omap1/board-palmte.c
@@ -213,90 +213,6 @@ static struct omap_lcd_config palmte_lcd_config __initdata = {
.ctrl_name = "internal",
};
-#ifdef CONFIG_APM
-/*
- * Values measured in 10 minute intervals averaged over 10 samples.
- * May differ slightly from device to device but should be accurate
- * enough to give basic idea of battery life left and trigger
- * potential alerts.
- */
-static const int palmte_battery_sample[] = {
- 2194, 2157, 2138, 2120,
- 2104, 2089, 2075, 2061,
- 2048, 2038, 2026, 2016,
- 2008, 1998, 1989, 1980,
- 1970, 1958, 1945, 1928,
- 1910, 1888, 1860, 1827,
- 1791, 1751, 1709, 1656,
-};
-
-#define INTERVAL 10
-#define BATTERY_HIGH_TRESHOLD 66
-#define BATTERY_LOW_TRESHOLD 33
-
-static void palmte_get_power_status(struct apm_power_info *info, int *battery)
-{
- int charging, batt, hi, lo, mid;
-
- charging = !gpio_get_value(PALMTE_DC_GPIO);
- batt = battery[0];
- if (charging)
- batt -= 60;
-
- hi = ARRAY_SIZE(palmte_battery_sample);
- lo = 0;
-
- info->battery_flag = 0;
- info->units = APM_UNITS_MINS;
-
- if (batt > palmte_battery_sample[lo]) {
- info->battery_life = 100;
- info->time = INTERVAL * ARRAY_SIZE(palmte_battery_sample);
- } else if (batt <= palmte_battery_sample[hi - 1]) {
- info->battery_life = 0;
- info->time = 0;
- } else {
- while (hi > lo + 1) {
- mid = (hi + lo) >> 1;
- if (batt <= palmte_battery_sample[mid])
- lo = mid;
- else
- hi = mid;
- }
-
- mid = palmte_battery_sample[lo] - palmte_battery_sample[hi];
- hi = palmte_battery_sample[lo] - batt;
- info->battery_life = 100 - (100 * lo + 100 * hi / mid) /
- ARRAY_SIZE(palmte_battery_sample);
- info->time = INTERVAL * (ARRAY_SIZE(palmte_battery_sample) -
- lo) - INTERVAL * hi / mid;
- }
-
- if (charging) {
- info->ac_line_status = APM_AC_ONLINE;
- info->battery_status = APM_BATTERY_STATUS_CHARGING;
- info->battery_flag |= APM_BATTERY_FLAG_CHARGING;
- } else {
- info->ac_line_status = APM_AC_OFFLINE;
- if (info->battery_life > BATTERY_HIGH_TRESHOLD)
- info->battery_status = APM_BATTERY_STATUS_HIGH;
- else if (info->battery_life > BATTERY_LOW_TRESHOLD)
- info->battery_status = APM_BATTERY_STATUS_LOW;
- else
- info->battery_status = APM_BATTERY_STATUS_CRITICAL;
- }
-
- if (info->battery_life > BATTERY_HIGH_TRESHOLD)
- info->battery_flag |= APM_BATTERY_FLAG_HIGH;
- else if (info->battery_life > BATTERY_LOW_TRESHOLD)
- info->battery_flag |= APM_BATTERY_FLAG_LOW;
- else
- info->battery_flag |= APM_BATTERY_FLAG_CRITICAL;
-}
-#else
-#define palmte_get_power_status NULL
-#endif
-
static struct omap_board_config_kernel palmte_config[] __initdata = {
{ OMAP_TAG_LCD, &palmte_lcd_config },
};
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 17/33] Removing dead SX1_OLD_FLASH
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
2010-06-30 15:53 ` Christoph Egger
@ 2010-06-30 15:59 ` Christoph Egger
2010-06-30 15:54 ` Christoph Egger
` (35 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:59 UTC (permalink / raw)
To: Tony Lindgren, Russell King, Kalle Valo, Ladislav Michl,
Janusz Krzysztofik, Kevin Hilman, linux-omap, linux-arm-kernel,
linux-kernel
Cc: vamos
SX1_OLD_FLASH doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap1/board-sx1.c | 26 --------------------------
1 files changed, 0 insertions(+), 26 deletions(-)
diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c
index 2fb1e5f..1de809d 100644
--- a/arch/arm/mach-omap1/board-sx1.c
+++ b/arch/arm/mach-omap1/board-sx1.c
@@ -295,31 +295,6 @@ static struct physmap_flash_data sx1_flash_data = {
.nr_parts = ARRAY_SIZE(sx1_partitions),
};
-#ifdef CONFIG_SX1_OLD_FLASH
-/* MTD Intel StrataFlash - old flashes */
-static struct resource sx1_old_flash_resource[] = {
- [0] = {
- .start = OMAP_CS0_PHYS, /* Physical */
- .end = OMAP_CS0_PHYS + SZ_16M - 1,,
- .flags = IORESOURCE_MEM,
- },
- [1] = {
- .start = OMAP_CS1_PHYS,
- .end = OMAP_CS1_PHYS + SZ_8M - 1,
- .flags = IORESOURCE_MEM,
- },
-};
-
-static struct platform_device sx1_flash_device = {
- .name = "physmap-flash",
- .id = 0,
- .dev = {
- .platform_data = &sx1_flash_data,
- },
- .num_resources = 2,
- .resource = &sx1_old_flash_resource,
-};
-#else
/* MTD Intel 4000 flash - new flashes */
static struct resource sx1_new_flash_resource = {
.start = OMAP_CS0_PHYS,
@@ -336,7 +311,6 @@ static struct platform_device sx1_flash_device = {
.num_resources = 1,
.resource = &sx1_new_flash_resource,
};
-#endif
/*----------- USB -------------------------*/
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 17/33] Removing dead SX1_OLD_FLASH
@ 2010-06-30 15:59 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:59 UTC (permalink / raw)
To: Tony Lindgren, Russell King, Kalle Valo, Ladislav Michl,
Janusz Krzysztofik
Cc: vamos
SX1_OLD_FLASH doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap1/board-sx1.c | 26 --------------------------
1 files changed, 0 insertions(+), 26 deletions(-)
diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c
index 2fb1e5f..1de809d 100644
--- a/arch/arm/mach-omap1/board-sx1.c
+++ b/arch/arm/mach-omap1/board-sx1.c
@@ -295,31 +295,6 @@ static struct physmap_flash_data sx1_flash_data = {
.nr_parts = ARRAY_SIZE(sx1_partitions),
};
-#ifdef CONFIG_SX1_OLD_FLASH
-/* MTD Intel StrataFlash - old flashes */
-static struct resource sx1_old_flash_resource[] = {
- [0] = {
- .start = OMAP_CS0_PHYS, /* Physical */
- .end = OMAP_CS0_PHYS + SZ_16M - 1,,
- .flags = IORESOURCE_MEM,
- },
- [1] = {
- .start = OMAP_CS1_PHYS,
- .end = OMAP_CS1_PHYS + SZ_8M - 1,
- .flags = IORESOURCE_MEM,
- },
-};
-
-static struct platform_device sx1_flash_device = {
- .name = "physmap-flash",
- .id = 0,
- .dev = {
- .platform_data = &sx1_flash_data,
- },
- .num_resources = 2,
- .resource = &sx1_old_flash_resource,
-};
-#else
/* MTD Intel 4000 flash - new flashes */
static struct resource sx1_new_flash_resource = {
.start = OMAP_CS0_PHYS,
@@ -336,7 +311,6 @@ static struct platform_device sx1_flash_device = {
.num_resources = 1,
.resource = &sx1_new_flash_resource,
};
-#endif
/*----------- USB -------------------------*/
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 17/33] Removing dead SX1_OLD_FLASH
@ 2010-06-30 15:59 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:59 UTC (permalink / raw)
To: linux-arm-kernel
SX1_OLD_FLASH doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap1/board-sx1.c | 26 --------------------------
1 files changed, 0 insertions(+), 26 deletions(-)
diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c
index 2fb1e5f..1de809d 100644
--- a/arch/arm/mach-omap1/board-sx1.c
+++ b/arch/arm/mach-omap1/board-sx1.c
@@ -295,31 +295,6 @@ static struct physmap_flash_data sx1_flash_data = {
.nr_parts = ARRAY_SIZE(sx1_partitions),
};
-#ifdef CONFIG_SX1_OLD_FLASH
-/* MTD Intel StrataFlash - old flashes */
-static struct resource sx1_old_flash_resource[] = {
- [0] = {
- .start = OMAP_CS0_PHYS, /* Physical */
- .end = OMAP_CS0_PHYS + SZ_16M - 1,,
- .flags = IORESOURCE_MEM,
- },
- [1] = {
- .start = OMAP_CS1_PHYS,
- .end = OMAP_CS1_PHYS + SZ_8M - 1,
- .flags = IORESOURCE_MEM,
- },
-};
-
-static struct platform_device sx1_flash_device = {
- .name = "physmap-flash",
- .id = 0,
- .dev = {
- .platform_data = &sx1_flash_data,
- },
- .num_resources = 2,
- .resource = &sx1_old_flash_resource,
-};
-#else
/* MTD Intel 4000 flash - new flashes */
static struct resource sx1_new_flash_resource = {
.start = OMAP_CS0_PHYS,
@@ -336,7 +311,6 @@ static struct platform_device sx1_flash_device = {
.num_resources = 1,
.resource = &sx1_new_flash_resource,
};
-#endif
/*----------- USB -------------------------*/
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 18/33] Removing dead OMAP_ARM_96MHZ
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
2010-06-30 15:53 ` Christoph Egger
@ 2010-06-30 15:59 ` Christoph Egger
2010-06-30 15:54 ` Christoph Egger
` (35 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:59 UTC (permalink / raw)
To: Tony Lindgren, Russell King, Paul Walmsley, linux-omap,
linux-arm-kernel, linux-kernel
Cc: vamos
OMAP_ARM_96MHZ doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap1/opp_data.c | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-omap1/opp_data.c b/arch/arm/mach-omap1/opp_data.c
index 75a5465..060df86 100644
--- a/arch/arm/mach-omap1/opp_data.c
+++ b/arch/arm/mach-omap1/opp_data.c
@@ -45,9 +45,6 @@ struct mpu_rate omap1_rate_table[] = {
#if defined(CONFIG_OMAP_ARM_120MHZ)
{ 120000000, 12000000, 120000000, 0x010a, 0x2510 }, /* 1/1/1/2/4/4 */
#endif
-#if defined(CONFIG_OMAP_ARM_96MHZ)
- { 96000000, 12000000, 96000000, 0x0005, 0x2410 }, /* 1/1/1/1/2/2 */
-#endif
#if defined(CONFIG_OMAP_ARM_60MHZ)
{ 60000000, 12000000, 60000000, 0x0005, 0x2290 }, /* 1/1/1/1/2/2 */
#endif
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 18/33] Removing dead OMAP_ARM_96MHZ
@ 2010-06-30 15:59 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:59 UTC (permalink / raw)
To: Tony Lindgren, Russell King, Paul Walmsley, linux-omap,
linux-arm-kernel, linux-kernel
Cc: vamos
OMAP_ARM_96MHZ doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap1/opp_data.c | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-omap1/opp_data.c b/arch/arm/mach-omap1/opp_data.c
index 75a5465..060df86 100644
--- a/arch/arm/mach-omap1/opp_data.c
+++ b/arch/arm/mach-omap1/opp_data.c
@@ -45,9 +45,6 @@ struct mpu_rate omap1_rate_table[] = {
#if defined(CONFIG_OMAP_ARM_120MHZ)
{ 120000000, 12000000, 120000000, 0x010a, 0x2510 }, /* 1/1/1/2/4/4 */
#endif
-#if defined(CONFIG_OMAP_ARM_96MHZ)
- { 96000000, 12000000, 96000000, 0x0005, 0x2410 }, /* 1/1/1/1/2/2 */
-#endif
#if defined(CONFIG_OMAP_ARM_60MHZ)
{ 60000000, 12000000, 60000000, 0x0005, 0x2290 }, /* 1/1/1/1/2/2 */
#endif
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 18/33] Removing dead OMAP_ARM_96MHZ
@ 2010-06-30 15:59 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 15:59 UTC (permalink / raw)
To: linux-arm-kernel
OMAP_ARM_96MHZ doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap1/opp_data.c | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-omap1/opp_data.c b/arch/arm/mach-omap1/opp_data.c
index 75a5465..060df86 100644
--- a/arch/arm/mach-omap1/opp_data.c
+++ b/arch/arm/mach-omap1/opp_data.c
@@ -45,9 +45,6 @@ struct mpu_rate omap1_rate_table[] = {
#if defined(CONFIG_OMAP_ARM_120MHZ)
{ 120000000, 12000000, 120000000, 0x010a, 0x2510 }, /* 1/1/1/2/4/4 */
#endif
-#if defined(CONFIG_OMAP_ARM_96MHZ)
- { 96000000, 12000000, 96000000, 0x0005, 0x2410 }, /* 1/1/1/1/2/2 */
-#endif
#if defined(CONFIG_OMAP_ARM_60MHZ)
{ 60000000, 12000000, 60000000, 0x0005, 0x2290 }, /* 1/1/1/1/2/2 */
#endif
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 19/33] Removing dead MACH_OMAP_H4_OTG
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
@ 2010-06-30 16:00 ` Christoph Egger
2010-06-30 15:54 ` [PATCH 03/33] Removing dead OMAP_MUX_ERRORS Christoph Egger
` (36 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:00 UTC (permalink / raw)
To: Tony Lindgren, Russell King, Paul Walmsley, Kalle Valo,
Santosh Shilimkar, Ladislav Michl, linux-omap, linux-arm-kernel,
linux-kernel
Cc: vamos
MACH_OMAP_H4_OTG doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap2/board-h4.c | 17 -----------------
1 files changed, 0 insertions(+), 17 deletions(-)
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
index ce4292b..85d7fb8 100644
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@ -277,22 +277,6 @@ static struct omap_usb_config h4_usb_config __initdata = {
.pins[1] = 4,
#endif
-#ifdef CONFIG_MACH_OMAP_H4_OTG
- /* S1.10 ON -- USB OTG port
- * usb0 switched to Mini-AB port and isp1301 transceiver;
- * S2.POS3 = OFF, S2.POS4 = ON ... to allow battery charging
- */
- .otg = 1,
- .pins[0] = 4,
-#ifdef CONFIG_USB_GADGET_OMAP
- /* use OTG cable, or standard A-to-MiniB */
- .hmc_mode = 0x14, /* 0:dev/otg 1:host 2:disable */
-#elif defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
- /* use OTG cable, or NONSTANDARD (B-to-MiniB) */
- .hmc_mode = 0x11, /* 0:host 1:host 2:disable */
-#endif /* XX */
-
-#else
/* S1.10 OFF -- usb "download port"
* usb0 switched to Mini-B port and isp1105 transceiver;
* S2.POS3 = ON, S2.POS4 = OFF ... to enable battery charging
@@ -301,7 +285,6 @@ static struct omap_usb_config h4_usb_config __initdata = {
.pins[0] = 3,
/* .hmc_mode = 0x14,*/ /* 0:dev 1:host 2:disable */
.hmc_mode = 0x00, /* 0:dev|otg 1:disable 2:disable */
-#endif
};
static struct omap_board_config_kernel h4_config[] = {
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 19/33] Removing dead MACH_OMAP_H4_OTG
@ 2010-06-30 16:00 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:00 UTC (permalink / raw)
To: linux-arm-kernel
MACH_OMAP_H4_OTG doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap2/board-h4.c | 17 -----------------
1 files changed, 0 insertions(+), 17 deletions(-)
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
index ce4292b..85d7fb8 100644
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@ -277,22 +277,6 @@ static struct omap_usb_config h4_usb_config __initdata = {
.pins[1] = 4,
#endif
-#ifdef CONFIG_MACH_OMAP_H4_OTG
- /* S1.10 ON -- USB OTG port
- * usb0 switched to Mini-AB port and isp1301 transceiver;
- * S2.POS3 = OFF, S2.POS4 = ON ... to allow battery charging
- */
- .otg = 1,
- .pins[0] = 4,
-#ifdef CONFIG_USB_GADGET_OMAP
- /* use OTG cable, or standard A-to-MiniB */
- .hmc_mode = 0x14, /* 0:dev/otg 1:host 2:disable */
-#elif defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
- /* use OTG cable, or NONSTANDARD (B-to-MiniB) */
- .hmc_mode = 0x11, /* 0:host 1:host 2:disable */
-#endif /* XX */
-
-#else
/* S1.10 OFF -- usb "download port"
* usb0 switched to Mini-B port and isp1105 transceiver;
* S2.POS3 = ON, S2.POS4 = OFF ... to enable battery charging
@@ -301,7 +285,6 @@ static struct omap_usb_config h4_usb_config __initdata = {
.pins[0] = 3,
/* .hmc_mode = 0x14,*/ /* 0:dev 1:host 2:disable */
.hmc_mode = 0x00, /* 0:dev|otg 1:disable 2:disable */
-#endif
};
static struct omap_board_config_kernel h4_config[] = {
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 20/33] Removing dead MACH_OMAP2_H4_USB1
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
@ 2010-06-30 16:00 ` Christoph Egger
2010-06-30 15:54 ` [PATCH 03/33] Removing dead OMAP_MUX_ERRORS Christoph Egger
` (36 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:00 UTC (permalink / raw)
To: Tony Lindgren, Russell King, Paul Walmsley, Kalle Valo,
Santosh Shilimkar, Ladislav Michl, linux-omap, linux-arm-kernel,
linux-kernel
Cc: vamos
MACH_OMAP2_H4_USB1 doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap2/board-h4.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
index 85d7fb8..f0c2701 100644
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@ -272,11 +272,6 @@ static struct omap_lcd_config h4_lcd_config __initdata = {
};
static struct omap_usb_config h4_usb_config __initdata = {
-#ifdef CONFIG_MACH_OMAP2_H4_USB1
- /* NOTE: usb1 could also be used with 3 wire signaling */
- .pins[1] = 4,
-#endif
-
/* S1.10 OFF -- usb "download port"
* usb0 switched to Mini-B port and isp1105 transceiver;
* S2.POS3 = ON, S2.POS4 = OFF ... to enable battery charging
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 20/33] Removing dead MACH_OMAP2_H4_USB1
@ 2010-06-30 16:00 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:00 UTC (permalink / raw)
To: linux-arm-kernel
MACH_OMAP2_H4_USB1 doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap2/board-h4.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
index 85d7fb8..f0c2701 100644
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@ -272,11 +272,6 @@ static struct omap_lcd_config h4_lcd_config __initdata = {
};
static struct omap_usb_config h4_usb_config __initdata = {
-#ifdef CONFIG_MACH_OMAP2_H4_USB1
- /* NOTE: usb1 could also be used with 3 wire signaling */
- .pins[1] = 4,
-#endif
-
/* S1.10 OFF -- usb "download port"
* usb0 switched to Mini-B port and isp1105 transceiver;
* S2.POS3 = ON, S2.POS4 = OFF ... to enable battery charging
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 21/33] Removing dead OMAP2_VENC_OUT_TYPE_SVIDEO, OMAP2_VENC_OUT_TYPE_COMPOSITE
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
2010-06-30 15:53 ` Christoph Egger
@ 2010-06-30 16:00 ` Christoph Egger
2010-06-30 15:54 ` Christoph Egger
` (35 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:00 UTC (permalink / raw)
To: Tony Lindgren, Russell King, Jason Lam, linux-omap,
linux-arm-kernel, linux-kernel
Cc: vamos
OMAP2_VENC_OUT_TYPE_SVIDEO, OMAP2_VENC_OUT_TYPE_COMPOSITE doesn't
exist in Kconfig, therefore removing all references for it from the
source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap2/board-omap3stalker.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c
index f848ba8..b38afd5 100644
--- a/arch/arm/mach-omap2/board-omap3stalker.c
+++ b/arch/arm/mach-omap2/board-omap3stalker.c
@@ -181,11 +181,6 @@ static struct omap_dss_device omap3_stalker_tv_device = {
.name = "tv",
.driver_name = "venc",
.type = OMAP_DISPLAY_TYPE_VENC,
-#if defined(CONFIG_OMAP2_VENC_OUT_TYPE_SVIDEO)
- .phy.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO,
-#elif defined(CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE)
- .u.venc.type = OMAP_DSS_VENC_TYPE_COMPOSITE,
-#endif
.platform_enable = omap3_stalker_enable_tv,
.platform_disable = omap3_stalker_disable_tv,
};
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 21/33] Removing dead OMAP2_VENC_OUT_TYPE_SVIDEO, OMAP2_VENC_OUT_TYPE_COMPOSITE
@ 2010-06-30 16:00 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:00 UTC (permalink / raw)
To: Tony Lindgren, Russell King, Jason Lam, linux-omap,
linux-arm-kernel, linux-kernel
Cc: vamos
OMAP2_VENC_OUT_TYPE_SVIDEO, OMAP2_VENC_OUT_TYPE_COMPOSITE doesn't
exist in Kconfig, therefore removing all references for it from the
source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap2/board-omap3stalker.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c
index f848ba8..b38afd5 100644
--- a/arch/arm/mach-omap2/board-omap3stalker.c
+++ b/arch/arm/mach-omap2/board-omap3stalker.c
@@ -181,11 +181,6 @@ static struct omap_dss_device omap3_stalker_tv_device = {
.name = "tv",
.driver_name = "venc",
.type = OMAP_DISPLAY_TYPE_VENC,
-#if defined(CONFIG_OMAP2_VENC_OUT_TYPE_SVIDEO)
- .phy.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO,
-#elif defined(CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE)
- .u.venc.type = OMAP_DSS_VENC_TYPE_COMPOSITE,
-#endif
.platform_enable = omap3_stalker_enable_tv,
.platform_disable = omap3_stalker_disable_tv,
};
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 21/33] Removing dead OMAP2_VENC_OUT_TYPE_SVIDEO, OMAP2_VENC_OUT_TYPE_COMPOSITE
@ 2010-06-30 16:00 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:00 UTC (permalink / raw)
To: linux-arm-kernel
OMAP2_VENC_OUT_TYPE_SVIDEO, OMAP2_VENC_OUT_TYPE_COMPOSITE doesn't
exist in Kconfig, therefore removing all references for it from the
source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap2/board-omap3stalker.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c
index f848ba8..b38afd5 100644
--- a/arch/arm/mach-omap2/board-omap3stalker.c
+++ b/arch/arm/mach-omap2/board-omap3stalker.c
@@ -181,11 +181,6 @@ static struct omap_dss_device omap3_stalker_tv_device = {
.name = "tv",
.driver_name = "venc",
.type = OMAP_DISPLAY_TYPE_VENC,
-#if defined(CONFIG_OMAP2_VENC_OUT_TYPE_SVIDEO)
- .phy.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO,
-#elif defined(CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE)
- .u.venc.type = OMAP_DSS_VENC_TYPE_COMPOSITE,
-#endif
.platform_enable = omap3_stalker_enable_tv,
.platform_disable = omap3_stalker_disable_tv,
};
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 22/33] Removing dead MPU_{BRIDGE,TESLA}_IOMMU
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
2010-06-30 15:53 ` Christoph Egger
@ 2010-06-30 16:01 ` Christoph Egger
2010-06-30 15:54 ` Christoph Egger
` (35 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:01 UTC (permalink / raw)
To: Tony Lindgren, Russell King, Hari Kanigeri, Hiroshi DOYU,
linux-omap, linux-arm-kernel, linux-kernel
Cc: vamos
MPU_{BRIDGE,TESLA}_IOMMU doesn't exist in Kconfig, therefore removing
all references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap2/omap-iommu.c | 22 ----------------------
1 files changed, 0 insertions(+), 22 deletions(-)
diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c
index eb9bee7..3aa3fe9 100644
--- a/arch/arm/mach-omap2/omap-iommu.c
+++ b/arch/arm/mach-omap2/omap-iommu.c
@@ -35,17 +35,6 @@ static struct iommu_device omap3_devices[] = {
.clk_name = "cam_ick",
},
},
-#if defined(CONFIG_MPU_BRIDGE_IOMMU)
- {
- .base = 0x5d000000,
- .irq = 28,
- .pdata = {
- .name = "iva2",
- .nr_tlb_entries = 32,
- .clk_name = "iva2_ck",
- },
- },
-#endif
};
#define NR_OMAP3_IOMMU_DEVICES ARRAY_SIZE(omap3_devices)
static struct platform_device *omap3_iommu_pdev[NR_OMAP3_IOMMU_DEVICES];
@@ -66,17 +55,6 @@ static struct iommu_device omap4_devices[] = {
.clk_name = "ducati_ick",
},
},
-#if defined(CONFIG_MPU_TESLA_IOMMU)
- {
- .base = OMAP4_MMU2_BASE,
- .irq = INT_44XX_DSP_MMU,
- .pdata = {
- .name = "tesla",
- .nr_tlb_entries = 32,
- .clk_name = "tesla_ick",
- },
- },
-#endif
};
#define NR_OMAP4_IOMMU_DEVICES ARRAY_SIZE(omap4_devices)
static struct platform_device *omap4_iommu_pdev[NR_OMAP4_IOMMU_DEVICES];
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 22/33] Removing dead MPU_{BRIDGE,TESLA}_IOMMU
@ 2010-06-30 16:01 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:01 UTC (permalink / raw)
To: Tony Lindgren, Russell King, Hari Kanigeri, Hiroshi DOYU, linux-omap
Cc: vamos
MPU_{BRIDGE,TESLA}_IOMMU doesn't exist in Kconfig, therefore removing
all references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap2/omap-iommu.c | 22 ----------------------
1 files changed, 0 insertions(+), 22 deletions(-)
diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c
index eb9bee7..3aa3fe9 100644
--- a/arch/arm/mach-omap2/omap-iommu.c
+++ b/arch/arm/mach-omap2/omap-iommu.c
@@ -35,17 +35,6 @@ static struct iommu_device omap3_devices[] = {
.clk_name = "cam_ick",
},
},
-#if defined(CONFIG_MPU_BRIDGE_IOMMU)
- {
- .base = 0x5d000000,
- .irq = 28,
- .pdata = {
- .name = "iva2",
- .nr_tlb_entries = 32,
- .clk_name = "iva2_ck",
- },
- },
-#endif
};
#define NR_OMAP3_IOMMU_DEVICES ARRAY_SIZE(omap3_devices)
static struct platform_device *omap3_iommu_pdev[NR_OMAP3_IOMMU_DEVICES];
@@ -66,17 +55,6 @@ static struct iommu_device omap4_devices[] = {
.clk_name = "ducati_ick",
},
},
-#if defined(CONFIG_MPU_TESLA_IOMMU)
- {
- .base = OMAP4_MMU2_BASE,
- .irq = INT_44XX_DSP_MMU,
- .pdata = {
- .name = "tesla",
- .nr_tlb_entries = 32,
- .clk_name = "tesla_ick",
- },
- },
-#endif
};
#define NR_OMAP4_IOMMU_DEVICES ARRAY_SIZE(omap4_devices)
static struct platform_device *omap4_iommu_pdev[NR_OMAP4_IOMMU_DEVICES];
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 22/33] Removing dead MPU_{BRIDGE,TESLA}_IOMMU
@ 2010-06-30 16:01 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:01 UTC (permalink / raw)
To: linux-arm-kernel
MPU_{BRIDGE,TESLA}_IOMMU doesn't exist in Kconfig, therefore removing
all references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap2/omap-iommu.c | 22 ----------------------
1 files changed, 0 insertions(+), 22 deletions(-)
diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c
index eb9bee7..3aa3fe9 100644
--- a/arch/arm/mach-omap2/omap-iommu.c
+++ b/arch/arm/mach-omap2/omap-iommu.c
@@ -35,17 +35,6 @@ static struct iommu_device omap3_devices[] = {
.clk_name = "cam_ick",
},
},
-#if defined(CONFIG_MPU_BRIDGE_IOMMU)
- {
- .base = 0x5d000000,
- .irq = 28,
- .pdata = {
- .name = "iva2",
- .nr_tlb_entries = 32,
- .clk_name = "iva2_ck",
- },
- },
-#endif
};
#define NR_OMAP3_IOMMU_DEVICES ARRAY_SIZE(omap3_devices)
static struct platform_device *omap3_iommu_pdev[NR_OMAP3_IOMMU_DEVICES];
@@ -66,17 +55,6 @@ static struct iommu_device omap4_devices[] = {
.clk_name = "ducati_ick",
},
},
-#if defined(CONFIG_MPU_TESLA_IOMMU)
- {
- .base = OMAP4_MMU2_BASE,
- .irq = INT_44XX_DSP_MMU,
- .pdata = {
- .name = "tesla",
- .nr_tlb_entries = 32,
- .clk_name = "tesla_ick",
- },
- },
-#endif
};
#define NR_OMAP4_IOMMU_DEVICES ARRAY_SIZE(omap4_devices)
static struct platform_device *omap4_iommu_pdev[NR_OMAP4_IOMMU_DEVICES];
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 23/33] Removing dead BACKLIGHT_CORGI
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
@ 2010-06-30 16:01 ` Christoph Egger
2010-06-30 15:54 ` [PATCH 03/33] Removing dead OMAP_MUX_ERRORS Christoph Egger
` (36 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:01 UTC (permalink / raw)
To: Eric Miao, Russell King, Pavel Machek, Arnaud Patard,
Uwe Kleine-K??nig, Kristoffer Ericson, linux-arm-kernel,
linux-kernel
Cc: vamos
BACKLIGHT_CORGI doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-pxa/corgi_pm.c | 2 --
arch/arm/mach-pxa/sharpsl_pm.c | 15 ---------------
arch/arm/mach-pxa/spitz_pm.c | 2 --
3 files changed, 0 insertions(+), 19 deletions(-)
diff --git a/arch/arm/mach-pxa/corgi_pm.c b/arch/arm/mach-pxa/corgi_pm.c
index 3f1dc74..a735205 100644
--- a/arch/arm/mach-pxa/corgi_pm.c
+++ b/arch/arm/mach-pxa/corgi_pm.c
@@ -165,8 +165,6 @@ static struct sharpsl_charger_machinfo corgi_pm_machinfo = {
.should_wakeup = corgi_should_wakeup,
#if defined(CONFIG_LCD_CORGI)
.backlight_limit = corgi_lcd_limit_intensity,
-#elif defined(CONFIG_BACKLIGHT_CORGI)
- .backlight_limit = corgibl_limit_intensity,
#endif
.charge_on_volt = SHARPSL_CHARGE_ON_VOLT,
.charge_on_temp = SHARPSL_CHARGE_ON_TEMP,
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
index cb47672..582701e 100644
--- a/arch/arm/mach-pxa/sharpsl_pm.c
+++ b/arch/arm/mach-pxa/sharpsl_pm.c
@@ -277,21 +277,6 @@ static void sharpsl_battery_thread(struct work_struct *private_)
dev_dbg(sharpsl_pm.dev, "Battery: voltage: %d, status: %d, percentage: %d, time: %ld\n", voltage,
sharpsl_pm.battstat.mainbat_status, sharpsl_pm.battstat.mainbat_percent, jiffies);
-#ifdef CONFIG_BACKLIGHT_CORGI
- /* If battery is low. limit backlight intensity to save power. */
- if ((sharpsl_pm.battstat.ac_status != APM_AC_ONLINE)
- && ((sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_LOW)
- || (sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_CRITICAL))) {
- if (!(sharpsl_pm.flags & SHARPSL_BL_LIMIT)) {
- sharpsl_pm.machinfo->backlight_limit(1);
- sharpsl_pm.flags |= SHARPSL_BL_LIMIT;
- }
- } else if (sharpsl_pm.flags & SHARPSL_BL_LIMIT) {
- sharpsl_pm.machinfo->backlight_limit(0);
- sharpsl_pm.flags &= ~SHARPSL_BL_LIMIT;
- }
-#endif
-
/* Suspend if critical battery level */
if ((sharpsl_pm.battstat.ac_status != APM_AC_ONLINE)
&& (sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_CRITICAL)
diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c
index 4209ddf..b36f0ae 100644
--- a/arch/arm/mach-pxa/spitz_pm.c
+++ b/arch/arm/mach-pxa/spitz_pm.c
@@ -212,8 +212,6 @@ struct sharpsl_charger_machinfo spitz_pm_machinfo = {
.should_wakeup = spitz_should_wakeup,
#if defined(CONFIG_LCD_CORGI)
.backlight_limit = corgi_lcd_limit_intensity,
-#elif defined(CONFIG_BACKLIGHT_CORGI)
- .backlight_limit = corgibl_limit_intensity,
#endif
.charge_on_volt = SHARPSL_CHARGE_ON_VOLT,
.charge_on_temp = SHARPSL_CHARGE_ON_TEMP,
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 23/33] Removing dead BACKLIGHT_CORGI
@ 2010-06-30 16:01 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:01 UTC (permalink / raw)
To: linux-arm-kernel
BACKLIGHT_CORGI doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-pxa/corgi_pm.c | 2 --
arch/arm/mach-pxa/sharpsl_pm.c | 15 ---------------
arch/arm/mach-pxa/spitz_pm.c | 2 --
3 files changed, 0 insertions(+), 19 deletions(-)
diff --git a/arch/arm/mach-pxa/corgi_pm.c b/arch/arm/mach-pxa/corgi_pm.c
index 3f1dc74..a735205 100644
--- a/arch/arm/mach-pxa/corgi_pm.c
+++ b/arch/arm/mach-pxa/corgi_pm.c
@@ -165,8 +165,6 @@ static struct sharpsl_charger_machinfo corgi_pm_machinfo = {
.should_wakeup = corgi_should_wakeup,
#if defined(CONFIG_LCD_CORGI)
.backlight_limit = corgi_lcd_limit_intensity,
-#elif defined(CONFIG_BACKLIGHT_CORGI)
- .backlight_limit = corgibl_limit_intensity,
#endif
.charge_on_volt = SHARPSL_CHARGE_ON_VOLT,
.charge_on_temp = SHARPSL_CHARGE_ON_TEMP,
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
index cb47672..582701e 100644
--- a/arch/arm/mach-pxa/sharpsl_pm.c
+++ b/arch/arm/mach-pxa/sharpsl_pm.c
@@ -277,21 +277,6 @@ static void sharpsl_battery_thread(struct work_struct *private_)
dev_dbg(sharpsl_pm.dev, "Battery: voltage: %d, status: %d, percentage: %d, time: %ld\n", voltage,
sharpsl_pm.battstat.mainbat_status, sharpsl_pm.battstat.mainbat_percent, jiffies);
-#ifdef CONFIG_BACKLIGHT_CORGI
- /* If battery is low. limit backlight intensity to save power. */
- if ((sharpsl_pm.battstat.ac_status != APM_AC_ONLINE)
- && ((sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_LOW)
- || (sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_CRITICAL))) {
- if (!(sharpsl_pm.flags & SHARPSL_BL_LIMIT)) {
- sharpsl_pm.machinfo->backlight_limit(1);
- sharpsl_pm.flags |= SHARPSL_BL_LIMIT;
- }
- } else if (sharpsl_pm.flags & SHARPSL_BL_LIMIT) {
- sharpsl_pm.machinfo->backlight_limit(0);
- sharpsl_pm.flags &= ~SHARPSL_BL_LIMIT;
- }
-#endif
-
/* Suspend if critical battery level */
if ((sharpsl_pm.battstat.ac_status != APM_AC_ONLINE)
&& (sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_CRITICAL)
diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c
index 4209ddf..b36f0ae 100644
--- a/arch/arm/mach-pxa/spitz_pm.c
+++ b/arch/arm/mach-pxa/spitz_pm.c
@@ -212,8 +212,6 @@ struct sharpsl_charger_machinfo spitz_pm_machinfo = {
.should_wakeup = spitz_should_wakeup,
#if defined(CONFIG_LCD_CORGI)
.backlight_limit = corgi_lcd_limit_intensity,
-#elif defined(CONFIG_BACKLIGHT_CORGI)
- .backlight_limit = corgibl_limit_intensity,
#endif
.charge_on_volt = SHARPSL_CHARGE_ON_VOLT,
.charge_on_temp = SHARPSL_CHARGE_ON_TEMP,
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 24/33] Removing dead ARCH_GUMSTIX_ORIG
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
@ 2010-06-30 16:01 ` Christoph Egger
2010-06-30 15:54 ` [PATCH 03/33] Removing dead OMAP_MUX_ERRORS Christoph Egger
` (36 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:01 UTC (permalink / raw)
To: Eric Miao, Russell King, linux-arm-kernel, linux-kernel; +Cc: vamos
ARCH_GUMSTIX_ORIG doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-pxa/include/mach/gumstix.h | 12 +-----------
1 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/arch/arm/mach-pxa/include/mach/gumstix.h b/arch/arm/mach-pxa/include/mach/gumstix.h
index 06abd41..9b89868 100644
--- a/arch/arm/mach-pxa/include/mach/gumstix.h
+++ b/arch/arm/mach-pxa/include/mach/gumstix.h
@@ -14,25 +14,15 @@
/*
GPIOn - Input from MAX823 (or equiv), normalizing USB +5V into a clean
-interrupt signal for determining cable presence. On the original gumstix,
-this is GPIO81, and GPIO83 needs to be defined as well. On the gumstix F,
+interrupt signal for determining cable presence. On the gumstix F,
this moves to GPIO17 and GPIO37. */
/* GPIOx - Connects to USB D+ and used as a pull-up after GPIOn
has detected a cable insertion; driven low otherwise. */
-#ifdef CONFIG_ARCH_GUMSTIX_ORIG
-
-#define GPIO_GUMSTIX_USB_GPIOn 81
-#define GPIO_GUMSTIX_USB_GPIOx 83
-
-#else
-
#define GPIO_GUMSTIX_USB_GPIOn 35
#define GPIO_GUMSTIX_USB_GPIOx 41
-#endif
-
/* usb state change */
#define GUMSTIX_USB_INTR_IRQ IRQ_GPIO(GPIO_GUMSTIX_USB_GPIOn)
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 24/33] Removing dead ARCH_GUMSTIX_ORIG
@ 2010-06-30 16:01 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:01 UTC (permalink / raw)
To: linux-arm-kernel
ARCH_GUMSTIX_ORIG doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-pxa/include/mach/gumstix.h | 12 +-----------
1 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/arch/arm/mach-pxa/include/mach/gumstix.h b/arch/arm/mach-pxa/include/mach/gumstix.h
index 06abd41..9b89868 100644
--- a/arch/arm/mach-pxa/include/mach/gumstix.h
+++ b/arch/arm/mach-pxa/include/mach/gumstix.h
@@ -14,25 +14,15 @@
/*
GPIOn - Input from MAX823 (or equiv), normalizing USB +5V into a clean
-interrupt signal for determining cable presence. On the original gumstix,
-this is GPIO81, and GPIO83 needs to be defined as well. On the gumstix F,
+interrupt signal for determining cable presence. On the gumstix F,
this moves to GPIO17 and GPIO37. */
/* GPIOx - Connects to USB D+ and used as a pull-up after GPIOn
has detected a cable insertion; driven low otherwise. */
-#ifdef CONFIG_ARCH_GUMSTIX_ORIG
-
-#define GPIO_GUMSTIX_USB_GPIOn 81
-#define GPIO_GUMSTIX_USB_GPIOx 83
-
-#else
-
#define GPIO_GUMSTIX_USB_GPIOn 35
#define GPIO_GUMSTIX_USB_GPIOx 41
-#endif
-
/* usb state change */
#define GUMSTIX_USB_INTR_IRQ IRQ_GPIO(GPIO_GUMSTIX_USB_GPIOn)
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 25/33] Removing dead CORGI_SSP_DEPRECATED
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
@ 2010-06-30 16:01 ` Christoph Egger
2010-06-30 15:54 ` [PATCH 03/33] Removing dead OMAP_MUX_ERRORS Christoph Egger
` (36 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:01 UTC (permalink / raw)
To: Eric Miao, Russell King, Pavel Machek, Arnaud Patard,
Uwe Kleine-K??nig, Kristoffer Ericson, linux-arm-kernel,
linux-kernel
Cc: vamos
CORGI_SSP_DEPRECATED doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-pxa/sharpsl_pm.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
index 582701e..d8c5301 100644
--- a/arch/arm/mach-pxa/sharpsl_pm.c
+++ b/arch/arm/mach-pxa/sharpsl_pm.c
@@ -180,17 +180,12 @@ int sharpsl_pm_pxa_read_max1111(int channel)
if (machine_is_tosa())
return 0;
-#ifdef CONFIG_CORGI_SSP_DEPRECATED
- return corgi_ssp_max1111_get((channel << MAXCTRL_SEL_SH) | MAXCTRL_PD0 | MAXCTRL_PD1
- | MAXCTRL_SGL | MAXCTRL_UNI | MAXCTRL_STR);
-#else
extern int max1111_read_channel(int);
/* max1111 accepts channels from 0-3, however,
* it is encoded from 0-7 here in the code.
*/
return max1111_read_channel(channel >> 1);
-#endif
}
static int get_percentage(int voltage)
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 25/33] Removing dead CORGI_SSP_DEPRECATED
@ 2010-06-30 16:01 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:01 UTC (permalink / raw)
To: linux-arm-kernel
CORGI_SSP_DEPRECATED doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-pxa/sharpsl_pm.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
index 582701e..d8c5301 100644
--- a/arch/arm/mach-pxa/sharpsl_pm.c
+++ b/arch/arm/mach-pxa/sharpsl_pm.c
@@ -180,17 +180,12 @@ int sharpsl_pm_pxa_read_max1111(int channel)
if (machine_is_tosa())
return 0;
-#ifdef CONFIG_CORGI_SSP_DEPRECATED
- return corgi_ssp_max1111_get((channel << MAXCTRL_SEL_SH) | MAXCTRL_PD0 | MAXCTRL_PD1
- | MAXCTRL_SGL | MAXCTRL_UNI | MAXCTRL_STR);
-#else
extern int max1111_read_channel(int);
/* max1111 accepts channels from 0-3, however,
* it is encoded from 0-7 here in the code.
*/
return max1111_read_channel(channel >> 1);
-#endif
}
static int get_percentage(int voltage)
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 26/33] Removing dead XSCALE_CACHE_ERRATA
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
@ 2010-06-30 16:02 ` Christoph Egger
2010-06-30 15:54 ` [PATCH 03/33] Removing dead OMAP_MUX_ERRORS Christoph Egger
` (36 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:02 UTC (permalink / raw)
To: Eric Miao, Russell King, linux-arm-kernel, linux-kernel; +Cc: vamos
XSCALE_CACHE_ERRATA doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-pxa/sleep.S | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-pxa/sleep.S b/arch/arm/mach-pxa/sleep.S
index 2ed95f3..52c30b0 100644
--- a/arch/arm/mach-pxa/sleep.S
+++ b/arch/arm/mach-pxa/sleep.S
@@ -339,10 +339,6 @@ ENTRY(pxa_cpu_resume)
mcr p15, 0, r1, c8, c7, 0 @ invalidate I & D TLBs
mcr p15, 0, r1, c7, c7, 0 @ invalidate I & D caches, BTB
-#ifdef CONFIG_XSCALE_CACHE_ERRATA
- bic r9, r9, #0x0004 @ see cpu_xscale_proc_init
-#endif
-
mcr p14, 0, r3, c6, c0, 0 @ clock configuration, turbo mode.
mcr p15, 0, r4, c15, c1, 0 @ CP access reg
mcr p15, 0, r5, c13, c0, 0 @ PID
@@ -368,9 +364,6 @@ sleep_save_sp:
.text
resume_after_mmu:
-#ifdef CONFIG_XSCALE_CACHE_ERRATA
- bl cpu_xscale_proc_init
-#endif
ldmfd sp!, {r2, r3}
#ifndef CONFIG_IWMMXT
mar acc0, r2, r3
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 26/33] Removing dead XSCALE_CACHE_ERRATA
@ 2010-06-30 16:02 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:02 UTC (permalink / raw)
To: linux-arm-kernel
XSCALE_CACHE_ERRATA doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-pxa/sleep.S | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-pxa/sleep.S b/arch/arm/mach-pxa/sleep.S
index 2ed95f3..52c30b0 100644
--- a/arch/arm/mach-pxa/sleep.S
+++ b/arch/arm/mach-pxa/sleep.S
@@ -339,10 +339,6 @@ ENTRY(pxa_cpu_resume)
mcr p15, 0, r1, c8, c7, 0 @ invalidate I & D TLBs
mcr p15, 0, r1, c7, c7, 0 @ invalidate I & D caches, BTB
-#ifdef CONFIG_XSCALE_CACHE_ERRATA
- bic r9, r9, #0x0004 @ see cpu_xscale_proc_init
-#endif
-
mcr p14, 0, r3, c6, c0, 0 @ clock configuration, turbo mode.
mcr p15, 0, r4, c15, c1, 0 @ CP access reg
mcr p15, 0, r5, c13, c0, 0 @ PID
@@ -368,9 +364,6 @@ sleep_save_sp:
.text
resume_after_mmu:
-#ifdef CONFIG_XSCALE_CACHE_ERRATA
- bl cpu_xscale_proc_init
-#endif
ldmfd sp!, {r2, r3}
#ifndef CONFIG_IWMMXT
mar acc0, r2, r3
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 27/33] Removing dead IDE_PXA_CF
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
@ 2010-06-30 16:02 ` Christoph Egger
2010-06-30 15:54 ` [PATCH 03/33] Removing dead OMAP_MUX_ERRORS Christoph Egger
` (36 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:02 UTC (permalink / raw)
To: Eric Miao, Russell King, Mike Rapoport, Robert Jarzmik,
Marek Vasut, linux-arm-kernel, linux-kernel
Cc: vamos
IDE_PXA_CF doesn't exist in Kconfig, therefore removing all references
for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-pxa/trizeps4.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c
index 6968911..0acff17 100644
--- a/arch/arm/mach-pxa/trizeps4.c
+++ b/arch/arm/mach-pxa/trizeps4.c
@@ -530,13 +530,9 @@ static void __init trizeps4_init(void)
i2c_register_board_info(0, trizeps4_i2c_devices,
ARRAY_SIZE(trizeps4_i2c_devices));
-#ifdef CONFIG_IDE_PXA_CF
- /* if boot direct from compact flash dont disable power */
- trizeps_conxs_bcr = 0x0009;
-#else
/* this is the reset value */
trizeps_conxs_bcr = 0x00A0;
-#endif
+
BCR_writew(trizeps_conxs_bcr);
board_backlight_power(1);
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 27/33] Removing dead IDE_PXA_CF
@ 2010-06-30 16:02 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:02 UTC (permalink / raw)
To: linux-arm-kernel
IDE_PXA_CF doesn't exist in Kconfig, therefore removing all references
for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-pxa/trizeps4.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c
index 6968911..0acff17 100644
--- a/arch/arm/mach-pxa/trizeps4.c
+++ b/arch/arm/mach-pxa/trizeps4.c
@@ -530,13 +530,9 @@ static void __init trizeps4_init(void)
i2c_register_board_info(0, trizeps4_i2c_devices,
ARRAY_SIZE(trizeps4_i2c_devices));
-#ifdef CONFIG_IDE_PXA_CF
- /* if boot direct from compact flash dont disable power */
- trizeps_conxs_bcr = 0x0009;
-#else
/* this is the reset value */
trizeps_conxs_bcr = 0x00A0;
-#endif
+
BCR_writew(trizeps_conxs_bcr);
board_backlight_power(1);
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 28/33] Removing dead CPU_S3C24XX
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
@ 2010-06-30 16:02 ` Christoph Egger
2010-06-30 15:54 ` [PATCH 03/33] Removing dead OMAP_MUX_ERRORS Christoph Egger
` (36 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:02 UTC (permalink / raw)
To: Vincent Sanders, Ben Dooks, Russell King, Vasily Khoruzhick,
linux-arm-kernel, linux-kernel
Cc: vamos
CPU_S3C24XX doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-s3c2410/include/mach/gpio.h | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-s3c2410/include/mach/gpio.h b/arch/arm/mach-s3c2410/include/mach/gpio.h
index b649bf2..a37d274 100644
--- a/arch/arm/mach-s3c2410/include/mach/gpio.h
+++ b/arch/arm/mach-s3c2410/include/mach/gpio.h
@@ -30,8 +30,4 @@
#include <mach/gpio-nrs.h>
#include <mach/gpio-fns.h>
-#ifdef CONFIG_CPU_S3C24XX
-#define S3C_GPIO_END (S3C2410_GPIO_BANKJ + 32)
-#else
#define S3C_GPIO_END (S3C2410_GPIO_BANKH + 32)
-#endif
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 28/33] Removing dead CPU_S3C24XX
@ 2010-06-30 16:02 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:02 UTC (permalink / raw)
To: linux-arm-kernel
CPU_S3C24XX doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-s3c2410/include/mach/gpio.h | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-s3c2410/include/mach/gpio.h b/arch/arm/mach-s3c2410/include/mach/gpio.h
index b649bf2..a37d274 100644
--- a/arch/arm/mach-s3c2410/include/mach/gpio.h
+++ b/arch/arm/mach-s3c2410/include/mach/gpio.h
@@ -30,8 +30,4 @@
#include <mach/gpio-nrs.h>
#include <mach/gpio-fns.h>
-#ifdef CONFIG_CPU_S3C24XX
-#define S3C_GPIO_END (S3C2410_GPIO_BANKJ + 32)
-#else
#define S3C_GPIO_END (S3C2410_GPIO_BANKH + 32)
-#endif
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 29/33] Removing dead SND_SOC_SMDK2443_WM9710
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
@ 2010-06-30 16:03 ` Christoph Egger
2010-06-30 15:54 ` [PATCH 03/33] Removing dead OMAP_MUX_ERRORS Christoph Egger
` (36 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:03 UTC (permalink / raw)
To: Ben Dooks, Russell King, Mark Brown, Jassi Brar,
linux-arm-kernel, linux-kernel
Cc: vamos
SND_SOC_SMDK2443_WM9710 doesn't exist in Kconfig, therefore removing
all references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-s3c2443/mach-smdk2443.c | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-s3c2443/mach-smdk2443.c b/arch/arm/mach-s3c2443/mach-smdk2443.c
index 4c863d3..47414c9 100644
--- a/arch/arm/mach-s3c2443/mach-smdk2443.c
+++ b/arch/arm/mach-s3c2443/mach-smdk2443.c
@@ -106,9 +106,6 @@ static struct platform_device *smdk2443_devices[] __initdata = {
&s3c_device_wdt,
&s3c_device_i2c0,
&s3c_device_hsmmc0,
-#ifdef CONFIG_SND_SOC_SMDK2443_WM9710
- &s3c_device_ac97,
-#endif
};
static void __init smdk2443_map_io(void)
@@ -122,10 +119,6 @@ static void __init smdk2443_machine_init(void)
{
s3c_i2c0_set_platdata(NULL);
-#ifdef CONFIG_SND_SOC_SMDK2443_WM9710
- s3c24xx_ac97_setup_gpio(S3C24XX_AC97_GPE0);
-#endif
-
platform_add_devices(smdk2443_devices, ARRAY_SIZE(smdk2443_devices));
smdk_machine_init();
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 29/33] Removing dead SND_SOC_SMDK2443_WM9710
@ 2010-06-30 16:03 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:03 UTC (permalink / raw)
To: linux-arm-kernel
SND_SOC_SMDK2443_WM9710 doesn't exist in Kconfig, therefore removing
all references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-s3c2443/mach-smdk2443.c | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-s3c2443/mach-smdk2443.c b/arch/arm/mach-s3c2443/mach-smdk2443.c
index 4c863d3..47414c9 100644
--- a/arch/arm/mach-s3c2443/mach-smdk2443.c
+++ b/arch/arm/mach-s3c2443/mach-smdk2443.c
@@ -106,9 +106,6 @@ static struct platform_device *smdk2443_devices[] __initdata = {
&s3c_device_wdt,
&s3c_device_i2c0,
&s3c_device_hsmmc0,
-#ifdef CONFIG_SND_SOC_SMDK2443_WM9710
- &s3c_device_ac97,
-#endif
};
static void __init smdk2443_map_io(void)
@@ -122,10 +119,6 @@ static void __init smdk2443_machine_init(void)
{
s3c_i2c0_set_platdata(NULL);
-#ifdef CONFIG_SND_SOC_SMDK2443_WM9710
- s3c24xx_ac97_setup_gpio(S3C24XX_AC97_GPE0);
-#endif
-
platform_add_devices(smdk2443_devices, ARRAY_SIZE(smdk2443_devices));
smdk_machine_init();
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 30/33] Removing dead S3C_DEV_ADC
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
@ 2010-06-30 16:03 ` Christoph Egger
2010-06-30 15:54 ` [PATCH 03/33] Removing dead OMAP_MUX_ERRORS Christoph Egger
` (36 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:03 UTC (permalink / raw)
To: Russell King, Ben Dooks, Kukjin Kim, Kyungmin Park,
Marek Szyprowski, Thomas Abraham, linux-arm-kernel, linux-kernel
Cc: vamos
S3C_DEV_ADC doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-s5pv210/cpu.c | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c
index 411a4a9..c5d53ab 100644
--- a/arch/arm/mach-s5pv210/cpu.c
+++ b/arch/arm/mach-s5pv210/cpu.c
@@ -76,10 +76,6 @@ static void s5pv210_idle(void)
void __init s5pv210_map_io(void)
{
-#ifdef CONFIG_S3C_DEV_ADC
- s3c_device_adc.name = "s3c64xx-adc";
-#endif
-
iotable_init(s5pv210_iodesc, ARRAY_SIZE(s5pv210_iodesc));
/* initialise device information early */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 30/33] Removing dead S3C_DEV_ADC
@ 2010-06-30 16:03 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:03 UTC (permalink / raw)
To: linux-arm-kernel
S3C_DEV_ADC doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-s5pv210/cpu.c | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c
index 411a4a9..c5d53ab 100644
--- a/arch/arm/mach-s5pv210/cpu.c
+++ b/arch/arm/mach-s5pv210/cpu.c
@@ -76,10 +76,6 @@ static void s5pv210_idle(void)
void __init s5pv210_map_io(void)
{
-#ifdef CONFIG_S3C_DEV_ADC
- s3c_device_adc.name = "s3c64xx-adc";
-#endif
-
iotable_init(s5pv210_iodesc, ARRAY_SIZE(s5pv210_iodesc));
/* initialise device information early */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 31/33] Removing dead MACH_U300_BS26
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
@ 2010-06-30 16:03 ` Christoph Egger
2010-06-30 15:54 ` [PATCH 03/33] Removing dead OMAP_MUX_ERRORS Christoph Egger
` (36 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:03 UTC (permalink / raw)
To: Linus Walleij, Russell King, Jiri Kosina, Daniel Mack,
linux-arm-kernel, linux-kernel
Cc: vamos
MACH_U300_BS26 doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-u300/core.c | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
index 5f34eb6..653b3e0 100644
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@ -1561,13 +1561,6 @@ static void __init u300_init_check_chip(void)
printk(KERN_INFO "Initializing U300 system on %s baseband chip " \
"(chip ID 0x%04x)\n", chipname, val);
-#ifdef CONFIG_MACH_U300_BS26
- if ((val & 0xFF00U) != 0xc800) {
- printk(KERN_ERR "Platform configured for BS25/BS26 " \
- "with DB3150 but %s detected, expect problems!",
- chipname);
- }
-#endif
#ifdef CONFIG_MACH_U300_BS330
if ((val & 0xFF00U) != 0xd800) {
printk(KERN_ERR "Platform configured for BS330 " \
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 31/33] Removing dead MACH_U300_BS26
@ 2010-06-30 16:03 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:03 UTC (permalink / raw)
To: linux-arm-kernel
MACH_U300_BS26 doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-u300/core.c | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
index 5f34eb6..653b3e0 100644
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@ -1561,13 +1561,6 @@ static void __init u300_init_check_chip(void)
printk(KERN_INFO "Initializing U300 system on %s baseband chip " \
"(chip ID 0x%04x)\n", chipname, val);
-#ifdef CONFIG_MACH_U300_BS26
- if ((val & 0xFF00U) != 0xc800) {
- printk(KERN_ERR "Platform configured for BS25/BS26 " \
- "with DB3150 but %s detected, expect problems!",
- chipname);
- }
-#endif
#ifdef CONFIG_MACH_U300_BS330
if ((val & 0xFF00U) != 0xd800) {
printk(KERN_ERR "Platform configured for BS330 " \
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 32/33] Removing dead CPU_ICACHE_STREAMING_DISABLE
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
@ 2010-06-30 16:04 ` Christoph Egger
2010-06-30 15:54 ` [PATCH 03/33] Removing dead OMAP_MUX_ERRORS Christoph Egger
` (36 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:04 UTC (permalink / raw)
To: Russell King, Kirill A. Shutemov, linux-arm-kernel, linux-kernel; +Cc: vamos
CPU_ICACHE_STREAMING_DISABLE doesn't exist in Kconfig, therefore
removing all references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mm/proc-arm925.S | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S
index 3c6cffe..2a3bb73 100644
--- a/arch/arm/mm/proc-arm925.S
+++ b/arch/arm/mm/proc-arm925.S
@@ -437,9 +437,6 @@ ENTRY(cpu_arm925_set_pte_ext)
.type __arm925_setup, #function
__arm925_setup:
mov r0, #0
-#if defined(CONFIG_CPU_ICACHE_STREAMING_DISABLE)
- orr r0,r0,#1 << 7
-#endif
/* Transparent on, D-cache clean & flush mode. See NOTE2 above */
orr r0,r0,#1 << 1 @ transparent mode on
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 32/33] Removing dead CPU_ICACHE_STREAMING_DISABLE
@ 2010-06-30 16:04 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:04 UTC (permalink / raw)
To: linux-arm-kernel
CPU_ICACHE_STREAMING_DISABLE doesn't exist in Kconfig, therefore
removing all references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mm/proc-arm925.S | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S
index 3c6cffe..2a3bb73 100644
--- a/arch/arm/mm/proc-arm925.S
+++ b/arch/arm/mm/proc-arm925.S
@@ -437,9 +437,6 @@ ENTRY(cpu_arm925_set_pte_ext)
.type __arm925_setup, #function
__arm925_setup:
mov r0, #0
-#if defined(CONFIG_CPU_ICACHE_STREAMING_DISABLE)
- orr r0,r0,#1 << 7
-#endif
/* Transparent on, D-cache clean & flush mode. See NOTE2 above */
orr r0,r0,#1 << 1 @ transparent mode on
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 33/33] Removing dead MACH_U300_USE_I2S_AS_MASTER
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
@ 2010-06-30 16:04 ` Christoph Egger
2010-06-30 15:54 ` [PATCH 03/33] Removing dead OMAP_MUX_ERRORS Christoph Egger
` (36 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:04 UTC (permalink / raw)
To: Linus Walleij, Russell King, H Hartley Sweeten, Eric Miao,
Kevin Hilman, linux-arm-kernel, linux-kernel
Cc: vamos
MACH_U300_USE_I2S_AS_MASTER doesn't exist in Kconfig, therefore
removing all references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-u300/clock.c | 91 --------------------------------------------
1 files changed, 0 insertions(+), 91 deletions(-)
diff --git a/arch/arm/mach-u300/clock.c b/arch/arm/mach-u300/clock.c
index 5af71d5..80972a0 100644
--- a/arch/arm/mach-u300/clock.c
+++ b/arch/arm/mach-u300/clock.c
@@ -216,85 +216,6 @@ static u16 syscon_clk_get_rate(void)
return val;
}
-#ifdef CONFIG_MACH_U300_USE_I2S_AS_MASTER
-static void enable_i2s0_vcxo(void)
-{
- u16 val;
- unsigned long iflags;
-
- spin_lock_irqsave(&syscon_clkreg_lock, iflags);
- /* Set I2S0 to use the VCXO 26 MHz clock */
- val = readw(U300_SYSCON_VBASE + U300_SYSCON_CCR);
- val |= U300_SYSCON_CCR_TURN_VCXO_ON;
- writew(val, U300_SYSCON_VBASE + U300_SYSCON_CCR);
- val |= U300_SYSCON_CCR_I2S0_USE_VCXO;
- writew(val, U300_SYSCON_VBASE + U300_SYSCON_CCR);
- val = readw(U300_SYSCON_VBASE + U300_SYSCON_CEFR);
- val |= U300_SYSCON_CEFR_I2S0_CLK_EN;
- writew(val, U300_SYSCON_VBASE + U300_SYSCON_CEFR);
- spin_unlock_irqrestore(&syscon_clkreg_lock, iflags);
-}
-
-static void enable_i2s1_vcxo(void)
-{
- u16 val;
- unsigned long iflags;
-
- spin_lock_irqsave(&syscon_clkreg_lock, iflags);
- /* Set I2S1 to use the VCXO 26 MHz clock */
- val = readw(U300_SYSCON_VBASE + U300_SYSCON_CCR);
- val |= U300_SYSCON_CCR_TURN_VCXO_ON;
- writew(val, U300_SYSCON_VBASE + U300_SYSCON_CCR);
- val |= U300_SYSCON_CCR_I2S1_USE_VCXO;
- writew(val, U300_SYSCON_VBASE + U300_SYSCON_CCR);
- val = readw(U300_SYSCON_VBASE + U300_SYSCON_CEFR);
- val |= U300_SYSCON_CEFR_I2S1_CLK_EN;
- writew(val, U300_SYSCON_VBASE + U300_SYSCON_CEFR);
- spin_unlock_irqrestore(&syscon_clkreg_lock, iflags);
-}
-
-static void disable_i2s0_vcxo(void)
-{
- u16 val;
- unsigned long iflags;
-
- spin_lock_irqsave(&syscon_clkreg_lock, iflags);
- /* Disable I2S0 use of the VCXO 26 MHz clock */
- val = readw(U300_SYSCON_VBASE + U300_SYSCON_CCR);
- val &= ~U300_SYSCON_CCR_I2S0_USE_VCXO;
- writew(val, U300_SYSCON_VBASE + U300_SYSCON_CCR);
- /* Deactivate VCXO if noone else is using VCXO */
- if (!(val & U300_SYSCON_CCR_I2S1_USE_VCXO))
- val &= ~U300_SYSCON_CCR_TURN_VCXO_ON;
- writew(val, U300_SYSCON_VBASE + U300_SYSCON_CCR);
- val = readw(U300_SYSCON_VBASE + U300_SYSCON_CEFR);
- val &= ~U300_SYSCON_CEFR_I2S0_CLK_EN;
- writew(val, U300_SYSCON_VBASE + U300_SYSCON_CEFR);
- spin_unlock_irqrestore(&syscon_clkreg_lock, iflags);
-}
-
-static void disable_i2s1_vcxo(void)
-{
- u16 val;
- unsigned long iflags;
-
- spin_lock_irqsave(&syscon_clkreg_lock, iflags);
- /* Disable I2S1 use of the VCXO 26 MHz clock */
- val = readw(U300_SYSCON_VBASE + U300_SYSCON_CCR);
- val &= ~U300_SYSCON_CCR_I2S1_USE_VCXO;
- writew(val, U300_SYSCON_VBASE + U300_SYSCON_CCR);
- /* Deactivate VCXO if noone else is using VCXO */
- if (!(val & U300_SYSCON_CCR_I2S0_USE_VCXO))
- val &= ~U300_SYSCON_CCR_TURN_VCXO_ON;
- writew(val, U300_SYSCON_VBASE + U300_SYSCON_CCR);
- val = readw(U300_SYSCON_VBASE + U300_SYSCON_CEFR);
- val &= ~U300_SYSCON_CEFR_I2S0_CLK_EN;
- writew(val, U300_SYSCON_VBASE + U300_SYSCON_CEFR);
- spin_unlock_irqrestore(&syscon_clkreg_lock, iflags);
-}
-#endif /* CONFIG_MACH_U300_USE_I2S_AS_MASTER */
-
-
static void syscon_clk_rate_set_mclk(unsigned long rate)
{
u16 val;
@@ -383,12 +304,6 @@ void clk_disable(struct clk *clk)
if (likely((u32)clk->parent))
clk_disable(clk->parent);
}
-#ifdef CONFIG_MACH_U300_USE_I2S_AS_MASTER
- if (unlikely(!strcmp(clk->name, "I2S0")))
- disable_i2s0_vcxo();
- if (unlikely(!strcmp(clk->name, "I2S1")))
- disable_i2s1_vcxo();
-#endif
spin_unlock_irqrestore(&clk->lock, iflags);
}
EXPORT_SYMBOL(clk_disable);
@@ -411,12 +326,6 @@ int clk_enable(struct clk *clk)
/* clocks without enable function are always on */
if (clk->enable)
clk->enable(clk);
-#ifdef CONFIG_MACH_U300_USE_I2S_AS_MASTER
- if (unlikely(!strcmp(clk->name, "I2S0")))
- enable_i2s0_vcxo();
- if (unlikely(!strcmp(clk->name, "I2S1")))
- enable_i2s1_vcxo();
-#endif
}
}
spin_unlock_irqrestore(&clk->lock, iflags);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 33/33] Removing dead MACH_U300_USE_I2S_AS_MASTER
@ 2010-06-30 16:04 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:04 UTC (permalink / raw)
To: linux-arm-kernel
MACH_U300_USE_I2S_AS_MASTER doesn't exist in Kconfig, therefore
removing all references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-u300/clock.c | 91 --------------------------------------------
1 files changed, 0 insertions(+), 91 deletions(-)
diff --git a/arch/arm/mach-u300/clock.c b/arch/arm/mach-u300/clock.c
index 5af71d5..80972a0 100644
--- a/arch/arm/mach-u300/clock.c
+++ b/arch/arm/mach-u300/clock.c
@@ -216,85 +216,6 @@ static u16 syscon_clk_get_rate(void)
return val;
}
-#ifdef CONFIG_MACH_U300_USE_I2S_AS_MASTER
-static void enable_i2s0_vcxo(void)
-{
- u16 val;
- unsigned long iflags;
-
- spin_lock_irqsave(&syscon_clkreg_lock, iflags);
- /* Set I2S0 to use the VCXO 26 MHz clock */
- val = readw(U300_SYSCON_VBASE + U300_SYSCON_CCR);
- val |= U300_SYSCON_CCR_TURN_VCXO_ON;
- writew(val, U300_SYSCON_VBASE + U300_SYSCON_CCR);
- val |= U300_SYSCON_CCR_I2S0_USE_VCXO;
- writew(val, U300_SYSCON_VBASE + U300_SYSCON_CCR);
- val = readw(U300_SYSCON_VBASE + U300_SYSCON_CEFR);
- val |= U300_SYSCON_CEFR_I2S0_CLK_EN;
- writew(val, U300_SYSCON_VBASE + U300_SYSCON_CEFR);
- spin_unlock_irqrestore(&syscon_clkreg_lock, iflags);
-}
-
-static void enable_i2s1_vcxo(void)
-{
- u16 val;
- unsigned long iflags;
-
- spin_lock_irqsave(&syscon_clkreg_lock, iflags);
- /* Set I2S1 to use the VCXO 26 MHz clock */
- val = readw(U300_SYSCON_VBASE + U300_SYSCON_CCR);
- val |= U300_SYSCON_CCR_TURN_VCXO_ON;
- writew(val, U300_SYSCON_VBASE + U300_SYSCON_CCR);
- val |= U300_SYSCON_CCR_I2S1_USE_VCXO;
- writew(val, U300_SYSCON_VBASE + U300_SYSCON_CCR);
- val = readw(U300_SYSCON_VBASE + U300_SYSCON_CEFR);
- val |= U300_SYSCON_CEFR_I2S1_CLK_EN;
- writew(val, U300_SYSCON_VBASE + U300_SYSCON_CEFR);
- spin_unlock_irqrestore(&syscon_clkreg_lock, iflags);
-}
-
-static void disable_i2s0_vcxo(void)
-{
- u16 val;
- unsigned long iflags;
-
- spin_lock_irqsave(&syscon_clkreg_lock, iflags);
- /* Disable I2S0 use of the VCXO 26 MHz clock */
- val = readw(U300_SYSCON_VBASE + U300_SYSCON_CCR);
- val &= ~U300_SYSCON_CCR_I2S0_USE_VCXO;
- writew(val, U300_SYSCON_VBASE + U300_SYSCON_CCR);
- /* Deactivate VCXO if noone else is using VCXO */
- if (!(val & U300_SYSCON_CCR_I2S1_USE_VCXO))
- val &= ~U300_SYSCON_CCR_TURN_VCXO_ON;
- writew(val, U300_SYSCON_VBASE + U300_SYSCON_CCR);
- val = readw(U300_SYSCON_VBASE + U300_SYSCON_CEFR);
- val &= ~U300_SYSCON_CEFR_I2S0_CLK_EN;
- writew(val, U300_SYSCON_VBASE + U300_SYSCON_CEFR);
- spin_unlock_irqrestore(&syscon_clkreg_lock, iflags);
-}
-
-static void disable_i2s1_vcxo(void)
-{
- u16 val;
- unsigned long iflags;
-
- spin_lock_irqsave(&syscon_clkreg_lock, iflags);
- /* Disable I2S1 use of the VCXO 26 MHz clock */
- val = readw(U300_SYSCON_VBASE + U300_SYSCON_CCR);
- val &= ~U300_SYSCON_CCR_I2S1_USE_VCXO;
- writew(val, U300_SYSCON_VBASE + U300_SYSCON_CCR);
- /* Deactivate VCXO if noone else is using VCXO */
- if (!(val & U300_SYSCON_CCR_I2S0_USE_VCXO))
- val &= ~U300_SYSCON_CCR_TURN_VCXO_ON;
- writew(val, U300_SYSCON_VBASE + U300_SYSCON_CCR);
- val = readw(U300_SYSCON_VBASE + U300_SYSCON_CEFR);
- val &= ~U300_SYSCON_CEFR_I2S0_CLK_EN;
- writew(val, U300_SYSCON_VBASE + U300_SYSCON_CEFR);
- spin_unlock_irqrestore(&syscon_clkreg_lock, iflags);
-}
-#endif /* CONFIG_MACH_U300_USE_I2S_AS_MASTER */
-
-
static void syscon_clk_rate_set_mclk(unsigned long rate)
{
u16 val;
@@ -383,12 +304,6 @@ void clk_disable(struct clk *clk)
if (likely((u32)clk->parent))
clk_disable(clk->parent);
}
-#ifdef CONFIG_MACH_U300_USE_I2S_AS_MASTER
- if (unlikely(!strcmp(clk->name, "I2S0")))
- disable_i2s0_vcxo();
- if (unlikely(!strcmp(clk->name, "I2S1")))
- disable_i2s1_vcxo();
-#endif
spin_unlock_irqrestore(&clk->lock, iflags);
}
EXPORT_SYMBOL(clk_disable);
@@ -411,12 +326,6 @@ int clk_enable(struct clk *clk)
/* clocks without enable function are always on */
if (clk->enable)
clk->enable(clk);
-#ifdef CONFIG_MACH_U300_USE_I2S_AS_MASTER
- if (unlikely(!strcmp(clk->name, "I2S0")))
- enable_i2s0_vcxo();
- if (unlikely(!strcmp(clk->name, "I2S1")))
- enable_i2s1_vcxo();
-#endif
}
}
spin_unlock_irqrestore(&clk->lock, iflags);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 02/33] Removing dead ARCH_DAVINCI_TNETV107X
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
@ 2010-06-30 16:05 ` Christoph Egger
2010-06-30 15:54 ` [PATCH 03/33] Removing dead OMAP_MUX_ERRORS Christoph Egger
` (36 subsequent siblings)
37 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:05 UTC (permalink / raw)
To: Kevin Hilman, Russell King, Sandeep Paulraj,
Sudhakar Rajashekhara, Steve Chen, Cyril Chemparathy,
linux-arm-kernel, linux-kernel
Cc: vamos
ARCH_DAVINCI_TNETV107X doesn't exist in Kconfig, therefore removing
all references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-davinci/include/mach/cputype.h | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-davinci/include/mach/cputype.h b/arch/arm/mach-davinci/include/mach/cputype.h
index cea6b89..6143022 100644
--- a/arch/arm/mach-davinci/include/mach/cputype.h
+++ b/arch/arm/mach-davinci/include/mach/cputype.h
@@ -85,10 +85,4 @@ IS_DAVINCI_CPU(tnetv107x, DAVINCI_CPU_ID_TNETV107X)
#define cpu_is_davinci_da850() 0
#endif
-#ifdef CONFIG_ARCH_DAVINCI_TNETV107X
-#define cpu_is_davinci_tnetv107x() is_davinci_tnetv107x()
-#else
-#define cpu_is_davinci_tnetv107x() 0
-#endif
-
#endif
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 02/33] Removing dead ARCH_DAVINCI_TNETV107X
@ 2010-06-30 16:05 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-06-30 16:05 UTC (permalink / raw)
To: linux-arm-kernel
ARCH_DAVINCI_TNETV107X doesn't exist in Kconfig, therefore removing
all references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-davinci/include/mach/cputype.h | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-davinci/include/mach/cputype.h b/arch/arm/mach-davinci/include/mach/cputype.h
index cea6b89..6143022 100644
--- a/arch/arm/mach-davinci/include/mach/cputype.h
+++ b/arch/arm/mach-davinci/include/mach/cputype.h
@@ -85,10 +85,4 @@ IS_DAVINCI_CPU(tnetv107x, DAVINCI_CPU_ID_TNETV107X)
#define cpu_is_davinci_da850() 0
#endif
-#ifdef CONFIG_ARCH_DAVINCI_TNETV107X
-#define cpu_is_davinci_tnetv107x() is_davinci_tnetv107x()
-#else
-#define cpu_is_davinci_tnetv107x() 0
-#endif
-
#endif
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* Re: [PATCH 28/33] Removing dead CPU_S3C24XX
2010-06-30 16:02 ` Christoph Egger
@ 2010-06-30 16:19 ` Vasily Khoruzhick
-1 siblings, 0 replies; 221+ messages in thread
From: Vasily Khoruzhick @ 2010-06-30 16:19 UTC (permalink / raw)
To: Christoph Egger
Cc: Vincent Sanders, Ben Dooks, Russell King, linux-arm-kernel,
linux-kernel, vamos
[-- Attachment #1: Type: Text/Plain, Size: 1071 bytes --]
В сообщении от 30 июня 2010 19:02:51 автор Christoph Egger написал:
> CPU_S3C24XX doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-s3c2410/include/mach/gpio.h | 4 ----
> 1 files changed, 0 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-s3c2410/include/mach/gpio.h
> b/arch/arm/mach-s3c2410/include/mach/gpio.h index b649bf2..a37d274 100644
> --- a/arch/arm/mach-s3c2410/include/mach/gpio.h
> +++ b/arch/arm/mach-s3c2410/include/mach/gpio.h
> @@ -30,8 +30,4 @@
> #include <mach/gpio-nrs.h>
> #include <mach/gpio-fns.h>
>
> -#ifdef CONFIG_CPU_S3C24XX
> -#define S3C_GPIO_END (S3C2410_GPIO_BANKJ + 32)
> -#else
> #define S3C_GPIO_END (S3C2410_GPIO_BANKH + 32)
> -#endif
This patch conflicts with Yaugen Kharuzhy patch (ARM: S3C24XX: Fix gpiolib
support for ports K..M), S3C24XX is just a typo, it should be S3C244X and that
was fixed by mentioned patch
Regards
Vasily
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 28/33] Removing dead CPU_S3C24XX
@ 2010-06-30 16:19 ` Vasily Khoruzhick
0 siblings, 0 replies; 221+ messages in thread
From: Vasily Khoruzhick @ 2010-06-30 16:19 UTC (permalink / raw)
To: linux-arm-kernel
? ????????? ?? 30 ???? 2010 19:02:51 ????? Christoph Egger ???????:
> CPU_S3C24XX doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-s3c2410/include/mach/gpio.h | 4 ----
> 1 files changed, 0 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-s3c2410/include/mach/gpio.h
> b/arch/arm/mach-s3c2410/include/mach/gpio.h index b649bf2..a37d274 100644
> --- a/arch/arm/mach-s3c2410/include/mach/gpio.h
> +++ b/arch/arm/mach-s3c2410/include/mach/gpio.h
> @@ -30,8 +30,4 @@
> #include <mach/gpio-nrs.h>
> #include <mach/gpio-fns.h>
>
> -#ifdef CONFIG_CPU_S3C24XX
> -#define S3C_GPIO_END (S3C2410_GPIO_BANKJ + 32)
> -#else
> #define S3C_GPIO_END (S3C2410_GPIO_BANKH + 32)
> -#endif
This patch conflicts with Yaugen Kharuzhy patch (ARM: S3C24XX: Fix gpiolib
support for ports K..M), S3C24XX is just a typo, it should be S3C244X and that
was fixed by mentioned patch
Regards
Vasily
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100630/cc4d4690/attachment.sig>
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 30/33] Removing dead S3C_DEV_ADC
2010-06-30 16:03 ` Christoph Egger
@ 2010-06-30 16:24 ` Arnaud Patard (Rtp)
-1 siblings, 0 replies; 221+ messages in thread
From: Arnaud Patard @ 2010-06-30 16:24 UTC (permalink / raw)
To: Christoph Egger
Cc: Russell King, Ben Dooks, Kukjin Kim, Kyungmin Park,
Marek Szyprowski, Thomas Abraham, linux-arm-kernel, linux-kernel,
vamos
Christoph Egger <siccegge@cs.fau.de> writes:
> S3C_DEV_ADC doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-s5pv210/cpu.c | 4 ----
> 1 files changed, 0 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c
> index 411a4a9..c5d53ab 100644
> --- a/arch/arm/mach-s5pv210/cpu.c
> +++ b/arch/arm/mach-s5pv210/cpu.c
> @@ -76,10 +76,6 @@ static void s5pv210_idle(void)
>
> void __init s5pv210_map_io(void)
> {
> -#ifdef CONFIG_S3C_DEV_ADC
> - s3c_device_adc.name = "s3c64xx-adc";
> -#endif
> -
too bad, should have been SAMSUNG_DEV_ADC :(
Anyway, a patch called "[PATCH] ARM: SAMSUNG: Implement set_name
function for ADC devices" has been sent for review today and is
addressing this same issue.
Thanks,
Arnaud
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 30/33] Removing dead S3C_DEV_ADC
@ 2010-06-30 16:24 ` Arnaud Patard (Rtp)
0 siblings, 0 replies; 221+ messages in thread
From: Arnaud Patard (Rtp) @ 2010-06-30 16:24 UTC (permalink / raw)
To: linux-arm-kernel
Christoph Egger <siccegge@cs.fau.de> writes:
> S3C_DEV_ADC doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-s5pv210/cpu.c | 4 ----
> 1 files changed, 0 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c
> index 411a4a9..c5d53ab 100644
> --- a/arch/arm/mach-s5pv210/cpu.c
> +++ b/arch/arm/mach-s5pv210/cpu.c
> @@ -76,10 +76,6 @@ static void s5pv210_idle(void)
>
> void __init s5pv210_map_io(void)
> {
> -#ifdef CONFIG_S3C_DEV_ADC
> - s3c_device_adc.name = "s3c64xx-adc";
> -#endif
> -
too bad, should have been SAMSUNG_DEV_ADC :(
Anyway, a patch called "[PATCH] ARM: SAMSUNG: Implement set_name
function for ADC devices" has been sent for review today and is
addressing this same issue.
Thanks,
Arnaud
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 08/33] Removing dead SA1101
2010-06-30 15:56 ` Christoph Egger
@ 2010-06-30 16:57 ` Nicolas Pitre
-1 siblings, 0 replies; 221+ messages in thread
From: Nicolas Pitre @ 2010-06-30 16:57 UTC (permalink / raw)
To: Christoph Egger; +Cc: Russell King, linux-arm-kernel, lkml, vamos
On Wed, 30 Jun 2010, Christoph Egger wrote:
> SA1101 doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
Acked-by: Nicolas Pitre <nico@fluxnic.net>
> ---
> arch/arm/mach-sa1100/include/mach/SA-1101.h | 925 --------------------------
> arch/arm/mach-sa1100/include/mach/hardware.h | 4 -
> 2 files changed, 0 insertions(+), 929 deletions(-)
> delete mode 100644 arch/arm/mach-sa1100/include/mach/SA-1101.h
>
[...]
Nicolas
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 08/33] Removing dead SA1101
@ 2010-06-30 16:57 ` Nicolas Pitre
0 siblings, 0 replies; 221+ messages in thread
From: Nicolas Pitre @ 2010-06-30 16:57 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, 30 Jun 2010, Christoph Egger wrote:
> SA1101 doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
Acked-by: Nicolas Pitre <nico@fluxnic.net>
> ---
> arch/arm/mach-sa1100/include/mach/SA-1101.h | 925 --------------------------
> arch/arm/mach-sa1100/include/mach/hardware.h | 4 -
> 2 files changed, 0 insertions(+), 929 deletions(-)
> delete mode 100644 arch/arm/mach-sa1100/include/mach/SA-1101.h
>
[...]
Nicolas
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 02/33] Removing dead ARCH_DAVINCI_TNETV107X
2010-06-30 16:05 ` Christoph Egger
@ 2010-06-30 17:07 ` Baruch Siach
-1 siblings, 0 replies; 221+ messages in thread
From: Baruch Siach @ 2010-06-30 17:07 UTC (permalink / raw)
To: Christoph Egger
Cc: Kevin Hilman, Russell King, Sandeep Paulraj,
Sudhakar Rajashekhara, Steve Chen, Cyril Chemparathy,
linux-arm-kernel, linux-kernel, vamos
Hi Christoph,
On Wed, Jun 30, 2010 at 06:05:38PM +0200, Christoph Egger wrote:
> ARCH_DAVINCI_TNETV107X doesn't exist in Kconfig, therefore removing
> all references for it from the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-davinci/include/mach/cputype.h | 6 ------
> 1 files changed, 0 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/mach-davinci/include/mach/cputype.h b/arch/arm/mach-davinci/include/mach/cputype.h
> index cea6b89..6143022 100644
> --- a/arch/arm/mach-davinci/include/mach/cputype.h
> +++ b/arch/arm/mach-davinci/include/mach/cputype.h
> @@ -85,10 +85,4 @@ IS_DAVINCI_CPU(tnetv107x, DAVINCI_CPU_ID_TNETV107X)
> #define cpu_is_davinci_da850() 0
> #endif
>
> -#ifdef CONFIG_ARCH_DAVINCI_TNETV107X
> -#define cpu_is_davinci_tnetv107x() is_davinci_tnetv107x()
> -#else
> -#define cpu_is_davinci_tnetv107x() 0
Why remove the #else part?
baruch
> -#endif
> -
> #endif
> --
> 1.7.0.4
--
~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch@tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 02/33] Removing dead ARCH_DAVINCI_TNETV107X
@ 2010-06-30 17:07 ` Baruch Siach
0 siblings, 0 replies; 221+ messages in thread
From: Baruch Siach @ 2010-06-30 17:07 UTC (permalink / raw)
To: linux-arm-kernel
Hi Christoph,
On Wed, Jun 30, 2010 at 06:05:38PM +0200, Christoph Egger wrote:
> ARCH_DAVINCI_TNETV107X doesn't exist in Kconfig, therefore removing
> all references for it from the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-davinci/include/mach/cputype.h | 6 ------
> 1 files changed, 0 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/mach-davinci/include/mach/cputype.h b/arch/arm/mach-davinci/include/mach/cputype.h
> index cea6b89..6143022 100644
> --- a/arch/arm/mach-davinci/include/mach/cputype.h
> +++ b/arch/arm/mach-davinci/include/mach/cputype.h
> @@ -85,10 +85,4 @@ IS_DAVINCI_CPU(tnetv107x, DAVINCI_CPU_ID_TNETV107X)
> #define cpu_is_davinci_da850() 0
> #endif
>
> -#ifdef CONFIG_ARCH_DAVINCI_TNETV107X
> -#define cpu_is_davinci_tnetv107x() is_davinci_tnetv107x()
> -#else
> -#define cpu_is_davinci_tnetv107x() 0
Why remove the #else part?
baruch
> -#endif
> -
> #endif
> --
> 1.7.0.4
--
~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 01/33] Removing dead MTD_NAND_AT91_BUSWIDTH_16
2010-06-30 15:53 ` Christoph Egger
@ 2010-06-30 17:53 ` Kirill A. Shutemov
-1 siblings, 0 replies; 221+ messages in thread
From: Kirill A. Shutemov @ 2010-06-30 17:53 UTC (permalink / raw)
To: Christoph Egger
Cc: Russell King, Andrew Victor, Antonio R. Costa, Nicolas Ferre,
Dmitry Torokhov, Andrea Gelmini, linux-arm-kernel, linux-kernel,
vamos
On Wed, Jun 30, 2010 at 05:53:52PM +0200, Christoph Egger wrote:
> MTD_NAND_AT91_BUSWIDTH_16 doesn't exist in Kconfig, therefore removing
> all references for it from the source code.
It was renamed to MTD_NAND_ATMEL_BUSWIDTH_16 (see f6ed6f7).
I think better to rename it here too.
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-at91/board-at572d940hf_ek.c | 4 ----
> arch/arm/mach-at91/board-sam9m10g45ek.c | 4 ----
> 2 files changed, 0 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/mach-at91/board-at572d940hf_ek.c b/arch/arm/mach-at91/board-at572d940hf_ek.c
> index 5daff27..889a442 100644
> --- a/arch/arm/mach-at91/board-at572d940hf_ek.c
> +++ b/arch/arm/mach-at91/board-at572d940hf_ek.c
> @@ -216,11 +216,7 @@ static struct atmel_nand_data __initdata eb_nand_data = {
> /* .rdy_pin = AT91_PIN_PC16, */
> .enable_pin = AT91_PIN_PA15,
> .partition_info = nand_partitions,
> -#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
> - .bus_width_16 = 1,
> -#else
> .bus_width_16 = 0,
> -#endif
> };
>
> static struct sam9_smc_config __initdata eb_nand_smc_config = {
> diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c
> index ee80059..49ef850 100644
> --- a/arch/arm/mach-at91/board-sam9m10g45ek.c
> +++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
> @@ -135,11 +135,7 @@ static struct atmel_nand_data __initdata ek_nand_data = {
> .rdy_pin = AT91_PIN_PC8,
> .enable_pin = AT91_PIN_PC14,
> .partition_info = nand_partitions,
> -#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
> - .bus_width_16 = 1,
> -#else
> .bus_width_16 = 0,
> -#endif
> };
>
> static struct sam9_smc_config __initdata ek_nand_smc_config = {
> --
> 1.7.0.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
Kirill A. Shutemov
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 01/33] Removing dead MTD_NAND_AT91_BUSWIDTH_16
@ 2010-06-30 17:53 ` Kirill A. Shutemov
0 siblings, 0 replies; 221+ messages in thread
From: Kirill A. Shutemov @ 2010-06-30 17:53 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jun 30, 2010 at 05:53:52PM +0200, Christoph Egger wrote:
> MTD_NAND_AT91_BUSWIDTH_16 doesn't exist in Kconfig, therefore removing
> all references for it from the source code.
It was renamed to MTD_NAND_ATMEL_BUSWIDTH_16 (see f6ed6f7).
I think better to rename it here too.
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-at91/board-at572d940hf_ek.c | 4 ----
> arch/arm/mach-at91/board-sam9m10g45ek.c | 4 ----
> 2 files changed, 0 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/mach-at91/board-at572d940hf_ek.c b/arch/arm/mach-at91/board-at572d940hf_ek.c
> index 5daff27..889a442 100644
> --- a/arch/arm/mach-at91/board-at572d940hf_ek.c
> +++ b/arch/arm/mach-at91/board-at572d940hf_ek.c
> @@ -216,11 +216,7 @@ static struct atmel_nand_data __initdata eb_nand_data = {
> /* .rdy_pin = AT91_PIN_PC16, */
> .enable_pin = AT91_PIN_PA15,
> .partition_info = nand_partitions,
> -#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
> - .bus_width_16 = 1,
> -#else
> .bus_width_16 = 0,
> -#endif
> };
>
> static struct sam9_smc_config __initdata eb_nand_smc_config = {
> diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c
> index ee80059..49ef850 100644
> --- a/arch/arm/mach-at91/board-sam9m10g45ek.c
> +++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
> @@ -135,11 +135,7 @@ static struct atmel_nand_data __initdata ek_nand_data = {
> .rdy_pin = AT91_PIN_PC8,
> .enable_pin = AT91_PIN_PC14,
> .partition_info = nand_partitions,
> -#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
> - .bus_width_16 = 1,
> -#else
> .bus_width_16 = 0,
> -#endif
> };
>
> static struct sam9_smc_config __initdata ek_nand_smc_config = {
> --
> 1.7.0.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
Kirill A. Shutemov
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 27/33] Removing dead IDE_PXA_CF
2010-06-30 16:02 ` Christoph Egger
@ 2010-06-30 18:17 ` Marek Vasut
-1 siblings, 0 replies; 221+ messages in thread
From: Marek Vasut @ 2010-06-30 18:17 UTC (permalink / raw)
To: Christoph Egger
Cc: Eric Miao, Russell King, Mike Rapoport, Robert Jarzmik,
linux-arm-kernel, linux-kernel, vamos
Dne St 30. června 2010 18:02:32 Christoph Egger napsal(a):
> IDE_PXA_CF doesn't exist in Kconfig, therefore removing all references
> for it from the source code.
This thing would be on purpose I believe ... maybe documenting it better won't
hurt though.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-pxa/trizeps4.c | 6 +-----
> 1 files changed, 1 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c
> index 6968911..0acff17 100644
> --- a/arch/arm/mach-pxa/trizeps4.c
> +++ b/arch/arm/mach-pxa/trizeps4.c
> @@ -530,13 +530,9 @@ static void __init trizeps4_init(void)
> i2c_register_board_info(0, trizeps4_i2c_devices,
> ARRAY_SIZE(trizeps4_i2c_devices));
>
> -#ifdef CONFIG_IDE_PXA_CF
> - /* if boot direct from compact flash dont disable power */
> - trizeps_conxs_bcr = 0x0009;
> -#else
> /* this is the reset value */
> trizeps_conxs_bcr = 0x00A0;
> -#endif
> +
> BCR_writew(trizeps_conxs_bcr);
> board_backlight_power(1);
> }
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 27/33] Removing dead IDE_PXA_CF
@ 2010-06-30 18:17 ` Marek Vasut
0 siblings, 0 replies; 221+ messages in thread
From: Marek Vasut @ 2010-06-30 18:17 UTC (permalink / raw)
To: linux-arm-kernel
Dne St 30. ?ervna 2010 18:02:32 Christoph Egger napsal(a):
> IDE_PXA_CF doesn't exist in Kconfig, therefore removing all references
> for it from the source code.
This thing would be on purpose I believe ... maybe documenting it better won't
hurt though.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-pxa/trizeps4.c | 6 +-----
> 1 files changed, 1 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c
> index 6968911..0acff17 100644
> --- a/arch/arm/mach-pxa/trizeps4.c
> +++ b/arch/arm/mach-pxa/trizeps4.c
> @@ -530,13 +530,9 @@ static void __init trizeps4_init(void)
> i2c_register_board_info(0, trizeps4_i2c_devices,
> ARRAY_SIZE(trizeps4_i2c_devices));
>
> -#ifdef CONFIG_IDE_PXA_CF
> - /* if boot direct from compact flash dont disable power */
> - trizeps_conxs_bcr = 0x0009;
> -#else
> /* this is the reset value */
> trizeps_conxs_bcr = 0x00A0;
> -#endif
> +
> BCR_writew(trizeps_conxs_bcr);
> board_backlight_power(1);
> }
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 08/33] Removing dead SA1101
2010-06-30 16:57 ` Nicolas Pitre
@ 2010-06-30 18:20 ` Marek Vasut
-1 siblings, 0 replies; 221+ messages in thread
From: Marek Vasut @ 2010-06-30 18:20 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Nicolas Pitre, Christoph Egger, vamos, Russell King, lkml
Dne St 30. června 2010 18:57:43 Nicolas Pitre napsal(a):
> On Wed, 30 Jun 2010, Christoph Egger wrote:
> > SA1101 doesn't exist in Kconfig, therefore removing all
> > references for it from the source code.
> >
> > Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
>
> Acked-by: Nicolas Pitre <nico@fluxnic.net>
You're dropping support for a whole CPU here ... is the code redundant or
something ?
>
> > ---
> >
> > arch/arm/mach-sa1100/include/mach/SA-1101.h | 925
> > -------------------------- arch/arm/mach-sa1100/include/mach/hardware.h
> > | 4 -
> > 2 files changed, 0 insertions(+), 929 deletions(-)
> > delete mode 100644 arch/arm/mach-sa1100/include/mach/SA-1101.h
>
> [...]
>
>
> Nicolas
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 08/33] Removing dead SA1101
@ 2010-06-30 18:20 ` Marek Vasut
0 siblings, 0 replies; 221+ messages in thread
From: Marek Vasut @ 2010-06-30 18:20 UTC (permalink / raw)
To: linux-arm-kernel
Dne St 30. ?ervna 2010 18:57:43 Nicolas Pitre napsal(a):
> On Wed, 30 Jun 2010, Christoph Egger wrote:
> > SA1101 doesn't exist in Kconfig, therefore removing all
> > references for it from the source code.
> >
> > Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
>
> Acked-by: Nicolas Pitre <nico@fluxnic.net>
You're dropping support for a whole CPU here ... is the code redundant or
something ?
>
> > ---
> >
> > arch/arm/mach-sa1100/include/mach/SA-1101.h | 925
> > -------------------------- arch/arm/mach-sa1100/include/mach/hardware.h
> > | 4 -
> > 2 files changed, 0 insertions(+), 929 deletions(-)
> > delete mode 100644 arch/arm/mach-sa1100/include/mach/SA-1101.h
>
> [...]
>
>
> Nicolas
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 22/33] Removing dead MPU_{BRIDGE,TESLA}_IOMMU
2010-06-30 16:01 ` Christoph Egger
@ 2010-06-30 18:23 ` Hiroshi DOYU
-1 siblings, 0 replies; 221+ messages in thread
From: Hiroshi DOYU @ 2010-06-30 18:23 UTC (permalink / raw)
To: siccegge, h-kanigeri2
Cc: tony, linux, linux-omap, linux-arm-kernel, linux-kernel, vamos
From: ext Christoph Egger <siccegge@cs.fau.de>
Subject: [PATCH 22/33] Removing dead MPU_{BRIDGE,TESLA}_IOMMU
Date: Wed, 30 Jun 2010 18:01:01 +0200
> MPU_{BRIDGE,TESLA}_IOMMU doesn't exist in Kconfig, therefore removing
> all references for it from the source code.
Coming soon, I guess. Hari?
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-omap2/omap-iommu.c | 22 ----------------------
> 1 files changed, 0 insertions(+), 22 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c
> index eb9bee7..3aa3fe9 100644
> --- a/arch/arm/mach-omap2/omap-iommu.c
> +++ b/arch/arm/mach-omap2/omap-iommu.c
> @@ -35,17 +35,6 @@ static struct iommu_device omap3_devices[] = {
> .clk_name = "cam_ick",
> },
> },
> -#if defined(CONFIG_MPU_BRIDGE_IOMMU)
> - {
> - .base = 0x5d000000,
> - .irq = 28,
> - .pdata = {
> - .name = "iva2",
> - .nr_tlb_entries = 32,
> - .clk_name = "iva2_ck",
> - },
> - },
> -#endif
> };
> #define NR_OMAP3_IOMMU_DEVICES ARRAY_SIZE(omap3_devices)
> static struct platform_device *omap3_iommu_pdev[NR_OMAP3_IOMMU_DEVICES];
> @@ -66,17 +55,6 @@ static struct iommu_device omap4_devices[] = {
> .clk_name = "ducati_ick",
> },
> },
> -#if defined(CONFIG_MPU_TESLA_IOMMU)
> - {
> - .base = OMAP4_MMU2_BASE,
> - .irq = INT_44XX_DSP_MMU,
> - .pdata = {
> - .name = "tesla",
> - .nr_tlb_entries = 32,
> - .clk_name = "tesla_ick",
> - },
> - },
> -#endif
> };
> #define NR_OMAP4_IOMMU_DEVICES ARRAY_SIZE(omap4_devices)
> static struct platform_device *omap4_iommu_pdev[NR_OMAP4_IOMMU_DEVICES];
> --
> 1.7.0.4
>
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 22/33] Removing dead MPU_{BRIDGE,TESLA}_IOMMU
@ 2010-06-30 18:23 ` Hiroshi DOYU
0 siblings, 0 replies; 221+ messages in thread
From: Hiroshi DOYU @ 2010-06-30 18:23 UTC (permalink / raw)
To: linux-arm-kernel
From: ext Christoph Egger <siccegge@cs.fau.de>
Subject: [PATCH 22/33] Removing dead MPU_{BRIDGE,TESLA}_IOMMU
Date: Wed, 30 Jun 2010 18:01:01 +0200
> MPU_{BRIDGE,TESLA}_IOMMU doesn't exist in Kconfig, therefore removing
> all references for it from the source code.
Coming soon, I guess. Hari?
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-omap2/omap-iommu.c | 22 ----------------------
> 1 files changed, 0 insertions(+), 22 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c
> index eb9bee7..3aa3fe9 100644
> --- a/arch/arm/mach-omap2/omap-iommu.c
> +++ b/arch/arm/mach-omap2/omap-iommu.c
> @@ -35,17 +35,6 @@ static struct iommu_device omap3_devices[] = {
> .clk_name = "cam_ick",
> },
> },
> -#if defined(CONFIG_MPU_BRIDGE_IOMMU)
> - {
> - .base = 0x5d000000,
> - .irq = 28,
> - .pdata = {
> - .name = "iva2",
> - .nr_tlb_entries = 32,
> - .clk_name = "iva2_ck",
> - },
> - },
> -#endif
> };
> #define NR_OMAP3_IOMMU_DEVICES ARRAY_SIZE(omap3_devices)
> static struct platform_device *omap3_iommu_pdev[NR_OMAP3_IOMMU_DEVICES];
> @@ -66,17 +55,6 @@ static struct iommu_device omap4_devices[] = {
> .clk_name = "ducati_ick",
> },
> },
> -#if defined(CONFIG_MPU_TESLA_IOMMU)
> - {
> - .base = OMAP4_MMU2_BASE,
> - .irq = INT_44XX_DSP_MMU,
> - .pdata = {
> - .name = "tesla",
> - .nr_tlb_entries = 32,
> - .clk_name = "tesla_ick",
> - },
> - },
> -#endif
> };
> #define NR_OMAP4_IOMMU_DEVICES ARRAY_SIZE(omap4_devices)
> static struct platform_device *omap4_iommu_pdev[NR_OMAP4_IOMMU_DEVICES];
> --
> 1.7.0.4
>
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 16/33] Removing dead APM
2010-06-30 15:59 ` Christoph Egger
@ 2010-06-30 18:23 ` Marek Vasut
-1 siblings, 0 replies; 221+ messages in thread
From: Marek Vasut @ 2010-06-30 18:23 UTC (permalink / raw)
To: Christoph Egger
Cc: Tony Lindgren, Russell King, Kalle Valo, Ladislav Michl,
Janusz Krzysztofik, Kevin Hilman, linux-omap, linux-arm-kernel,
linux-kernel, vamos
Dne St 30. června 2010 17:59:06 Christoph Egger napsal(a):
> APM doesn't exist in Kconfig, therefore removing all references for it
> from the source code.
Tony, do you know Andrzej Zaborowski's new email address? Maybe he should be
CCed here
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-omap1/board-palmte.c | 84
> ------------------------------------ 1 files changed, 0 insertions(+), 84
> deletions(-)
>
> diff --git a/arch/arm/mach-omap1/board-palmte.c
> b/arch/arm/mach-omap1/board-palmte.c index 569b4c9..23bb0c9 100644
> --- a/arch/arm/mach-omap1/board-palmte.c
> +++ b/arch/arm/mach-omap1/board-palmte.c
> @@ -213,90 +213,6 @@ static struct omap_lcd_config palmte_lcd_config
> __initdata = { .ctrl_name = "internal",
> };
>
> -#ifdef CONFIG_APM
> -/*
> - * Values measured in 10 minute intervals averaged over 10 samples.
> - * May differ slightly from device to device but should be accurate
> - * enough to give basic idea of battery life left and trigger
> - * potential alerts.
> - */
> -static const int palmte_battery_sample[] = {
> - 2194, 2157, 2138, 2120,
> - 2104, 2089, 2075, 2061,
> - 2048, 2038, 2026, 2016,
> - 2008, 1998, 1989, 1980,
> - 1970, 1958, 1945, 1928,
> - 1910, 1888, 1860, 1827,
> - 1791, 1751, 1709, 1656,
> -};
> -
> -#define INTERVAL 10
> -#define BATTERY_HIGH_TRESHOLD 66
> -#define BATTERY_LOW_TRESHOLD 33
> -
> -static void palmte_get_power_status(struct apm_power_info *info, int
> *battery) -{
> - int charging, batt, hi, lo, mid;
> -
> - charging = !gpio_get_value(PALMTE_DC_GPIO);
> - batt = battery[0];
> - if (charging)
> - batt -= 60;
> -
> - hi = ARRAY_SIZE(palmte_battery_sample);
> - lo = 0;
> -
> - info->battery_flag = 0;
> - info->units = APM_UNITS_MINS;
> -
> - if (batt > palmte_battery_sample[lo]) {
> - info->battery_life = 100;
> - info->time = INTERVAL * ARRAY_SIZE(palmte_battery_sample);
> - } else if (batt <= palmte_battery_sample[hi - 1]) {
> - info->battery_life = 0;
> - info->time = 0;
> - } else {
> - while (hi > lo + 1) {
> - mid = (hi + lo) >> 1;
> - if (batt <= palmte_battery_sample[mid])
> - lo = mid;
> - else
> - hi = mid;
> - }
> -
> - mid = palmte_battery_sample[lo] - palmte_battery_sample[hi];
> - hi = palmte_battery_sample[lo] - batt;
> - info->battery_life = 100 - (100 * lo + 100 * hi / mid) /
> - ARRAY_SIZE(palmte_battery_sample);
> - info->time = INTERVAL * (ARRAY_SIZE(palmte_battery_sample) -
> - lo) - INTERVAL * hi / mid;
> - }
> -
> - if (charging) {
> - info->ac_line_status = APM_AC_ONLINE;
> - info->battery_status = APM_BATTERY_STATUS_CHARGING;
> - info->battery_flag |= APM_BATTERY_FLAG_CHARGING;
> - } else {
> - info->ac_line_status = APM_AC_OFFLINE;
> - if (info->battery_life > BATTERY_HIGH_TRESHOLD)
> - info->battery_status = APM_BATTERY_STATUS_HIGH;
> - else if (info->battery_life > BATTERY_LOW_TRESHOLD)
> - info->battery_status = APM_BATTERY_STATUS_LOW;
> - else
> - info->battery_status = APM_BATTERY_STATUS_CRITICAL;
> - }
> -
> - if (info->battery_life > BATTERY_HIGH_TRESHOLD)
> - info->battery_flag |= APM_BATTERY_FLAG_HIGH;
> - else if (info->battery_life > BATTERY_LOW_TRESHOLD)
> - info->battery_flag |= APM_BATTERY_FLAG_LOW;
> - else
> - info->battery_flag |= APM_BATTERY_FLAG_CRITICAL;
> -}
> -#else
> -#define palmte_get_power_status NULL
> -#endif
> -
> static struct omap_board_config_kernel palmte_config[] __initdata = {
> { OMAP_TAG_LCD, &palmte_lcd_config },
> };
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 16/33] Removing dead APM
@ 2010-06-30 18:23 ` Marek Vasut
0 siblings, 0 replies; 221+ messages in thread
From: Marek Vasut @ 2010-06-30 18:23 UTC (permalink / raw)
To: linux-arm-kernel
Dne St 30. ?ervna 2010 17:59:06 Christoph Egger napsal(a):
> APM doesn't exist in Kconfig, therefore removing all references for it
> from the source code.
Tony, do you know Andrzej Zaborowski's new email address? Maybe he should be
CCed here
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-omap1/board-palmte.c | 84
> ------------------------------------ 1 files changed, 0 insertions(+), 84
> deletions(-)
>
> diff --git a/arch/arm/mach-omap1/board-palmte.c
> b/arch/arm/mach-omap1/board-palmte.c index 569b4c9..23bb0c9 100644
> --- a/arch/arm/mach-omap1/board-palmte.c
> +++ b/arch/arm/mach-omap1/board-palmte.c
> @@ -213,90 +213,6 @@ static struct omap_lcd_config palmte_lcd_config
> __initdata = { .ctrl_name = "internal",
> };
>
> -#ifdef CONFIG_APM
> -/*
> - * Values measured in 10 minute intervals averaged over 10 samples.
> - * May differ slightly from device to device but should be accurate
> - * enough to give basic idea of battery life left and trigger
> - * potential alerts.
> - */
> -static const int palmte_battery_sample[] = {
> - 2194, 2157, 2138, 2120,
> - 2104, 2089, 2075, 2061,
> - 2048, 2038, 2026, 2016,
> - 2008, 1998, 1989, 1980,
> - 1970, 1958, 1945, 1928,
> - 1910, 1888, 1860, 1827,
> - 1791, 1751, 1709, 1656,
> -};
> -
> -#define INTERVAL 10
> -#define BATTERY_HIGH_TRESHOLD 66
> -#define BATTERY_LOW_TRESHOLD 33
> -
> -static void palmte_get_power_status(struct apm_power_info *info, int
> *battery) -{
> - int charging, batt, hi, lo, mid;
> -
> - charging = !gpio_get_value(PALMTE_DC_GPIO);
> - batt = battery[0];
> - if (charging)
> - batt -= 60;
> -
> - hi = ARRAY_SIZE(palmte_battery_sample);
> - lo = 0;
> -
> - info->battery_flag = 0;
> - info->units = APM_UNITS_MINS;
> -
> - if (batt > palmte_battery_sample[lo]) {
> - info->battery_life = 100;
> - info->time = INTERVAL * ARRAY_SIZE(palmte_battery_sample);
> - } else if (batt <= palmte_battery_sample[hi - 1]) {
> - info->battery_life = 0;
> - info->time = 0;
> - } else {
> - while (hi > lo + 1) {
> - mid = (hi + lo) >> 1;
> - if (batt <= palmte_battery_sample[mid])
> - lo = mid;
> - else
> - hi = mid;
> - }
> -
> - mid = palmte_battery_sample[lo] - palmte_battery_sample[hi];
> - hi = palmte_battery_sample[lo] - batt;
> - info->battery_life = 100 - (100 * lo + 100 * hi / mid) /
> - ARRAY_SIZE(palmte_battery_sample);
> - info->time = INTERVAL * (ARRAY_SIZE(palmte_battery_sample) -
> - lo) - INTERVAL * hi / mid;
> - }
> -
> - if (charging) {
> - info->ac_line_status = APM_AC_ONLINE;
> - info->battery_status = APM_BATTERY_STATUS_CHARGING;
> - info->battery_flag |= APM_BATTERY_FLAG_CHARGING;
> - } else {
> - info->ac_line_status = APM_AC_OFFLINE;
> - if (info->battery_life > BATTERY_HIGH_TRESHOLD)
> - info->battery_status = APM_BATTERY_STATUS_HIGH;
> - else if (info->battery_life > BATTERY_LOW_TRESHOLD)
> - info->battery_status = APM_BATTERY_STATUS_LOW;
> - else
> - info->battery_status = APM_BATTERY_STATUS_CRITICAL;
> - }
> -
> - if (info->battery_life > BATTERY_HIGH_TRESHOLD)
> - info->battery_flag |= APM_BATTERY_FLAG_HIGH;
> - else if (info->battery_life > BATTERY_LOW_TRESHOLD)
> - info->battery_flag |= APM_BATTERY_FLAG_LOW;
> - else
> - info->battery_flag |= APM_BATTERY_FLAG_CRITICAL;
> -}
> -#else
> -#define palmte_get_power_status NULL
> -#endif
> -
> static struct omap_board_config_kernel palmte_config[] __initdata = {
> { OMAP_TAG_LCD, &palmte_lcd_config },
> };
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 17/33] Removing dead SX1_OLD_FLASH
2010-06-30 15:59 ` Christoph Egger
(?)
@ 2010-06-30 18:24 ` Marek Vasut
-1 siblings, 0 replies; 221+ messages in thread
From: Marek Vasut @ 2010-06-30 18:24 UTC (permalink / raw)
To: Christoph Egger
Cc: Tony Lindgren, Russell King, Kalle Valo, Ladislav Michl,
Janusz Krzysztofik, Kevin Hilman, linux-omap, linux-arm-kernel,
linux-kernel, vamos
Dne St 30. června 2010 17:59:25 Christoph Egger napsal(a):
> SX1_OLD_FLASH doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
There were two models of the phone made, you can toggle between old and new
version. Maybe better documentation won't hurt.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-omap1/board-sx1.c | 26 --------------------------
> 1 files changed, 0 insertions(+), 26 deletions(-)
>
> diff --git a/arch/arm/mach-omap1/board-sx1.c
> b/arch/arm/mach-omap1/board-sx1.c index 2fb1e5f..1de809d 100644
> --- a/arch/arm/mach-omap1/board-sx1.c
> +++ b/arch/arm/mach-omap1/board-sx1.c
> @@ -295,31 +295,6 @@ static struct physmap_flash_data sx1_flash_data = {
> .nr_parts = ARRAY_SIZE(sx1_partitions),
> };
>
> -#ifdef CONFIG_SX1_OLD_FLASH
> -/* MTD Intel StrataFlash - old flashes */
> -static struct resource sx1_old_flash_resource[] = {
> - [0] = {
> - .start = OMAP_CS0_PHYS, /* Physical */
> - .end = OMAP_CS0_PHYS + SZ_16M - 1,,
> - .flags = IORESOURCE_MEM,
> - },
> - [1] = {
> - .start = OMAP_CS1_PHYS,
> - .end = OMAP_CS1_PHYS + SZ_8M - 1,
> - .flags = IORESOURCE_MEM,
> - },
> -};
> -
> -static struct platform_device sx1_flash_device = {
> - .name = "physmap-flash",
> - .id = 0,
> - .dev = {
> - .platform_data = &sx1_flash_data,
> - },
> - .num_resources = 2,
> - .resource = &sx1_old_flash_resource,
> -};
> -#else
> /* MTD Intel 4000 flash - new flashes */
> static struct resource sx1_new_flash_resource = {
> .start = OMAP_CS0_PHYS,
> @@ -336,7 +311,6 @@ static struct platform_device sx1_flash_device = {
> .num_resources = 1,
> .resource = &sx1_new_flash_resource,
> };
> -#endif
>
> /*----------- USB -------------------------*/
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 17/33] Removing dead SX1_OLD_FLASH
@ 2010-06-30 18:24 ` Marek Vasut
0 siblings, 0 replies; 221+ messages in thread
From: Marek Vasut @ 2010-06-30 18:24 UTC (permalink / raw)
To: Christoph Egger
Cc: Kalle Valo, Ladislav Michl, Russell King, Janusz Krzysztofik,
Tony Lindgren, vamos, linux-kernel, Kevin Hilman, linux-omap,
linux-arm-kernel
Dne St 30. června 2010 17:59:25 Christoph Egger napsal(a):
> SX1_OLD_FLASH doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
There were two models of the phone made, you can toggle between old and new
version. Maybe better documentation won't hurt.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-omap1/board-sx1.c | 26 --------------------------
> 1 files changed, 0 insertions(+), 26 deletions(-)
>
> diff --git a/arch/arm/mach-omap1/board-sx1.c
> b/arch/arm/mach-omap1/board-sx1.c index 2fb1e5f..1de809d 100644
> --- a/arch/arm/mach-omap1/board-sx1.c
> +++ b/arch/arm/mach-omap1/board-sx1.c
> @@ -295,31 +295,6 @@ static struct physmap_flash_data sx1_flash_data = {
> .nr_parts = ARRAY_SIZE(sx1_partitions),
> };
>
> -#ifdef CONFIG_SX1_OLD_FLASH
> -/* MTD Intel StrataFlash - old flashes */
> -static struct resource sx1_old_flash_resource[] = {
> - [0] = {
> - .start = OMAP_CS0_PHYS, /* Physical */
> - .end = OMAP_CS0_PHYS + SZ_16M - 1,,
> - .flags = IORESOURCE_MEM,
> - },
> - [1] = {
> - .start = OMAP_CS1_PHYS,
> - .end = OMAP_CS1_PHYS + SZ_8M - 1,
> - .flags = IORESOURCE_MEM,
> - },
> -};
> -
> -static struct platform_device sx1_flash_device = {
> - .name = "physmap-flash",
> - .id = 0,
> - .dev = {
> - .platform_data = &sx1_flash_data,
> - },
> - .num_resources = 2,
> - .resource = &sx1_old_flash_resource,
> -};
> -#else
> /* MTD Intel 4000 flash - new flashes */
> static struct resource sx1_new_flash_resource = {
> .start = OMAP_CS0_PHYS,
> @@ -336,7 +311,6 @@ static struct platform_device sx1_flash_device = {
> .num_resources = 1,
> .resource = &sx1_new_flash_resource,
> };
> -#endif
>
> /*----------- USB -------------------------*/
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 17/33] Removing dead SX1_OLD_FLASH
@ 2010-06-30 18:24 ` Marek Vasut
0 siblings, 0 replies; 221+ messages in thread
From: Marek Vasut @ 2010-06-30 18:24 UTC (permalink / raw)
To: linux-arm-kernel
Dne St 30. ?ervna 2010 17:59:25 Christoph Egger napsal(a):
> SX1_OLD_FLASH doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
There were two models of the phone made, you can toggle between old and new
version. Maybe better documentation won't hurt.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-omap1/board-sx1.c | 26 --------------------------
> 1 files changed, 0 insertions(+), 26 deletions(-)
>
> diff --git a/arch/arm/mach-omap1/board-sx1.c
> b/arch/arm/mach-omap1/board-sx1.c index 2fb1e5f..1de809d 100644
> --- a/arch/arm/mach-omap1/board-sx1.c
> +++ b/arch/arm/mach-omap1/board-sx1.c
> @@ -295,31 +295,6 @@ static struct physmap_flash_data sx1_flash_data = {
> .nr_parts = ARRAY_SIZE(sx1_partitions),
> };
>
> -#ifdef CONFIG_SX1_OLD_FLASH
> -/* MTD Intel StrataFlash - old flashes */
> -static struct resource sx1_old_flash_resource[] = {
> - [0] = {
> - .start = OMAP_CS0_PHYS, /* Physical */
> - .end = OMAP_CS0_PHYS + SZ_16M - 1,,
> - .flags = IORESOURCE_MEM,
> - },
> - [1] = {
> - .start = OMAP_CS1_PHYS,
> - .end = OMAP_CS1_PHYS + SZ_8M - 1,
> - .flags = IORESOURCE_MEM,
> - },
> -};
> -
> -static struct platform_device sx1_flash_device = {
> - .name = "physmap-flash",
> - .id = 0,
> - .dev = {
> - .platform_data = &sx1_flash_data,
> - },
> - .num_resources = 2,
> - .resource = &sx1_old_flash_resource,
> -};
> -#else
> /* MTD Intel 4000 flash - new flashes */
> static struct resource sx1_new_flash_resource = {
> .start = OMAP_CS0_PHYS,
> @@ -336,7 +311,6 @@ static struct platform_device sx1_flash_device = {
> .num_resources = 1,
> .resource = &sx1_new_flash_resource,
> };
> -#endif
>
> /*----------- USB -------------------------*/
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 18/33] Removing dead OMAP_ARM_96MHZ
2010-06-30 15:59 ` Christoph Egger
(?)
@ 2010-06-30 18:25 ` Marek Vasut
-1 siblings, 0 replies; 221+ messages in thread
From: Marek Vasut @ 2010-06-30 18:25 UTC (permalink / raw)
To: Christoph Egger
Cc: Tony Lindgren, Russell King, Paul Walmsley, linux-omap,
linux-arm-kernel, linux-kernel, vamos
Dne St 30. června 2010 17:59:45 Christoph Egger napsal(a):
> OMAP_ARM_96MHZ doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
I'd be for adding it to Kconfig rather than removing from here
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-omap1/opp_data.c | 3 ---
> 1 files changed, 0 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-omap1/opp_data.c
> b/arch/arm/mach-omap1/opp_data.c index 75a5465..060df86 100644
> --- a/arch/arm/mach-omap1/opp_data.c
> +++ b/arch/arm/mach-omap1/opp_data.c
> @@ -45,9 +45,6 @@ struct mpu_rate omap1_rate_table[] = {
> #if defined(CONFIG_OMAP_ARM_120MHZ)
> { 120000000, 12000000, 120000000, 0x010a, 0x2510 }, /* 1/1/1/2/4/4 */
> #endif
> -#if defined(CONFIG_OMAP_ARM_96MHZ)
> - { 96000000, 12000000, 96000000, 0x0005, 0x2410 }, /* 1/1/1/1/2/2 */
> -#endif
> #if defined(CONFIG_OMAP_ARM_60MHZ)
> { 60000000, 12000000, 60000000, 0x0005, 0x2290 }, /* 1/1/1/1/2/2 */
> #endif
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 18/33] Removing dead OMAP_ARM_96MHZ
@ 2010-06-30 18:25 ` Marek Vasut
0 siblings, 0 replies; 221+ messages in thread
From: Marek Vasut @ 2010-06-30 18:25 UTC (permalink / raw)
To: Christoph Egger
Cc: Tony Lindgren, Russell King, Paul Walmsley, linux-omap,
linux-arm-kernel, linux-kernel, vamos
Dne St 30. června 2010 17:59:45 Christoph Egger napsal(a):
> OMAP_ARM_96MHZ doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
I'd be for adding it to Kconfig rather than removing from here
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-omap1/opp_data.c | 3 ---
> 1 files changed, 0 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-omap1/opp_data.c
> b/arch/arm/mach-omap1/opp_data.c index 75a5465..060df86 100644
> --- a/arch/arm/mach-omap1/opp_data.c
> +++ b/arch/arm/mach-omap1/opp_data.c
> @@ -45,9 +45,6 @@ struct mpu_rate omap1_rate_table[] = {
> #if defined(CONFIG_OMAP_ARM_120MHZ)
> { 120000000, 12000000, 120000000, 0x010a, 0x2510 }, /* 1/1/1/2/4/4 */
> #endif
> -#if defined(CONFIG_OMAP_ARM_96MHZ)
> - { 96000000, 12000000, 96000000, 0x0005, 0x2410 }, /* 1/1/1/1/2/2 */
> -#endif
> #if defined(CONFIG_OMAP_ARM_60MHZ)
> { 60000000, 12000000, 60000000, 0x0005, 0x2290 }, /* 1/1/1/1/2/2 */
> #endif
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 18/33] Removing dead OMAP_ARM_96MHZ
@ 2010-06-30 18:25 ` Marek Vasut
0 siblings, 0 replies; 221+ messages in thread
From: Marek Vasut @ 2010-06-30 18:25 UTC (permalink / raw)
To: linux-arm-kernel
Dne St 30. ?ervna 2010 17:59:45 Christoph Egger napsal(a):
> OMAP_ARM_96MHZ doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
I'd be for adding it to Kconfig rather than removing from here
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-omap1/opp_data.c | 3 ---
> 1 files changed, 0 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-omap1/opp_data.c
> b/arch/arm/mach-omap1/opp_data.c index 75a5465..060df86 100644
> --- a/arch/arm/mach-omap1/opp_data.c
> +++ b/arch/arm/mach-omap1/opp_data.c
> @@ -45,9 +45,6 @@ struct mpu_rate omap1_rate_table[] = {
> #if defined(CONFIG_OMAP_ARM_120MHZ)
> { 120000000, 12000000, 120000000, 0x010a, 0x2510 }, /* 1/1/1/2/4/4 */
> #endif
> -#if defined(CONFIG_OMAP_ARM_96MHZ)
> - { 96000000, 12000000, 96000000, 0x0005, 0x2410 }, /* 1/1/1/1/2/2 */
> -#endif
> #if defined(CONFIG_OMAP_ARM_60MHZ)
> { 60000000, 12000000, 60000000, 0x0005, 0x2290 }, /* 1/1/1/1/2/2 */
> #endif
^ permalink raw reply [flat|nested] 221+ messages in thread
* RE: [PATCH 22/33] Removing dead MPU_{BRIDGE,TESLA}_IOMMU
2010-06-30 18:23 ` Hiroshi DOYU
(?)
@ 2010-06-30 18:44 ` Kanigeri, Hari
-1 siblings, 0 replies; 221+ messages in thread
From: Kanigeri, Hari @ 2010-06-30 18:44 UTC (permalink / raw)
To: Hiroshi DOYU, siccegge
Cc: tony, linux, linux-omap, linux-arm-kernel, linux-kernel, vamos
> -----Original Message-----
> From: Hiroshi DOYU [mailto:Hiroshi.DOYU@nokia.com]
> Sent: Wednesday, June 30, 2010 1:24 PM
> To: siccegge@cs.fau.de; Kanigeri, Hari
> Cc: tony@atomide.com; linux@arm.linux.org.uk; linux-omap@vger.kernel.org;
> linux-arm-kernel@lists.infradead.org; linux-kernel@vger.kernel.org;
> vamos@i4.informatik.uni-erlangen.de
> Subject: Re: [PATCH 22/33] Removing dead MPU_{BRIDGE,TESLA}_IOMMU
>
> From: ext Christoph Egger <siccegge@cs.fau.de>
> Subject: [PATCH 22/33] Removing dead MPU_{BRIDGE,TESLA}_IOMMU
> Date: Wed, 30 Jun 2010 18:01:01 +0200
>
> > MPU_{BRIDGE,TESLA}_IOMMU doesn't exist in Kconfig, therefore removing
> > all references for it from the source code.
>
> Coming soon, I guess. Hari?
Coming soon for both Bridge and Tesla. As I am writing this email, Fernando is preparing the Bridge patches to migrate to iommu.
Thank you,
Best regards,
Hari
^ permalink raw reply [flat|nested] 221+ messages in thread
* RE: [PATCH 22/33] Removing dead MPU_{BRIDGE,TESLA}_IOMMU
@ 2010-06-30 18:44 ` Kanigeri, Hari
0 siblings, 0 replies; 221+ messages in thread
From: Kanigeri, Hari @ 2010-06-30 18:44 UTC (permalink / raw)
To: Hiroshi DOYU, siccegge
Cc: tony, linux, linux-omap, linux-arm-kernel, linux-kernel, vamos
> -----Original Message-----
> From: Hiroshi DOYU [mailto:Hiroshi.DOYU@nokia.com]
> Sent: Wednesday, June 30, 2010 1:24 PM
> To: siccegge@cs.fau.de; Kanigeri, Hari
> Cc: tony@atomide.com; linux@arm.linux.org.uk; linux-omap@vger.kernel.org;
> linux-arm-kernel@lists.infradead.org; linux-kernel@vger.kernel.org;
> vamos@i4.informatik.uni-erlangen.de
> Subject: Re: [PATCH 22/33] Removing dead MPU_{BRIDGE,TESLA}_IOMMU
>
> From: ext Christoph Egger <siccegge@cs.fau.de>
> Subject: [PATCH 22/33] Removing dead MPU_{BRIDGE,TESLA}_IOMMU
> Date: Wed, 30 Jun 2010 18:01:01 +0200
>
> > MPU_{BRIDGE,TESLA}_IOMMU doesn't exist in Kconfig, therefore removing
> > all references for it from the source code.
>
> Coming soon, I guess. Hari?
Coming soon for both Bridge and Tesla. As I am writing this email, Fernando is preparing the Bridge patches to migrate to iommu.
Thank you,
Best regards,
Hari
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 22/33] Removing dead MPU_{BRIDGE,TESLA}_IOMMU
@ 2010-06-30 18:44 ` Kanigeri, Hari
0 siblings, 0 replies; 221+ messages in thread
From: Kanigeri, Hari @ 2010-06-30 18:44 UTC (permalink / raw)
To: linux-arm-kernel
> -----Original Message-----
> From: Hiroshi DOYU [mailto:Hiroshi.DOYU at nokia.com]
> Sent: Wednesday, June 30, 2010 1:24 PM
> To: siccegge at cs.fau.de; Kanigeri, Hari
> Cc: tony at atomide.com; linux at arm.linux.org.uk; linux-omap at vger.kernel.org;
> linux-arm-kernel at lists.infradead.org; linux-kernel at vger.kernel.org;
> vamos at i4.informatik.uni-erlangen.de
> Subject: Re: [PATCH 22/33] Removing dead MPU_{BRIDGE,TESLA}_IOMMU
>
> From: ext Christoph Egger <siccegge@cs.fau.de>
> Subject: [PATCH 22/33] Removing dead MPU_{BRIDGE,TESLA}_IOMMU
> Date: Wed, 30 Jun 2010 18:01:01 +0200
>
> > MPU_{BRIDGE,TESLA}_IOMMU doesn't exist in Kconfig, therefore removing
> > all references for it from the source code.
>
> Coming soon, I guess. Hari?
Coming soon for both Bridge and Tesla. As I am writing this email, Fernando is preparing the Bridge patches to migrate to iommu.
Thank you,
Best regards,
Hari
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 08/33] Removing dead SA1101
2010-06-30 18:20 ` Marek Vasut
@ 2010-06-30 18:59 ` Nicolas Pitre
-1 siblings, 0 replies; 221+ messages in thread
From: Nicolas Pitre @ 2010-06-30 18:59 UTC (permalink / raw)
To: Marek Vasut; +Cc: linux-arm-kernel, Christoph Egger, vamos, Russell King, lkml
[-- Attachment #1: Type: TEXT/PLAIN, Size: 959 bytes --]
On Wed, 30 Jun 2010, Marek Vasut wrote:
> Dne St 30. června 2010 18:57:43 Nicolas Pitre napsal(a):
> > On Wed, 30 Jun 2010, Christoph Egger wrote:
> > > SA1101 doesn't exist in Kconfig, therefore removing all
> > > references for it from the source code.
> > >
> > > Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> >
> > Acked-by: Nicolas Pitre <nico@fluxnic.net>
>
> You're dropping support for a whole CPU here ... is the code redundant or
> something ?
The SA1101 is not a CPU. It is a companion chipset for the SA1100. And
so far we have no target using it in the tree, and that isn't likely to
change more than 10 years after the chip availability. Needless to say
that the SA1101 has long been unavailable either.
We also have support for the SA1111 which is a similar companion chipset
for the SA1110. This is not going away as at least the Neponset
expansion board for the Assabet development board is using a SA1111.
Nicolas
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 08/33] Removing dead SA1101
@ 2010-06-30 18:59 ` Nicolas Pitre
0 siblings, 0 replies; 221+ messages in thread
From: Nicolas Pitre @ 2010-06-30 18:59 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, 30 Jun 2010, Marek Vasut wrote:
> Dne St 30. ?ervna 2010 18:57:43 Nicolas Pitre napsal(a):
> > On Wed, 30 Jun 2010, Christoph Egger wrote:
> > > SA1101 doesn't exist in Kconfig, therefore removing all
> > > references for it from the source code.
> > >
> > > Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> >
> > Acked-by: Nicolas Pitre <nico@fluxnic.net>
>
> You're dropping support for a whole CPU here ... is the code redundant or
> something ?
The SA1101 is not a CPU. It is a companion chipset for the SA1100. And
so far we have no target using it in the tree, and that isn't likely to
change more than 10 years after the chip availability. Needless to say
that the SA1101 has long been unavailable either.
We also have support for the SA1111 which is a similar companion chipset
for the SA1110. This is not going away as at least the Neponset
expansion board for the Assabet development board is using a SA1111.
Nicolas
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 02/33] Removing dead ARCH_DAVINCI_TNETV107X
2010-06-30 17:07 ` Baruch Siach
@ 2010-06-30 19:49 ` Kirill A. Shutemov
-1 siblings, 0 replies; 221+ messages in thread
From: Kirill A. Shutemov @ 2010-06-30 19:49 UTC (permalink / raw)
To: Baruch Siach
Cc: Christoph Egger, Kevin Hilman, Sudhakar Rajashekhara,
Russell King, vamos, Steve Chen, linux-kernel, Sandeep Paulraj,
Cyril Chemparathy, linux-arm-kernel
On Wed, Jun 30, 2010 at 08:07:31PM +0300, Baruch Siach wrote:
> Hi Christoph,
>
> On Wed, Jun 30, 2010 at 06:05:38PM +0200, Christoph Egger wrote:
> > ARCH_DAVINCI_TNETV107X doesn't exist in Kconfig, therefore removing
> > all references for it from the source code.
> >
> > Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> > ---
> > arch/arm/mach-davinci/include/mach/cputype.h | 6 ------
> > 1 files changed, 0 insertions(+), 6 deletions(-)
> >
> > diff --git a/arch/arm/mach-davinci/include/mach/cputype.h b/arch/arm/mach-davinci/include/mach/cputype.h
> > index cea6b89..6143022 100644
> > --- a/arch/arm/mach-davinci/include/mach/cputype.h
> > +++ b/arch/arm/mach-davinci/include/mach/cputype.h
> > @@ -85,10 +85,4 @@ IS_DAVINCI_CPU(tnetv107x, DAVINCI_CPU_ID_TNETV107X)
> > #define cpu_is_davinci_da850() 0
> > #endif
> >
> > -#ifdef CONFIG_ARCH_DAVINCI_TNETV107X
> > -#define cpu_is_davinci_tnetv107x() is_davinci_tnetv107x()
> > -#else
> > -#define cpu_is_davinci_tnetv107x() 0
>
> Why remove the #else part?
Nobody uses cpu_is_davinci_tnetv107x as well.
Acked-by: Kirill A. Shutemov <kirill@shutemov.name>
--
Kirill A. Shutemov
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 02/33] Removing dead ARCH_DAVINCI_TNETV107X
@ 2010-06-30 19:49 ` Kirill A. Shutemov
0 siblings, 0 replies; 221+ messages in thread
From: Kirill A. Shutemov @ 2010-06-30 19:49 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jun 30, 2010 at 08:07:31PM +0300, Baruch Siach wrote:
> Hi Christoph,
>
> On Wed, Jun 30, 2010 at 06:05:38PM +0200, Christoph Egger wrote:
> > ARCH_DAVINCI_TNETV107X doesn't exist in Kconfig, therefore removing
> > all references for it from the source code.
> >
> > Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> > ---
> > arch/arm/mach-davinci/include/mach/cputype.h | 6 ------
> > 1 files changed, 0 insertions(+), 6 deletions(-)
> >
> > diff --git a/arch/arm/mach-davinci/include/mach/cputype.h b/arch/arm/mach-davinci/include/mach/cputype.h
> > index cea6b89..6143022 100644
> > --- a/arch/arm/mach-davinci/include/mach/cputype.h
> > +++ b/arch/arm/mach-davinci/include/mach/cputype.h
> > @@ -85,10 +85,4 @@ IS_DAVINCI_CPU(tnetv107x, DAVINCI_CPU_ID_TNETV107X)
> > #define cpu_is_davinci_da850() 0
> > #endif
> >
> > -#ifdef CONFIG_ARCH_DAVINCI_TNETV107X
> > -#define cpu_is_davinci_tnetv107x() is_davinci_tnetv107x()
> > -#else
> > -#define cpu_is_davinci_tnetv107x() 0
>
> Why remove the #else part?
Nobody uses cpu_is_davinci_tnetv107x as well.
Acked-by: Kirill A. Shutemov <kirill@shutemov.name>
--
Kirill A. Shutemov
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 03/33] Removing dead OMAP_MUX_ERRORS
2010-06-30 15:54 ` Christoph Egger
@ 2010-06-30 19:54 ` Kirill A. Shutemov
-1 siblings, 0 replies; 221+ messages in thread
From: Kirill A. Shutemov @ 2010-06-30 19:54 UTC (permalink / raw)
To: Christoph Egger
Cc: Tony Lindgren, Russell King, Cory Maccarrone,
Zebediah C. McClure, Alistair Buxton, linux-omap,
linux-arm-kernel, linux-kernel, vamos
On Wed, Jun 30, 2010 at 05:54:42PM +0200, Christoph Egger wrote:
> OMAP_MUX_ERRORS doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
IIUC, CONFIG_OMAP_MUX_WARNINGS should be used here instead of it.
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-omap1/mux.c | 5 -----
> 1 files changed, 0 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c
> index 8434137..1ddb02c 100644
> --- a/arch/arm/mach-omap1/mux.c
> +++ b/arch/arm/mach-omap1/mux.c
> @@ -439,12 +439,7 @@ int __init_or_module omap1_cfg_reg(const struct pin_config *cfg)
> cfg->pull_name, cfg->pull_reg, pull_orig, pull);
> }
> #endif
> -
> -#ifdef CONFIG_OMAP_MUX_ERRORS
> - return warn ? -ETXTBSY : 0;
> -#else
> return 0;
> -#endif
> }
>
> int __init omap1_mux_init(void)
> --
> 1.7.0.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
Kirill A. Shutemov
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 03/33] Removing dead OMAP_MUX_ERRORS
@ 2010-06-30 19:54 ` Kirill A. Shutemov
0 siblings, 0 replies; 221+ messages in thread
From: Kirill A. Shutemov @ 2010-06-30 19:54 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jun 30, 2010 at 05:54:42PM +0200, Christoph Egger wrote:
> OMAP_MUX_ERRORS doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
IIUC, CONFIG_OMAP_MUX_WARNINGS should be used here instead of it.
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-omap1/mux.c | 5 -----
> 1 files changed, 0 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c
> index 8434137..1ddb02c 100644
> --- a/arch/arm/mach-omap1/mux.c
> +++ b/arch/arm/mach-omap1/mux.c
> @@ -439,12 +439,7 @@ int __init_or_module omap1_cfg_reg(const struct pin_config *cfg)
> cfg->pull_name, cfg->pull_reg, pull_orig, pull);
> }
> #endif
> -
> -#ifdef CONFIG_OMAP_MUX_ERRORS
> - return warn ? -ETXTBSY : 0;
> -#else
> return 0;
> -#endif
> }
>
> int __init omap1_mux_init(void)
> --
> 1.7.0.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
Kirill A. Shutemov
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 04/33] Removing dead MSM7X00A_IDLE
2010-06-30 15:55 ` Christoph Egger
@ 2010-06-30 19:59 ` Kirill A. Shutemov
-1 siblings, 0 replies; 221+ messages in thread
From: Kirill A. Shutemov @ 2010-06-30 19:59 UTC (permalink / raw)
To: Christoph Egger
Cc: David Brown, Daniel Walker, Bryan Huntsman, Russell King,
linux-arm-msm, linux-arm-kernel, linux-kernel, vamos,
Brian Swetland
On Wed, Jun 30, 2010 at 05:55:03PM +0200, Christoph Egger wrote:
> MSM7X00A_IDLE doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
It was removed in commit 1637de0c9. I'm not sure if it's correct.
Brian Swetland added to CC list.
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-msm/idle.S | 13 -------------
> 1 files changed, 0 insertions(+), 13 deletions(-)
>
> diff --git a/arch/arm/mach-msm/idle.S b/arch/arm/mach-msm/idle.S
> index 6a94f05..d8e8027 100644
> --- a/arch/arm/mach-msm/idle.S
> +++ b/arch/arm/mach-msm/idle.S
> @@ -20,17 +20,4 @@
> #include <asm/assembler.h>
>
> ENTRY(arch_idle)
> -#ifdef CONFIG_MSM7X00A_IDLE
> - mrc p15, 0, r1, c1, c0, 0 /* read current CR */
> - bic r0, r1, #(1 << 2) /* clear dcache bit */
> - bic r0, r0, #(1 << 12) /* clear icache bit */
> - mcr p15, 0, r0, c1, c0, 0 /* disable d/i cache */
> -
> - mov r0, #0 /* prepare wfi value */
> - mcr p15, 0, r0, c7, c10, 0 /* flush the cache */
> - mcr p15, 0, r0, c7, c10, 4 /* memory barrier */
> - mcr p15, 0, r0, c7, c0, 4 /* wait for interrupt */
> -
> - mcr p15, 0, r1, c1, c0, 0 /* restore d/i cache */
> -#endif
> mov pc, lr
> --
> 1.7.0.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
Kirill A. Shutemov
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 04/33] Removing dead MSM7X00A_IDLE
@ 2010-06-30 19:59 ` Kirill A. Shutemov
0 siblings, 0 replies; 221+ messages in thread
From: Kirill A. Shutemov @ 2010-06-30 19:59 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jun 30, 2010 at 05:55:03PM +0200, Christoph Egger wrote:
> MSM7X00A_IDLE doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
It was removed in commit 1637de0c9. I'm not sure if it's correct.
Brian Swetland added to CC list.
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-msm/idle.S | 13 -------------
> 1 files changed, 0 insertions(+), 13 deletions(-)
>
> diff --git a/arch/arm/mach-msm/idle.S b/arch/arm/mach-msm/idle.S
> index 6a94f05..d8e8027 100644
> --- a/arch/arm/mach-msm/idle.S
> +++ b/arch/arm/mach-msm/idle.S
> @@ -20,17 +20,4 @@
> #include <asm/assembler.h>
>
> ENTRY(arch_idle)
> -#ifdef CONFIG_MSM7X00A_IDLE
> - mrc p15, 0, r1, c1, c0, 0 /* read current CR */
> - bic r0, r1, #(1 << 2) /* clear dcache bit */
> - bic r0, r0, #(1 << 12) /* clear icache bit */
> - mcr p15, 0, r0, c1, c0, 0 /* disable d/i cache */
> -
> - mov r0, #0 /* prepare wfi value */
> - mcr p15, 0, r0, c7, c10, 0 /* flush the cache */
> - mcr p15, 0, r0, c7, c10, 4 /* memory barrier */
> - mcr p15, 0, r0, c7, c0, 4 /* wait for interrupt */
> -
> - mcr p15, 0, r1, c1, c0, 0 /* restore d/i cache */
> -#endif
> mov pc, lr
> --
> 1.7.0.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
Kirill A. Shutemov
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 04/33] Removing dead MSM7X00A_IDLE
2010-06-30 19:59 ` Kirill A. Shutemov
@ 2010-06-30 20:03 ` Daniel Walker
-1 siblings, 0 replies; 221+ messages in thread
From: Daniel Walker @ 2010-06-30 20:03 UTC (permalink / raw)
To: Kirill A. Shutemov
Cc: Christoph Egger, David Brown, Bryan Huntsman, Russell King,
linux-arm-msm, linux-arm-kernel, linux-kernel, vamos,
Brian Swetland
On Wed, 2010-06-30 at 22:59 +0300, Kirill A. Shutemov wrote:
> On Wed, Jun 30, 2010 at 05:55:03PM +0200, Christoph Egger wrote:
> > MSM7X00A_IDLE doesn't exist in Kconfig, therefore removing all
> > references for it from the source code.
>
> It was removed in commit 1637de0c9. I'm not sure if it's correct.
>
> Brian Swetland added to CC list.
Yeah, it looks like it was missed in the original commit.
Daniel
--
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 04/33] Removing dead MSM7X00A_IDLE
@ 2010-06-30 20:03 ` Daniel Walker
0 siblings, 0 replies; 221+ messages in thread
From: Daniel Walker @ 2010-06-30 20:03 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, 2010-06-30 at 22:59 +0300, Kirill A. Shutemov wrote:
> On Wed, Jun 30, 2010 at 05:55:03PM +0200, Christoph Egger wrote:
> > MSM7X00A_IDLE doesn't exist in Kconfig, therefore removing all
> > references for it from the source code.
>
> It was removed in commit 1637de0c9. I'm not sure if it's correct.
>
> Brian Swetland added to CC list.
Yeah, it looks like it was missed in the original commit.
Daniel
--
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 02/33] Removing dead ARCH_DAVINCI_TNETV107X
2010-06-30 16:05 ` Christoph Egger
@ 2010-06-30 20:36 ` Kevin Hilman
-1 siblings, 0 replies; 221+ messages in thread
From: Kevin Hilman @ 2010-06-30 20:36 UTC (permalink / raw)
To: Christoph Egger
Cc: Kevin Hilman, Russell King, Sandeep Paulraj,
Sudhakar Rajashekhara, Steve Chen, Cyril Chemparathy,
linux-arm-kernel, linux-kernel, vamos
Christoph Egger <siccegge@cs.fau.de> writes:
> ARCH_DAVINCI_TNETV107X doesn't exist in Kconfig, therefore removing
> all references for it from the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
Please leave this define in.
The full support for this platform is currently in linux-next and will
be merged for 2.6.36.
Kevin
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 02/33] Removing dead ARCH_DAVINCI_TNETV107X
@ 2010-06-30 20:36 ` Kevin Hilman
0 siblings, 0 replies; 221+ messages in thread
From: Kevin Hilman @ 2010-06-30 20:36 UTC (permalink / raw)
To: linux-arm-kernel
Christoph Egger <siccegge@cs.fau.de> writes:
> ARCH_DAVINCI_TNETV107X doesn't exist in Kconfig, therefore removing
> all references for it from the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
Please leave this define in.
The full support for this platform is currently in linux-next and will
be merged for 2.6.36.
Kevin
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 31/33] Removing dead MACH_U300_BS26
2010-06-30 16:03 ` Christoph Egger
@ 2010-06-30 22:00 ` Linus Walleij
-1 siblings, 0 replies; 221+ messages in thread
From: Linus Walleij @ 2010-06-30 22:00 UTC (permalink / raw)
To: Christoph Egger
Cc: Russell King, Jiri Kosina, Daniel Mack, linux-arm-kernel,
linux-kernel, vamos
2010/6/30 Christoph Egger <siccegge@cs.fau.de>:
> MACH_U300_BS26 doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
OK then,
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 31/33] Removing dead MACH_U300_BS26
@ 2010-06-30 22:00 ` Linus Walleij
0 siblings, 0 replies; 221+ messages in thread
From: Linus Walleij @ 2010-06-30 22:00 UTC (permalink / raw)
To: linux-arm-kernel
2010/6/30 Christoph Egger <siccegge@cs.fau.de>:
> MACH_U300_BS26 doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
OK then,
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 33/33] Removing dead MACH_U300_USE_I2S_AS_MASTER
2010-06-30 16:04 ` Christoph Egger
@ 2010-06-30 22:03 ` Linus Walleij
-1 siblings, 0 replies; 221+ messages in thread
From: Linus Walleij @ 2010-06-30 22:03 UTC (permalink / raw)
To: Christoph Egger
Cc: Russell King, H Hartley Sweeten, Eric Miao, Kevin Hilman,
linux-arm-kernel, linux-kernel, vamos
2010/6/30 Christoph Egger <siccegge@cs.fau.de>:
> MACH_U300_USE_I2S_AS_MASTER doesn't exist in Kconfig, therefore
> removing all references for it from the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
I remember the pain of writing that code, but until I get around to merge that
ancient driver I see no point in keeping it around, so:
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 33/33] Removing dead MACH_U300_USE_I2S_AS_MASTER
@ 2010-06-30 22:03 ` Linus Walleij
0 siblings, 0 replies; 221+ messages in thread
From: Linus Walleij @ 2010-06-30 22:03 UTC (permalink / raw)
To: linux-arm-kernel
2010/6/30 Christoph Egger <siccegge@cs.fau.de>:
> MACH_U300_USE_I2S_AS_MASTER doesn't exist in Kconfig, therefore
> removing all references for it from the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
I remember the pain of writing that code, but until I get around to merge that
ancient driver I see no point in keeping it around, so:
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 06/33] Removing dead SHARPSL_LOCOMO
2010-06-30 15:55 ` Christoph Egger
(?)
@ 2010-06-30 23:12 ` Dmitry Eremin-Solenikov
-1 siblings, 0 replies; 221+ messages in thread
From: Dmitry Eremin-Solenikov @ 2010-06-30 23:12 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-arm-kernel
Christoph Egger wrote:
> SHARPSL_LOCOMO doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
Hmmm. Shouldn't this be instead just SHARP_LOCOMO?
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de> ---
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 08/33] Removing dead SA1101
2010-06-30 18:59 ` Nicolas Pitre
@ 2010-07-01 0:01 ` Marek Vasut
-1 siblings, 0 replies; 221+ messages in thread
From: Marek Vasut @ 2010-07-01 0:01 UTC (permalink / raw)
To: Nicolas Pitre
Cc: linux-arm-kernel, Christoph Egger, vamos, Russell King, lkml
Dne St 30. června 2010 20:59:05 Nicolas Pitre napsal(a):
> On Wed, 30 Jun 2010, Marek Vasut wrote:
> > Dne St 30. června 2010 18:57:43 Nicolas Pitre napsal(a):
> > > On Wed, 30 Jun 2010, Christoph Egger wrote:
> > > > SA1101 doesn't exist in Kconfig, therefore removing all
> > > > references for it from the source code.
> > > >
> > > > Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> > >
> > > Acked-by: Nicolas Pitre <nico@fluxnic.net>
> >
> > You're dropping support for a whole CPU here ... is the code redundant or
> > something ?
>
> The SA1101 is not a CPU. It is a companion chipset for the SA1100. And
> so far we have no target using it in the tree, and that isn't likely to
> change more than 10 years after the chip availability. Needless to say
> that the SA1101 has long been unavailable either.
>
> We also have support for the SA1111 which is a similar companion chipset
> for the SA1110. This is not going away as at least the Neponset
> expansion board for the Assabet development board is using a SA1111.
>
>
> Nicolas
Oh I see. Thanks for clearing that.
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 08/33] Removing dead SA1101
@ 2010-07-01 0:01 ` Marek Vasut
0 siblings, 0 replies; 221+ messages in thread
From: Marek Vasut @ 2010-07-01 0:01 UTC (permalink / raw)
To: linux-arm-kernel
Dne St 30. ?ervna 2010 20:59:05 Nicolas Pitre napsal(a):
> On Wed, 30 Jun 2010, Marek Vasut wrote:
> > Dne St 30. ?ervna 2010 18:57:43 Nicolas Pitre napsal(a):
> > > On Wed, 30 Jun 2010, Christoph Egger wrote:
> > > > SA1101 doesn't exist in Kconfig, therefore removing all
> > > > references for it from the source code.
> > > >
> > > > Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> > >
> > > Acked-by: Nicolas Pitre <nico@fluxnic.net>
> >
> > You're dropping support for a whole CPU here ... is the code redundant or
> > something ?
>
> The SA1101 is not a CPU. It is a companion chipset for the SA1100. And
> so far we have no target using it in the tree, and that isn't likely to
> change more than 10 years after the chip availability. Needless to say
> that the SA1101 has long been unavailable either.
>
> We also have support for the SA1111 which is a similar companion chipset
> for the SA1110. This is not going away as at least the Neponset
> expansion board for the Assabet development board is using a SA1111.
>
>
> Nicolas
Oh I see. Thanks for clearing that.
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 06/33] Removing dead SHARPSL_LOCOMO
2010-06-30 15:55 ` Christoph Egger
@ 2010-07-01 2:34 ` Eric Miao
-1 siblings, 0 replies; 221+ messages in thread
From: Eric Miao @ 2010-07-01 2:34 UTC (permalink / raw)
To: Christoph Egger; +Cc: Russell King, linux-arm-kernel, linux-kernel, vamos
On Wed, Jun 30, 2010 at 11:55 PM, Christoph Egger <siccegge@cs.fau.de> wrote:
> SHARPSL_LOCOMO doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
>
A good catch, though SHARPSL_LOCOMO has be changed to SHARP_LOCOMO
later, so a better fix would be the name change only.
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-sa1100/include/mach/irqs.h | 2 --
> 1 files changed, 0 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-sa1100/include/mach/irqs.h b/arch/arm/mach-sa1100/include/mach/irqs.h
> index 8c8845b..123c6c9 100644
> --- a/arch/arm/mach-sa1100/include/mach/irqs.h
> +++ b/arch/arm/mach-sa1100/include/mach/irqs.h
> @@ -77,8 +77,6 @@
> */
> #ifdef CONFIG_SA1111
> #define NR_IRQS (IRQ_BOARD_END + 55)
> -#elif defined(CONFIG_SHARPSL_LOCOMO)
> -#define NR_IRQS (IRQ_BOARD_START + 4)
> #else
> #define NR_IRQS (IRQ_BOARD_START)
> #endif
> --
> 1.7.0.4
>
>
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 06/33] Removing dead SHARPSL_LOCOMO
@ 2010-07-01 2:34 ` Eric Miao
0 siblings, 0 replies; 221+ messages in thread
From: Eric Miao @ 2010-07-01 2:34 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jun 30, 2010 at 11:55 PM, Christoph Egger <siccegge@cs.fau.de> wrote:
> SHARPSL_LOCOMO doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
>
A good catch, though SHARPSL_LOCOMO has be changed to SHARP_LOCOMO
later, so a better fix would be the name change only.
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> ?arch/arm/mach-sa1100/include/mach/irqs.h | ? ?2 --
> ?1 files changed, 0 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-sa1100/include/mach/irqs.h b/arch/arm/mach-sa1100/include/mach/irqs.h
> index 8c8845b..123c6c9 100644
> --- a/arch/arm/mach-sa1100/include/mach/irqs.h
> +++ b/arch/arm/mach-sa1100/include/mach/irqs.h
> @@ -77,8 +77,6 @@
> ?*/
> ?#ifdef CONFIG_SA1111
> ?#define NR_IRQS ? ? ? ? ? ? ? ? ? ? ? ?(IRQ_BOARD_END + 55)
> -#elif defined(CONFIG_SHARPSL_LOCOMO)
> -#define NR_IRQS ? ? ? ? ? ? ? ? ? ? ? ?(IRQ_BOARD_START + 4)
> ?#else
> ?#define NR_IRQS ? ? ? ? ? ? ? ? ? ? ? ?(IRQ_BOARD_START)
> ?#endif
> --
> 1.7.0.4
>
>
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 27/33] Removing dead IDE_PXA_CF
2010-06-30 16:02 ` Christoph Egger
@ 2010-07-01 2:56 ` Eric Miao
-1 siblings, 0 replies; 221+ messages in thread
From: Eric Miao @ 2010-07-01 2:56 UTC (permalink / raw)
To: Christoph Egger
Cc: Russell King, Mike Rapoport, Robert Jarzmik, Marek Vasut,
linux-arm-kernel, linux-kernel, vamos, Jurgen Schindele
On Thu, Jul 1, 2010 at 12:02 AM, Christoph Egger <siccegge@cs.fau.de> wrote:
> IDE_PXA_CF doesn't exist in Kconfig, therefore removing all references
> for it from the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Include Jurgen though, in case he has any idea.
> ---
> arch/arm/mach-pxa/trizeps4.c | 6 +-----
> 1 files changed, 1 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c
> index 6968911..0acff17 100644
> --- a/arch/arm/mach-pxa/trizeps4.c
> +++ b/arch/arm/mach-pxa/trizeps4.c
> @@ -530,13 +530,9 @@ static void __init trizeps4_init(void)
> i2c_register_board_info(0, trizeps4_i2c_devices,
> ARRAY_SIZE(trizeps4_i2c_devices));
>
> -#ifdef CONFIG_IDE_PXA_CF
> - /* if boot direct from compact flash dont disable power */
> - trizeps_conxs_bcr = 0x0009;
> -#else
> /* this is the reset value */
> trizeps_conxs_bcr = 0x00A0;
> -#endif
> +
> BCR_writew(trizeps_conxs_bcr);
> board_backlight_power(1);
> }
> --
> 1.7.0.4
>
>
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 27/33] Removing dead IDE_PXA_CF
@ 2010-07-01 2:56 ` Eric Miao
0 siblings, 0 replies; 221+ messages in thread
From: Eric Miao @ 2010-07-01 2:56 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 1, 2010 at 12:02 AM, Christoph Egger <siccegge@cs.fau.de> wrote:
> IDE_PXA_CF doesn't exist in Kconfig, therefore removing all references
> for it from the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Include Jurgen though, in case he has any idea.
> ---
> ?arch/arm/mach-pxa/trizeps4.c | ? ?6 +-----
> ?1 files changed, 1 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c
> index 6968911..0acff17 100644
> --- a/arch/arm/mach-pxa/trizeps4.c
> +++ b/arch/arm/mach-pxa/trizeps4.c
> @@ -530,13 +530,9 @@ static void __init trizeps4_init(void)
> ? ? ? ?i2c_register_board_info(0, trizeps4_i2c_devices,
> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?ARRAY_SIZE(trizeps4_i2c_devices));
>
> -#ifdef CONFIG_IDE_PXA_CF
> - ? ? ? /* if boot direct from compact flash dont disable power */
> - ? ? ? trizeps_conxs_bcr = 0x0009;
> -#else
> ? ? ? ?/* this is the reset value */
> ? ? ? ?trizeps_conxs_bcr = 0x00A0;
> -#endif
> +
> ? ? ? ?BCR_writew(trizeps_conxs_bcr);
> ? ? ? ?board_backlight_power(1);
> ?}
> --
> 1.7.0.4
>
>
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 23/33] Removing dead BACKLIGHT_CORGI
2010-06-30 16:01 ` Christoph Egger
@ 2010-07-01 3:50 ` Eric Miao
-1 siblings, 0 replies; 221+ messages in thread
From: Eric Miao @ 2010-07-01 3:50 UTC (permalink / raw)
To: Christoph Egger
Cc: Russell King, Pavel Machek, Arnaud Patard, Uwe Kleine-K??nig,
Kristoffer Ericson, linux-arm-kernel, linux-kernel, vamos,
Richard Purdie
On Thu, Jul 1, 2010 at 12:01 AM, Christoph Egger <siccegge@cs.fau.de> wrote:
> BACKLIGHT_CORGI doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
BACKLIGHT_CORGI was renamed to BACKLIGHT_GENERIC in commit
d00ba726725c6f41e43df00f83e484ba8f9fac5c.
Since it's now safe to completely transition to LCD_CORGI, which not only
includes the backlight functionality but also the LCD, so
Acked-by: Eric Miao <eric.y.miao@gmail.com>
> ---
> arch/arm/mach-pxa/corgi_pm.c | 2 --
> arch/arm/mach-pxa/sharpsl_pm.c | 15 ---------------
> arch/arm/mach-pxa/spitz_pm.c | 2 --
> 3 files changed, 0 insertions(+), 19 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/corgi_pm.c b/arch/arm/mach-pxa/corgi_pm.c
> index 3f1dc74..a735205 100644
> --- a/arch/arm/mach-pxa/corgi_pm.c
> +++ b/arch/arm/mach-pxa/corgi_pm.c
> @@ -165,8 +165,6 @@ static struct sharpsl_charger_machinfo corgi_pm_machinfo = {
> .should_wakeup = corgi_should_wakeup,
> #if defined(CONFIG_LCD_CORGI)
> .backlight_limit = corgi_lcd_limit_intensity,
> -#elif defined(CONFIG_BACKLIGHT_CORGI)
> - .backlight_limit = corgibl_limit_intensity,
> #endif
> .charge_on_volt = SHARPSL_CHARGE_ON_VOLT,
> .charge_on_temp = SHARPSL_CHARGE_ON_TEMP,
> diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
> index cb47672..582701e 100644
> --- a/arch/arm/mach-pxa/sharpsl_pm.c
> +++ b/arch/arm/mach-pxa/sharpsl_pm.c
> @@ -277,21 +277,6 @@ static void sharpsl_battery_thread(struct work_struct *private_)
> dev_dbg(sharpsl_pm.dev, "Battery: voltage: %d, status: %d, percentage: %d, time: %ld\n", voltage,
> sharpsl_pm.battstat.mainbat_status, sharpsl_pm.battstat.mainbat_percent, jiffies);
>
> -#ifdef CONFIG_BACKLIGHT_CORGI
> - /* If battery is low. limit backlight intensity to save power. */
> - if ((sharpsl_pm.battstat.ac_status != APM_AC_ONLINE)
> - && ((sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_LOW)
> - || (sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_CRITICAL))) {
> - if (!(sharpsl_pm.flags & SHARPSL_BL_LIMIT)) {
> - sharpsl_pm.machinfo->backlight_limit(1);
> - sharpsl_pm.flags |= SHARPSL_BL_LIMIT;
> - }
> - } else if (sharpsl_pm.flags & SHARPSL_BL_LIMIT) {
> - sharpsl_pm.machinfo->backlight_limit(0);
> - sharpsl_pm.flags &= ~SHARPSL_BL_LIMIT;
> - }
> -#endif
> -
> /* Suspend if critical battery level */
> if ((sharpsl_pm.battstat.ac_status != APM_AC_ONLINE)
> && (sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_CRITICAL)
> diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c
> index 4209ddf..b36f0ae 100644
> --- a/arch/arm/mach-pxa/spitz_pm.c
> +++ b/arch/arm/mach-pxa/spitz_pm.c
> @@ -212,8 +212,6 @@ struct sharpsl_charger_machinfo spitz_pm_machinfo = {
> .should_wakeup = spitz_should_wakeup,
> #if defined(CONFIG_LCD_CORGI)
> .backlight_limit = corgi_lcd_limit_intensity,
> -#elif defined(CONFIG_BACKLIGHT_CORGI)
> - .backlight_limit = corgibl_limit_intensity,
> #endif
> .charge_on_volt = SHARPSL_CHARGE_ON_VOLT,
> .charge_on_temp = SHARPSL_CHARGE_ON_TEMP,
> --
> 1.7.0.4
>
>
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 23/33] Removing dead BACKLIGHT_CORGI
@ 2010-07-01 3:50 ` Eric Miao
0 siblings, 0 replies; 221+ messages in thread
From: Eric Miao @ 2010-07-01 3:50 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 1, 2010 at 12:01 AM, Christoph Egger <siccegge@cs.fau.de> wrote:
> BACKLIGHT_CORGI doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
BACKLIGHT_CORGI was renamed to BACKLIGHT_GENERIC in commit
d00ba726725c6f41e43df00f83e484ba8f9fac5c.
Since it's now safe to completely transition to LCD_CORGI, which not only
includes the backlight functionality but also the LCD, so
Acked-by: Eric Miao <eric.y.miao@gmail.com>
> ---
> ?arch/arm/mach-pxa/corgi_pm.c ? | ? ?2 --
> ?arch/arm/mach-pxa/sharpsl_pm.c | ? 15 ---------------
> ?arch/arm/mach-pxa/spitz_pm.c ? | ? ?2 --
> ?3 files changed, 0 insertions(+), 19 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/corgi_pm.c b/arch/arm/mach-pxa/corgi_pm.c
> index 3f1dc74..a735205 100644
> --- a/arch/arm/mach-pxa/corgi_pm.c
> +++ b/arch/arm/mach-pxa/corgi_pm.c
> @@ -165,8 +165,6 @@ static struct sharpsl_charger_machinfo corgi_pm_machinfo = {
> ? ? ? ?.should_wakeup ? = corgi_should_wakeup,
> ?#if defined(CONFIG_LCD_CORGI)
> ? ? ? ?.backlight_limit = corgi_lcd_limit_intensity,
> -#elif defined(CONFIG_BACKLIGHT_CORGI)
> - ? ? ? .backlight_limit = corgibl_limit_intensity,
> ?#endif
> ? ? ? ?.charge_on_volt ? = SHARPSL_CHARGE_ON_VOLT,
> ? ? ? ?.charge_on_temp ? = SHARPSL_CHARGE_ON_TEMP,
> diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
> index cb47672..582701e 100644
> --- a/arch/arm/mach-pxa/sharpsl_pm.c
> +++ b/arch/arm/mach-pxa/sharpsl_pm.c
> @@ -277,21 +277,6 @@ static void sharpsl_battery_thread(struct work_struct *private_)
> ? ? ? ?dev_dbg(sharpsl_pm.dev, "Battery: voltage: %d, status: %d, percentage: %d, time: %ld\n", voltage,
> ? ? ? ? ? ? ? ? ? ? ? ?sharpsl_pm.battstat.mainbat_status, sharpsl_pm.battstat.mainbat_percent, jiffies);
>
> -#ifdef CONFIG_BACKLIGHT_CORGI
> - ? ? ? /* If battery is low. limit backlight intensity to save power. */
> - ? ? ? if ((sharpsl_pm.battstat.ac_status != APM_AC_ONLINE)
> - ? ? ? ? ? && ((sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_LOW)
> - ? ? ? ? ? || (sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_CRITICAL))) {
> - ? ? ? ? ? ? ? if (!(sharpsl_pm.flags & SHARPSL_BL_LIMIT)) {
> - ? ? ? ? ? ? ? ? ? ? ? sharpsl_pm.machinfo->backlight_limit(1);
> - ? ? ? ? ? ? ? ? ? ? ? sharpsl_pm.flags |= SHARPSL_BL_LIMIT;
> - ? ? ? ? ? ? ? }
> - ? ? ? } else if (sharpsl_pm.flags & SHARPSL_BL_LIMIT) {
> - ? ? ? ? ? ? ? sharpsl_pm.machinfo->backlight_limit(0);
> - ? ? ? ? ? ? ? sharpsl_pm.flags &= ~SHARPSL_BL_LIMIT;
> - ? ? ? }
> -#endif
> -
> ? ? ? ?/* Suspend if critical battery level */
> ? ? ? ?if ((sharpsl_pm.battstat.ac_status != APM_AC_ONLINE)
> ? ? ? ? ? ? && (sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_CRITICAL)
> diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c
> index 4209ddf..b36f0ae 100644
> --- a/arch/arm/mach-pxa/spitz_pm.c
> +++ b/arch/arm/mach-pxa/spitz_pm.c
> @@ -212,8 +212,6 @@ struct sharpsl_charger_machinfo spitz_pm_machinfo = {
> ? ? ? ?.should_wakeup ? ?= spitz_should_wakeup,
> ?#if defined(CONFIG_LCD_CORGI)
> ? ? ? ?.backlight_limit = corgi_lcd_limit_intensity,
> -#elif defined(CONFIG_BACKLIGHT_CORGI)
> - ? ? ? .backlight_limit ?= corgibl_limit_intensity,
> ?#endif
> ? ? ? ?.charge_on_volt ? = SHARPSL_CHARGE_ON_VOLT,
> ? ? ? ?.charge_on_temp ? = SHARPSL_CHARGE_ON_TEMP,
> --
> 1.7.0.4
>
>
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 26/33] Removing dead XSCALE_CACHE_ERRATA
2010-06-30 16:02 ` Christoph Egger
@ 2010-07-01 4:25 ` Eric Miao
-1 siblings, 0 replies; 221+ messages in thread
From: Eric Miao @ 2010-07-01 4:25 UTC (permalink / raw)
To: Christoph Egger
Cc: Russell King, linux-arm-kernel, linux-kernel, vamos, Nicolas Pitre
On Thu, Jul 1, 2010 at 12:02 AM, Christoph Egger <siccegge@cs.fau.de> wrote:
> XSCALE_CACHE_ERRATA doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
It's not been there since 2.6, found some references in 2.4 kernel though. And
I doubt anyone has encountered this issue in real products on market.
> ---
> arch/arm/mach-pxa/sleep.S | 7 -------
> 1 files changed, 0 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/sleep.S b/arch/arm/mach-pxa/sleep.S
> index 2ed95f3..52c30b0 100644
> --- a/arch/arm/mach-pxa/sleep.S
> +++ b/arch/arm/mach-pxa/sleep.S
> @@ -339,10 +339,6 @@ ENTRY(pxa_cpu_resume)
> mcr p15, 0, r1, c8, c7, 0 @ invalidate I & D TLBs
> mcr p15, 0, r1, c7, c7, 0 @ invalidate I & D caches, BTB
>
> -#ifdef CONFIG_XSCALE_CACHE_ERRATA
> - bic r9, r9, #0x0004 @ see cpu_xscale_proc_init
> -#endif
> -
> mcr p14, 0, r3, c6, c0, 0 @ clock configuration, turbo mode.
> mcr p15, 0, r4, c15, c1, 0 @ CP access reg
> mcr p15, 0, r5, c13, c0, 0 @ PID
> @@ -368,9 +364,6 @@ sleep_save_sp:
>
> .text
> resume_after_mmu:
> -#ifdef CONFIG_XSCALE_CACHE_ERRATA
> - bl cpu_xscale_proc_init
> -#endif
> ldmfd sp!, {r2, r3}
> #ifndef CONFIG_IWMMXT
> mar acc0, r2, r3
> --
> 1.7.0.4
>
>
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 26/33] Removing dead XSCALE_CACHE_ERRATA
@ 2010-07-01 4:25 ` Eric Miao
0 siblings, 0 replies; 221+ messages in thread
From: Eric Miao @ 2010-07-01 4:25 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 1, 2010 at 12:02 AM, Christoph Egger <siccegge@cs.fau.de> wrote:
> XSCALE_CACHE_ERRATA doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
It's not been there since 2.6, found some references in 2.4 kernel though. And
I doubt anyone has encountered this issue in real products on market.
> ---
> ?arch/arm/mach-pxa/sleep.S | ? ?7 -------
> ?1 files changed, 0 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/sleep.S b/arch/arm/mach-pxa/sleep.S
> index 2ed95f3..52c30b0 100644
> --- a/arch/arm/mach-pxa/sleep.S
> +++ b/arch/arm/mach-pxa/sleep.S
> @@ -339,10 +339,6 @@ ENTRY(pxa_cpu_resume)
> ? ? ? ?mcr ? ? p15, 0, r1, c8, c7, 0 ? ? ? ? ? @ invalidate I & D TLBs
> ? ? ? ?mcr ? ? p15, 0, r1, c7, c7, 0 ? ? ? ? ? @ invalidate I & D caches, BTB
>
> -#ifdef CONFIG_XSCALE_CACHE_ERRATA
> - ? ? ? bic ? ? r9, r9, #0x0004 ? ? ? ? ? ? ? ? @ see cpu_xscale_proc_init
> -#endif
> -
> ? ? ? ?mcr ? ? p14, 0, r3, c6, c0, 0 ? ? ? ? ? @ clock configuration, turbo mode.
> ? ? ? ?mcr ? ? p15, 0, r4, c15, c1, 0 ? ? ? ? ?@ CP access reg
> ? ? ? ?mcr ? ? p15, 0, r5, c13, c0, 0 ? ? ? ? ?@ PID
> @@ -368,9 +364,6 @@ sleep_save_sp:
>
> ? ? ? ?.text
> ?resume_after_mmu:
> -#ifdef CONFIG_XSCALE_CACHE_ERRATA
> - ? ? ? bl ? ? ?cpu_xscale_proc_init
> -#endif
> ? ? ? ?ldmfd ? sp!, {r2, r3}
> ?#ifndef CONFIG_IWMMXT
> ? ? ? ?mar ? ? acc0, r2, r3
> --
> 1.7.0.4
>
>
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 24/33] Removing dead ARCH_GUMSTIX_ORIG
2010-06-30 16:01 ` Christoph Egger
@ 2010-07-01 4:27 ` Eric Miao
-1 siblings, 0 replies; 221+ messages in thread
From: Eric Miao @ 2010-07-01 4:27 UTC (permalink / raw)
To: Christoph Egger
Cc: Russell King, linux-arm-kernel, linux-kernel, vamos, Jaya Kumar
On Thu, Jul 1, 2010 at 12:01 AM, Christoph Egger <siccegge@cs.fau.de> wrote:
> ARCH_GUMSTIX_ORIG doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Cc'ed Jaya Kumar for additional thoughts.
> ---
> arch/arm/mach-pxa/include/mach/gumstix.h | 12 +-----------
> 1 files changed, 1 insertions(+), 11 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/include/mach/gumstix.h b/arch/arm/mach-pxa/include/mach/gumstix.h
> index 06abd41..9b89868 100644
> --- a/arch/arm/mach-pxa/include/mach/gumstix.h
> +++ b/arch/arm/mach-pxa/include/mach/gumstix.h
> @@ -14,25 +14,15 @@
>
> /*
> GPIOn - Input from MAX823 (or equiv), normalizing USB +5V into a clean
> -interrupt signal for determining cable presence. On the original gumstix,
> -this is GPIO81, and GPIO83 needs to be defined as well. On the gumstix F,
> +interrupt signal for determining cable presence. On the gumstix F,
> this moves to GPIO17 and GPIO37. */
>
> /* GPIOx - Connects to USB D+ and used as a pull-up after GPIOn
> has detected a cable insertion; driven low otherwise. */
>
> -#ifdef CONFIG_ARCH_GUMSTIX_ORIG
> -
> -#define GPIO_GUMSTIX_USB_GPIOn 81
> -#define GPIO_GUMSTIX_USB_GPIOx 83
> -
> -#else
> -
> #define GPIO_GUMSTIX_USB_GPIOn 35
> #define GPIO_GUMSTIX_USB_GPIOx 41
>
> -#endif
> -
> /* usb state change */
> #define GUMSTIX_USB_INTR_IRQ IRQ_GPIO(GPIO_GUMSTIX_USB_GPIOn)
>
> --
> 1.7.0.4
>
>
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 24/33] Removing dead ARCH_GUMSTIX_ORIG
@ 2010-07-01 4:27 ` Eric Miao
0 siblings, 0 replies; 221+ messages in thread
From: Eric Miao @ 2010-07-01 4:27 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 1, 2010 at 12:01 AM, Christoph Egger <siccegge@cs.fau.de> wrote:
> ARCH_GUMSTIX_ORIG doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Cc'ed Jaya Kumar for additional thoughts.
> ---
> ?arch/arm/mach-pxa/include/mach/gumstix.h | ? 12 +-----------
> ?1 files changed, 1 insertions(+), 11 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/include/mach/gumstix.h b/arch/arm/mach-pxa/include/mach/gumstix.h
> index 06abd41..9b89868 100644
> --- a/arch/arm/mach-pxa/include/mach/gumstix.h
> +++ b/arch/arm/mach-pxa/include/mach/gumstix.h
> @@ -14,25 +14,15 @@
>
> ?/*
> ?GPIOn - Input from MAX823 (or equiv), normalizing USB +5V into a clean
> -interrupt signal for determining cable presence. On the original gumstix,
> -this is GPIO81, and GPIO83 needs to be defined as well. On the gumstix F,
> +interrupt signal for determining cable presence. On the gumstix F,
> ?this moves to GPIO17 and GPIO37. */
>
> ?/* GPIOx - Connects to USB D+ and used as a pull-up after GPIOn
> ?has detected a cable insertion; driven low otherwise. */
>
> -#ifdef CONFIG_ARCH_GUMSTIX_ORIG
> -
> -#define GPIO_GUMSTIX_USB_GPIOn ? ? ? ? 81
> -#define GPIO_GUMSTIX_USB_GPIOx ? ? ? ? 83
> -
> -#else
> -
> ?#define GPIO_GUMSTIX_USB_GPIOn ? ? ? ? 35
> ?#define GPIO_GUMSTIX_USB_GPIOx ? ? ? ? 41
>
> -#endif
> -
> ?/* usb state change */
> ?#define GUMSTIX_USB_INTR_IRQ ? ? ? ? ? IRQ_GPIO(GPIO_GUMSTIX_USB_GPIOn)
>
> --
> 1.7.0.4
>
>
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 20/33] Removing dead MACH_OMAP2_H4_USB1
2010-06-30 16:00 ` Christoph Egger
(?)
@ 2010-07-01 7:35 ` Felipe Balbi
-1 siblings, 0 replies; 221+ messages in thread
From: Felipe Balbi @ 2010-07-01 7:35 UTC (permalink / raw)
To: ext Christoph Egger
Cc: Tony Lindgren, Russell King, Paul Walmsley, Kalle Valo,
Santosh Shilimkar, Ladislav Michl, linux-omap, linux-arm-kernel,
linux-kernel, vamos
On Wed, Jun 30, 2010 at 06:00:23PM +0200, ext Christoph Egger wrote:
>MACH_OMAP2_H4_USB1 doesn't exist in Kconfig, therefore removing all
>references for it from the source code.
>
>Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
Does this apply on top of Tony's recent patches ??
--
balbi
DefectiveByDesign.org
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 20/33] Removing dead MACH_OMAP2_H4_USB1
@ 2010-07-01 7:35 ` Felipe Balbi
0 siblings, 0 replies; 221+ messages in thread
From: Felipe Balbi @ 2010-07-01 7:35 UTC (permalink / raw)
To: ext Christoph Egger
Cc: Tony Lindgren, Russell King, Paul Walmsley, Kalle Valo,
Santosh Shilimkar, Ladislav Michl, linux-omap, linux-arm-kernel,
linux-kernel, vamos
On Wed, Jun 30, 2010 at 06:00:23PM +0200, ext Christoph Egger wrote:
>MACH_OMAP2_H4_USB1 doesn't exist in Kconfig, therefore removing all
>references for it from the source code.
>
>Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
Does this apply on top of Tony's recent patches ??
--
balbi
DefectiveByDesign.org
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 20/33] Removing dead MACH_OMAP2_H4_USB1
@ 2010-07-01 7:35 ` Felipe Balbi
0 siblings, 0 replies; 221+ messages in thread
From: Felipe Balbi @ 2010-07-01 7:35 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jun 30, 2010 at 06:00:23PM +0200, ext Christoph Egger wrote:
>MACH_OMAP2_H4_USB1 doesn't exist in Kconfig, therefore removing all
>references for it from the source code.
>
>Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
Does this apply on top of Tony's recent patches ??
--
balbi
DefectiveByDesign.org
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 14/33] Removing dead SDMA_IRAM
2010-06-30 15:58 ` Christoph Egger
@ 2010-07-01 8:48 ` Sascha Hauer
-1 siblings, 0 replies; 221+ messages in thread
From: Sascha Hauer @ 2010-07-01 8:48 UTC (permalink / raw)
To: Christoph Egger
Cc: Sascha Hauer, Russell King, Amit Kucheria, linux-arm-kernel,
linux-kernel, vamos
On Wed, Jun 30, 2010 at 05:58:25PM +0200, Christoph Egger wrote:
> SDMA_IRAM doesn't exist in Kconfig, therefore removing all references
> for it from the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
> arch/arm/plat-mxc/include/mach/mx51.h | 4 ----
> 1 files changed, 0 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/plat-mxc/include/mach/mx51.h b/arch/arm/plat-mxc/include/mach/mx51.h
> index 5aad344..fd5ec07 100644
> --- a/arch/arm/plat-mxc/include/mach/mx51.h
> +++ b/arch/arm/plat-mxc/include/mach/mx51.h
> @@ -149,11 +149,7 @@
> #define MX51_MXC_DMA_CHANNEL_SSI1_RX MXC_DMA_DYNAMIC_CHANNEL
> #define MX51_MXC_DMA_CHANNEL_SSI1_TX MXC_DMA_DYNAMIC_CHANNEL
> #define MX51_MXC_DMA_CHANNEL_SSI2_RX MXC_DMA_DYNAMIC_CHANNEL
> -#ifdef CONFIG_SDMA_IRAM
> -#define MX51_MXC_DMA_CHANNEL_SSI2_TX (MX51_MXC_DMA_CHANNEL_IRAM + 1)
> -#else /*CONFIG_SDMA_IRAM */
> #define MX51_MXC_DMA_CHANNEL_SSI2_TX MXC_DMA_DYNAMIC_CHANNEL
> -#endif /*CONFIG_SDMA_IRAM */
> #define MX51_MXC_DMA_CHANNEL_CSPI1_RX MXC_DMA_DYNAMIC_CHANNEL
> #define MX51_MXC_DMA_CHANNEL_CSPI1_TX MXC_DMA_DYNAMIC_CHANNEL
> #define MX51_MXC_DMA_CHANNEL_CSPI2_RX MXC_DMA_DYNAMIC_CHANNEL
> --
> 1.7.0.4
>
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 14/33] Removing dead SDMA_IRAM
@ 2010-07-01 8:48 ` Sascha Hauer
0 siblings, 0 replies; 221+ messages in thread
From: Sascha Hauer @ 2010-07-01 8:48 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jun 30, 2010 at 05:58:25PM +0200, Christoph Egger wrote:
> SDMA_IRAM doesn't exist in Kconfig, therefore removing all references
> for it from the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
> arch/arm/plat-mxc/include/mach/mx51.h | 4 ----
> 1 files changed, 0 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/plat-mxc/include/mach/mx51.h b/arch/arm/plat-mxc/include/mach/mx51.h
> index 5aad344..fd5ec07 100644
> --- a/arch/arm/plat-mxc/include/mach/mx51.h
> +++ b/arch/arm/plat-mxc/include/mach/mx51.h
> @@ -149,11 +149,7 @@
> #define MX51_MXC_DMA_CHANNEL_SSI1_RX MXC_DMA_DYNAMIC_CHANNEL
> #define MX51_MXC_DMA_CHANNEL_SSI1_TX MXC_DMA_DYNAMIC_CHANNEL
> #define MX51_MXC_DMA_CHANNEL_SSI2_RX MXC_DMA_DYNAMIC_CHANNEL
> -#ifdef CONFIG_SDMA_IRAM
> -#define MX51_MXC_DMA_CHANNEL_SSI2_TX (MX51_MXC_DMA_CHANNEL_IRAM + 1)
> -#else /*CONFIG_SDMA_IRAM */
> #define MX51_MXC_DMA_CHANNEL_SSI2_TX MXC_DMA_DYNAMIC_CHANNEL
> -#endif /*CONFIG_SDMA_IRAM */
> #define MX51_MXC_DMA_CHANNEL_CSPI1_RX MXC_DMA_DYNAMIC_CHANNEL
> #define MX51_MXC_DMA_CHANNEL_CSPI1_TX MXC_DMA_DYNAMIC_CHANNEL
> #define MX51_MXC_DMA_CHANNEL_CSPI2_RX MXC_DMA_DYNAMIC_CHANNEL
> --
> 1.7.0.4
>
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH] AT91: Correct configuration define value
2010-06-30 15:53 ` Christoph Egger
@ 2010-07-01 8:55 ` Nicolas Ferre
-1 siblings, 0 replies; 221+ messages in thread
From: Nicolas Ferre @ 2010-07-01 8:55 UTC (permalink / raw)
To: linux-arm-kernel, avictor.za, siccegge, costa.antonior
Cc: linux-kernel, vamos, Nicolas Ferre
The MTD nand driver for Atmel chips is atmel_nand and not at91_nand anymore.
Change wrong configuration variables that were remaining.
Reported-by: Christoph Egger <siccegge@cs.fau.de>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
Christoph,
Thank you for highlighting this. But please consider this
patch instead of yours.
arch/arm/mach-at91/board-at572d940hf_ek.c | 2 +-
arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-at91/board-at572d940hf_ek.c b/arch/arm/mach-at91/board-at572d940hf_ek.c
index 5daff27..4665162 100644
--- a/arch/arm/mach-at91/board-at572d940hf_ek.c
+++ b/arch/arm/mach-at91/board-at572d940hf_ek.c
@@ -216,7 +216,7 @@ static struct atmel_nand_data __initdata eb_nand_data = {
/* .rdy_pin = AT91_PIN_PC16, */
.enable_pin = AT91_PIN_PA15,
.partition_info = nand_partitions,
-#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
+#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
.bus_width_16 = 1,
#else
.bus_width_16 = 0,
diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c
index ee80059..37af9b1 100644
--- a/arch/arm/mach-at91/board-sam9m10g45ek.c
+++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
@@ -135,7 +135,7 @@ static struct atmel_nand_data __initdata ek_nand_data = {
.rdy_pin = AT91_PIN_PC8,
.enable_pin = AT91_PIN_PC14,
.partition_info = nand_partitions,
-#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
+#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
.bus_width_16 = 1,
#else
.bus_width_16 = 0,
--
1.5.6.5
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH] AT91: Correct configuration define value
@ 2010-07-01 8:55 ` Nicolas Ferre
0 siblings, 0 replies; 221+ messages in thread
From: Nicolas Ferre @ 2010-07-01 8:55 UTC (permalink / raw)
To: linux-arm-kernel
The MTD nand driver for Atmel chips is atmel_nand and not at91_nand anymore.
Change wrong configuration variables that were remaining.
Reported-by: Christoph Egger <siccegge@cs.fau.de>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
Christoph,
Thank you for highlighting this. But please consider this
patch instead of yours.
arch/arm/mach-at91/board-at572d940hf_ek.c | 2 +-
arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-at91/board-at572d940hf_ek.c b/arch/arm/mach-at91/board-at572d940hf_ek.c
index 5daff27..4665162 100644
--- a/arch/arm/mach-at91/board-at572d940hf_ek.c
+++ b/arch/arm/mach-at91/board-at572d940hf_ek.c
@@ -216,7 +216,7 @@ static struct atmel_nand_data __initdata eb_nand_data = {
/* .rdy_pin = AT91_PIN_PC16, */
.enable_pin = AT91_PIN_PA15,
.partition_info = nand_partitions,
-#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
+#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
.bus_width_16 = 1,
#else
.bus_width_16 = 0,
diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c
index ee80059..37af9b1 100644
--- a/arch/arm/mach-at91/board-sam9m10g45ek.c
+++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
@@ -135,7 +135,7 @@ static struct atmel_nand_data __initdata ek_nand_data = {
.rdy_pin = AT91_PIN_PC8,
.enable_pin = AT91_PIN_PC14,
.partition_info = nand_partitions,
-#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
+#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
.bus_width_16 = 1,
#else
.bus_width_16 = 0,
--
1.5.6.5
^ permalink raw reply related [flat|nested] 221+ messages in thread
* Re: [PATCH] AT91: Correct configuration define value
2010-07-01 8:55 ` Nicolas Ferre
@ 2010-07-01 9:14 ` Kirill A. Shutemov
-1 siblings, 0 replies; 221+ messages in thread
From: Kirill A. Shutemov @ 2010-07-01 9:14 UTC (permalink / raw)
To: Nicolas Ferre, g
Cc: linux-arm-kernel, avictor.za, siccegge, costa.antonior, vamos,
linux-kernel
On Thu, Jul 01, 2010 at 10:55:45AM +0200, Nicolas Ferre wrote:
> The MTD nand driver for Atmel chips is atmel_nand and not at91_nand anymore.
> Change wrong configuration variables that were remaining.
Acked-by: Kirill A. Shutemov <kirill@shutemov.name>
> Reported-by: Christoph Egger <siccegge@cs.fau.de>
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
> Christoph,
>
> Thank you for highlighting this. But please consider this
> patch instead of yours.
>
> arch/arm/mach-at91/board-at572d940hf_ek.c | 2 +-
> arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-at91/board-at572d940hf_ek.c b/arch/arm/mach-at91/board-at572d940hf_ek.c
> index 5daff27..4665162 100644
> --- a/arch/arm/mach-at91/board-at572d940hf_ek.c
> +++ b/arch/arm/mach-at91/board-at572d940hf_ek.c
> @@ -216,7 +216,7 @@ static struct atmel_nand_data __initdata eb_nand_data = {
> /* .rdy_pin = AT91_PIN_PC16, */
> .enable_pin = AT91_PIN_PA15,
> .partition_info = nand_partitions,
> -#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
> +#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
> .bus_width_16 = 1,
> #else
> .bus_width_16 = 0,
> diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c
> index ee80059..37af9b1 100644
> --- a/arch/arm/mach-at91/board-sam9m10g45ek.c
> +++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
> @@ -135,7 +135,7 @@ static struct atmel_nand_data __initdata ek_nand_data = {
> .rdy_pin = AT91_PIN_PC8,
> .enable_pin = AT91_PIN_PC14,
> .partition_info = nand_partitions,
> -#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
> +#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
> .bus_width_16 = 1,
> #else
> .bus_width_16 = 0,
> --
> 1.5.6.5
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
Kirill A. Shutemov
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH] AT91: Correct configuration define value
@ 2010-07-01 9:14 ` Kirill A. Shutemov
0 siblings, 0 replies; 221+ messages in thread
From: Kirill A. Shutemov @ 2010-07-01 9:14 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 01, 2010 at 10:55:45AM +0200, Nicolas Ferre wrote:
> The MTD nand driver for Atmel chips is atmel_nand and not at91_nand anymore.
> Change wrong configuration variables that were remaining.
Acked-by: Kirill A. Shutemov <kirill@shutemov.name>
> Reported-by: Christoph Egger <siccegge@cs.fau.de>
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
> Christoph,
>
> Thank you for highlighting this. But please consider this
> patch instead of yours.
>
> arch/arm/mach-at91/board-at572d940hf_ek.c | 2 +-
> arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-at91/board-at572d940hf_ek.c b/arch/arm/mach-at91/board-at572d940hf_ek.c
> index 5daff27..4665162 100644
> --- a/arch/arm/mach-at91/board-at572d940hf_ek.c
> +++ b/arch/arm/mach-at91/board-at572d940hf_ek.c
> @@ -216,7 +216,7 @@ static struct atmel_nand_data __initdata eb_nand_data = {
> /* .rdy_pin = AT91_PIN_PC16, */
> .enable_pin = AT91_PIN_PA15,
> .partition_info = nand_partitions,
> -#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
> +#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
> .bus_width_16 = 1,
> #else
> .bus_width_16 = 0,
> diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c
> index ee80059..37af9b1 100644
> --- a/arch/arm/mach-at91/board-sam9m10g45ek.c
> +++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
> @@ -135,7 +135,7 @@ static struct atmel_nand_data __initdata ek_nand_data = {
> .rdy_pin = AT91_PIN_PC8,
> .enable_pin = AT91_PIN_PC14,
> .partition_info = nand_partitions,
> -#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
> +#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
> .bus_width_16 = 1,
> #else
> .bus_width_16 = 0,
> --
> 1.5.6.5
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
Kirill A. Shutemov
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 25/33] Removing dead CORGI_SSP_DEPRECATED
2010-06-30 16:01 ` Christoph Egger
@ 2010-07-01 9:58 ` Kristoffer Ericson
-1 siblings, 0 replies; 221+ messages in thread
From: Kristoffer Ericson @ 2010-07-01 9:58 UTC (permalink / raw)
To: Christoph Egger
Cc: Eric Miao, Russell King, Pavel Machek, Arnaud Patard,
Uwe Kleine-K??nig, linux-arm-kernel, linux-kernel, vamos
On Wed, Jun 30, 2010 at 06:01:56PM +0200, Christoph Egger wrote:
> CORGI_SSP_DEPRECATED doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
Cant see anything wrong with this.
acked-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>
> ---
> arch/arm/mach-pxa/sharpsl_pm.c | 5 -----
> 1 files changed, 0 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
> index 582701e..d8c5301 100644
> --- a/arch/arm/mach-pxa/sharpsl_pm.c
> +++ b/arch/arm/mach-pxa/sharpsl_pm.c
> @@ -180,17 +180,12 @@ int sharpsl_pm_pxa_read_max1111(int channel)
> if (machine_is_tosa())
> return 0;
>
> -#ifdef CONFIG_CORGI_SSP_DEPRECATED
> - return corgi_ssp_max1111_get((channel << MAXCTRL_SEL_SH) | MAXCTRL_PD0 | MAXCTRL_PD1
> - | MAXCTRL_SGL | MAXCTRL_UNI | MAXCTRL_STR);
> -#else
> extern int max1111_read_channel(int);
>
> /* max1111 accepts channels from 0-3, however,
> * it is encoded from 0-7 here in the code.
> */
> return max1111_read_channel(channel >> 1);
> -#endif
> }
>
> static int get_percentage(int voltage)
> --
> 1.7.0.4
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 25/33] Removing dead CORGI_SSP_DEPRECATED
@ 2010-07-01 9:58 ` Kristoffer Ericson
0 siblings, 0 replies; 221+ messages in thread
From: Kristoffer Ericson @ 2010-07-01 9:58 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jun 30, 2010 at 06:01:56PM +0200, Christoph Egger wrote:
> CORGI_SSP_DEPRECATED doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
Cant see anything wrong with this.
acked-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>
> ---
> arch/arm/mach-pxa/sharpsl_pm.c | 5 -----
> 1 files changed, 0 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
> index 582701e..d8c5301 100644
> --- a/arch/arm/mach-pxa/sharpsl_pm.c
> +++ b/arch/arm/mach-pxa/sharpsl_pm.c
> @@ -180,17 +180,12 @@ int sharpsl_pm_pxa_read_max1111(int channel)
> if (machine_is_tosa())
> return 0;
>
> -#ifdef CONFIG_CORGI_SSP_DEPRECATED
> - return corgi_ssp_max1111_get((channel << MAXCTRL_SEL_SH) | MAXCTRL_PD0 | MAXCTRL_PD1
> - | MAXCTRL_SGL | MAXCTRL_UNI | MAXCTRL_STR);
> -#else
> extern int max1111_read_channel(int);
>
> /* max1111 accepts channels from 0-3, however,
> * it is encoded from 0-7 here in the code.
> */
> return max1111_read_channel(channel >> 1);
> -#endif
> }
>
> static int get_percentage(int voltage)
> --
> 1.7.0.4
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 29/33] Removing dead SND_SOC_SMDK2443_WM9710
2010-06-30 16:03 ` Christoph Egger
@ 2010-07-01 12:55 ` Jassi Brar
-1 siblings, 0 replies; 221+ messages in thread
From: Jassi Brar @ 2010-07-01 12:55 UTC (permalink / raw)
To: Christoph Egger
Cc: Ben Dooks, Russell King, Mark Brown, Jassi Brar,
linux-arm-kernel, linux-kernel, vamos
On Thu, Jul 1, 2010 at 1:03 AM, Christoph Egger <siccegge@cs.fau.de> wrote:
> SND_SOC_SMDK2443_WM9710 doesn't exist in Kconfig, therefore removing
> all references for it from the source code.
I'd rather have the code compiled unconditionally.
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 29/33] Removing dead SND_SOC_SMDK2443_WM9710
@ 2010-07-01 12:55 ` Jassi Brar
0 siblings, 0 replies; 221+ messages in thread
From: Jassi Brar @ 2010-07-01 12:55 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 1, 2010 at 1:03 AM, Christoph Egger <siccegge@cs.fau.de> wrote:
> SND_SOC_SMDK2443_WM9710 doesn't exist in Kconfig, therefore removing
> all references for it from the source code.
I'd rather have the code compiled unconditionally.
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 29/33] Removing dead SND_SOC_SMDK2443_WM9710
2010-07-01 12:55 ` Jassi Brar
@ 2010-07-01 13:07 ` Mark Brown
-1 siblings, 0 replies; 221+ messages in thread
From: Mark Brown @ 2010-07-01 13:07 UTC (permalink / raw)
To: Jassi Brar
Cc: Christoph Egger, Ben Dooks, Russell King, Jassi Brar,
linux-arm-kernel, linux-kernel, vamos
On Thu, Jul 01, 2010 at 09:55:47PM +0900, Jassi Brar wrote:
> On Thu, Jul 1, 2010 at 1:03 AM, Christoph Egger <siccegge@cs.fau.de> wrote:
> > SND_SOC_SMDK2443_WM9710 doesn't exist in Kconfig, therefore removing
> > all references for it from the source code.
> I'd rather have the code compiled unconditionally.
Hrm, if this is part of the default hardware build we should get the
driver merged.
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 29/33] Removing dead SND_SOC_SMDK2443_WM9710
@ 2010-07-01 13:07 ` Mark Brown
0 siblings, 0 replies; 221+ messages in thread
From: Mark Brown @ 2010-07-01 13:07 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 01, 2010 at 09:55:47PM +0900, Jassi Brar wrote:
> On Thu, Jul 1, 2010 at 1:03 AM, Christoph Egger <siccegge@cs.fau.de> wrote:
> > SND_SOC_SMDK2443_WM9710 doesn't exist in Kconfig, therefore removing
> > all references for it from the source code.
> I'd rather have the code compiled unconditionally.
Hrm, if this is part of the default hardware build we should get the
driver merged.
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 03/33] Removing dead OMAP_MUX_ERRORS
2010-06-30 19:54 ` Kirill A. Shutemov
@ 2010-07-01 13:22 ` Christoph Egger
-1 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-07-01 13:22 UTC (permalink / raw)
To: Kirill A. Shutemov
Cc: Tony Lindgren, Russell King, Cory Maccarrone,
Zebediah C. McClure, Alistair Buxton, linux-omap,
linux-arm-kernel, linux-kernel, vamos
On Wed, Jun 30, 2010 at 10:54:09PM +0300, Kirill A. Shutemov wrote:
> On Wed, Jun 30, 2010 at 05:54:42PM +0200, Christoph Egger wrote:
> > OMAP_MUX_ERRORS doesn't exist in Kconfig, therefore removing all
> > references for it from the source code.
>
> IIUC, CONFIG_OMAP_MUX_WARNINGS should be used here instead of it.
Something like the patch below?
----
From: Christoph Egger <siccegge@cs.fau.de>
Date: Wed, 30 Jun 2010 12:30:36 +0200
Subject: [PATCH 03/33] Replace dead OMAP_MUX_ERRORS with OMAP_MUX_WARNINGS
OMAP_MUX_ERRORS doesn't exist in Kconfig, therefore replacing all
references for it with OMAP_MUX_WARNINGS in the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap1/mux.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c
index 8434137..3e98835 100644
--- a/arch/arm/mach-omap1/mux.c
+++ b/arch/arm/mach-omap1/mux.c
@@ -440,7 +440,7 @@ int __init_or_module omap1_cfg_reg(const struct pin_config *cfg)
}
#endif
-#ifdef CONFIG_OMAP_MUX_ERRORS
+#ifdef CONFIG_OMAP_MUX_WARNINGS
return warn ? -ETXTBSY : 0;
#else
return 0;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 03/33] Removing dead OMAP_MUX_ERRORS
@ 2010-07-01 13:22 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-07-01 13:22 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jun 30, 2010 at 10:54:09PM +0300, Kirill A. Shutemov wrote:
> On Wed, Jun 30, 2010 at 05:54:42PM +0200, Christoph Egger wrote:
> > OMAP_MUX_ERRORS doesn't exist in Kconfig, therefore removing all
> > references for it from the source code.
>
> IIUC, CONFIG_OMAP_MUX_WARNINGS should be used here instead of it.
Something like the patch below?
----
From: Christoph Egger <siccegge@cs.fau.de>
Date: Wed, 30 Jun 2010 12:30:36 +0200
Subject: [PATCH 03/33] Replace dead OMAP_MUX_ERRORS with OMAP_MUX_WARNINGS
OMAP_MUX_ERRORS doesn't exist in Kconfig, therefore replacing all
references for it with OMAP_MUX_WARNINGS in the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-omap1/mux.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c
index 8434137..3e98835 100644
--- a/arch/arm/mach-omap1/mux.c
+++ b/arch/arm/mach-omap1/mux.c
@@ -440,7 +440,7 @@ int __init_or_module omap1_cfg_reg(const struct pin_config *cfg)
}
#endif
-#ifdef CONFIG_OMAP_MUX_ERRORS
+#ifdef CONFIG_OMAP_MUX_WARNINGS
return warn ? -ETXTBSY : 0;
#else
return 0;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* Re: [PATCH 06/33] Removing dead SHARPSL_LOCOMO
2010-07-01 2:34 ` Eric Miao
@ 2010-07-01 13:23 ` Christoph Egger
-1 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-07-01 13:23 UTC (permalink / raw)
To: Eric Miao; +Cc: Russell King, linux-arm-kernel, linux-kernel, vamos
On Thu, Jul 01, 2010 at 10:34:13AM +0800, Eric Miao wrote:
> On Wed, Jun 30, 2010 at 11:55 PM, Christoph Egger <siccegge@cs.fau.de> wrote:
> > SHARPSL_LOCOMO doesn't exist in Kconfig, therefore removing all
> > references for it from the source code.
> >
>
> A good catch, though SHARPSL_LOCOMO has be changed to SHARP_LOCOMO
> later, so a better fix would be the name change only.
Hi! Updated patch below
----
From: Christoph Egger <siccegge@cs.fau.de>
Date: Wed, 30 Jun 2010 12:36:20 +0200
Subject: [PATCH 06/33] Replacing dead SHARPSL_LOCOMO with SHARP_LOCOMO
SHARP_LOCOMO doesn't exist in Kconfig, therefore replacing all
references for it with SHARP_LOCOMO in the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-sa1100/include/mach/irqs.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-sa1100/include/mach/irqs.h b/arch/arm/mach-sa1100/include/mach/irqs.h
index 8c8845b..d18f21a 100644
--- a/arch/arm/mach-sa1100/include/mach/irqs.h
+++ b/arch/arm/mach-sa1100/include/mach/irqs.h
@@ -77,7 +77,7 @@
*/
#ifdef CONFIG_SA1111
#define NR_IRQS (IRQ_BOARD_END + 55)
-#elif defined(CONFIG_SHARPSL_LOCOMO)
+#elif defined(CONFIG_SHARP_LOCOMO)
#define NR_IRQS (IRQ_BOARD_START + 4)
#else
#define NR_IRQS (IRQ_BOARD_START)
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 06/33] Removing dead SHARPSL_LOCOMO
@ 2010-07-01 13:23 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-07-01 13:23 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 01, 2010 at 10:34:13AM +0800, Eric Miao wrote:
> On Wed, Jun 30, 2010 at 11:55 PM, Christoph Egger <siccegge@cs.fau.de> wrote:
> > SHARPSL_LOCOMO doesn't exist in Kconfig, therefore removing all
> > references for it from the source code.
> >
>
> A good catch, though SHARPSL_LOCOMO has be changed to SHARP_LOCOMO
> later, so a better fix would be the name change only.
Hi! Updated patch below
----
From: Christoph Egger <siccegge@cs.fau.de>
Date: Wed, 30 Jun 2010 12:36:20 +0200
Subject: [PATCH 06/33] Replacing dead SHARPSL_LOCOMO with SHARP_LOCOMO
SHARP_LOCOMO doesn't exist in Kconfig, therefore replacing all
references for it with SHARP_LOCOMO in the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-sa1100/include/mach/irqs.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-sa1100/include/mach/irqs.h b/arch/arm/mach-sa1100/include/mach/irqs.h
index 8c8845b..d18f21a 100644
--- a/arch/arm/mach-sa1100/include/mach/irqs.h
+++ b/arch/arm/mach-sa1100/include/mach/irqs.h
@@ -77,7 +77,7 @@
*/
#ifdef CONFIG_SA1111
#define NR_IRQS (IRQ_BOARD_END + 55)
-#elif defined(CONFIG_SHARPSL_LOCOMO)
+#elif defined(CONFIG_SHARP_LOCOMO)
#define NR_IRQS (IRQ_BOARD_START + 4)
#else
#define NR_IRQS (IRQ_BOARD_START)
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* Re: [PATCH 29/33] Removing dead SND_SOC_SMDK2443_WM9710
2010-07-01 12:55 ` Jassi Brar
@ 2010-07-01 13:25 ` Christoph Egger
-1 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-07-01 13:25 UTC (permalink / raw)
To: Jassi Brar
Cc: Ben Dooks, Russell King, Mark Brown, Jassi Brar,
linux-arm-kernel, linux-kernel, vamos
On Thu, Jul 01, 2010 at 09:55:47PM +0900, Jassi Brar wrote:
> On Thu, Jul 1, 2010 at 1:03 AM, Christoph Egger <siccegge@cs.fau.de> wrote:
> > SND_SOC_SMDK2443_WM9710 doesn't exist in Kconfig, therefore removing
> > all references for it from the source code.
> I'd rather have the code compiled unconditionally.
OK that would be done by the patch below
----
From: Christoph Egger <siccegge@cs.fau.de>
Date: Wed, 30 Jun 2010 17:18:52 +0200
Subject: [PATCH 29/33] Removing dead SND_SOC_SMDK2443_WM9710
SND_SOC_SMDK2443_WM9710 doesn't exist in Kconfig, therefore removing
all references for it from the source code, building the parts
unconditionally
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-s3c2443/mach-smdk2443.c | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-s3c2443/mach-smdk2443.c b/arch/arm/mach-s3c2443/mach-smdk2443.c
index 4c863d3..764144a 100644
--- a/arch/arm/mach-s3c2443/mach-smdk2443.c
+++ b/arch/arm/mach-s3c2443/mach-smdk2443.c
@@ -106,9 +106,7 @@ static struct platform_device *smdk2443_devices[] __initdata = {
&s3c_device_wdt,
&s3c_device_i2c0,
&s3c_device_hsmmc0,
-#ifdef CONFIG_SND_SOC_SMDK2443_WM9710
&s3c_device_ac97,
-#endif
};
static void __init smdk2443_map_io(void)
@@ -122,9 +120,7 @@ static void __init smdk2443_machine_init(void)
{
s3c_i2c0_set_platdata(NULL);
-#ifdef CONFIG_SND_SOC_SMDK2443_WM9710
s3c24xx_ac97_setup_gpio(S3C24XX_AC97_GPE0);
-#endif
platform_add_devices(smdk2443_devices, ARRAY_SIZE(smdk2443_devices));
smdk_machine_init();
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 29/33] Removing dead SND_SOC_SMDK2443_WM9710
@ 2010-07-01 13:25 ` Christoph Egger
0 siblings, 0 replies; 221+ messages in thread
From: Christoph Egger @ 2010-07-01 13:25 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 01, 2010 at 09:55:47PM +0900, Jassi Brar wrote:
> On Thu, Jul 1, 2010 at 1:03 AM, Christoph Egger <siccegge@cs.fau.de> wrote:
> > SND_SOC_SMDK2443_WM9710 doesn't exist in Kconfig, therefore removing
> > all references for it from the source code.
> I'd rather have the code compiled unconditionally.
OK that would be done by the patch below
----
From: Christoph Egger <siccegge@cs.fau.de>
Date: Wed, 30 Jun 2010 17:18:52 +0200
Subject: [PATCH 29/33] Removing dead SND_SOC_SMDK2443_WM9710
SND_SOC_SMDK2443_WM9710 doesn't exist in Kconfig, therefore removing
all references for it from the source code, building the parts
unconditionally
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
---
arch/arm/mach-s3c2443/mach-smdk2443.c | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-s3c2443/mach-smdk2443.c b/arch/arm/mach-s3c2443/mach-smdk2443.c
index 4c863d3..764144a 100644
--- a/arch/arm/mach-s3c2443/mach-smdk2443.c
+++ b/arch/arm/mach-s3c2443/mach-smdk2443.c
@@ -106,9 +106,7 @@ static struct platform_device *smdk2443_devices[] __initdata = {
&s3c_device_wdt,
&s3c_device_i2c0,
&s3c_device_hsmmc0,
-#ifdef CONFIG_SND_SOC_SMDK2443_WM9710
&s3c_device_ac97,
-#endif
};
static void __init smdk2443_map_io(void)
@@ -122,9 +120,7 @@ static void __init smdk2443_machine_init(void)
{
s3c_i2c0_set_platdata(NULL);
-#ifdef CONFIG_SND_SOC_SMDK2443_WM9710
s3c24xx_ac97_setup_gpio(S3C24XX_AC97_GPE0);
-#endif
platform_add_devices(smdk2443_devices, ARRAY_SIZE(smdk2443_devices));
smdk_machine_init();
--
1.7.0.4
^ permalink raw reply related [flat|nested] 221+ messages in thread
* Re: [PATCH 06/33] Removing dead SHARPSL_LOCOMO
2010-07-01 13:23 ` Christoph Egger
@ 2010-07-01 14:40 ` Eric Miao
-1 siblings, 0 replies; 221+ messages in thread
From: Eric Miao @ 2010-07-01 14:40 UTC (permalink / raw)
To: Christoph Egger; +Cc: Russell King, linux-arm-kernel, linux-kernel, vamos
On Thu, Jul 1, 2010 at 9:23 PM, Christoph Egger <siccegge@cs.fau.de> wrote:
> On Thu, Jul 01, 2010 at 10:34:13AM +0800, Eric Miao wrote:
>> On Wed, Jun 30, 2010 at 11:55 PM, Christoph Egger <siccegge@cs.fau.de> wrote:
>> > SHARPSL_LOCOMO doesn't exist in Kconfig, therefore removing all
>> > references for it from the source code.
>> >
>>
>> A good catch, though SHARPSL_LOCOMO has be changed to SHARP_LOCOMO
>> later, so a better fix would be the name change only.
>
> Hi! Updated patch below
>
> ----
> From: Christoph Egger <siccegge@cs.fau.de>
> Date: Wed, 30 Jun 2010 12:36:20 +0200
> Subject: [PATCH 06/33] Replacing dead SHARPSL_LOCOMO with SHARP_LOCOMO
>
> SHARP_LOCOMO doesn't exist in Kconfig, therefore replacing all
> references for it with SHARP_LOCOMO in the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
> ---
> arch/arm/mach-sa1100/include/mach/irqs.h | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-sa1100/include/mach/irqs.h b/arch/arm/mach-sa1100/include/mach/irqs.h
> index 8c8845b..d18f21a 100644
> --- a/arch/arm/mach-sa1100/include/mach/irqs.h
> +++ b/arch/arm/mach-sa1100/include/mach/irqs.h
> @@ -77,7 +77,7 @@
> */
> #ifdef CONFIG_SA1111
> #define NR_IRQS (IRQ_BOARD_END + 55)
> -#elif defined(CONFIG_SHARPSL_LOCOMO)
> +#elif defined(CONFIG_SHARP_LOCOMO)
> #define NR_IRQS (IRQ_BOARD_START + 4)
> #else
> #define NR_IRQS (IRQ_BOARD_START)
> --
> 1.7.0.4
>
>
>
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 06/33] Removing dead SHARPSL_LOCOMO
@ 2010-07-01 14:40 ` Eric Miao
0 siblings, 0 replies; 221+ messages in thread
From: Eric Miao @ 2010-07-01 14:40 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 1, 2010 at 9:23 PM, Christoph Egger <siccegge@cs.fau.de> wrote:
> On Thu, Jul 01, 2010 at 10:34:13AM +0800, Eric Miao wrote:
>> On Wed, Jun 30, 2010 at 11:55 PM, Christoph Egger <siccegge@cs.fau.de> wrote:
>> > SHARPSL_LOCOMO doesn't exist in Kconfig, therefore removing all
>> > references for it from the source code.
>> >
>>
>> A good catch, though SHARPSL_LOCOMO has be changed to SHARP_LOCOMO
>> later, so a better fix would be the name change only.
>
> Hi! Updated patch below
>
> ----
> From: Christoph Egger <siccegge@cs.fau.de>
> Date: Wed, 30 Jun 2010 12:36:20 +0200
> Subject: [PATCH 06/33] Replacing dead SHARPSL_LOCOMO with SHARP_LOCOMO
>
> SHARP_LOCOMO doesn't exist in Kconfig, therefore replacing all
> references for it with SHARP_LOCOMO in the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
> ---
> ?arch/arm/mach-sa1100/include/mach/irqs.h | ? ?2 +-
> ?1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-sa1100/include/mach/irqs.h b/arch/arm/mach-sa1100/include/mach/irqs.h
> index 8c8845b..d18f21a 100644
> --- a/arch/arm/mach-sa1100/include/mach/irqs.h
> +++ b/arch/arm/mach-sa1100/include/mach/irqs.h
> @@ -77,7 +77,7 @@
> ?*/
> ?#ifdef CONFIG_SA1111
> ?#define NR_IRQS ? ? ? ? ? ? ? ? ? ? ? ?(IRQ_BOARD_END + 55)
> -#elif defined(CONFIG_SHARPSL_LOCOMO)
> +#elif defined(CONFIG_SHARP_LOCOMO)
> ?#define NR_IRQS ? ? ? ? ? ? ? ? ? ? ? ?(IRQ_BOARD_START + 4)
> ?#else
> ?#define NR_IRQS ? ? ? ? ? ? ? ? ? ? ? ?(IRQ_BOARD_START)
> --
> 1.7.0.4
>
>
>
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 03/33] Removing dead OMAP_MUX_ERRORS
2010-07-01 13:22 ` Christoph Egger
@ 2010-07-01 15:27 ` Kirill A. Shutemov
-1 siblings, 0 replies; 221+ messages in thread
From: Kirill A. Shutemov @ 2010-07-01 15:27 UTC (permalink / raw)
To: Christoph Egger
Cc: Tony Lindgren, Russell King, Cory Maccarrone,
Zebediah C. McClure, Alistair Buxton, linux-omap,
linux-arm-kernel, linux-kernel, vamos
On Thu, Jul 01, 2010 at 03:22:55PM +0200, Christoph Egger wrote:
> On Wed, Jun 30, 2010 at 10:54:09PM +0300, Kirill A. Shutemov wrote:
> > On Wed, Jun 30, 2010 at 05:54:42PM +0200, Christoph Egger wrote:
> > > OMAP_MUX_ERRORS doesn't exist in Kconfig, therefore removing all
> > > references for it from the source code.
> >
> > IIUC, CONFIG_OMAP_MUX_WARNINGS should be used here instead of it.
>
> Something like the patch below?
Acked-by: Kirill A. Shutemov <kirill@shutemov.name>
>
> ----
> From: Christoph Egger <siccegge@cs.fau.de>
> Date: Wed, 30 Jun 2010 12:30:36 +0200
> Subject: [PATCH 03/33] Replace dead OMAP_MUX_ERRORS with OMAP_MUX_WARNINGS
>
> OMAP_MUX_ERRORS doesn't exist in Kconfig, therefore replacing all
> references for it with OMAP_MUX_WARNINGS in the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-omap1/mux.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c
> index 8434137..3e98835 100644
> --- a/arch/arm/mach-omap1/mux.c
> +++ b/arch/arm/mach-omap1/mux.c
> @@ -440,7 +440,7 @@ int __init_or_module omap1_cfg_reg(const struct pin_config *cfg)
> }
> #endif
>
> -#ifdef CONFIG_OMAP_MUX_ERRORS
> +#ifdef CONFIG_OMAP_MUX_WARNINGS
> return warn ? -ETXTBSY : 0;
> #else
> return 0;
> --
> 1.7.0.4
>
>
--
Kirill A. Shutemov
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 03/33] Removing dead OMAP_MUX_ERRORS
@ 2010-07-01 15:27 ` Kirill A. Shutemov
0 siblings, 0 replies; 221+ messages in thread
From: Kirill A. Shutemov @ 2010-07-01 15:27 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 01, 2010 at 03:22:55PM +0200, Christoph Egger wrote:
> On Wed, Jun 30, 2010 at 10:54:09PM +0300, Kirill A. Shutemov wrote:
> > On Wed, Jun 30, 2010 at 05:54:42PM +0200, Christoph Egger wrote:
> > > OMAP_MUX_ERRORS doesn't exist in Kconfig, therefore removing all
> > > references for it from the source code.
> >
> > IIUC, CONFIG_OMAP_MUX_WARNINGS should be used here instead of it.
>
> Something like the patch below?
Acked-by: Kirill A. Shutemov <kirill@shutemov.name>
>
> ----
> From: Christoph Egger <siccegge@cs.fau.de>
> Date: Wed, 30 Jun 2010 12:30:36 +0200
> Subject: [PATCH 03/33] Replace dead OMAP_MUX_ERRORS with OMAP_MUX_WARNINGS
>
> OMAP_MUX_ERRORS doesn't exist in Kconfig, therefore replacing all
> references for it with OMAP_MUX_WARNINGS in the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-omap1/mux.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c
> index 8434137..3e98835 100644
> --- a/arch/arm/mach-omap1/mux.c
> +++ b/arch/arm/mach-omap1/mux.c
> @@ -440,7 +440,7 @@ int __init_or_module omap1_cfg_reg(const struct pin_config *cfg)
> }
> #endif
>
> -#ifdef CONFIG_OMAP_MUX_ERRORS
> +#ifdef CONFIG_OMAP_MUX_WARNINGS
> return warn ? -ETXTBSY : 0;
> #else
> return 0;
> --
> 1.7.0.4
>
>
--
Kirill A. Shutemov
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 24/33] Removing dead ARCH_GUMSTIX_ORIG
2010-07-01 4:27 ` Eric Miao
@ 2010-07-01 23:57 ` Jaya Kumar
-1 siblings, 0 replies; 221+ messages in thread
From: Jaya Kumar @ 2010-07-01 23:57 UTC (permalink / raw)
To: Eric Miao
Cc: Christoph Egger, Russell King, linux-arm-kernel, linux-kernel, vamos
On Thu, Jul 1, 2010 at 12:27 PM, Eric Miao <eric.y.miao@gmail.com> wrote:
> On Thu, Jul 1, 2010 at 12:01 AM, Christoph Egger <siccegge@cs.fau.de> wrote:
>> ARCH_GUMSTIX_ORIG doesn't exist in Kconfig, therefore removing all
>> references for it from the source code.
>>
>> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
>
> Acked-by: Eric Miao <eric.y.miao@gmail.com>
>
> Cc'ed Jaya Kumar for additional thoughts.
Looks okay to me too. Thanks.
Acked-by: Jaya Kumar <jayakumar.lkml@gmail.com>
>
>> ---
>> arch/arm/mach-pxa/include/mach/gumstix.h | 12 +-----------
>> 1 files changed, 1 insertions(+), 11 deletions(-)
>>
>> diff --git a/arch/arm/mach-pxa/include/mach/gumstix.h b/arch/arm/mach-pxa/include/mach/gumstix.h
>> index 06abd41..9b89868 100644
>> --- a/arch/arm/mach-pxa/include/mach/gumstix.h
>> +++ b/arch/arm/mach-pxa/include/mach/gumstix.h
>> @@ -14,25 +14,15 @@
>>
>> /*
>> GPIOn - Input from MAX823 (or equiv), normalizing USB +5V into a clean
>> -interrupt signal for determining cable presence. On the original gumstix,
>> -this is GPIO81, and GPIO83 needs to be defined as well. On the gumstix F,
>> +interrupt signal for determining cable presence. On the gumstix F,
>> this moves to GPIO17 and GPIO37. */
>>
>> /* GPIOx - Connects to USB D+ and used as a pull-up after GPIOn
>> has detected a cable insertion; driven low otherwise. */
>>
>> -#ifdef CONFIG_ARCH_GUMSTIX_ORIG
>> -
>> -#define GPIO_GUMSTIX_USB_GPIOn 81
>> -#define GPIO_GUMSTIX_USB_GPIOx 83
>> -
>> -#else
>> -
>> #define GPIO_GUMSTIX_USB_GPIOn 35
>> #define GPIO_GUMSTIX_USB_GPIOx 41
>>
>> -#endif
>> -
>> /* usb state change */
>> #define GUMSTIX_USB_INTR_IRQ IRQ_GPIO(GPIO_GUMSTIX_USB_GPIOn)
>>
>> --
>> 1.7.0.4
>>
>>
>
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 24/33] Removing dead ARCH_GUMSTIX_ORIG
@ 2010-07-01 23:57 ` Jaya Kumar
0 siblings, 0 replies; 221+ messages in thread
From: Jaya Kumar @ 2010-07-01 23:57 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 1, 2010 at 12:27 PM, Eric Miao <eric.y.miao@gmail.com> wrote:
> On Thu, Jul 1, 2010 at 12:01 AM, Christoph Egger <siccegge@cs.fau.de> wrote:
>> ARCH_GUMSTIX_ORIG doesn't exist in Kconfig, therefore removing all
>> references for it from the source code.
>>
>> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
>
> Acked-by: Eric Miao <eric.y.miao@gmail.com>
>
> Cc'ed Jaya Kumar for additional thoughts.
Looks okay to me too. Thanks.
Acked-by: Jaya Kumar <jayakumar.lkml@gmail.com>
>
>> ---
>> ?arch/arm/mach-pxa/include/mach/gumstix.h | ? 12 +-----------
>> ?1 files changed, 1 insertions(+), 11 deletions(-)
>>
>> diff --git a/arch/arm/mach-pxa/include/mach/gumstix.h b/arch/arm/mach-pxa/include/mach/gumstix.h
>> index 06abd41..9b89868 100644
>> --- a/arch/arm/mach-pxa/include/mach/gumstix.h
>> +++ b/arch/arm/mach-pxa/include/mach/gumstix.h
>> @@ -14,25 +14,15 @@
>>
>> ?/*
>> ?GPIOn - Input from MAX823 (or equiv), normalizing USB +5V into a clean
>> -interrupt signal for determining cable presence. On the original gumstix,
>> -this is GPIO81, and GPIO83 needs to be defined as well. On the gumstix F,
>> +interrupt signal for determining cable presence. On the gumstix F,
>> ?this moves to GPIO17 and GPIO37. */
>>
>> ?/* GPIOx - Connects to USB D+ and used as a pull-up after GPIOn
>> ?has detected a cable insertion; driven low otherwise. */
>>
>> -#ifdef CONFIG_ARCH_GUMSTIX_ORIG
>> -
>> -#define GPIO_GUMSTIX_USB_GPIOn ? ? ? ? 81
>> -#define GPIO_GUMSTIX_USB_GPIOx ? ? ? ? 83
>> -
>> -#else
>> -
>> ?#define GPIO_GUMSTIX_USB_GPIOn ? ? ? ? 35
>> ?#define GPIO_GUMSTIX_USB_GPIOx ? ? ? ? 41
>>
>> -#endif
>> -
>> ?/* usb state change */
>> ?#define GUMSTIX_USB_INTR_IRQ ? ? ? ? ? IRQ_GPIO(GPIO_GUMSTIX_USB_GPIOn)
>>
>> --
>> 1.7.0.4
>>
>>
>
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 29/33] Removing dead SND_SOC_SMDK2443_WM9710
2010-07-01 13:07 ` Mark Brown
@ 2010-07-02 7:08 ` Jassi Brar
-1 siblings, 0 replies; 221+ messages in thread
From: Jassi Brar @ 2010-07-02 7:08 UTC (permalink / raw)
To: Mark Brown
Cc: Christoph Egger, Ben Dooks, Russell King, Jassi Brar,
linux-arm-kernel, linux-kernel, vamos
On Thu, Jul 1, 2010 at 10:07 PM, Mark Brown
<broonie@opensource.wolfsonmicro.com> wrote:
> On Thu, Jul 01, 2010 at 09:55:47PM +0900, Jassi Brar wrote:
>> On Thu, Jul 1, 2010 at 1:03 AM, Christoph Egger <siccegge@cs.fau.de> wrote:
>> > SND_SOC_SMDK2443_WM9710 doesn't exist in Kconfig, therefore removing
>> > all references for it from the source code.
>
>> I'd rather have the code compiled unconditionally.
>
> Hrm, if this is part of the default hardware build we should get the
> driver merged.
But the machine driver is already there
sound/soc/s3c24xx/smdk2443_wm9710.c
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 29/33] Removing dead SND_SOC_SMDK2443_WM9710
@ 2010-07-02 7:08 ` Jassi Brar
0 siblings, 0 replies; 221+ messages in thread
From: Jassi Brar @ 2010-07-02 7:08 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 1, 2010 at 10:07 PM, Mark Brown
<broonie@opensource.wolfsonmicro.com> wrote:
> On Thu, Jul 01, 2010 at 09:55:47PM +0900, Jassi Brar wrote:
>> On Thu, Jul 1, 2010 at 1:03 AM, Christoph Egger <siccegge@cs.fau.de> wrote:
>> > SND_SOC_SMDK2443_WM9710 doesn't exist in Kconfig, therefore removing
>> > all references for it from the source code.
>
>> I'd rather have the code compiled unconditionally.
>
> Hrm, if this is part of the default hardware build we should get the
> driver merged.
But the machine driver is already there
sound/soc/s3c24xx/smdk2443_wm9710.c
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 29/33] Removing dead SND_SOC_SMDK2443_WM9710
2010-07-01 13:25 ` Christoph Egger
@ 2010-07-02 7:10 ` Jassi Brar
-1 siblings, 0 replies; 221+ messages in thread
From: Jassi Brar @ 2010-07-02 7:10 UTC (permalink / raw)
To: Christoph Egger
Cc: Ben Dooks, Russell King, Mark Brown, Jassi Brar,
linux-arm-kernel, linux-kernel, vamos
On Thu, Jul 1, 2010 at 10:25 PM, Christoph Egger <siccegge@cs.fau.de> wrote:
> On Thu, Jul 01, 2010 at 09:55:47PM +0900, Jassi Brar wrote:
>> On Thu, Jul 1, 2010 at 1:03 AM, Christoph Egger <siccegge@cs.fau.de> wrote:
>> > SND_SOC_SMDK2443_WM9710 doesn't exist in Kconfig, therefore removing
>> > all references for it from the source code.
>> I'd rather have the code compiled unconditionally.
>
> OK that would be done by the patch below
>
> ----
> From: Christoph Egger <siccegge@cs.fau.de>
> Date: Wed, 30 Jun 2010 17:18:52 +0200
> Subject: [PATCH 29/33] Removing dead SND_SOC_SMDK2443_WM9710
>
> SND_SOC_SMDK2443_WM9710 doesn't exist in Kconfig, therefore removing
> all references for it from the source code, building the parts
> unconditionally
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-s3c2443/mach-smdk2443.c | 4 ----
> 1 files changed, 0 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-s3c2443/mach-smdk2443.c b/arch/arm/mach-s3c2443/mach-smdk2443.c
> index 4c863d3..764144a 100644
> --- a/arch/arm/mach-s3c2443/mach-smdk2443.c
> +++ b/arch/arm/mach-s3c2443/mach-smdk2443.c
> @@ -106,9 +106,7 @@ static struct platform_device *smdk2443_devices[] __initdata = {
> &s3c_device_wdt,
> &s3c_device_i2c0,
> &s3c_device_hsmmc0,
> -#ifdef CONFIG_SND_SOC_SMDK2443_WM9710
> &s3c_device_ac97,
> -#endif
This is ok provided 2440 support is included.
> };
>
> static void __init smdk2443_map_io(void)
> @@ -122,9 +120,7 @@ static void __init smdk2443_machine_init(void)
> {
> s3c_i2c0_set_platdata(NULL);
>
> -#ifdef CONFIG_SND_SOC_SMDK2443_WM9710
> s3c24xx_ac97_setup_gpio(S3C24XX_AC97_GPE0);
> -#endif
This gpio setup is nowhere implemented. So might as well discard it.
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 29/33] Removing dead SND_SOC_SMDK2443_WM9710
@ 2010-07-02 7:10 ` Jassi Brar
0 siblings, 0 replies; 221+ messages in thread
From: Jassi Brar @ 2010-07-02 7:10 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 1, 2010 at 10:25 PM, Christoph Egger <siccegge@cs.fau.de> wrote:
> On Thu, Jul 01, 2010 at 09:55:47PM +0900, Jassi Brar wrote:
>> On Thu, Jul 1, 2010 at 1:03 AM, Christoph Egger <siccegge@cs.fau.de> wrote:
>> > SND_SOC_SMDK2443_WM9710 doesn't exist in Kconfig, therefore removing
>> > all references for it from the source code.
>> I'd rather have the code compiled unconditionally.
>
> OK that would be done by the patch below
>
> ----
> From: Christoph Egger <siccegge@cs.fau.de>
> Date: Wed, 30 Jun 2010 17:18:52 +0200
> Subject: [PATCH 29/33] Removing dead SND_SOC_SMDK2443_WM9710
>
> SND_SOC_SMDK2443_WM9710 doesn't exist in Kconfig, therefore removing
> all references for it from the source code, building the parts
> unconditionally
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> ?arch/arm/mach-s3c2443/mach-smdk2443.c | ? ?4 ----
> ?1 files changed, 0 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-s3c2443/mach-smdk2443.c b/arch/arm/mach-s3c2443/mach-smdk2443.c
> index 4c863d3..764144a 100644
> --- a/arch/arm/mach-s3c2443/mach-smdk2443.c
> +++ b/arch/arm/mach-s3c2443/mach-smdk2443.c
> @@ -106,9 +106,7 @@ static struct platform_device *smdk2443_devices[] __initdata = {
> ? ? ? ?&s3c_device_wdt,
> ? ? ? ?&s3c_device_i2c0,
> ? ? ? ?&s3c_device_hsmmc0,
> -#ifdef CONFIG_SND_SOC_SMDK2443_WM9710
> ? ? ? ?&s3c_device_ac97,
> -#endif
This is ok provided 2440 support is included.
> ?};
>
> ?static void __init smdk2443_map_io(void)
> @@ -122,9 +120,7 @@ static void __init smdk2443_machine_init(void)
> ?{
> ? ? ? ?s3c_i2c0_set_platdata(NULL);
>
> -#ifdef CONFIG_SND_SOC_SMDK2443_WM9710
> ? ? ? ?s3c24xx_ac97_setup_gpio(S3C24XX_AC97_GPE0);
> -#endif
This gpio setup is nowhere implemented. So might as well discard it.
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 27/33] Removing dead IDE_PXA_CF
2010-07-01 2:56 ` Eric Miao
(?)
@ 2010-07-02 7:45 ` Juergen Schindele
2010-07-02 9:24 ` Marek Vasut
2010-07-04 15:57 ` Eric Miao
-1 siblings, 2 replies; 221+ messages in thread
From: Juergen Schindele @ 2010-07-02 7:45 UTC (permalink / raw)
To: linux-arm-kernel
Am Donnerstag, 1. Juli 2010 schrieb Eric Miao:
> On Thu, Jul 1, 2010 at 12:02 AM, Christoph Egger <siccegge@cs.fau.de> wrote:
> > IDE_PXA_CF doesn't exist in Kconfig, therefore removing all references
> > for it from the source code.
> >
> > Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
>
> Acked-by: Eric Miao <eric.y.miao@gmail.com>
>
> Include Jurgen though, in case he has any idea.
>
> > ---
> > ?arch/arm/mach-pxa/trizeps4.c | ? ?6 +-----
> > ?1 files changed, 1 insertions(+), 5 deletions(-)
> >
> > diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c
> > index 6968911..0acff17 100644
> > --- a/arch/arm/mach-pxa/trizeps4.c
> > +++ b/arch/arm/mach-pxa/trizeps4.c
> > @@ -530,13 +530,9 @@ static void __init trizeps4_init(void)
> > ? ? ? ?i2c_register_board_info(0, trizeps4_i2c_devices,
> > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?ARRAY_SIZE(trizeps4_i2c_devices));
> >
Its OK for me to remove this because i can use pata_platform
instead and a rework of trizeps4/5 is planned.
Recently it was very hard for me to follow all changes.
> > -#ifdef CONFIG_IDE_PXA_CF
> > - ? ? ? /* if boot direct from compact flash dont disable power */
> > - ? ? ? trizeps_conxs_bcr = 0x0009;
> > -#else
> > ? ? ? ?/* this is the reset value */
> > ? ? ? ?trizeps_conxs_bcr = 0x00A0;
> > -#endif
> > +
> > ? ? ? ?BCR_writew(trizeps_conxs_bcr);
> > ? ? ? ?board_backlight_power(1);
> > ?}
> > --
> > 1.7.0.4
> >
> >
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
--
--------------------------------------------------------------
J?rgen Schindele
--------------------------------------------------------------
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 27/33] Removing dead IDE_PXA_CF
2010-07-02 7:45 ` Juergen Schindele
@ 2010-07-02 9:24 ` Marek Vasut
2010-07-04 15:57 ` Eric Miao
1 sibling, 0 replies; 221+ messages in thread
From: Marek Vasut @ 2010-07-02 9:24 UTC (permalink / raw)
To: linux-arm-kernel
Dne P? 2. ?ervence 2010 09:45:41 Juergen Schindele napsal(a):
> Am Donnerstag, 1. Juli 2010 schrieb Eric Miao:
> > On Thu, Jul 1, 2010 at 12:02 AM, Christoph Egger <siccegge@cs.fau.de> wrote:
> > > IDE_PXA_CF doesn't exist in Kconfig, therefore removing all references
> > > for it from the source code.
> > >
> > > Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> >
> > Acked-by: Eric Miao <eric.y.miao@gmail.com>
> >
> > Include Jurgen though, in case he has any idea.
> >
> > > ---
> > > arch/arm/mach-pxa/trizeps4.c | 6 +-----
> > > 1 files changed, 1 insertions(+), 5 deletions(-)
> > >
> > > diff --git a/arch/arm/mach-pxa/trizeps4.c
> > > b/arch/arm/mach-pxa/trizeps4.c index 6968911..0acff17 100644
> > > --- a/arch/arm/mach-pxa/trizeps4.c
> > > +++ b/arch/arm/mach-pxa/trizeps4.c
> > > @@ -530,13 +530,9 @@ static void __init trizeps4_init(void)
> > > i2c_register_board_info(0, trizeps4_i2c_devices,
> > >
> > > ARRAY_SIZE(trizeps4_i2c_devices));
>
> Its OK for me to remove this because i can use pata_platform
> instead and a rework of trizeps4/5 is planned.
> Recently it was very hard for me to follow all changes.
Are you using U-Boot on that trizeps V ? btw. maybe you can even use pata-pxa if
your hardware supports pxa dma?
Cheers
>
> > > -#ifdef CONFIG_IDE_PXA_CF
> > > - /* if boot direct from compact flash dont disable power */
> > > - trizeps_conxs_bcr = 0x0009;
> > > -#else
> > > /* this is the reset value */
> > > trizeps_conxs_bcr = 0x00A0;
> > > -#endif
> > > +
> > > BCR_writew(trizeps_conxs_bcr);
> > > board_backlight_power(1);
> > > }
> > > --
> > > 1.7.0.4
> >
> > _______________________________________________
> > linux-arm-kernel mailing list
> > linux-arm-kernel at lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 29/33] Removing dead SND_SOC_SMDK2443_WM9710
2010-07-02 7:08 ` Jassi Brar
@ 2010-07-02 9:33 ` Mark Brown
-1 siblings, 0 replies; 221+ messages in thread
From: Mark Brown @ 2010-07-02 9:33 UTC (permalink / raw)
To: Jassi Brar
Cc: Christoph Egger, Ben Dooks, Russell King, Jassi Brar,
linux-arm-kernel, linux-kernel, vamos
On Fri, Jul 02, 2010 at 04:08:56PM +0900, Jassi Brar wrote:
> On Thu, Jul 1, 2010 at 10:07 PM, Mark Brown
> > Hrm, if this is part of the default hardware build we should get the
> > driver merged.
> But the machine driver is already there
> sound/soc/s3c24xx/smdk2443_wm9710.c
Oh, right. I was just assuming that it wasn't there since the symbol
isn't defined in mainline, I hadn't actually looked.
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 29/33] Removing dead SND_SOC_SMDK2443_WM9710
@ 2010-07-02 9:33 ` Mark Brown
0 siblings, 0 replies; 221+ messages in thread
From: Mark Brown @ 2010-07-02 9:33 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Jul 02, 2010 at 04:08:56PM +0900, Jassi Brar wrote:
> On Thu, Jul 1, 2010 at 10:07 PM, Mark Brown
> > Hrm, if this is part of the default hardware build we should get the
> > driver merged.
> But the machine driver is already there
> sound/soc/s3c24xx/smdk2443_wm9710.c
Oh, right. I was just assuming that it wasn't there since the symbol
isn't defined in mainline, I hadn't actually looked.
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 30/33] Removing dead S3C_DEV_ADC
2010-06-30 16:03 ` Christoph Egger
@ 2010-07-02 9:38 ` Ben Dooks
-1 siblings, 0 replies; 221+ messages in thread
From: Ben Dooks @ 2010-07-02 9:38 UTC (permalink / raw)
To: Christoph Egger
Cc: Russell King, Ben Dooks, Kukjin Kim, Kyungmin Park,
Marek Szyprowski, Thomas Abraham, linux-arm-kernel, linux-kernel,
vamos
On 30/06/10 17:03, Christoph Egger wrote:
> S3C_DEV_ADC doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
This is going to be fixed in the next kernel release, one way
or the other, so please drop this patch
--
Ben
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 30/33] Removing dead S3C_DEV_ADC
@ 2010-07-02 9:38 ` Ben Dooks
0 siblings, 0 replies; 221+ messages in thread
From: Ben Dooks @ 2010-07-02 9:38 UTC (permalink / raw)
To: linux-arm-kernel
On 30/06/10 17:03, Christoph Egger wrote:
> S3C_DEV_ADC doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
This is going to be fixed in the next kernel release, one way
or the other, so please drop this patch
--
Ben
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 06/33] Removing dead SHARPSL_LOCOMO
2010-07-01 14:40 ` Eric Miao
@ 2010-07-04 15:55 ` Eric Miao
-1 siblings, 0 replies; 221+ messages in thread
From: Eric Miao @ 2010-07-04 15:55 UTC (permalink / raw)
To: Christoph Egger; +Cc: Russell King, linux-arm-kernel, linux-kernel, vamos
On Thu, Jul 1, 2010 at 10:40 PM, Eric Miao <eric.y.miao@gmail.com> wrote:
> On Thu, Jul 1, 2010 at 9:23 PM, Christoph Egger <siccegge@cs.fau.de> wrote:
>> On Thu, Jul 01, 2010 at 10:34:13AM +0800, Eric Miao wrote:
>>> On Wed, Jun 30, 2010 at 11:55 PM, Christoph Egger <siccegge@cs.fau.de> wrote:
>>> > SHARPSL_LOCOMO doesn't exist in Kconfig, therefore removing all
>>> > references for it from the source code.
>>> >
>>>
>>> A good catch, though SHARPSL_LOCOMO has be changed to SHARP_LOCOMO
>>> later, so a better fix would be the name change only.
>>
>> Hi! Updated patch below
>>
>> ----
>> From: Christoph Egger <siccegge@cs.fau.de>
>> Date: Wed, 30 Jun 2010 12:36:20 +0200
>> Subject: [PATCH 06/33] Replacing dead SHARPSL_LOCOMO with SHARP_LOCOMO
>>
>> SHARP_LOCOMO doesn't exist in Kconfig, therefore replacing all
>> references for it with SHARP_LOCOMO in the source code.
>>
>> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
>
> Acked-by: Eric Miao <eric.y.miao@gmail.com>
>
Applied.
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 06/33] Removing dead SHARPSL_LOCOMO
@ 2010-07-04 15:55 ` Eric Miao
0 siblings, 0 replies; 221+ messages in thread
From: Eric Miao @ 2010-07-04 15:55 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 1, 2010 at 10:40 PM, Eric Miao <eric.y.miao@gmail.com> wrote:
> On Thu, Jul 1, 2010 at 9:23 PM, Christoph Egger <siccegge@cs.fau.de> wrote:
>> On Thu, Jul 01, 2010 at 10:34:13AM +0800, Eric Miao wrote:
>>> On Wed, Jun 30, 2010 at 11:55 PM, Christoph Egger <siccegge@cs.fau.de> wrote:
>>> > SHARPSL_LOCOMO doesn't exist in Kconfig, therefore removing all
>>> > references for it from the source code.
>>> >
>>>
>>> A good catch, though SHARPSL_LOCOMO has be changed to SHARP_LOCOMO
>>> later, so a better fix would be the name change only.
>>
>> Hi! Updated patch below
>>
>> ----
>> From: Christoph Egger <siccegge@cs.fau.de>
>> Date: Wed, 30 Jun 2010 12:36:20 +0200
>> Subject: [PATCH 06/33] Replacing dead SHARPSL_LOCOMO with SHARP_LOCOMO
>>
>> SHARP_LOCOMO doesn't exist in Kconfig, therefore replacing all
>> references for it with SHARP_LOCOMO in the source code.
>>
>> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
>
> Acked-by: Eric Miao <eric.y.miao@gmail.com>
>
Applied.
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 23/33] Removing dead BACKLIGHT_CORGI
2010-07-01 3:50 ` Eric Miao
@ 2010-07-04 15:55 ` Eric Miao
-1 siblings, 0 replies; 221+ messages in thread
From: Eric Miao @ 2010-07-04 15:55 UTC (permalink / raw)
To: Christoph Egger
Cc: Russell King, Pavel Machek, Arnaud Patard, Uwe Kleine-K??nig,
Kristoffer Ericson, linux-arm-kernel, linux-kernel, vamos,
Richard Purdie
On Thu, Jul 1, 2010 at 11:50 AM, Eric Miao <eric.y.miao@gmail.com> wrote:
> On Thu, Jul 1, 2010 at 12:01 AM, Christoph Egger <siccegge@cs.fau.de> wrote:
>> BACKLIGHT_CORGI doesn't exist in Kconfig, therefore removing all
>> references for it from the source code.
>>
>> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
>
> BACKLIGHT_CORGI was renamed to BACKLIGHT_GENERIC in commit
> d00ba726725c6f41e43df00f83e484ba8f9fac5c.
>
> Since it's now safe to completely transition to LCD_CORGI, which not only
> includes the backlight functionality but also the LCD, so
>
> Acked-by: Eric Miao <eric.y.miao@gmail.com>
>
Applied.
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 23/33] Removing dead BACKLIGHT_CORGI
@ 2010-07-04 15:55 ` Eric Miao
0 siblings, 0 replies; 221+ messages in thread
From: Eric Miao @ 2010-07-04 15:55 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 1, 2010 at 11:50 AM, Eric Miao <eric.y.miao@gmail.com> wrote:
> On Thu, Jul 1, 2010 at 12:01 AM, Christoph Egger <siccegge@cs.fau.de> wrote:
>> BACKLIGHT_CORGI doesn't exist in Kconfig, therefore removing all
>> references for it from the source code.
>>
>> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
>
> BACKLIGHT_CORGI was renamed to BACKLIGHT_GENERIC in commit
> d00ba726725c6f41e43df00f83e484ba8f9fac5c.
>
> Since it's now safe to completely transition to LCD_CORGI, which not only
> includes the backlight functionality but also the LCD, so
>
> Acked-by: Eric Miao <eric.y.miao@gmail.com>
>
Applied.
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 24/33] Removing dead ARCH_GUMSTIX_ORIG
2010-07-01 23:57 ` Jaya Kumar
@ 2010-07-04 15:56 ` Eric Miao
-1 siblings, 0 replies; 221+ messages in thread
From: Eric Miao @ 2010-07-04 15:56 UTC (permalink / raw)
To: Jaya Kumar
Cc: Christoph Egger, Russell King, linux-arm-kernel, linux-kernel, vamos
On Fri, Jul 2, 2010 at 7:57 AM, Jaya Kumar <jayakumar.arm@gmail.com> wrote:
> On Thu, Jul 1, 2010 at 12:27 PM, Eric Miao <eric.y.miao@gmail.com> wrote:
>> On Thu, Jul 1, 2010 at 12:01 AM, Christoph Egger <siccegge@cs.fau.de> wrote:
>>> ARCH_GUMSTIX_ORIG doesn't exist in Kconfig, therefore removing all
>>> references for it from the source code.
>>>
>>> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
>>
>> Acked-by: Eric Miao <eric.y.miao@gmail.com>
>>
>> Cc'ed Jaya Kumar for additional thoughts.
>
> Looks okay to me too. Thanks.
>
> Acked-by: Jaya Kumar <jayakumar.lkml@gmail.com>
>
Applied.
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 24/33] Removing dead ARCH_GUMSTIX_ORIG
@ 2010-07-04 15:56 ` Eric Miao
0 siblings, 0 replies; 221+ messages in thread
From: Eric Miao @ 2010-07-04 15:56 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Jul 2, 2010 at 7:57 AM, Jaya Kumar <jayakumar.arm@gmail.com> wrote:
> On Thu, Jul 1, 2010 at 12:27 PM, Eric Miao <eric.y.miao@gmail.com> wrote:
>> On Thu, Jul 1, 2010 at 12:01 AM, Christoph Egger <siccegge@cs.fau.de> wrote:
>>> ARCH_GUMSTIX_ORIG doesn't exist in Kconfig, therefore removing all
>>> references for it from the source code.
>>>
>>> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
>>
>> Acked-by: Eric Miao <eric.y.miao@gmail.com>
>>
>> Cc'ed Jaya Kumar for additional thoughts.
>
> Looks okay to me too. Thanks.
>
> Acked-by: Jaya Kumar <jayakumar.lkml@gmail.com>
>
Applied.
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 25/33] Removing dead CORGI_SSP_DEPRECATED
2010-07-01 9:58 ` Kristoffer Ericson
@ 2010-07-04 15:56 ` Eric Miao
-1 siblings, 0 replies; 221+ messages in thread
From: Eric Miao @ 2010-07-04 15:56 UTC (permalink / raw)
To: Kristoffer Ericson
Cc: Christoph Egger, Russell King, Pavel Machek, Arnaud Patard,
Uwe Kleine-K??nig, linux-arm-kernel, linux-kernel, vamos
On Thu, Jul 1, 2010 at 5:58 PM, Kristoffer Ericson
<kristoffer.ericson@gmail.com> wrote:
> On Wed, Jun 30, 2010 at 06:01:56PM +0200, Christoph Egger wrote:
>> CORGI_SSP_DEPRECATED doesn't exist in Kconfig, therefore removing all
>> references for it from the source code.
>>
>> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
>
> Cant see anything wrong with this.
>
> acked-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>
>
Applied.
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 25/33] Removing dead CORGI_SSP_DEPRECATED
@ 2010-07-04 15:56 ` Eric Miao
0 siblings, 0 replies; 221+ messages in thread
From: Eric Miao @ 2010-07-04 15:56 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 1, 2010 at 5:58 PM, Kristoffer Ericson
<kristoffer.ericson@gmail.com> wrote:
> On Wed, Jun 30, 2010 at 06:01:56PM +0200, Christoph Egger wrote:
>> CORGI_SSP_DEPRECATED doesn't exist in Kconfig, therefore removing all
>> references for it from the source code.
>>
>> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
>
> Cant see anything wrong with this.
>
> acked-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>
>
Applied.
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 26/33] Removing dead XSCALE_CACHE_ERRATA
2010-07-01 4:25 ` Eric Miao
@ 2010-07-04 15:56 ` Eric Miao
-1 siblings, 0 replies; 221+ messages in thread
From: Eric Miao @ 2010-07-04 15:56 UTC (permalink / raw)
To: Christoph Egger
Cc: Russell King, linux-arm-kernel, linux-kernel, vamos, Nicolas Pitre
On Thu, Jul 1, 2010 at 12:25 PM, Eric Miao <eric.y.miao@gmail.com> wrote:
> On Thu, Jul 1, 2010 at 12:02 AM, Christoph Egger <siccegge@cs.fau.de> wrote:
>> XSCALE_CACHE_ERRATA doesn't exist in Kconfig, therefore removing all
>> references for it from the source code.
>>
>> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
>
> Acked-by: Eric Miao <eric.y.miao@gmail.com>
>
> It's not been there since 2.6, found some references in 2.4 kernel though. And
> I doubt anyone has encountered this issue in real products on market.
>
Applied.
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 26/33] Removing dead XSCALE_CACHE_ERRATA
@ 2010-07-04 15:56 ` Eric Miao
0 siblings, 0 replies; 221+ messages in thread
From: Eric Miao @ 2010-07-04 15:56 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 1, 2010 at 12:25 PM, Eric Miao <eric.y.miao@gmail.com> wrote:
> On Thu, Jul 1, 2010 at 12:02 AM, Christoph Egger <siccegge@cs.fau.de> wrote:
>> XSCALE_CACHE_ERRATA doesn't exist in Kconfig, therefore removing all
>> references for it from the source code.
>>
>> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
>
> Acked-by: Eric Miao <eric.y.miao@gmail.com>
>
> It's not been there since 2.6, found some references in 2.4 kernel though. And
> I doubt anyone has encountered this issue in real products on market.
>
Applied.
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 27/33] Removing dead IDE_PXA_CF
2010-07-02 7:45 ` Juergen Schindele
2010-07-02 9:24 ` Marek Vasut
@ 2010-07-04 15:57 ` Eric Miao
1 sibling, 0 replies; 221+ messages in thread
From: Eric Miao @ 2010-07-04 15:57 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Jul 2, 2010 at 3:45 PM, Juergen Schindele <schindele@nentec.de> wrote:
> Am Donnerstag, 1. Juli 2010 schrieb Eric Miao:
>> On Thu, Jul 1, 2010 at 12:02 AM, Christoph Egger <siccegge@cs.fau.de> wrote:
>> > IDE_PXA_CF doesn't exist in Kconfig, therefore removing all references
>> > for it from the source code.
>> >
>> > Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
>>
>> Acked-by: Eric Miao <eric.y.miao@gmail.com>
>>
>> Include Jurgen though, in case he has any idea.
>>
>> > ---
>> > ?arch/arm/mach-pxa/trizeps4.c | ? ?6 +-----
>> > ?1 files changed, 1 insertions(+), 5 deletions(-)
>> >
>> > diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c
>> > index 6968911..0acff17 100644
>> > --- a/arch/arm/mach-pxa/trizeps4.c
>> > +++ b/arch/arm/mach-pxa/trizeps4.c
>> > @@ -530,13 +530,9 @@ static void __init trizeps4_init(void)
>> > ? ? ? ?i2c_register_board_info(0, trizeps4_i2c_devices,
>> > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?ARRAY_SIZE(trizeps4_i2c_devices));
>> >
> Its OK for me to remove this because i can use pata_platform
> instead and a rework of trizeps4/5 is planned.
> Recently it was very hard for me to follow all changes.
I took this as an Acked-by and patch applied.
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 15/33] Removing dead PROCESSOR_NS9750
2010-06-30 15:58 ` Christoph Egger
@ 2010-07-05 7:15 ` Uwe Kleine-König
-1 siblings, 0 replies; 221+ messages in thread
From: Uwe Kleine-König @ 2010-07-05 7:15 UTC (permalink / raw)
To: Christoph Egger; +Cc: Russell King, linux-arm-kernel, linux-kernel, vamos
On Wed, Jun 30, 2010 at 05:58:48PM +0200, Christoph Egger wrote:
> PROCESSOR_NS9750 doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-ns9xxx/gpio.c | 8 --------
> 1 files changed, 0 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/mach-ns9xxx/gpio.c b/arch/arm/mach-ns9xxx/gpio.c
> index 5503ca0..58f4f50 100644
> --- a/arch/arm/mach-ns9xxx/gpio.c
> +++ b/arch/arm/mach-ns9xxx/gpio.c
> @@ -25,9 +25,6 @@
>
> #if defined(CONFIG_PROCESSOR_NS9360)
> #define GPIO_MAX 72
> -#elif defined(CONFIG_PROCESSOR_NS9750)
> -#define GPIO_MAX 49
> -#endif
>
> /* protects BBU_GCONFx and BBU_GCTRLx */
> static spinlock_t gpio_lock = __SPIN_LOCK_UNLOCKED(gpio_lock);
> @@ -42,11 +39,6 @@ static inline int ns9xxx_valid_gpio(unsigned gpio)
> return gpio <= 72;
> else
> #endif
> -#if defined(CONFIG_PROCESSOR_NS9750)
> - if (processor_is_ns9750())
> - return gpio <= 49;
> - else
> -#endif
> {
> BUG();
> return 0;
The code is correct as is, but AFAIK the ns9750 isn't supported anymore
even in the Digi provided BSPs and as it seems there aren't any efforts
to maintain ns9xxx in mainline.
So, Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 15/33] Removing dead PROCESSOR_NS9750
@ 2010-07-05 7:15 ` Uwe Kleine-König
0 siblings, 0 replies; 221+ messages in thread
From: Uwe Kleine-König @ 2010-07-05 7:15 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jun 30, 2010 at 05:58:48PM +0200, Christoph Egger wrote:
> PROCESSOR_NS9750 doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-ns9xxx/gpio.c | 8 --------
> 1 files changed, 0 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/mach-ns9xxx/gpio.c b/arch/arm/mach-ns9xxx/gpio.c
> index 5503ca0..58f4f50 100644
> --- a/arch/arm/mach-ns9xxx/gpio.c
> +++ b/arch/arm/mach-ns9xxx/gpio.c
> @@ -25,9 +25,6 @@
>
> #if defined(CONFIG_PROCESSOR_NS9360)
> #define GPIO_MAX 72
> -#elif defined(CONFIG_PROCESSOR_NS9750)
> -#define GPIO_MAX 49
> -#endif
>
> /* protects BBU_GCONFx and BBU_GCTRLx */
> static spinlock_t gpio_lock = __SPIN_LOCK_UNLOCKED(gpio_lock);
> @@ -42,11 +39,6 @@ static inline int ns9xxx_valid_gpio(unsigned gpio)
> return gpio <= 72;
> else
> #endif
> -#if defined(CONFIG_PROCESSOR_NS9750)
> - if (processor_is_ns9750())
> - return gpio <= 49;
> - else
> -#endif
> {
> BUG();
> return 0;
The code is correct as is, but AFAIK the ns9750 isn't supported anymore
even in the Digi provided BSPs and as it seems there aren't any efforts
to maintain ns9xxx in mainline.
So, Acked-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 03/33] Removing dead OMAP_MUX_ERRORS
2010-07-01 15:27 ` Kirill A. Shutemov
@ 2010-07-05 8:07 ` Tony Lindgren
-1 siblings, 0 replies; 221+ messages in thread
From: Tony Lindgren @ 2010-07-05 8:07 UTC (permalink / raw)
To: Kirill A. Shutemov
Cc: Christoph Egger, Russell King, Cory Maccarrone,
Zebediah C. McClure, Alistair Buxton, linux-omap,
linux-arm-kernel, linux-kernel, vamos
* Kirill A. Shutemov <kirill@shutemov.name> [100701 18:21]:
> On Thu, Jul 01, 2010 at 03:22:55PM +0200, Christoph Egger wrote:
> > On Wed, Jun 30, 2010 at 10:54:09PM +0300, Kirill A. Shutemov wrote:
> > > On Wed, Jun 30, 2010 at 05:54:42PM +0200, Christoph Egger wrote:
> > > > OMAP_MUX_ERRORS doesn't exist in Kconfig, therefore removing all
> > > > references for it from the source code.
> > >
> > > IIUC, CONFIG_OMAP_MUX_WARNINGS should be used here instead of it.
> >
> > Something like the patch below?
>
> Acked-by: Kirill A. Shutemov <kirill@shutemov.name>
Thanks, I've queued up this.
Tony
> >
> > ----
> > From: Christoph Egger <siccegge@cs.fau.de>
> > Date: Wed, 30 Jun 2010 12:30:36 +0200
> > Subject: [PATCH 03/33] Replace dead OMAP_MUX_ERRORS with OMAP_MUX_WARNINGS
> >
> > OMAP_MUX_ERRORS doesn't exist in Kconfig, therefore replacing all
> > references for it with OMAP_MUX_WARNINGS in the source code.
> >
> > Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> > ---
> > arch/arm/mach-omap1/mux.c | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c
> > index 8434137..3e98835 100644
> > --- a/arch/arm/mach-omap1/mux.c
> > +++ b/arch/arm/mach-omap1/mux.c
> > @@ -440,7 +440,7 @@ int __init_or_module omap1_cfg_reg(const struct pin_config *cfg)
> > }
> > #endif
> >
> > -#ifdef CONFIG_OMAP_MUX_ERRORS
> > +#ifdef CONFIG_OMAP_MUX_WARNINGS
> > return warn ? -ETXTBSY : 0;
> > #else
> > return 0;
> > --
> > 1.7.0.4
> >
> >
>
> --
> Kirill A. Shutemov
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 03/33] Removing dead OMAP_MUX_ERRORS
@ 2010-07-05 8:07 ` Tony Lindgren
0 siblings, 0 replies; 221+ messages in thread
From: Tony Lindgren @ 2010-07-05 8:07 UTC (permalink / raw)
To: linux-arm-kernel
* Kirill A. Shutemov <kirill@shutemov.name> [100701 18:21]:
> On Thu, Jul 01, 2010 at 03:22:55PM +0200, Christoph Egger wrote:
> > On Wed, Jun 30, 2010 at 10:54:09PM +0300, Kirill A. Shutemov wrote:
> > > On Wed, Jun 30, 2010 at 05:54:42PM +0200, Christoph Egger wrote:
> > > > OMAP_MUX_ERRORS doesn't exist in Kconfig, therefore removing all
> > > > references for it from the source code.
> > >
> > > IIUC, CONFIG_OMAP_MUX_WARNINGS should be used here instead of it.
> >
> > Something like the patch below?
>
> Acked-by: Kirill A. Shutemov <kirill@shutemov.name>
Thanks, I've queued up this.
Tony
> >
> > ----
> > From: Christoph Egger <siccegge@cs.fau.de>
> > Date: Wed, 30 Jun 2010 12:30:36 +0200
> > Subject: [PATCH 03/33] Replace dead OMAP_MUX_ERRORS with OMAP_MUX_WARNINGS
> >
> > OMAP_MUX_ERRORS doesn't exist in Kconfig, therefore replacing all
> > references for it with OMAP_MUX_WARNINGS in the source code.
> >
> > Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> > ---
> > arch/arm/mach-omap1/mux.c | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c
> > index 8434137..3e98835 100644
> > --- a/arch/arm/mach-omap1/mux.c
> > +++ b/arch/arm/mach-omap1/mux.c
> > @@ -440,7 +440,7 @@ int __init_or_module omap1_cfg_reg(const struct pin_config *cfg)
> > }
> > #endif
> >
> > -#ifdef CONFIG_OMAP_MUX_ERRORS
> > +#ifdef CONFIG_OMAP_MUX_WARNINGS
> > return warn ? -ETXTBSY : 0;
> > #else
> > return 0;
> > --
> > 1.7.0.4
> >
> >
>
> --
> Kirill A. Shutemov
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 05/33] Removing dead OMAP_IR
2010-06-30 15:55 ` Christoph Egger
@ 2010-07-05 8:14 ` Tony Lindgren
-1 siblings, 0 replies; 221+ messages in thread
From: Tony Lindgren @ 2010-07-05 8:14 UTC (permalink / raw)
To: Christoph Egger
Cc: Russell King, Ladislav Michl, Kalle Valo, Kevin Hilman,
Paul Walmsley, Santosh Shilimkar, linux-omap, linux-arm-kernel,
linux-kernel, vamos
[-- Attachment #1: Type: text/plain, Size: 271 bytes --]
* Christoph Egger <siccegge@cs.fau.de> [100630 18:49]:
> OMAP_IR doesn't exist in Kconfig, therefore removing all references
> for it from the source code.
Thanks I've updated this for the new mux code for board-h4.c and applied it.
Updated patch below.
Regards,
Tony
[-- Attachment #2: irda.patch --]
[-- Type: text/x-diff, Size: 2370 bytes --]
>From e2bed14099b0d15514d3e542742fa9310d9bf52c Mon Sep 17 00:00:00 2001
From: Christoph Egger <siccegge@cs.fau.de>
Date: Wed, 30 Jun 2010 15:55:22 +0000
Subject: [PATCH] Removing dead OMAP_IR
OMAP_IR doesn't exist in Kconfig, therefore removing all references
for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
[tony@atomide.com: updated for new mux code]
Signed-off-by: Tony Lindgren <tony@atomide.com>
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index ee46974..2efa427 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -292,15 +292,6 @@ static struct platform_device h2_kp_device = {
#define H2_IRDA_FIRSEL_GPIO_PIN 17
-#if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE)
-static int h2_transceiver_mode(struct device *dev, int state)
-{
- /* SIR when low, else MIR/FIR when HIGH */
- gpio_set_value(H2_IRDA_FIRSEL_GPIO_PIN, !(state & IR_SIRMODE));
- return 0;
-}
-#endif
-
static struct omap_irda_config h2_irda_data = {
.transceiver_cap = IR_SIRMODE | IR_MIRMODE | IR_FIRMODE,
.rx_channel = OMAP_DMA_UART3_RX,
@@ -450,15 +441,6 @@ static void __init h2_init(void)
omap_cfg_reg(E19_1610_KBR4);
omap_cfg_reg(N19_1610_KBR5);
- /* Irda */
-#if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE)
- omap_writel(omap_readl(FUNC_MUX_CTRL_A) | 7, FUNC_MUX_CTRL_A);
- if (gpio_request(H2_IRDA_FIRSEL_GPIO_PIN, "IRDA mode") < 0)
- BUG();
- gpio_direction_output(H2_IRDA_FIRSEL_GPIO_PIN, 0);
- h2_irda_data.transceiver_mode = h2_transceiver_mode;
-#endif
-
platform_add_devices(h2_devices, ARRAY_SIZE(h2_devices));
omap_board_config = h2_config;
omap_board_config_size = ARRAY_SIZE(h2_config);
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
index 2d9ff0f..9044dcf 100644
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@ -356,10 +356,6 @@ static void __init omap_h4_init(void)
* You have to mux them off in device drivers later on
* if not needed.
*/
-#if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE)
- omap_mux_init_signal("uart3_tx_irtx.uart3_tx_irtx", 0);
- omap_mux_init_signal("uart3_rx_irrx.uart3_rx_irrx", 0);
-#endif
#if defined(CONFIG_KEYBOARD_OMAP) || defined(CONFIG_KEYBOARD_OMAP_MODULE)
omap_mux_init_gpio(88, OMAP_PULL_ENA | OMAP_PULL_UP);
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 05/33] Removing dead OMAP_IR
@ 2010-07-05 8:14 ` Tony Lindgren
0 siblings, 0 replies; 221+ messages in thread
From: Tony Lindgren @ 2010-07-05 8:14 UTC (permalink / raw)
To: linux-arm-kernel
* Christoph Egger <siccegge@cs.fau.de> [100630 18:49]:
> OMAP_IR doesn't exist in Kconfig, therefore removing all references
> for it from the source code.
Thanks I've updated this for the new mux code for board-h4.c and applied it.
Updated patch below.
Regards,
Tony
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 11/33] Removing dead OMAP_DSP
2010-06-30 15:57 ` Christoph Egger
@ 2010-07-05 8:20 ` Tony Lindgren
-1 siblings, 0 replies; 221+ messages in thread
From: Tony Lindgren @ 2010-07-05 8:20 UTC (permalink / raw)
To: Christoph Egger
Cc: Russell King, Tomi Valkeinen, Cory Maccarrone, Felipe Balbi,
Zebediah C. McClure, Alistair Buxton, Janusz Krzysztofik,
Jorge Eduardo Candelaria, Santosh Shilimkar, linux-omap,
linux-arm-kernel, linux-kernel, vamos
[-- Attachment #1: Type: text/plain, Size: 219 bytes --]
* Christoph Egger <siccegge@cs.fau.de> [100630 18:51]:
> OMAP_DSP doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
I've updated and queued this one. Updated patch below.
Tony
[-- Attachment #2: dead-dsp.patch --]
[-- Type: text/x-diff, Size: 9848 bytes --]
>From 2a65e8217bc6686b409ae19ec79e89421b5e73c1 Mon Sep 17 00:00:00 2001
From: Christoph Egger <siccegge@cs.fau.de>
Date: Wed, 30 Jun 2010 15:57:26 +0000
Subject: [PATCH] Removing dead OMAP_DSP
OMAP_DSP doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
[tony@atomide.com: updated to apply on top of already queued patches]
Signed-off-by: Tony Lindgren <tony@atomide.com>
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index c9e9e37..5a7b638 100644
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -242,138 +242,6 @@ static inline void nokia770_mmc_init(void)
}
#endif
-#if defined(CONFIG_OMAP_DSP)
-/*
- * audio power control
- */
-#define HEADPHONE_GPIO 14
-#define AMPLIFIER_CTRL_GPIO 58
-
-static struct clk *dspxor_ck;
-static DEFINE_MUTEX(audio_pwr_lock);
-/*
- * audio_pwr_state
- * +--+-------------------------+---------------------------------------+
- * |-1|down |power-up request -> 0 |
- * +--+-------------------------+---------------------------------------+
- * | 0|up |power-down(1) request -> 1 |
- * | | |power-down(2) request -> (ignore) |
- * +--+-------------------------+---------------------------------------+
- * | 1|up, |power-up request -> 0 |
- * | |received down(1) request |power-down(2) request -> -1 |
- * +--+-------------------------+---------------------------------------+
- */
-static int audio_pwr_state = -1;
-
-static inline void aic23_power_up(void)
-{
-}
-static inline void aic23_power_down(void)
-{
-}
-
-/*
- * audio_pwr_up / down should be called under audio_pwr_lock
- */
-static void nokia770_audio_pwr_up(void)
-{
- clk_enable(dspxor_ck);
-
- /* Turn on codec */
- aic23_power_up();
-
- if (gpio_get_value(HEADPHONE_GPIO))
- /* HP not connected, turn on amplifier */
- gpio_set_value(AMPLIFIER_CTRL_GPIO, 1);
- else
- /* HP connected, do not turn on amplifier */
- printk("HP connected\n");
-}
-
-static void codec_delayed_power_down(struct work_struct *work)
-{
- mutex_lock(&audio_pwr_lock);
- if (audio_pwr_state == -1)
- aic23_power_down();
- clk_disable(dspxor_ck);
- mutex_unlock(&audio_pwr_lock);
-}
-
-static DECLARE_DELAYED_WORK(codec_power_down_work, codec_delayed_power_down);
-
-static void nokia770_audio_pwr_down(void)
-{
- /* Turn off amplifier */
- gpio_set_value(AMPLIFIER_CTRL_GPIO, 0);
-
- /* Turn off codec: schedule delayed work */
- schedule_delayed_work(&codec_power_down_work, HZ / 20); /* 50ms */
-}
-
-static int
-nokia770_audio_pwr_up_request(struct dsp_kfunc_device *kdev, int stage)
-{
- mutex_lock(&audio_pwr_lock);
- if (audio_pwr_state == -1)
- nokia770_audio_pwr_up();
- /* force audio_pwr_state = 0, even if it was 1. */
- audio_pwr_state = 0;
- mutex_unlock(&audio_pwr_lock);
- return 0;
-}
-
-static int
-nokia770_audio_pwr_down_request(struct dsp_kfunc_device *kdev, int stage)
-{
- mutex_lock(&audio_pwr_lock);
- switch (stage) {
- case 1:
- if (audio_pwr_state == 0)
- audio_pwr_state = 1;
- break;
- case 2:
- if (audio_pwr_state == 1) {
- nokia770_audio_pwr_down();
- audio_pwr_state = -1;
- }
- break;
- }
- mutex_unlock(&audio_pwr_lock);
- return 0;
-}
-
-static struct dsp_kfunc_device nokia770_audio_device = {
- .name = "audio",
- .type = DSP_KFUNC_DEV_TYPE_AUDIO,
- .enable = nokia770_audio_pwr_up_request,
- .disable = nokia770_audio_pwr_down_request,
-};
-
-static __init int omap_dsp_init(void)
-{
- int ret;
-
- dspxor_ck = clk_get(0, "dspxor_ck");
- if (IS_ERR(dspxor_ck)) {
- printk(KERN_ERR "couldn't acquire dspxor_ck\n");
- return PTR_ERR(dspxor_ck);
- }
-
- ret = dsp_kfunc_device_register(&nokia770_audio_device);
- if (ret) {
- printk(KERN_ERR
- "KFUNC device registration faild: %s\n",
- nokia770_audio_device.name);
- goto out;
- }
- return 0;
- out:
- return ret;
-}
-#else
-#define omap_dsp_init() do {} while (0)
-#endif /* CONFIG_OMAP_DSP */
-
static void __init omap_nokia770_init(void)
{
platform_add_devices(nokia770_devices, ARRAY_SIZE(nokia770_devices));
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index 379100c..c00d602 100644
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -63,44 +63,7 @@ static void omap_init_rtc(void)
static inline void omap_init_rtc(void) {}
#endif
-#if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE)
-
-#if defined(CONFIG_ARCH_OMAP15XX)
-# define OMAP1_MBOX_SIZE 0x23
-# define INT_DSP_MAILBOX1 INT_1510_DSP_MAILBOX1
-#elif defined(CONFIG_ARCH_OMAP16XX)
-# define OMAP1_MBOX_SIZE 0x2f
-# define INT_DSP_MAILBOX1 INT_1610_DSP_MAILBOX1
-#endif
-
-#define OMAP1_MBOX_BASE OMAP16XX_MAILBOX_BASE
-
-static struct resource mbox_resources[] = {
- {
- .start = OMAP1_MBOX_BASE,
- .end = OMAP1_MBOX_BASE + OMAP1_MBOX_SIZE,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = INT_DSP_MAILBOX1,
- .flags = IORESOURCE_IRQ,
- },
-};
-
-static struct platform_device mbox_device = {
- .name = "omap1-mailbox",
- .id = -1,
- .num_resources = ARRAY_SIZE(mbox_resources),
- .resource = mbox_resources,
-};
-
-static inline void omap_init_mbox(void)
-{
- platform_device_register(&mbox_device);
-}
-#else
static inline void omap_init_mbox(void) { }
-#endif
/*-------------------------------------------------------------------------*/
diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c
index e9bdff1..b3a796a 100644
--- a/arch/arm/mach-omap1/mcbsp.c
+++ b/arch/arm/mach-omap1/mcbsp.c
@@ -23,7 +23,6 @@
#include <plat/mux.h>
#include <plat/cpu.h>
#include <plat/mcbsp.h>
-#include <plat/dsp_common.h>
#define DPS_RSTCT2_PER_EN (1 << 0)
#define DSP_RSTCT2_WD_PER_EN (1 << 1)
@@ -46,7 +45,6 @@ static void omap1_mcbsp_request(unsigned int id)
clk_enable(api_clk);
clk_enable(dsp_clk);
- omap_dsp_request_mem();
/*
* DSP external peripheral reset
* FIXME: This should be moved to dsp code
@@ -62,7 +60,6 @@ static void omap1_mcbsp_free(unsigned int id)
{
if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) {
if (--dsp_use == 0) {
- omap_dsp_release_mem();
if (!IS_ERR(api_clk)) {
clk_disable(api_clk);
clk_put(api_clk);
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
index ca5b229..9d5466d 100644
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@ -30,67 +30,6 @@
#include <plat/dsp_common.h>
#include <plat/omap44xx.h>
-#if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE)
-
-static struct dsp_platform_data dsp_pdata = {
- .kdev_list = LIST_HEAD_INIT(dsp_pdata.kdev_list),
-};
-
-static struct resource omap_dsp_resources[] = {
- {
- .name = "dsp_mmu",
- .start = -1,
- .flags = IORESOURCE_IRQ,
- },
-};
-
-static struct platform_device omap_dsp_device = {
- .name = "dsp",
- .id = -1,
- .num_resources = ARRAY_SIZE(omap_dsp_resources),
- .resource = omap_dsp_resources,
- .dev = {
- .platform_data = &dsp_pdata,
- },
-};
-
-static inline void omap_init_dsp(void)
-{
- struct resource *res;
- int irq;
-
- if (cpu_is_omap15xx())
- irq = INT_1510_DSP_MMU;
- else if (cpu_is_omap16xx())
- irq = INT_1610_DSP_MMU;
- else if (cpu_is_omap24xx())
- irq = INT_24XX_DSP_MMU;
-
- res = platform_get_resource_byname(&omap_dsp_device,
- IORESOURCE_IRQ, "dsp_mmu");
- res->start = irq;
-
- platform_device_register(&omap_dsp_device);
-}
-
-int dsp_kfunc_device_register(struct dsp_kfunc_device *kdev)
-{
- static DEFINE_MUTEX(dsp_pdata_lock);
-
- spin_lock_init(&kdev->lock);
-
- mutex_lock(&dsp_pdata_lock);
- list_add_tail(&kdev->entry, &dsp_pdata.kdev_list);
- mutex_unlock(&dsp_pdata_lock);
-
- return 0;
-}
-EXPORT_SYMBOL(dsp_kfunc_device_register);
-
-#else
-static inline void omap_init_dsp(void) { }
-#endif /* CONFIG_OMAP_DSP */
-
/*-------------------------------------------------------------------------*/
#if defined(CONFIG_OMAP_MCBSP) || defined(CONFIG_OMAP_MCBSP_MODULE)
@@ -359,7 +298,6 @@ static int __init omap_init_devices(void)
/* please keep these calls, and their implementations above,
* in alphabetical order so they're easier to sort through.
*/
- omap_init_dsp();
omap_init_rng();
omap_init_mcpdm();
omap_init_uwire();
diff --git a/arch/arm/plat-omap/include/plat/dsp_common.h b/arch/arm/plat-omap/include/plat/dsp_common.h
deleted file mode 100644
index da97736..0000000
--- a/arch/arm/plat-omap/include/plat/dsp_common.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of OMAP DSP driver (DSP Gateway version 3.3.1)
- *
- * Copyright (C) 2004-2006 Nokia Corporation. All rights reserved.
- *
- * Contact: Toshihiro Kobayashi <toshihiro.kobayashi@nokia.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- */
-
-#ifndef ASM_ARCH_DSP_COMMON_H
-#define ASM_ARCH_DSP_COMMON_H
-
-#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_OMAP_MMU_FWK)
-extern void omap_dsp_request_mpui(void);
-extern void omap_dsp_release_mpui(void);
-extern int omap_dsp_request_mem(void);
-extern int omap_dsp_release_mem(void);
-#else
-static inline int omap_dsp_request_mem(void)
-{
- return 0;
-}
-#define omap_dsp_release_mem() do {} while (0)
-#endif
-
-#endif /* ASM_ARCH_DSP_COMMON_H */
^ permalink raw reply related [flat|nested] 221+ messages in thread
* [PATCH 11/33] Removing dead OMAP_DSP
@ 2010-07-05 8:20 ` Tony Lindgren
0 siblings, 0 replies; 221+ messages in thread
From: Tony Lindgren @ 2010-07-05 8:20 UTC (permalink / raw)
To: linux-arm-kernel
* Christoph Egger <siccegge@cs.fau.de> [100630 18:51]:
> OMAP_DSP doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
I've updated and queued this one. Updated patch below.
Tony
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 12/33] Removing dead OMAP_STI
2010-06-30 15:57 ` Christoph Egger
(?)
@ 2010-07-05 8:24 ` Tony Lindgren
-1 siblings, 0 replies; 221+ messages in thread
From: Tony Lindgren @ 2010-07-05 8:24 UTC (permalink / raw)
To: Christoph Egger
Cc: Russell King, Cory Maccarrone, Felipe Balbi,
Madhusudhan Chikkature, Andrew Morton, Dmitry Kasatkin,
Herbert Xu, linux-omap, linux-arm-kernel, linux-kernel, vamos
* Christoph Egger <siccegge@cs.fau.de> [100630 18:51]:
> OMAP_STI doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
Thanks, applied.
Tony
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 12/33] Removing dead OMAP_STI
@ 2010-07-05 8:24 ` Tony Lindgren
0 siblings, 0 replies; 221+ messages in thread
From: Tony Lindgren @ 2010-07-05 8:24 UTC (permalink / raw)
To: Christoph Egger
Cc: Russell King, Cory Maccarrone, Felipe Balbi,
Madhusudhan Chikkature, Andrew Morton, Dmitry Kasatkin,
Herbert Xu, linux-omap, linux-arm-kernel, linux-kernel, vamos
* Christoph Egger <siccegge@cs.fau.de> [100630 18:51]:
> OMAP_STI doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
Thanks, applied.
Tony
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 12/33] Removing dead OMAP_STI
@ 2010-07-05 8:24 ` Tony Lindgren
0 siblings, 0 replies; 221+ messages in thread
From: Tony Lindgren @ 2010-07-05 8:24 UTC (permalink / raw)
To: linux-arm-kernel
* Christoph Egger <siccegge@cs.fau.de> [100630 18:51]:
> OMAP_STI doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
Thanks, applied.
Tony
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 13/33] Replacing LEDS_OMAP_DEBUG with OMAP_DEBUG_LEDS
2010-06-30 15:58 ` Christoph Egger
@ 2010-07-05 8:28 ` Tony Lindgren
-1 siblings, 0 replies; 221+ messages in thread
From: Tony Lindgren @ 2010-07-05 8:28 UTC (permalink / raw)
To: Christoph Egger
Cc: Russell King, Paul Walmsley, Kevin Hilman, Tero Kristo,
Hiroshi DOYU, Pavel Machek, Andrew Morton, Magnus Damm,
Alexey Dobriyan, linux-omap, linux-arm-kernel, linux-kernel,
vamos
* Christoph Egger <siccegge@cs.fau.de> [100630 18:58]:
> LEDS_OMAP_DEBUG doesn't exist in Kconfig, therefore replacing all
> references for it with OMAP_DEBUG_LEDS from the source code.
Applied.
Tony
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 13/33] Replacing LEDS_OMAP_DEBUG with OMAP_DEBUG_LEDS
@ 2010-07-05 8:28 ` Tony Lindgren
0 siblings, 0 replies; 221+ messages in thread
From: Tony Lindgren @ 2010-07-05 8:28 UTC (permalink / raw)
To: linux-arm-kernel
* Christoph Egger <siccegge@cs.fau.de> [100630 18:58]:
> LEDS_OMAP_DEBUG doesn't exist in Kconfig, therefore replacing all
> references for it with OMAP_DEBUG_LEDS from the source code.
Applied.
Tony
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 16/33] Removing dead APM
2010-06-30 18:23 ` Marek Vasut
(?)
@ 2010-07-05 8:31 ` Tony Lindgren
-1 siblings, 0 replies; 221+ messages in thread
From: Tony Lindgren @ 2010-07-05 8:31 UTC (permalink / raw)
To: Marek Vasut
Cc: Christoph Egger, Russell King, Kalle Valo, Ladislav Michl,
Janusz Krzysztofik, Kevin Hilman, linux-omap, linux-arm-kernel,
linux-kernel, vamos
* Marek Vasut <marek.vasut@gmail.com> [100630 21:19]:
> Dne St 30. června 2010 17:59:06 Christoph Egger napsal(a):
> > APM doesn't exist in Kconfig, therefore removing all references for it
> > from the source code.
>
> Tony, do you know Andrzej Zaborowski's new email address? Maybe he should be
> CCed here
Sorry I don't have any other email address for him either. I've applied this.
Tony
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 16/33] Removing dead APM
@ 2010-07-05 8:31 ` Tony Lindgren
0 siblings, 0 replies; 221+ messages in thread
From: Tony Lindgren @ 2010-07-05 8:31 UTC (permalink / raw)
To: Marek Vasut
Cc: Christoph Egger, Russell King, Kalle Valo, Ladislav Michl,
Janusz Krzysztofik, Kevin Hilman, linux-omap, linux-arm-kernel,
linux-kernel, vamos
* Marek Vasut <marek.vasut@gmail.com> [100630 21:19]:
> Dne St 30. června 2010 17:59:06 Christoph Egger napsal(a):
> > APM doesn't exist in Kconfig, therefore removing all references for it
> > from the source code.
>
> Tony, do you know Andrzej Zaborowski's new email address? Maybe he should be
> CCed here
Sorry I don't have any other email address for him either. I've applied this.
Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 16/33] Removing dead APM
@ 2010-07-05 8:31 ` Tony Lindgren
0 siblings, 0 replies; 221+ messages in thread
From: Tony Lindgren @ 2010-07-05 8:31 UTC (permalink / raw)
To: linux-arm-kernel
* Marek Vasut <marek.vasut@gmail.com> [100630 21:19]:
> Dne St 30. ?ervna 2010 17:59:06 Christoph Egger napsal(a):
> > APM doesn't exist in Kconfig, therefore removing all references for it
> > from the source code.
>
> Tony, do you know Andrzej Zaborowski's new email address? Maybe he should be
> CCed here
Sorry I don't have any other email address for him either. I've applied this.
Tony
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 17/33] Removing dead SX1_OLD_FLASH
2010-06-30 18:24 ` Marek Vasut
(?)
@ 2010-07-05 8:33 ` Tony Lindgren
-1 siblings, 0 replies; 221+ messages in thread
From: Tony Lindgren @ 2010-07-05 8:33 UTC (permalink / raw)
To: Marek Vasut
Cc: Christoph Egger, Russell King, Kalle Valo, Ladislav Michl,
Janusz Krzysztofik, Kevin Hilman, linux-omap, linux-arm-kernel,
linux-kernel, vamos
* Marek Vasut <marek.vasut@gmail.com> [100630 21:21]:
> Dne St 30. června 2010 17:59:25 Christoph Egger napsal(a):
> > SX1_OLD_FLASH doesn't exist in Kconfig, therefore removing all
> > references for it from the source code.
>
> There were two models of the phone made, you can toggle between old and new
> version. Maybe better documentation won't hurt.
Sounds like this should be done dynamically based on omap_rev,
or some cmdline option from the bootloader? Not applying this
one.
Tony
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 17/33] Removing dead SX1_OLD_FLASH
@ 2010-07-05 8:33 ` Tony Lindgren
0 siblings, 0 replies; 221+ messages in thread
From: Tony Lindgren @ 2010-07-05 8:33 UTC (permalink / raw)
To: Marek Vasut
Cc: Christoph Egger, Russell King, Kalle Valo, Ladislav Michl,
Janusz Krzysztofik, Kevin Hilman, linux-omap, linux-arm-kernel,
linux-kernel, vamos
* Marek Vasut <marek.vasut@gmail.com> [100630 21:21]:
> Dne St 30. června 2010 17:59:25 Christoph Egger napsal(a):
> > SX1_OLD_FLASH doesn't exist in Kconfig, therefore removing all
> > references for it from the source code.
>
> There were two models of the phone made, you can toggle between old and new
> version. Maybe better documentation won't hurt.
Sounds like this should be done dynamically based on omap_rev,
or some cmdline option from the bootloader? Not applying this
one.
Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 17/33] Removing dead SX1_OLD_FLASH
@ 2010-07-05 8:33 ` Tony Lindgren
0 siblings, 0 replies; 221+ messages in thread
From: Tony Lindgren @ 2010-07-05 8:33 UTC (permalink / raw)
To: linux-arm-kernel
* Marek Vasut <marek.vasut@gmail.com> [100630 21:21]:
> Dne St 30. ?ervna 2010 17:59:25 Christoph Egger napsal(a):
> > SX1_OLD_FLASH doesn't exist in Kconfig, therefore removing all
> > references for it from the source code.
>
> There were two models of the phone made, you can toggle between old and new
> version. Maybe better documentation won't hurt.
Sounds like this should be done dynamically based on omap_rev,
or some cmdline option from the bootloader? Not applying this
one.
Tony
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 18/33] Removing dead OMAP_ARM_96MHZ
2010-06-30 18:25 ` Marek Vasut
@ 2010-07-05 8:44 ` Tony Lindgren
-1 siblings, 0 replies; 221+ messages in thread
From: Tony Lindgren @ 2010-07-05 8:44 UTC (permalink / raw)
To: Marek Vasut
Cc: Christoph Egger, Russell King, Paul Walmsley, linux-omap,
linux-arm-kernel, linux-kernel, vamos
* Marek Vasut <marek.vasut@gmail.com> [100630 21:21]:
> Dne St 30. června 2010 17:59:45 Christoph Egger napsal(a):
> > OMAP_ARM_96MHZ doesn't exist in Kconfig, therefore removing all
> > references for it from the source code.
>
> I'd be for adding it to Kconfig rather than removing from here
Looks like Paul has queued a patch to do this.
Tony
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 18/33] Removing dead OMAP_ARM_96MHZ
@ 2010-07-05 8:44 ` Tony Lindgren
0 siblings, 0 replies; 221+ messages in thread
From: Tony Lindgren @ 2010-07-05 8:44 UTC (permalink / raw)
To: linux-arm-kernel
* Marek Vasut <marek.vasut@gmail.com> [100630 21:21]:
> Dne St 30. ?ervna 2010 17:59:45 Christoph Egger napsal(a):
> > OMAP_ARM_96MHZ doesn't exist in Kconfig, therefore removing all
> > references for it from the source code.
>
> I'd be for adding it to Kconfig rather than removing from here
Looks like Paul has queued a patch to do this.
Tony
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 20/33] Removing dead MACH_OMAP2_H4_USB1
2010-07-01 7:35 ` Felipe Balbi
(?)
@ 2010-07-05 8:55 ` Tony Lindgren
-1 siblings, 0 replies; 221+ messages in thread
From: Tony Lindgren @ 2010-07-05 8:55 UTC (permalink / raw)
To: Felipe Balbi
Cc: ext Christoph Egger, Russell King, Paul Walmsley, Kalle Valo,
Santosh Shilimkar, Ladislav Michl, linux-omap, linux-arm-kernel,
linux-kernel, vamos
* Felipe Balbi <felipe.balbi@nokia.com> [100701 10:32]:
> On Wed, Jun 30, 2010 at 06:00:23PM +0200, ext Christoph Egger wrote:
> >MACH_OMAP2_H4_USB1 doesn't exist in Kconfig, therefore removing all
> >references for it from the source code.
> >
> >Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
>
> Does this apply on top of Tony's recent patches ??
Yes, I've applied both this and the previous patch.
Tony
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 20/33] Removing dead MACH_OMAP2_H4_USB1
@ 2010-07-05 8:55 ` Tony Lindgren
0 siblings, 0 replies; 221+ messages in thread
From: Tony Lindgren @ 2010-07-05 8:55 UTC (permalink / raw)
To: Felipe Balbi
Cc: ext Christoph Egger, Russell King, Paul Walmsley, Kalle Valo,
Santosh Shilimkar, Ladislav Michl, linux-omap, linux-arm-kernel,
linux-kernel, vamos
* Felipe Balbi <felipe.balbi@nokia.com> [100701 10:32]:
> On Wed, Jun 30, 2010 at 06:00:23PM +0200, ext Christoph Egger wrote:
> >MACH_OMAP2_H4_USB1 doesn't exist in Kconfig, therefore removing all
> >references for it from the source code.
> >
> >Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
>
> Does this apply on top of Tony's recent patches ??
Yes, I've applied both this and the previous patch.
Tony
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 20/33] Removing dead MACH_OMAP2_H4_USB1
@ 2010-07-05 8:55 ` Tony Lindgren
0 siblings, 0 replies; 221+ messages in thread
From: Tony Lindgren @ 2010-07-05 8:55 UTC (permalink / raw)
To: linux-arm-kernel
* Felipe Balbi <felipe.balbi@nokia.com> [100701 10:32]:
> On Wed, Jun 30, 2010 at 06:00:23PM +0200, ext Christoph Egger wrote:
> >MACH_OMAP2_H4_USB1 doesn't exist in Kconfig, therefore removing all
> >references for it from the source code.
> >
> >Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
>
> Does this apply on top of Tony's recent patches ??
Yes, I've applied both this and the previous patch.
Tony
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 21/33] Removing dead OMAP2_VENC_OUT_TYPE_SVIDEO, OMAP2_VENC_OUT_TYPE_COMPOSITE
2010-06-30 16:00 ` Christoph Egger
@ 2010-07-05 8:56 ` Tony Lindgren
-1 siblings, 0 replies; 221+ messages in thread
From: Tony Lindgren @ 2010-07-05 8:56 UTC (permalink / raw)
To: Christoph Egger
Cc: Russell King, Jason Lam, linux-omap, linux-arm-kernel,
linux-kernel, vamos, Tomi Valkeinen
* Christoph Egger <siccegge@cs.fau.de> [100630 18:58]:
> OMAP2_VENC_OUT_TYPE_SVIDEO, OMAP2_VENC_OUT_TYPE_COMPOSITE doesn't
> exist in Kconfig, therefore removing all references for it from the
> source code.
Let's let Tomi figure out this one, added him to Cc.
Regards,
Tony
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-omap2/board-omap3stalker.c | 5 -----
> 1 files changed, 0 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c
> index f848ba8..b38afd5 100644
> --- a/arch/arm/mach-omap2/board-omap3stalker.c
> +++ b/arch/arm/mach-omap2/board-omap3stalker.c
> @@ -181,11 +181,6 @@ static struct omap_dss_device omap3_stalker_tv_device = {
> .name = "tv",
> .driver_name = "venc",
> .type = OMAP_DISPLAY_TYPE_VENC,
> -#if defined(CONFIG_OMAP2_VENC_OUT_TYPE_SVIDEO)
> - .phy.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO,
> -#elif defined(CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE)
> - .u.venc.type = OMAP_DSS_VENC_TYPE_COMPOSITE,
> -#endif
> .platform_enable = omap3_stalker_enable_tv,
> .platform_disable = omap3_stalker_disable_tv,
> };
> --
> 1.7.0.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 21/33] Removing dead OMAP2_VENC_OUT_TYPE_SVIDEO, OMAP2_VENC_OUT_TYPE_COMPOSITE
@ 2010-07-05 8:56 ` Tony Lindgren
0 siblings, 0 replies; 221+ messages in thread
From: Tony Lindgren @ 2010-07-05 8:56 UTC (permalink / raw)
To: linux-arm-kernel
* Christoph Egger <siccegge@cs.fau.de> [100630 18:58]:
> OMAP2_VENC_OUT_TYPE_SVIDEO, OMAP2_VENC_OUT_TYPE_COMPOSITE doesn't
> exist in Kconfig, therefore removing all references for it from the
> source code.
Let's let Tomi figure out this one, added him to Cc.
Regards,
Tony
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-omap2/board-omap3stalker.c | 5 -----
> 1 files changed, 0 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c
> index f848ba8..b38afd5 100644
> --- a/arch/arm/mach-omap2/board-omap3stalker.c
> +++ b/arch/arm/mach-omap2/board-omap3stalker.c
> @@ -181,11 +181,6 @@ static struct omap_dss_device omap3_stalker_tv_device = {
> .name = "tv",
> .driver_name = "venc",
> .type = OMAP_DISPLAY_TYPE_VENC,
> -#if defined(CONFIG_OMAP2_VENC_OUT_TYPE_SVIDEO)
> - .phy.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO,
> -#elif defined(CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE)
> - .u.venc.type = OMAP_DSS_VENC_TYPE_COMPOSITE,
> -#endif
> .platform_enable = omap3_stalker_enable_tv,
> .platform_disable = omap3_stalker_disable_tv,
> };
> --
> 1.7.0.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 17/33] Removing dead SX1_OLD_FLASH
2010-07-05 8:33 ` Tony Lindgren
@ 2010-07-05 10:31 ` Marek Vasut
-1 siblings, 0 replies; 221+ messages in thread
From: Marek Vasut @ 2010-07-05 10:31 UTC (permalink / raw)
To: Tony Lindgren
Cc: Christoph Egger, Russell King, Kalle Valo, Ladislav Michl,
Janusz Krzysztofik, Kevin Hilman, linux-omap, linux-arm-kernel,
linux-kernel, vamos
Dne Po 5. července 2010 10:33:48 Tony Lindgren napsal(a):
> * Marek Vasut <marek.vasut@gmail.com> [100630 21:21]:
> > Dne St 30. června 2010 17:59:25 Christoph Egger napsal(a):
> > > SX1_OLD_FLASH doesn't exist in Kconfig, therefore removing all
> > > references for it from the source code.
> >
> > There were two models of the phone made, you can toggle between old and
> > new version. Maybe better documentation won't hurt.
>
> Sounds like this should be done dynamically based on omap_rev,
> or some cmdline option from the bootloader? Not applying this
> one.
>
> Tony
Yea, the russian guy who ported this is gone I guess though. Just maybe I can
get my hands on linux-powered SX1 and try looking into this, but I can't promise
it'll be any soon.
Cheers
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 17/33] Removing dead SX1_OLD_FLASH
@ 2010-07-05 10:31 ` Marek Vasut
0 siblings, 0 replies; 221+ messages in thread
From: Marek Vasut @ 2010-07-05 10:31 UTC (permalink / raw)
To: linux-arm-kernel
Dne Po 5. ?ervence 2010 10:33:48 Tony Lindgren napsal(a):
> * Marek Vasut <marek.vasut@gmail.com> [100630 21:21]:
> > Dne St 30. ?ervna 2010 17:59:25 Christoph Egger napsal(a):
> > > SX1_OLD_FLASH doesn't exist in Kconfig, therefore removing all
> > > references for it from the source code.
> >
> > There were two models of the phone made, you can toggle between old and
> > new version. Maybe better documentation won't hurt.
>
> Sounds like this should be done dynamically based on omap_rev,
> or some cmdline option from the bootloader? Not applying this
> one.
>
> Tony
Yea, the russian guy who ported this is gone I guess though. Just maybe I can
get my hands on linux-powered SX1 and try looking into this, but I can't promise
it'll be any soon.
Cheers
^ permalink raw reply [flat|nested] 221+ messages in thread
* RE: [PATCH 21/33] Removing dead OMAP2_VENC_OUT_TYPE_SVIDEO, OMAP2_VENC_OUT_TYPE_COMPOSITE
2010-06-30 16:00 ` Christoph Egger
(?)
@ 2010-07-06 5:56 ` Hiremath, Vaibhav
-1 siblings, 0 replies; 221+ messages in thread
From: Hiremath, Vaibhav @ 2010-07-06 5:56 UTC (permalink / raw)
To: Christoph Egger, Tony Lindgren, Russell King, Jason Lam,
linux-omap, linux-arm-kernel, linux-kernel
Cc: vamos
> -----Original Message-----
> From: linux-omap-owner@vger.kernel.org [mailto:linux-omap-
> owner@vger.kernel.org] On Behalf Of Christoph Egger
> Sent: Wednesday, June 30, 2010 9:31 PM
> To: Tony Lindgren; Russell King; Jason Lam; linux-omap@vger.kernel.org;
> linux-arm-kernel@lists.infradead.org; linux-kernel@vger.kernel.org
> Cc: vamos@i4.informatik.uni-erlangen.de
> Subject: [PATCH 21/33] Removing dead OMAP2_VENC_OUT_TYPE_SVIDEO,
> OMAP2_VENC_OUT_TYPE_COMPOSITE
>
> OMAP2_VENC_OUT_TYPE_SVIDEO, OMAP2_VENC_OUT_TYPE_COMPOSITE doesn't
> exist in Kconfig, therefore removing all references for it from the
> source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-omap2/board-omap3stalker.c | 5 -----
> 1 files changed, 0 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-
> omap2/board-omap3stalker.c
> index f848ba8..b38afd5 100644
> --- a/arch/arm/mach-omap2/board-omap3stalker.c
> +++ b/arch/arm/mach-omap2/board-omap3stalker.c
> @@ -181,11 +181,6 @@ static struct omap_dss_device omap3_stalker_tv_device =
> {
> .name = "tv",
> .driver_name = "venc",
> .type = OMAP_DISPLAY_TYPE_VENC,
> -#if defined(CONFIG_OMAP2_VENC_OUT_TYPE_SVIDEO)
> - .phy.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO,
> -#elif defined(CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE)
> - .u.venc.type = OMAP_DSS_VENC_TYPE_COMPOSITE,
> -#endif
[Hiremath, Vaibhav] I understand that currently we do not have any mechanism to dynamically change the VENC output type, but I think we should make some default type assumption and keep that initialization here, which is anyway happening to CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE. But explicitly initialize it to CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE for completeness/readability.
Just wanted to add one more thing here is, in our internal releases we do have config option to choose between this. But ideally it would be configurable dynamically.
Thanks,
Vaibhav
> .platform_enable = omap3_stalker_enable_tv,
> .platform_disable = omap3_stalker_disable_tv,
> };
> --
> 1.7.0.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 221+ messages in thread
* RE: [PATCH 21/33] Removing dead OMAP2_VENC_OUT_TYPE_SVIDEO, OMAP2_VENC_OUT_TYPE_COMPOSITE
@ 2010-07-06 5:56 ` Hiremath, Vaibhav
0 siblings, 0 replies; 221+ messages in thread
From: Hiremath, Vaibhav @ 2010-07-06 5:56 UTC (permalink / raw)
To: Christoph Egger, Tony Lindgren, Russell King, Jason Lam,
linux-omap@vger.kernel.org
Cc: vamos
> -----Original Message-----
> From: linux-omap-owner@vger.kernel.org [mailto:linux-omap-
> owner@vger.kernel.org] On Behalf Of Christoph Egger
> Sent: Wednesday, June 30, 2010 9:31 PM
> To: Tony Lindgren; Russell King; Jason Lam; linux-omap@vger.kernel.org;
> linux-arm-kernel@lists.infradead.org; linux-kernel@vger.kernel.org
> Cc: vamos@i4.informatik.uni-erlangen.de
> Subject: [PATCH 21/33] Removing dead OMAP2_VENC_OUT_TYPE_SVIDEO,
> OMAP2_VENC_OUT_TYPE_COMPOSITE
>
> OMAP2_VENC_OUT_TYPE_SVIDEO, OMAP2_VENC_OUT_TYPE_COMPOSITE doesn't
> exist in Kconfig, therefore removing all references for it from the
> source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-omap2/board-omap3stalker.c | 5 -----
> 1 files changed, 0 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-
> omap2/board-omap3stalker.c
> index f848ba8..b38afd5 100644
> --- a/arch/arm/mach-omap2/board-omap3stalker.c
> +++ b/arch/arm/mach-omap2/board-omap3stalker.c
> @@ -181,11 +181,6 @@ static struct omap_dss_device omap3_stalker_tv_device =
> {
> .name = "tv",
> .driver_name = "venc",
> .type = OMAP_DISPLAY_TYPE_VENC,
> -#if defined(CONFIG_OMAP2_VENC_OUT_TYPE_SVIDEO)
> - .phy.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO,
> -#elif defined(CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE)
> - .u.venc.type = OMAP_DSS_VENC_TYPE_COMPOSITE,
> -#endif
[Hiremath, Vaibhav] I understand that currently we do not have any mechanism to dynamically change the VENC output type, but I think we should make some default type assumption and keep that initialization here, which is anyway happening to CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE. But explicitly initialize it to CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE for completeness/readability.
Just wanted to add one more thing here is, in our internal releases we do have config option to choose between this. But ideally it would be configurable dynamically.
Thanks,
Vaibhav
> .platform_enable = omap3_stalker_enable_tv,
> .platform_disable = omap3_stalker_disable_tv,
> };
> --
> 1.7.0.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 21/33] Removing dead OMAP2_VENC_OUT_TYPE_SVIDEO, OMAP2_VENC_OUT_TYPE_COMPOSITE
@ 2010-07-06 5:56 ` Hiremath, Vaibhav
0 siblings, 0 replies; 221+ messages in thread
From: Hiremath, Vaibhav @ 2010-07-06 5:56 UTC (permalink / raw)
To: linux-arm-kernel
> -----Original Message-----
> From: linux-omap-owner at vger.kernel.org [mailto:linux-omap-
> owner at vger.kernel.org] On Behalf Of Christoph Egger
> Sent: Wednesday, June 30, 2010 9:31 PM
> To: Tony Lindgren; Russell King; Jason Lam; linux-omap at vger.kernel.org;
> linux-arm-kernel at lists.infradead.org; linux-kernel at vger.kernel.org
> Cc: vamos at i4.informatik.uni-erlangen.de
> Subject: [PATCH 21/33] Removing dead OMAP2_VENC_OUT_TYPE_SVIDEO,
> OMAP2_VENC_OUT_TYPE_COMPOSITE
>
> OMAP2_VENC_OUT_TYPE_SVIDEO, OMAP2_VENC_OUT_TYPE_COMPOSITE doesn't
> exist in Kconfig, therefore removing all references for it from the
> source code.
>
> Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> ---
> arch/arm/mach-omap2/board-omap3stalker.c | 5 -----
> 1 files changed, 0 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-
> omap2/board-omap3stalker.c
> index f848ba8..b38afd5 100644
> --- a/arch/arm/mach-omap2/board-omap3stalker.c
> +++ b/arch/arm/mach-omap2/board-omap3stalker.c
> @@ -181,11 +181,6 @@ static struct omap_dss_device omap3_stalker_tv_device =
> {
> .name = "tv",
> .driver_name = "venc",
> .type = OMAP_DISPLAY_TYPE_VENC,
> -#if defined(CONFIG_OMAP2_VENC_OUT_TYPE_SVIDEO)
> - .phy.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO,
> -#elif defined(CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE)
> - .u.venc.type = OMAP_DSS_VENC_TYPE_COMPOSITE,
> -#endif
[Hiremath, Vaibhav] I understand that currently we do not have any mechanism to dynamically change the VENC output type, but I think we should make some default type assumption and keep that initialization here, which is anyway happening to CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE. But explicitly initialize it to CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE for completeness/readability.
Just wanted to add one more thing here is, in our internal releases we do have config option to choose between this. But ideally it would be configurable dynamically.
Thanks,
Vaibhav
> .platform_enable = omap3_stalker_enable_tv,
> .platform_disable = omap3_stalker_disable_tv,
> };
> --
> 1.7.0.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 31/33] Removing dead MACH_U300_BS26
2010-06-30 22:00 ` Linus Walleij
@ 2010-07-20 15:27 ` Jiri Kosina
-1 siblings, 0 replies; 221+ messages in thread
From: Jiri Kosina @ 2010-07-20 15:27 UTC (permalink / raw)
To: Linus Walleij
Cc: Christoph Egger, Russell King, Daniel Mack, linux-arm-kernel,
linux-kernel, vamos
On Thu, 1 Jul 2010, Linus Walleij wrote:
> > MACH_U300_BS26 doesn't exist in Kconfig, therefore removing all
> > references for it from the source code.
> >
> > Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
>
> OK then,
> Acked-by: Linus Walleij <linus.walleij@stericsson.com>
As this doesn't seem to be present in linux-next as of today, I have
applied it to trivial queue. Thanks,
--
Jiri Kosina
SUSE Labs, Novell Inc.
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 31/33] Removing dead MACH_U300_BS26
@ 2010-07-20 15:27 ` Jiri Kosina
0 siblings, 0 replies; 221+ messages in thread
From: Jiri Kosina @ 2010-07-20 15:27 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, 1 Jul 2010, Linus Walleij wrote:
> > MACH_U300_BS26 doesn't exist in Kconfig, therefore removing all
> > references for it from the source code.
> >
> > Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
>
> OK then,
> Acked-by: Linus Walleij <linus.walleij@stericsson.com>
As this doesn't seem to be present in linux-next as of today, I have
applied it to trivial queue. Thanks,
--
Jiri Kosina
SUSE Labs, Novell Inc.
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 21/33] Removing dead OMAP2_VENC_OUT_TYPE_SVIDEO, OMAP2_VENC_OUT_TYPE_COMPOSITE
2010-07-05 8:56 ` Tony Lindgren
(?)
@ 2010-08-03 12:12 ` Tomi Valkeinen
-1 siblings, 0 replies; 221+ messages in thread
From: Tomi Valkeinen @ 2010-08-03 12:12 UTC (permalink / raw)
To: ext Tony Lindgren
Cc: Christoph Egger, Russell King, Jason Lam, linux-omap,
linux-arm-kernel, linux-kernel, vamos
On Mon, 2010-07-05 at 10:56 +0200, ext Tony Lindgren wrote:
> * Christoph Egger <siccegge@cs.fau.de> [100630 18:58]:
> > OMAP2_VENC_OUT_TYPE_SVIDEO, OMAP2_VENC_OUT_TYPE_COMPOSITE doesn't
> > exist in Kconfig, therefore removing all references for it from the
> > source code.
>
> Let's let Tomi figure out this one, added him to Cc.
The patch doesn't look valid, because either SVIDEO or COMPOSITE should
be set into .phy.venc.type. But then again, the code that's removed
doesn't look valid either, as by default it doesn't do either, and the
COMPOSITE block wouldn't even comile...
Those defines look like some custom defines that have never been in
mainstream linux, so I think the patch can be applied, and the board
file maintainer can fix it with proper code later.
Tomi
>
> Regards,
>
> Tony
>
> > Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> > ---
> > arch/arm/mach-omap2/board-omap3stalker.c | 5 -----
> > 1 files changed, 0 insertions(+), 5 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c
> > index f848ba8..b38afd5 100644
> > --- a/arch/arm/mach-omap2/board-omap3stalker.c
> > +++ b/arch/arm/mach-omap2/board-omap3stalker.c
> > @@ -181,11 +181,6 @@ static struct omap_dss_device omap3_stalker_tv_device = {
> > .name = "tv",
> > .driver_name = "venc",
> > .type = OMAP_DISPLAY_TYPE_VENC,
> > -#if defined(CONFIG_OMAP2_VENC_OUT_TYPE_SVIDEO)
> > - .phy.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO,
> > -#elif defined(CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE)
> > - .u.venc.type = OMAP_DSS_VENC_TYPE_COMPOSITE,
> > -#endif
> > .platform_enable = omap3_stalker_enable_tv,
> > .platform_disable = omap3_stalker_disable_tv,
> > };
> > --
> > 1.7.0.4
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
> > Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH 21/33] Removing dead OMAP2_VENC_OUT_TYPE_SVIDEO, OMAP2_VENC_OUT_TYPE_COMPOSITE
@ 2010-08-03 12:12 ` Tomi Valkeinen
0 siblings, 0 replies; 221+ messages in thread
From: Tomi Valkeinen @ 2010-08-03 12:12 UTC (permalink / raw)
To: ext Tony Lindgren
Cc: Christoph Egger, Russell King, Jason Lam, linux-omap,
linux-arm-kernel, linux-kernel, vamos
On Mon, 2010-07-05 at 10:56 +0200, ext Tony Lindgren wrote:
> * Christoph Egger <siccegge@cs.fau.de> [100630 18:58]:
> > OMAP2_VENC_OUT_TYPE_SVIDEO, OMAP2_VENC_OUT_TYPE_COMPOSITE doesn't
> > exist in Kconfig, therefore removing all references for it from the
> > source code.
>
> Let's let Tomi figure out this one, added him to Cc.
The patch doesn't look valid, because either SVIDEO or COMPOSITE should
be set into .phy.venc.type. But then again, the code that's removed
doesn't look valid either, as by default it doesn't do either, and the
COMPOSITE block wouldn't even comile...
Those defines look like some custom defines that have never been in
mainstream linux, so I think the patch can be applied, and the board
file maintainer can fix it with proper code later.
Tomi
>
> Regards,
>
> Tony
>
> > Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> > ---
> > arch/arm/mach-omap2/board-omap3stalker.c | 5 -----
> > 1 files changed, 0 insertions(+), 5 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c
> > index f848ba8..b38afd5 100644
> > --- a/arch/arm/mach-omap2/board-omap3stalker.c
> > +++ b/arch/arm/mach-omap2/board-omap3stalker.c
> > @@ -181,11 +181,6 @@ static struct omap_dss_device omap3_stalker_tv_device = {
> > .name = "tv",
> > .driver_name = "venc",
> > .type = OMAP_DISPLAY_TYPE_VENC,
> > -#if defined(CONFIG_OMAP2_VENC_OUT_TYPE_SVIDEO)
> > - .phy.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO,
> > -#elif defined(CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE)
> > - .u.venc.type = OMAP_DSS_VENC_TYPE_COMPOSITE,
> > -#endif
> > .platform_enable = omap3_stalker_enable_tv,
> > .platform_disable = omap3_stalker_disable_tv,
> > };
> > --
> > 1.7.0.4
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
> > Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH 21/33] Removing dead OMAP2_VENC_OUT_TYPE_SVIDEO, OMAP2_VENC_OUT_TYPE_COMPOSITE
@ 2010-08-03 12:12 ` Tomi Valkeinen
0 siblings, 0 replies; 221+ messages in thread
From: Tomi Valkeinen @ 2010-08-03 12:12 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, 2010-07-05 at 10:56 +0200, ext Tony Lindgren wrote:
> * Christoph Egger <siccegge@cs.fau.de> [100630 18:58]:
> > OMAP2_VENC_OUT_TYPE_SVIDEO, OMAP2_VENC_OUT_TYPE_COMPOSITE doesn't
> > exist in Kconfig, therefore removing all references for it from the
> > source code.
>
> Let's let Tomi figure out this one, added him to Cc.
The patch doesn't look valid, because either SVIDEO or COMPOSITE should
be set into .phy.venc.type. But then again, the code that's removed
doesn't look valid either, as by default it doesn't do either, and the
COMPOSITE block wouldn't even comile...
Those defines look like some custom defines that have never been in
mainstream linux, so I think the patch can be applied, and the board
file maintainer can fix it with proper code later.
Tomi
>
> Regards,
>
> Tony
>
> > Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
> > ---
> > arch/arm/mach-omap2/board-omap3stalker.c | 5 -----
> > 1 files changed, 0 insertions(+), 5 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c
> > index f848ba8..b38afd5 100644
> > --- a/arch/arm/mach-omap2/board-omap3stalker.c
> > +++ b/arch/arm/mach-omap2/board-omap3stalker.c
> > @@ -181,11 +181,6 @@ static struct omap_dss_device omap3_stalker_tv_device = {
> > .name = "tv",
> > .driver_name = "venc",
> > .type = OMAP_DISPLAY_TYPE_VENC,
> > -#if defined(CONFIG_OMAP2_VENC_OUT_TYPE_SVIDEO)
> > - .phy.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO,
> > -#elif defined(CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE)
> > - .u.venc.type = OMAP_DSS_VENC_TYPE_COMPOSITE,
> > -#endif
> > .platform_enable = omap3_stalker_enable_tv,
> > .platform_disable = omap3_stalker_disable_tv,
> > };
> > --
> > 1.7.0.4
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> > the body of a message to majordomo at vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
> > Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH] AT91: Correct configuration define value
2010-07-01 8:55 ` Nicolas Ferre
@ 2010-08-20 15:18 ` Nicolas Ferre
-1 siblings, 0 replies; 221+ messages in thread
From: Nicolas Ferre @ 2010-08-20 15:18 UTC (permalink / raw)
To: siccegge
Cc: Nicolas Ferre, linux-arm-kernel, avictor.za, costa.antonior,
linux-kernel, vamos
Le 01/07/2010 10:55, Nicolas Ferre :
> The MTD nand driver for Atmel chips is atmel_nand and not at91_nand anymore.
> Change wrong configuration variables that were remaining.
>
> Reported-by: Christoph Egger <siccegge@cs.fau.de>
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
We can add:
Acked-by: Kirill A. Shutemov <kirill@shutemov.name>
> ---
> Christoph,
Christoph,
Is this patch handled by you as part of your patch series or should I
include it in "Trivial" or "AT91" patch series?
Bye,
> Thank you for highlighting this. But please consider this
> patch instead of yours.
>
> arch/arm/mach-at91/board-at572d940hf_ek.c | 2 +-
> arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-at91/board-at572d940hf_ek.c b/arch/arm/mach-at91/board-at572d940hf_ek.c
> index 5daff27..4665162 100644
> --- a/arch/arm/mach-at91/board-at572d940hf_ek.c
> +++ b/arch/arm/mach-at91/board-at572d940hf_ek.c
> @@ -216,7 +216,7 @@ static struct atmel_nand_data __initdata eb_nand_data = {
> /* .rdy_pin = AT91_PIN_PC16, */
> .enable_pin = AT91_PIN_PA15,
> .partition_info = nand_partitions,
> -#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
> +#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
> .bus_width_16 = 1,
> #else
> .bus_width_16 = 0,
> diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c
> index ee80059..37af9b1 100644
> --- a/arch/arm/mach-at91/board-sam9m10g45ek.c
> +++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
> @@ -135,7 +135,7 @@ static struct atmel_nand_data __initdata ek_nand_data = {
> .rdy_pin = AT91_PIN_PC8,
> .enable_pin = AT91_PIN_PC14,
> .partition_info = nand_partitions,
> -#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
> +#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
> .bus_width_16 = 1,
> #else
> .bus_width_16 = 0,
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH] AT91: Correct configuration define value
@ 2010-08-20 15:18 ` Nicolas Ferre
0 siblings, 0 replies; 221+ messages in thread
From: Nicolas Ferre @ 2010-08-20 15:18 UTC (permalink / raw)
To: linux-arm-kernel
Le 01/07/2010 10:55, Nicolas Ferre :
> The MTD nand driver for Atmel chips is atmel_nand and not at91_nand anymore.
> Change wrong configuration variables that were remaining.
>
> Reported-by: Christoph Egger <siccegge@cs.fau.de>
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
We can add:
Acked-by: Kirill A. Shutemov <kirill@shutemov.name>
> ---
> Christoph,
Christoph,
Is this patch handled by you as part of your patch series or should I
include it in "Trivial" or "AT91" patch series?
Bye,
> Thank you for highlighting this. But please consider this
> patch instead of yours.
>
> arch/arm/mach-at91/board-at572d940hf_ek.c | 2 +-
> arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-at91/board-at572d940hf_ek.c b/arch/arm/mach-at91/board-at572d940hf_ek.c
> index 5daff27..4665162 100644
> --- a/arch/arm/mach-at91/board-at572d940hf_ek.c
> +++ b/arch/arm/mach-at91/board-at572d940hf_ek.c
> @@ -216,7 +216,7 @@ static struct atmel_nand_data __initdata eb_nand_data = {
> /* .rdy_pin = AT91_PIN_PC16, */
> .enable_pin = AT91_PIN_PA15,
> .partition_info = nand_partitions,
> -#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
> +#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
> .bus_width_16 = 1,
> #else
> .bus_width_16 = 0,
> diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c
> index ee80059..37af9b1 100644
> --- a/arch/arm/mach-at91/board-sam9m10g45ek.c
> +++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
> @@ -135,7 +135,7 @@ static struct atmel_nand_data __initdata ek_nand_data = {
> .rdy_pin = AT91_PIN_PC8,
> .enable_pin = AT91_PIN_PC14,
> .partition_info = nand_partitions,
> -#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
> +#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
> .bus_width_16 = 1,
> #else
> .bus_width_16 = 0,
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 221+ messages in thread
* Re: [PATCH] AT91: Correct configuration define value
2010-08-20 15:18 ` Nicolas Ferre
@ 2010-08-23 2:56 ` Jean-Christophe PLAGNIOL-VILLARD
-1 siblings, 0 replies; 221+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2010-08-23 2:56 UTC (permalink / raw)
To: Nicolas Ferre
Cc: siccegge, costa.antonior, vamos, linux-kernel, avictor.za,
linux-arm-kernel
On 17:18 Fri 20 Aug , Nicolas Ferre wrote:
> Le 01/07/2010 10:55, Nicolas Ferre :
> > The MTD nand driver for Atmel chips is atmel_nand and not at91_nand anymore.
> > Change wrong configuration variables that were remaining.
> >
> > Reported-by: Christoph Egger <siccegge@cs.fau.de>
> > Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
>
> We can add:
> Acked-by: Kirill A. Shutemov <kirill@shutemov.name>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Best Regards,
J.
^ permalink raw reply [flat|nested] 221+ messages in thread
* [PATCH] AT91: Correct configuration define value
@ 2010-08-23 2:56 ` Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 0 replies; 221+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2010-08-23 2:56 UTC (permalink / raw)
To: linux-arm-kernel
On 17:18 Fri 20 Aug , Nicolas Ferre wrote:
> Le 01/07/2010 10:55, Nicolas Ferre :
> > The MTD nand driver for Atmel chips is atmel_nand and not at91_nand anymore.
> > Change wrong configuration variables that were remaining.
> >
> > Reported-by: Christoph Egger <siccegge@cs.fau.de>
> > Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
>
> We can add:
> Acked-by: Kirill A. Shutemov <kirill@shutemov.name>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Best Regards,
J.
^ permalink raw reply [flat|nested] 221+ messages in thread
end of thread, other threads:[~2010-08-23 3:03 UTC | newest]
Thread overview: 221+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-06-30 15:53 [PATCH 00/33] Removing dead code Christoph Egger
2010-06-30 15:53 ` [PATCH 01/33] Removing dead MTD_NAND_AT91_BUSWIDTH_16 Christoph Egger
2010-06-30 15:53 ` Christoph Egger
2010-06-30 17:53 ` Kirill A. Shutemov
2010-06-30 17:53 ` Kirill A. Shutemov
2010-07-01 8:55 ` [PATCH] AT91: Correct configuration define value Nicolas Ferre
2010-07-01 8:55 ` Nicolas Ferre
2010-07-01 9:14 ` Kirill A. Shutemov
2010-07-01 9:14 ` Kirill A. Shutemov
2010-08-20 15:18 ` Nicolas Ferre
2010-08-20 15:18 ` Nicolas Ferre
2010-08-23 2:56 ` Jean-Christophe PLAGNIOL-VILLARD
2010-08-23 2:56 ` Jean-Christophe PLAGNIOL-VILLARD
2010-06-30 15:54 ` [PATCH 03/33] Removing dead OMAP_MUX_ERRORS Christoph Egger
2010-06-30 15:54 ` Christoph Egger
2010-06-30 15:54 ` Christoph Egger
2010-06-30 19:54 ` Kirill A. Shutemov
2010-06-30 19:54 ` Kirill A. Shutemov
2010-07-01 13:22 ` Christoph Egger
2010-07-01 13:22 ` Christoph Egger
2010-07-01 15:27 ` Kirill A. Shutemov
2010-07-01 15:27 ` Kirill A. Shutemov
2010-07-05 8:07 ` Tony Lindgren
2010-07-05 8:07 ` Tony Lindgren
2010-06-30 15:55 ` [PATCH 04/33] Removing dead MSM7X00A_IDLE Christoph Egger
2010-06-30 15:55 ` Christoph Egger
2010-06-30 19:59 ` Kirill A. Shutemov
2010-06-30 19:59 ` Kirill A. Shutemov
2010-06-30 20:03 ` Daniel Walker
2010-06-30 20:03 ` Daniel Walker
2010-06-30 15:55 ` [PATCH 05/33] Removing dead OMAP_IR Christoph Egger
2010-06-30 15:55 ` Christoph Egger
2010-06-30 15:55 ` Christoph Egger
2010-07-05 8:14 ` Tony Lindgren
2010-07-05 8:14 ` Tony Lindgren
2010-06-30 15:55 ` [PATCH 06/33] Removing dead SHARPSL_LOCOMO Christoph Egger
2010-06-30 15:55 ` Christoph Egger
2010-06-30 23:12 ` Dmitry Eremin-Solenikov
2010-07-01 2:34 ` Eric Miao
2010-07-01 2:34 ` Eric Miao
2010-07-01 13:23 ` Christoph Egger
2010-07-01 13:23 ` Christoph Egger
2010-07-01 14:40 ` Eric Miao
2010-07-01 14:40 ` Eric Miao
2010-07-04 15:55 ` Eric Miao
2010-07-04 15:55 ` Eric Miao
2010-06-30 15:56 ` [PATCH 07/33] Removing dead CPU_S3C2400 Christoph Egger
2010-06-30 15:56 ` Christoph Egger
2010-06-30 15:56 ` [PATCH 08/33] Removing dead SA1101 Christoph Egger
2010-06-30 15:56 ` Christoph Egger
2010-06-30 16:57 ` Nicolas Pitre
2010-06-30 16:57 ` Nicolas Pitre
2010-06-30 18:20 ` Marek Vasut
2010-06-30 18:20 ` Marek Vasut
2010-06-30 18:59 ` Nicolas Pitre
2010-06-30 18:59 ` Nicolas Pitre
2010-07-01 0:01 ` Marek Vasut
2010-07-01 0:01 ` Marek Vasut
2010-06-30 15:56 ` [PATCH 09/33] Removing dead MAGICV Christoph Egger
2010-06-30 15:56 ` Christoph Egger
2010-06-30 15:57 ` [PATCH 10/33] Removing dead VIDEO_AT91_ISI Christoph Egger
2010-06-30 15:57 ` Christoph Egger
2010-06-30 15:57 ` [PATCH 11/33] Removing dead OMAP_DSP Christoph Egger
2010-06-30 15:57 ` Christoph Egger
2010-06-30 15:57 ` Christoph Egger
2010-07-05 8:20 ` Tony Lindgren
2010-07-05 8:20 ` Tony Lindgren
2010-06-30 15:57 ` [PATCH 12/33] Removing dead OMAP_STI Christoph Egger
2010-06-30 15:57 ` Christoph Egger
2010-06-30 15:57 ` Christoph Egger
2010-07-05 8:24 ` Tony Lindgren
2010-07-05 8:24 ` Tony Lindgren
2010-07-05 8:24 ` Tony Lindgren
2010-06-30 15:58 ` [PATCH 13/33] Replacing LEDS_OMAP_DEBUG with OMAP_DEBUG_LEDS Christoph Egger
2010-06-30 15:58 ` Christoph Egger
2010-06-30 15:58 ` Christoph Egger
2010-07-05 8:28 ` Tony Lindgren
2010-07-05 8:28 ` Tony Lindgren
2010-06-30 15:58 ` [PATCH 14/33] Removing dead SDMA_IRAM Christoph Egger
2010-06-30 15:58 ` Christoph Egger
2010-07-01 8:48 ` Sascha Hauer
2010-07-01 8:48 ` Sascha Hauer
2010-06-30 15:58 ` [PATCH 15/33] Removing dead PROCESSOR_NS9750 Christoph Egger
2010-06-30 15:58 ` Christoph Egger
2010-07-05 7:15 ` Uwe Kleine-König
2010-07-05 7:15 ` Uwe Kleine-König
2010-06-30 15:59 ` [PATCH 16/33] Removing dead APM Christoph Egger
2010-06-30 15:59 ` Christoph Egger
2010-06-30 18:23 ` Marek Vasut
2010-06-30 18:23 ` Marek Vasut
2010-07-05 8:31 ` Tony Lindgren
2010-07-05 8:31 ` Tony Lindgren
2010-07-05 8:31 ` Tony Lindgren
2010-06-30 15:59 ` Christoph Egger
2010-06-30 15:59 ` [PATCH 17/33] Removing dead SX1_OLD_FLASH Christoph Egger
2010-06-30 15:59 ` Christoph Egger
2010-06-30 15:59 ` Christoph Egger
2010-06-30 18:24 ` Marek Vasut
2010-06-30 18:24 ` Marek Vasut
2010-06-30 18:24 ` Marek Vasut
2010-07-05 8:33 ` Tony Lindgren
2010-07-05 8:33 ` Tony Lindgren
2010-07-05 8:33 ` Tony Lindgren
2010-07-05 10:31 ` Marek Vasut
2010-07-05 10:31 ` Marek Vasut
2010-06-30 15:59 ` [PATCH 18/33] Removing dead OMAP_ARM_96MHZ Christoph Egger
2010-06-30 15:59 ` Christoph Egger
2010-06-30 15:59 ` Christoph Egger
2010-06-30 18:25 ` Marek Vasut
2010-06-30 18:25 ` Marek Vasut
2010-06-30 18:25 ` Marek Vasut
2010-07-05 8:44 ` Tony Lindgren
2010-07-05 8:44 ` Tony Lindgren
2010-06-30 16:00 ` [PATCH 19/33] Removing dead MACH_OMAP_H4_OTG Christoph Egger
2010-06-30 16:00 ` Christoph Egger
2010-06-30 16:00 ` [PATCH 20/33] Removing dead MACH_OMAP2_H4_USB1 Christoph Egger
2010-06-30 16:00 ` Christoph Egger
2010-07-01 7:35 ` Felipe Balbi
2010-07-01 7:35 ` Felipe Balbi
2010-07-01 7:35 ` Felipe Balbi
2010-07-05 8:55 ` Tony Lindgren
2010-07-05 8:55 ` Tony Lindgren
2010-07-05 8:55 ` Tony Lindgren
2010-06-30 16:00 ` [PATCH 21/33] Removing dead OMAP2_VENC_OUT_TYPE_SVIDEO, OMAP2_VENC_OUT_TYPE_COMPOSITE Christoph Egger
2010-06-30 16:00 ` Christoph Egger
2010-06-30 16:00 ` Christoph Egger
2010-07-05 8:56 ` Tony Lindgren
2010-07-05 8:56 ` Tony Lindgren
2010-08-03 12:12 ` Tomi Valkeinen
2010-08-03 12:12 ` Tomi Valkeinen
2010-08-03 12:12 ` Tomi Valkeinen
2010-07-06 5:56 ` Hiremath, Vaibhav
2010-07-06 5:56 ` Hiremath, Vaibhav
2010-07-06 5:56 ` Hiremath, Vaibhav
2010-06-30 16:01 ` [PATCH 22/33] Removing dead MPU_{BRIDGE,TESLA}_IOMMU Christoph Egger
2010-06-30 16:01 ` Christoph Egger
2010-06-30 16:01 ` Christoph Egger
2010-06-30 18:23 ` Hiroshi DOYU
2010-06-30 18:23 ` Hiroshi DOYU
2010-06-30 18:44 ` Kanigeri, Hari
2010-06-30 18:44 ` Kanigeri, Hari
2010-06-30 18:44 ` Kanigeri, Hari
2010-06-30 16:01 ` [PATCH 23/33] Removing dead BACKLIGHT_CORGI Christoph Egger
2010-06-30 16:01 ` Christoph Egger
2010-07-01 3:50 ` Eric Miao
2010-07-01 3:50 ` Eric Miao
2010-07-04 15:55 ` Eric Miao
2010-07-04 15:55 ` Eric Miao
2010-06-30 16:01 ` [PATCH 24/33] Removing dead ARCH_GUMSTIX_ORIG Christoph Egger
2010-06-30 16:01 ` Christoph Egger
2010-07-01 4:27 ` Eric Miao
2010-07-01 4:27 ` Eric Miao
2010-07-01 23:57 ` Jaya Kumar
2010-07-01 23:57 ` Jaya Kumar
2010-07-04 15:56 ` Eric Miao
2010-07-04 15:56 ` Eric Miao
2010-06-30 16:01 ` [PATCH 25/33] Removing dead CORGI_SSP_DEPRECATED Christoph Egger
2010-06-30 16:01 ` Christoph Egger
2010-07-01 9:58 ` Kristoffer Ericson
2010-07-01 9:58 ` Kristoffer Ericson
2010-07-04 15:56 ` Eric Miao
2010-07-04 15:56 ` Eric Miao
2010-06-30 16:02 ` [PATCH 26/33] Removing dead XSCALE_CACHE_ERRATA Christoph Egger
2010-06-30 16:02 ` Christoph Egger
2010-07-01 4:25 ` Eric Miao
2010-07-01 4:25 ` Eric Miao
2010-07-04 15:56 ` Eric Miao
2010-07-04 15:56 ` Eric Miao
2010-06-30 16:02 ` [PATCH 27/33] Removing dead IDE_PXA_CF Christoph Egger
2010-06-30 16:02 ` Christoph Egger
2010-06-30 18:17 ` Marek Vasut
2010-06-30 18:17 ` Marek Vasut
2010-07-01 2:56 ` Eric Miao
2010-07-01 2:56 ` Eric Miao
2010-07-02 7:45 ` Juergen Schindele
2010-07-02 9:24 ` Marek Vasut
2010-07-04 15:57 ` Eric Miao
2010-06-30 16:02 ` [PATCH 28/33] Removing dead CPU_S3C24XX Christoph Egger
2010-06-30 16:02 ` Christoph Egger
2010-06-30 16:19 ` Vasily Khoruzhick
2010-06-30 16:19 ` Vasily Khoruzhick
2010-06-30 16:03 ` [PATCH 29/33] Removing dead SND_SOC_SMDK2443_WM9710 Christoph Egger
2010-06-30 16:03 ` Christoph Egger
2010-07-01 12:55 ` Jassi Brar
2010-07-01 12:55 ` Jassi Brar
2010-07-01 13:07 ` Mark Brown
2010-07-01 13:07 ` Mark Brown
2010-07-02 7:08 ` Jassi Brar
2010-07-02 7:08 ` Jassi Brar
2010-07-02 9:33 ` Mark Brown
2010-07-02 9:33 ` Mark Brown
2010-07-01 13:25 ` Christoph Egger
2010-07-01 13:25 ` Christoph Egger
2010-07-02 7:10 ` Jassi Brar
2010-07-02 7:10 ` Jassi Brar
2010-06-30 16:03 ` [PATCH 30/33] Removing dead S3C_DEV_ADC Christoph Egger
2010-06-30 16:03 ` Christoph Egger
2010-06-30 16:24 ` Arnaud Patard
2010-06-30 16:24 ` Arnaud Patard (Rtp)
2010-07-02 9:38 ` Ben Dooks
2010-07-02 9:38 ` Ben Dooks
2010-06-30 16:03 ` [PATCH 31/33] Removing dead MACH_U300_BS26 Christoph Egger
2010-06-30 16:03 ` Christoph Egger
2010-06-30 22:00 ` Linus Walleij
2010-06-30 22:00 ` Linus Walleij
2010-07-20 15:27 ` Jiri Kosina
2010-07-20 15:27 ` Jiri Kosina
2010-06-30 16:04 ` [PATCH 32/33] Removing dead CPU_ICACHE_STREAMING_DISABLE Christoph Egger
2010-06-30 16:04 ` Christoph Egger
2010-06-30 16:04 ` [PATCH 33/33] Removing dead MACH_U300_USE_I2S_AS_MASTER Christoph Egger
2010-06-30 16:04 ` Christoph Egger
2010-06-30 22:03 ` Linus Walleij
2010-06-30 22:03 ` Linus Walleij
2010-06-30 16:05 ` [PATCH 02/33] Removing dead ARCH_DAVINCI_TNETV107X Christoph Egger
2010-06-30 16:05 ` Christoph Egger
2010-06-30 17:07 ` Baruch Siach
2010-06-30 17:07 ` Baruch Siach
2010-06-30 19:49 ` Kirill A. Shutemov
2010-06-30 19:49 ` Kirill A. Shutemov
2010-06-30 20:36 ` Kevin Hilman
2010-06-30 20:36 ` Kevin Hilman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.