From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH V5 30/63] ST SPEAr: Replacing SIZE macro's with actual required size
Date: Sat, 19 Feb 2011 18:01:19 +0000 [thread overview]
Message-ID: <20110219180119.GR29493@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <38be663ab3e653d889d64005a86ed4dcf8661ae1.1295499395.git.viresh.kumar@st.com>
Same comments as the other patch changing to SZ_* macros. Where possible
fold these changes into the patch(es) which add the original definitions
rather than having patches which add stuff and then separate patches
which rework those patches.
Could you do that and provide reworked patches please? I'll publish the
branch I've merged stuff onto thus far (but note that it's 'unstable'),
but note that it won't contain the bits I've merged into the 'fixes'
branch.
On Thu, Jan 20, 2011 at 12:56:08PM +0530, Viresh Kumar wrote:
> From: Shiraz Hashim <shiraz.hashim@st.com>
>
> In arch specific files SIZE macro's were defined which were used for
> creating memory/io mappings for sepecific devices. These macro's are
> coming straight from h/w user manual and are much greated than required
> sizes. Replacing these macros by actual required size.
>
> Signed-off-by: Shiraz Hashim <shiraz.hashim@st.com>
> Signed-off-by: Rajeev Kumar <rajeev-dlh.kumar@st.com>
> Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
> ---
> arch/arm/mach-spear3xx/spear300.c | 9 +++------
> arch/arm/mach-spear3xx/spear310.c | 2 +-
> arch/arm/mach-spear3xx/spear320.c | 2 +-
> arch/arm/mach-spear3xx/spear3xx.c | 8 ++++----
> arch/arm/mach-spear6xx/spear6xx.c | 10 +++++-----
> 5 files changed, 14 insertions(+), 17 deletions(-)
>
> diff --git a/arch/arm/mach-spear3xx/spear300.c b/arch/arm/mach-spear3xx/spear300.c
> index 6989407..30e893f 100644
> --- a/arch/arm/mach-spear3xx/spear300.c
> +++ b/arch/arm/mach-spear3xx/spear300.c
> @@ -604,8 +604,7 @@ struct spear_shirq shirq_ras1 = {
> void sdhci_i2s_mem_enable(u8 mask)
> {
> u32 val;
> - void __iomem *base = ioremap(SPEAR300_SOC_CONFIG_BASE,
> - SPEAR300_SOC_CONFIG_SIZE);
> + void __iomem *base = ioremap(SPEAR300_SOC_CONFIG_BASE, SZ_4K);
> if (!base) {
> pr_debug("sdhci_i2s_enb: ioremap fail\n");
> return;
> @@ -628,8 +627,7 @@ void __init spear300_init(void)
> spear3xx_init();
>
> /* shared irq registration */
> - shirq_ras1.regs.base =
> - ioremap(SPEAR300_TELECOM_BASE, SPEAR300_TELECOM_REG_SIZE);
> + shirq_ras1.regs.base = ioremap(SPEAR300_TELECOM_BASE, SZ_4K);
> if (shirq_ras1.regs.base) {
> ret = spear_shirq_register(&shirq_ras1);
> if (ret)
> @@ -637,8 +635,7 @@ void __init spear300_init(void)
> }
>
> /* pmx initialization */
> - pmx_driver.base = ioremap(SPEAR300_SOC_CONFIG_BASE,
> - SPEAR300_SOC_CONFIG_SIZE);
> + pmx_driver.base = ioremap(SPEAR300_SOC_CONFIG_BASE, SZ_4K);
> if (pmx_driver.base) {
> ret = pmx_register(&pmx_driver);
> if (ret)
> diff --git a/arch/arm/mach-spear3xx/spear310.c b/arch/arm/mach-spear3xx/spear310.c
> index bb9ff7c..ffc1f63 100644
> --- a/arch/arm/mach-spear3xx/spear310.c
> +++ b/arch/arm/mach-spear3xx/spear310.c
> @@ -362,7 +362,7 @@ void __init spear310_init(void)
> spear3xx_init();
>
> /* shared irq registration */
> - base = ioremap(SPEAR310_SOC_CONFIG_BASE, SPEAR310_SOC_CONFIG_SIZE);
> + base = ioremap(SPEAR310_SOC_CONFIG_BASE, SZ_4K);
> if (base) {
> /* shirq 1 */
> shirq_ras1.regs.base = base;
> diff --git a/arch/arm/mach-spear3xx/spear320.c b/arch/arm/mach-spear3xx/spear320.c
> index ab4ad8e..ac4f80b 100644
> --- a/arch/arm/mach-spear3xx/spear320.c
> +++ b/arch/arm/mach-spear3xx/spear320.c
> @@ -694,7 +694,7 @@ void __init spear320_init(void)
> spear3xx_init();
>
> /* shared irq registration */
> - base = ioremap(SPEAR320_SOC_CONFIG_BASE, SPEAR320_SOC_CONFIG_SIZE);
> + base = ioremap(SPEAR320_SOC_CONFIG_BASE, SZ_4K);
> if (base) {
> /* shirq 1 */
> shirq_ras1.regs.base = base;
> diff --git a/arch/arm/mach-spear3xx/spear3xx.c b/arch/arm/mach-spear3xx/spear3xx.c
> index 6be49b3..0088b7c 100644
> --- a/arch/arm/mach-spear3xx/spear3xx.c
> +++ b/arch/arm/mach-spear3xx/spear3xx.c
> @@ -235,22 +235,22 @@ struct map_desc spear3xx_io_desc[] __initdata = {
> {
> .virtual = VA_SPEAR3XX_ICM1_UART_BASE,
> .pfn = __phys_to_pfn(SPEAR3XX_ICM1_UART_BASE),
> - .length = SPEAR3XX_ICM1_UART_SIZE,
> + .length = SZ_4K,
> .type = MT_DEVICE
> }, {
> .virtual = VA_SPEAR3XX_ML1_VIC_BASE,
> .pfn = __phys_to_pfn(SPEAR3XX_ML1_VIC_BASE),
> - .length = SPEAR3XX_ML1_VIC_SIZE,
> + .length = SZ_4K,
> .type = MT_DEVICE
> }, {
> .virtual = VA_SPEAR3XX_ICM3_SYS_CTRL_BASE,
> .pfn = __phys_to_pfn(SPEAR3XX_ICM3_SYS_CTRL_BASE),
> - .length = SPEAR3XX_ICM3_SYS_CTRL_SIZE,
> + .length = SZ_4K,
> .type = MT_DEVICE
> }, {
> .virtual = VA_SPEAR3XX_ICM3_MISC_REG_BASE,
> .pfn = __phys_to_pfn(SPEAR3XX_ICM3_MISC_REG_BASE),
> - .length = SPEAR3XX_ICM3_MISC_REG_SIZE,
> + .length = SZ_4K,
> .type = MT_DEVICE
> },
> };
> diff --git a/arch/arm/mach-spear6xx/spear6xx.c b/arch/arm/mach-spear6xx/spear6xx.c
> index a948dd4..f8be93a 100644
> --- a/arch/arm/mach-spear6xx/spear6xx.c
> +++ b/arch/arm/mach-spear6xx/spear6xx.c
> @@ -389,27 +389,27 @@ static struct map_desc spear6xx_io_desc[] __initdata = {
> {
> .virtual = VA_SPEAR6XX_ICM1_UART0_BASE,
> .pfn = __phys_to_pfn(SPEAR6XX_ICM1_UART0_BASE),
> - .length = SPEAR6XX_ICM1_UART0_SIZE,
> + .length = SZ_4K,
> .type = MT_DEVICE
> }, {
> .virtual = VA_SPEAR6XX_CPU_VIC_PRI_BASE,
> .pfn = __phys_to_pfn(SPEAR6XX_CPU_VIC_PRI_BASE),
> - .length = SPEAR6XX_CPU_VIC_PRI_SIZE,
> + .length = SZ_4K,
> .type = MT_DEVICE
> }, {
> .virtual = VA_SPEAR6XX_CPU_VIC_SEC_BASE,
> .pfn = __phys_to_pfn(SPEAR6XX_CPU_VIC_SEC_BASE),
> - .length = SPEAR6XX_CPU_VIC_SEC_SIZE,
> + .length = SZ_4K,
> .type = MT_DEVICE
> }, {
> .virtual = VA_SPEAR6XX_ICM3_SYS_CTRL_BASE,
> .pfn = __phys_to_pfn(SPEAR6XX_ICM3_SYS_CTRL_BASE),
> - .length = SPEAR6XX_ICM3_MISC_REG_BASE,
> + .length = SZ_4K,
> .type = MT_DEVICE
> }, {
> .virtual = VA_SPEAR6XX_ICM3_MISC_REG_BASE,
> .pfn = __phys_to_pfn(SPEAR6XX_ICM3_MISC_REG_BASE),
> - .length = SPEAR6XX_ICM3_MISC_REG_SIZE,
> + .length = SZ_4K,
> .type = MT_DEVICE
> },
> };
> --
> 1.7.3.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2011-02-19 18:01 UTC|newest]
Thread overview: 102+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-20 7:25 [PATCH V5 00/63] Updating SPEAr Support Viresh Kumar
2011-01-20 7:25 ` [PATCH V5 01/63] spear/vmalloc.h: Appending UL to VMALLOC_END Viresh Kumar
2011-01-20 7:25 ` [PATCH V5 02/63] SPEAr: Defining IOMEM(x) and updating declaration of MISC_BASE Viresh Kumar
2011-01-20 7:25 ` [PATCH V5 03/63] sp810 Fix: Switch to slow mode before sysctl_soft_reset Viresh Kumar
2011-02-19 14:40 ` Russell King - ARM Linux
2011-02-19 17:14 ` viresh kumar
2011-01-20 7:25 ` [PATCH V5 04/63] ST SPEAr: Padmux code Updated Viresh Kumar
2011-01-20 7:25 ` [PATCH V5 05/63] ST SPEAr: Making clock functions more generic Viresh Kumar
2011-01-20 7:25 ` [PATCH V5 06/63] ST SPEAr: Formalized timer support Viresh Kumar
2011-01-20 7:25 ` [PATCH V5 07/63] ST SPEAr13XX: Adding machine specific header files Viresh Kumar
2011-01-20 7:25 ` [PATCH V5 08/63] ST SPEAr13XX: Adding machine specific src files Viresh Kumar
2011-01-20 7:25 ` [PATCH V5 09/63] ST SPEAr: Adding support for SPEAr13xx SoC in spear generic plat/ Viresh Kumar
2011-01-20 7:25 ` [PATCH V5 10/63] ST SPEAr13XX: Added compilation support in arch/arm/ Viresh Kumar
2011-01-20 7:25 ` [PATCH V5 11/63] ST SPEAr13xx: Adding default config file Viresh Kumar
2011-01-20 7:25 ` [PATCH V5 12/63] ST SPEAr: Adding support for CLCD on SPEAr3xx/6xx Viresh Kumar
2011-02-16 9:56 ` Russell King - ARM Linux
2011-02-16 10:14 ` Russell King - ARM Linux
2011-02-17 4:19 ` viresh kumar
2011-01-20 7:25 ` [PATCH V5 13/63] ST SPEAr: Updating Clock Support Viresh Kumar
2011-02-19 17:16 ` Russell King - ARM Linux
2011-01-20 7:25 ` [PATCH V5 14/63] ST SPEAr: Adding Debugfs support on clock framework Viresh Kumar
2011-01-20 7:25 ` [PATCH V5 15/63] ST SPEAr: Correcting SOC Config base address for spear320 Viresh Kumar
2011-02-19 16:40 ` Russell King - ARM Linux
2011-02-19 17:20 ` viresh kumar
2011-01-20 7:25 ` [PATCH V5 16/63] ST SPEAr: Adding PLGPIO driver for spear platform Viresh Kumar
2011-01-20 7:25 ` [PATCH V5 18/63] ST SPEAr: Adding machine support for rtc-spear Viresh Kumar
2011-01-20 7:25 ` [PATCH V5 19/63] ST SPEAr: adding support for synopsis i2c designware Viresh Kumar
2011-01-20 7:25 ` [PATCH V5 20/63] ST SPEAr: Adding machine support for USB host Viresh Kumar
2011-01-20 7:25 ` [PATCH V5 21/63] ST SPEAr: Adding machine support for keyboard Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 22/63] ST SPEAr: Added ARM PL061 GPIO Support on SPEAr13xx and modified resource size Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 23/63] ST SPEAr: Adding support for ST's PWM IP Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 24/63] ST SPEAr: Adding Watchdog support Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 25/63] ST SPEAr: Adding machine support for nand Viresh Kumar
2011-01-25 8:57 ` stanley.miao
2011-01-25 9:20 ` viresh kumar
2011-01-20 7:26 ` [PATCH V5 26/63] ST SPEAr: Added PCIE host controller base driver support Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 27/63] ST SPEAr: Adding support for SSP PL022 Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 28/63] ST SPEAr: Adding support for SDHCI (SDIO) Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 29/63] ST SPEAr: Changing resource size of amba devices to SZ_4K Viresh Kumar
2011-02-19 17:58 ` Russell King - ARM Linux
2011-02-21 6:37 ` viresh kumar
2011-01-20 7:26 ` [PATCH V5 30/63] ST SPEAr: Replacing SIZE macro's with actual required size Viresh Kumar
2011-02-19 18:01 ` Russell King - ARM Linux [this message]
2011-02-21 6:39 ` viresh kumar
2011-02-21 11:03 ` Russell King - ARM Linux
2011-02-21 11:44 ` viresh kumar
2011-02-21 11:53 ` Russell King - ARM Linux
2011-02-21 12:04 ` viresh kumar
2011-02-21 13:09 ` Russell King - ARM Linux
2011-02-21 13:57 ` viresh kumar
2011-01-20 7:26 ` [PATCH V5 31/63] SPEAr: defines base addresses as ulong Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 32/63] ST SPEAr: Adding miscellaneous devices Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 33/63] ST SPEAr 13xx : Adding support for SPEAr1310 Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 34/63] SPEAr320: Adding support for CAN Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 35/63] ST SPEAr: Adding support for DDR in clock framework Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 36/63] ST SPEAr : EMI (Extrenal Memory Interface) controller driver Viresh Kumar
2011-02-19 17:13 ` Russell King - ARM Linux
2011-02-21 6:26 ` Vipin Kumar
2011-02-21 11:02 ` Russell King - ARM Linux
2011-02-21 11:44 ` Vipin Kumar
2011-01-20 7:26 ` [PATCH V5 37/63] SPEAr Clock Framework: Adding support for PLL frequency change Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 38/63] SPEAr Power Management: Added the support for Standby mode Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 39/63] SPEAr CPU freq: Adding support for CPU Freq framework Viresh Kumar
2011-01-20 14:49 ` Jamie Iles
2011-01-21 3:40 ` viresh kumar
2011-01-20 7:26 ` [PATCH V5 40/63] ST SPEAr13xx: Adding CPU hotplug support added for SMP platforms Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 41/63] ST SPEAr: replace readl, writel with readl_relaxed, writel_relaxed in uncompress.h Viresh Kumar
2011-02-19 14:44 ` Russell King - ARM Linux
2011-02-19 17:16 ` viresh kumar
2011-01-20 7:26 ` [PATCH V5 42/63] ST SPEAr13xx: add L2 cache support Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 43/63] ST SPEAr13xx: Modified static mappings Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 44/63] SPEAr1310: Adding Static Mapping for RAS Area Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 45/63] SPEAr: Adding and Updating Clock definitions Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 46/63] SPEAr : Pad multiplexing handling modified Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 47/63] SPEAr13xx : Fixed part devices in SPEAr13xx addded to the generic implementation Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 48/63] SPEAr : Updating pad multiplexing support Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 49/63] ST SPEAr3xx: Passing pmx devices address from machine *.c files Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 50/63] ST SPEAr Clock Framework: Updating for single image solution Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 51/63] SPEAr3xx: Make local structures static Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 52/63] SPEAR3xx: Rename register/irq defines to remove naming conflicts Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 53/63] SPEAr3xx: Rework pmx_dev code to remove conflicts Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 54/63] SPEAr3xx: Rework KConfig to allow all boards to be compiled in Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 55/63] SPEAr3xx: Replace defconfigs with single unified defconfig Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 56/63] ST SPEAr: Appending spear3** with global structures Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 57/63] ST SPEAr3xx: Updating plgpio and emi source to make it compliant with single image strategy Viresh Kumar
2011-02-19 16:50 ` Russell King - ARM Linux
2011-02-19 17:30 ` viresh kumar
2011-01-20 7:26 ` [PATCH V5 58/63] SPEAr6xx: Rework Kconfig for single image solution Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 59/63] ST SPEAR6xx: renaming spear600_defconfig as spear6xx_defconfig Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 60/63] ST SPEAr13xx: Pass default padmux settings as parameter to spear13**_init routine Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 61/63] ST SPEAr: Adding devices & clocks Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 62/63] ST SPEAr: Adding information in Documentation/ and MAINTAINERS Viresh Kumar
2011-01-20 7:26 ` [PATCH V5 63/63] ST SPEAr: Updating defconfigs Viresh Kumar
2011-01-21 16:57 ` [PATCH V5 00/63] Updating SPEAr Support Jamie Iles
2011-01-31 4:30 ` viresh kumar
2011-01-31 9:22 ` Russell King - ARM Linux
2011-02-14 8:31 ` viresh kumar
2011-02-16 10:04 ` Russell King - ARM Linux
2011-02-15 9:06 ` stanley.miao
2011-02-19 13:47 ` Russell King - ARM Linux
2011-02-19 17:48 ` viresh kumar
2011-03-01 11:00 ` viresh kumar
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=20110219180119.GR29493@n2100.arm.linux.org.uk \
--to=linux@arm.linux.org.uk \
--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).