Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2787cb8ae5c68a6945eb82ccf96b5f2c4f238323

Authored by Bartlomiej Zolnierkiewicz
1 parent 0a6e49e9bc
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

ide: add IDE_HFLAG_DTC2278 host flag 

Add IDE_HFLAG_DTC2278 host flag and use it instead of ide_dtc2278
chipset type in ide_init_port().

There should be no functional changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Showing 3 changed files with 5 additions and 2 deletions Side-by-side Diff

drivers/ide/dtc2278.c
Diff comments   View file @ 2787cb8
... ... @@ -100,7 +100,8 @@
100 100 IDE_HFLAG_IO_32BIT |
101 101 /* disallow ->io_32bit changes */
102 102 IDE_HFLAG_NO_IO_32BIT |
103   - IDE_HFLAG_NO_DMA,
  103 + IDE_HFLAG_NO_DMA |
  104 + IDE_HFLAG_DTC2278,
104 105 .pio_mask = ATA_PIO4,
105 106 };
106 107  
drivers/ide/ide-probe.c
Diff comments   View file @ 2787cb8
... ... @@ -1061,7 +1061,7 @@
1061 1061 hwif->tp_ops = d->tp_ops;
1062 1062  
1063 1063 /* ->set_pio_mode for DTC2278 is currently limited to port 0 */
1064   - if (hwif->chipset != ide_dtc2278 || hwif->channel == 0)
  1064 + if ((hwif->host_flags & IDE_HFLAG_DTC2278) == 0 || hwif->channel == 0)
1065 1065 hwif->port_ops = d->port_ops;
1066 1066  
1067 1067 hwif->swdma_mask = d->swdma_mask;
... ... @@ -1325,6 +1325,8 @@
1325 1325 IDE_HFLAG_ERROR_STOPS_FIFO = (1 << 19),
1326 1326 /* serialize ports */
1327 1327 IDE_HFLAG_SERIALIZE = (1 << 20),
  1328 + /* host is DTC2278 */
  1329 + IDE_HFLAG_DTC2278 = (1 << 21),
1328 1330 /* host is TRM290 */
1329 1331 IDE_HFLAG_TRM290 = (1 << 23),
1330 1332 /* use 32-bit I/O ops */