Message ID | 1371462767-16630-3-git-send-email-r65037@freescale.com |
---|---|
State | Not Applicable |
Delegated to: | David Miller |
Headers | show |
On Mon, Jun 17, 2013 at 2:52 AM, Richard Zhu <richard.zhuhongxing@gmail.com> wrote: > imx6q contains the Synopsys AHCI SATA controller which shares > ahci_platform driver with other controllers. > > This patch updates the DT compatible list for ahci_platform, > and enable the imx6q ahci sata support. > > Signed-off-by: Richard Zhu <r65037@freescale.com> I suppose this better be routed with the rest of the series through the arch tree? If not, please let me know. Acked-by: Tejun Heo <tj@kernel.org> There probably will be a merge conflict but it's gonna be very trivial, so no worries. Thanks. -- tejun -- 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 Mon, Jun 17, 2013 at 05:52:46PM +0800, Richard Zhu wrote: > imx6q contains the Synopsys AHCI SATA controller which shares > ahci_platform driver with other controllers. > > This patch updates the DT compatible list for ahci_platform, > and enable the imx6q ahci sata support. > > Signed-off-by: Richard Zhu <r65037@freescale.com> > --- > drivers/ata/ahci_platform.c | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c > index 7a8a284..61f2142 100644 > --- a/drivers/ata/ahci_platform.c > +++ b/drivers/ata/ahci_platform.c > @@ -327,6 +327,7 @@ static SIMPLE_DEV_PM_OPS(ahci_pm_ops, ahci_suspend, ahci_resume); > > static const struct of_device_id ahci_of_match[] = { > { .compatible = "snps,spear-ahci", }, > + { .compatible = "snps,imx-ahci", }, I'm not sure it makes much sense to invent multiple platform specific strings for an IP which is completely compatible between them. Why don't we just have a generic compatible string like "snps,ahci" for all those compatible platforms, and only add platform specific string when there is incompatibility on particular platform to deal with? Added devicetree-discuss to get DT people's opinion. Shawn > {}, > }; > MODULE_DEVICE_TABLE(of, ahci_of_match); > -- > 1.7.5.4 > -- 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
Hi Tejun&Shawn: Thanks for your comments. Hi Tejun: I looked through the for-next branch of the libata git-repo, there maybe a merge conflict. " static const struct of_device_id ahci_of_match[] = { { .compatible = "snps,spear-ahci", }, { .compatible = "snps,exynos5440-ahci", }, {}, }; MODULE_DEVICE_TABLE(of, ahci_of_match); " How about to re-change the patch, based on for-next branch of the libata git-repo. Hi Shawn: About the one similar IP, multiple platform specific strings inventions. Waiting for DT's people’s opinion. Best Regards Richard Zhu
On Tue, Jun 18, 2013 at 02:19:52AM +0000, Zhu Richard-R65037 wrote: > Hi Tejun&Shawn: > Thanks for your comments. > > Hi Tejun: > I looked through the for-next branch of the libata git-repo, there maybe a merge conflict. > " > static const struct of_device_id ahci_of_match[] = { > { .compatible = "snps,spear-ahci", }, > { .compatible = "snps,exynos5440-ahci", }, This is exactly what I'm concerned about. We will end up with a huge match table with all different platform specific compatible strings in there. But they're all matching to the same programming model of the same IP block. That's not how device tree compatible table works. > {}, > }; > MODULE_DEVICE_TABLE(of, ahci_of_match); > " > > How about to re-change the patch, based on for-next branch of the libata git-repo. > Yes, I think the driver part and platform part can go separately. Shawn -- 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/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c index 7a8a284..61f2142 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c @@ -327,6 +327,7 @@ static SIMPLE_DEV_PM_OPS(ahci_pm_ops, ahci_suspend, ahci_resume); static const struct of_device_id ahci_of_match[] = { { .compatible = "snps,spear-ahci", }, + { .compatible = "snps,imx-ahci", }, {}, }; MODULE_DEVICE_TABLE(of, ahci_of_match);
imx6q contains the Synopsys AHCI SATA controller which shares ahci_platform driver with other controllers. This patch updates the DT compatible list for ahci_platform, and enable the imx6q ahci sata support. Signed-off-by: Richard Zhu <r65037@freescale.com> --- drivers/ata/ahci_platform.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)