Use common macro to define resources
Subsystems (3)
cover Use common macro to define resources
There are some helper macros (DEFINE_RES_XXX) for defining resource structures. This patchset migrates all the earlier resource definitions (within Samsung specific code base) to use these macros.
In some cases, it was not possible to use DEFINE_RES_IRQ() macro because of usage of additional flags. In those cases, DEFINE_RES_NAMED() macro is used instead.
The patches are rebased on top of Kukjin's for-next branch at this commit.
d0ee53a Merge branch 'next/board-samsung' into for-next
Tushar Behera (33):
ARM: SAMSUNG: devs: Use common macro to define resources
ARM: EXYNOS: dev-ahci: Use common macro to define resources
ARM: EXYNOS: dev-audio: Use common macro to define resources
ARM: EXYNOS: mach-armlex4210: Use common macro to define resources
ARM: EXYNOS: mach-smdkv310: Use common macro to define resources
ARM: S3C24XX: dev-uart: Use common macro to define resources
ARM: S3C24XX: bast-ide: Use common macro to define resources
ARM: S3C24XX: mach-amlm5900: Use common macro to define resources
ARM: S3C24XX: mach-anubis: Use common macro to define resources
ARM: S3C24XX: mach-at2440evb: Use common macro to define resources
ARM: S3C24XX: mach-bast: Use common macro to define resources
ARM: S3C24XX: mach-gta02: Use common macro to define resources
ARM: S3C24XX: mach-h1940: Use common macro to define resources
ARM: S3C24XX: mach-mini2440: Use common macro to define resources
ARM: S3C24XX: mach-nexcoder: Use common macro to define resources
ARM: S3C24XX: mach-osiris: Use common macro to define resources
ARM: S3C24XX: mach-otom: Use common macro to define resources
ARM: S3C24XX: mach-qt2410: Use common macro to define resources
ARM: S3C24XX: mach-rx1950: Use common macro to define resources
ARM: S3C24XX: mach-tct_hammer: Use common macro to define resources
ARM: S3C24XX: mach-vr1000: Use common macro to define resources
ARM: S3C24XX: simtec-nor: Use common macro to define resources
ARM: S3C64XX: dev-audio: Use common macro to define resources
ARM: S3C64XX: dev-uart: Use common macro to define resources
ARM: S3C64XX: mach-anw6410: Use common macro to define resources
ARM: S3C64XX: mach-crag6410: Use common macro to define resources
ARM: S3C64XX: mach-mini6410: Use common macro to define resources
ARM: S3C64XX: mach-real6410: Use common macro to define resources
ARM: S3C64XX: mach-smdk6410: Use common macro to define resources
ARM: S5P64X0: dev-audio: Use common macro to define resources
ARM: S5PC100: dev-audio: Use common macro to define resources
ARM: S5PV210: dev-audio: Use common macro to define resources
ARM: S5PV210: mach-smdkv210: Use common macro to define resources
arch/arm/mach-exynos/dev-ahci.c | 12 +-- arch/arm/mach-exynos/dev-audio.c | 156 +++++------------------------- arch/arm/mach-exynos/mach-armlex4210.c | 13 +-- arch/arm/mach-exynos/mach-smdkv310.c | 13 +-- arch/arm/mach-s3c24xx/bast-ide.c | 36 +------ arch/arm/mach-s3c24xx/mach-amlm5900.c | 9 +-- arch/arm/mach-s3c24xx/mach-anubis.c | 62 ++---------- arch/arm/mach-s3c24xx/mach-at2440evb.c | 19 +--- arch/arm/mach-s3c24xx/mach-bast.c | 45 ++------- arch/arm/mach-s3c24xx/mach-gta02.c | 7 +- arch/arm/mach-s3c24xx/mach-h1940.c | 9 +-- arch/arm/mach-s3c24xx/mach-mini2440.c | 19 +--- arch/arm/mach-s3c24xx/mach-nexcoder.c | 6 +- arch/arm/mach-s3c24xx/mach-osiris.c | 12 +-- arch/arm/mach-s3c24xx/mach-otom.c | 6 +- arch/arm/mach-s3c24xx/mach-qt2410.c | 12 +-- arch/arm/mach-s3c24xx/mach-rx1950.c | 9 +-- arch/arm/mach-s3c24xx/mach-tct_hammer.c | 7 +- arch/arm/mach-s3c24xx/mach-vr1000.c | 39 ++------ arch/arm/mach-s3c24xx/simtec-nor.c | 6 +- arch/arm/mach-s3c64xx/dev-audio.c | 120 ++++-------------------- arch/arm/mach-s3c64xx/dev-uart.c | 48 ++-------- arch/arm/mach-s3c64xx/mach-anw6410.c | 19 +--- arch/arm/mach-s3c64xx/mach-crag6410.c | 26 +---- arch/arm/mach-s3c64xx/mach-mini6410.c | 19 +--- arch/arm/mach-s3c64xx/mach-real6410.c | 19 +--- arch/arm/mach-s3c64xx/mach-smdk6410.c | 13 +-- arch/arm/mach-s5p64x0/dev-audio.c | 72 +++------------ arch/arm/mach-s5pc100/dev-audio.c | 138 +++++----------------------- arch/arm/mach-s5pv210/dev-audio.c | 156 +++++------------------------- arch/arm/mach-s5pv210/mach-smdkv210.c | 19 +--- arch/arm/plat-s3c24xx/dev-uart.c | 56 +++-------- arch/arm/plat-samsung/devs.c | 12 +-- 33 files changed, 224 insertions(+), 990 deletions(-)
Signature · 1 line
1.7.4.1
PATCH 1/33 ARM: SAMSUNG: devs: Use common macro to define resources
CC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/plat-samsung/devs.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-)
arch/arm/plat-samsung/devs.c +2 -10
@@ -272,16 +272,8 @@ struct platform_device s5p_device_fimc3 = {#ifdef CONFIG_S5P_DEV_G2D static struct resource s5p_g2d_resource[] = { - [0 ] = { - .start =S5P_PA_G2D , - .end =S5P_PA_G2D +SZ_4K -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IRQ_2D , - .end =IRQ_2D , - .flags =IORESOURCE_IRQ , - }, + [0 ] =DEFINE_RES_MEM (S5P_PA_G2D ,SZ_4K ), + [1 ] =DEFINE_RES_IRQ (IRQ_2D ), }; struct platform_device s5p_device_g2d = {
Signature · 1 line
1.7.4.1
PATCH 2/33 ARM: EXYNOS: dev-ahci: Use common macro to define resources
In reply to Tushar BeheraCC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-exynos/dev-ahci.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-)
arch/arm/mach-exynos/dev-ahci.c +2 -10
@@ -236,16 +236,8 @@ static struct ahci_platform_data exynos4_ahci_pdata = { };static struct resource exynos4_ahci_resource[] = { - [0 ] = { - .start =EXYNOS4_PA_SATA , - .end =EXYNOS4_PA_SATA +SZ_64K -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =EXYNOS4_IRQ_SATA , - .end =EXYNOS4_IRQ_SATA , - .flags =IORESOURCE_IRQ , - }, + [0 ] =DEFINE_RES_MEM (EXYNOS4_PA_SATA ,SZ_64K ), + [1 ] =DEFINE_RES_IRQ (EXYNOS4_IRQ_SATA ), };static u64 exynos4_ahci_dmamask =DMA_BIT_MASK (32 );
Signature · 1 line
1.7.4.1
PATCH 3/33 ARM: EXYNOS: dev-audio: Use common macro to define resources
In reply to Tushar BeheraCC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-exynos/dev-audio.c | 156 ++++++------------------------------- 1 files changed, 26 insertions(+), 130 deletions(-)
arch/arm/mach-exynos/dev-audio.c +26 -130
@@ -62,26 +62,10 @@ static struct s3c_audio_pdata i2sv5_pdata = { };static struct resource exynos4_i2s0_resource[] = { - [0 ] = { - .start =EXYNOS4_PA_I2S0 , - .end =EXYNOS4_PA_I2S0 +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_I2S0_TX , - .end =DMACH_I2S0_TX , - .flags =IORESOURCE_DMA , - }, - [2 ] = { - .start =DMACH_I2S0_RX , - .end =DMACH_I2S0_RX , - .flags =IORESOURCE_DMA , - }, - [3 ] = { - .start =DMACH_I2S0S_TX , - .end =DMACH_I2S0S_TX , - .flags =IORESOURCE_DMA , - }, + [0 ] =DEFINE_RES_MEM (EXYNOS4_PA_I2S0 ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_I2S0_TX ), + [2 ] =DEFINE_RES_DMA (DMACH_I2S0_RX ), + [3 ] =DEFINE_RES_DMA (DMACH_I2S0S_TX ), };struct platform_device exynos4_device_i2s0 = {
@@ -110,21 +94,9 @@ static struct s3c_audio_pdata i2sv3_pdata = { };static struct resource exynos4_i2s1_resource[] = { - [0 ] = { - .start =EXYNOS4_PA_I2S1 , - .end =EXYNOS4_PA_I2S1 +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_I2S1_TX , - .end =DMACH_I2S1_TX , - .flags =IORESOURCE_DMA , - }, - [2 ] = { - .start =DMACH_I2S1_RX , - .end =DMACH_I2S1_RX , - .flags =IORESOURCE_DMA , - }, + [0 ] =DEFINE_RES_MEM (EXYNOS4_PA_I2S1 ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_I2S1_TX ), + [2 ] =DEFINE_RES_DMA (DMACH_I2S1_RX ), };struct platform_device exynos4_device_i2s1 = {
@@ -138,21 +110,9 @@ struct platform_device exynos4_device_i2s1 = { };static struct resource exynos4_i2s2_resource[] = { - [0 ] = { - .start =EXYNOS4_PA_I2S2 , - .end =EXYNOS4_PA_I2S2 +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_I2S2_TX , - .end =DMACH_I2S2_TX , - .flags =IORESOURCE_DMA , - }, - [2 ] = { - .start =DMACH_I2S2_RX , - .end =DMACH_I2S2_RX , - .flags =IORESOURCE_DMA , - }, + [0 ] =DEFINE_RES_MEM (EXYNOS4_PA_I2S2 ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_I2S2_TX ), + [2 ] =DEFINE_RES_DMA (DMACH_I2S2_RX ), };struct platform_device exynos4_device_i2s2 = {
@@ -192,21 +152,9 @@ static struct s3c_audio_pdata s3c_pcm_pdata = { };static struct resource exynos4_pcm0_resource[] = { - [0 ] = { - .start =EXYNOS4_PA_PCM0 , - .end =EXYNOS4_PA_PCM0 +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_PCM0_TX , - .end =DMACH_PCM0_TX , - .flags =IORESOURCE_DMA , - }, - [2 ] = { - .start =DMACH_PCM0_RX , - .end =DMACH_PCM0_RX , - .flags =IORESOURCE_DMA , - }, + [0 ] =DEFINE_RES_MEM (EXYNOS4_PA_PCM0 ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_PCM0_TX ), + [2 ] =DEFINE_RES_DMA (DMACH_PCM0_RX ), };struct platform_device exynos4_device_pcm0 = {
@@ -220,21 +168,9 @@ struct platform_device exynos4_device_pcm0 = { };static struct resource exynos4_pcm1_resource[] = { - [0 ] = { - .start =EXYNOS4_PA_PCM1 , - .end =EXYNOS4_PA_PCM1 +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_PCM1_TX , - .end =DMACH_PCM1_TX , - .flags =IORESOURCE_DMA , - }, - [2 ] = { - .start =DMACH_PCM1_RX , - .end =DMACH_PCM1_RX , - .flags =IORESOURCE_DMA , - }, + [0 ] =DEFINE_RES_MEM (EXYNOS4_PA_PCM1 ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_PCM1_TX ), + [2 ] =DEFINE_RES_DMA (DMACH_PCM1_RX ), };struct platform_device exynos4_device_pcm1 = {
@@ -248,21 +184,9 @@ struct platform_device exynos4_device_pcm1 = { };static struct resource exynos4_pcm2_resource[] = { - [0 ] = { - .start =EXYNOS4_PA_PCM2 , - .end =EXYNOS4_PA_PCM2 +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_PCM2_TX , - .end =DMACH_PCM2_TX , - .flags =IORESOURCE_DMA , - }, - [2 ] = { - .start =DMACH_PCM2_RX , - .end =DMACH_PCM2_RX , - .flags =IORESOURCE_DMA , - }, + [0 ] =DEFINE_RES_MEM (EXYNOS4_PA_PCM2 ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_PCM2_TX ), + [2 ] =DEFINE_RES_DMA (DMACH_PCM2_RX ), };struct platform_device exynos4_device_pcm2 = {
@@ -283,31 +207,11 @@ static int exynos4_ac97_cfg_gpio(struct platform_device *pdev) }static struct resource exynos4_ac97_resource[] = { - [0 ] = { - .start =EXYNOS4_PA_AC97 , - .end =EXYNOS4_PA_AC97 +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_AC97_PCMOUT , - .end =DMACH_AC97_PCMOUT , - .flags =IORESOURCE_DMA , - }, - [2 ] = { - .start =DMACH_AC97_PCMIN , - .end =DMACH_AC97_PCMIN , - .flags =IORESOURCE_DMA , - }, - [3 ] = { - .start =DMACH_AC97_MICIN , - .end =DMACH_AC97_MICIN , - .flags =IORESOURCE_DMA , - }, - [4 ] = { - .start =EXYNOS4_IRQ_AC97 , - .end =EXYNOS4_IRQ_AC97 , - .flags =IORESOURCE_IRQ , - }, + [0 ] =DEFINE_RES_MEM (EXYNOS4_PA_AC97 ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_AC97_PCMOUT ), + [2 ] =DEFINE_RES_DMA (DMACH_AC97_PCMIN ), + [3 ] =DEFINE_RES_DMA (DMACH_AC97_MICIN ), + [4 ] =DEFINE_RES_IRQ (EXYNOS4_IRQ_AC97 ), };static struct s3c_audio_pdata s3c_ac97_pdata = {
@@ -338,16 +242,8 @@ static int exynos4_spdif_cfg_gpio(struct platform_device *pdev) }static struct resource exynos4_spdif_resource[] = { - [0 ] = { - .start =EXYNOS4_PA_SPDIF , - .end =EXYNOS4_PA_SPDIF +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_SPDIF , - .end =DMACH_SPDIF , - .flags =IORESOURCE_DMA , - }, + [0 ] =DEFINE_RES_MEM (EXYNOS4_PA_SPDIF ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_SPDIF ), };static struct s3c_audio_pdata samsung_spdif_pdata = {
Signature · 1 line
1.7.4.1
PATCH 4/33 ARM: EXYNOS: mach-armlex4210: Use common macro to define resources
In reply to Tushar BeheraCC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-exynos/mach-armlex4210.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-)
arch/arm/mach-exynos/mach-armlex4210.c +3 -10
@@ -118,16 +118,9 @@ static void __init armlex4210_wlan_init(void) }static struct resource armlex4210_smsc911x_resources[] = { - [0 ] = { - .start =EXYNOS4_PA_SROM_BANK (3 ), - .end =EXYNOS4_PA_SROM_BANK (3 ) +SZ_64K -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IRQ_EINT (27 ), - .end =IRQ_EINT (27 ), - .flags =IORESOURCE_IRQ |IRQF_TRIGGER_HIGH , - }, + [0 ] =DEFINE_RES_MEM (EXYNOS4_PA_SROM_BANK (3 ),SZ_64K ), + [1 ] =DEFINE_RES_NAMED (IRQ_EINT (27 ),1 ,NULL ,IORESOURCE_IRQ \ + |IRQF_TRIGGER_HIGH ), };static struct smsc911x_platform_config smsc9215_config = {
Signature · 1 line
1.7.4.1
PATCH 5/33 ARM: EXYNOS: mach-smdkv310: Use common macro to define resources
In reply to Tushar BeheraCC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-exynos/mach-smdkv310.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-)
arch/arm/mach-exynos/mach-smdkv310.c +3 -10
@@ -179,16 +179,9 @@ static struct s3c_fb_platdata smdkv310_lcd0_pdata __initdata = { };static struct resource smdkv310_smsc911x_resources[] = { - [0 ] = { - .start =EXYNOS4_PA_SROM_BANK (1 ), - .end =EXYNOS4_PA_SROM_BANK (1 ) +SZ_64K -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IRQ_EINT (5 ), - .end =IRQ_EINT (5 ), - .flags =IORESOURCE_IRQ |IRQF_TRIGGER_LOW , - }, + [0 ] =DEFINE_RES_MEM (EXYNOS4_PA_SROM_BANK (1 ),SZ_64K ), + [1 ] =DEFINE_RES_NAMED (IRQ_EINT (5 ),1 ,NULL ,IORESOURCE_IRQ \ + |IRQF_TRIGGER_LOW ), };static struct smsc911x_platform_config smsc9215_config = {
Signature · 1 line
1.7.4.1
PATCH 6/33 ARM: S3C24XX: dev-uart: Use common macro to define resources
In reply to Tushar BeheraCC Ben Dooks <[email protected]>
CC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/plat-s3c24xx/dev-uart.c | 56 +++++++++++--------------------------- 1 files changed, 16 insertions(+), 40 deletions(-)
arch/arm/plat-s3c24xx/dev-uart.c +16 -40
@@ -29,55 +29,31 @@/* Serial port registrations */ static struct resource s3c2410_uart0_resource[] = { - [0 ] = { - .start =S3C2410_PA_UART0 , - .end =S3C2410_PA_UART0 +0x3fff , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IRQ_S3CUART_RX0 , - .end =IRQ_S3CUART_ERR0 , - .flags =IORESOURCE_IRQ , - } + [0 ] =DEFINE_RES_MEM (S3C2410_PA_UART0 ,SZ_16K ), + [1 ] =DEFINE_RES_NAMED (IRQ_S3CUART_RX0 , \ +IRQ_S3CUART_ERR0 -IRQ_S3CUART_RX0 +1 , \ +NULL ,IORESOURCE_IRQ ) };static struct resource s3c2410_uart1_resource[] = { - [0 ] = { - .start =S3C2410_PA_UART1 , - .end =S3C2410_PA_UART1 +0x3fff , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IRQ_S3CUART_RX1 , - .end =IRQ_S3CUART_ERR1 , - .flags =IORESOURCE_IRQ , - } + [0 ] =DEFINE_RES_MEM (S3C2410_PA_UART1 ,SZ_16K ), + [1 ] =DEFINE_RES_NAMED (IRQ_S3CUART_RX1 , \ +IRQ_S3CUART_ERR1 -IRQ_S3CUART_RX1 +1 , \ +NULL ,IORESOURCE_IRQ ) };static struct resource s3c2410_uart2_resource[] = { - [0 ] = { - .start =S3C2410_PA_UART2 , - .end =S3C2410_PA_UART2 +0x3fff , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IRQ_S3CUART_RX2 , - .end =IRQ_S3CUART_ERR2 , - .flags =IORESOURCE_IRQ , - } + [0 ] =DEFINE_RES_MEM (S3C2410_PA_UART2 ,SZ_16K ), + [1 ] =DEFINE_RES_NAMED (IRQ_S3CUART_RX2 , \ +IRQ_S3CUART_ERR2 -IRQ_S3CUART_RX2 +1 , \ +NULL ,IORESOURCE_IRQ ) };static struct resource s3c2410_uart3_resource[] = { - [0 ] = { - .start =S3C2443_PA_UART3 , - .end =S3C2443_PA_UART3 +0x3fff , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IRQ_S3CUART_RX3 , - .end =IRQ_S3CUART_ERR3 , - .flags =IORESOURCE_IRQ , - }, + [0 ] =DEFINE_RES_MEM (S3C2443_PA_UART3 ,SZ_16K ), + [1 ] =DEFINE_RES_NAMED (IRQ_S3CUART_RX3 , \ +IRQ_S3CUART_ERR3 -IRQ_S3CUART_RX3 +1 , \ +NULL ,IORESOURCE_IRQ ) };struct s3c24xx_uart_resources s3c2410_uart_resources[]__initdata = {
Signature · 1 line
1.7.4.1
PATCH 6/33 ARM: S3C24XX: dev-uart: Use common macro to define resources
Am Mittwoch, 25. April 2012, 06:12:16 schrieb Tushar Behera:
Quoted 3 lines
CC Ben Dooks <[email protected]>CC Kukjin Kim <[email protected]>Signed-off-by Tushar Behera <[email protected]>
Acked-by Heiko Stuebner <[email protected]>
Quoted 81 lines
--- arch/arm/plat-s3c24xx/dev-uart.c | 56+++++++++++--------------------------- 1 files changed, 16 insertions(+), 40 deletions(-)
(quoted diff) +0
-0
b/arch/arm/plat-s3c24xx/dev-uart.cindex 9ab22e6..d779216 100644arch/arm/plat-s3c24xx/dev-uart.c +16
-40@@ -29,55 +29,31 @@/* Serial port registrations */ static struct resource s3c2410_uart0_resource[] = { - [0 ] = { - .start =S3C2410_PA_UART0 , - .end =S3C2410_PA_UART0 +0x3fff , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IRQ_S3CUART_RX0 , - .end =IRQ_S3CUART_ERR0 , - .flags =IORESOURCE_IRQ , - } + [0 ] =DEFINE_RES_MEM (S3C2410_PA_UART0 ,SZ_16K ), + [1 ] =DEFINE_RES_NAMED (IRQ_S3CUART_RX0 , \ +IRQ_S3CUART_ERR0 -IRQ_S3CUART_RX0 +1 , \ +NULL ,IORESOURCE_IRQ ) };static struct resource s3c2410_uart1_resource[] = { - [0 ] = { - .start =S3C2410_PA_UART1 , - .end =S3C2410_PA_UART1 +0x3fff , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IRQ_S3CUART_RX1 , - .end =IRQ_S3CUART_ERR1 , - .flags =IORESOURCE_IRQ , - } + [0 ] =DEFINE_RES_MEM (S3C2410_PA_UART1 ,SZ_16K ), + [1 ] =DEFINE_RES_NAMED (IRQ_S3CUART_RX1 , \ +IRQ_S3CUART_ERR1 -IRQ_S3CUART_RX1 +1 , \ +NULL ,IORESOURCE_IRQ ) };static struct resource s3c2410_uart2_resource[] = { - [0 ] = { - .start =S3C2410_PA_UART2 , - .end =S3C2410_PA_UART2 +0x3fff , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IRQ_S3CUART_RX2 , - .end =IRQ_S3CUART_ERR2 , - .flags =IORESOURCE_IRQ , - } + [0 ] =DEFINE_RES_MEM (S3C2410_PA_UART2 ,SZ_16K ), + [1 ] =DEFINE_RES_NAMED (IRQ_S3CUART_RX2 , \ +IRQ_S3CUART_ERR2 -IRQ_S3CUART_RX2 +1 , \ +NULL ,IORESOURCE_IRQ ) };static struct resource s3c2410_uart3_resource[] = { - [0 ] = { - .start =S3C2443_PA_UART3 , - .end =S3C2443_PA_UART3 +0x3fff , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IRQ_S3CUART_RX3 , - .end =IRQ_S3CUART_ERR3 , - .flags =IORESOURCE_IRQ , - }, + [0 ] =DEFINE_RES_MEM (S3C2443_PA_UART3 ,SZ_16K ), + [1 ] =DEFINE_RES_NAMED (IRQ_S3CUART_RX3 , \ +IRQ_S3CUART_ERR3 -IRQ_S3CUART_RX3 +1 , \ +NULL ,IORESOURCE_IRQ ) };struct s3c24xx_uart_resources s3c2410_uart_resources[]__initdata = {
PATCH v2 6/33 ARM: S3C24XX: dev-uart: Use common macro to define resources
In reply to Tushar BeheraFrom: Tushar Behera <[email protected]>
CC Ben Dooks <[email protected]>
CC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
Signed-off-by Heiko Stuebner <[email protected]>
---
changes since v1: update the patch to apply against the moved dev-uart devices As this patch does not touch anything else apart from the uart devices it could also be applied on top of the movement patches directly
arch/arm/mach-s3c24xx/common.c | 56 +++++++++++---------------------------- 1 files changed, 16 insertions(+), 40 deletions(-)
arch/arm/mach-s3c24xx/common.c +16 -40
@@ -241,55 +241,31 @@ void __init s3c24xx_init_io(struct map_desc *mach_desc, int size)/* Serial port registrations */ static struct resource s3c2410_uart0_resource[] = { - [0 ] = { - .start =S3C2410_PA_UART0 , - .end =S3C2410_PA_UART0 +0x3fff , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IRQ_S3CUART_RX0 , - .end =IRQ_S3CUART_ERR0 , - .flags =IORESOURCE_IRQ , - } + [0 ] =DEFINE_RES_MEM (S3C2410_PA_UART0 ,SZ_16K ), + [1 ] =DEFINE_RES_NAMED (IRQ_S3CUART_RX0 , \ +IRQ_S3CUART_ERR0 -IRQ_S3CUART_RX0 +1 , \ +NULL ,IORESOURCE_IRQ ) };static struct resource s3c2410_uart1_resource[] = { - [0 ] = { - .start =S3C2410_PA_UART1 , - .end =S3C2410_PA_UART1 +0x3fff , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IRQ_S3CUART_RX1 , - .end =IRQ_S3CUART_ERR1 , - .flags =IORESOURCE_IRQ , - } + [0 ] =DEFINE_RES_MEM (S3C2410_PA_UART1 ,SZ_16K ), + [1 ] =DEFINE_RES_NAMED (IRQ_S3CUART_RX1 , \ +IRQ_S3CUART_ERR1 -IRQ_S3CUART_RX1 +1 , \ +NULL ,IORESOURCE_IRQ ) };static struct resource s3c2410_uart2_resource[] = { - [0 ] = { - .start =S3C2410_PA_UART2 , - .end =S3C2410_PA_UART2 +0x3fff , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IRQ_S3CUART_RX2 , - .end =IRQ_S3CUART_ERR2 , - .flags =IORESOURCE_IRQ , - } + [0 ] =DEFINE_RES_MEM (S3C2410_PA_UART2 ,SZ_16K ), + [1 ] =DEFINE_RES_NAMED (IRQ_S3CUART_RX2 , \ +IRQ_S3CUART_ERR2 -IRQ_S3CUART_RX2 +1 , \ +NULL ,IORESOURCE_IRQ ) };static struct resource s3c2410_uart3_resource[] = { - [0 ] = { - .start =S3C2443_PA_UART3 , - .end =S3C2443_PA_UART3 +0x3fff , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IRQ_S3CUART_RX3 , - .end =IRQ_S3CUART_ERR3 , - .flags =IORESOURCE_IRQ , - }, + [0 ] =DEFINE_RES_MEM (S3C2443_PA_UART3 ,SZ_16K ), + [1 ] =DEFINE_RES_NAMED (IRQ_S3CUART_RX3 , \ +IRQ_S3CUART_ERR3 -IRQ_S3CUART_RX3 +1 , \ +NULL ,IORESOURCE_IRQ ) };struct s3c24xx_uart_resources s3c2410_uart_resources[]__initdata = {
Signature · 1 line
1.7.5.4
PATCH v2 6/33 ARM: S3C24XX: dev-uart: Use common macro to define resources
Quoted 7 lines · Heiko St?bner
From: Tushar Behera <[email protected]>
CC Ben Dooks <[email protected]>CC Kukjin Kim <[email protected]>Signed-off-by Tushar Behera <[email protected]>Signed-off-by Heiko Stuebner <[email protected]>
Quoted 8 lines
---
changes since v1: update the patch to apply against the moved dev-uart devices
As this patch does not touch anything else apart from the uart devices it could
also be applied on top of the movement patches directlyarch/arm/mach-s3c24xx/common.c | 56
+++++++++++-------------------------
Quoted 80 lines
---
1 files changed, 16 insertions(+), 40 deletions(-)arch/arm/mach- renamed from arch/arm/mach-s3c24xx/common.c +0
-0
s3c24xx/common.c
index d42423a..56cdd34 100644arch/arm/mach-s3c24xx/common.c +16
-40@@ -241,55 +241,31 @@ void __init s3c24xx_init_io(struct map_desc *mach_desc, int size)/* Serial port registrations */ static struct resource s3c2410_uart0_resource[] = { - [0 ] = { - .start =S3C2410_PA_UART0 , - .end =S3C2410_PA_UART0 +0x3fff , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IRQ_S3CUART_RX0 , - .end =IRQ_S3CUART_ERR0 , - .flags =IORESOURCE_IRQ , - } + [0 ] =DEFINE_RES_MEM (S3C2410_PA_UART0 ,SZ_16K ), + [1 ] =DEFINE_RES_NAMED (IRQ_S3CUART_RX0 , \ +IRQ_S3CUART_ERR0 -IRQ_S3CUART_RX0 +1 , \ +NULL ,IORESOURCE_IRQ ) };static struct resource s3c2410_uart1_resource[] = { - [0 ] = { - .start =S3C2410_PA_UART1 , - .end =S3C2410_PA_UART1 +0x3fff , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IRQ_S3CUART_RX1 , - .end =IRQ_S3CUART_ERR1 , - .flags =IORESOURCE_IRQ , - } + [0 ] =DEFINE_RES_MEM (S3C2410_PA_UART1 ,SZ_16K ), + [1 ] =DEFINE_RES_NAMED (IRQ_S3CUART_RX1 , \ +IRQ_S3CUART_ERR1 -IRQ_S3CUART_RX1 +1 , \ +NULL ,IORESOURCE_IRQ ) };static struct resource s3c2410_uart2_resource[] = { - [0 ] = { - .start =S3C2410_PA_UART2 , - .end =S3C2410_PA_UART2 +0x3fff , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IRQ_S3CUART_RX2 , - .end =IRQ_S3CUART_ERR2 , - .flags =IORESOURCE_IRQ , - } + [0 ] =DEFINE_RES_MEM (S3C2410_PA_UART2 ,SZ_16K ), + [1 ] =DEFINE_RES_NAMED (IRQ_S3CUART_RX2 , \ +IRQ_S3CUART_ERR2 -IRQ_S3CUART_RX2 +1 , \ +NULL ,IORESOURCE_IRQ ) };static struct resource s3c2410_uart3_resource[] = { - [0 ] = { - .start =S3C2443_PA_UART3 , - .end =S3C2443_PA_UART3 +0x3fff , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IRQ_S3CUART_RX3 , - .end =IRQ_S3CUART_ERR3 , - .flags =IORESOURCE_IRQ , - }, + [0 ] =DEFINE_RES_MEM (S3C2443_PA_UART3 ,SZ_16K ), + [1 ] =DEFINE_RES_NAMED (IRQ_S3CUART_RX3 , \ +IRQ_S3CUART_ERR3 -IRQ_S3CUART_RX3 +1 , \ +NULL ,IORESOURCE_IRQ ) };
Quoted 3 lines
struct
s3c24xx_uart_resourcess3c2410_uart_resources[]__initdata= {
--
1.7.5.4
OK, will apply.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
PATCH 7/33 ARM: S3C24XX: bast-ide: Use common macro to define resources
In reply to Tushar BeheraCC Ben Dooks <[email protected]>
CC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-s3c24xx/bast-ide.c | 36 ++++++------------------------------ 1 files changed, 6 insertions(+), 30 deletions(-)
arch/arm/mach-s3c24xx/bast-ide.c +6 -30
@@ -37,21 +37,9 @@ static struct pata_platform_info bast_ide_platdata = {#define IDE_CS S3C2410_CS5static struct resource bast_ide0_resource[] = { - [0 ] = { - .start =IDE_CS +BAST_PA_IDEPRI , - .end =IDE_CS +BAST_PA_IDEPRI + (8 *0x20 ) -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IDE_CS +BAST_PA_IDEPRIAUX + (6 *0x20 ) , - .end =IDE_CS +BAST_PA_IDEPRIAUX + (7 *0x20 ) -1 , - .flags =IORESOURCE_MEM , - }, - [2 ] = { - .start =IRQ_IDE0 , - .end =IRQ_IDE0 , - .flags =IORESOURCE_IRQ , - }, + [0 ] =DEFINE_RES_MEM (IDE_CS +BAST_PA_IDEPRI ,8 *0x20 ), + [1 ] =DEFINE_RES_MEM (IDE_CS +BAST_PA_IDEPRIAUX + (6 *0x20 ),0x20 ), + [2 ] =DEFINE_RES_IRQ (IRQ_IDE0 ), };static struct platform_device bast_device_ide0 = {
@@ -67,21 +55,9 @@ static struct platform_device bast_device_ide0 = { };static struct resource bast_ide1_resource[] = { - [0 ] = { - .start =IDE_CS +BAST_PA_IDESEC , - .end =IDE_CS +BAST_PA_IDESEC + (8 *0x20 ) -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IDE_CS +BAST_PA_IDESECAUX + (6 *0x20 ), - .end =IDE_CS +BAST_PA_IDESECAUX + (7 *0x20 ) -1 , - .flags =IORESOURCE_MEM , - }, - [2 ] = { - .start =IRQ_IDE1 , - .end =IRQ_IDE1 , - .flags =IORESOURCE_IRQ , - }, + [0 ] =DEFINE_RES_MEM (IDE_CS +BAST_PA_IDESEC ,8 *0x20 ), + [1 ] =DEFINE_RES_MEM (IDE_CS +BAST_PA_IDESECAUX + (6 *0x20 ),0x20 ), + [2 ] =DEFINE_RES_IRQ (IRQ_IDE1 ), };static struct platform_device bast_device_ide1 = {
Signature · 1 line
1.7.4.1
PATCH 8/33 ARM: S3C24XX: mach-amlm5900: Use common macro to define resources
In reply to Tushar BeheraCC Ben Dooks <[email protected]>
CC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-s3c24xx/mach-amlm5900.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-)
arch/arm/mach-s3c24xx/mach-amlm5900.c +2 -7
@@ -65,13 +65,8 @@#include "common.h" -static struct resource amlm5900_nor_resource = { - .start =0x00000000 , - .end =0x01000000 -1 , - .flags =IORESOURCE_MEM , -}; - - +static struct resource amlm5900_nor_resource = +DEFINE_RES_MEM (0x00000000 ,SZ_16M );static struct mtd_partition amlm5900_mtd_partitions[] = { {
Signature · 1 line
1.7.4.1
PATCH 9/33 ARM: S3C24XX: mach-anubis: Use common macro to define resources
In reply to Tushar BeheraCC Ben Dooks <[email protected]>
CC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-s3c24xx/mach-anubis.c | 62 ++++++---------------------------- 1 files changed, 11 insertions(+), 51 deletions(-)
arch/arm/mach-s3c24xx/mach-anubis.c +11 -51
@@ -235,19 +235,9 @@ static struct pata_platform_info anubis_ide_platdata = { };static struct resource anubis_ide0_resource[] = { - { - .start =S3C2410_CS3 , - .end =S3C2410_CS3 + (8 *32 ) -1 , - .flags =IORESOURCE_MEM , - }, { - .start =S3C2410_CS3 + (1 <<26 ) + (6 *32 ), - .end =S3C2410_CS3 + (1 <<26 ) + (7 *32 ) -1 , - .flags =IORESOURCE_MEM , - }, { - .start =IRQ_IDE0 , - .end =IRQ_IDE0 , - .flags =IORESOURCE_IRQ , - }, + [0 ] =DEFINE_RES_MEM (S3C2410_CS3 ,8 *32 ), + [2 ] =DEFINE_RES_MEM (S3C2410_CS3 + (1 <<26 ) + (6 *32 ),32 ), + [3 ] =DEFINE_RES_IRQ (IRQ_IDE0 ), };static struct platform_device anubis_device_ide0 = {
@@ -262,19 +252,9 @@ static struct platform_device anubis_device_ide0 = { };static struct resource anubis_ide1_resource[] = { - { - .start =S3C2410_CS4 , - .end =S3C2410_CS4 + (8 *32 ) -1 , - .flags =IORESOURCE_MEM , - }, { - .start =S3C2410_CS4 + (1 <<26 ) + (6 *32 ), - .end =S3C2410_CS4 + (1 <<26 ) + (7 *32 ) -1 , - .flags =IORESOURCE_MEM , - }, { - .start =IRQ_IDE0 , - .end =IRQ_IDE0 , - .flags =IORESOURCE_IRQ , - }, + [0 ] =DEFINE_RES_MEM (S3C2410_CS4 ,8 *32 ), + [1 ] =DEFINE_RES_MEM (S3C2410_CS4 + (1 <<26 ) + (6 *32 ),32 ), + [2 ] =DEFINE_RES_IRQ (IRQ_IDE0 ), };static struct platform_device anubis_device_ide1 = {
@@ -298,16 +278,8 @@ static struct ax_plat_data anubis_asix_platdata = { };static struct resource anubis_asix_resource[] = { - [0 ] = { - .start =S3C2410_CS5 , - .end =S3C2410_CS5 + (0x20 *0x20 ) -1 , - .flags =IORESOURCE_MEM - }, - [1 ] = { - .start =IRQ_ASIX , - .end =IRQ_ASIX , - .flags =IORESOURCE_IRQ - } + [0 ] =DEFINE_RES_MEM (S3C2410_CS5 ,0x20 *0x20 ), + [1 ] =DEFINE_RES_IRQ (IRQ_ASIX ), };static struct platform_device anubis_device_asix = {
@@ -323,21 +295,9 @@ static struct platform_device anubis_device_asix = {/* SM501 */ static struct resource anubis_sm501_resource[] = { - [0 ] = { - .start =S3C2410_CS2 , - .end =S3C2410_CS2 +SZ_8M , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =S3C2410_CS2 +SZ_64M -SZ_2M , - .end =S3C2410_CS2 +SZ_64M -1 , - .flags =IORESOURCE_MEM , - }, - [2 ] = { - .start =IRQ_EINT0 , - .end =IRQ_EINT0 , - .flags =IORESOURCE_IRQ , - }, + [0 ] =DEFINE_RES_MEM (S3C2410_CS2 ,SZ_8M ), + [1 ] =DEFINE_RES_MEM (S3C2410_CS2 +SZ_64M -SZ_2M ,SZ_2M ), + [2 ] =DEFINE_RES_IRQ (IRQ_EINT0 ), };static struct sm501_initdata anubis_sm501_initdata = {
Signature · 1 line
1.7.4.1
PATCH 10/33 ARM: S3C24XX: mach-at2440evb: Use common macro to define resources
In reply to Tushar BeheraCC Ben Dooks <[email protected]>
CC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-s3c24xx/mach-at2440evb.c | 19 ++++--------------- 1 files changed, 4 insertions(+), 15 deletions(-)
arch/arm/mach-s3c24xx/mach-at2440evb.c +4 -15
@@ -118,21 +118,10 @@ static struct s3c2410_platform_nand __initdata at2440evb_nand_info = {/* DM9000AEP 10/100 ethernet controller */ static struct resource at2440evb_dm9k_resource[] = { - [0 ] = { - .start =S3C2410_CS3 , - .end =S3C2410_CS3 +3 , - .flags =IORESOURCE_MEM - }, - [1 ] = { - .start =S3C2410_CS3 +4 , - .end =S3C2410_CS3 +7 , - .flags =IORESOURCE_MEM - }, - [2 ] = { - .start =IRQ_EINT7 , - .end =IRQ_EINT7 , - .flags =IORESOURCE_IRQ |IORESOURCE_IRQ_HIGHEDGE , - } + [0 ] =DEFINE_RES_MEM (S3C2410_CS3 ,4 ), + [1 ] =DEFINE_RES_MEM (S3C2410_CS3 +4 ,4 ), + [2 ] =DEFINE_RES_NAMED (IRQ_EINT7 ,1 ,NULL ,IORESOURCE_IRQ \ + |IORESOURCE_IRQ_HIGHEDGE ), };static struct dm9000_plat_data at2440evb_dm9k_pdata = {
Signature · 1 line
1.7.4.1
PATCH 11/33 ARM: S3C24XX: mach-bast: Use common macro to define resources
In reply to Tushar BeheraCC Ben Dooks <[email protected]>
CC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-s3c24xx/mach-bast.c | 45 +++++++----------------------------- 1 files changed, 9 insertions(+), 36 deletions(-)
arch/arm/mach-s3c24xx/mach-bast.c +9 -36
@@ -310,22 +310,10 @@ static struct s3c2410_platform_nand __initdata bast_nand_info = {/* DM9000 */ static struct resource bast_dm9k_resource[] = { - [0 ] = { - .start =S3C2410_CS5 +BAST_PA_DM9000 , - .end =S3C2410_CS5 +BAST_PA_DM9000 +3 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =S3C2410_CS5 +BAST_PA_DM9000 +0x40 , - .end =S3C2410_CS5 +BAST_PA_DM9000 +0x40 +0x3f , - .flags =IORESOURCE_MEM , - }, - [2 ] = { - .start =IRQ_DM9000 , - .end =IRQ_DM9000 , - .flags =IORESOURCE_IRQ |IORESOURCE_IRQ_HIGHLEVEL , - } - + [0 ] =DEFINE_RES_MEM (S3C2410_CS5 +BAST_PA_DM9000 ,4 ), + [1 ] =DEFINE_RES_MEM (S3C2410_CS5 +BAST_PA_DM9000 +0x40 ,0x40 ), + [2 ] =DEFINE_RES_NAMED (IRQ_DM9000 ,1 ,NULL ,IORESOURCE_IRQ \ + |IORESOURCE_IRQ_HIGHLEVEL ), };/* for the moment we limit ourselves to 16bit IO until some
@@ -400,21 +388,9 @@ static struct ax_plat_data bast_asix_platdata = { };static struct resource bast_asix_resource[] = { - [0 ] = { - .start =S3C2410_CS5 +BAST_PA_ASIXNET , - .end =S3C2410_CS5 +BAST_PA_ASIXNET + (0x18 *0x20 ) -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =S3C2410_CS5 +BAST_PA_ASIXNET + (0x1f *0x20 ), - .end =S3C2410_CS5 +BAST_PA_ASIXNET + (0x1f *0x20 ), - .flags =IORESOURCE_MEM , - }, - [2 ] = { - .start =IRQ_ASIX , - .end =IRQ_ASIX , - .flags =IORESOURCE_IRQ - } + [0 ] =DEFINE_RES_MEM (S3C2410_CS5 +BAST_PA_ASIXNET ,0x18 *0x20 ), + [1 ] =DEFINE_RES_MEM (S3C2410_CS5 +BAST_PA_ASIXNET + (0x1f *0x20 ),1 ), + [2 ] =DEFINE_RES_IRQ (IRQ_ASIX ), };static struct platform_device bast_device_asix = {
@@ -430,11 +406,8 @@ static struct platform_device bast_device_asix = {/* Asix AX88796 10/100 ethernet controller parallel port */ static struct resource bast_asixpp_resource[] = { - [0 ] = { - .start =S3C2410_CS5 +BAST_PA_ASIXNET + (0x18 *0x20 ), - .end =S3C2410_CS5 +BAST_PA_ASIXNET + (0x1b *0x20 ) -1 , - .flags =IORESOURCE_MEM , - } + [0 ] =DEFINE_RES_MEM (S3C2410_CS5 +BAST_PA_ASIXNET + (0x18 *0x20 ), \ +0x30 *0x20 ), };static struct platform_device bast_device_axpp = {
Signature · 1 line
1.7.4.1
PATCH 12/33 ARM: S3C24XX: mach-gta02: Use common macro to define resources
In reply to Tushar BeheraCC Nelson Castillo <[email protected]>
CC Ben Dooks <[email protected]>
CC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-s3c24xx/mach-gta02.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)
arch/arm/mach-s3c24xx/mach-gta02.c +2 -5
@@ -387,11 +387,8 @@ static struct physmap_flash_data gta02_nor_flash_data = { .width = 2, }; -static struct resource gta02_nor_flash_resource = { - .start =GTA02_FLASH_BASE , - .end =GTA02_FLASH_BASE +GTA02_FLASH_SIZE -1 , - .flags =IORESOURCE_MEM , -}; +static struct resource gta02_nor_flash_resource = +DEFINE_RES_MEM (GTA02_FLASH_BASE ,GTA02_FLASH_SIZE );static struct platform_device gta02_nor_flash = { .name ="physmap-flash" ,
Signature · 1 line
1.7.4.1
PATCH 13/33 ARM: S3C24XX: mach-h1940: Use common macro to define resources
In reply to Tushar BeheraCC Ben Dooks <[email protected]>
CC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-s3c24xx/mach-h1940.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-)
arch/arm/mach-s3c24xx/mach-h1940.c +2 -7
@@ -253,13 +253,8 @@ static struct pda_power_pdata power_supply_info = { };static struct resource power_supply_resources[] = { - [0 ] = { - .name ="ac" , - .flags =IORESOURCE_IRQ |IORESOURCE_IRQ_LOWEDGE | -IORESOURCE_IRQ_HIGHEDGE , - .start =IRQ_EINT2 , - .end =IRQ_EINT2 , - }, + [0 ] =DEFINE_RES_NAMED (IRQ_EINT2 ,1 ,"ac" ,IORESOURCE_IRQ \ + |IORESOURCE_IRQ_LOWEDGE |IORESOURCE_IRQ_HIGHEDGE ), };static struct platform_device power_supply = {
Signature · 1 line
1.7.4.1
PATCH 14/33 ARM: S3C24XX: mach-mini2440: Use common macro to define resources
In reply to Tushar BeheraCC Michel Pollet <[email protected]>
CC Ben Dooks <[email protected]>
CC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-s3c24xx/mach-mini2440.c | 19 ++++--------------- 1 files changed, 4 insertions(+), 15 deletions(-)
arch/arm/mach-s3c24xx/mach-mini2440.c +4 -15
@@ -292,21 +292,10 @@ static struct s3c2410_platform_nand mini2440_nand_info __initdata = {/* DM9000AEP 10/100 ethernet controller */ static struct resource mini2440_dm9k_resource[] = { - [0 ] = { - .start =MACH_MINI2440_DM9K_BASE , - .end =MACH_MINI2440_DM9K_BASE +3 , - .flags =IORESOURCE_MEM - }, - [1 ] = { - .start =MACH_MINI2440_DM9K_BASE +4 , - .end =MACH_MINI2440_DM9K_BASE +7 , - .flags =IORESOURCE_MEM - }, - [2 ] = { - .start =IRQ_EINT7 , - .end =IRQ_EINT7 , - .flags =IORESOURCE_IRQ |IORESOURCE_IRQ_HIGHEDGE , - } + [0 ] =DEFINE_RES_MEM (MACH_MINI2440_DM9K_BASE ,4 ), + [1 ] =DEFINE_RES_MEM (MACH_MINI2440_DM9K_BASE +4 ,4 ), + [2 ] =DEFINE_RES_NAMED (IRQ_EINT7 ,1 ,NULL ,IORESOURCE_IRQ \ + |IORESOURCE_IRQ_HIGHEDGE ), };/*
Signature · 1 line
1.7.4.1
PATCH 15/33 ARM: S3C24XX: mach-nexcoder: Use common macro to define resources
In reply to Tushar BeheraCC Guillaume GOURAT <[email protected]>
CC Ben Dooks <[email protected]>
CC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-s3c24xx/mach-nexcoder.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-)
arch/arm/mach-s3c24xx/mach-nexcoder.c +1 -5
@@ -84,11 +84,7 @@ static struct s3c2410_uartcfg nexcoder_uartcfgs[] __initdata = {/* NOR Flash on NexVision NexCoder 2440 board */ static struct resource nexcoder_nor_resource[] = { - [0 ] = { - .start =S3C2410_CS0 , - .end =S3C2410_CS0 + (8 *1024 *1024 ) -1 , - .flags =IORESOURCE_MEM , - } + [0 ] =DEFINE_RES_MEM (S3C2410_CS0 ,SZ_8M ), };static struct map_info nexcoder_nor_map = {
Signature · 1 line
1.7.4.1
PATCH 16/33 ARM: S3C24XX: mach-osiris: Use common macro to define resources
In reply to Tushar BeheraCC Ben Dooks <[email protected]>
CC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-s3c24xx/mach-osiris.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-)
arch/arm/mach-s3c24xx/mach-osiris.c +2 -10
@@ -244,16 +244,8 @@ static struct s3c2410_platform_nand __initdata osiris_nand_info = {/* PCMCIA control and configuration */ static struct resource osiris_pcmcia_resource[] = { - [0 ] = { - .start =0x0f000000 , - .end =0x0f100000 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =0x0c000000 , - .end =0x0c100000 , - .flags =IORESOURCE_MEM , - } + [0 ] =DEFINE_RES_MEM (0x0f000000 ,SZ_1M ), + [1 ] =DEFINE_RES_MEM (0x0c000000 ,SZ_1M ), };static struct platform_device osiris_pcmcia = {
Signature · 1 line
1.7.4.1
PATCH 16/33 ARM: S3C24XX: mach-osiris: Use common macro to define resources
Hello.
Quoted 17 lines · Tushar Behera
CC Ben Dooks<[email protected]>CC Kukjin Kim<[email protected]>Signed-off-by Tushar Behera<[email protected]>--- arch/arm/mach-s3c24xx/mach-osiris.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-)arch/arm/mach-s3c24xx/mach-osiris.c +0
-2@@ -244,16 +244,8 @@ static struct s3c2410_platform_nand __initdata osiris_nand_info = {/* PCMCIA control and configuration */ static struct resource osiris_pcmcia_resource[] = { - [0 ] = { - .start =0x0f000000 ,
arch/arm/mach-s3c24xx/mach-osiris.c static struct s3c2410_platform_nand __initdata osiris_nand_info = { · line 248
Quoted 10 lines
arch/arm/mach-s3c24xx/mach-osiris.c +2
-8- .end = 0x0f100000, - .flags = IORESOURCE_MEM, - }, - [1] = { - .start = 0x0c000000, - .end = 0x0c100000, - .flags = IORESOURCE_MEM, - } + [0] = DEFINE_RES_MEM(0x0f000000, SZ_1M), + [1] = DEFINE_RES_MEM(0x0c000000, SZ_1M),
You seem to be fixing the mistake in the original code where - 1 was missing
in the '.end' initializers...
WBR, Sergei
PATCH 16/33 ARM: S3C24XX: mach-osiris: Use common macro to define resources
Quoted 20 lines · Sergei Shtylyov
Hello.
Quoted 16 lines · Tushar Behera
CC Ben Dooks<[email protected]>CC Kukjin Kim<[email protected]>Signed-off-by Tushar Behera<[email protected]>--- arch/arm/mach-s3c24xx/mach-osiris.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-)arch/arm/mach-s3c24xx/mach-osiris.c +0
-0@@ -244,16 +244,8 @@ static struct s3c2410_platform_nand __initdata osiris_nand_info = {/* PCMCIA control and configuration */
Quoted 17 lines
arch/arm/mach-s3c24xx/mach-osiris.c static struct s3c2410_platform_nand __initdata osiris_nand_info = { · line 248
Quoted 13 lines
arch/arm/mach-s3c24xx/mach-osiris.c +2
-10static struct resource osiris_pcmcia_resource[] = { - [0 ] = { - .start =0x0f000000 , - .end =0x0f100000 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =0x0c000000 , - .end =0x0c100000 , - .flags =IORESOURCE_MEM , - } + [0 ] =DEFINE_RES_MEM (0x0f000000 ,SZ_1M ), + [1 ] =DEFINE_RES_MEM (0x0c000000 ,SZ_1M ),You seem to be fixing the mistake in the original code where - 1 was
missing in the '.end' initializers...
I am not sure if the original author intended to have it SZ_1M byte wide or (SZ_1M+1) byte wide. Since the later case seemed highly unlikely, I went ahead with SZ_1M.
Although, I should have mentioned this in the commit log. :(
Quoted 1 line
WBR, Sergei
Signature · 1 line
Tushar Behera
PATCH 17/33 ARM: S3C24XX: mach-otom: Use common macro to define resources
In reply to Tushar BeheraCC Guillaume GOURAT <[email protected]>
CC Ben Dooks <[email protected]>
CC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-s3c24xx/mach-otom.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-)
arch/arm/mach-s3c24xx/mach-otom.c +1 -5
@@ -77,11 +77,7 @@ static struct s3c2410_uartcfg otom11_uartcfgs[] __initdata = {/* NOR Flash on NexVision OTOM board */ static struct resource otom_nor_resource[] = { - [0 ] = { - .start =S3C2410_CS0 , - .end =S3C2410_CS0 + (4 *1024 *1024 ) -1 , - .flags =IORESOURCE_MEM , - } + [0 ] =DEFINE_RES_MEM (S3C2410_CS0 ,SZ_4M ), };static struct platform_device otom_device_nor = {
Signature · 1 line
1.7.4.1
PATCH 18/33 ARM: S3C24XX: mach-qt2410: Use common macro to define resources
In reply to Tushar BeheraCC Ben Dooks <[email protected]>
CC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-s3c24xx/mach-qt2410.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-)
arch/arm/mach-s3c24xx/mach-qt2410.c +2 -10
@@ -180,16 +180,8 @@ static struct s3c2410fb_mach_info qt2410_fb_info __initdata = {/* CS8900 */ static struct resource qt2410_cs89x0_resources[] = { - [0 ] = { - .start =0x19000000 , - .end =0x19000000 +16 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IRQ_EINT9 , - .end =IRQ_EINT9 , - .flags =IORESOURCE_IRQ , - }, + [0 ] =DEFINE_RES_MEM (0x19000000 ,17 ), + [1 ] =DEFINE_RES_IRQ (IRQ_EINT9 ), };static struct platform_device qt2410_cs89x0 = {
Signature · 1 line
1.7.4.1
PATCH 18/33 ARM: S3C24XX: mach-qt2410: Use common macro to define resources
Hello.
Quoted 12 lines · Tushar Behera
CC Ben Dooks<[email protected]>CC Kukjin Kim<[email protected]>Signed-off-by Tushar Behera<[email protected]>--- arch/arm/mach-s3c24xx/mach-qt2410.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-)arch/arm/mach-s3c24xx/mach-qt2410.c +0
-0
arch/arm/mach-s3c24xx/mach-qt2410.c static struct s3c2410fb_mach_info qt2410_fb_info __initdata = { · line 185
Quoted 6 lines
arch/arm/mach-s3c24xx/mach-qt2410.c +0
-3@@ -180,16 +180,8 @@ static struct s3c2410fb_mach_info qt2410_fb_info __initdata = {/* CS8900 */ static struct resource qt2410_cs89x0_resources[] = { - [0 ] = { - .start =0x19000000 , - .end =0x19000000 +16 ,
Are you sure there was no mistake here, with - 1 missing? It looks suspicious...
arch/arm/mach-s3c24xx/mach-qt2410.c static struct s3c2410fb_mach_info qt2410_fb_info __initdata = { · line 187
Quoted 12 lines
arch/arm/mach-s3c24xx/mach-qt2410.c +2
-7- .flags = IORESOURCE_MEM, - }, - [1] = { - .start = IRQ_EINT9, - .end = IRQ_EINT9, - .flags = IORESOURCE_IRQ, - }, + [0] = DEFINE_RES_MEM(0x19000000, 17), + [1] = DEFINE_RES_IRQ(IRQ_EINT9), };static struct platform_device qt2410_cs89x0 = {
WBR, Sergei
PATCH 18/33 ARM: S3C24XX: mach-qt2410: Use common macro to define resources
Quoted 20 lines · Sergei Shtylyov
Hello.
Quoted 16 lines · Tushar Behera
CC Ben Dooks<[email protected]>CC Kukjin Kim<[email protected]>Signed-off-by Tushar Behera<[email protected]>--- arch/arm/mach-s3c24xx/mach-qt2410.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-)arch/arm/mach-s3c24xx/mach-qt2410.c +0
-0@@ -180,16 +180,8 @@ static struct s3c2410fb_mach_info qt2410_fb_info __initdata = {/* CS8900 */
Quoted 8 lines
arch/arm/mach-s3c24xx/mach-qt2410.c static struct s3c2410fb_mach_info qt2410_fb_info __initdata = { · line 185
Quoted 4 lines
arch/arm/mach-s3c24xx/mach-qt2410.c +0
-3static struct resource qt2410_cs89x0_resources[] = { - [0 ] = { - .start =0x19000000 , - .end =0x19000000 +16 ,Are you sure there was no mistake here, with - 1 missing? It looks
suspicious...
I was not very sure here, whether the original author intended to have the memory resource to be 16 byte wide or 17 byte wide. So I went with the original implementation. Though I must agree, 16-byte width looks more plausible.
Quoted 14 lines
Quoted 11 lines
arch/arm/mach-s3c24xx/mach-qt2410.c +2
-7- .flags = IORESOURCE_MEM, - }, - [1] = { - .start = IRQ_EINT9, - .end = IRQ_EINT9, - .flags = IORESOURCE_IRQ, - }, + [0] = DEFINE_RES_MEM(0x19000000, 17), + [1] = DEFINE_RES_IRQ(IRQ_EINT9), };Quoted 1 line
static struct platform_device qt2410_cs89x0 = {WBR, Sergei
Signature · 1 line
Tushar Behera
PATCH 19/33 ARM: S3C24XX: mach-rx1950: Use common macro to define resources
In reply to Tushar BeheraCC Ben Dooks <[email protected]>
CC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-s3c24xx/mach-rx1950.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-)
arch/arm/mach-s3c24xx/mach-rx1950.c +2 -7
@@ -152,13 +152,8 @@ static struct pda_power_pdata power_supply_info = { };static struct resource power_supply_resources[] = { - [0 ] = { - .name ="ac" , - .flags =IORESOURCE_IRQ |IORESOURCE_IRQ_LOWEDGE | -IORESOURCE_IRQ_HIGHEDGE , - .start =IRQ_EINT2 , - .end =IRQ_EINT2 , - }, + [0 ] =DEFINE_RES_NAMED (IRQ_EINT2 ,1 ,"ac" ,IORESOURCE_IRQ \ + |IORESOURCE_IRQ_LOWEDGE |IORESOURCE_IRQ_HIGHEDGE ), };static struct platform_device power_supply = {
Signature · 1 line
1.7.4.1
PATCH 20/33 ARM: S3C24XX: mach-tct_hammer: Use common macro to define resources
In reply to Tushar BeheraCC Ben Dooks <[email protected]>
CC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-s3c24xx/mach-tct_hammer.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)
arch/arm/mach-s3c24xx/mach-tct_hammer.c +2 -5
@@ -56,11 +56,8 @@#include "common.h" -static struct resource tct_hammer_nor_resource = { - .start =0x00000000 , - .end =0x01000000 -1 , - .flags =IORESOURCE_MEM , -}; +static struct resource tct_hammer_nor_resource = +DEFINE_RES_MEM (0x00000000 ,SZ_16M );static struct mtd_partition tct_hammer_mtd_partitions[] = { {
Signature · 1 line
1.7.4.1
PATCH 21/33 ARM: S3C24XX: mach-vr1000: Use common macro to define resources
In reply to Tushar BeheraCC Ben Dooks <[email protected]>
CC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-s3c24xx/mach-vr1000.c | 39 +++++++--------------------------- 1 files changed, 8 insertions(+), 31 deletions(-)
arch/arm/mach-s3c24xx/mach-vr1000.c +8 -31
@@ -187,40 +187,17 @@ static struct platform_device serial_device = {/* DM9000 ethernet devices */ static struct resource vr1000_dm9k0_resource[] = { - [0 ] = { - .start =S3C2410_CS5 +VR1000_PA_DM9000 , - .end =S3C2410_CS5 +VR1000_PA_DM9000 +3 , - .flags =IORESOURCE_MEM - }, - [1 ] = { - .start =S3C2410_CS5 +VR1000_PA_DM9000 +0x40 , - .end =S3C2410_CS5 +VR1000_PA_DM9000 +0x7f , - .flags =IORESOURCE_MEM - }, - [2 ] = { - .start =IRQ_VR1000_DM9000A , - .end =IRQ_VR1000_DM9000A , - .flags =IORESOURCE_IRQ |IORESOURCE_IRQ_HIGHLEVEL , - } - + [0 ] =DEFINE_RES_MEM (S3C2410_CS5 +VR1000_PA_DM9000 ,4 ), + [1 ] =DEFINE_RES_MEM (S3C2410_CS5 +VR1000_PA_DM9000 +0x40 ,0x40 ), + [2 ] =DEFINE_RES_NAMED (IRQ_VR1000_DM9000A ,1 ,NULL ,IORESOURCE_IRQ \ + |IORESOURCE_IRQ_HIGHLEVEL ), };static struct resource vr1000_dm9k1_resource[] = { - [0 ] = { - .start =S3C2410_CS5 +VR1000_PA_DM9000 +0x80 , - .end =S3C2410_CS5 +VR1000_PA_DM9000 +0x83 , - .flags =IORESOURCE_MEM - }, - [1 ] = { - .start =S3C2410_CS5 +VR1000_PA_DM9000 +0xC0 , - .end =S3C2410_CS5 +VR1000_PA_DM9000 +0xFF , - .flags =IORESOURCE_MEM - }, - [2 ] = { - .start =IRQ_VR1000_DM9000N , - .end =IRQ_VR1000_DM9000N , - .flags =IORESOURCE_IRQ |IORESOURCE_IRQ_HIGHLEVEL , - } + [0 ] =DEFINE_RES_MEM (S3C2410_CS5 +VR1000_PA_DM9000 +0x80 ,4 ), + [1 ] =DEFINE_RES_MEM (S3C2410_CS5 +VR1000_PA_DM9000 +0xC0 ,0x40 ), + [2 ] =DEFINE_RES_NAMED (IRQ_VR1000_DM9000N ,1 ,NULL ,IORESOURCE_IRQ \ + |IORESOURCE_IRQ_HIGHLEVEL ), };/* for the moment we limit ourselves to 16bit IO until some
Signature · 1 line
1.7.4.1
PATCH 22/33 ARM: S3C24XX: simtec-nor: Use common macro to define resources
In reply to Tushar BeheraCC Ben Dooks <[email protected]>
CC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-s3c24xx/simtec-nor.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-)
arch/arm/mach-s3c24xx/simtec-nor.c +1 -5
@@ -55,11 +55,7 @@ static struct physmap_flash_data simtec_nor_pdata = { };static struct resource simtec_nor_resource[] = { - [0 ] = { - .start =S3C2410_CS1 +0x4000000 , - .end =S3C2410_CS1 +0x4000000 +SZ_8M -1 , - .flags =IORESOURCE_MEM , - } + [0 ] =DEFINE_RES_MEM (S3C2410_CS1 +0x4000000 ,SZ_8M ), };static struct platform_device simtec_device_nor = {
Signature · 1 line
1.7.4.1
PATCH 23/33 ARM: S3C64XX: dev-audio: Use common macro to define resources
In reply to Tushar BeheraCC Ben Dooks <[email protected]>
CC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-s3c64xx/dev-audio.c | 120 ++++++------------------------------ 1 files changed, 20 insertions(+), 100 deletions(-)
arch/arm/mach-s3c64xx/dev-audio.c +20 -100
@@ -57,21 +57,9 @@ static int s3c64xx_i2s_cfg_gpio(struct platform_device *pdev) }static struct resource s3c64xx_iis0_resource[] = { - [0 ] = { - .start =S3C64XX_PA_IIS0 , - .end =S3C64XX_PA_IIS0 +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_I2S0_OUT , - .end =DMACH_I2S0_OUT , - .flags =IORESOURCE_DMA , - }, - [2 ] = { - .start =DMACH_I2S0_IN , - .end =DMACH_I2S0_IN , - .flags =IORESOURCE_DMA , - }, + [0 ] =DEFINE_RES_MEM (S3C64XX_PA_IIS0 ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_I2S0_OUT ), + [2 ] =DEFINE_RES_DMA (DMACH_I2S0_IN ), };static struct s3c_audio_pdata i2sv3_pdata = {
@@ -95,21 +83,9 @@ struct platform_device s3c64xx_device_iis0 = {EXPORT_SYMBOL (s3c64xx_device_iis0);static struct resource s3c64xx_iis1_resource[] = { - [0 ] = { - .start =S3C64XX_PA_IIS1 , - .end =S3C64XX_PA_IIS1 +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_I2S1_OUT , - .end =DMACH_I2S1_OUT , - .flags =IORESOURCE_DMA , - }, - [2 ] = { - .start =DMACH_I2S1_IN , - .end =DMACH_I2S1_IN , - .flags =IORESOURCE_DMA , - }, + [0 ] =DEFINE_RES_MEM (S3C64XX_PA_IIS1 ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_I2S1_OUT ), + [2 ] =DEFINE_RES_DMA (DMACH_I2S1_IN ), };struct platform_device s3c64xx_device_iis1 = {
@@ -124,21 +100,9 @@ struct platform_device s3c64xx_device_iis1 = {EXPORT_SYMBOL (s3c64xx_device_iis1);static struct resource s3c64xx_iisv4_resource[] = { - [0 ] = { - .start =S3C64XX_PA_IISV4 , - .end =S3C64XX_PA_IISV4 +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_HSI_I2SV40_TX , - .end =DMACH_HSI_I2SV40_TX , - .flags =IORESOURCE_DMA , - }, - [2 ] = { - .start =DMACH_HSI_I2SV40_RX , - .end =DMACH_HSI_I2SV40_RX , - .flags =IORESOURCE_DMA , - }, + [0 ] =DEFINE_RES_MEM (S3C64XX_PA_IISV4 ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_HSI_I2SV40_TX ), + [2 ] =DEFINE_RES_DMA (DMACH_HSI_I2SV40_RX ), };static struct s3c_audio_pdata i2sv4_pdata = {
@@ -187,21 +151,9 @@ static int s3c64xx_pcm_cfg_gpio(struct platform_device *pdev) }static struct resource s3c64xx_pcm0_resource[] = { - [0 ] = { - .start =S3C64XX_PA_PCM0 , - .end =S3C64XX_PA_PCM0 +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_PCM0_TX , - .end =DMACH_PCM0_TX , - .flags =IORESOURCE_DMA , - }, - [2 ] = { - .start =DMACH_PCM0_RX , - .end =DMACH_PCM0_RX , - .flags =IORESOURCE_DMA , - }, + [0 ] =DEFINE_RES_MEM (S3C64XX_PA_PCM0 ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_PCM0_TX ), + [2 ] =DEFINE_RES_DMA (DMACH_PCM0_RX ), };static struct s3c_audio_pdata s3c_pcm0_pdata = {
@@ -220,21 +172,9 @@ struct platform_device s3c64xx_device_pcm0 = {EXPORT_SYMBOL (s3c64xx_device_pcm0);static struct resource s3c64xx_pcm1_resource[] = { - [0 ] = { - .start =S3C64XX_PA_PCM1 , - .end =S3C64XX_PA_PCM1 +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_PCM1_TX , - .end =DMACH_PCM1_TX , - .flags =IORESOURCE_DMA , - }, - [2 ] = { - .start =DMACH_PCM1_RX , - .end =DMACH_PCM1_RX , - .flags =IORESOURCE_DMA , - }, + [0 ] =DEFINE_RES_MEM (S3C64XX_PA_PCM1 ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_PCM1_TX ), + [2 ] =DEFINE_RES_DMA (DMACH_PCM1_RX ), };static struct s3c_audio_pdata s3c_pcm1_pdata = {
@@ -265,31 +205,11 @@ static int s3c64xx_ac97_cfg_gpe(struct platform_device *pdev) }static struct resource s3c64xx_ac97_resource[] = { - [0 ] = { - .start =S3C64XX_PA_AC97 , - .end =S3C64XX_PA_AC97 +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_AC97_PCMOUT , - .end =DMACH_AC97_PCMOUT , - .flags =IORESOURCE_DMA , - }, - [2 ] = { - .start =DMACH_AC97_PCMIN , - .end =DMACH_AC97_PCMIN , - .flags =IORESOURCE_DMA , - }, - [3 ] = { - .start =DMACH_AC97_MICIN , - .end =DMACH_AC97_MICIN , - .flags =IORESOURCE_DMA , - }, - [4 ] = { - .start =IRQ_AC97 , - .end =IRQ_AC97 , - .flags =IORESOURCE_IRQ , - }, + [0 ] =DEFINE_RES_MEM (S3C64XX_PA_AC97 ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_AC97_PCMOUT ), + [2 ] =DEFINE_RES_DMA (DMACH_AC97_PCMIN ), + [3 ] =DEFINE_RES_DMA (DMACH_AC97_MICIN ), + [4 ] =DEFINE_RES_IRQ (IRQ_AC97 ), };static struct s3c_audio_pdata s3c_ac97_pdata;
Signature · 1 line
1.7.4.1
PATCH 24/33 ARM: S3C64XX: dev-uart: Use common macro to define resources
In reply to Tushar BeheraCC Ben Dooks <[email protected]>
CC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-s3c64xx/dev-uart.c | 48 ++++++------------------------------- 1 files changed, 8 insertions(+), 40 deletions(-)
arch/arm/mach-s3c64xx/dev-uart.c +8 -40
@@ -31,55 +31,23 @@/* 64xx uarts are closer together */ static struct resource s3c64xx_uart0_resource[] = { - [0 ] = { - .start =S3C_PA_UART0 , - .end =S3C_PA_UART0 +0x100 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IRQ_UART0 , - .end =IRQ_UART0 , - .flags =IORESOURCE_IRQ , - }, + [0 ] =DEFINE_RES_MEM (S3C_PA_UART0 ,SZ_256 ), + [1 ] =DEFINE_RES_IRQ (IRQ_UART0 ), };static struct resource s3c64xx_uart1_resource[] = { - [0 ] = { - .start =S3C_PA_UART1 , - .end =S3C_PA_UART1 +0x100 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IRQ_UART1 , - .end =IRQ_UART1 , - .flags =IORESOURCE_IRQ , - }, + [0 ] =DEFINE_RES_MEM (S3C_PA_UART1 ,SZ_256 ), + [1 ] =DEFINE_RES_IRQ (IRQ_UART1 ), };static struct resource s3c6xx_uart2_resource[] = { - [0 ] = { - .start =S3C_PA_UART2 , - .end =S3C_PA_UART2 +0x100 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IRQ_UART2 , - .end =IRQ_UART2 , - .flags =IORESOURCE_IRQ , - }, + [0 ] =DEFINE_RES_MEM (S3C_PA_UART2 ,SZ_256 ), + [1 ] =DEFINE_RES_IRQ (IRQ_UART2 ), };static struct resource s3c64xx_uart3_resource[] = { - [0 ] = { - .start =S3C_PA_UART3 , - .end =S3C_PA_UART3 +0x100 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =IRQ_UART3 , - .end =IRQ_UART3 , - .flags =IORESOURCE_IRQ , - }, + [0 ] =DEFINE_RES_MEM (S3C_PA_UART3 ,SZ_256 ), + [1 ] =DEFINE_RES_IRQ (IRQ_UART3 ), };
Signature · 1 line
1.7.4.1
PATCH 25/33 ARM: S3C64XX: mach-anw6410: Use common macro to define resources
In reply to Tushar BeheraCC Kwangwoo Lee <[email protected]>
CC Ben Dooks <[email protected]>
CC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-s3c64xx/mach-anw6410.c | 19 ++++--------------- 1 files changed, 4 insertions(+), 15 deletions(-)
arch/arm/mach-s3c64xx/mach-anw6410.c +4 -15
@@ -165,21 +165,10 @@ static void __init anw6410_dm9000_enable(void) }static struct resource anw6410_dm9000_resource[] = { - [0 ] = { - .start =ANW6410_PA_DM9000 , - .end =ANW6410_PA_DM9000 +3 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =ANW6410_PA_DM9000 +4 , - .end =ANW6410_PA_DM9000 +4 +500 , - .flags =IORESOURCE_MEM , - }, - [2 ] = { - .start =IRQ_EINT (15 ), - .end =IRQ_EINT (15 ), - .flags =IORESOURCE_IRQ |IRQF_TRIGGER_HIGH , - }, + [0 ] =DEFINE_RES_MEM (ANW6410_PA_DM9000 ,4 ), + [1 ] =DEFINE_RES_MEM (ANW6410_PA_DM9000 +4 ,501 ), + [2 ] =DEFINE_RES_NAMED (IRQ_EINT (15 ),1 ,NULL ,IORESOURCE_IRQ \ + |IRQF_TRIGGER_HIGH ), };static struct dm9000_plat_data anw6410_dm9000_pdata = {
Signature · 1 line
1.7.4.1
PATCH 26/33 ARM: S3C64XX: mach-crag6410: Use common macro to define resources
In reply to Tushar BeheraCC Mark Brown <[email protected]>
CC Ben Dooks <[email protected]>
CC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-s3c64xx/mach-crag6410.c | 26 +++++--------------------- 1 files changed, 5 insertions(+), 21 deletions(-)
arch/arm/mach-s3c64xx/mach-crag6410.c +5 -21
@@ -232,21 +232,10 @@ static struct platform_device crag6410_gpio_keydev = { };static struct resource crag6410_dm9k_resource[] = { - [0 ] = { - .start =S3C64XX_PA_XM0CSN5 , - .end =S3C64XX_PA_XM0CSN5 +1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =S3C64XX_PA_XM0CSN5 + (1 <<8 ), - .end =S3C64XX_PA_XM0CSN5 + (1 <<8 ) +1 , - .flags =IORESOURCE_MEM , - }, - [2 ] = { - .start =S3C_EINT (17 ), - .end =S3C_EINT (17 ), - .flags =IORESOURCE_IRQ |IORESOURCE_IRQ_HIGHLEVEL , - }, + [0 ] =DEFINE_RES_MEM (S3C64XX_PA_XM0CSN5 ,2 ), + [1 ] =DEFINE_RES_MEM (S3C64XX_PA_XM0CSN5 + (1 <<8 ),2 ), + [2 ] =DEFINE_RES_NAMED (S3C_EINT (17 ),1 ,NULL ,IORESOURCE_IRQ \ + |IORESOURCE_IRQ_HIGHLEVEL ), };static struct dm9000_plat_data mini6410_dm9k_pdata = {
@@ -262,12 +251,7 @@ static struct platform_device crag6410_dm9k_device = { };static struct resource crag6410_mmgpio_resource[] = { - [0 ] = { - .name ="dat" , - .start =S3C64XX_PA_XM0CSN4 +1 , - .end =S3C64XX_PA_XM0CSN4 +1 , - .flags =IORESOURCE_MEM , - }, + [0 ] =DEFINE_RES_MEM_NAMED (S3C64XX_PA_XM0CSN4 ,1 ,"dat" ), };static struct platform_device crag6410_mmgpio = {
Signature · 1 line
1.7.4.1
PATCH 26/33 ARM: S3C64XX: mach-crag6410: Use common macro to define resources
Quoted 4 lines · Tushar Behera
CC Mark Brown <[email protected]>CC Ben Dooks <[email protected]>CC Kukjin Kim <[email protected]>Signed-off-by Tushar Behera <[email protected]>
Acked-by Mark Brown <[email protected]>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120425/968e4667/attachment.sig>
PATCH 27/33 ARM: S3C64XX: mach-mini6410: Use common macro to define resources
In reply to Tushar BeheraCC Darius Augulis <[email protected]>
CC Ben Dooks <[email protected]>
CC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-s3c64xx/mach-mini6410.c | 19 ++++--------------- 1 files changed, 4 insertions(+), 15 deletions(-)
arch/arm/mach-s3c64xx/mach-mini6410.c +4 -15
@@ -85,21 +85,10 @@ static struct s3c2410_uartcfg mini6410_uartcfgs[] __initdata = {/* DM9000AEP 10/100 ethernet controller */ static struct resource mini6410_dm9k_resource[] = { - [0 ] = { - .start =S3C64XX_PA_XM0CSN1 , - .end =S3C64XX_PA_XM0CSN1 +1 , - .flags =IORESOURCE_MEM - }, - [1 ] = { - .start =S3C64XX_PA_XM0CSN1 +4 , - .end =S3C64XX_PA_XM0CSN1 +5 , - .flags =IORESOURCE_MEM - }, - [2 ] = { - .start =S3C_EINT (7 ), - .end =S3C_EINT (7 ), - .flags =IORESOURCE_IRQ |IORESOURCE_IRQ_HIGHLEVEL - } + [0 ] =DEFINE_RES_MEM (S3C64XX_PA_XM0CSN1 ,2 ), + [1 ] =DEFINE_RES_MEM (S3C64XX_PA_XM0CSN1 +4 ,2 ), + [2 ] =DEFINE_RES_NAMED (S3C_EINT (7 ),1 ,NULL ,IORESOURCE_IRQ \ + |IORESOURCE_IRQ_HIGHLEVEL ), };static struct dm9000_plat_data mini6410_dm9k_pdata = {
Signature · 1 line
1.7.4.1
PATCH 28/33 ARM: S3C64XX: mach-real6410: Use common macro to define resources
In reply to Tushar BeheraCC Darius Augulis <[email protected]>
CC Ben Dooks <[email protected]>
CC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-s3c64xx/mach-real6410.c | 19 ++++--------------- 1 files changed, 4 insertions(+), 15 deletions(-)
arch/arm/mach-s3c64xx/mach-real6410.c +4 -15
@@ -86,21 +86,10 @@ static struct s3c2410_uartcfg real6410_uartcfgs[] __initdata = {/* DM9000AEP 10/100 ethernet controller */ static struct resource real6410_dm9k_resource[] = { - [0 ] = { - .start =S3C64XX_PA_XM0CSN1 , - .end =S3C64XX_PA_XM0CSN1 +1 , - .flags =IORESOURCE_MEM - }, - [1 ] = { - .start =S3C64XX_PA_XM0CSN1 +4 , - .end =S3C64XX_PA_XM0CSN1 +5 , - .flags =IORESOURCE_MEM - }, - [2 ] = { - .start =S3C_EINT (7 ), - .end =S3C_EINT (7 ), - .flags =IORESOURCE_IRQ |IORESOURCE_IRQ_HIGHLEVEL - } + [0 ] =DEFINE_RES_MEM (S3C64XX_PA_XM0CSN1 ,2 ), + [1 ] =DEFINE_RES_MEM (S3C64XX_PA_XM0CSN1 +4 ,2 ), + [2 ] =DEFINE_RES_NAMED (S3C_EINT (7 ),1 ,NULL ,IORESOURCE_IRQ \ + |IORESOURCE_IRQ_HIGHLEVEL ), };static struct dm9000_plat_data real6410_dm9k_pdata = {
Signature · 1 line
1.7.4.1
PATCH 29/33 ARM: S3C64XX: mach-smdk6410: Use common macro to define resources
In reply to Tushar BeheraCC Ben Dooks <[email protected]>
CC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-s3c64xx/mach-smdk6410.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-)
arch/arm/mach-s3c64xx/mach-smdk6410.c +3 -10
@@ -182,16 +182,9 @@ static struct s3c_fb_platdata smdk6410_lcd_pdata __initdata = {*/ static struct resource smdk6410_smsc911x_resources[] = { - [0 ] = { - .start =S3C64XX_PA_XM0CSN1 , - .end =S3C64XX_PA_XM0CSN1 +SZ_64K -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =S3C_EINT (10 ), - .end =S3C_EINT (10 ), - .flags =IORESOURCE_IRQ |IRQ_TYPE_LEVEL_LOW , - }, + [0 ] =DEFINE_RES_MEM (S3C64XX_PA_XM0CSN1 ,SZ_64K ), + [1 ] =DEFINE_RES_NAMED (S3C_EINT (10 ),1 ,NULL ,IORESOURCE_IRQ \ + |IRQ_TYPE_LEVEL_LOW ), };static struct smsc911x_platform_config smdk6410_smsc911x_pdata = {
Signature · 1 line
1.7.4.1
PATCH 30/33 ARM: S5P64X0: dev-audio: Use common macro to define resources
In reply to Tushar BeheraCC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-s5p64x0/dev-audio.c | 72 ++++++------------------------------ 1 files changed, 12 insertions(+), 60 deletions(-)
arch/arm/mach-s5p64x0/dev-audio.c +12 -60
@@ -51,21 +51,9 @@ static struct s3c_audio_pdata s5p6440_i2s_pdata = { };static struct resource s5p64x0_i2s0_resource[] = { - [0 ] = { - .start =S5P64X0_PA_I2S , - .end =S5P64X0_PA_I2S +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_I2S0_TX , - .end =DMACH_I2S0_TX , - .flags =IORESOURCE_DMA , - }, - [2 ] = { - .start =DMACH_I2S0_RX , - .end =DMACH_I2S0_RX , - .flags =IORESOURCE_DMA , - }, + [0 ] =DEFINE_RES_MEM (S5P64X0_PA_I2S ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_I2S0_TX ), + [2 ] =DEFINE_RES_DMA (DMACH_I2S0_RX ), };struct platform_device s5p6440_device_iis = {
@@ -130,21 +118,9 @@ static struct s3c_audio_pdata s5p6450_i2s_pdata = { };static struct resource s5p6450_i2s1_resource[] = { - [0 ] = { - .start =S5P6450_PA_I2S1 , - .end =S5P6450_PA_I2S1 +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_I2S1_TX , - .end =DMACH_I2S1_TX , - .flags =IORESOURCE_DMA , - }, - [2 ] = { - .start =DMACH_I2S1_RX , - .end =DMACH_I2S1_RX , - .flags =IORESOURCE_DMA , - }, + [0 ] =DEFINE_RES_MEM (S5P6450_PA_I2S1 ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_I2S1_TX ), + [2 ] =DEFINE_RES_DMA (DMACH_I2S1_RX ), };struct platform_device s5p6450_device_iis1 = {
@@ -158,21 +134,9 @@ struct platform_device s5p6450_device_iis1 = { };static struct resource s5p6450_i2s2_resource[] = { - [0 ] = { - .start =S5P6450_PA_I2S2 , - .end =S5P6450_PA_I2S2 +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_I2S2_TX , - .end =DMACH_I2S2_TX , - .flags =IORESOURCE_DMA , - }, - [2 ] = { - .start =DMACH_I2S2_RX , - .end =DMACH_I2S2_RX , - .flags =IORESOURCE_DMA , - }, + [0 ] =DEFINE_RES_MEM (S5P6450_PA_I2S2 ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_I2S2_TX ), + [2 ] =DEFINE_RES_DMA (DMACH_I2S2_RX ), };struct platform_device s5p6450_device_iis2 = {
@@ -208,21 +172,9 @@ static struct s3c_audio_pdata s5p6440_pcm_pdata = { };static struct resource s5p6440_pcm0_resource[] = { - [0 ] = { - .start =S5P64X0_PA_PCM , - .end =S5P64X0_PA_PCM +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_PCM0_TX , - .end =DMACH_PCM0_TX , - .flags =IORESOURCE_DMA , - }, - [2 ] = { - .start =DMACH_PCM0_RX , - .end =DMACH_PCM0_RX , - .flags =IORESOURCE_DMA , - }, + [0 ] =DEFINE_RES_MEM (S5P64X0_PA_PCM ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_PCM0_TX ), + [2 ] =DEFINE_RES_DMA (DMACH_PCM0_RX ), };struct platform_device s5p6440_device_pcm = {
Signature · 1 line
1.7.4.1
PATCH 31/33 ARM: S5PC100: dev-audio: Use common macro to define resources
In reply to Tushar BeheraCC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-s5pc100/dev-audio.c | 138 ++++++------------------------------ 1 files changed, 23 insertions(+), 115 deletions(-)
arch/arm/mach-s5pc100/dev-audio.c +23 -115
@@ -56,26 +56,10 @@ static struct s3c_audio_pdata i2sv5_pdata = { };static struct resource s5pc100_iis0_resource[] = { - [0 ] = { - .start =S5PC100_PA_I2S0 , - .end =S5PC100_PA_I2S0 +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_I2S0_TX , - .end =DMACH_I2S0_TX , - .flags =IORESOURCE_DMA , - }, - [2 ] = { - .start =DMACH_I2S0_RX , - .end =DMACH_I2S0_RX , - .flags =IORESOURCE_DMA , - }, - [3 ] = { - .start =DMACH_I2S0S_TX , - .end =DMACH_I2S0S_TX , - .flags =IORESOURCE_DMA , - }, + [0 ] =DEFINE_RES_MEM (S5PC100_PA_I2S0 ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_I2S0_TX ), + [2 ] =DEFINE_RES_DMA (DMACH_I2S0_RX ), + [3 ] =DEFINE_RES_DMA (DMACH_I2S0S_TX ), };struct platform_device s5pc100_device_iis0 = {
@@ -103,21 +87,9 @@ static struct s3c_audio_pdata i2sv3_pdata = { };static struct resource s5pc100_iis1_resource[] = { - [0 ] = { - .start =S5PC100_PA_I2S1 , - .end =S5PC100_PA_I2S1 +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_I2S1_TX , - .end =DMACH_I2S1_TX , - .flags =IORESOURCE_DMA , - }, - [2 ] = { - .start =DMACH_I2S1_RX , - .end =DMACH_I2S1_RX , - .flags =IORESOURCE_DMA , - }, + [0 ] =DEFINE_RES_MEM (S5PC100_PA_I2S1 ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_I2S1_TX ), + [2 ] =DEFINE_RES_DMA (DMACH_I2S1_RX ), };struct platform_device s5pc100_device_iis1 = {
@@ -131,21 +103,9 @@ struct platform_device s5pc100_device_iis1 = { };static struct resource s5pc100_iis2_resource[] = { - [0 ] = { - .start =S5PC100_PA_I2S2 , - .end =S5PC100_PA_I2S2 +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_I2S2_TX , - .end =DMACH_I2S2_TX , - .flags =IORESOURCE_DMA , - }, - [2 ] = { - .start =DMACH_I2S2_RX , - .end =DMACH_I2S2_RX , - .flags =IORESOURCE_DMA , - }, + [0 ] =DEFINE_RES_MEM (S5PC100_PA_I2S2 ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_I2S2_TX ), + [2 ] =DEFINE_RES_DMA (DMACH_I2S2_RX ), };struct platform_device s5pc100_device_iis2 = {
@@ -184,21 +144,9 @@ static struct s3c_audio_pdata s3c_pcm_pdata = { };static struct resource s5pc100_pcm0_resource[] = { - [0 ] = { - .start =S5PC100_PA_PCM0 , - .end =S5PC100_PA_PCM0 +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_PCM0_TX , - .end =DMACH_PCM0_TX , - .flags =IORESOURCE_DMA , - }, - [2 ] = { - .start =DMACH_PCM0_RX , - .end =DMACH_PCM0_RX , - .flags =IORESOURCE_DMA , - }, + [0 ] =DEFINE_RES_MEM (S5PC100_PA_PCM0 ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_PCM0_TX ), + [2 ] =DEFINE_RES_DMA (DMACH_PCM0_RX ), };struct platform_device s5pc100_device_pcm0 = {
@@ -212,21 +160,9 @@ struct platform_device s5pc100_device_pcm0 = { };static struct resource s5pc100_pcm1_resource[] = { - [0 ] = { - .start =S5PC100_PA_PCM1 , - .end =S5PC100_PA_PCM1 +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_PCM1_TX , - .end =DMACH_PCM1_TX , - .flags =IORESOURCE_DMA , - }, - [2 ] = { - .start =DMACH_PCM1_RX , - .end =DMACH_PCM1_RX , - .flags =IORESOURCE_DMA , - }, + [0 ] =DEFINE_RES_MEM (S5PC100_PA_PCM1 ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_PCM1_TX ), + [2 ] =DEFINE_RES_DMA (DMACH_PCM1_RX ), };struct platform_device s5pc100_device_pcm1 = {
@@ -247,31 +183,11 @@ static int s5pc100_ac97_cfg_gpio(struct platform_device *pdev) }static struct resource s5pc100_ac97_resource[] = { - [0 ] = { - .start =S5PC100_PA_AC97 , - .end =S5PC100_PA_AC97 +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_AC97_PCMOUT , - .end =DMACH_AC97_PCMOUT , - .flags =IORESOURCE_DMA , - }, - [2 ] = { - .start =DMACH_AC97_PCMIN , - .end =DMACH_AC97_PCMIN , - .flags =IORESOURCE_DMA , - }, - [3 ] = { - .start =DMACH_AC97_MICIN , - .end =DMACH_AC97_MICIN , - .flags =IORESOURCE_DMA , - }, - [4 ] = { - .start =IRQ_AC97 , - .end =IRQ_AC97 , - .flags =IORESOURCE_IRQ , - }, + [0 ] =DEFINE_RES_MEM (S5PC100_PA_AC97 ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_AC97_PCMOUT ), + [2 ] =DEFINE_RES_DMA (DMACH_AC97_PCMIN ), + [3 ] =DEFINE_RES_DMA (DMACH_AC97_MICIN ), + [4 ] =DEFINE_RES_IRQ (IRQ_AC97 ), };static struct s3c_audio_pdata s3c_ac97_pdata = {
@@ -308,16 +224,8 @@ static int s5pc100_spdif_cfg_gpg3(struct platform_device *pdev) }static struct resource s5pc100_spdif_resource[] = { - [0 ] = { - .start =S5PC100_PA_SPDIF , - .end =S5PC100_PA_SPDIF +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_SPDIF , - .end =DMACH_SPDIF , - .flags =IORESOURCE_DMA , - }, + [0 ] =DEFINE_RES_MEM (S5PC100_PA_SPDIF ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_SPDIF ), };static struct s3c_audio_pdata s5p_spdif_pdata = {
Signature · 1 line
1.7.4.1
PATCH 32/33 ARM: S5PV210: dev-audio: Use common macro to define resources
In reply to Tushar BeheraCC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-s5pv210/dev-audio.c | 156 ++++++------------------------------ 1 files changed, 26 insertions(+), 130 deletions(-)
arch/arm/mach-s5pv210/dev-audio.c +26 -130
@@ -59,26 +59,10 @@ static struct s3c_audio_pdata i2sv5_pdata = { };static struct resource s5pv210_iis0_resource[] = { - [0 ] = { - .start =S5PV210_PA_IIS0 , - .end =S5PV210_PA_IIS0 +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_I2S0_TX , - .end =DMACH_I2S0_TX , - .flags =IORESOURCE_DMA , - }, - [2 ] = { - .start =DMACH_I2S0_RX , - .end =DMACH_I2S0_RX , - .flags =IORESOURCE_DMA , - }, - [3 ] = { - .start =DMACH_I2S0S_TX , - .end =DMACH_I2S0S_TX , - .flags =IORESOURCE_DMA , - }, + [0 ] =DEFINE_RES_MEM (S5PV210_PA_IIS0 ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_I2S0_TX ), + [2 ] =DEFINE_RES_DMA (DMACH_I2S0_RX ), + [3 ] =DEFINE_RES_DMA (DMACH_I2S0S_TX ), };struct platform_device s5pv210_device_iis0 = {
@@ -106,21 +90,9 @@ static struct s3c_audio_pdata i2sv3_pdata = { };static struct resource s5pv210_iis1_resource[] = { - [0 ] = { - .start =S5PV210_PA_IIS1 , - .end =S5PV210_PA_IIS1 +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_I2S1_TX , - .end =DMACH_I2S1_TX , - .flags =IORESOURCE_DMA , - }, - [2 ] = { - .start =DMACH_I2S1_RX , - .end =DMACH_I2S1_RX , - .flags =IORESOURCE_DMA , - }, + [0 ] =DEFINE_RES_MEM (S5PV210_PA_IIS1 ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_I2S1_TX ), + [2 ] =DEFINE_RES_DMA (DMACH_I2S1_RX ), };struct platform_device s5pv210_device_iis1 = {
@@ -134,21 +106,9 @@ struct platform_device s5pv210_device_iis1 = { };static struct resource s5pv210_iis2_resource[] = { - [0 ] = { - .start =S5PV210_PA_IIS2 , - .end =S5PV210_PA_IIS2 +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_I2S2_TX , - .end =DMACH_I2S2_TX , - .flags =IORESOURCE_DMA , - }, - [2 ] = { - .start =DMACH_I2S2_RX , - .end =DMACH_I2S2_RX , - .flags =IORESOURCE_DMA , - }, + [0 ] =DEFINE_RES_MEM (S5PV210_PA_IIS2 ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_I2S2_TX ), + [2 ] =DEFINE_RES_DMA (DMACH_I2S2_RX ), };struct platform_device s5pv210_device_iis2 = {
@@ -188,21 +148,9 @@ static struct s3c_audio_pdata s3c_pcm_pdata = { };static struct resource s5pv210_pcm0_resource[] = { - [0 ] = { - .start =S5PV210_PA_PCM0 , - .end =S5PV210_PA_PCM0 +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_PCM0_TX , - .end =DMACH_PCM0_TX , - .flags =IORESOURCE_DMA , - }, - [2 ] = { - .start =DMACH_PCM0_RX , - .end =DMACH_PCM0_RX , - .flags =IORESOURCE_DMA , - }, + [0 ] =DEFINE_RES_MEM (S5PV210_PA_PCM0 ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_PCM0_TX ), + [2 ] =DEFINE_RES_DMA (DMACH_PCM0_RX ), };struct platform_device s5pv210_device_pcm0 = {
@@ -216,21 +164,9 @@ struct platform_device s5pv210_device_pcm0 = { };static struct resource s5pv210_pcm1_resource[] = { - [0 ] = { - .start =S5PV210_PA_PCM1 , - .end =S5PV210_PA_PCM1 +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_PCM1_TX , - .end =DMACH_PCM1_TX , - .flags =IORESOURCE_DMA , - }, - [2 ] = { - .start =DMACH_PCM1_RX , - .end =DMACH_PCM1_RX , - .flags =IORESOURCE_DMA , - }, + [0 ] =DEFINE_RES_MEM (S5PV210_PA_PCM1 ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_PCM1_TX ), + [2 ] =DEFINE_RES_DMA (DMACH_PCM1_RX ), };struct platform_device s5pv210_device_pcm1 = {
@@ -244,21 +180,9 @@ struct platform_device s5pv210_device_pcm1 = { };static struct resource s5pv210_pcm2_resource[] = { - [0 ] = { - .start =S5PV210_PA_PCM2 , - .end =S5PV210_PA_PCM2 +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_PCM2_TX , - .end =DMACH_PCM2_TX , - .flags =IORESOURCE_DMA , - }, - [2 ] = { - .start =DMACH_PCM2_RX , - .end =DMACH_PCM2_RX , - .flags =IORESOURCE_DMA , - }, + [0 ] =DEFINE_RES_MEM (S5PV210_PA_PCM2 ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_PCM2_TX ), + [2 ] =DEFINE_RES_DMA (DMACH_PCM2_RX ), };struct platform_device s5pv210_device_pcm2 = {
@@ -279,31 +203,11 @@ static int s5pv210_ac97_cfg_gpio(struct platform_device *pdev) }static struct resource s5pv210_ac97_resource[] = { - [0 ] = { - .start =S5PV210_PA_AC97 , - .end =S5PV210_PA_AC97 +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_AC97_PCMOUT , - .end =DMACH_AC97_PCMOUT , - .flags =IORESOURCE_DMA , - }, - [2 ] = { - .start =DMACH_AC97_PCMIN , - .end =DMACH_AC97_PCMIN , - .flags =IORESOURCE_DMA , - }, - [3 ] = { - .start =DMACH_AC97_MICIN , - .end =DMACH_AC97_MICIN , - .flags =IORESOURCE_DMA , - }, - [4 ] = { - .start =IRQ_AC97 , - .end =IRQ_AC97 , - .flags =IORESOURCE_IRQ , - }, + [0 ] =DEFINE_RES_MEM (S5PV210_PA_AC97 ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_AC97_PCMOUT ), + [2 ] =DEFINE_RES_DMA (DMACH_AC97_PCMIN ), + [3 ] =DEFINE_RES_DMA (DMACH_AC97_MICIN ), + [4 ] =DEFINE_RES_IRQ (IRQ_AC97 ), };static struct s3c_audio_pdata s3c_ac97_pdata = {
@@ -334,16 +238,8 @@ static int s5pv210_spdif_cfg_gpio(struct platform_device *pdev) }static struct resource s5pv210_spdif_resource[] = { - [0 ] = { - .start =S5PV210_PA_SPDIF , - .end =S5PV210_PA_SPDIF +0x100 -1 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =DMACH_SPDIF , - .end =DMACH_SPDIF , - .flags =IORESOURCE_DMA , - }, + [0 ] =DEFINE_RES_MEM (S5PV210_PA_SPDIF ,SZ_256 ), + [1 ] =DEFINE_RES_DMA (DMACH_SPDIF ), };static struct s3c_audio_pdata samsung_spdif_pdata = {
Signature · 1 line
1.7.4.1
PATCH 33/33 ARM: S5PV210: mach-smdkv210: Use common macro to define resources
In reply to Tushar BeheraCC Kukjin Kim <[email protected]>
Signed-off-by Tushar Behera <[email protected]>
--- arch/arm/mach-s5pv210/mach-smdkv210.c | 19 ++++--------------- 1 files changed, 4 insertions(+), 15 deletions(-)
arch/arm/mach-s5pv210/mach-smdkv210.c +4 -15
@@ -119,21 +119,10 @@ static struct samsung_keypad_platdata smdkv210_keypad_data __initdata = { };static struct resource smdkv210_dm9000_resources[] = { - [0 ] = { - .start =S5PV210_PA_SROM_BANK5 , - .end =S5PV210_PA_SROM_BANK5 , - .flags =IORESOURCE_MEM , - }, - [1 ] = { - .start =S5PV210_PA_SROM_BANK5 +2 , - .end =S5PV210_PA_SROM_BANK5 +2 , - .flags =IORESOURCE_MEM , - }, - [2 ] = { - .start =IRQ_EINT (9 ), - .end =IRQ_EINT (9 ), - .flags =IORESOURCE_IRQ |IORESOURCE_IRQ_HIGHLEVEL , - }, + [0 ] =DEFINE_RES_MEM (S5PV210_PA_SROM_BANK5 ,1 ), + [1 ] =DEFINE_RES_MEM (S5PV210_PA_SROM_BANK5 +2 ,1 ), + [2 ] =DEFINE_RES_NAMED (IRQ_EINT (9 ),1 ,NULL ,IORESOURCE_IRQ \ + |IORESOURCE_IRQ_HIGHLEVEL ), };static struct dm9000_plat_data smdkv210_dm9000_platdata = {
Signature · 1 line
1.7.4.1
cover Use common macro to define resources
In reply to Tushar BeheraQuoted 11 lines · Tushar Behera
There are some helper macros (
DEFINE_RES_XXX) for defining resource structures. This patchset migrates all the earlier resource definitions (within Samsung specific code base) to use these macros.In some cases, it was not possible to use
DEFINE_RES_IRQ()macro because of usage of additional flags. In those cases,DEFINE_RES_NAMED()macro is used instead.The patches are rebased on top of Kukjin's for-next branch at this commit.
d0ee53a Merge branch 'next/board-samsung' into for-next
is this really necessary as we switch to DT this code will be droped
for my point of view it's cosmetics change
Arnd what do you think?
Best Regards,
J.
cover Use common macro to define resources
Hi,
Am Mittwoch, 25. April 2012, 06:19:39 schrieb Jean-Christophe PLAGNIOL- VILLARD:
Quoted 9 lines · Tushar Behera
Quoted 8 lines
There are some helper macros (
DEFINE_RES_XXX) for defining resource structures. This patchset migrates all the earlier resource definitions (within Samsung specific code base) to use these macros.In some cases, it was not possible to use
DEFINE_RES_IRQ()macro because of usage of additional flags. In those cases,DEFINE_RES_NAMED()macro is used instead.
Quoted 6 lines
Quoted 4 lines
The patches are rebased on top of Kukjin's for-next branch at this commit.
d0ee53a Merge branch 'next/board-samsung' into for-next
is this really necessary as we switch to DT this code will be droped
As far as I know legacy SoCs are allowed to keep being non-DT and I don't see the older Samsung SoCs (especially the S3C24XX ones) changing to DT anytime soon, as they don't see any new development but only bug fixes currently.
Quoted 1 line
for my point of view it's cosmetics change
it is, but it also makes the code more readable
Heiko
cover Use common macro to define resources
Quoted 20 lines · Heiko St?bner
Hi,
Am Mittwoch, 25. April 2012, 06:19:39 schrieb Jean-Christophe PLAGNIOL- VILLARD:
Quoted 9 lines · Tushar Behera
Quoted 8 lines
There are some helper macros (
DEFINE_RES_XXX) for defining resource structures. This patchset migrates all the earlier resource definitions (within Samsung specific code base) to use these macros.In some cases, it was not possible to use
DEFINE_RES_IRQ()macro because of usage of additional flags. In those cases,DEFINE_RES_NAMED()macro is used instead.Quoted 6 lines
Quoted 4 lines
The patches are rebased on top of Kukjin's for-next branch at this commit.
d0ee53a Merge branch 'next/board-samsung' into for-next
is this really necessary as we switch to DT this code will be droped
Quoted 7 lines
As far as I know legacy SoCs are allowed to keep being non-DT and I don't see the older Samsung SoCs (especially the S3C24XX ones) changing to DT anytime soon, as they don't see any new development but only bug fixes currently.
Quoted 1 line
for my point of view it's cosmetics change
it is, but it also makes the code more readable
we get comment from Linus to do not do cosmetic changes
so if it work well I'll not touch it
Best Regards,
J.
cover Use common macro to define resources
Quoted 11 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 8 lines
As far as I know legacy SoCs are allowed to keep being non-DT and I don't see the older Samsung SoCs (especially the S3C24XX ones) changing to DT anytime soon, as they don't see any new development but only bug fixes currently.
Quoted 1 line
for my point of view it's cosmetics change
it is, but it also makes the code more readable
we get comment from Linus to do not do cosmetic changes
so if it work well I'll not touch it
I would leave this up for the platform maintainers to decide individually, as there is no easy answer.
Generally cleanups are welcome and the patch series has the nice effect of removing a few hundred lines from the platform, which is good. On the other hand I agree that we should not mess too much with legacy platforms: If something is in the state where we just want to keep it running and not get it up to modern coding standards, we shouldn't be doing those changes, but if a platform is important enough to warrant such cleanups, we should go the full way and make it use all the right subsystems and use DT instead of board files.
Note that the point of the DEFINE_RES_*() macros is really to prevent people from coming up with new silly macros to do the same thing, as we've had in the past. Converting existing code that is just open-coding the resources to use these macros is just noise IMHO. If Kukjin Kim wants to take those patches, I won't complain though.
Arnd
cover Use common macro to define resources
Quoted 3 lines · Arnd Bergmann
Note that the point of the DEFINE_RES_*() macros is really to prevent people from coming up with new silly macros to do the same thing, as we've had in the past.
One of the other reaons was to stop the stream of resources with wrong endings (because people kept thinking it was exclusive rather than inclusive) - and the resulting stream of additional patches to fix those errors.
The legacy platforms do have those kinds of errors - when I converted SA11x0 as part of a previous patch set, I found a number suffering from this error. (Were any found in this patch set? I've not read through it.)
I think if this becomes a small %age of the change to Samsung stuff, and Kukjin is happy with it, it should go in.
cover Use common macro to define resources
Quoted 10 lines · Russell King - ARM Linux
Quoted 3 lines · Arnd Bergmann
Note that the point of the DEFINE_RES_*() macros is really to prevent people from coming up with new silly macros to do the same thing, as we've had in the past.
One of the other reaons was to stop the stream of resources with wrong endings (because people kept thinking it was exclusive rather than inclusive) - and the resulting stream of additional patches to fix those errors.
Patch 16, 18, 24 seemed to touch that problem. It was fixed in patches 16 and 24. There was not much clarity regarding the situation in patch 18, so it was left as it was.
Signature · 1 line
Tushar Behera
cover Use common macro to define resources
In reply to Russell King - ARM LinuxQuoted 11 lines · Russell King - ARM Linux
Quoted 3 lines · Arnd Bergmann
Note that the point of the DEFINE_RES_*() macros is really to prevent people from coming up with new silly macros to do the same thing, as we've had in the past.
One of the other reaons was to stop the stream of resources with wrong endings (because people kept thinking it was exclusive rather than inclusive) - and the resulting stream of additional patches to fix those errors.
Quoted 7 lines
The legacy platforms do have those kinds of errors - when I converted SA11x0 as part of a previous patch set, I found a number suffering from this error. (Were any found in this patch set? I've not read through it.)
I think if this becomes a small %age of the change to Samsung stuff, and Kukjin is happy with it, it should go in.
Yes, agree. I will apply this whole series.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.