All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Heiko Stübner" <heiko@sntech.de>
To: Kukjin Kim <kgene.kim@samsung.com>
Cc: linux-arm-kernel@lists.infradead.org,
	linux-samsung-soc@vger.kernel.org,
	Grant Likely <grant.likely@linaro.org>,
	linus.walleij@linaro.org
Subject: [PATCH 3/3] ARM: S3C24XX: update uart addresses in s3c2416-dt auxdata
Date: Fri, 14 Jun 2013 00:46:25 +0200	[thread overview]
Message-ID: <201306140046.25954.heiko@sntech.de> (raw)
In-Reply-To: <201306140044.15568.heiko@sntech.de>

Commit 9ee51f01eee8 (tty: serial/samsung: make register definitions global)
removed the S3C2410_PA_UARTX defines that the newly merged s3c2416 dt
support still expected.

So update mach-s3c2416-dt.c to use the S3C24XX_PA_UART constant
until we have support for the common clock framework the the s3c2416-dt.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 arch/arm/mach-s3c24xx/mach-s3c2416-dt.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c b/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c
index f5c9072..f50454a 100644
--- a/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c
+++ b/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c
@@ -43,13 +43,13 @@
  * data from the device tree.
  */
 static const struct of_dev_auxdata s3c2416_auxdata_lookup[] __initconst = {
-	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C2410_PA_UART0,
+	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C24XX_PA_UART,
 				"s3c2440-uart.0", NULL),
-	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C2410_PA_UART1,
+	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C24XX_PA_UART + 0x4000,
 				"s3c2440-uart.1", NULL),
-	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C2410_PA_UART2,
+	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C24XX_PA_UART + 0x8000,
 				"s3c2440-uart.2", NULL),
-	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C2443_PA_UART3,
+	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C24XX_PA_UART + 0xC000,
 				"s3c2440-uart.3", NULL),
 	OF_DEV_AUXDATA("samsung,s3c6410-sdhci", S3C_PA_HSMMC0,
 				"s3c-sdhci.0", NULL),
-- 
1.7.10.4

WARNING: multiple messages have this Message-ID (diff)
From: heiko@sntech.de (Heiko Stübner)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/3] ARM: S3C24XX: update uart addresses in s3c2416-dt auxdata
Date: Fri, 14 Jun 2013 00:46:25 +0200	[thread overview]
Message-ID: <201306140046.25954.heiko@sntech.de> (raw)
In-Reply-To: <201306140044.15568.heiko@sntech.de>

Commit 9ee51f01eee8 (tty: serial/samsung: make register definitions global)
removed the S3C2410_PA_UARTX defines that the newly merged s3c2416 dt
support still expected.

So update mach-s3c2416-dt.c to use the S3C24XX_PA_UART constant
until we have support for the common clock framework the the s3c2416-dt.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 arch/arm/mach-s3c24xx/mach-s3c2416-dt.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c b/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c
index f5c9072..f50454a 100644
--- a/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c
+++ b/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c
@@ -43,13 +43,13 @@
  * data from the device tree.
  */
 static const struct of_dev_auxdata s3c2416_auxdata_lookup[] __initconst = {
-	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C2410_PA_UART0,
+	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C24XX_PA_UART,
 				"s3c2440-uart.0", NULL),
-	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C2410_PA_UART1,
+	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C24XX_PA_UART + 0x4000,
 				"s3c2440-uart.1", NULL),
-	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C2410_PA_UART2,
+	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C24XX_PA_UART + 0x8000,
 				"s3c2440-uart.2", NULL),
-	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C2443_PA_UART3,
+	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C24XX_PA_UART + 0xC000,
 				"s3c2440-uart.3", NULL),
 	OF_DEV_AUXDATA("samsung,s3c6410-sdhci", S3C_PA_HSMMC0,
 				"s3c-sdhci.0", NULL),
-- 
1.7.10.4

  parent reply	other threads:[~2013-06-13 22:46 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-13 22:44 [PATCH 0/3] ARM: S3C24XX: s3c2416 build fixes Heiko Stübner
2013-06-13 22:44 ` Heiko Stübner
2013-06-13 22:45 ` [PATCH 1/3] gpio: samsung: add PINCTRL_S3C24XX to exclude options Heiko Stübner
2013-06-13 22:45   ` Heiko Stübner
2013-06-17 13:13   ` Kukjin Kim
2013-06-17 13:13     ` Kukjin Kim
2013-06-17 16:49     ` Linus Walleij
2013-06-17 16:49       ` Linus Walleij
2013-06-17 13:19   ` Tomasz Figa
2013-06-17 13:19     ` Tomasz Figa
2013-06-17 15:43     ` Kukjin Kim
2013-06-17 15:43       ` Kukjin Kim
2013-06-17 15:48       ` Tomasz Figa
2013-06-17 15:48         ` Tomasz Figa
2013-06-13 22:45 ` [PATCH 2/3] pinctrl: s3c24xx: use correct header for chained_irq functions Heiko Stübner
2013-06-13 22:45   ` Heiko Stübner
2013-06-17 13:16   ` Kukjin Kim
2013-06-17 13:16     ` Kukjin Kim
2013-06-17 15:45     ` Linus Walleij
2013-06-17 15:45       ` Linus Walleij
2013-06-17 15:58       ` Kukjin Kim
2013-06-17 15:58         ` Kukjin Kim
2013-06-13 22:46 ` Heiko Stübner [this message]
2013-06-13 22:46   ` [PATCH 3/3] ARM: S3C24XX: update uart addresses in s3c2416-dt auxdata Heiko Stübner
2013-06-18 17:39   ` Kukjin Kim
2013-06-18 17:39     ` Kukjin Kim

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=201306140046.25954.heiko@sntech.de \
    --to=heiko@sntech.de \
    --cc=grant.likely@linaro.org \
    --cc=kgene.kim@samsung.com \
    --cc=linus.walleij@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-samsung-soc@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.