* [RFC][PATCH] ARM: kirkwood: Remove eSATA SheevaPlug board support
@ 2011-12-01 11:04 ` Axel Lin
0 siblings, 0 replies; 15+ messages in thread
From: Axel Lin @ 2011-12-01 11:04 UTC (permalink / raw)
To: linux-kernel
Cc: Nicolas Pitre, Lennert Buytenhek, John Holland, Russell King,
linux-arm-kernel
commit bb9b25f923 "ARM: Update mach-types" removes sheeva_esata entry
from mach-types, so current code in arch/arm/mach-kirkwood/sheevaplug-setup.c
always compile fail.
This patch removes sheeva_esata related code.
Cc: Nicolas Pitre <nico@fluxnic.net>
Cc: Lennert Buytenhek <kernel@wantstofly.org>
Cc: John Holland <john.holland@cellent-fs.de>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
Not really sure if we should remove all sheeva_esata related code or
just add it back to mach-types.
If nobody cares, maybe it is ok to remove it.
Note:
I got the build error on linux-next tree (20111201).
So this patch is against linux-next tree.
Axel
arch/arm/mach-kirkwood/Kconfig | 6 ----
arch/arm/mach-kirkwood/Makefile | 1 -
arch/arm/mach-kirkwood/sheevaplug-setup.c | 45 +---------------------------
3 files changed, 2 insertions(+), 50 deletions(-)
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
index 7fc603b..f5ba3aa 100644
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
@@ -32,12 +32,6 @@ config MACH_SHEEVAPLUG
Say 'Y' here if you want your kernel to support the
Marvell SheevaPlug Reference Board.
-config MACH_ESATA_SHEEVAPLUG
- bool "Marvell eSATA SheevaPlug Reference Board"
- help
- Say 'Y' here if you want your kernel to support the
- Marvell eSATA SheevaPlug Reference Board.
-
config MACH_GURUPLUG
bool "Marvell GuruPlug Reference Board"
help
diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
index 5dcaa81..1cd300c 100644
--- a/arch/arm/mach-kirkwood/Makefile
+++ b/arch/arm/mach-kirkwood/Makefile
@@ -5,7 +5,6 @@ obj-$(CONFIG_MACH_RD88F6192_NAS) += rd88f6192-nas-setup.o
obj-$(CONFIG_MACH_RD88F6281) += rd88f6281-setup.o
obj-$(CONFIG_MACH_MV88F6281GTW_GE) += mv88f6281gtw_ge-setup.o
obj-$(CONFIG_MACH_SHEEVAPLUG) += sheevaplug-setup.o
-obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o
obj-$(CONFIG_MACH_GURUPLUG) += guruplug-setup.o
obj-$(CONFIG_MACH_DOCKSTAR) += dockstar-setup.o
obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o
diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
index 85bff6b..346bb07 100644
--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c
@@ -11,7 +11,6 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
-#include <linux/ata_platform.h>
#include <linux/mtd/partitions.h>
#include <linux/mv643xx_eth.h>
#include <linux/gpio.h>
@@ -43,19 +42,10 @@ static struct mv643xx_eth_platform_data sheevaplug_ge00_data = {
.phy_addr = MV643XX_ETH_PHY_ADDR(0),
};
-static struct mv_sata_platform_data sheeva_esata_sata_data = {
- .n_ports = 2,
-};
-
static struct mvsdio_platform_data sheevaplug_mvsdio_data = {
/* unfortunately the CD signal has not been connected */
};
-static struct mvsdio_platform_data sheeva_esata_mvsdio_data = {
- .gpio_write_protect = 44, /* MPP44 used as SD write protect */
- .gpio_card_detect = 47, /* MPP47 used as SD card detect */
-};
-
static struct gpio_led sheevaplug_led_pins[] = {
{
.name = "plug:red:misc",
@@ -91,14 +81,6 @@ static unsigned int sheevaplug_mpp_config[] __initdata = {
0
};
-static unsigned int sheeva_esata_mpp_config[] __initdata = {
- MPP29_GPIO, /* USB Power Enable */
- MPP44_GPIO, /* SD Write Protect */
- MPP47_GPIO, /* SD Card Detect */
- MPP49_GPIO, /* LED Green */
- 0
-};
-
static void __init sheevaplug_init(void)
{
/*
@@ -107,10 +89,7 @@ static void __init sheevaplug_init(void)
kirkwood_init();
/* setup gpio pin select */
- if (machine_is_sheeva_esata())
- kirkwood_mpp_conf(sheeva_esata_mpp_config);
- else
- kirkwood_mpp_conf(sheevaplug_mpp_config);
+ kirkwood_mpp_conf(sheevaplug_mpp_config);
kirkwood_uart0_init();
kirkwood_nand_init(ARRAY_AND_SIZE(sheevaplug_nand_parts), 25);
@@ -122,15 +101,7 @@ static void __init sheevaplug_init(void)
kirkwood_ge00_init(&sheevaplug_ge00_data);
- /* honor lower power consumption for plugs with out eSATA */
- if (machine_is_sheeva_esata())
- kirkwood_sata_init(&sheeva_esata_sata_data);
-
- /* enable sd wp and sd cd on plugs with esata */
- if (machine_is_sheeva_esata())
- kirkwood_sdio_init(&sheeva_esata_mvsdio_data);
- else
- kirkwood_sdio_init(&sheevaplug_mvsdio_data);
+ kirkwood_sdio_init(&sheevaplug_mvsdio_data);
platform_device_register(&sheevaplug_leds);
}
@@ -147,15 +118,3 @@ MACHINE_START(SHEEVAPLUG, "Marvell SheevaPlug Reference Board")
.restart = kirkwood_restart,
MACHINE_END
#endif
-
-#ifdef CONFIG_MACH_ESATA_SHEEVAPLUG
-MACHINE_START(ESATA_SHEEVAPLUG, "Marvell eSATA SheevaPlug Reference Board")
- .atag_offset = 0x100,
- .init_machine = sheevaplug_init,
- .map_io = kirkwood_map_io,
- .init_early = kirkwood_init_early,
- .init_irq = kirkwood_init_irq,
- .timer = &kirkwood_timer,
- .restart = kirkwood_restart,
-MACHINE_END
-#endif
--
1.7.5.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [RFC][PATCH] ARM: kirkwood: Remove eSATA SheevaPlug board support
@ 2011-12-01 11:04 ` Axel Lin
0 siblings, 0 replies; 15+ messages in thread
From: Axel Lin @ 2011-12-01 11:04 UTC (permalink / raw)
To: linux-arm-kernel
commit bb9b25f923 "ARM: Update mach-types" removes sheeva_esata entry
from mach-types, so current code in arch/arm/mach-kirkwood/sheevaplug-setup.c
always compile fail.
This patch removes sheeva_esata related code.
Cc: Nicolas Pitre <nico@fluxnic.net>
Cc: Lennert Buytenhek <kernel@wantstofly.org>
Cc: John Holland <john.holland@cellent-fs.de>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
Not really sure if we should remove all sheeva_esata related code or
just add it back to mach-types.
If nobody cares, maybe it is ok to remove it.
Note:
I got the build error on linux-next tree (20111201).
So this patch is against linux-next tree.
Axel
arch/arm/mach-kirkwood/Kconfig | 6 ----
arch/arm/mach-kirkwood/Makefile | 1 -
arch/arm/mach-kirkwood/sheevaplug-setup.c | 45 +---------------------------
3 files changed, 2 insertions(+), 50 deletions(-)
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
index 7fc603b..f5ba3aa 100644
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
@@ -32,12 +32,6 @@ config MACH_SHEEVAPLUG
Say 'Y' here if you want your kernel to support the
Marvell SheevaPlug Reference Board.
-config MACH_ESATA_SHEEVAPLUG
- bool "Marvell eSATA SheevaPlug Reference Board"
- help
- Say 'Y' here if you want your kernel to support the
- Marvell eSATA SheevaPlug Reference Board.
-
config MACH_GURUPLUG
bool "Marvell GuruPlug Reference Board"
help
diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
index 5dcaa81..1cd300c 100644
--- a/arch/arm/mach-kirkwood/Makefile
+++ b/arch/arm/mach-kirkwood/Makefile
@@ -5,7 +5,6 @@ obj-$(CONFIG_MACH_RD88F6192_NAS) += rd88f6192-nas-setup.o
obj-$(CONFIG_MACH_RD88F6281) += rd88f6281-setup.o
obj-$(CONFIG_MACH_MV88F6281GTW_GE) += mv88f6281gtw_ge-setup.o
obj-$(CONFIG_MACH_SHEEVAPLUG) += sheevaplug-setup.o
-obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o
obj-$(CONFIG_MACH_GURUPLUG) += guruplug-setup.o
obj-$(CONFIG_MACH_DOCKSTAR) += dockstar-setup.o
obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o
diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
index 85bff6b..346bb07 100644
--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c
@@ -11,7 +11,6 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
-#include <linux/ata_platform.h>
#include <linux/mtd/partitions.h>
#include <linux/mv643xx_eth.h>
#include <linux/gpio.h>
@@ -43,19 +42,10 @@ static struct mv643xx_eth_platform_data sheevaplug_ge00_data = {
.phy_addr = MV643XX_ETH_PHY_ADDR(0),
};
-static struct mv_sata_platform_data sheeva_esata_sata_data = {
- .n_ports = 2,
-};
-
static struct mvsdio_platform_data sheevaplug_mvsdio_data = {
/* unfortunately the CD signal has not been connected */
};
-static struct mvsdio_platform_data sheeva_esata_mvsdio_data = {
- .gpio_write_protect = 44, /* MPP44 used as SD write protect */
- .gpio_card_detect = 47, /* MPP47 used as SD card detect */
-};
-
static struct gpio_led sheevaplug_led_pins[] = {
{
.name = "plug:red:misc",
@@ -91,14 +81,6 @@ static unsigned int sheevaplug_mpp_config[] __initdata = {
0
};
-static unsigned int sheeva_esata_mpp_config[] __initdata = {
- MPP29_GPIO, /* USB Power Enable */
- MPP44_GPIO, /* SD Write Protect */
- MPP47_GPIO, /* SD Card Detect */
- MPP49_GPIO, /* LED Green */
- 0
-};
-
static void __init sheevaplug_init(void)
{
/*
@@ -107,10 +89,7 @@ static void __init sheevaplug_init(void)
kirkwood_init();
/* setup gpio pin select */
- if (machine_is_sheeva_esata())
- kirkwood_mpp_conf(sheeva_esata_mpp_config);
- else
- kirkwood_mpp_conf(sheevaplug_mpp_config);
+ kirkwood_mpp_conf(sheevaplug_mpp_config);
kirkwood_uart0_init();
kirkwood_nand_init(ARRAY_AND_SIZE(sheevaplug_nand_parts), 25);
@@ -122,15 +101,7 @@ static void __init sheevaplug_init(void)
kirkwood_ge00_init(&sheevaplug_ge00_data);
- /* honor lower power consumption for plugs with out eSATA */
- if (machine_is_sheeva_esata())
- kirkwood_sata_init(&sheeva_esata_sata_data);
-
- /* enable sd wp and sd cd on plugs with esata */
- if (machine_is_sheeva_esata())
- kirkwood_sdio_init(&sheeva_esata_mvsdio_data);
- else
- kirkwood_sdio_init(&sheevaplug_mvsdio_data);
+ kirkwood_sdio_init(&sheevaplug_mvsdio_data);
platform_device_register(&sheevaplug_leds);
}
@@ -147,15 +118,3 @@ MACHINE_START(SHEEVAPLUG, "Marvell SheevaPlug Reference Board")
.restart = kirkwood_restart,
MACHINE_END
#endif
-
-#ifdef CONFIG_MACH_ESATA_SHEEVAPLUG
-MACHINE_START(ESATA_SHEEVAPLUG, "Marvell eSATA SheevaPlug Reference Board")
- .atag_offset = 0x100,
- .init_machine = sheevaplug_init,
- .map_io = kirkwood_map_io,
- .init_early = kirkwood_init_early,
- .init_irq = kirkwood_init_irq,
- .timer = &kirkwood_timer,
- .restart = kirkwood_restart,
-MACHINE_END
-#endif
--
1.7.5.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [RFC][PATCH] ARM: kirkwood: Remove eSATA SheevaPlug board support
2011-12-01 11:04 ` Axel Lin
@ 2011-12-01 11:57 ` Holland, John
-1 siblings, 0 replies; 15+ messages in thread
From: Holland, John @ 2011-12-01 11:57 UTC (permalink / raw)
To: Axel Lin
Cc: linux-kernel, Nicolas Pitre, Lennert Buytenhek, Russell King,
linux-arm-kernel
On 01.12.2011, at 12:04, "Axel Lin" <axel.lin@gmail.com> wrote:
> commit bb9b25f923 "ARM: Update mach-types" removes sheeva_esata entry
> from mach-types, so current code in arch/arm/mach-kirkwood/sheevaplug-setup.c
> always compile fail.
>
> This patch removes sheeva_esata related code.
>
> Cc: Nicolas Pitre <nico@fluxnic.net>
> Cc: Lennert Buytenhek <kernel@wantstofly.org>
> Cc: John Holland <john.holland@cellent-fs.de>
> Cc: Russell King <linux@arm.linux.org.uk>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
> Not really sure if we should remove all sheeva_esata related code or
> just add it back to mach-types.
> If nobody cares, maybe it is ok to remove it.
I think removing the will also remove ESATA support for the device as a whole. I prefer reinstating the MACH_TYPE for the ESATA SheevaPlug.
> Note:
> I got the build error on linux-next tree (20111201).
> So this patch is against linux-next tree.
> Axel
>
> arch/arm/mach-kirkwood/Kconfig | 6 ----
> arch/arm/mach-kirkwood/Makefile | 1 -
> arch/arm/mach-kirkwood/sheevaplug-setup.c | 45 +---------------------------
> 3 files changed, 2 insertions(+), 50 deletions(-)
>
> diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
> index 7fc603b..f5ba3aa 100644
> --- a/arch/arm/mach-kirkwood/Kconfig
> +++ b/arch/arm/mach-kirkwood/Kconfig
> @@ -32,12 +32,6 @@ config MACH_SHEEVAPLUG
> Say 'Y' here if you want your kernel to support the
> Marvell SheevaPlug Reference Board.
>
> -config MACH_ESATA_SHEEVAPLUG
> - bool "Marvell eSATA SheevaPlug Reference Board"
> - help
> - Say 'Y' here if you want your kernel to support the
> - Marvell eSATA SheevaPlug Reference Board.
> -
> config MACH_GURUPLUG
> bool "Marvell GuruPlug Reference Board"
> help
> diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
> index 5dcaa81..1cd300c 100644
> --- a/arch/arm/mach-kirkwood/Makefile
> +++ b/arch/arm/mach-kirkwood/Makefile
> @@ -5,7 +5,6 @@ obj-$(CONFIG_MACH_RD88F6192_NAS) += rd88f6192-nas-setup.o
> obj-$(CONFIG_MACH_RD88F6281) += rd88f6281-setup.o
> obj-$(CONFIG_MACH_MV88F6281GTW_GE) += mv88f6281gtw_ge-setup.o
> obj-$(CONFIG_MACH_SHEEVAPLUG) += sheevaplug-setup.o
> -obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o
> obj-$(CONFIG_MACH_GURUPLUG) += guruplug-setup.o
> obj-$(CONFIG_MACH_DOCKSTAR) += dockstar-setup.o
> obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o
> diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
> index 85bff6b..346bb07 100644
> --- a/arch/arm/mach-kirkwood/sheevaplug-setup.c
> +++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c
> @@ -11,7 +11,6 @@
> #include <linux/kernel.h>
> #include <linux/init.h>
> #include <linux/platform_device.h>
> -#include <linux/ata_platform.h>
> #include <linux/mtd/partitions.h>
> #include <linux/mv643xx_eth.h>
> #include <linux/gpio.h>
> @@ -43,19 +42,10 @@ static struct mv643xx_eth_platform_data sheevaplug_ge00_data = {
> .phy_addr = MV643XX_ETH_PHY_ADDR(0),
> };
>
> -static struct mv_sata_platform_data sheeva_esata_sata_data = {
> - .n_ports = 2,
> -};
> -
> static struct mvsdio_platform_data sheevaplug_mvsdio_data = {
> /* unfortunately the CD signal has not been connected */
> };
>
> -static struct mvsdio_platform_data sheeva_esata_mvsdio_data = {
> - .gpio_write_protect = 44, /* MPP44 used as SD write protect */
> - .gpio_card_detect = 47, /* MPP47 used as SD card detect */
> -};
> -
> static struct gpio_led sheevaplug_led_pins[] = {
> {
> .name = "plug:red:misc",
> @@ -91,14 +81,6 @@ static unsigned int sheevaplug_mpp_config[] __initdata = {
> 0
> };
>
> -static unsigned int sheeva_esata_mpp_config[] __initdata = {
> - MPP29_GPIO, /* USB Power Enable */
> - MPP44_GPIO, /* SD Write Protect */
> - MPP47_GPIO, /* SD Card Detect */
> - MPP49_GPIO, /* LED Green */
> - 0
> -};
> -
> static void __init sheevaplug_init(void)
> {
> /*
> @@ -107,10 +89,7 @@ static void __init sheevaplug_init(void)
> kirkwood_init();
>
> /* setup gpio pin select */
> - if (machine_is_sheeva_esata())
> - kirkwood_mpp_conf(sheeva_esata_mpp_config);
> - else
> - kirkwood_mpp_conf(sheevaplug_mpp_config);
> + kirkwood_mpp_conf(sheevaplug_mpp_config);
>
> kirkwood_uart0_init();
> kirkwood_nand_init(ARRAY_AND_SIZE(sheevaplug_nand_parts), 25);
> @@ -122,15 +101,7 @@ static void __init sheevaplug_init(void)
>
> kirkwood_ge00_init(&sheevaplug_ge00_data);
>
> - /* honor lower power consumption for plugs with out eSATA */
> - if (machine_is_sheeva_esata())
> - kirkwood_sata_init(&sheeva_esata_sata_data);
> -
> - /* enable sd wp and sd cd on plugs with esata */
> - if (machine_is_sheeva_esata())
> - kirkwood_sdio_init(&sheeva_esata_mvsdio_data);
> - else
> - kirkwood_sdio_init(&sheevaplug_mvsdio_data);
> + kirkwood_sdio_init(&sheevaplug_mvsdio_data);
>
> platform_device_register(&sheevaplug_leds);
> }
> @@ -147,15 +118,3 @@ MACHINE_START(SHEEVAPLUG, "Marvell SheevaPlug Reference Board")
> .restart = kirkwood_restart,
> MACHINE_END
> #endif
> -
> -#ifdef CONFIG_MACH_ESATA_SHEEVAPLUG
> -MACHINE_START(ESATA_SHEEVAPLUG, "Marvell eSATA SheevaPlug Reference Board")
> - .atag_offset = 0x100,
> - .init_machine = sheevaplug_init,
> - .map_io = kirkwood_map_io,
> - .init_early = kirkwood_init_early,
> - .init_irq = kirkwood_init_irq,
> - .timer = &kirkwood_timer,
> - .restart = kirkwood_restart,
> -MACHINE_END
> -#endif
> --
> 1.7.5.4
>
>
>
___________________________________
Cellent Finance Solutions AG
Firmensitz: Calwer Straße 33, 70173 Stuttgart
Registergericht: Amtsgericht Stuttgart, HRB 720743
Vorstand: Thomas Wild
Vorsitzender des Aufsichtsrats: Rudolf Zipf
^ permalink raw reply [flat|nested] 15+ messages in thread
* [RFC][PATCH] ARM: kirkwood: Remove eSATA SheevaPlug board support
@ 2011-12-01 11:57 ` Holland, John
0 siblings, 0 replies; 15+ messages in thread
From: Holland, John @ 2011-12-01 11:57 UTC (permalink / raw)
To: linux-arm-kernel
On 01.12.2011, at 12:04, "Axel Lin" <axel.lin@gmail.com> wrote:
> commit bb9b25f923 "ARM: Update mach-types" removes sheeva_esata entry
> from mach-types, so current code in arch/arm/mach-kirkwood/sheevaplug-setup.c
> always compile fail.
>
> This patch removes sheeva_esata related code.
>
> Cc: Nicolas Pitre <nico@fluxnic.net>
> Cc: Lennert Buytenhek <kernel@wantstofly.org>
> Cc: John Holland <john.holland@cellent-fs.de>
> Cc: Russell King <linux@arm.linux.org.uk>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
> Not really sure if we should remove all sheeva_esata related code or
> just add it back to mach-types.
> If nobody cares, maybe it is ok to remove it.
I think removing the will also remove ESATA support for the device as a whole. I prefer reinstating the MACH_TYPE for the ESATA SheevaPlug.
> Note:
> I got the build error on linux-next tree (20111201).
> So this patch is against linux-next tree.
> Axel
>
> arch/arm/mach-kirkwood/Kconfig | 6 ----
> arch/arm/mach-kirkwood/Makefile | 1 -
> arch/arm/mach-kirkwood/sheevaplug-setup.c | 45 +---------------------------
> 3 files changed, 2 insertions(+), 50 deletions(-)
>
> diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
> index 7fc603b..f5ba3aa 100644
> --- a/arch/arm/mach-kirkwood/Kconfig
> +++ b/arch/arm/mach-kirkwood/Kconfig
> @@ -32,12 +32,6 @@ config MACH_SHEEVAPLUG
> Say 'Y' here if you want your kernel to support the
> Marvell SheevaPlug Reference Board.
>
> -config MACH_ESATA_SHEEVAPLUG
> - bool "Marvell eSATA SheevaPlug Reference Board"
> - help
> - Say 'Y' here if you want your kernel to support the
> - Marvell eSATA SheevaPlug Reference Board.
> -
> config MACH_GURUPLUG
> bool "Marvell GuruPlug Reference Board"
> help
> diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
> index 5dcaa81..1cd300c 100644
> --- a/arch/arm/mach-kirkwood/Makefile
> +++ b/arch/arm/mach-kirkwood/Makefile
> @@ -5,7 +5,6 @@ obj-$(CONFIG_MACH_RD88F6192_NAS) += rd88f6192-nas-setup.o
> obj-$(CONFIG_MACH_RD88F6281) += rd88f6281-setup.o
> obj-$(CONFIG_MACH_MV88F6281GTW_GE) += mv88f6281gtw_ge-setup.o
> obj-$(CONFIG_MACH_SHEEVAPLUG) += sheevaplug-setup.o
> -obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o
> obj-$(CONFIG_MACH_GURUPLUG) += guruplug-setup.o
> obj-$(CONFIG_MACH_DOCKSTAR) += dockstar-setup.o
> obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o
> diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
> index 85bff6b..346bb07 100644
> --- a/arch/arm/mach-kirkwood/sheevaplug-setup.c
> +++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c
> @@ -11,7 +11,6 @@
> #include <linux/kernel.h>
> #include <linux/init.h>
> #include <linux/platform_device.h>
> -#include <linux/ata_platform.h>
> #include <linux/mtd/partitions.h>
> #include <linux/mv643xx_eth.h>
> #include <linux/gpio.h>
> @@ -43,19 +42,10 @@ static struct mv643xx_eth_platform_data sheevaplug_ge00_data = {
> .phy_addr = MV643XX_ETH_PHY_ADDR(0),
> };
>
> -static struct mv_sata_platform_data sheeva_esata_sata_data = {
> - .n_ports = 2,
> -};
> -
> static struct mvsdio_platform_data sheevaplug_mvsdio_data = {
> /* unfortunately the CD signal has not been connected */
> };
>
> -static struct mvsdio_platform_data sheeva_esata_mvsdio_data = {
> - .gpio_write_protect = 44, /* MPP44 used as SD write protect */
> - .gpio_card_detect = 47, /* MPP47 used as SD card detect */
> -};
> -
> static struct gpio_led sheevaplug_led_pins[] = {
> {
> .name = "plug:red:misc",
> @@ -91,14 +81,6 @@ static unsigned int sheevaplug_mpp_config[] __initdata = {
> 0
> };
>
> -static unsigned int sheeva_esata_mpp_config[] __initdata = {
> - MPP29_GPIO, /* USB Power Enable */
> - MPP44_GPIO, /* SD Write Protect */
> - MPP47_GPIO, /* SD Card Detect */
> - MPP49_GPIO, /* LED Green */
> - 0
> -};
> -
> static void __init sheevaplug_init(void)
> {
> /*
> @@ -107,10 +89,7 @@ static void __init sheevaplug_init(void)
> kirkwood_init();
>
> /* setup gpio pin select */
> - if (machine_is_sheeva_esata())
> - kirkwood_mpp_conf(sheeva_esata_mpp_config);
> - else
> - kirkwood_mpp_conf(sheevaplug_mpp_config);
> + kirkwood_mpp_conf(sheevaplug_mpp_config);
>
> kirkwood_uart0_init();
> kirkwood_nand_init(ARRAY_AND_SIZE(sheevaplug_nand_parts), 25);
> @@ -122,15 +101,7 @@ static void __init sheevaplug_init(void)
>
> kirkwood_ge00_init(&sheevaplug_ge00_data);
>
> - /* honor lower power consumption for plugs with out eSATA */
> - if (machine_is_sheeva_esata())
> - kirkwood_sata_init(&sheeva_esata_sata_data);
> -
> - /* enable sd wp and sd cd on plugs with esata */
> - if (machine_is_sheeva_esata())
> - kirkwood_sdio_init(&sheeva_esata_mvsdio_data);
> - else
> - kirkwood_sdio_init(&sheevaplug_mvsdio_data);
> + kirkwood_sdio_init(&sheevaplug_mvsdio_data);
>
> platform_device_register(&sheevaplug_leds);
> }
> @@ -147,15 +118,3 @@ MACHINE_START(SHEEVAPLUG, "Marvell SheevaPlug Reference Board")
> .restart = kirkwood_restart,
> MACHINE_END
> #endif
> -
> -#ifdef CONFIG_MACH_ESATA_SHEEVAPLUG
> -MACHINE_START(ESATA_SHEEVAPLUG, "Marvell eSATA SheevaPlug Reference Board")
> - .atag_offset = 0x100,
> - .init_machine = sheevaplug_init,
> - .map_io = kirkwood_map_io,
> - .init_early = kirkwood_init_early,
> - .init_irq = kirkwood_init_irq,
> - .timer = &kirkwood_timer,
> - .restart = kirkwood_restart,
> -MACHINE_END
> -#endif
> --
> 1.7.5.4
>
>
>
___________________________________
Cellent Finance Solutions AG
Firmensitz: Calwer Stra?e 33, 70173 Stuttgart
Registergericht: Amtsgericht Stuttgart, HRB 720743
Vorstand: Thomas Wild
Vorsitzender des Aufsichtsrats: Rudolf Zipf
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [RFC][PATCH] ARM: kirkwood: Remove eSATA SheevaPlug board support
2011-12-01 11:04 ` Axel Lin
@ 2011-12-03 11:39 ` Tixy
-1 siblings, 0 replies; 15+ messages in thread
From: Tixy @ 2011-12-03 11:39 UTC (permalink / raw)
To: Axel Lin
Cc: linux-kernel, John Holland, Russell King, Lennert Buytenhek,
linux-arm-kernel, Nicolas Pitre
On Thu, 2011-12-01 at 19:04 +0800, Axel Lin wrote:
> commit bb9b25f923 "ARM: Update mach-types" removes sheeva_esata entry
> from mach-types, so current code in arch/arm/mach-kirkwood/sheevaplug-setup.c
> always compile fail.
>
> This patch removes sheeva_esata related code.
As I use this device I would rather not see support for it dropped.
After doing some digging in the mail archives I believe the eSata
SheevaPlug entry has been deleted due to the machine_is_xxx() name not
matching the CONFIG_XXX name. A fix for this was proposed a while back
by Nicolas Pitre: http://www.spinics.net/lists/arm-kernel/msg140555.html
Is it now too late to fix this now?
Below is a respin of Nicolas's original patch based on yesterdays
linux-next...
8<---------------------------------------------------------------------->8
[PATCH] Fix machine_is_xxx() naming for eSata SheevaPlug and QNAP TS-209
The eSata SheevaPlug and QNAP TS-209 devices were removed from
mach-types due to naming mismatches between machine_is_xxx(), CONFIG_XXX
and MACH_TYPE_XXX.
This patch fixes those mismatches and adds the devices back into
mach-types.
Cc: Nicolas Pitre <nico@fluxnic.net>
Cc: Lennert Buytenhek <kernel@wantstofly.org>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
---
arch/arm/mach-kirkwood/sheevaplug-setup.c | 6 +++---
arch/arm/mach-orion5x/ts209-setup.c | 2 +-
arch/arm/tools/mach-types | 2 ++
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
index 85bff6b..4ea70e5 100644
--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c
@@ -107,7 +107,7 @@ static void __init sheevaplug_init(void)
kirkwood_init();
/* setup gpio pin select */
- if (machine_is_sheeva_esata())
+ if (machine_is_esata_sheevaplug())
kirkwood_mpp_conf(sheeva_esata_mpp_config);
else
kirkwood_mpp_conf(sheevaplug_mpp_config);
@@ -123,11 +123,11 @@ static void __init sheevaplug_init(void)
kirkwood_ge00_init(&sheevaplug_ge00_data);
/* honor lower power consumption for plugs with out eSATA */
- if (machine_is_sheeva_esata())
+ if (machine_is_esata_sheevaplug())
kirkwood_sata_init(&sheeva_esata_sata_data);
/* enable sd wp and sd cd on plugs with esata */
- if (machine_is_sheeva_esata())
+ if (machine_is_esata_sheevaplug())
kirkwood_sdio_init(&sheeva_esata_mvsdio_data);
else
kirkwood_sdio_init(&sheevaplug_mvsdio_data);
diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
index 62c156b..5d64087 100644
--- a/arch/arm/mach-orion5x/ts209-setup.c
+++ b/arch/arm/mach-orion5x/ts209-setup.c
@@ -178,7 +178,7 @@ static struct hw_pci qnap_ts209_pci __initdata = {
static int __init qnap_ts209_pci_init(void)
{
- if (machine_is_ts_x09())
+ if (machine_is_ts209())
pci_common_init(&qnap_ts209_pci);
return 0;
diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
index 459d114..7f9809a 100644
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
@@ -269,6 +269,7 @@ dns323 MACH_DNS323 DNS323 1542
omap3_beagle MACH_OMAP3_BEAGLE OMAP3_BEAGLE 1546
nokia_n810 MACH_NOKIA_N810 NOKIA_N810 1548
pcm038 MACH_PCM038 PCM038 1551
+ts209 MACH_TS209 TS209 1565
at91cap9adk MACH_AT91CAP9ADK AT91CAP9ADK 1566
mx31moboard MACH_MX31MOBOARD MX31MOBOARD 1574
vision_ep9307 MACH_VISION_EP9307 VISION_EP9307 1578
@@ -457,6 +458,7 @@ guruplug MACH_GURUPLUG GURUPLUG 2659
spear310 MACH_SPEAR310 SPEAR310 2660
spear320 MACH_SPEAR320 SPEAR320 2661
aquila MACH_AQUILA AQUILA 2676
+esata_sheevaplug MACH_ESATA_SHEEVAPLUG ESATA_SHEEVAPLUG 2678
msm7x30_surf MACH_MSM7X30_SURF MSM7X30_SURF 2679
ea2478devkit MACH_EA2478DEVKIT EA2478DEVKIT 2683
terastation_wxl MACH_TERASTATION_WXL TERASTATION_WXL 2697
--
1.7.2.5
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [RFC][PATCH] ARM: kirkwood: Remove eSATA SheevaPlug board support
@ 2011-12-03 11:39 ` Tixy
0 siblings, 0 replies; 15+ messages in thread
From: Tixy @ 2011-12-03 11:39 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, 2011-12-01 at 19:04 +0800, Axel Lin wrote:
> commit bb9b25f923 "ARM: Update mach-types" removes sheeva_esata entry
> from mach-types, so current code in arch/arm/mach-kirkwood/sheevaplug-setup.c
> always compile fail.
>
> This patch removes sheeva_esata related code.
As I use this device I would rather not see support for it dropped.
After doing some digging in the mail archives I believe the eSata
SheevaPlug entry has been deleted due to the machine_is_xxx() name not
matching the CONFIG_XXX name. A fix for this was proposed a while back
by Nicolas Pitre: http://www.spinics.net/lists/arm-kernel/msg140555.html
Is it now too late to fix this now?
Below is a respin of Nicolas's original patch based on yesterdays
linux-next...
8<---------------------------------------------------------------------->8
[PATCH] Fix machine_is_xxx() naming for eSata SheevaPlug and QNAP TS-209
The eSata SheevaPlug and QNAP TS-209 devices were removed from
mach-types due to naming mismatches between machine_is_xxx(), CONFIG_XXX
and MACH_TYPE_XXX.
This patch fixes those mismatches and adds the devices back into
mach-types.
Cc: Nicolas Pitre <nico@fluxnic.net>
Cc: Lennert Buytenhek <kernel@wantstofly.org>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
---
arch/arm/mach-kirkwood/sheevaplug-setup.c | 6 +++---
arch/arm/mach-orion5x/ts209-setup.c | 2 +-
arch/arm/tools/mach-types | 2 ++
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
index 85bff6b..4ea70e5 100644
--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c
@@ -107,7 +107,7 @@ static void __init sheevaplug_init(void)
kirkwood_init();
/* setup gpio pin select */
- if (machine_is_sheeva_esata())
+ if (machine_is_esata_sheevaplug())
kirkwood_mpp_conf(sheeva_esata_mpp_config);
else
kirkwood_mpp_conf(sheevaplug_mpp_config);
@@ -123,11 +123,11 @@ static void __init sheevaplug_init(void)
kirkwood_ge00_init(&sheevaplug_ge00_data);
/* honor lower power consumption for plugs with out eSATA */
- if (machine_is_sheeva_esata())
+ if (machine_is_esata_sheevaplug())
kirkwood_sata_init(&sheeva_esata_sata_data);
/* enable sd wp and sd cd on plugs with esata */
- if (machine_is_sheeva_esata())
+ if (machine_is_esata_sheevaplug())
kirkwood_sdio_init(&sheeva_esata_mvsdio_data);
else
kirkwood_sdio_init(&sheevaplug_mvsdio_data);
diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
index 62c156b..5d64087 100644
--- a/arch/arm/mach-orion5x/ts209-setup.c
+++ b/arch/arm/mach-orion5x/ts209-setup.c
@@ -178,7 +178,7 @@ static struct hw_pci qnap_ts209_pci __initdata = {
static int __init qnap_ts209_pci_init(void)
{
- if (machine_is_ts_x09())
+ if (machine_is_ts209())
pci_common_init(&qnap_ts209_pci);
return 0;
diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
index 459d114..7f9809a 100644
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
@@ -269,6 +269,7 @@ dns323 MACH_DNS323 DNS323 1542
omap3_beagle MACH_OMAP3_BEAGLE OMAP3_BEAGLE 1546
nokia_n810 MACH_NOKIA_N810 NOKIA_N810 1548
pcm038 MACH_PCM038 PCM038 1551
+ts209 MACH_TS209 TS209 1565
at91cap9adk MACH_AT91CAP9ADK AT91CAP9ADK 1566
mx31moboard MACH_MX31MOBOARD MX31MOBOARD 1574
vision_ep9307 MACH_VISION_EP9307 VISION_EP9307 1578
@@ -457,6 +458,7 @@ guruplug MACH_GURUPLUG GURUPLUG 2659
spear310 MACH_SPEAR310 SPEAR310 2660
spear320 MACH_SPEAR320 SPEAR320 2661
aquila MACH_AQUILA AQUILA 2676
+esata_sheevaplug MACH_ESATA_SHEEVAPLUG ESATA_SHEEVAPLUG 2678
msm7x30_surf MACH_MSM7X30_SURF MSM7X30_SURF 2679
ea2478devkit MACH_EA2478DEVKIT EA2478DEVKIT 2683
terastation_wxl MACH_TERASTATION_WXL TERASTATION_WXL 2697
--
1.7.2.5
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [RFC][PATCH] ARM: kirkwood: Remove eSATA SheevaPlug board support
2011-12-03 11:39 ` Tixy
@ 2011-12-03 18:00 ` Nicolas Pitre
-1 siblings, 0 replies; 15+ messages in thread
From: Nicolas Pitre @ 2011-12-03 18:00 UTC (permalink / raw)
To: Tixy
Cc: Axel Lin, linux-kernel, John Holland, Russell King,
Lennert Buytenhek, linux-arm-kernel
On Sat, 3 Dec 2011, Tixy wrote:
> On Thu, 2011-12-01 at 19:04 +0800, Axel Lin wrote:
> > commit bb9b25f923 "ARM: Update mach-types" removes sheeva_esata entry
> > from mach-types, so current code in arch/arm/mach-kirkwood/sheevaplug-setup.c
> > always compile fail.
> >
> > This patch removes sheeva_esata related code.
>
> As I use this device I would rather not see support for it dropped.
Sorry to catch up late.
I really don't see why this support has to be dropped. The removal of
the eSata SheevaPlug entry from the machine registry was a mistake and
that's where a fix should be directed to.
> After doing some digging in the mail archives I believe the eSata
> SheevaPlug entry has been deleted due to the machine_is_xxx() name not
> matching the CONFIG_XXX name. A fix for this was proposed a while back
> by Nicolas Pitre: http://www.spinics.net/lists/arm-kernel/msg140555.html
>
> Is it now too late to fix this now?
It is never too late to fix mistakes.
> Below is a respin of Nicolas's original patch based on yesterdays
> linux-next...
>
> 8<---------------------------------------------------------------------->8
>
> [PATCH] Fix machine_is_xxx() naming for eSata SheevaPlug and QNAP TS-209
>
> The eSata SheevaPlug and QNAP TS-209 devices were removed from
> mach-types due to naming mismatches between machine_is_xxx(), CONFIG_XXX
> and MACH_TYPE_XXX.
>
> This patch fixes those mismatches and adds the devices back into
> mach-types.
>
> Cc: Nicolas Pitre <nico@fluxnic.net>
> Cc: Lennert Buytenhek <kernel@wantstofly.org>
> Cc: Russell King <linux@arm.linux.org.uk>
> Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nico@linaro.org>
Obviously, the change to mach-types should be done in the machine
registry database as well by RMK.
> ---
> arch/arm/mach-kirkwood/sheevaplug-setup.c | 6 +++---
> arch/arm/mach-orion5x/ts209-setup.c | 2 +-
> arch/arm/tools/mach-types | 2 ++
> 3 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
> index 85bff6b..4ea70e5 100644
> --- a/arch/arm/mach-kirkwood/sheevaplug-setup.c
> +++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c
> @@ -107,7 +107,7 @@ static void __init sheevaplug_init(void)
> kirkwood_init();
>
> /* setup gpio pin select */
> - if (machine_is_sheeva_esata())
> + if (machine_is_esata_sheevaplug())
> kirkwood_mpp_conf(sheeva_esata_mpp_config);
> else
> kirkwood_mpp_conf(sheevaplug_mpp_config);
> @@ -123,11 +123,11 @@ static void __init sheevaplug_init(void)
> kirkwood_ge00_init(&sheevaplug_ge00_data);
>
> /* honor lower power consumption for plugs with out eSATA */
> - if (machine_is_sheeva_esata())
> + if (machine_is_esata_sheevaplug())
> kirkwood_sata_init(&sheeva_esata_sata_data);
>
> /* enable sd wp and sd cd on plugs with esata */
> - if (machine_is_sheeva_esata())
> + if (machine_is_esata_sheevaplug())
> kirkwood_sdio_init(&sheeva_esata_mvsdio_data);
> else
> kirkwood_sdio_init(&sheevaplug_mvsdio_data);
> diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
> index 62c156b..5d64087 100644
> --- a/arch/arm/mach-orion5x/ts209-setup.c
> +++ b/arch/arm/mach-orion5x/ts209-setup.c
> @@ -178,7 +178,7 @@ static struct hw_pci qnap_ts209_pci __initdata = {
>
> static int __init qnap_ts209_pci_init(void)
> {
> - if (machine_is_ts_x09())
> + if (machine_is_ts209())
> pci_common_init(&qnap_ts209_pci);
>
> return 0;
> diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
> index 459d114..7f9809a 100644
> --- a/arch/arm/tools/mach-types
> +++ b/arch/arm/tools/mach-types
> @@ -269,6 +269,7 @@ dns323 MACH_DNS323 DNS323 1542
> omap3_beagle MACH_OMAP3_BEAGLE OMAP3_BEAGLE 1546
> nokia_n810 MACH_NOKIA_N810 NOKIA_N810 1548
> pcm038 MACH_PCM038 PCM038 1551
> +ts209 MACH_TS209 TS209 1565
> at91cap9adk MACH_AT91CAP9ADK AT91CAP9ADK 1566
> mx31moboard MACH_MX31MOBOARD MX31MOBOARD 1574
> vision_ep9307 MACH_VISION_EP9307 VISION_EP9307 1578
> @@ -457,6 +458,7 @@ guruplug MACH_GURUPLUG GURUPLUG 2659
> spear310 MACH_SPEAR310 SPEAR310 2660
> spear320 MACH_SPEAR320 SPEAR320 2661
> aquila MACH_AQUILA AQUILA 2676
> +esata_sheevaplug MACH_ESATA_SHEEVAPLUG ESATA_SHEEVAPLUG 2678
> msm7x30_surf MACH_MSM7X30_SURF MSM7X30_SURF 2679
> ea2478devkit MACH_EA2478DEVKIT EA2478DEVKIT 2683
> terastation_wxl MACH_TERASTATION_WXL TERASTATION_WXL 2697
> --
> 1.7.2.5
>
>
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [RFC][PATCH] ARM: kirkwood: Remove eSATA SheevaPlug board support
@ 2011-12-03 18:00 ` Nicolas Pitre
0 siblings, 0 replies; 15+ messages in thread
From: Nicolas Pitre @ 2011-12-03 18:00 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, 3 Dec 2011, Tixy wrote:
> On Thu, 2011-12-01 at 19:04 +0800, Axel Lin wrote:
> > commit bb9b25f923 "ARM: Update mach-types" removes sheeva_esata entry
> > from mach-types, so current code in arch/arm/mach-kirkwood/sheevaplug-setup.c
> > always compile fail.
> >
> > This patch removes sheeva_esata related code.
>
> As I use this device I would rather not see support for it dropped.
Sorry to catch up late.
I really don't see why this support has to be dropped. The removal of
the eSata SheevaPlug entry from the machine registry was a mistake and
that's where a fix should be directed to.
> After doing some digging in the mail archives I believe the eSata
> SheevaPlug entry has been deleted due to the machine_is_xxx() name not
> matching the CONFIG_XXX name. A fix for this was proposed a while back
> by Nicolas Pitre: http://www.spinics.net/lists/arm-kernel/msg140555.html
>
> Is it now too late to fix this now?
It is never too late to fix mistakes.
> Below is a respin of Nicolas's original patch based on yesterdays
> linux-next...
>
> 8<---------------------------------------------------------------------->8
>
> [PATCH] Fix machine_is_xxx() naming for eSata SheevaPlug and QNAP TS-209
>
> The eSata SheevaPlug and QNAP TS-209 devices were removed from
> mach-types due to naming mismatches between machine_is_xxx(), CONFIG_XXX
> and MACH_TYPE_XXX.
>
> This patch fixes those mismatches and adds the devices back into
> mach-types.
>
> Cc: Nicolas Pitre <nico@fluxnic.net>
> Cc: Lennert Buytenhek <kernel@wantstofly.org>
> Cc: Russell King <linux@arm.linux.org.uk>
> Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nico@linaro.org>
Obviously, the change to mach-types should be done in the machine
registry database as well by RMK.
> ---
> arch/arm/mach-kirkwood/sheevaplug-setup.c | 6 +++---
> arch/arm/mach-orion5x/ts209-setup.c | 2 +-
> arch/arm/tools/mach-types | 2 ++
> 3 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
> index 85bff6b..4ea70e5 100644
> --- a/arch/arm/mach-kirkwood/sheevaplug-setup.c
> +++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c
> @@ -107,7 +107,7 @@ static void __init sheevaplug_init(void)
> kirkwood_init();
>
> /* setup gpio pin select */
> - if (machine_is_sheeva_esata())
> + if (machine_is_esata_sheevaplug())
> kirkwood_mpp_conf(sheeva_esata_mpp_config);
> else
> kirkwood_mpp_conf(sheevaplug_mpp_config);
> @@ -123,11 +123,11 @@ static void __init sheevaplug_init(void)
> kirkwood_ge00_init(&sheevaplug_ge00_data);
>
> /* honor lower power consumption for plugs with out eSATA */
> - if (machine_is_sheeva_esata())
> + if (machine_is_esata_sheevaplug())
> kirkwood_sata_init(&sheeva_esata_sata_data);
>
> /* enable sd wp and sd cd on plugs with esata */
> - if (machine_is_sheeva_esata())
> + if (machine_is_esata_sheevaplug())
> kirkwood_sdio_init(&sheeva_esata_mvsdio_data);
> else
> kirkwood_sdio_init(&sheevaplug_mvsdio_data);
> diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
> index 62c156b..5d64087 100644
> --- a/arch/arm/mach-orion5x/ts209-setup.c
> +++ b/arch/arm/mach-orion5x/ts209-setup.c
> @@ -178,7 +178,7 @@ static struct hw_pci qnap_ts209_pci __initdata = {
>
> static int __init qnap_ts209_pci_init(void)
> {
> - if (machine_is_ts_x09())
> + if (machine_is_ts209())
> pci_common_init(&qnap_ts209_pci);
>
> return 0;
> diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
> index 459d114..7f9809a 100644
> --- a/arch/arm/tools/mach-types
> +++ b/arch/arm/tools/mach-types
> @@ -269,6 +269,7 @@ dns323 MACH_DNS323 DNS323 1542
> omap3_beagle MACH_OMAP3_BEAGLE OMAP3_BEAGLE 1546
> nokia_n810 MACH_NOKIA_N810 NOKIA_N810 1548
> pcm038 MACH_PCM038 PCM038 1551
> +ts209 MACH_TS209 TS209 1565
> at91cap9adk MACH_AT91CAP9ADK AT91CAP9ADK 1566
> mx31moboard MACH_MX31MOBOARD MX31MOBOARD 1574
> vision_ep9307 MACH_VISION_EP9307 VISION_EP9307 1578
> @@ -457,6 +458,7 @@ guruplug MACH_GURUPLUG GURUPLUG 2659
> spear310 MACH_SPEAR310 SPEAR310 2660
> spear320 MACH_SPEAR320 SPEAR320 2661
> aquila MACH_AQUILA AQUILA 2676
> +esata_sheevaplug MACH_ESATA_SHEEVAPLUG ESATA_SHEEVAPLUG 2678
> msm7x30_surf MACH_MSM7X30_SURF MSM7X30_SURF 2679
> ea2478devkit MACH_EA2478DEVKIT EA2478DEVKIT 2683
> terastation_wxl MACH_TERASTATION_WXL TERASTATION_WXL 2697
> --
> 1.7.2.5
>
>
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [RFC][PATCH] ARM: kirkwood: Remove eSATA SheevaPlug board support
2011-12-03 18:00 ` Nicolas Pitre
@ 2011-12-06 7:07 ` Tixy
-1 siblings, 0 replies; 15+ messages in thread
From: Tixy @ 2011-12-06 7:07 UTC (permalink / raw)
To: Nicolas Pitre
Cc: Axel Lin, linux-kernel, John Holland, Russell King,
Lennert Buytenhek, linux-arm-kernel
On Sat, 2011-12-03 at 13:00 -0500, Nicolas Pitre wrote:
> On Sat, 3 Dec 2011, Tixy wrote:
> > [PATCH] Fix machine_is_xxx() naming for eSata SheevaPlug and QNAP TS-209
> >
> > The eSata SheevaPlug and QNAP TS-209 devices were removed from
> > mach-types due to naming mismatches between machine_is_xxx(), CONFIG_XXX
> > and MACH_TYPE_XXX.
> >
> > This patch fixes those mismatches and adds the devices back into
> > mach-types.
> >
> > Cc: Nicolas Pitre <nico@fluxnic.net>
> > Cc: Lennert Buytenhek <kernel@wantstofly.org>
> > Cc: Russell King <linux@arm.linux.org.uk>
> > Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
>
> Acked-by: Nicolas Pitre <nico@linaro.org>
>
> Obviously, the change to mach-types should be done in the machine
> registry database as well by RMK.
Which tree should this go through? Russell's or arm-soc?
--
Tixy
> > ---
> > arch/arm/mach-kirkwood/sheevaplug-setup.c | 6 +++---
> > arch/arm/mach-orion5x/ts209-setup.c | 2 +-
> > arch/arm/tools/mach-types | 2 ++
> > 3 files changed, 6 insertions(+), 4 deletions(-)
> >
> > diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
> > index 85bff6b..4ea70e5 100644
> > --- a/arch/arm/mach-kirkwood/sheevaplug-setup.c
> > +++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c
> > @@ -107,7 +107,7 @@ static void __init sheevaplug_init(void)
> > kirkwood_init();
> >
> > /* setup gpio pin select */
> > - if (machine_is_sheeva_esata())
> > + if (machine_is_esata_sheevaplug())
> > kirkwood_mpp_conf(sheeva_esata_mpp_config);
> > else
> > kirkwood_mpp_conf(sheevaplug_mpp_config);
> > @@ -123,11 +123,11 @@ static void __init sheevaplug_init(void)
> > kirkwood_ge00_init(&sheevaplug_ge00_data);
> >
> > /* honor lower power consumption for plugs with out eSATA */
> > - if (machine_is_sheeva_esata())
> > + if (machine_is_esata_sheevaplug())
> > kirkwood_sata_init(&sheeva_esata_sata_data);
> >
> > /* enable sd wp and sd cd on plugs with esata */
> > - if (machine_is_sheeva_esata())
> > + if (machine_is_esata_sheevaplug())
> > kirkwood_sdio_init(&sheeva_esata_mvsdio_data);
> > else
> > kirkwood_sdio_init(&sheevaplug_mvsdio_data);
> > diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
> > index 62c156b..5d64087 100644
> > --- a/arch/arm/mach-orion5x/ts209-setup.c
> > +++ b/arch/arm/mach-orion5x/ts209-setup.c
> > @@ -178,7 +178,7 @@ static struct hw_pci qnap_ts209_pci __initdata = {
> >
> > static int __init qnap_ts209_pci_init(void)
> > {
> > - if (machine_is_ts_x09())
> > + if (machine_is_ts209())
> > pci_common_init(&qnap_ts209_pci);
> >
> > return 0;
> > diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
> > index 459d114..7f9809a 100644
> > --- a/arch/arm/tools/mach-types
> > +++ b/arch/arm/tools/mach-types
> > @@ -269,6 +269,7 @@ dns323 MACH_DNS323 DNS323 1542
> > omap3_beagle MACH_OMAP3_BEAGLE OMAP3_BEAGLE 1546
> > nokia_n810 MACH_NOKIA_N810 NOKIA_N810 1548
> > pcm038 MACH_PCM038 PCM038 1551
> > +ts209 MACH_TS209 TS209 1565
> > at91cap9adk MACH_AT91CAP9ADK AT91CAP9ADK 1566
> > mx31moboard MACH_MX31MOBOARD MX31MOBOARD 1574
> > vision_ep9307 MACH_VISION_EP9307 VISION_EP9307 1578
> > @@ -457,6 +458,7 @@ guruplug MACH_GURUPLUG GURUPLUG 2659
> > spear310 MACH_SPEAR310 SPEAR310 2660
> > spear320 MACH_SPEAR320 SPEAR320 2661
> > aquila MACH_AQUILA AQUILA 2676
> > +esata_sheevaplug MACH_ESATA_SHEEVAPLUG ESATA_SHEEVAPLUG 2678
> > msm7x30_surf MACH_MSM7X30_SURF MSM7X30_SURF 2679
> > ea2478devkit MACH_EA2478DEVKIT EA2478DEVKIT 2683
> > terastation_wxl MACH_TERASTATION_WXL TERASTATION_WXL 2697
> > --
> > 1.7.2.5
> >
> >
> >
^ permalink raw reply [flat|nested] 15+ messages in thread
* [RFC][PATCH] ARM: kirkwood: Remove eSATA SheevaPlug board support
@ 2011-12-06 7:07 ` Tixy
0 siblings, 0 replies; 15+ messages in thread
From: Tixy @ 2011-12-06 7:07 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, 2011-12-03 at 13:00 -0500, Nicolas Pitre wrote:
> On Sat, 3 Dec 2011, Tixy wrote:
> > [PATCH] Fix machine_is_xxx() naming for eSata SheevaPlug and QNAP TS-209
> >
> > The eSata SheevaPlug and QNAP TS-209 devices were removed from
> > mach-types due to naming mismatches between machine_is_xxx(), CONFIG_XXX
> > and MACH_TYPE_XXX.
> >
> > This patch fixes those mismatches and adds the devices back into
> > mach-types.
> >
> > Cc: Nicolas Pitre <nico@fluxnic.net>
> > Cc: Lennert Buytenhek <kernel@wantstofly.org>
> > Cc: Russell King <linux@arm.linux.org.uk>
> > Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
>
> Acked-by: Nicolas Pitre <nico@linaro.org>
>
> Obviously, the change to mach-types should be done in the machine
> registry database as well by RMK.
Which tree should this go through? Russell's or arm-soc?
--
Tixy
> > ---
> > arch/arm/mach-kirkwood/sheevaplug-setup.c | 6 +++---
> > arch/arm/mach-orion5x/ts209-setup.c | 2 +-
> > arch/arm/tools/mach-types | 2 ++
> > 3 files changed, 6 insertions(+), 4 deletions(-)
> >
> > diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
> > index 85bff6b..4ea70e5 100644
> > --- a/arch/arm/mach-kirkwood/sheevaplug-setup.c
> > +++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c
> > @@ -107,7 +107,7 @@ static void __init sheevaplug_init(void)
> > kirkwood_init();
> >
> > /* setup gpio pin select */
> > - if (machine_is_sheeva_esata())
> > + if (machine_is_esata_sheevaplug())
> > kirkwood_mpp_conf(sheeva_esata_mpp_config);
> > else
> > kirkwood_mpp_conf(sheevaplug_mpp_config);
> > @@ -123,11 +123,11 @@ static void __init sheevaplug_init(void)
> > kirkwood_ge00_init(&sheevaplug_ge00_data);
> >
> > /* honor lower power consumption for plugs with out eSATA */
> > - if (machine_is_sheeva_esata())
> > + if (machine_is_esata_sheevaplug())
> > kirkwood_sata_init(&sheeva_esata_sata_data);
> >
> > /* enable sd wp and sd cd on plugs with esata */
> > - if (machine_is_sheeva_esata())
> > + if (machine_is_esata_sheevaplug())
> > kirkwood_sdio_init(&sheeva_esata_mvsdio_data);
> > else
> > kirkwood_sdio_init(&sheevaplug_mvsdio_data);
> > diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
> > index 62c156b..5d64087 100644
> > --- a/arch/arm/mach-orion5x/ts209-setup.c
> > +++ b/arch/arm/mach-orion5x/ts209-setup.c
> > @@ -178,7 +178,7 @@ static struct hw_pci qnap_ts209_pci __initdata = {
> >
> > static int __init qnap_ts209_pci_init(void)
> > {
> > - if (machine_is_ts_x09())
> > + if (machine_is_ts209())
> > pci_common_init(&qnap_ts209_pci);
> >
> > return 0;
> > diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
> > index 459d114..7f9809a 100644
> > --- a/arch/arm/tools/mach-types
> > +++ b/arch/arm/tools/mach-types
> > @@ -269,6 +269,7 @@ dns323 MACH_DNS323 DNS323 1542
> > omap3_beagle MACH_OMAP3_BEAGLE OMAP3_BEAGLE 1546
> > nokia_n810 MACH_NOKIA_N810 NOKIA_N810 1548
> > pcm038 MACH_PCM038 PCM038 1551
> > +ts209 MACH_TS209 TS209 1565
> > at91cap9adk MACH_AT91CAP9ADK AT91CAP9ADK 1566
> > mx31moboard MACH_MX31MOBOARD MX31MOBOARD 1574
> > vision_ep9307 MACH_VISION_EP9307 VISION_EP9307 1578
> > @@ -457,6 +458,7 @@ guruplug MACH_GURUPLUG GURUPLUG 2659
> > spear310 MACH_SPEAR310 SPEAR310 2660
> > spear320 MACH_SPEAR320 SPEAR320 2661
> > aquila MACH_AQUILA AQUILA 2676
> > +esata_sheevaplug MACH_ESATA_SHEEVAPLUG ESATA_SHEEVAPLUG 2678
> > msm7x30_surf MACH_MSM7X30_SURF MSM7X30_SURF 2679
> > ea2478devkit MACH_EA2478DEVKIT EA2478DEVKIT 2683
> > terastation_wxl MACH_TERASTATION_WXL TERASTATION_WXL 2697
> > --
> > 1.7.2.5
> >
> >
> >
^ permalink raw reply [flat|nested] 15+ messages in thread
* Patch 7193/1: Fix machine_is_xxx() naming for eSata SheevaPlug and QNAP TS-209
2011-12-03 18:00 ` Nicolas Pitre
(?)
(?)
@ 2011-12-06 9:52 ` Tixy
-1 siblings, 0 replies; 15+ messages in thread
From: Tixy @ 2011-12-06 9:52 UTC (permalink / raw)
To: linux-arm-kernel
Hi Russell
I have submitted the patch below to your patch system, this adds two
boards back into mach-types, together with fixing the reasons I believe
they were removed. The mach-types file has a header which says "Please
do not send patches to this file; it is automatically generated!" so I'm
not sure if I should have included mach-file in the patch. Either way, I
believe the master list of mach types also needs updating.
Please advice if I should have done things differently.
Thanks
--
Tixy
----------------------------------------------------------------
Fix machine_is_xxx() naming for eSata SheevaPlug and QNAP TS-209
The eSata SheevaPlug and QNAP TS-209 devices were removed from
mach-types due to naming mismatches between machine_is_xxx(), CONFIG_XXX
and MACH_TYPE_XXX.
This patch fixes those mismatches and adds the devices back into
mach-types.
Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
---
arch/arm/mach-kirkwood/sheevaplug-setup.c | 6 +++---
arch/arm/mach-orion5x/ts209-setup.c | 2 +-
arch/arm/tools/mach-types | 2 ++
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
index 85bff6b..4ea70e5 100644
--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c
@@ -107,7 +107,7 @@ static void __init sheevaplug_init(void)
kirkwood_init();
/* setup gpio pin select */
- if (machine_is_sheeva_esata())
+ if (machine_is_esata_sheevaplug())
kirkwood_mpp_conf(sheeva_esata_mpp_config);
else
kirkwood_mpp_conf(sheevaplug_mpp_config);
@@ -123,11 +123,11 @@ static void __init sheevaplug_init(void)
kirkwood_ge00_init(&sheevaplug_ge00_data);
/* honor lower power consumption for plugs with out eSATA */
- if (machine_is_sheeva_esata())
+ if (machine_is_esata_sheevaplug())
kirkwood_sata_init(&sheeva_esata_sata_data);
/* enable sd wp and sd cd on plugs with esata */
- if (machine_is_sheeva_esata())
+ if (machine_is_esata_sheevaplug())
kirkwood_sdio_init(&sheeva_esata_mvsdio_data);
else
kirkwood_sdio_init(&sheevaplug_mvsdio_data);
diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
index 62c156b..5d64087 100644
--- a/arch/arm/mach-orion5x/ts209-setup.c
+++ b/arch/arm/mach-orion5x/ts209-setup.c
@@ -178,7 +178,7 @@ static struct hw_pci qnap_ts209_pci __initdata = {
static int __init qnap_ts209_pci_init(void)
{
- if (machine_is_ts_x09())
+ if (machine_is_ts209())
pci_common_init(&qnap_ts209_pci);
return 0;
diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
index 459d114..7f9809a 100644
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
@@ -269,6 +269,7 @@ dns323 MACH_DNS323 DNS323 1542
omap3_beagle MACH_OMAP3_BEAGLE OMAP3_BEAGLE 1546
nokia_n810 MACH_NOKIA_N810 NOKIA_N810 1548
pcm038 MACH_PCM038 PCM038 1551
+ts209 MACH_TS209 TS209 1565
at91cap9adk MACH_AT91CAP9ADK AT91CAP9ADK 1566
mx31moboard MACH_MX31MOBOARD MX31MOBOARD 1574
vision_ep9307 MACH_VISION_EP9307 VISION_EP9307 1578
@@ -457,6 +458,7 @@ guruplug MACH_GURUPLUG GURUPLUG 2659
spear310 MACH_SPEAR310 SPEAR310 2660
spear320 MACH_SPEAR320 SPEAR320 2661
aquila MACH_AQUILA AQUILA 2676
+esata_sheevaplug MACH_ESATA_SHEEVAPLUG ESATA_SHEEVAPLUG 2678
msm7x30_surf MACH_MSM7X30_SURF MSM7X30_SURF 2679
ea2478devkit MACH_EA2478DEVKIT EA2478DEVKIT 2683
terastation_wxl MACH_TERASTATION_WXL TERASTATION_WXL 2697
--
1.7.2.5
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [RFC][PATCH] ARM: kirkwood: Remove eSATA SheevaPlug board support
2011-12-06 7:07 ` Tixy
@ 2011-12-06 19:45 ` Nicolas Pitre
-1 siblings, 0 replies; 15+ messages in thread
From: Nicolas Pitre @ 2011-12-06 19:45 UTC (permalink / raw)
To: Tixy
Cc: Axel Lin, linux-kernel, John Holland, Russell King,
Lennert Buytenhek, linux-arm-kernel
On Tue, 6 Dec 2011, Tixy wrote:
> On Sat, 2011-12-03 at 13:00 -0500, Nicolas Pitre wrote:
> > On Sat, 3 Dec 2011, Tixy wrote:
> > > [PATCH] Fix machine_is_xxx() naming for eSata SheevaPlug and QNAP TS-209
> > >
> > > The eSata SheevaPlug and QNAP TS-209 devices were removed from
> > > mach-types due to naming mismatches between machine_is_xxx(), CONFIG_XXX
> > > and MACH_TYPE_XXX.
> > >
> > > This patch fixes those mismatches and adds the devices back into
> > > mach-types.
> > >
> > > Cc: Nicolas Pitre <nico@fluxnic.net>
> > > Cc: Lennert Buytenhek <kernel@wantstofly.org>
> > > Cc: Russell King <linux@arm.linux.org.uk>
> > > Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
> >
> > Acked-by: Nicolas Pitre <nico@linaro.org>
> >
> > Obviously, the change to mach-types should be done in the machine
> > registry database as well by RMK.
>
> Which tree should this go through? Russell's or arm-soc?
The arm-soc tree is probably more appropriate. Don't include the
mach-types changes though as it is preferable if they come through RMK's
database updates.
Nicolas
^ permalink raw reply [flat|nested] 15+ messages in thread
* [RFC][PATCH] ARM: kirkwood: Remove eSATA SheevaPlug board support
@ 2011-12-06 19:45 ` Nicolas Pitre
0 siblings, 0 replies; 15+ messages in thread
From: Nicolas Pitre @ 2011-12-06 19:45 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, 6 Dec 2011, Tixy wrote:
> On Sat, 2011-12-03 at 13:00 -0500, Nicolas Pitre wrote:
> > On Sat, 3 Dec 2011, Tixy wrote:
> > > [PATCH] Fix machine_is_xxx() naming for eSata SheevaPlug and QNAP TS-209
> > >
> > > The eSata SheevaPlug and QNAP TS-209 devices were removed from
> > > mach-types due to naming mismatches between machine_is_xxx(), CONFIG_XXX
> > > and MACH_TYPE_XXX.
> > >
> > > This patch fixes those mismatches and adds the devices back into
> > > mach-types.
> > >
> > > Cc: Nicolas Pitre <nico@fluxnic.net>
> > > Cc: Lennert Buytenhek <kernel@wantstofly.org>
> > > Cc: Russell King <linux@arm.linux.org.uk>
> > > Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
> >
> > Acked-by: Nicolas Pitre <nico@linaro.org>
> >
> > Obviously, the change to mach-types should be done in the machine
> > registry database as well by RMK.
>
> Which tree should this go through? Russell's or arm-soc?
The arm-soc tree is probably more appropriate. Don't include the
mach-types changes though as it is preferable if they come through RMK's
database updates.
Nicolas
^ permalink raw reply [flat|nested] 15+ messages in thread
* [RFC][PATCH] ARM: kirkwood: Remove eSATA SheevaPlug board support
2011-12-06 19:45 ` Nicolas Pitre
(?)
@ 2011-12-06 20:22 ` Tixy
2011-12-06 21:18 ` Russell King - ARM Linux
-1 siblings, 1 reply; 15+ messages in thread
From: Tixy @ 2011-12-06 20:22 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, 2011-12-06 at 14:45 -0500, Nicolas Pitre wrote:
> On Tue, 6 Dec 2011, Tixy wrote:
>
> > On Sat, 2011-12-03 at 13:00 -0500, Nicolas Pitre wrote:
> > > On Sat, 3 Dec 2011, Tixy wrote:
> > > > [PATCH] Fix machine_is_xxx() naming for eSata SheevaPlug and QNAP TS-209
> > > >
> > > > The eSata SheevaPlug and QNAP TS-209 devices were removed from
> > > > mach-types due to naming mismatches between machine_is_xxx(), CONFIG_XXX
> > > > and MACH_TYPE_XXX.
> > > >
> > > > This patch fixes those mismatches and adds the devices back into
> > > > mach-types.
> > > >
> > > > Cc: Nicolas Pitre <nico@fluxnic.net>
> > > > Cc: Lennert Buytenhek <kernel@wantstofly.org>
> > > > Cc: Russell King <linux@arm.linux.org.uk>
> > > > Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
> > >
> > > Acked-by: Nicolas Pitre <nico@linaro.org>
> > >
> > > Obviously, the change to mach-types should be done in the machine
> > > registry database as well by RMK.
> >
> > Which tree should this go through? Russell's or arm-soc?
>
> The arm-soc tree is probably more appropriate. Don't include the
> mach-types changes though as it is preferable if they come through RMK's
> database updates.
It's already gone through Russell's tree.
I realised that a mach-types patch couldn't go into arm-soc as that
doesn't have the removed machine entries, and the only other changes in
linux-next for the sheevaplug and ts209 files were from Russell's tree
anyway. And finally, I thought that Russel's mach-types generation
script would want to see the fixed files in his tree, otherwise it would
want to delete the machine entries.
--
Tixy
^ permalink raw reply [flat|nested] 15+ messages in thread
* [RFC][PATCH] ARM: kirkwood: Remove eSATA SheevaPlug board support
2011-12-06 20:22 ` Tixy
@ 2011-12-06 21:18 ` Russell King - ARM Linux
0 siblings, 0 replies; 15+ messages in thread
From: Russell King - ARM Linux @ 2011-12-06 21:18 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Dec 06, 2011 at 08:22:47PM +0000, Tixy wrote:
> On Tue, 2011-12-06 at 14:45 -0500, Nicolas Pitre wrote:
> > The arm-soc tree is probably more appropriate. Don't include the
> > mach-types changes though as it is preferable if they come through RMK's
> > database updates.
>
> It's already gone through Russell's tree.
>
> I realised that a mach-types patch couldn't go into arm-soc as that
> doesn't have the removed machine entries, and the only other changes in
> linux-next for the sheevaplug and ts209 files were from Russell's tree
> anyway. And finally, I thought that Russel's mach-types generation
> script would want to see the fixed files in his tree, otherwise it would
> want to delete the machine entries.
Let me take you through what I did to deal with this. You supplied me
a patch to go on top of current stuff. So, I selected the 'misc' branch
to apply it, which had the recent mach-types update as the last thing.
Then:
1. I applied your patch as-is and committed it. So the tree looked like:
Nov. mach-types update -> your patch
2. I shuffled your patch before the mach-types update, which caused
conficts which had to be fixed manually. So this resulted in:
your patch -> Nov. mach-types update
3. I resolved the entries in the machine database - by hand in SQL -
to fix up the entries how you want them.
4. I did another update to mach-types. At this point, the tree
looks like:
your patch -> Nov. mach-types update -> Dec. mach-types update
and, because I'd fixed the entries in the machine database, they
didn't get removed this time.
5. I combined the two mach-types update into a single December time
mach-types update. Finally, we have what is visible today:
your patch -> Dec. mach-types update
What we now have is a completely bisectable change with no commit which
fails to build for these platforms. Of course, as a result of the
juggling, your patch is no longer exactly what you sent on the list
(it's changing the entry in mach-types rather than adding it back) but
my sign-off on committing your change covers that - DCO condition (b).)
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2011-12-06 21:18 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-12-01 11:04 [RFC][PATCH] ARM: kirkwood: Remove eSATA SheevaPlug board support Axel Lin
2011-12-01 11:04 ` Axel Lin
2011-12-01 11:57 ` Holland, John
2011-12-01 11:57 ` Holland, John
2011-12-03 11:39 ` Tixy
2011-12-03 11:39 ` Tixy
2011-12-03 18:00 ` Nicolas Pitre
2011-12-03 18:00 ` Nicolas Pitre
2011-12-06 7:07 ` Tixy
2011-12-06 7:07 ` Tixy
2011-12-06 19:45 ` Nicolas Pitre
2011-12-06 19:45 ` Nicolas Pitre
2011-12-06 20:22 ` Tixy
2011-12-06 21:18 ` Russell King - ARM Linux
2011-12-06 9:52 ` Patch 7193/1: Fix machine_is_xxx() naming for eSata SheevaPlug and QNAP TS-209 Tixy
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.