Skip to contentSkip to conversation

ep93xx/micro9: Update platform code and maintainer

PATCH New Hubert Feurstein 4 participants 5 messages Sep 23, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ep93xx/micro9: Update platform code and maintainer

ARM: Update Contec Micro9 maintainer and add entry in MAINTAINERS
Update Contec Micro9 platform code and add Micro9-Slim support

---
 MAINTAINERS                                     |    5 +
 arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h |   11 ++
 arch/arm/mach-ep93xx/micro9.c                   |  132
+++++++++++++----------
 3 files changed, 93 insertions(+), 55 deletions(-)
MAINTAINERS +0 -0
index d24c882..4b95d20 100644
@@ -576,6 +576,11 @@ M:	Mike Rapoport <[email protected]>
 L:	linux-arm-kernel at lists.infradead.org (moderated for

non-subscribers)
S: Maintained

+ARM/CONTEC MICRO9 MACHINE SUPPORT
+M: Hubert Feurstein <[email protected]>
+S: Maintained
+F: arch/arm/mach-ep93xx/micro9.c
+
ARM/CORGI MACHINE SUPPORT
M: Richard Purdie <[email protected]>
S: Maintained

(quoted diff) +0 -0

b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h index ea78e90..d4f8367 100644

arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h +11 -0
@@ -212,6 +212,17 @@
 #define EP93XX_SYSCON_KEYTCHCLKDIV_ADIV	(1<<16)
 #define EP93XX_SYSCON_KEYTCHCLKDIV_KEN	(1<<15)
 #define EP93XX_SYSCON_KEYTCHCLKDIV_KDIV	(1<<0)
+#define EP93XX_SYSCON_SYSCFG		EP93XX_SYSCON_REG(0x9c)
+#define EP93XX_SYSCON_SYSCFG_REV_MASK	(0xf0000000)
+#define EP93XX_SYSCON_SYSCFG_REV_SHIFT	(28)
+#define EP93XX_SYSCON_SYSCFG_SBOOT	(1<<8)
+#define EP93XX_SYSCON_SYSCFG_LCSN7	(1<<7)
+#define EP93XX_SYSCON_SYSCFG_LCSN6	(1<<6)
+#define EP93XX_SYSCON_SYSCFG_LASDO	(1<<5)
+#define EP93XX_SYSCON_SYSCFG_LEEDA	(1<<4)
+#define EP93XX_SYSCON_SYSCFG_LEECLK	(1<<3)
+#define EP93XX_SYSCON_SYSCFG_LCSN2	(1<<1)
+#define EP93XX_SYSCON_SYSCFG_LCSN1	(1<<0)
 #define EP93XX_SYSCON_SWLOCK		EP93XX_SYSCON_REG(0xc0)
 
 #define EP93XX_WATCHDOG_BASE		EP93XX_APB_IOMEM(0x00140000)
(quoted diff) +0 -0

b/arch/arm/mach-ep93xx/micro9.c
index 0a313e8..d83b804 100644

arch/arm/mach-ep93xx/micro9.c +4 -19
@@ -2,7 +2,9 @@
  *  linux/arch/arm/mach-ep93xx/micro9.c
  *
  * Copyright (C) 2006 Contec Steuerungstechnik & Automation GmbH
- *                   Manfred Gruber <[email protected]>
+ *                    Manfred Gruber <[email protected]>
+ * Copyright (C) 2009 Contec Steuerungstechnik & Automation GmbH
+ *                    Hubert Feurstein <[email protected]>
  *
  * 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
@@ -20,104 +22,124 @@
 #include <asm/mach/arch.h>
 
 
