| Message ID | 1314976215-23902-1-git-send-email-robherring2@gmail.com |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
On 09/02/2011 10:10 AM, Rob Herring wrote: > From: Rob Herring <rob.herring@calxeda.com> > > Add devicetree match table to ahci platform driver for Calxeda Highbank > AHCI controller. > > Signed-off-by: Rob Herring <rob.herring@calxeda.com> > Cc: Jeff Garzik <jgarzik@pobox.com> > Cc: linux-ide@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > Cc: devicetree-discuss@lists.ozlabs.org > --- Any comments on this? Rob > .../devicetree/bindings/ata/calxeda-sata.txt | 17 +++++++++++++++++ > drivers/ata/ahci_platform.c | 7 +++++++ > 2 files changed, 24 insertions(+), 0 deletions(-) > create mode 100644 Documentation/devicetree/bindings/ata/calxeda-sata.txt > > diff --git a/Documentation/devicetree/bindings/ata/calxeda-sata.txt b/Documentation/devicetree/bindings/ata/calxeda-sata.txt > new file mode 100644 > index 0000000..79caa56 > --- /dev/null > +++ b/Documentation/devicetree/bindings/ata/calxeda-sata.txt > @@ -0,0 +1,17 @@ > +* Calxeda SATA Controller > + > +SATA nodes are defined to describe on-chip Serial ATA controllers. > +Each SATA controller should have its own node. > + > +Required properties: > +- compatible : compatible list, contains "calxeda,hb-ahci" > +- interrupts : <interrupt mapping for SATA IRQ> > +- reg : <registers mapping> > + > +Example: > + sata@ffe08000 { > + compatible = "calxeda,hb-ahci"; > + reg = <0xffe08000 0x1000>; > + interrupts = <115>; > + }; > + > diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c > index 6fef1fa..9bfc970 100644 > --- a/drivers/ata/ahci_platform.c > +++ b/drivers/ata/ahci_platform.c > @@ -171,11 +171,18 @@ static int __devexit ahci_remove(struct platform_device *pdev) > return 0; > } > > +static const struct of_device_id ahci_of_match[] = { > + { .compatible = "calxeda,hb-ahci", }, > + {}, > +}; > +MODULE_DEVICE_TABLE(of, ahci_of_match); > + > static struct platform_driver ahci_driver = { > .remove = __devexit_p(ahci_remove), > .driver = { > .name = "ahci", > .owner = THIS_MODULE, > + .of_match_table = ahci_of_match, > }, > }; > -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Sep 02, 2011 at 10:10:15AM -0500, Rob Herring wrote: > From: Rob Herring <rob.herring@calxeda.com> > > Add devicetree match table to ahci platform driver for Calxeda Highbank > AHCI controller. > > Signed-off-by: Rob Herring <rob.herring@calxeda.com> > Cc: Jeff Garzik <jgarzik@pobox.com> > Cc: linux-ide@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > Cc: devicetree-discuss@lists.ozlabs.org Acked-by: Grant Likely <grant.likely@secretlab.ca> > --- > .../devicetree/bindings/ata/calxeda-sata.txt | 17 +++++++++++++++++ > drivers/ata/ahci_platform.c | 7 +++++++ > 2 files changed, 24 insertions(+), 0 deletions(-) > create mode 100644 Documentation/devicetree/bindings/ata/calxeda-sata.txt > > diff --git a/Documentation/devicetree/bindings/ata/calxeda-sata.txt b/Documentation/devicetree/bindings/ata/calxeda-sata.txt > new file mode 100644 > index 0000000..79caa56 > --- /dev/null > +++ b/Documentation/devicetree/bindings/ata/calxeda-sata.txt > @@ -0,0 +1,17 @@ > +* Calxeda SATA Controller > + > +SATA nodes are defined to describe on-chip Serial ATA controllers. > +Each SATA controller should have its own node. > + > +Required properties: > +- compatible : compatible list, contains "calxeda,hb-ahci" > +- interrupts : <interrupt mapping for SATA IRQ> > +- reg : <registers mapping> > + > +Example: > + sata@ffe08000 { > + compatible = "calxeda,hb-ahci"; > + reg = <0xffe08000 0x1000>; > + interrupts = <115>; > + }; > + > diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c > index 6fef1fa..9bfc970 100644 > --- a/drivers/ata/ahci_platform.c > +++ b/drivers/ata/ahci_platform.c > @@ -171,11 +171,18 @@ static int __devexit ahci_remove(struct platform_device *pdev) > return 0; > } > > +static const struct of_device_id ahci_of_match[] = { > + { .compatible = "calxeda,hb-ahci", }, > + {}, > +}; > +MODULE_DEVICE_TABLE(of, ahci_of_match); > + > static struct platform_driver ahci_driver = { > .remove = __devexit_p(ahci_remove), > .driver = { > .name = "ahci", > .owner = THIS_MODULE, > + .of_match_table = ahci_of_match, > }, > }; > > -- > 1.7.5.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Jeff, On 10/03/2011 09:30 PM, Rob Herring wrote: > On 09/02/2011 10:10 AM, Rob Herring wrote: >> From: Rob Herring <rob.herring@calxeda.com> >> >> Add devicetree match table to ahci platform driver for Calxeda Highbank >> AHCI controller. >> >> Signed-off-by: Rob Herring <rob.herring@calxeda.com> >> Cc: Jeff Garzik <jgarzik@pobox.com> >> Cc: linux-ide@vger.kernel.org >> Cc: linux-kernel@vger.kernel.org >> Cc: devicetree-discuss@lists.ozlabs.org >> --- > > Any comments on this? > Ping. Can you please apply this for 3.2. Regards, Rob >> .../devicetree/bindings/ata/calxeda-sata.txt | 17 +++++++++++++++++ >> drivers/ata/ahci_platform.c | 7 +++++++ >> 2 files changed, 24 insertions(+), 0 deletions(-) >> create mode 100644 Documentation/devicetree/bindings/ata/calxeda-sata.txt >> >> diff --git a/Documentation/devicetree/bindings/ata/calxeda-sata.txt b/Documentation/devicetree/bindings/ata/calxeda-sata.txt >> new file mode 100644 >> index 0000000..79caa56 >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/ata/calxeda-sata.txt >> @@ -0,0 +1,17 @@ >> +* Calxeda SATA Controller >> + >> +SATA nodes are defined to describe on-chip Serial ATA controllers. >> +Each SATA controller should have its own node. >> + >> +Required properties: >> +- compatible : compatible list, contains "calxeda,hb-ahci" >> +- interrupts : <interrupt mapping for SATA IRQ> >> +- reg : <registers mapping> >> + >> +Example: >> + sata@ffe08000 { >> + compatible = "calxeda,hb-ahci"; >> + reg = <0xffe08000 0x1000>; >> + interrupts = <115>; >> + }; >> + >> diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c >> index 6fef1fa..9bfc970 100644 >> --- a/drivers/ata/ahci_platform.c >> +++ b/drivers/ata/ahci_platform.c >> @@ -171,11 +171,18 @@ static int __devexit ahci_remove(struct platform_device *pdev) >> return 0; >> } >> >> +static const struct of_device_id ahci_of_match[] = { >> + { .compatible = "calxeda,hb-ahci", }, >> + {}, >> +}; >> +MODULE_DEVICE_TABLE(of, ahci_of_match); >> + >> static struct platform_driver ahci_driver = { >> .remove = __devexit_p(ahci_remove), >> .driver = { >> .name = "ahci", >> .owner = THIS_MODULE, >> + .of_match_table = ahci_of_match, >> }, >> }; >> > -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 10/24/2011 09:20 AM, Rob Herring wrote: > Jeff, > > On 10/03/2011 09:30 PM, Rob Herring wrote: >> On 09/02/2011 10:10 AM, Rob Herring wrote: >>> From: Rob Herring <rob.herring@calxeda.com> >>> >>> Add devicetree match table to ahci platform driver for Calxeda Highbank >>> AHCI controller. >>> >>> Signed-off-by: Rob Herring <rob.herring@calxeda.com> >>> Cc: Jeff Garzik <jgarzik@pobox.com> >>> Cc: linux-ide@vger.kernel.org >>> Cc: linux-kernel@vger.kernel.org >>> Cc: devicetree-discuss@lists.ozlabs.org >>> --- >> >> Any comments on this? >> > > Ping. > > Can you please apply this for 3.2. > Anyone out there? Rob -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/ata/calxeda-sata.txt b/Documentation/devicetree/bindings/ata/calxeda-sata.txt new file mode 100644 index 0000000..79caa56 --- /dev/null +++ b/Documentation/devicetree/bindings/ata/calxeda-sata.txt @@ -0,0 +1,17 @@ +* Calxeda SATA Controller + +SATA nodes are defined to describe on-chip Serial ATA controllers. +Each SATA controller should have its own node. + +Required properties: +- compatible : compatible list, contains "calxeda,hb-ahci" +- interrupts : <interrupt mapping for SATA IRQ> +- reg : <registers mapping> + +Example: + sata@ffe08000 { + compatible = "calxeda,hb-ahci"; + reg = <0xffe08000 0x1000>; + interrupts = <115>; + }; + diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c index 6fef1fa..9bfc970 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c @@ -171,11 +171,18 @@ static int __devexit ahci_remove(struct platform_device *pdev) return 0; } +static const struct of_device_id ahci_of_match[] = { + { .compatible = "calxeda,hb-ahci", }, + {}, +}; +MODULE_DEVICE_TABLE(of, ahci_of_match); + static struct platform_driver ahci_driver = { .remove = __devexit_p(ahci_remove), .driver = { .name = "ahci", .owner = THIS_MODULE, + .of_match_table = ahci_of_match, }, };