linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 16/16] ARM: ux500: Re-enable SMSC911x platform code registration during non-DT boots
Date: Fri, 18 May 2012 09:39:15 +0100	[thread overview]
Message-ID: <1337330355-17747-17-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1337330355-17747-1-git-send-email-lee.jones@linaro.org>

The patch to disable SMSC911x registration was applied twice in the upstream
kernel by mistake. Git interpreted this as 'take the same entry from a
similar struct' which was close by. This was the wrong thing to do. This patch
rectifies this error and re-enables SMSC911x registration when Device Tree is
not enabled.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/mach-ux500/board-mop500.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 33d47e1..2ddbb87 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -596,6 +596,7 @@ static void __init mop500_uart_init(struct device *parent)
 static struct platform_device *snowball_platform_devs[] __initdata = {
 	&snowball_led_dev,
 	&snowball_key_dev,
+	&snowball_sbnet_dev,
 	&ab8500_device,
 };
 
-- 
1.7.9.5

  parent reply	other threads:[~2012-05-18  8:39 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-18  8:38 [PATCH 00/16] The last large installment of DT for Snowball Lee Jones
2012-05-18  8:39 ` [PATCH 01/16] Input: Add Device Tree support to the ab8500-ponkey driver Lee Jones
2012-05-21 21:32   ` Linus Walleij
2012-06-12  7:22     ` Dmitry Torokhov
2012-05-18  8:39 ` [PATCH 02/16] ARM: ux500: Enable LED heartbeat functionality on Snowball Lee Jones
2012-05-21 21:33   ` Linus Walleij
2012-05-22  7:38     ` Lee Jones
2012-05-18  8:39 ` [PATCH 03/16] ARM: ux500: Enable LED heartbeat functionality on Snowbal via DT Lee Jones
2012-05-21 21:34   ` Linus Walleij
2012-05-18  8:39 ` [PATCH 04/16] ARM: ux500: Only initialise STE's UIBs on boards which support them Lee Jones
2012-05-21 21:36   ` Linus Walleij
2012-05-22  7:39     ` Lee Jones
2012-05-18  8:39 ` [PATCH 05/16] regulator: db8500-prcmu: Separate regulator registration from probe Lee Jones
2012-05-18 15:36   ` Mark Brown
2012-05-21  6:58   ` Linus Walleij
2012-05-18  8:39 ` [PATCH 06/16] ARM: ux500: Apply db8500-prcmu regulator information to db8500 Device Tree Lee Jones
2012-05-21 21:37   ` Linus Walleij
2012-05-22  7:41     ` Lee Jones
2012-05-29  1:51   ` Linus Walleij
2012-05-18  8:39 ` [PATCH 07/16] regulator: Enable Device Tree for the db8500-prcmu regulator driver Lee Jones
2012-05-18 15:36   ` Mark Brown
2012-05-21  6:59   ` Linus Walleij
2012-05-18  8:39 ` [PATCH 08/16] ARM: ux500: Allow PRCMU regulator to be probed during a DT enabled boot Lee Jones
2012-05-21 21:37   ` Linus Walleij
2012-05-18  8:39 ` [PATCH 09/16] ARM: ux500: Provide regulator support for SMSC911x via Device Tree Lee Jones
2012-05-21 21:42   ` Linus Walleij
2012-05-22  6:44     ` Arnd Bergmann
2012-05-22  7:46     ` Lee Jones
2012-05-18  8:39 ` [PATCH 10/16] ARM: ux500: Add db8500 Device Tree node for ab8500-sysctrl Lee Jones
2012-05-21 21:43   ` Linus Walleij
2012-05-18  8:39 ` [PATCH 11/16] mfd: Enable Device Tree support in the ab8500-sysctrl driver Lee Jones
2012-05-19 15:35   ` Samuel Ortiz
2012-05-18  8:39 ` [PATCH 12/16] ARM: ux500: Add db8500 Device Tree node for misc/ab8500-pwm Lee Jones
2012-05-21 21:43   ` Linus Walleij
2012-05-18  8:39 ` [PATCH 13/16] mfd: Enable Device Tree support in the ab8500-pwm driver Lee Jones
2012-05-19 15:35   ` Samuel Ortiz
2012-05-18  8:39 ` [PATCH 14/16] ARM: ux500: Add a ab8500-usb Device Tree node for db8500 based devices Lee Jones
2012-05-21 21:44   ` Linus Walleij
2012-05-18  8:39 ` [PATCH 15/16] ARM: ux500: Add regulator support for nomadik-i2c into the db8500 Device Tree Lee Jones
2012-05-21 21:45   ` Linus Walleij
2012-05-22  8:00     ` Lee Jones
2012-05-29  1:53       ` Linus Walleij
2012-05-29  4:50         ` Lee Jones
2012-05-30  0:09           ` Linus Walleij
2012-05-30  0:33             ` Lee Jones
2012-05-30  2:51               ` Linus Walleij
2012-05-18  8:39 ` Lee Jones [this message]
2012-05-21 21:46   ` [PATCH 16/16] ARM: ux500: Re-enable SMSC911x platform code registration during non-DT boots Linus Walleij
2012-05-22  8:01     ` Lee Jones
2012-05-29  1:54       ` Linus Walleij

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=1337330355-17747-17-git-send-email-lee.jones@linaro.org \
    --to=lee.jones@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.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).