-static struct ep93xx_eth_data micro9_eth_data = {
-	.phy_id		= 0x1f,
-};
-
-static void __init micro9_init(void)
-{
-	ep93xx_register_eth(&micro9_eth_data, 1);
-}
-
-/*
- * Micro9-H
- */
-#ifdef CONFIG_MACH_MICRO9H
-static struct physmap_flash_data micro9h_flash_data = {
-	.width		= 4,
-};
-
-static struct resource micro9h_flash_resource = {
+/**********************************************************************

***
+ * Micro9 NOR Flash
+ *
+ * Micro9-High has up to 64MB of 32-bit flash on CS1
+ * Micro9-Mid has up to 64MB of either 32-bit or 16-bit flash on CS1
+ * Micro9-Lite uses a seperate MTD map driver for flash support
+ * Micro9-Slim has up to 64MB of either 32-bit or 16-bit flash on CS1 +
************************************************************************
*/
+static struct physmap_flash_data micro9_flash_data;
+
+static struct resource micro9_flash_resource = {
.start = EP93XX_CS1_PHYS_BASE,
.end = EP93XX_CS1_PHYS_BASE + SZ_64M - 1,
.flags = IORESOURCE_MEM,
};

-static struct platform_device micro9h_flash = { +static struct platform_device micro9_flash = {
.name = "physmap-flash",
.id = 0,
.dev = {
- .platform_data = &micro9h_flash_data,
+ .platform_data = &micro9_flash_data,
},
.num_resources = 1,
- .resource = &micro9h_flash_resource,
+ .resource = &micro9_flash_resource,
};

-static void __init micro9h_init(void)
+static void __init __micro9_register_flash(unsigned int width) +{
+ micro9_flash_data.width = width;
+
+ platform_device_register(&micro9_flash);
+}
+
+static unsigned int __init micro9_detect_bootwidth(void) +{
+ u32 v;
+
+ /* Detect the bus width of the external flash memory */
+ v = __raw_readl(EP93XX_SYSCON_SYSCFG);
+ if (v & EP93XX_SYSCON_SYSCFG_LCSN7)
+ return 4; /* 32-bit */
+ else
+ return 2; /* 16-bit */
+}
+
+static void __init micro9_register_flash(void)
{
- platform_device_register(&micro9h_flash);
+ if (machine_is_micro9())
+ __micro9_register_flash(4);
+ else if (machine_is_micro9m() || machine_is_micro9s())
+ __micro9_register_flash(micro9_detect_bootwidth());
}

-static void __init micro9h_init_machine(void)
+ +/**********************************************************************
***
+ * Micro9 Ethernet
+
************************************************************************
*/
+static struct ep93xx_eth_data micro9_eth_data = {
+ .phy_id = 0x1f,
+};
+
+
+static void __init micro9_init_machine(void)
{
ep93xx_init_devices();
- micro9_init();
- micro9h_init();
+ ep93xx_register_eth(&micro9_eth_data, 1);
+ micro9_register_flash();
}

-MACHINE_START(MICRO9, "Contec Hypercontrol Micro9-H")
- /* Maintainer: Manfred Gruber <[email protected]> */
+
+#ifdef CONFIG_MACH_MICRO9H +MACHINE_START(MICRO9, "Contec Micro9-High")
+ /* Maintainer: Hubert Feurstein <[email protected]> */
.phys_io = EP93XX_APB_PHYS_BASE,
.io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
.boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100,
.map_io = ep93xx_map_io,
.init_irq = ep93xx_init_irq,
.timer = &ep93xx_timer,
- .init_machine = micro9h_init_machine,
+ .init_machine = micro9_init_machine,
MACHINE_END
#endif

-/*
- * Micro9-M
- */
#ifdef CONFIG_MACH_MICRO9M
-static void __init micro9m_init_machine(void) -{
- ep93xx_init_devices();
- micro9_init();
-}
-
-MACHINE_START(MICRO9M, "Contec Hypercontrol Micro9-M")
- /* Maintainer: Manfred Gruber <[email protected]> */
+MACHINE_START(MICRO9M, "Contec Micro9-Mid")
+ /* Maintainer: Hubert Feurstein <[email protected]> */
.phys_io = EP93XX_APB_PHYS_BASE,
.io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
- .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100,
+ .boot_params = EP93XX_SDCE3_PHYS_BASE_ASYNC + 0x100,
.map_io = ep93xx_map_io,
.init_irq = ep93xx_init_irq,
.timer = &ep93xx_timer,
- .init_machine = micro9m_init_machine,
+ .init_machine = micro9_init_machine,
MACHINE_END
#endif

-/*
- * Micro9-L
- */
#ifdef CONFIG_MACH_MICRO9L
-static void __init micro9l_init_machine(void) -{
- ep93xx_init_devices();
- micro9_init();
-}
-
-MACHINE_START(MICRO9L, "Contec Hypercontrol Micro9-L")
- /* Maintainer: Manfred Gruber <[email protected]> */
+MACHINE_START(MICRO9L, "Contec Micro9-Lite")
+ /* Maintainer: Hubert Feurstein <[email protected]> */
.phys_io = EP93XX_APB_PHYS_BASE,
.io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
.boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100,
.map_io = ep93xx_map_io,
.init_irq = ep93xx_init_irq,
.timer = &ep93xx_timer,
- .init_machine = micro9l_init_machine,
+ .init_machine = micro9_init_machine,
MACHINE_END
#endif

+#ifdef CONFIG_MACH_MICRO9S
+MACHINE_START(MICRO9S, "Contec Micro9-Slim")
+ /* Maintainer: Hubert Feurstein <[email protected]> */
+ .phys_io = EP93XX_APB_PHYS_BASE,
+ .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
+ .boot_params = EP93XX_SDCE3_PHYS_BASE_ASYNC + 0x100,
+ .map_io = ep93xx_map_io,
+ .init_irq = ep93xx_init_irq,
+ .timer = &ep93xx_timer,
+ .init_machine = micro9_init_machine,
+MACHINE_END
+#endif

Signature · 1 line
1.6.0.2
#1 lore raw

PATCH 1/1 ep93xx/micro9: Update platform code and maintainer

ARM: Update Contec Micro9 maintainer and add entry in MAINTAINERS
Update Contec Micro9 platform code and add Micro9-Slim support

---
 MAINTAINERS                                     |    5 +
 arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h |   11 ++
 arch/arm/mach-ep93xx/micro9.c                   |  132 +++++++++++++----------
 3 files changed, 93 insertions(+), 55 deletions(-)
MAINTAINERS +5 -0
index d24c882..4b95d20 100644
@@ -576,6 +576,11 @@ M:	Mike Rapoport <[email protected]>
 L:	linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
 S:	Maintained
 
+ARM/CONTEC MICRO9 MACHINE SUPPORT
+M:	Hubert Feurstein <[email protected]>
+S:	Maintained
+F:	arch/arm/mach-ep93xx/micro9.c
+
 ARM/CORGI MACHINE SUPPORT
 M:	Richard Purdie <[email protected]>
 S:	Maintained
(quoted diff) +0 -0

b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
index ea78e90..d4f8367 100644

arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h +11 -0
@@ -212,6 +212,17 @@
 #define EP93XX_SYSCON_KEYTCHCLKDIV_ADIV	(1<<16)
 #define EP93XX_SYSCON_KEYTCHCLKDIV_KEN	(1<<15)
 #define EP93XX_SYSCON_KEYTCHCLKDIV_KDIV	(1<<0)
+#define EP93XX_SYSCON_SYSCFG		EP93XX_SYSCON_REG(0x9c)
+#define EP93XX_SYSCON_SYSCFG_REV_MASK	(0xf0000000)
+#define EP93XX_SYSCON_SYSCFG_REV_SHIFT	(28)
+#define EP93XX_SYSCON_SYSCFG_SBOOT	(1<<8)
+#define EP93XX_SYSCON_SYSCFG_LCSN7	(1<<7)
+#define EP93XX_SYSCON_SYSCFG_LCSN6	(1<<6)
+#define EP93XX_SYSCON_SYSCFG_LASDO	(1<<5)
+#define EP93XX_SYSCON_SYSCFG_LEEDA	(1<<4)
+#define EP93XX_SYSCON_SYSCFG_LEECLK	(1<<3)
+#define EP93XX_SYSCON_SYSCFG_LCSN2	(1<<1)
+#define EP93XX_SYSCON_SYSCFG_LCSN1	(1<<0)
 #define EP93XX_SYSCON_SWLOCK		EP93XX_SYSCON_REG(0xc0)
 
 #define EP93XX_WATCHDOG_BASE		EP93XX_APB_IOMEM(0x00140000)
arch/arm/mach-ep93xx/micro9.c +77 -55

188 lines not on this page · raw message

Signature · 1 line
1.6.0.2
#2 lore raw

PATCH 1/1 ep93xx/micro9: Update platform code and maintainer

In reply to Hubert Feurstein
Quoted 7 lines · Hubert Feurstein

ARM: Update Contec Micro9 maintainer and add entry in MAINTAINERS
Update Contec Micro9 platform code and add Micro9-Slim support

Could we separate this out into two patches, one which updates the MAINTAINERS file, and the maintainer in the comments, and one which makes code changes. The two aren't really related.

~Ryan

Signature · 8 lines
Bluewater Systems Ltd - ARM Technology Solution Centre

       Ryan Mallon                              Unit 5, Amuri Park
       Phone: +64 3 3779127                     404 Barbadoes St
       Fax:   +64 3 3779135                     PO Box 13 889
       Email: ryan at bluewatersys.com             Christchurch, 8013
       Web:   http://www.bluewatersys.com       New Zealand
       Freecall Australia  1800 148 751         USA 1800 261 2934
#3 lore raw

PATCH 1/1 ep93xx/micro9: Update platform code and maintainer

Quoted 4 lines · Ryan Mallon
Quoted 3 lines · Hubert Feurstein

ARM: Update Contec Micro9 maintainer and add entry in MAINTAINERS
Update Contec Micro9 platform code and add Micro9-Slim support

Quoted 8 lines
Quoted 4 lines

Could we separate this out into two patches, one which updates the MAINTAINERS file, and the maintainer in the comments, and one which makes code changes. The two aren't really related.

Ryan,

I normally would agree but the change to micro9.c is pretty large. There could be some patch reject issues depending on the order the patches are picked up and applied.

How about just a split into a MAINTAINERS file patch and a code patch?

Regards,
Hartley

#4 lore raw

PATCH 1/1 ep93xx/micro9: Update platform code and maintainer

Quoted 13 lines · H Hartley Sweeten
Quoted 11 lines · Ryan Mallon
Quoted 7 lines · Hubert Feurstein

ARM: Update Contec Micro9 maintainer and add entry in MAINTAINERS
Update Contec Micro9 platform code and add Micro9-Slim support

Could we separate this out into two patches, one which updates the MAINTAINERS file, and the maintainer in the comments, and one which makes code changes. The two aren't really related.

Quoted 5 lines

Ryan,

I normally would agree but the change to micro9.c is pretty large. There could be some patch reject issues depending on the order the patches are picked up and applied.

They could be posted as a series of 2 so that they are applied in the correct order. It shouldn't be a big issue.

Quoted 1 line

How about just a split into a MAINTAINERS file patch and a code patch?

That would be better than a single patch.

~Ryan

Signature · 8 lines
Bluewater Systems Ltd - ARM Technology Solution Centre

       Ryan Mallon                              Unit 5, Amuri Park
       Phone: +64 3 3779127                     404 Barbadoes St
       Fax:   +64 3 3779135                     PO Box 13 889
       Email: ryan at bluewatersys.com             Christchurch, 8013
       Web:   http://www.bluewatersys.com       New Zealand
       Freecall Australia  1800 148 751         USA 1800 261 2934