From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 6/6] ARM: ux500: get rid of <mach/[hardware|db8500-regs].h>
Date: Thu, 21 Mar 2013 13:21:50 +0100 [thread overview]
Message-ID: <18952950.WVCFaaGPFa@wuerfel> (raw)
In-Reply-To: <1363866553-15054-7-git-send-email-linus.walleij@stericsson.com>
On Thursday 21 March 2013 12:49:13 Linus Walleij wrote:
> From: Linus Walleij <linus.walleij@linaro.org>
>
> This removes <mach/hardware.h> and <mach/db8500-regs.h>
> from the Ux500, merging them into the local include
> "db8500-regs.h" in mach-ux500. There is some impact
> outside the ux500 machine, but most of it is dealt with
> in earlier patches.
Nice
> diff --git a/arch/arm/include/debug/ux500.S b/arch/arm/include/debug/ux500.S
> index 6703522..2848857 100644
> --- a/arch/arm/include/debug/ux500.S
> +++ b/arch/arm/include/debug/ux500.S
> @@ -8,7 +8,7 @@
> * published by the Free Software Foundation.
> *
> */
> -#include <mach/hardware.h>
> +
>
> #if CONFIG_UX500_DEBUG_UART > 2
> #error Invalid Ux500 debug UART
> @@ -21,19 +21,28 @@
> */
>
> #ifdef CONFIG_UX500_SOC_DB8500
> -#define __UX500_UART(n) U8500_UART##n##_BASE
> +#define U8500_UART0_PHYS_BASE (0x80120000)
> +#define U8500_UART1_PHYS_BASE (0x80121000)
> +#define U8500_UART2_PHYS_BASE (0x80007000)
> +#define U8500_UART0_VIRT_BASE (0xa8120000)
> +#define U8500_UART1_VIRT_BASE (0xa8121000)
> +#define U8500_UART2_VIRT_BASE (0xa8007000)
> +#define __UX500_PHYS_UART(n) U8500_UART##n##_PHYS_BASE
> +#define __UX500_VIRT_UART(n) U8500_UART##n##_VIRT_BASE
> #endif
>
> -#ifndef __UX500_UART
> +#if !defined(__UX500_PHYS_UART) || !defined(__UX500_VIRT_UART)
> #error Unknown SOC
> #endif
>
> -#define UX500_UART(n) __UX500_UART(n)
> -#define UART_BASE UX500_UART(CONFIG_UX500_DEBUG_UART)
> +#define UX500_PHYS_UART(n) __UX500_PHYS_UART(n)
> +#define UX500_VIRT_UART(n) __UX500_VIRT_UART(n)
> +#define UART_PHYS_BASE UX500_PHYS_UART(CONFIG_UX500_DEBUG_UART)
> +#define UART_VIRT_BASE UX500_VIRT_UART(CONFIG_UX500_DEBUG_UART)
>
> .macro addruart, rp, rv, tmp
> - ldr \rp, =UART_BASE @ no, physical address
> - ldr \rv, =IO_ADDRESS(UART_BASE) @ yes, virtual address
> + ldr \rp, =UART_PHYS_BASE @ no, physical address
> + ldr \rv, =UART_VIRT_BASE @ yes, virtual address
> .endm
>
> #include <asm/hardware/debug-pl01x.S>
I would suggest splitting this change out into a separate patch, or
folding it into the one that creates the ux500.S file.
> diff --git a/arch/arm/mach-ux500/db8500-regs.h b/arch/arm/mach-ux500/db8500-regs.h
> new file mode 100644
> index 0000000..b2d7a0b
> --- /dev/null
> +++ b/arch/arm/mach-ux500/db8500-regs.h
> @@ -0,0 +1,201 @@
> +/*
> + * Copyright (C) ST-Ericsson SA 2010
> + *
> + * License terms: GNU General Public License (GPL) version 2
> + */
Did you forget to pass '-M' to git-format-patch?
You can set 'git config diff.renames true' to get this right in the future.
> @@ -228,6 +228,12 @@ static struct resource db8500_prcmu_res[] = {
> .end = U8500_PRCMU_TCPM_BASE + SZ_4K - 1,
> .flags = IORESOURCE_MEM,
> },
> + {
> + .name = "gic-distbase",
> + .start = U8500_GIC_DIST_BASE,
> + .end = U8500_GIC_DIST_BASE + SZ_4K - 1,
> + .flags = IORESOURCE_MEM,
> + },
> };
>
> struct platform_device db8500_prcmu_device = {
Was this meant to have been in a different patch? I don't see what it does here.
Arnd
next prev parent reply other threads:[~2013-03-21 12:21 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-21 11:49 [PATCH 0/6] ARM: ux500: first multiplatform series Linus Walleij
2013-03-21 11:49 ` [PATCH 1/6] ARM: ux500: move debugmacro to debug includes Linus Walleij
2013-03-21 12:06 ` Arnd Bergmann
2013-03-21 11:49 ` [PATCH 2/6] clk: ux500: pass clock base adresses in init call Linus Walleij
2013-03-21 12:10 ` Arnd Bergmann
2013-03-21 14:05 ` Ulf Hansson
2013-03-21 17:50 ` Mike Turquette
2013-03-21 11:49 ` [PATCH 3/6] mfd: prcmu: pass a base and size with the early initcall Linus Walleij
2013-03-21 12:11 ` Arnd Bergmann
2013-03-21 14:01 ` Ulf Hansson
2013-03-21 11:49 ` [PATCH 4/6] mfd: db8500-prcmu: get base address from resource Linus Walleij
2013-03-21 12:15 ` Arnd Bergmann
2013-03-21 17:10 ` Linus Walleij
2013-03-21 19:07 ` Arnd Bergmann
2013-03-21 20:26 ` Loic PALLARDY
2013-03-21 11:49 ` [PATCH 5/6] ARM: ux500: move PRCMU functions into the CPUidle driver Linus Walleij
2013-03-21 12:14 ` Rickard Andersson
2013-03-21 12:30 ` Daniel Lezcano
2013-03-22 8:30 ` Rickard Andersson
2013-03-25 13:44 ` Linus Walleij
2013-03-25 13:58 ` Daniel Lezcano
2013-03-25 14:10 ` Linus Walleij
2013-03-25 14:11 ` Arnd Bergmann
2013-03-25 14:36 ` Linus Walleij
2013-03-25 15:13 ` Arnd Bergmann
2013-03-25 15:48 ` Linus Walleij
2013-03-21 11:49 ` [PATCH 6/6] ARM: ux500: get rid of <mach/[hardware|db8500-regs].h> Linus Walleij
2013-03-21 12:21 ` Arnd Bergmann [this message]
2013-03-21 21:51 ` [PATCH 0/9] More ux500 multiplatform stuff Arnd Bergmann
2013-03-21 21:51 ` [PATCH 1/9] ARM: ux500: move mach/msp.h to include/linux/platform_data.h Arnd Bergmann
2013-03-21 21:51 ` [PATCH 2/9] ARM: ux500: split out prcmu initialization Arnd Bergmann
2013-03-21 21:51 ` [PATCH 3/9] ARM: ux500: make irqs.h local to platform Arnd Bergmann
2013-03-21 21:51 ` [PATCH 4/9] ARM: ux500: kill mach/hardware.h some more Arnd Bergmann
2013-03-21 21:51 ` [PATCH 5/9] staging: ste_rmi4: kill platform_data hack Arnd Bergmann
2013-03-25 13:12 ` Linus Walleij
2013-03-25 18:00 ` Greg KH
2013-03-21 21:51 ` [PATCH 6/9] power: pm2301_charger: remove __devinit annotations Arnd Bergmann
2013-03-22 12:14 ` Linus Walleij
2013-03-22 15:16 ` Anton Vorontsov
2013-03-25 3:09 ` Anton Vorontsov
2013-03-21 21:51 ` [PATCH 7/9] ARM: ux500: make remaining headers local Arnd Bergmann
2013-03-21 21:51 ` [PATCH 8/9] ARM: ux500: move to multiplatform Arnd Bergmann
2013-03-21 21:51 ` [PATCH 9/9] ARM: ux500: build hotplug.o for ARMv7-a Arnd Bergmann
2013-03-22 13:21 ` [PATCH 0/9] More ux500 multiplatform stuff Linus Walleij
2013-03-22 13:34 ` Arnd Bergmann
2013-03-22 13:36 ` Linus Walleij
2013-03-22 14:16 ` Arnd Bergmann
2013-03-22 14:39 ` Linus Walleij
2013-03-22 15:25 ` Arnd Bergmann
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=18952950.WVCFaaGPFa@wuerfel \
--to=arnd@arndb.de \
--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).