i.MX35: Add mx35_revision function to query the silicon revision
Subsystems (3)
Sascha Hauer
maintainerPATCH 1/1 i.MX35: Add mx35_revision function to query the silicon revision
--- arch/arm/mach-mx3/clock-imx35.c | 2 ++ arch/arm/mach-mx3/cpu.c | 32 ++++++++++++++++++++++++++++++++ arch/arm/plat-mxc/include/mach/mx35.h | 19 +++++++------------ arch/arm/plat-mxc/include/mach/mx3x.h | 8 ++++++++ 4 files changed, 49 insertions(+), 12 deletions(-)
arch/arm/mach-mx3/clock-imx35.c +2 -0
@@ -535,6 +535,8 @@ int __init mx35_clocks_init()__raw_writel (cgr2,CCM_BASE +CCM_CGR2 );__raw_writel (cgr3,CCM_BASE +CCM_CGR3 ); +mx35_read_cpu_rev (); +#ifdef CONFIG_MXC_USE_EPIT epit_timer_init (&epit1_clk,MX35_IO_ADDRESS (MX35_EPIT1_BASE_ADDR ),MX35_INT_EPIT1 );
arch/arm/mach-mx3/cpu.c +32 -0
@@ -55,3 +55,35 @@ void __init mx31_read_cpu_rev(void)printk (KERN_WARNING "Unknown CPU identifier. srev = %02x\n" , srev); } + +unsigned int mx35_cpu_rev; +EXPORT_SYMBOL (mx35_cpu_rev); + +#define MX35_ROM_SI_REV 0x40 + +void __init mx35_read_cpu_rev (void ) +{ +void __iomem *rom =ioremap (MX35_IROM_BASE_ADDR ,MX35_IROM_SIZE ); +u32 rev; +char *srev ="unknown" ; + +if (!rom) +return ; + + rev =readl (rom +MX35_ROM_SI_REV ); +switch (rev) { +case 0x1 : + mx35_cpu_rev =MX35_CHIP_REV_1_0 ; + srev ="1.0" ; +break ; +case 0x2 : + mx35_cpu_rev =MX35_CHIP_REV_2_0 ; + srev ="2.0" ; +break ; + } + +printk (KERN_INFO "CPU identified as i.MX35, silicon rev %s\n" , srev); + +iounmap (rom); +} +
arch/arm/plat-mxc/include/mach/mx35.h +7 -12
@@ -1,5 +1,9 @@#ifndef __MACH_MX35_H__#define __MACH_MX35_H__ + +#define MX35_IROM_BASE_ADDR 0x0 +#define MX35_IROM_SIZE SZ_16K +/* * IRAM */
@@ -184,18 +188,9 @@#define MX35_PROD_SIGNATURE 0x1/* For MX31 */ -/* silicon revisions specific to i.MX31 */ -#define MX35_CHIP_REV_1_0 0x10 -#define MX35_CHIP_REV_1_1 0x11 -#define MX35_CHIP_REV_1_2 0x12 -#define MX35_CHIP_REV_1_3 0x13 -#define MX35_CHIP_REV_2_0 0x20 -#define MX35_CHIP_REV_2_1 0x21 -#define MX35_CHIP_REV_2_2 0x22 -#define MX35_CHIP_REV_2_3 0x23 -#define MX35_CHIP_REV_3_0 0x30 -#define MX35_CHIP_REV_3_1 0x31 -#define MX35_CHIP_REV_3_2 0x32 +/* silicon revisions specific to i.MX35 */ +#define MX35_CHIP_REV_1_0 0x1 +#define MX35_CHIP_REV_2_0 0x2#define MX35_SYSTEM_REV_MIN MX35_CHIP_REV_1_0#define MX35_SYSTEM_REV_NUM 3
arch/arm/plat-mxc/include/mach/mx3x.h +8 -0
@@ -267,6 +267,14 @@ static inline int mx31_revision(void) {return mx31_cpu_rev; } + +extern unsigned int mx35_cpu_rev; +extern void mx35_read_cpu_rev (void ); + +static inline int mx35_revision (void ) +{ +return mx35_cpu_rev; +}#endif #ifdef IMX_NEEDS_DEPRECATED_SYMBOLS
Signature · 7 lines
1.7.2.3 -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
PATCH 1/1 i.MX35: Add mx35_revision function to query the silicon revision
Hallo Sascha,
I put you patch in my (still private) tree and suggest the following on top of the two. If you're OK I'd squash the hunks into the respective patches and send them to you.
Best regards
Uwe
arch/arm/mach-mx3/cpu.c +2 -3
@@ -73,11 +73,11 @@ void __init mx35_read_cpu_rev(void) rev =readl (rom +MX35_ROM_SI_REV );switch (rev) {case 0x1 : - mx35_cpu_rev =MX35_CHIP_REV_1_0 ; + mx35_cpu_rev = MX3x_CHIP_REV_1_0; srev ="1.0" ;break ;case 0x2 : - mx35_cpu_rev =MX35_CHIP_REV_2_0 ; + mx35_cpu_rev = MX3x_CHIP_REV_2_0; srev ="2.0" ;break ; }
@@ -86,4 +86,3 @@ void __init mx35_read_cpu_rev(void)iounmap (rom); } -
arch/arm/plat-mxc/devices/platform-imx-dma.c +5 -4
@@ -50,8 +50,8 @@ struct imx_imx_sdma_data imx31_imx_sdma_data __initdata =#endif /* ifdef CONFIG_ARCH_MX31 */ #ifdef CONFIG_ARCH_MX35 -const struct imx_imx_sdma_data imx35_imx_sdma_data__initconst = -imx_imx_sdma_data_entry_single (MX35 ,2 ,"imx35" ,2 ); +struct imx_imx_sdma_data imx35_imx_sdma_data__initdata = +imx_imx_sdma_data_entry_single (MX35 ,2 ,"imx35" ,0 );#endif /* ifdef CONFIG_ARCH_MX35 */ #ifdef CONFIG_ARCH_MX51
@@ -108,9 +108,10 @@ static int __init imxXX_add_imx_dma(void)#endif #if defined(CONFIG_ARCH_MX35 ) -if (cpu_is_mx35 ()) +if (cpu_is_mx35 ()) { + imx35_imx_sdma_data.pdata.to_version =mx35_revision () >>4 ; ret =imx_add_imx_sdma (&imx35_imx_sdma_data); - else + } else#endif #if defined(CONFIG_ARCH_MX51 )
arch/arm/plat-mxc/include/mach/mx35.h +1 -5
@@ -188,11 +188,7 @@#define MX35_PROD_SIGNATURE 0x1/* For MX31 */ -/* silicon revisions specific to i.MX35 */ -#define MX35_CHIP_REV_1_0 0x1 -#define MX35_CHIP_REV_2_0 0x2 - -#define MX35_SYSTEM_REV_MIN MX35_CHIP_REV_1_0 +#define MX35_SYSTEM_REV_MIN MX3x_CHIP_REV_1_0#define MX35_SYSTEM_REV_NUM 3#ifdef IMX_NEEDS_DEPRECATED_SYMBOLS
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
Sascha Hauer
maintainerPATCH 1/1 i.MX35: Add mx35_revision function to query the silicon revision
Quoted 5 lines · Uwe Kleine-K?nig
Hallo Sascha,
I put you patch in my (still private) tree and suggest the following on top of the two. If you're OK I'd squash the hunks into the respective patches and send them to you.
Yes, I'm ok.
Here's another one I would like to put ontop of it.
SAscha
[PATCH] ARM i.MX31: use MX3x_ prefixed version of CHIP_REV_x
Also, remove the depreacated symbols from arch/arm/mach-mx3/cpu.c
--- arch/arm/mach-mx3/Makefile | 1 - arch/arm/mach-mx3/cpu.c | 20 ++++++++++---------- arch/arm/plat-mxc/include/mach/mx3x.h | 15 +-------------- 3 files changed, 11 insertions(+), 25 deletions(-)
arch/arm/mach-mx3/Makefile +0 -1
@@ -7,7 +7,6 @@ obj-y := mm.o devices.o cpu.o CFLAGS_mm.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS CFLAGS_devices.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS -CFLAGS_cpu.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS obj-$(CONFIG_ARCH_MX31) += clock-imx31.o iomux-imx31.o obj-$(CONFIG_ARCH_MX35) += clock-imx35.o obj-$(CONFIG_MACH_MX31ADS) += mach-mx31ads.o
arch/arm/mach-mx3/cpu.c +10 -10
@@ -25,15 +25,15 @@ struct mx3_cpu_type { };static struct mx3_cpu_type mx31_cpu_type[]__initdata = { - { .srev =0x00 , .name ="i.MX31(L)" , .v ="1.0" , .rev =CHIP_REV_1_0 }, - { .srev =0x10 , .name ="i.MX31" , .v ="1.1" , .rev =CHIP_REV_1_1 }, - { .srev =0x11 , .name ="i.MX31L" , .v ="1.1" , .rev =CHIP_REV_1_1 }, - { .srev =0x12 , .name ="i.MX31" , .v ="1.15" , .rev =CHIP_REV_1_1 }, - { .srev =0x13 , .name ="i.MX31L" , .v ="1.15" , .rev =CHIP_REV_1_1 }, - { .srev =0x14 , .name ="i.MX31" , .v ="1.2" , .rev =CHIP_REV_1_2 }, - { .srev =0x15 , .name ="i.MX31L" , .v ="1.2" , .rev =CHIP_REV_1_2 }, - { .srev =0x28 , .name ="i.MX31" , .v ="2.0" , .rev =CHIP_REV_2_0 }, - { .srev =0x29 , .name ="i.MX31L" , .v ="2.0" , .rev =CHIP_REV_2_0 }, + { .srev =0x00 , .name ="i.MX31(L)" , .v ="1.0" , .rev = MX3x_CHIP_REV_1_0 }, + { .srev =0x10 , .name ="i.MX31" , .v ="1.1" , .rev = MX3x_CHIP_REV_1_1 }, + { .srev =0x11 , .name ="i.MX31L" , .v ="1.1" , .rev = MX3x_CHIP_REV_1_1 }, + { .srev =0x12 , .name ="i.MX31" , .v ="1.15" , .rev = MX3x_CHIP_REV_1_1 }, + { .srev =0x13 , .name ="i.MX31L" , .v ="1.15" , .rev = MX3x_CHIP_REV_1_1 }, + { .srev =0x14 , .name ="i.MX31" , .v ="1.2" , .rev = MX3x_CHIP_REV_1_2 }, + { .srev =0x15 , .name ="i.MX31L" , .v ="1.2" , .rev = MX3x_CHIP_REV_1_2 }, + { .srev =0x28 , .name ="i.MX31" , .v ="2.0" , .rev = MX3x_CHIP_REV_2_0 }, + { .srev =0x29 , .name ="i.MX31L" , .v ="2.0" , .rev = MX3x_CHIP_REV_2_0 }, };void __init mx31_read_cpu_rev (void )
@@ -41,7 +41,7 @@ void __init mx31_read_cpu_rev(void)u32 i, srev;/* read SREV register from IIM module */ - srev =__raw_readl (IO_ADDRESS (IIM_BASE_ADDR +MXC_IIMSREV )); + srev =__raw_readl (MX31_IO_ADDRESS (MX31_IIM_BASE_ADDR +MXC_IIMSREV ));for (i =0 ; i <ARRAY_SIZE (mx31_cpu_type); i++)if (srev == mx31_cpu_type[i].srev) {
arch/arm/plat-mxc/include/mach/mx3x.h +1 -14
@@ -240,7 +240,7 @@#define MX3x_PROD_SIGNATURE 0x1/* For MX31 */ -/* silicon revisions specific to i.MX31 */ +/* silicon revisions specific to i.MX31 and i.MX35 */ #define MX3x_CHIP_REV_1_0 0x10#define MX3x_CHIP_REV_1_1 0x11#define MX3x_CHIP_REV_1_2 0x12
@@ -397,19 +397,6 @@ static inline int mx35_revision(void)#define MXC_INT_EXT_WDOG MX3x_INT_EXT_WDOG#define MXC_INT_EXT_TV MX3x_INT_EXT_TV#define PROD_SIGNATURE MX3x_PROD_SIGNATURE -#define CHIP_REV_1_0 MX3x_CHIP_REV_1_0 -#define CHIP_REV_1_1 MX3x_CHIP_REV_1_1 -#define CHIP_REV_1_2 MX3x_CHIP_REV_1_2 -#define CHIP_REV_1_3 MX3x_CHIP_REV_1_3 -#define CHIP_REV_2_0 MX3x_CHIP_REV_2_0 -#define CHIP_REV_2_1 MX3x_CHIP_REV_2_1 -#define CHIP_REV_2_2 MX3x_CHIP_REV_2_2 -#define CHIP_REV_2_3 MX3x_CHIP_REV_2_3 -#define CHIP_REV_3_0 MX3x_CHIP_REV_3_0 -#define CHIP_REV_3_1 MX3x_CHIP_REV_3_1 -#define CHIP_REV_3_2 MX3x_CHIP_REV_3_2 -#define SYSTEM_REV_MIN MX3x_SYSTEM_REV_MIN -#define SYSTEM_REV_NUM MX3x_SYSTEM_REV_NUM#endif #endif /* ifndef __MACH_MX3x_H__ */
Signature · 7 lines
1.7.2.3 -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
cover sdma/dma resources
Hello Sascha,
you have to drop "ARM: imx: fix/define clocks and create devices for imx dma" (currently dcdb3b1cf9b327cf91e) from your tree to be able to apply these on top of your imx-for-2.6.37 branch.
Best regards
Uwe
PATCH 1/3 ARM: mx3: use MX3x_ prefixed version of CHIP_REV_x
In reply to Sascha HauerFrom: Sascha Hauer <[email protected]>
Also, remove the deprecated symbols from arch/arm/mach-mx3/cpu.c
--- arch/arm/mach-mx3/Makefile | 1 - arch/arm/mach-mx3/cpu.c | 20 ++++++++++---------- arch/arm/plat-mxc/include/mach/mx3x.h | 13 ------------- 3 files changed, 10 insertions(+), 24 deletions(-)
arch/arm/mach-mx3/Makefile +0 -1
@@ -7,7 +7,6 @@ obj-y := mm.o devices.o cpu.o CFLAGS_mm.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS CFLAGS_devices.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS -CFLAGS_cpu.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS obj-$(CONFIG_ARCH_MX31) += clock-imx31.o iomux-imx31.o obj-$(CONFIG_ARCH_MX35) += clock-imx35.o obj-$(CONFIG_MACH_MX31ADS) += mach-mx31ads.o
arch/arm/mach-mx3/cpu.c +10 -10
@@ -25,15 +25,15 @@ struct mx3_cpu_type { };static struct mx3_cpu_type mx31_cpu_type[]__initdata = { - { .srev =0x00 , .name ="i.MX31(L)" , .v ="1.0" , .rev =CHIP_REV_1_0 }, - { .srev =0x10 , .name ="i.MX31" , .v ="1.1" , .rev =CHIP_REV_1_1 }, - { .srev =0x11 , .name ="i.MX31L" , .v ="1.1" , .rev =CHIP_REV_1_1 }, - { .srev =0x12 , .name ="i.MX31" , .v ="1.15" , .rev =CHIP_REV_1_1 }, - { .srev =0x13 , .name ="i.MX31L" , .v ="1.15" , .rev =CHIP_REV_1_1 }, - { .srev =0x14 , .name ="i.MX31" , .v ="1.2" , .rev =CHIP_REV_1_2 }, - { .srev =0x15 , .name ="i.MX31L" , .v ="1.2" , .rev =CHIP_REV_1_2 }, - { .srev =0x28 , .name ="i.MX31" , .v ="2.0" , .rev =CHIP_REV_2_0 }, - { .srev =0x29 , .name ="i.MX31L" , .v ="2.0" , .rev =CHIP_REV_2_0 }, + { .srev =0x00 , .name ="i.MX31(L)" , .v ="1.0" , .rev = MX3x_CHIP_REV_1_0 }, + { .srev =0x10 , .name ="i.MX31" , .v ="1.1" , .rev = MX3x_CHIP_REV_1_1 }, + { .srev =0x11 , .name ="i.MX31L" , .v ="1.1" , .rev = MX3x_CHIP_REV_1_1 }, + { .srev =0x12 , .name ="i.MX31" , .v ="1.15" , .rev = MX3x_CHIP_REV_1_1 }, + { .srev =0x13 , .name ="i.MX31L" , .v ="1.15" , .rev = MX3x_CHIP_REV_1_1 }, + { .srev =0x14 , .name ="i.MX31" , .v ="1.2" , .rev = MX3x_CHIP_REV_1_2 }, + { .srev =0x15 , .name ="i.MX31L" , .v ="1.2" , .rev = MX3x_CHIP_REV_1_2 }, + { .srev =0x28 , .name ="i.MX31" , .v ="2.0" , .rev = MX3x_CHIP_REV_2_0 }, + { .srev =0x29 , .name ="i.MX31L" , .v ="2.0" , .rev = MX3x_CHIP_REV_2_0 }, };void __init mx31_read_cpu_rev (void )
@@ -41,7 +41,7 @@ void __init mx31_read_cpu_rev(void)u32 i, srev;/* read SREV register from IIM module */ - srev =__raw_readl (IO_ADDRESS (IIM_BASE_ADDR +MXC_IIMSREV )); + srev =__raw_readl (MX31_IO_ADDRESS (MX31_IIM_BASE_ADDR +MXC_IIMSREV ));for (i =0 ; i <ARRAY_SIZE (mx31_cpu_type); i++)if (srev == mx31_cpu_type[i].srev) {
arch/arm/plat-mxc/include/mach/mx3x.h +0 -13
@@ -389,19 +389,6 @@ static inline int mx31_revision(void)#define MXC_INT_EXT_WDOG MX3x_INT_EXT_WDOG#define MXC_INT_EXT_TV MX3x_INT_EXT_TV#define PROD_SIGNATURE MX3x_PROD_SIGNATURE -#define CHIP_REV_1_0 MX3x_CHIP_REV_1_0 -#define CHIP_REV_1_1 MX3x_CHIP_REV_1_1 -#define CHIP_REV_1_2 MX3x_CHIP_REV_1_2 -#define CHIP_REV_1_3 MX3x_CHIP_REV_1_3 -#define CHIP_REV_2_0 MX3x_CHIP_REV_2_0 -#define CHIP_REV_2_1 MX3x_CHIP_REV_2_1 -#define CHIP_REV_2_2 MX3x_CHIP_REV_2_2 -#define CHIP_REV_2_3 MX3x_CHIP_REV_2_3 -#define CHIP_REV_3_0 MX3x_CHIP_REV_3_0 -#define CHIP_REV_3_1 MX3x_CHIP_REV_3_1 -#define CHIP_REV_3_2 MX3x_CHIP_REV_3_2 -#define SYSTEM_REV_MIN MX3x_SYSTEM_REV_MIN -#define SYSTEM_REV_NUM MX3x_SYSTEM_REV_NUM#endif #endif /* ifndef __MACH_MX3x_H__ */
Signature · 1 line
1.7.2.3
PATCH 2/3 ARM: mx35: Add mx35_revision function to query the silicon revision
In reply to Sascha HauerFrom: Sascha Hauer <[email protected]>
--- arch/arm/mach-mx3/clock-imx35.c | 2 ++ arch/arm/mach-mx3/cpu.c | 31 +++++++++++++++++++++++++++++++ arch/arm/plat-mxc/include/mach/mx35.h | 19 +++++-------------- arch/arm/plat-mxc/include/mach/mx3x.h | 10 +++++++++- 4 files changed, 47 insertions(+), 15 deletions(-)
arch/arm/mach-mx3/clock-imx35.c +2 -0
@@ -535,6 +535,8 @@ int __init mx35_clocks_init()__raw_writel (cgr2,CCM_BASE +CCM_CGR2 );__raw_writel (cgr3,CCM_BASE +CCM_CGR3 ); +mx35_read_cpu_rev (); +#ifdef CONFIG_MXC_USE_EPIT epit_timer_init (&epit1_clk,MX35_IO_ADDRESS (MX35_EPIT1_BASE_ADDR ),MX35_INT_EPIT1 );
arch/arm/mach-mx3/cpu.c +31 -0
@@ -55,3 +55,34 @@ void __init mx31_read_cpu_rev(void)printk (KERN_WARNING "Unknown CPU identifier. srev = %02x\n" , srev); } + +unsigned int mx35_cpu_rev; +EXPORT_SYMBOL (mx35_cpu_rev); + +#define MX35_ROM_SI_REV 0x40 + +void __init mx35_read_cpu_rev (void ) +{ +void __iomem *rom =ioremap (MX35_IROM_BASE_ADDR ,MX35_IROM_SIZE ); +u32 rev; +char *srev ="unknown" ; + +if (!rom) +return ; + + rev =readl (rom +MX35_ROM_SI_REV ); +switch (rev) { +case 0x1 : + mx35_cpu_rev = MX3x_CHIP_REV_1_0; + srev ="1.0" ; +break ; +case 0x2 : + mx35_cpu_rev = MX3x_CHIP_REV_2_0; + srev ="2.0" ; +break ; + } + +printk (KERN_INFO "CPU identified as i.MX35, silicon rev %s\n" , srev); + +iounmap (rom); +}
arch/arm/plat-mxc/include/mach/mx35.h +5 -14
@@ -1,5 +1,9 @@#ifndef __MACH_MX35_H__#define __MACH_MX35_H__ + +#define MX35_IROM_BASE_ADDR 0x0 +#define MX35_IROM_SIZE SZ_16K +/* * IRAM */
@@ -184,20 +188,7 @@#define MX35_PROD_SIGNATURE 0x1/* For MX31 */ -/* silicon revisions specific to i.MX31 */ -#define MX35_CHIP_REV_1_0 0x10 -#define MX35_CHIP_REV_1_1 0x11 -#define MX35_CHIP_REV_1_2 0x12 -#define MX35_CHIP_REV_1_3 0x13 -#define MX35_CHIP_REV_2_0 0x20 -#define MX35_CHIP_REV_2_1 0x21 -#define MX35_CHIP_REV_2_2 0x22 -#define MX35_CHIP_REV_2_3 0x23 -#define MX35_CHIP_REV_3_0 0x30 -#define MX35_CHIP_REV_3_1 0x31 -#define MX35_CHIP_REV_3_2 0x32 - -#define MX35_SYSTEM_REV_MIN MX35_CHIP_REV_1_0 +#define MX35_SYSTEM_REV_MIN MX3x_CHIP_REV_1_0#define MX35_SYSTEM_REV_NUM 3#ifdef IMX_NEEDS_DEPRECATED_SYMBOLS
arch/arm/plat-mxc/include/mach/mx3x.h +9 -1
@@ -240,7 +240,7 @@#define MX3x_PROD_SIGNATURE 0x1/* For MX31 */ -/* silicon revisions specific to i.MX31 */ +/* silicon revisions specific to i.MX31 and i.MX35 */ #define MX3x_CHIP_REV_1_0 0x10#define MX3x_CHIP_REV_1_1 0x11#define MX3x_CHIP_REV_1_2 0x12
@@ -267,6 +267,14 @@ static inline int mx31_revision(void) {return mx31_cpu_rev; } + +extern unsigned int mx35_cpu_rev; +extern void mx35_read_cpu_rev (void ); + +static inline int mx35_revision (void ) +{ +return mx35_cpu_rev; +}#endif #ifdef IMX_NEEDS_DEPRECATED_SYMBOLS
Signature · 1 line
1.7.2.3
PATCH 3/3 ARM: imx: fix/define clocks and create devices for imx dma
In reply to Sascha Hauer--- arch/arm/mach-mx3/clock-imx31.c | 4 +- arch/arm/mach-mx3/clock-imx35.c | 2 +- arch/arm/mach-mx5/clock-mx51.c | 5 + arch/arm/plat-mxc/devices/Makefile | 1 + arch/arm/plat-mxc/devices/platform-imx-dma.c | 129 ++++++++++++++++++++++++++ arch/arm/plat-mxc/include/mach/mx51.h | 2 +- 6 files changed, 139 insertions(+), 4 deletions(-) create mode 100644 arch/arm/plat-mxc/devices/platform-imx-dma.c
arch/arm/mach-mx3/clock-imx31.c +2 -2
@@ -477,7 +477,7 @@ DEFINE_CLOCK(epit1_clk, 0, MXC_CCM_CGR0, 6, NULL, NULL, &perclk_clk);DEFINE_CLOCK (epit2_clk,1 ,MXC_CCM_CGR0 ,8 ,NULL ,NULL , &perclk_clk);DEFINE_CLOCK (iim_clk,0 ,MXC_CCM_CGR0 ,10 ,NULL ,NULL , &ipg_clk);DEFINE_CLOCK (ata_clk,0 ,MXC_CCM_CGR0 ,12 ,NULL ,NULL , &ipg_clk); -DEFINE_CLOCK (sdma_clk1,0 ,MXC_CCM_CGR0 ,14 ,NULL , &sdma_clk1, &ahb_clk); +DEFINE_CLOCK (sdma_clk1,0 ,MXC_CCM_CGR0 ,14 ,NULL ,NULL , &ahb_clk);DEFINE_CLOCK (cspi3_clk,2 ,MXC_CCM_CGR0 ,16 ,NULL ,NULL , &ipg_clk);DEFINE_CLOCK (rng_clk,0 ,MXC_CCM_CGR0 ,18 ,NULL ,NULL , &ipg_clk);DEFINE_CLOCK (uart1_clk,0 ,MXC_CCM_CGR0 ,20 ,NULL ,NULL , &perclk_clk);
@@ -564,7 +564,7 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK(NULL, "ata", ata_clk) _REGISTER_CLOCK(NULL, "rtic", rtic_clk) _REGISTER_CLOCK(NULL, "rng", rng_clk) - _REGISTER_CLOCK(NULL, "sdma_ahb", sdma_clk1) + _REGISTER_CLOCK("imx-sdma", NULL, sdma_clk1) _REGISTER_CLOCK(NULL, "sdma_ipg", sdma_clk2) _REGISTER_CLOCK(NULL, "mstick", mstick1_clk)_REGISTER_CLOCK (NULL ,"mstick" , mstick2_clk)
arch/arm/mach-mx3/clock-imx35.c +1 -1
@@ -482,7 +482,7 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK(NULL, "rtc", rtc_clk) _REGISTER_CLOCK(NULL, "rtic", rtic_clk) _REGISTER_CLOCK(NULL, "scc", scc_clk) - _REGISTER_CLOCK(NULL, "sdma", sdma_clk) + _REGISTER_CLOCK("imx-sdma", NULL, sdma_clk) _REGISTER_CLOCK(NULL, "spba", spba_clk) _REGISTER_CLOCK(NULL, "spdif", spdif_clk)_REGISTER_CLOCK ("imx-ssi.0" ,NULL , ssi1_clk)
arch/arm/mach-mx5/clock-mx51.c +5 -0
@@ -977,6 +977,10 @@ DEFINE_CLOCK(cspi_ipg_clk, 0, MXC_CCM_CCGR4, MXC_CCM_CCGRx_CG9_OFFSET,DEFINE_CLOCK (cspi_clk,0 ,MXC_CCM_CCGR4 , MXC_CCM_CCGRx_CG13_OFFSET,NULL ,NULL , &ipg_clk, &cspi_ipg_clk); +/* SDMA */ +DEFINE_CLOCK (sdma_clk,1 ,MXC_CCM_CCGR4 , MXC_CCM_CCGRx_CG15_OFFSET, +NULL ,NULL , &ahb_clk,NULL ); +#define _REGISTER_CLOCK (d, n, c) \ { \ .dev_id = d, \
@@ -1003,6 +1007,7 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK("mxc_nand", NULL, nfc_clk) _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk) _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk) + _REGISTER_CLOCK("imx-sdma", NULL, sdma_clk) _REGISTER_CLOCK(NULL, "ckih", ckih_clk) _REGISTER_CLOCK(NULL, "ckih2", ckih2_clk)_REGISTER_CLOCK (NULL ,"gpt_32k" , gpt_32k_clk)
arch/arm/plat-mxc/devices/Makefile +1 -0
@@ -1,4 +1,5 @@ obj-$(CONFIG_IMX_HAVE_PLATFORM_FLEXCAN) += platform-flexcan.o +obj-y += platform-imx-dma.o obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_I2C) += platform-imx-i2c.o obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_SSI) += platform-imx-ssi.o obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_UART) += platform-imx-uart.o
arch/arm/plat-mxc/devices/platform-imx-dma.c new file +129 -0
129 lines not on this page · raw message
arch/arm/plat-mxc/include/mach/mx51.h +1 -1
@@ -285,7 +285,7 @@#define MX51_MXC_INT_MMC_SDHC3 3#define MX51_MXC_INT_MMC_SDHC4 4#define MX51_MXC_INT_RESV5 5 -#define MX51_MXC_INT_SDMA 6 +#define MX51_INT_SDMA 6#define MX51_MXC_INT_IOMUX 7#define MX51_INT_NFC 8#define MX51_MXC_INT_VPU 9
Signature · 1 line
1.7.2.3
PATCH 1/1 i.MX35: use the correct IIM register to get CPU revision
In reply to Uwe Kleine-Königinstead of using ROM_SI_REV use IIM's Silicon Revision register as described in :
- Reference Manual 29.3.3.10
- RM Errata 29.3.3.9.13
--- arch/arm/mach-mx3/clock-imx35.c | 1 + arch/arm/mach-mx3/cpu.c | 23 +++++++++-------------- arch/arm/plat-mxc/include/mach/mx35.h | 8 +++----- 3 files changed, 13 insertions(+), 19 deletions(-)
arch/arm/mach-mx3/clock-imx35.c +1 -0
@@ -535,6 +535,7 @@ int __init mx35_clocks_init()__raw_writel (cgr2,CCM_BASE +CCM_CGR2 );__raw_writel (cgr3,CCM_BASE +CCM_CGR3 ); +clk_enable (&iim_clk);mx35_read_cpu_rev (); mxc_timer_init(&gpt_clk,
arch/arm/mach-mx3/cpu.c +9 -14
@@ -59,31 +59,26 @@ void __init mx31_read_cpu_rev(void)unsigned int mx35_cpu_rev;EXPORT_SYMBOL (mx35_cpu_rev); -#define MX35_ROM_SI_REV 0x40 -void __init mx35_read_cpu_rev (void ) { -void __iomem *rom =ioremap (MX35_IROM_BASE_ADDR ,MX35_IROM_SIZE );u32 rev;char *srev ="unknown" ; -if (!rom) -return ; - - rev =readl (rom +MX35_ROM_SI_REV ); + rev =__raw_readl (MX35_IO_ADDRESS (MX35_IIM_BASE_ADDR +MXC_IIMSREV ));switch (rev) { -case 0x1 : - mx35_cpu_rev =MX35_CHIP_REV_1_0 ; +case 0x00 : + mx35_cpu_rev = MX3x_CHIP_REV_1_0; srev ="1.0" ;break ; -case 0x2 : - mx35_cpu_rev =MX35_CHIP_REV_2_0 ; +case 0x10 : + mx35_cpu_rev = MX3x_CHIP_REV_2_0; srev ="2.0" ;break ; +case 0x11 : + mx35_cpu_rev = MX3x_CHIP_REV_2_1; + srev ="2.1" ; +break ; }printk (KERN_INFO "CPU identified as i.MX35, silicon rev %s\n" , srev); - -iounmap (rom); } -
arch/arm/plat-mxc/include/mach/mx35.h +3 -5
@@ -70,6 +70,8 @@#define MX35_CAN1_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xe4000)#define MX35_CAN2_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xe8000)#define MX35_RTIC_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xec000) +#define MX35_IIM_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xf0000) +#define MX35_OTG_BASE_ADDR 0x53ff4000#define MX35_ROMP_BASE_ADDR 0x60000000
@@ -182,11 +184,7 @@#define MX35_PROD_SIGNATURE 0x1/* For MX31 */ -/* silicon revisions specific to i.MX35 */ -#define MX35_CHIP_REV_1_0 0x1 -#define MX35_CHIP_REV_2_0 0x2 - -#define MX35_SYSTEM_REV_MIN MX35_CHIP_REV_1_0 +#define MX35_SYSTEM_REV_MIN MX3x_CHIP_REV_1_0#define MX35_SYSTEM_REV_NUM 3#ifdef IMX_NEEDS_DEPRECATED_SYMBOLS
Signature · 1 line
1.7.0.4
PATCH 1/1 i.MX35: use the correct IIM register to get CPU revision
Le 08/10/2010 10:02, Eric B?nard a ?crit :
arch/arm/plat-mxc/include/mach/mx35.h line 190
Quoted 13 lines
arch/arm/plat-mxc/include/mach/mx35.h +1
-5@@ -182,11 +184,7 @@#define MX35_PROD_SIGNATURE 0x1/* For MX31 */ -/* silicon revisions specific to i.MX35 */ -#define MX35_CHIP_REV_1_0 0x1 -#define MX35_CHIP_REV_2_0 0x2 - -#define MX35_SYSTEM_REV_MIN MX35_CHIP_REV_1_0 +#define MX35_SYSTEM_REV_MIN MX3x_CHIP_REV_1_0#define MX35_SYSTEM_REV_NUM 3#ifdef IMX_NEEDS_DEPRECATED_SYMBOLS
oops I made a mistake when importing your patches, the end of this one shjould'nt be there.
Eric
PATCH v2 1/1 i.MX35: use the correct IIM register to get CPU revision
In reply to Eric Bénardinstead of using ROM_SI_REV use IIM's Silicon Revision register as described in :
- Reference Manual 29.3.3.10
- RM Errata 29.3.3.9.13
---
v2 : fix wrong part of previous patch in plat-mxc/include/mach/mx35.h
arch/arm/mach-mx3/clock-imx35.c | 1 + arch/arm/mach-mx3/cpu.c | 23 +++++++++-------------- arch/arm/plat-mxc/include/mach/mx35.h | 2 ++ 3 files changed, 12 insertions(+), 14 deletions(-)
arch/arm/mach-mx3/clock-imx35.c +1 -0
@@ -535,6 +535,7 @@ int __init mx35_clocks_init()__raw_writel (cgr2,CCM_BASE +CCM_CGR2 );__raw_writel (cgr3,CCM_BASE +CCM_CGR3 ); +clk_enable (&iim_clk);mx35_read_cpu_rev (); mxc_timer_init(&gpt_clk,
arch/arm/mach-mx3/cpu.c +9 -14
@@ -59,31 +59,26 @@ void __init mx31_read_cpu_rev(void)unsigned int mx35_cpu_rev;EXPORT_SYMBOL (mx35_cpu_rev); -#define MX35_ROM_SI_REV 0x40 -void __init mx35_read_cpu_rev (void ) { -void __iomem *rom =ioremap (MX35_IROM_BASE_ADDR ,MX35_IROM_SIZE );u32 rev;char *srev ="unknown" ; -if (!rom) -return ; - - rev =readl (rom +MX35_ROM_SI_REV ); + rev =__raw_readl (MX35_IO_ADDRESS (MX35_IIM_BASE_ADDR +MXC_IIMSREV ));switch (rev) { -case 0x1 : - mx35_cpu_rev =MX35_CHIP_REV_1_0 ; +case 0x00 : + mx35_cpu_rev = MX3x_CHIP_REV_1_0; srev ="1.0" ;break ; -case 0x2 : - mx35_cpu_rev =MX35_CHIP_REV_2_0 ; +case 0x10 : + mx35_cpu_rev = MX3x_CHIP_REV_2_0; srev ="2.0" ;break ; +case 0x11 : + mx35_cpu_rev = MX3x_CHIP_REV_2_1; + srev ="2.1" ; +break ; }printk (KERN_INFO "CPU identified as i.MX35, silicon rev %s\n" , srev); - -iounmap (rom); } -
arch/arm/plat-mxc/include/mach/mx35.h +2 -0
@@ -70,6 +70,8 @@#define MX35_CAN1_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xe4000)#define MX35_CAN2_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xe8000)#define MX35_RTIC_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xec000) +#define MX35_IIM_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xf0000) +#define MX35_OTG_BASE_ADDR 0x53ff4000#define MX35_ROMP_BASE_ADDR 0x60000000
Signature · 1 line
1.7.0.4
PATCH v2 1/1 i.MX35: use the correct IIM register to get CPU revision
Hi Eric,
--- On Fri, 10/8/10, Eric B?nard <[email protected]> wrote:
...
Quoted 7 lines
instead of using
ROM_SI_REVuse IIM's
Silicon Revision register
as described in :
- Reference Manual 29.3.3.10
- RM Errata 29.3.3.9.13Signed-off-by Eric B?nard <[email protected]>
Yes, this is the preferred method for silicon detection on MX35.
Thanks,
Fabio Estevam
PATCH v2 1/1 i.MX35: use the correct IIM register to get CPU revision
In reply to Eric BénardHello Eric,
Quoted 18 lines · Eric B?nard
instead of using
ROM_SI_REVuse IIM's Silicon Revision register as described in :
- Reference Manual 29.3.3.10
- RM Errata 29.3.3.9.13Signed-off-by Eric B?nard <[email protected]>---
v2 : fix wrong part of previous patch inplat-mxc/include/mach/mx35.harch/arm/mach-mx3/clock-imx35.c | 1 + arch/arm/mach-mx3/cpu.c | 23 +++++++++-------------- arch/arm/plat-mxc/include/mach/mx35.h | 2 ++ 3 files changed, 12 insertions(+), 14 deletions(-)arch/arm/mach-mx3/clock-imx35.c +0
-0
arch/arm/mach-mx3/clock-imx35.c int __init mx35_clocks_init() · line 539
Quoted 5 lines
arch/arm/mach-mx3/clock-imx35.c +1
-0@@ -535,6 +535,7 @@ int __init mx35_clocks_init()__raw_writel (cgr2,CCM_BASE +CCM_CGR2 );__raw_writel (cgr3,CCM_BASE +CCM_CGR3 ); +clk_enable (&iim_clk);mx35_read_cpu_rev ();
Do you let the clock running on purpose?
Quoted 29 lines
arch/arm/mach-mx3/clock-imx35.c +0
-0mxc_timer_init(&gpt_clk,arch/arm/mach-mx3/cpu.c +3
-9@@ -59,31 +59,26 @@ void __init mx31_read_cpu_rev(void)unsigned int mx35_cpu_rev;EXPORT_SYMBOL (mx35_cpu_rev); -#define MX35_ROM_SI_REV 0x40 -void __init mx35_read_cpu_rev (void ) { -void __iomem *rom =ioremap (MX35_IROM_BASE_ADDR ,MX35_IROM_SIZE );u32 rev;char *srev ="unknown" ; -if (!rom) -return ; - - rev =readl (rom +MX35_ROM_SI_REV ); + rev =__raw_readl (MX35_IO_ADDRESS (MX35_IIM_BASE_ADDR +MXC_IIMSREV ));switch (rev) { -case 0x1 : - mx35_cpu_rev =MX35_CHIP_REV_1_0 ; +case 0x00 : + mx35_cpu_rev = MX3x_CHIP_REV_1_0; srev ="1.0" ;break ;
arch/arm/mach-mx3/cpu.c void __init mx31_read_cpu_rev(void) · line 80
Quoted 10 lines
arch/arm/mach-mx3/cpu.c +6
-2-case 0x2 : - mx35_cpu_rev =MX35_CHIP_REV_2_0 ; +case 0x10 : + mx35_cpu_rev = MX3x_CHIP_REV_2_0; srev ="2.0" ;break ; +case 0x11 : + mx35_cpu_rev = MX3x_CHIP_REV_2_1; + srev ="2.1" ; +break ;
Would it make sense here to do:
mx35_cpu_rev = 0x10 + rev;
?
Quoted 24 lines
arch/arm/mach-mx3/cpu.c +0
-3}printk (KERN_INFO "CPU identified as i.MX35, silicon rev %s\n" , srev); - -iounmap (rom); } -arch/arm/plat-mxc/include/mach/mx35.h +2
-0@@ -70,6 +70,8 @@#define MX35_CAN1_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xe4000)#define MX35_CAN2_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xe8000)#define MX35_RTIC_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xec000) +#define MX35_IIM_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xf0000) +#define MX35_OTG_BASE_ADDR 0x53ff4000#define MX35_ROMP_BASE_ADDR 0x60000000Signature · 1 line
1.7.0.4
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
Sascha Hauer
maintainerPATCH v2 1/1 i.MX35: use the correct IIM register to get CPU revision
Quoted 70 lines · Uwe Kleine-K?nig
Hello Eric,
Quoted 18 lines · Eric B?nard
instead of using
ROM_SI_REVuse IIM's Silicon Revision register as described in :
- Reference Manual 29.3.3.10
- RM Errata 29.3.3.9.13Signed-off-by Eric B?nard <[email protected]>---
v2 : fix wrong part of previous patch inplat-mxc/include/mach/mx35.harch/arm/mach-mx3/clock-imx35.c | 1 + arch/arm/mach-mx3/cpu.c | 23 +++++++++-------------- arch/arm/plat-mxc/include/mach/mx35.h | 2 ++ 3 files changed, 12 insertions(+), 14 deletions(-)arch/arm/mach-mx3/clock-imx35.c +0
-0arch/arm/mach-mx3/clock-imx35.c int __init mx35_clocks_init() · line 539
Quoted 5 lines
arch/arm/mach-mx3/clock-imx35.c +1
-0@@ -535,6 +535,7 @@ int __init mx35_clocks_init()__raw_writel (cgr2,CCM_BASE +CCM_CGR2 );__raw_writel (cgr3,CCM_BASE +CCM_CGR3 ); +clk_enable (&iim_clk);mx35_read_cpu_rev ();Do you let the clock running on purpose?
Quoted 29 lines
arch/arm/mach-mx3/clock-imx35.c +0
-0mxc_timer_init(&gpt_clk,arch/arm/mach-mx3/cpu.c +3
-9@@ -59,31 +59,26 @@ void __init mx31_read_cpu_rev(void)unsigned int mx35_cpu_rev;EXPORT_SYMBOL (mx35_cpu_rev); -#define MX35_ROM_SI_REV 0x40 -void __init mx35_read_cpu_rev (void ) { -void __iomem *rom =ioremap (MX35_IROM_BASE_ADDR ,MX35_IROM_SIZE );u32 rev;char *srev ="unknown" ; -if (!rom) -return ; - - rev =readl (rom +MX35_ROM_SI_REV ); + rev =__raw_readl (MX35_IO_ADDRESS (MX35_IIM_BASE_ADDR +MXC_IIMSREV ));switch (rev) { -case 0x1 : - mx35_cpu_rev =MX35_CHIP_REV_1_0 ; +case 0x00 : + mx35_cpu_rev = MX3x_CHIP_REV_1_0; srev ="1.0" ;break ;arch/arm/mach-mx3/cpu.c void __init mx31_read_cpu_rev(void) · line 80
Quoted 10 lines
arch/arm/mach-mx3/cpu.c +6
-2-case 0x2 : - mx35_cpu_rev =MX35_CHIP_REV_2_0 ; +case 0x10 : + mx35_cpu_rev = MX3x_CHIP_REV_2_0; srev ="2.0" ;break ; +case 0x11 : + mx35_cpu_rev = MX3x_CHIP_REV_2_1; + srev ="2.1" ; +break ;Would it make sense here to do:
Quoted 1 line
mx35_cpu_rev = 0x10 + rev;
I think this makes only sense when someone from Freescale says it's correct. Otherwise I would prefer getting an 'unknown' here as a heads up for new silicon versions.
Sascha
Signature · 4 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
PATCH v2 1/1 i.MX35: use the correct IIM register to get CPU revision
In reply to Uwe Kleine-KönigHi Uwe,
Le 08/10/2010 14:31, Uwe Kleine-K?nig a ?crit :
Quoted 8 lines
Quoted 8 lines
arch/arm/mach-mx3/clock-imx35.c +0
-0@@ -535,6 +535,7 @@ int __init mx35_clocks_init()__raw_writel (cgr2,CCM_BASE +CCM_CGR2 );__raw_writel (cgr3,CCM_BASE +CCM_CGR3 );
Quoted 5 lines
arch/arm/mach-mx3/clock-imx35.c int __init mx35_clocks_init() · line 539
Quoted 2 lines
arch/arm/mach-mx3/clock-imx35.c +1
-0+clk_enable (&iim_clk);mx35_read_cpu_rev ();Do you let the clock running on purpose?
same as on i.MX31 : the iim clock is kept on.
Quoted 41 lines
Quoted 29 lines
arch/arm/mach-mx3/clock-imx35.c +0
-0mxc_timer_init(&gpt_clk,arch/arm/mach-mx3/cpu.c +3
-9@@ -59,31 +59,26 @@ void __init mx31_read_cpu_rev(void)unsigned int mx35_cpu_rev;EXPORT_SYMBOL (mx35_cpu_rev); -#define MX35_ROM_SI_REV 0x40 -void __init mx35_read_cpu_rev (void ) { -void __iomem *rom =ioremap (MX35_IROM_BASE_ADDR ,MX35_IROM_SIZE );u32 rev;char *srev ="unknown" ; -if (!rom) -return ; - - rev =readl (rom +MX35_ROM_SI_REV ); + rev =__raw_readl (MX35_IO_ADDRESS (MX35_IIM_BASE_ADDR +MXC_IIMSREV ));switch (rev) { -case 0x1 : - mx35_cpu_rev =MX35_CHIP_REV_1_0 ; +case 0x00 : + mx35_cpu_rev = MX3x_CHIP_REV_1_0; srev ="1.0" ;break ;arch/arm/mach-mx3/cpu.c void __init mx31_read_cpu_rev(void) · line 80
Quoted 10 lines
arch/arm/mach-mx3/cpu.c +6
-2-case 0x2 : - mx35_cpu_rev =MX35_CHIP_REV_2_0 ; +case 0x10 : + mx35_cpu_rev = MX3x_CHIP_REV_2_0; srev ="2.0" ;break ; +case 0x11 : + mx35_cpu_rev = MX3x_CHIP_REV_2_1; + srev ="2.1" ; +break ;Would it make sense here to do:
Quoted 4 lines
mx35_cpu_rev = 0x10 + rev;?
we don't know how future chip will be numbered !
Eric
PATCH v2 1/1 i.MX35: use the correct IIM register to get CPU revision
Quoted 11 lines · Eric B?nard
Hi Uwe,
Le 08/10/2010 14:31, Uwe Kleine-K?nig a ?crit :
Quoted 8 lines
Quoted 8 lines
arch/arm/mach-mx3/clock-imx35.c +0
-0@@ -535,6 +535,7 @@ int __init mx35_clocks_init()__raw_writel (cgr2,CCM_BASE +CCM_CGR2 );__raw_writel (cgr3,CCM_BASE +CCM_CGR3 );
Quoted 6 lines
Quoted 5 lines
arch/arm/mach-mx3/clock-imx35.c int __init mx35_clocks_init() · line 539
Quoted 2 lines
arch/arm/mach-mx3/clock-imx35.c +1
-0+clk_enable (&iim_clk);mx35_read_cpu_rev ();Do you let the clock running on purpose?
same as on i.MX31 : the iim clock is kept on.
OK
Quoted 41 lines
Quoted 41 lines
Quoted 29 lines
arch/arm/mach-mx3/clock-imx35.c +0
-0mxc_timer_init(&gpt_clk,arch/arm/mach-mx3/cpu.c +3
-9@@ -59,31 +59,26 @@ void __init mx31_read_cpu_rev(void)unsigned int mx35_cpu_rev;EXPORT_SYMBOL (mx35_cpu_rev); -#define MX35_ROM_SI_REV 0x40 -void __init mx35_read_cpu_rev (void ) { -void __iomem *rom =ioremap (MX35_IROM_BASE_ADDR ,MX35_IROM_SIZE );u32 rev;char *srev ="unknown" ; -if (!rom) -return ; - - rev =readl (rom +MX35_ROM_SI_REV ); + rev =__raw_readl (MX35_IO_ADDRESS (MX35_IIM_BASE_ADDR +MXC_IIMSREV ));switch (rev) { -case 0x1 : - mx35_cpu_rev =MX35_CHIP_REV_1_0 ; +case 0x00 : + mx35_cpu_rev = MX3x_CHIP_REV_1_0; srev ="1.0" ;break ;arch/arm/mach-mx3/cpu.c void __init mx31_read_cpu_rev(void) · line 80
Quoted 10 lines
arch/arm/mach-mx3/cpu.c +6
-2-case 0x2 : - mx35_cpu_rev =MX35_CHIP_REV_2_0 ; +case 0x10 : + mx35_cpu_rev = MX3x_CHIP_REV_2_0; srev ="2.0" ;break ; +case 0x11 : + mx35_cpu_rev = MX3x_CHIP_REV_2_1; + srev ="2.1" ; +break ;Would it make sense here to do:
Quoted 5 lines
Quoted 4 lines
mx35_cpu_rev = 0x10 + rev;?
we don't know how future chip will be numbered !
ack
Will resend the series with this and Sascha's patch squashed together.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH v2 1/1 i.MX35: use the correct IIM register to get CPU revision
In reply to Eric BénardHello,
Quoted 6 lines · Eric B?nard
instead of using
ROM_SI_REVuse IIM's Silicon Revision register as described in :
- Reference Manual 29.3.3.10
- RM Errata 29.3.3.9.13Signed-off-by Eric B?nard <[email protected]>
OK, based on this I resend the three patches. I squashed Eric's "i.MX35: use the correct IIM register to get CPU revision" and Sascha's "5f3282f0821ece24f9423d1ac819c398eed5947f" together, fixed up the conflicts (as Eric seems not to have used my latest patches) and removed a few things that became superflous then.
(I kept Sascha's short description and as a countermove took Eric as author. I hope this is OK for you.)
Patches 1 and 3 are unaffected, but I resend them to have them together.
Sascha: as before: you need to drop dcdb3b1cf9b327cf91ee6eaff61d809619bd98f4 from your branch before applying this series.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH v2 1/3 ARM: mx3: use MX3x_ prefixed version of CHIP_REV_x
From: Sascha Hauer <[email protected]>
Also, remove the deprecated symbols from arch/arm/mach-mx3/cpu.c
--- arch/arm/mach-mx3/Makefile | 1 - arch/arm/mach-mx3/cpu.c | 20 ++++++++++---------- arch/arm/plat-mxc/include/mach/mx3x.h | 13 ------------- 3 files changed, 10 insertions(+), 24 deletions(-)
arch/arm/mach-mx3/Makefile +0 -1
@@ -7,7 +7,6 @@ obj-y := mm.o devices.o cpu.o CFLAGS_mm.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS CFLAGS_devices.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS -CFLAGS_cpu.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS obj-$(CONFIG_ARCH_MX31) += clock-imx31.o iomux-imx31.o obj-$(CONFIG_ARCH_MX35) += clock-imx35.o obj-$(CONFIG_MACH_MX31ADS) += mach-mx31ads.o
arch/arm/mach-mx3/cpu.c +10 -10
@@ -25,15 +25,15 @@ struct mx3_cpu_type { };static struct mx3_cpu_type mx31_cpu_type[]__initdata = { - { .srev =0x00 , .name ="i.MX31(L)" , .v ="1.0" , .rev =CHIP_REV_1_0 }, - { .srev =0x10 , .name ="i.MX31" , .v ="1.1" , .rev =CHIP_REV_1_1 }, - { .srev =0x11 , .name ="i.MX31L" , .v ="1.1" , .rev =CHIP_REV_1_1 }, - { .srev =0x12 , .name ="i.MX31" , .v ="1.15" , .rev =CHIP_REV_1_1 }, - { .srev =0x13 , .name ="i.MX31L" , .v ="1.15" , .rev =CHIP_REV_1_1 }, - { .srev =0x14 , .name ="i.MX31" , .v ="1.2" , .rev =CHIP_REV_1_2 }, - { .srev =0x15 , .name ="i.MX31L" , .v ="1.2" , .rev =CHIP_REV_1_2 }, - { .srev =0x28 , .name ="i.MX31" , .v ="2.0" , .rev =CHIP_REV_2_0 }, - { .srev =0x29 , .name ="i.MX31L" , .v ="2.0" , .rev =CHIP_REV_2_0 }, + { .srev =0x00 , .name ="i.MX31(L)" , .v ="1.0" , .rev = MX3x_CHIP_REV_1_0 }, + { .srev =0x10 , .name ="i.MX31" , .v ="1.1" , .rev = MX3x_CHIP_REV_1_1 }, + { .srev =0x11 , .name ="i.MX31L" , .v ="1.1" , .rev = MX3x_CHIP_REV_1_1 }, + { .srev =0x12 , .name ="i.MX31" , .v ="1.15" , .rev = MX3x_CHIP_REV_1_1 }, + { .srev =0x13 , .name ="i.MX31L" , .v ="1.15" , .rev = MX3x_CHIP_REV_1_1 }, + { .srev =0x14 , .name ="i.MX31" , .v ="1.2" , .rev = MX3x_CHIP_REV_1_2 }, + { .srev =0x15 , .name ="i.MX31L" , .v ="1.2" , .rev = MX3x_CHIP_REV_1_2 }, + { .srev =0x28 , .name ="i.MX31" , .v ="2.0" , .rev = MX3x_CHIP_REV_2_0 }, + { .srev =0x29 , .name ="i.MX31L" , .v ="2.0" , .rev = MX3x_CHIP_REV_2_0 }, };void __init mx31_read_cpu_rev (void )
@@ -41,7 +41,7 @@ void __init mx31_read_cpu_rev(void)u32 i, srev;/* read SREV register from IIM module */ - srev =__raw_readl (IO_ADDRESS (IIM_BASE_ADDR +MXC_IIMSREV )); + srev =__raw_readl (MX31_IO_ADDRESS (MX31_IIM_BASE_ADDR +MXC_IIMSREV ));for (i =0 ; i <ARRAY_SIZE (mx31_cpu_type); i++)if (srev == mx31_cpu_type[i].srev) {
arch/arm/plat-mxc/include/mach/mx3x.h +0 -13
@@ -389,19 +389,6 @@ static inline int mx31_revision(void)#define MXC_INT_EXT_WDOG MX3x_INT_EXT_WDOG#define MXC_INT_EXT_TV MX3x_INT_EXT_TV#define PROD_SIGNATURE MX3x_PROD_SIGNATURE -#define CHIP_REV_1_0 MX3x_CHIP_REV_1_0 -#define CHIP_REV_1_1 MX3x_CHIP_REV_1_1 -#define CHIP_REV_1_2 MX3x_CHIP_REV_1_2 -#define CHIP_REV_1_3 MX3x_CHIP_REV_1_3 -#define CHIP_REV_2_0 MX3x_CHIP_REV_2_0 -#define CHIP_REV_2_1 MX3x_CHIP_REV_2_1 -#define CHIP_REV_2_2 MX3x_CHIP_REV_2_2 -#define CHIP_REV_2_3 MX3x_CHIP_REV_2_3 -#define CHIP_REV_3_0 MX3x_CHIP_REV_3_0 -#define CHIP_REV_3_1 MX3x_CHIP_REV_3_1 -#define CHIP_REV_3_2 MX3x_CHIP_REV_3_2 -#define SYSTEM_REV_MIN MX3x_SYSTEM_REV_MIN -#define SYSTEM_REV_NUM MX3x_SYSTEM_REV_NUM#endif #endif /* ifndef __MACH_MX3x_H__ */
Signature · 1 line
1.7.2.3
PATCH v2 2/3 ARM: mx35: Add mx35_revision function to query the silicon revision
In reply to Uwe Kleine-KönigFrom: Eric B?nard <[email protected]>
Based on work done earlier by Sascha Hauer
--- arch/arm/mach-mx3/clock-imx35.c | 3 +++ arch/arm/mach-mx3/cpu.c | 27 +++++++++++++++++++++++++++ arch/arm/plat-mxc/include/mach/mx35.h | 18 ++++-------------- arch/arm/plat-mxc/include/mach/mx3x.h | 10 +++++++++- 4 files changed, 43 insertions(+), 15 deletions(-)
arch/arm/mach-mx3/clock-imx35.c +3 -0
@@ -535,6 +535,9 @@ int __init mx35_clocks_init()__raw_writel (cgr2,CCM_BASE +CCM_CGR2 );__raw_writel (cgr3,CCM_BASE +CCM_CGR3 ); +clk_enable (&iim_clk); +mx35_read_cpu_rev (); +#ifdef CONFIG_MXC_USE_EPIT epit_timer_init (&epit1_clk,MX35_IO_ADDRESS (MX35_EPIT1_BASE_ADDR ),MX35_INT_EPIT1 );
arch/arm/mach-mx3/cpu.c +27 -0
@@ -55,3 +55,30 @@ void __init mx31_read_cpu_rev(void)printk (KERN_WARNING "Unknown CPU identifier. srev = %02x\n" , srev); } + +unsigned int mx35_cpu_rev; +EXPORT_SYMBOL (mx35_cpu_rev); + +void __init mx35_read_cpu_rev (void ) +{ +u32 rev; +char *srev ="unknown" ; + + rev =__raw_readl (MX35_IO_ADDRESS (MX35_IIM_BASE_ADDR +MXC_IIMSREV )); +switch (rev) { +case 0x00 : + mx35_cpu_rev = MX3x_CHIP_REV_1_0; + srev ="1.0" ; +break ; +case 0x10 : + mx35_cpu_rev = MX3x_CHIP_REV_2_0; + srev ="2.0" ; +break ; +case 0x11 : + mx35_cpu_rev = MX3x_CHIP_REV_2_1; + srev ="2.1" ; +break ; + } + +printk (KERN_INFO "CPU identified as i.MX35, silicon rev %s\n" , srev); +}
arch/arm/plat-mxc/include/mach/mx35.h +4 -14
@@ -1,5 +1,6 @@#ifndef __MACH_MX35_H__#define __MACH_MX35_H__ +/* * IRAM */
@@ -63,6 +64,8 @@#define MX35_CAN1_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xe4000)#define MX35_CAN2_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xe8000)#define MX35_RTIC_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xec000) +#define MX35_IIM_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xf0000) +#define MX35_OTG_BASE_ADDR 0x53ff4000#define MX35_ROMP_BASE_ADDR 0x60000000
@@ -184,20 +187,7 @@#define MX35_PROD_SIGNATURE 0x1/* For MX31 */ -/* silicon revisions specific to i.MX31 */ -#define MX35_CHIP_REV_1_0 0x10 -#define MX35_CHIP_REV_1_1 0x11 -#define MX35_CHIP_REV_1_2 0x12 -#define MX35_CHIP_REV_1_3 0x13 -#define MX35_CHIP_REV_2_0 0x20 -#define MX35_CHIP_REV_2_1 0x21 -#define MX35_CHIP_REV_2_2 0x22 -#define MX35_CHIP_REV_2_3 0x23 -#define MX35_CHIP_REV_3_0 0x30 -#define MX35_CHIP_REV_3_1 0x31 -#define MX35_CHIP_REV_3_2 0x32 - -#define MX35_SYSTEM_REV_MIN MX35_CHIP_REV_1_0 +#define MX35_SYSTEM_REV_MIN MX3x_CHIP_REV_1_0#define MX35_SYSTEM_REV_NUM 3#ifdef IMX_NEEDS_DEPRECATED_SYMBOLS
arch/arm/plat-mxc/include/mach/mx3x.h +9 -1
@@ -240,7 +240,7 @@#define MX3x_PROD_SIGNATURE 0x1/* For MX31 */ -/* silicon revisions specific to i.MX31 */ +/* silicon revisions specific to i.MX31 and i.MX35 */ #define MX3x_CHIP_REV_1_0 0x10#define MX3x_CHIP_REV_1_1 0x11#define MX3x_CHIP_REV_1_2 0x12
@@ -267,6 +267,14 @@ static inline int mx31_revision(void) {return mx31_cpu_rev; } + +extern unsigned int mx35_cpu_rev; +extern void mx35_read_cpu_rev (void ); + +static inline int mx35_revision (void ) +{ +return mx35_cpu_rev; +}#endif #ifdef IMX_NEEDS_DEPRECATED_SYMBOLS
Signature · 1 line
1.7.2.3
PATCH v2 3/3 ARM: imx: fix/define clocks and create devices for imx dma
In reply to Uwe Kleine-König--- arch/arm/mach-mx3/clock-imx31.c | 4 +- arch/arm/mach-mx3/clock-imx35.c | 2 +- arch/arm/mach-mx5/clock-mx51.c | 5 + arch/arm/plat-mxc/devices/Makefile | 1 + arch/arm/plat-mxc/devices/platform-imx-dma.c | 129 ++++++++++++++++++++++++++ arch/arm/plat-mxc/include/mach/mx51.h | 2 +- 6 files changed, 139 insertions(+), 4 deletions(-) create mode 100644 arch/arm/plat-mxc/devices/platform-imx-dma.c
arch/arm/mach-mx3/clock-imx31.c +2 -2
@@ -477,7 +477,7 @@ DEFINE_CLOCK(epit1_clk, 0, MXC_CCM_CGR0, 6, NULL, NULL, &perclk_clk);DEFINE_CLOCK (epit2_clk,1 ,MXC_CCM_CGR0 ,8 ,NULL ,NULL , &perclk_clk);DEFINE_CLOCK (iim_clk,0 ,MXC_CCM_CGR0 ,10 ,NULL ,NULL , &ipg_clk);DEFINE_CLOCK (ata_clk,0 ,MXC_CCM_CGR0 ,12 ,NULL ,NULL , &ipg_clk); -DEFINE_CLOCK (sdma_clk1,0 ,MXC_CCM_CGR0 ,14 ,NULL , &sdma_clk1, &ahb_clk); +DEFINE_CLOCK (sdma_clk1,0 ,MXC_CCM_CGR0 ,14 ,NULL ,NULL , &ahb_clk);DEFINE_CLOCK (cspi3_clk,2 ,MXC_CCM_CGR0 ,16 ,NULL ,NULL , &ipg_clk);DEFINE_CLOCK (rng_clk,0 ,MXC_CCM_CGR0 ,18 ,NULL ,NULL , &ipg_clk);DEFINE_CLOCK (uart1_clk,0 ,MXC_CCM_CGR0 ,20 ,NULL ,NULL , &perclk_clk);
@@ -564,7 +564,7 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK(NULL, "ata", ata_clk) _REGISTER_CLOCK(NULL, "rtic", rtic_clk) _REGISTER_CLOCK(NULL, "rng", rng_clk) - _REGISTER_CLOCK(NULL, "sdma_ahb", sdma_clk1) + _REGISTER_CLOCK("imx-sdma", NULL, sdma_clk1) _REGISTER_CLOCK(NULL, "sdma_ipg", sdma_clk2) _REGISTER_CLOCK(NULL, "mstick", mstick1_clk)_REGISTER_CLOCK (NULL ,"mstick" , mstick2_clk)
arch/arm/mach-mx3/clock-imx35.c +1 -1
@@ -482,7 +482,7 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK(NULL, "rtc", rtc_clk) _REGISTER_CLOCK(NULL, "rtic", rtic_clk) _REGISTER_CLOCK(NULL, "scc", scc_clk) - _REGISTER_CLOCK(NULL, "sdma", sdma_clk) + _REGISTER_CLOCK("imx-sdma", NULL, sdma_clk) _REGISTER_CLOCK(NULL, "spba", spba_clk) _REGISTER_CLOCK(NULL, "spdif", spdif_clk)_REGISTER_CLOCK ("imx-ssi.0" ,NULL , ssi1_clk)
arch/arm/mach-mx5/clock-mx51.c +5 -0
@@ -977,6 +977,10 @@ DEFINE_CLOCK(cspi_ipg_clk, 0, MXC_CCM_CCGR4, MXC_CCM_CCGRx_CG9_OFFSET,DEFINE_CLOCK (cspi_clk,0 ,MXC_CCM_CCGR4 , MXC_CCM_CCGRx_CG13_OFFSET,NULL ,NULL , &ipg_clk, &cspi_ipg_clk); +/* SDMA */ +DEFINE_CLOCK (sdma_clk,1 ,MXC_CCM_CCGR4 , MXC_CCM_CCGRx_CG15_OFFSET, +NULL ,NULL , &ahb_clk,NULL ); +#define _REGISTER_CLOCK (d, n, c) \ { \ .dev_id = d, \
@@ -1003,6 +1007,7 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK("mxc_nand", NULL, nfc_clk) _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk) _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk) + _REGISTER_CLOCK("imx-sdma", NULL, sdma_clk) _REGISTER_CLOCK(NULL, "ckih", ckih_clk) _REGISTER_CLOCK(NULL, "ckih2", ckih2_clk)_REGISTER_CLOCK (NULL ,"gpt_32k" , gpt_32k_clk)
arch/arm/plat-mxc/devices/Makefile +1 -0
@@ -1,4 +1,5 @@ obj-$(CONFIG_IMX_HAVE_PLATFORM_FLEXCAN) += platform-flexcan.o +obj-y += platform-imx-dma.o obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_I2C) += platform-imx-i2c.o obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_SSI) += platform-imx-ssi.o obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_UART) += platform-imx-uart.o
arch/arm/plat-mxc/devices/platform-imx-dma.c new file +129 -0
129 lines not on this page · raw message
arch/arm/plat-mxc/include/mach/mx51.h +1 -1
@@ -285,7 +285,7 @@#define MX51_MXC_INT_MMC_SDHC3 3#define MX51_MXC_INT_MMC_SDHC4 4#define MX51_MXC_INT_RESV5 5 -#define MX51_MXC_INT_SDMA 6 +#define MX51_INT_SDMA 6#define MX51_MXC_INT_IOMUX 7#define MX51_INT_NFC 8#define MX51_MXC_INT_VPU 9
Signature · 1 line
1.7.2.3