AT91: initialize IDE driver on AT91SAM9263 cpu
PATCH 3/3 AT91: initialize IDE driver on AT91SAM9263 cpu
--- arch/arm/mach-at91/at91sam9263_devices.c | 97 ++++++++++++++++++++++++++++++ 1 files changed, 97 insertions(+), 0 deletions(-)
arch/arm/mach-at91/at91sam9263_devices.c +97 -0
@@ -347,6 +347,103 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)void __init at91_add_device_mmc (short mmc_id,struct at91_mmc_data *data) {}#endif +/* -------------------------------------------------------------------- +* IDE +* -------------------------------------------------------------------- */ + +#if defined(CONFIG_BLK_DEV_IDE_AT91 ) || defined(CONFIG_BLK_DEV_IDE_AT91_MODULE ) + +/* Proper CS address space will be added */ +#define AT91_IDE_TASK_FILE 0x00c00000 +#define AT91_IDE_CTRL_REG 0x00e00000 + +static struct resource ide_resources[] = { + [0 ] = { + .start =AT91_IDE_TASK_FILE , + .end =AT91_IDE_TASK_FILE +16 -1 , + .flags =IORESOURCE_MEM , + }, + [1 ] = { + .start =AT91_IDE_CTRL_REG , + .end =AT91_IDE_CTRL_REG +16 -1 , + .flags =IORESOURCE_MEM , + }, +}; + +static struct at91_ide_data ide_data; + +static struct platform_device at91_ide_device = { + .name ="at91_ide" , + .id =-1 , + .dev = { + .platform_data = &ide_data, + }, + .resource = ide_resources, + .num_resources =ARRAY_SIZE (ide_resources), +}; + +void __init at91_add_device_ide (struct at91_ide_data *data) +{ +unsigned long ebi0_csa, addr_space; +u8 chipselect = data->chipselect; + +/* enable PIO controlled pins, inputs with pull ups */ +if (data->rst_pin) +at91_set_gpio_output (data->rst_pin,0 );/* reset card */ + +at91_set_gpio_input (data->irq_pin,1 ); +at91_set_deglitch (data->irq_pin,1 ); + +if (data->det_pin) { +at91_set_gpio_input (data->det_pin,1 ); +at91_set_deglitch (data->det_pin,1 ); + } + +/* enable EBI SMC controlled pins */ +at91_set_A_periph (AT91_PIN_PD5 ,1 );/* NWAIT */ +at91_set_A_periph (AT91_PIN_PD8 ,0 );/* CFCE1 */ +at91_set_A_periph (AT91_PIN_PD9 ,0 );/* CFCE2 */ +at91_set_A_periph (AT91_PIN_PD14 ,0 );/* CFNRW */ + +/* assign CS4/5 to SMC with Compact Flash logic support +* and fix resources addresses */ + ebi0_csa =at91_sys_read (AT91_MATRIX_EBI0CSA ); +switch (chipselect) { +case 4 : +at91_set_A_periph (AT91_PIN_PD6 ,0 );/* EBI0_NCS4/CFCS0 */ + ebi0_csa |=AT91_MATRIX_EBI0_CS4A_SMC_CF1 ; + addr_space =AT91_CHIPSELECT_4 ; +break ; +case 5 : +at91_set_A_periph (AT91_PIN_PD7 ,0 );/* EBI0_NCS5/CFCS1 */ + ebi0_csa |=AT91_MATRIX_EBI0_CS5A_SMC_CF2 ; + addr_space =AT91_CHIPSELECT_5 ; +break ; +default : +printk (KERN_ERR "at91_ide: bad chip select %u\n" , chipselect); +return ; + } +at91_sys_write (AT91_MATRIX_EBI0CSA , ebi0_csa); + ide_resources[0 ].start += addr_space; + ide_resources[0 ].end += addr_space; + ide_resources[1 ].start += addr_space; + ide_resources[1 ].end += addr_space; + +/* turn on the card if reset pin is GPIO */ +if (data->rst_pin) +at91_set_gpio_value (data->rst_pin,1 ); + +if (data->det_pin &&at91_get_gpio_value (data->det_pin) !=0 ) { +printk (KERN_ERR "at91_ide: no Compact Flash card detected\n" ); +return ; + } + + ide_data = *data; +platform_device_register (&at91_ide_device); +} +#else +void __init at91_add_device_ide (struct at91_ide_data *data) {} +#endif /* -------------------------------------------------------------------- * NAND / SmartMedia
Signature · 1 line
1.5.2.5
hi Stanislaw,
arch/arm/mach-at91/at91sam9263_devices.c void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) · line 386
Quoted 2 lines
arch/arm/mach-at91/at91sam9263_devices.c +2
-0+void __init at91_add_device_ide (struct at91_ide_data *data) +{
This platform initialization code is virtually identical to the at91_cf version submitted by Uros Bizjak, albeit for the SAM9260. Similarly the "at91_cf_data" and "at91_ide_data" structs.
Wouldn't it be better to have a single CF initialization function, and you specify whether you want "plain CF" mode or True-IDE mode? You could even pass the same platform-resources structure (ie, base-address of CF region), and have at91_ide setup the location of the task-file and control registers from that base address.
Regards,
Andrew Victor
Tuesday 03 February 2009 21:27:04 Andrew Victor napisał(a):
Quoted 1 line
hi Stanislaw,
Hi.
Quoted 7 lines
arch/arm/mach-at91/at91sam9263_devices.c void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) · line 386
Quoted 2 lines
arch/arm/mach-at91/at91sam9263_devices.c +2
-0+void __init at91_add_device_ide (struct at91_ide_data *data) +{This platform initialization code is virtually identical to the
at91_cfversion submitted by Uros Bizjak, albeit for the SAM9260. Similarly the "at91_cf_data" and "at91_ide_data" structs.
Quoted 5 lines
Wouldn't it be better to have a single CF initialization function, and you specify whether you want "plain CF" mode or True-IDE mode? You could even pass the same platform-resources structure (ie, base-address of CF region), and have
at91_idesetup the location of the task-file and control registers from that base address.
Yes, this can be merged together. Ronetix already did a SAM9263 board and linux patch with "full" CF device.
There are some difference, but I think CF stuff can have one initialization function. Could this be a separate patch in later date? I would like marge at91_ide into mainline without changes if there will be no objections.
Cheers
Stanislaw Gruszka
Hello.
Quoted 2 lines · Stanislaw Gruszka
Signed-off-by Stanislaw Gruszka <[email protected]>
[...]
Quoted 8 lines
arch/arm/mach-at91/at91sam9263_devices.c +0
-0@@ -347,6 +347,103 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)void __init at91_add_device_mmc (short mmc_id,struct at91_mmc_data *data) {}#endif
arch/arm/mach-at91/at91sam9263_devices.c void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) · line 359
Quoted 10 lines
arch/arm/mach-at91/at91sam9263_devices.c +9
-0+/* -------------------------------------------------------------------- +* IDE +* -------------------------------------------------------------------- */ + +#if defined(CONFIG_BLK_DEV_IDE_AT91 ) || defined(CONFIG_BLK_DEV_IDE_AT91_MODULE ) + +/* Proper CS address space will be added */ +#define AT91_IDE_TASK_FILE 0x00c00000 +#define AT91_IDE_CTRL_REG 0x00e00000
Why are you assuming that these offsets are not board specifec I
wonder? Theyu clearly depend on how the -CSx were wired on the board -- it's the same board specific data as your IRQ.
Quoted 3 lines
arch/arm/mach-at91/at91sam9263_devices.c +2
-0+void __init at91_add_device_ide (struct at91_ide_data *data) +{
[...]
arch/arm/mach-at91/at91sam9263_devices.c void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) · line 409
Quoted 3 lines
arch/arm/mach-at91/at91sam9263_devices.c +2
-0+/* assign CS4/5 to SMC with Compact Flash logic support +* and fix resources addresses */
It again seems like board specific configuration...
Quoted 7 lines
arch/arm/mach-at91/at91sam9263_devices.c +6
-0+ ebi0_csa =at91_sys_read (AT91_MATRIX_EBI0CSA ); +switch (chipselect) { +case 4 : +at91_set_A_periph (AT91_PIN_PD6 ,0 );/* EBI0_NCS4/CFCS0 */ + ebi0_csa |=AT91_MATRIX_EBI0_CS4A_SMC_CF1 ; + addr_space =AT91_CHIPSELECT_4 ;
arch/arm/mach-at91/at91sam9263_devices.c void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)
Quoted 10 lines
arch/arm/mach-at91/at91sam9263_devices.c +9
-0+break ; +case 5 : +at91_set_A_periph (AT91_PIN_PD7 ,0 );/* EBI0_NCS5/CFCS1 */ + ebi0_csa |=AT91_MATRIX_EBI0_CS5A_SMC_CF2 ; + addr_space =AT91_CHIPSELECT_5 ; +break ; +default : +printk (KERN_ERR "at91_ide: bad chip select %u\n" , chipselect); +return ;
Why do you consider it bad? Is there some SMC limitation or what?
MBR, Sergei
Wednesday 04 February 2009 13:18:05 Sergei Shtylyov napisał(a):
Quoted 1 line
Hello.
Hi
Quoted 12 lines
Quoted 2 lines · Stanislaw Gruszka
Signed-off-by Stanislaw Gruszka <[email protected]>[...]
Quoted 8 lines
arch/arm/mach-at91/at91sam9263_devices.c +0
-0@@ -347,6 +347,103 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)void __init at91_add_device_mmc (short mmc_id,struct at91_mmc_data *data) {}#endif
Quoted 14 lines
arch/arm/mach-at91/at91sam9263_devices.c void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)
Quoted 10 lines
arch/arm/mach-at91/at91sam9263_devices.c +9
-0+/* -------------------------------------------------------------------- +* IDE +* -------------------------------------------------------------------- */ + +#if defined(CONFIG_BLK_DEV_IDE_AT91 ) || defined(CONFIG_BLK_DEV_IDE_AT91_MODULE ) + +/* Proper CS address space will be added */ +#define AT91_IDE_TASK_FILE 0x00c00000 +#define AT91_IDE_CTRL_REG 0x00e00000Why are you assuming that these offsets are not board specifec I
wonder? Theyu clearly depend on how the -CSx were wired on the board -- it's the same board specific data as your IRQ.
Are CPU specific. Actually all AT91(except RM9200) use the same offsets, so could be moved from here to driver code, like in at91_cf driver. In this file only we will have proper Chip Select address space resource.
Quoted 9 lines
Quoted 3 lines
arch/arm/mach-at91/at91sam9263_devices.c +2
-0+void __init at91_add_device_ide (struct at91_ide_data *data) +{[...]
arch/arm/mach-at91/at91sam9263_devices.c void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) · line 409
Quoted 3 lines
arch/arm/mach-at91/at91sam9263_devices.c +2
-0+/* assign CS4/5 to SMC with Compact Flash logic support +* and fix resources addresses */ It again seems like board specific configuration...
No, is not board specific.
Quoted 15 lines
Quoted 15 lines
arch/arm/mach-at91/at91sam9263_devices.c +14
-0+ ebi0_csa =at91_sys_read (AT91_MATRIX_EBI0CSA ); +switch (chipselect) { +case 4 : +at91_set_A_periph (AT91_PIN_PD6 ,0 );/* EBI0_NCS4/CFCS0 */ + ebi0_csa |=AT91_MATRIX_EBI0_CS4A_SMC_CF1 ; + addr_space =AT91_CHIPSELECT_4 ; +break ; +case 5 : +at91_set_A_periph (AT91_PIN_PD7 ,0 );/* EBI0_NCS5/CFCS1 */ + ebi0_csa |=AT91_MATRIX_EBI0_CS5A_SMC_CF2 ; + addr_space =AT91_CHIPSELECT_5 ; +break ; +default : +printk (KERN_ERR "at91_ide: bad chip select %u\n" , chipselect);
Quoted 4 lines
arch/arm/mach-at91/at91sam9263_devices.c
Quoted 2 lines
arch/arm/mach-at91/at91sam9263_devices.c +1
-0+return ;Why do you consider it bad? Is there some SMC limitation or what?
Yes, Compact Flash ("full" and True IDE mode) is supported only on chip select 4 or 5 for AT91SAM9263 (like for all other SAM9s).
Cheers
Stanislaw Gruszka
Quoted 25 lines · Stanislaw Gruszka
Quoted 12 lines
Quoted 1 line
Signed-off-by Stanislaw Gruszka <[email protected]>[...]
Quoted 8 lines
arch/arm/mach-at91/at91sam9263_devices.c +0
-0@@ -347,6 +347,103 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)void __init at91_add_device_mmc (short mmc_id,struct at91_mmc_data *data) {}#endif Quoted 12 lines
arch/arm/mach-at91/at91sam9263_devices.c void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) · line 358
Quoted 9 lines
arch/arm/mach-at91/at91sam9263_devices.c +9
-0+/* -------------------------------------------------------------------- +* IDE +* -------------------------------------------------------------------- */ + +#if defined(CONFIG_BLK_DEV_IDE_AT91 ) || defined(CONFIG_BLK_DEV_IDE_AT91_MODULE ) + +/* Proper CS address space will be added */ +#define AT91_IDE_TASK_FILE 0x00c00000 +#define AT91_IDE_CTRL_REG 0x00e00000Why are you assuming that these offsets are not board specifec I
wonder? Theyu clearly depend on how the -CSx were wired on the board -- it's the same board specific data as your IRQ.
Quoted 1 line
Are CPU specific.
Ah, sorry, I've missed that in the datasheet -- only looked into the SMC
section and that's described in the EBI section...
Quoted 3 lines
Actually all AT91(except RM9200) use the same offsets,
so could be moved from here to driver code, like inat91_cfdriver. In this file only we will have proper Chip Select address space resource.
Then it indeed makes much sense having a single platfrom device for both
IDE driver and the possible PCMCIA driver with a single memory resource covering the whole CS4/5 range as the drivers will know what subranges they want to use.
Quoted 2 lines
Cheers
Stanislaw Gruszka
WBR, Sergei
Hello.
Quoted 13 lines · Stanislaw Gruszka
Quoted 7 lines
arch/arm/mach-at91/at91sam9263_devices.c void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) · line 386
Quoted 3 lines
arch/arm/mach-at91/at91sam9263_devices.c +2
-0+void __init at91_add_device_ide (struct at91_ide_data *data) +{This platform initialization code is virtually identical to the
at91_cfversion submitted by Uros Bizjak, albeit for the SAM9260. Similarly the "at91_cf_data" and "at91_ide_data" structs.Quoted 6 lines
Wouldn't it be better to have a single CF initialization function, and you specify whether you want "plain CF" mode or True-IDE mode? You could even pass the same platform-resources structure (ie, base-address of CF region), and have
at91_idesetup the location of the task-file and control registers from that base address.
Quoted 5 lines
Yes, this can be merged together. Ronetix already did a SAM9263 board and linux patch with "full" CF device.
This patch is clearly incomplete because drivers/pcmcia/at91_cf.c
does accesses AT91RM9200 specific SMC register, but the patch does nothing about making this work on AT91SAM9. Though it indeed seems that AT91SAM9 can be supported by that driver with minimum change -- perhaps by using cpi_is_*()...
And WTF is that: sound/arm/at91-ac97.c.rej? :-/
Quoted 1 line
There are some difference,
The CF memory mappings seem compatible b/w AT91SAM9 and AT91RM9200,
except the latter doesn't support True IDE mode.
Quoted 3 lines
but I think CF stuff can have one initialization function. Could this be a separate patch in later date? I would like marge
at91_ideinto mainline without changes if there will be no objections.
I would still like 2 resources merged into 1 -- however, possibly
from the offset 0x00c00000, i.e. not including PCMCIA compatible memory space.
Quoted 3 lines
Cheers
Stanislaw Gruszka
MBR, Sergei
Tuesday 03 February 2009 21:27:04 Andrew Victor napisał(a):
Quoted 8 lines
hi Stanislaw,
arch/arm/mach-at91/at91sam9263_devices.c void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) · line 386
Quoted 2 lines
arch/arm/mach-at91/at91sam9263_devices.c +2
-0+void __init at91_add_device_ide (struct at91_ide_data *data) +{This platform initialization code is virtually identical to the
at91_cfversion submitted by Uros Bizjak, albeit for the SAM9260. Similarly the "at91_cf_data" and "at91_ide_data" structs.
Shouldn't be sam9_smc_config stuff be in board file not in cpu file, in place where you know what is the clock frequency. Could you assume cpu is clocked with some particular freqency?
Cheers
Stanislaw Gruszka
hi,
Quoted 7 lines
Quoted 1 line
This patch is clearly incomplete because
drivers/pcmcia/at91_cf.cdoes
accesses AT91RM9200 specific SMC register, but the patch does nothing about making this work on AT91SAM9. Though it indeed seems that AT91SAM9 can be supported by that driver with minimum change -- perhaps by using cpi_is_*()...
Rather see latest patch on http://maxim.org.za/at91_26.html.
The cpu_is_XX() is for run-time selection (and is the preferred mechanism). Unfortunately the SMC registers are significantly different on the SAM9 and RM9200, so we need to use #ifdefs for compile-time selection.
Regards,
Andrew Victor
Quoted 8 lines · Andrew Victor
Quoted 7 lines
Quoted 1 line
This patch is clearly incomplete because
drivers/pcmcia/at91_cf.cdoes accesses AT91RM9200 specific SMC register, but the patch does nothing about making this work on AT91SAM9. Though it indeed seems that AT91SAM9 can be supported by that driver with minimum change -- perhaps by using cpi_is_*()...
Quoted 5 lines
Rather see latest patch on http://maxim.org.za/at91_26.html.
The
cpu_is_XX()is for run-time selection (and is the preferred mechanism). Unfortunately the SMC registers are significantly different on the SAM9 and RM9200, so we need to use #ifdefs for compile-time selection.
Ah, seeing the real issue now: different encoding of the DBW fields b/w
those 2 types of SMCs. Oh, and I've missed the different DBW field positions too... That however can be addressed by using the driver local #define', not the ones from the headers (which should be conflicting)...
Quoted 2 lines
Regards,
Andrew Victor
WBR, Sergei
Quoted 9 lines · Hello. I
Quoted 8 lines
Quoted 8 lines
Quoted 2 lines
This patch is clearly incomplete because
drivers/pcmcia/at91_cf.cdoes accesses AT91RM9200 specific SMC register, but the patch does nothing about making this work on AT91SAM9. Though it indeed seems that AT91SAM9 can be supported by that driver with minimum change -- perhaps by using cpi_is_*()...
Quoted 8 lines
Quoted 5 lines
Rather see latest patch on http://maxim.org.za/at91_26.html.
The
cpu_is_XX()is for run-time selection (and is the preferred mechanism). Unfortunately the SMC registers are significantly different on the SAM9 and RM9200, so we need to use #ifdefs for compile-time selection.Ah, seeing the real issue now: different encoding of the DBW fields
b/w those 2 types of SMCs. Oh, and I've missed the different DBW field positions too... That however can be addressed by using the driver local #define', not the ones from the headers (which should be conflicting)...
Well, probably not the best approach either. Since the SMC specific
in contained in a single funtion in this case, anothe rapproach can be used: implement the function in the platfrom code and pass the pointer to it via the platfrom data. This approach is used when the driver needs to some board specific hook, e.g. some MMC drivers use this approach for checking the write protect signal wired to some GPIO in a board specific way).
Quoted 2 lines
Quoted 1 line
Andrew Victor
Regards,
WBR, Sergei