ATA: Add missing defines to ata.h
PATCH 1/1 ATA: Add missing defines to ata.h
Add defines that intersects with the libata patch sent by Dave Liu
Signed-off-by Tor Krill <[email protected]>
u-boot/include/ata.h renamed from include/ata.h +14 -3
@@ -119,8 +119,10 @@ATA_REG_BYTEH =ATA_REG_LBAH ,ATA_REG_DEVSEL =ATA_REG_DEVICE , ATA_REG_IRQ = ATA_REG_NSECT, - -/* SETFEATURES stuff */ +}; + +/* SETFEATURES stuff */ +enum ata_set_features {SETFEATURES_XFER =0x03 ,XFER_UDMA_7 =0x47 , XFER_UDMA_6 = 0x46,
@@ -130,9 +132,13 @@XFER_UDMA_2 =0x42 ,XFER_UDMA_1 =0x41 ,XFER_UDMA_0 =0x40 , +XFER_MW_DMA_4 =0x24 ,/* CFA only */ +XFER_MW_DMA_3 =0x23 ,/* CFA only */ XFER_MW_DMA_2 =0x22 ,XFER_MW_DMA_1 =0x21 ,XFER_MW_DMA_0 =0x20 , +XFER_PIO_6 =0x0E ,/* CFA only */ +XFER_PIO_5 =0x0D ,/* CFA only */ XFER_PIO_4 =0x0C ,XFER_PIO_3 =0x0B , XFER_PIO_2 = 0x0A,
@@ -141,7 +147,12 @@XFER_SW_DMA_2 =0x12 ,XFER_SW_DMA_1 =0x11 ,XFER_SW_DMA_0 =0x10 , - XFER_PIO_SLOW = 0x00 +XFER_PIO_SLOW =0x00 , + +SETFEATURES_WC_ON =0x02 ,/* Enable write cache */ +SETFEATURES_WC_OFF =0x82 ,/* Disable write cache */ + + SETFEATURES_SPINUP = 0x07, /* Spin-up drive */ };/* * ATA Commands (only mandatory commands listed here)
PATCH 1/1 ATA: Add missing defines to ata.h
Quoted 4 lines · In message <n2tuAEh3.1205933786.7768430.tor@localhost> you wrote:
Add defines that intersects with the libata patch sent by Dave Liu
Signed-off-by Tor Krill <[email protected]>
error: u-boot/include/ata.h: does not exist in index
fatal: sha1 information is lacking or useless (u-boot/include/ata.h). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge.
Patch failed at 0001.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de For every complex problem, there is a solution that is simple, neat, and wrong. - Mark Twain