2007-01-06 12:14:56

by Conke Hu

[permalink] [raw]
Subject: [PATCH 2/3] atiixp.c: sb600 ide only has one channel

AMD/ATI SB600 IDE/PATA controller only has one channel.

Signed-off-by: Conke Hu <[email protected]>
---------------
--- linux-2.6.20-rc3-git4/drivers/ide/pci/atiixp.c.1 2007-01-06
19:13:55.000000000 +0800
+++ linux-2.6.20-rc3-git4/drivers/ide/pci/atiixp.c.2 2007-01-06
19:19:35.000000000 +0800
@@ -327,7 +327,14 @@ static ide_pci_device_t atiixp_pci_info[
.autodma = AUTODMA,
.enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
.bootable = ON_BOARD,
- },
+ },{ /* 1 */
+ .name = "SB600_PATA",
+ .init_hwif = init_hwif_atiixp,
+ .channels = 1,
+ .autodma = AUTODMA,
+ .enablebits = {{0x48,0x01,0x00}, {0x00,0x00,0x00}},
+ .bootable = ON_BOARD,
+ },
};

/**
@@ -348,7 +355,7 @@ static struct pci_device_id atiixp_pci_t
{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP200_IDE, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 0},
{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP300_IDE, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 0},
{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_IDE, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 0},
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_IDE, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 0},
+ { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_IDE, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 1},
{ 0, },
};
MODULE_DEVICE_TABLE(pci, atiixp_pci_tbl);


Subject: Re: [PATCH 2/3] atiixp.c: sb600 ide only has one channel

On 1/6/07, Conke Hu <[email protected]> wrote:
> AMD/ATI SB600 IDE/PATA controller only has one channel.
>
> Signed-off-by: Conke Hu <[email protected]>

Acked-by: Bartlomiej Zolnierkiewicz <[email protected]>

[ but the patch is line wrapped ]

2007-01-09 12:48:56

by Conke Hu

[permalink] [raw]
Subject: Re: [PATCH 2/3] atiixp.c: sb600 ide only has one channel

On 1/7/07, Bartlomiej Zolnierkiewicz <[email protected]> wrote:
> On 1/6/07, Conke Hu <[email protected]> wrote:
> > AMD/ATI SB600 IDE/PATA controller only has one channel.
> >
> > Signed-off-by: Conke Hu <[email protected]>
>
> Acked-by: Bartlomiej Zolnierkiewicz <[email protected]>
>
> [ but the patch is line wrapped ]
>

Hi Bart,
Thank you!
I've re-created the patch based on 2.6.20-rc4, pls see below.
I've sent out 3 patches for the same file atiixp.c, pls apply it
after the [patch 1/3] :)
-------------------
--- linux-2.6.20-rc4/drivers/ide/pci/atiixp.c.2 2007-01-09
15:21:29.000000000 +0800
+++ linux-2.6.20-rc4/drivers/ide/pci/atiixp.c 2007-01-09
15:25:15.000000000 +0800
@@ -328,7 +328,14 @@ static ide_pci_device_t atiixp_pci_info[
.autodma = AUTODMA,
.enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
.bootable = ON_BOARD,
- },
+ },{ /* 1 */
+ .name = "SB600_PATA",
+ .init_hwif = init_hwif_atiixp,
+ .channels = 1,
+ .autodma = AUTODMA,
+ .enablebits = {{0x48,0x01,0x00}, {0x00,0x00,0x00}},
+ .bootable = ON_BOARD,
+ },
};

/**
@@ -349,7 +356,7 @@ static struct pci_device_id atiixp_pci_t
{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP200_IDE, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 0},
{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP300_IDE, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 0},
{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_IDE, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 0},
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_IDE, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 0},
+ { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_IDE, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 1},
{ 0, },
};
MODULE_DEVICE_TABLE(pci, atiixp_pci_tbl);