Commit 92f27db7 authored by Bjorn Helgaas's avatar Bjorn Helgaas

Merge branch 'remotes/lorenzo/pci/meson'

- Add pci-meson module support and enable by default on ARCH_MESON (Kevin
  Hilman)

* remotes/lorenzo/pci/meson:
  PCI: meson: Build as module by default
parents 1f287b5c a98d2187
...@@ -237,8 +237,9 @@ config PCIE_HISI_STB ...@@ -237,8 +237,9 @@ config PCIE_HISI_STB
Say Y here if you want PCIe controller support on HiSilicon STB SoCs Say Y here if you want PCIe controller support on HiSilicon STB SoCs
config PCI_MESON config PCI_MESON
bool "MESON PCIe controller" tristate "MESON PCIe controller"
depends on PCI_MSI_IRQ_DOMAIN depends on PCI_MSI_IRQ_DOMAIN
default m if ARCH_MESON
select PCIE_DW_HOST select PCIE_DW_HOST
help help
Say Y here if you want to enable PCI controller support on Amlogic Say Y here if you want to enable PCI controller support on Amlogic
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include <linux/resource.h> #include <linux/resource.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/phy/phy.h> #include <linux/phy/phy.h>
#include <linux/module.h>
#include "pcie-designware.h" #include "pcie-designware.h"
...@@ -507,6 +508,7 @@ static const struct of_device_id meson_pcie_of_match[] = { ...@@ -507,6 +508,7 @@ static const struct of_device_id meson_pcie_of_match[] = {
}, },
{}, {},
}; };
MODULE_DEVICE_TABLE(of, meson_pcie_of_match);
static struct platform_driver meson_pcie_driver = { static struct platform_driver meson_pcie_driver = {
.probe = meson_pcie_probe, .probe = meson_pcie_probe,
...@@ -516,4 +518,8 @@ static struct platform_driver meson_pcie_driver = { ...@@ -516,4 +518,8 @@ static struct platform_driver meson_pcie_driver = {
}, },
}; };
builtin_platform_driver(meson_pcie_driver); module_platform_driver(meson_pcie_driver);
MODULE_AUTHOR("Yue Wang <yue.wang@amlogic.com>");
MODULE_DESCRIPTION("Amlogic PCIe Controller driver");
MODULE_LICENSE("GPL v2");
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment