2010-06-30 15:59:30

by Christoph Egger

Subject: [PATCH 17/33] Removing dead SX1_OLD_FLASH

SX1_OLD_FLASH doesn't exist in Kconfig, therefore removing all
references for it from the source code.

Signed-off-by: Christoph Egger <[email protected]>
---
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

2010-06-30 18:27:10

by Marek Vasut

Subject: Re: [PATCH 17/33] Removing dead SX1_OLD_FLASH

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 <[email protected]>
> ---
> 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 -------------------------*/

2010-07-05 08:34:34

by Tony Lindgren

Subject: Re: [PATCH 17/33] Removing dead SX1_OLD_FLASH

* Marek Vasut <[email protected]> [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

2010-07-05 10:33:41

by Marek Vasut

Subject: Re: [PATCH 17/33] Removing dead SX1_OLD_FLASH

Dne Po 5. července 2010 10:33:48 Tony Lindgren napsal(a):
> * Marek Vasut <[email protected]> [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