Linux MIPS Architecture development
 help / color / mirror / Atom feed
From: Shane McDonald <mcdonald.shane@gmail.com>
To: linux-mips@linux-mips.org, ralf@linux-mips.org
Subject: [MIPS] msp71xx: resolve compilation problem in msp_setup.c
Date: Sun, 17 Aug 2008 11:51:48 -0600	[thread overview]
Message-ID: <E1KUmPs-0005uZ-Du@localhost> (raw)

The msp71xx_defconfig has never compiled in a kernel release.  This is
because the file msp_setup.c relies on some definitions from the PMCMSP
GPIO driver, which has not yet been accepted into the kernel.
This patch checks for the existence of the PMCMSP GPIO driver;
if it doesn't exist, no GPIO functions are referenced.

This patch will continue to work after the GPIO driver has been accepted,
so no changes will be necessary when that happens.

Signed-off-by: Shane McDonald <mcdonald.shane@gmail.com>
---
 arch/mips/pmc-sierra/msp71xx/msp_setup.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Note that this patch doesn't clean up all compilation problems with
the MSP71xx: there is still a problem with a multiple definition
of plat_timer_setup.  I'm trying to wrangle some hardware to sort
this out.  Note that removing the definition of plat_timer_setup
in msp_time.c allows the kernel to compile completely,
but I don't know if it will run.

diff -uprN orig/arch/mips/pmc-sierra/msp71xx/msp_setup.c patched/arch/mips/pmc-sierra/msp71xx/msp_setup.c
--- orig/arch/mips/pmc-sierra/msp71xx/msp_setup.c	2008-08-17 10:15:11.000000000 -0600
+++ patched/arch/mips/pmc-sierra/msp71xx/msp_setup.c	2008-08-17 10:15:48.000000000 -0600
@@ -19,7 +19,7 @@
 #include <msp_prom.h>
 #include <msp_regs.h>
 
-#if defined(CONFIG_PMC_MSP7120_GW)
+#if defined(CONFIG_PMC_MSP7120_GW) && defined(CONFIG_PMCMSP_GPIO)
 #include <msp_regops.h>
 #include <msp_gpio.h>
 #define MSP_BOARD_RESET_GPIO	9
@@ -79,7 +79,7 @@ void msp7120_reset(void)
 	/* Wait a bit for the DDRC to settle */
 	for (i = 0; i < 100000000; i++);
 
-#if defined(CONFIG_PMC_MSP7120_GW)
+#if defined(CONFIG_PMC_MSP7120_GW) && defined(CONFIG_PMCMSP_GPIO)
 	/*
 	 * Set GPIO 9 HI, (tied to board reset logic)
 	 * GPIO 9 is the 4th GPIO of register 3

             reply	other threads:[~2008-08-17 17:52 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-08-17 17:51 Shane McDonald [this message]
2008-08-18 21:28 ` [MIPS] msp71xx: resolve compilation problem in msp_setup.c Ralf Baechle
2008-08-18 23:11   ` Patrick Glass
2008-08-18 23:11     ` Patrick Glass
2008-08-18 23:22     ` Shane McDonald
2008-08-19  9:17     ` Ralf Baechle

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=E1KUmPs-0005uZ-Du@localhost \
    --to=mcdonald.shane@gmail.com \
    --cc=linux-mips@linux-mips.org \
    --cc=ralf@linux-mips.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox