Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 934bb7f88eb398f62314fa63ba72ac6dcd21192a

Authored by Hirokazu Takata
Committed by Linus Torvalds
1 parent 6f973b001a
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[PATCH] m32r: Update m32r_cfc.[ch] to support Mappi-III platform 

This patch is for the M32R CF/PCMCIA drivers to support a new platform,
Mappi-III evaluation board.

Signed-off-by: Mamoru Sakugawa <sakugawa@linux-m32r.org>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 3 changed files with 33 additions and 38 deletions Side-by-side Diff

drivers/pcmcia/Kconfig
Diff comments   View file @ 934bb7f
... ... @@ -171,19 +171,21 @@
171 171 config M32R_PCC
172 172 bool "M32R PCMCIA I/F"
173 173 depends on M32R && CHIP_M32700 && PCMCIA
  174 + select PCCARD_NONSTATIC
174 175 help
175 176 Say Y here to use the M32R PCMCIA controller.
176 177  
177 178 config M32R_CFC
178 179 bool "M32R CF I/F Controller"
179   - depends on M32R && (PLAT_USRV || PLAT_M32700UT || PLAT_MAPPI2 || PLAT_OPSPUT)
  180 + depends on M32R && (PLAT_USRV || PLAT_M32700UT || PLAT_MAPPI2 || PLAT_MAPPI3 || PLAT_OPSPUT)
  181 + select PCCARD_NONSTATIC
180 182 help
181 183 Say Y here to use the M32R CompactFlash controller.
182 184  
183 185 config M32R_CFC_NUM
184 186 int "M32R CF I/F number"
185 187 depends on M32R_CFC
186   - default "1" if PLAT_USRV || PLAT_M32700UT || PLAT_MAPPI2 || PLAT_OPSPUT
  188 + default "1" if PLAT_USRV || PLAT_M32700UT || PLAT_MAPPI2 || PLAT_MAPPI3 || PLAT_OPSPUT
187 189 help
188 190 Set the number of M32R CF slots.
189 191  
drivers/pcmcia/m32r_cfc.c
Diff comments   View file @ 934bb7f
... ... @@ -24,9 +24,9 @@
24 24 #include <linux/workqueue.h>
25 25 #include <linux/interrupt.h>
26 26 #include <linux/device.h>
  27 +#include <linux/bitops.h>
27 28 #include <asm/irq.h>
28 29 #include <asm/io.h>
29   -#include <asm/bitops.h>
30 30 #include <asm/system.h>
31 31  
32 32 #include <pcmcia/version.h>
... ... @@ -444,7 +444,7 @@
444 444 debug(3, "m32r_cfc: _pcc_get_status: "
445 445 "power off (CPCR=0x%08x)\n", status);
446 446 }
447   -#elif defined(CONFIG_PLAT_MAPPI2)
  447 +#elif defined(CONFIG_PLAT_MAPPI2) || defined(CONFIG_PLAT_MAPPI3)
448 448 if ( status ) {
449 449 status = pcc_get(sock, (unsigned int)PLD_CPCR);
450 450 if (status == 0) { /* power off */
... ... @@ -452,18 +452,23 @@
452 452 pcc_set(sock, (unsigned int)PLD_CFBUFCR,0); /* force buffer off for ZA-36 */
453 453 udelay(50);
454 454 }
455   - status = pcc_get(sock, (unsigned int)PLD_CFBUFCR);
456   - if (status != 0) { /* buffer off */
457   - pcc_set(sock, (unsigned int)PLD_CFBUFCR,0);
458   - udelay(50);
459   - pcc_set(sock, (unsigned int)PLD_CFRSTCR, 0x0101);
460   - udelay(25); /* for IDE reset */
461   - pcc_set(sock, (unsigned int)PLD_CFRSTCR, 0x0100);
462   - mdelay(2); /* for IDE reset */
463   - } else {
464   - *value |= SS_POWERON;
465   - *value |= SS_READY;
466   - }
  455 + *value |= SS_POWERON;
  456 +
  457 + pcc_set(sock, (unsigned int)PLD_CFBUFCR,0);
  458 + udelay(50);
  459 + pcc_set(sock, (unsigned int)PLD_CFRSTCR, 0x0101);
  460 + udelay(25); /* for IDE reset */
  461 + pcc_set(sock, (unsigned int)PLD_CFRSTCR, 0x0100);
  462 + mdelay(2); /* for IDE reset */
  463 +
  464 + *value |= SS_READY;
  465 + *value |= SS_3VCARD;
  466 + } else {
  467 + /* disable CF power */
  468 + pcc_set(sock, (unsigned int)PLD_CPCR, 0);
  469 + udelay(100);
  470 + debug(3, "m32r_cfc: _pcc_get_status: "
  471 + "power off (CPCR=0x%08x)\n", status);
467 472 }
468 473 #else
469 474 #error no platform configuration
470 475  
... ... @@ -479,14 +484,13 @@
479 484 {
480 485 // pcc_socket_t *t = &socket[sock];
481 486  
482   -#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_USRV) || defined(CONFIG_PLAT_OPSPUT)
483 487 state->flags = 0;
484 488 state->csc_mask = SS_DETECT;
485 489 state->csc_mask |= SS_READY;
486 490 state->io_irq = 0;
487 491 state->Vcc = 33; /* 3.3V fixed */
488 492 state->Vpp = 33;
489   -#endif
  493 +
490 494 debug(3, "m32r_cfc: GetSocket(%d) = flags %#3.3x, Vcc %d, Vpp %d, "
491 495 "io_irq %d, csc_mask %#2.2x\n", sock, state->flags,
492 496 state->Vcc, state->Vpp, state->io_irq, state->csc_mask);
493 497  
494 498  
495 499  
... ... @@ -497,32 +501,17 @@
497 501  
498 502 static int _pcc_set_socket(u_short sock, socket_state_t *state)
499 503 {
500   -#if defined(CONFIG_PLAT_MAPPI2)
501   - u_long reg = 0;
502   -#endif
503 504 debug(3, "m32r_cfc: SetSocket(%d, flags %#3.3x, Vcc %d, Vpp %d, "
504 505 "io_irq %d, csc_mask %#2.2x)\n", sock, state->flags,
505 506 state->Vcc, state->Vpp, state->io_irq, state->csc_mask);
506 507  
507   -#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_USRV) || defined(CONFIG_PLAT_OPSPUT)
  508 +#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_USRV) || defined(CONFIG_PLAT_OPSPUT) || defined(CONFIG_PLAT_MAPPI2) || defined(CONFIG_PLAT_MAPPI3)
508 509 if (state->Vcc) {
509 510 if ((state->Vcc != 50) && (state->Vcc != 33))
510 511 return -EINVAL;
511 512 /* accept 5V and 3.3V */
512 513 }
513   -#elif defined(CONFIG_PLAT_MAPPI2)
514   - if (state->Vcc) {
515   - /*
516   - * 5V only
517   - */
518   - if (state->Vcc == 50) {
519   - reg |= PCCSIGCR_VEN;
520   - } else {
521   - return -EINVAL;
522   - }
523   - }
524 514 #endif
525   -
526 515 if (state->flags & SS_RESET) {
527 516 debug(3, ":RESET\n");
528 517 pcc_set(sock,(unsigned int)PLD_CFRSTCR,0x101);
... ... @@ -788,7 +777,7 @@
788 777 return ret;
789 778 }
790 779  
791   -#if defined(CONFIG_PLAT_MAPPI2)
  780 +#if defined(CONFIG_PLAT_MAPPI2) || defined(CONFIG_PLAT_MAPPI3)
792 781 pcc_set(0, (unsigned int)PLD_CFCR0, 0x0f0f);
793 782 pcc_set(0, (unsigned int)PLD_CFCR1, 0x0200);
794 783 #endif
... ... @@ -825,7 +814,7 @@
825 814 for (i = 0 ; i < pcc_sockets ; i++) {
826 815 socket[i].socket.dev.dev = &pcc_device.dev;
827 816 socket[i].socket.ops = &pcc_operations;
828   - socket[i].socket.resource_ops = &pccard_static_ops;
  817 + socket[i].socket.resource_ops = &pccard_nonstatic_ops;
829 818 socket[i].socket.owner = THIS_MODULE;
830 819 socket[i].number = i;
831 820 ret = pcmcia_register_socket(&socket[i].socket);
drivers/pcmcia/m32r_cfc.h
Diff comments   View file @ 934bb7f
... ... @@ -71,11 +71,15 @@
71 71  
72 72 #define CFC_IOPORT_BASE 0x1000
73 73  
74   -#if !defined(CONFIG_PLAT_USRV)
  74 +#if defined(CONFIG_PLAT_MAPPI3)
  75 +#define CFC_ATTR_MAPBASE 0x14014000
  76 +#define CFC_IO_MAPBASE_BYTE 0xb4012000
  77 +#define CFC_IO_MAPBASE_WORD 0xb4002000
  78 +#elif !defined(CONFIG_PLAT_USRV)
75 79 #define CFC_ATTR_MAPBASE 0x0c014000
76 80 #define CFC_IO_MAPBASE_BYTE 0xac012000
77 81 #define CFC_IO_MAPBASE_WORD 0xac002000
78   -#else /* CONFIG_PLAT_USRV */
  82 +#else
79 83 #define CFC_ATTR_MAPBASE 0x04014000
80 84 #define CFC_IO_MAPBASE_BYTE 0xa4012000
81 85 #define CFC_IO_MAPBASE_WORD 0xa4002000