[PATCH 0/3] MIPS: lantiq: Fix build problems on linux-queue.

[PATCH 0/3] MIPS: lantiq: Fix build problems on linux-queue.

[David Daney]

These patches fix three problems I encountered building a kernel for
the lantiq platform.

David Daney (3):
  MIPS: lantiq: Add missing include to mach-easy50712.c
  MIPS: lantiq: Fix section mismatch in gpio_stp.c
  MIPS: lantiq: Check return value from strict_strtoul().

 arch/mips/lantiq/setup.c               |    3 ++-
 arch/mips/lantiq/xway/gpio_stp.c       |    2 +-
 arch/mips/lantiq/xway/mach-easy50712.c |    1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

Cc: John Crispin <blogic@openwrt.org>
-- 
1.7.2.3

[PATCH 1/3] MIPS: lantiq: Add missing include to mach-easy50712.c

[David Daney]

Without this we fail building with a missing definition for
PHY_INTERFACE_MODE_MII.

Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Cc: John Crispin <blogic@openwrt.org>
---
 arch/mips/lantiq/xway/mach-easy50712.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/mips/lantiq/xway/mach-easy50712.c b/arch/mips/lantiq/xway/mach-easy50712.c
index 2512561..30b8000 100644
--- a/arch/mips/lantiq/xway/mach-easy50712.c
+++ b/arch/mips/lantiq/xway/mach-easy50712.c
@@ -12,6 +12,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/input.h>
+#include <linux/phy.h>
 
 #include <lantiq_soc.h>
 #include <irq.h>
-- 
1.7.2.3

[PATCH 2/3] MIPS: lantiq: Fix section mismatch in gpio_stp.c

[David Daney]

ltq_stp_probe() cannot be __init if ltq_stp_driver isn't also.

Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Cc: John Crispin <blogic@openwrt.org>
---
 arch/mips/lantiq/xway/gpio_stp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/mips/lantiq/xway/gpio_stp.c b/arch/mips/lantiq/xway/gpio_stp.c
index efa3782..eed5a45 100644
--- a/arch/mips/lantiq/xway/gpio_stp.c
+++ b/arch/mips/lantiq/xway/gpio_stp.c
@@ -111,7 +111,7 @@ static int ltq_stp_hw_init(void)
 	return 0;
 }
 
-static int __init ltq_stp_probe(struct platform_device *pdev)
+static int ltq_stp_probe(struct platform_device *pdev)
 {
 	struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	int ret = 0;
-- 
1.7.2.3

[PATCH 3/3] MIPS: lantiq: Check return value from strict_strtoul().

[David Daney]

The build fails if we don't check the return value from
strict_strtoul(), so print a message if it fails.

Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Cc: John Crispin <blogic@openwrt.org>
---
 arch/mips/lantiq/setup.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/mips/lantiq/setup.c b/arch/mips/lantiq/setup.c
index 2f27f58..9b8af77 100644
--- a/arch/mips/lantiq/setup.c
+++ b/arch/mips/lantiq/setup.c
@@ -35,7 +35,8 @@ void __init plat_mem_setup(void)
 		char *e = (char *)KSEG1ADDR(*envp);
 		if (!strncmp(e, "memsize=", 8)) {
 			e += 8;
-			strict_strtoul(e, 0, &memsize);
+			if (strict_strtoul(e, 0, &memsize))
+				pr_warn("bad memsize specified\n");
 		}
 		envp++;
 	}
-- 
1.7.2.3

Re: [PATCH 1/3] MIPS: lantiq: Add missing include to mach-easy50712.c

[Ralf Baechle]

Thanks, folded into "MIPS: Lantiq: Add etop board support".

  Ralf

Re: [PATCH 2/3] MIPS: lantiq: Fix section mismatch in gpio_stp.c

[Ralf Baechle]

On Wed, May 11, 2011 at 01:22:26PM -0700, David Daney wrote:

> ltq_stp_probe() cannot be __init if ltq_stp_driver isn't also.

That would work - but a __devinit declaration would be even better.

  Ralf

Re: [PATCH 3/3] MIPS: lantiq: Check return value from strict_strtoul().

[Ralf Baechle]

On Wed, May 11, 2011 at 01:22:27PM -0700, David Daney wrote:

> Subject: [PATCH 3/3] MIPS: lantiq: Check return value from strict_strtoul().

Thanks, folded into "MIPS: Lantiq: Add initial support for Lantiq SoCs".

  Ralf

Re: [PATCH 1/3] MIPS: lantiq: Add missing include to mach-easy50712.c

[John Crispin]

On 11/05/11 23:25, Ralf Baechle wrote:
> Thanks, folded into "MIPS: Lantiq: Add etop board support".
>
>   Ralf
>
>   

Hi,

the include should be in arch/lantiq/devices.h and not the mach-*.c file.

this got lost int he folding and i thought we fixed it yesterday already .

John

Re: [PATCH 1/3] MIPS: lantiq: Add missing include to mach-easy50712.c

[David Daney]

On 05/11/2011 10:57 PM, John Crispin wrote:
> On 11/05/11 23:25, Ralf Baechle wrote:
>> Thanks, folded into "MIPS: Lantiq: Add etop board support".
>>
>>    Ralf
>>
>>
>
> Hi,
>
> the include should be in arch/lantiq/devices.h and not the mach-*.c file.
>

It is best to keep the include pushed as far to the leaves of the build 
as possible.  That makes compiling other files that need devices.h faster.

> this got lost int he folding and i thought we fixed it yesterday already .

In any event I think Ralf has it sorted out now.  linux-queue is now 
building for me with no patches.

David Daney

Re: [PATCH 1/3] MIPS: lantiq: Add missing include to mach-easy50712.c

[John Crispin]

> It is best to keep the include pushed as far to the leaves of the
> build as possible.  That makes compiling other files that need
> devices.h faster.
>
>> this got lost int he folding and i thought we fixed it yesterday
>> already .
>
> In any event I think Ralf has it sorted out now.  linux-queue is now
> building for me with no patches.

yes its solved, current queue builds and runs as expected on lantiq socs