From: Florian Fainelli <florian@openwrt.org>
To: ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org, Maxime Bizon <mbizon@freebox.fr>
Subject: [PATCH 2/2] bcm63xx: only set the proper GPIO overlay settings
Date: Mon, 31 Aug 2009 20:28:10 +0200 [thread overview]
Message-ID: <200908312028.10931.florian@openwrt.org> (raw)
This patch makes the GPIO pin multiplexing configuration
read the initial GPIO mode register value instead of
setting it initially to 0, then setting the correct
bits, this is safer.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c
index cfe32af..6ae4242 100644
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -634,7 +634,7 @@ void __init board_prom_init(void)
/* setup pin multiplexing depending on board enabled device,
* this has to be done this early since PCI init is done
* inside arch_initcall */
- val = 0;
+ val = bcm_gpio_readl(GPIO_MODE_REG);
#ifdef CONFIG_PCI
if (board.has_pci) {
next reply other threads:[~2009-08-31 18:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-31 18:28 Florian Fainelli [this message]
2009-08-31 20:26 ` [PATCH 2/2] bcm63xx: only set the proper GPIO overlay settings Maxime Bizon
2009-08-31 21:37 ` Florian Fainelli
2009-10-11 22:53 ` Ralf Baechle
2009-10-12 16:12 ` Florian Fainelli
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=200908312028.10931.florian@openwrt.org \
--to=florian@openwrt.org \
--cc=linux-mips@linux-mips.org \
--cc=mbizon@freebox.fr \
--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;
as well as URLs for NNTP newsgroup(s).