diff options
| author |   Dan Williams <dan.j.williams@intel.com> | 2018-04-09 10:50:08 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2018-04-09 10:50:08 -0700 |
| commit | 1ed41b5696ccc3ff40a1dee39fe14eff273faf82 (patch) | |
| tree | 1202df08129d350a65cf220406eb7ce87185d813 /arch/powerpc | |
| parent | Linux 4.16-rc7 (diff) | |
| parent | libnvdimm, of_pmem: workaround OF_NUMA=n build error (diff) | |
| download | linux-dev-1ed41b5696ccc3ff40a1dee39fe14eff273faf82.tar.xz linux-dev-1ed41b5696ccc3ff40a1dee39fe14eff273faf82.zip | |
Merge branch 'for-4.17/libnvdimm' into libnvdimm-for-next
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/platforms/powernv/opal.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c index c15182765ff5..c37485a3c5c9 100644 --- a/arch/powerpc/platforms/powernv/opal.c +++ b/arch/powerpc/platforms/powernv/opal.c @@ -821,6 +821,9 @@ static int __init opal_init(void) /* Create i2c platform devices */ opal_pdev_init("ibm,opal-i2c"); + /* Handle non-volatile memory devices */ + opal_pdev_init("pmem-region"); + /* Setup a heatbeat thread if requested by OPAL */ opal_init_heartbeat(); |