Skip to content

Commit 52da431

Browse files
committed
Merge tag 'libnvdimm-fixes-6.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull libnvdimm fix from Ira Weiny: "This converts the pmem-region device tree bindings to YAML to fix errors and bring it up to date" * tag 'libnvdimm-fixes-6.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: dt-bindings: pmem: Convert binding to YAML
2 parents 4663747 + 62a65b3 commit 52da431

File tree

3 files changed

+49
-66
lines changed

3 files changed

+49
-66
lines changed

Documentation/devicetree/bindings/pmem/pmem-region.txt

Lines changed: 0 additions & 65 deletions
This file was deleted.
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/pmem-region.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
maintainers:
8+
- Oliver O'Halloran <[email protected]>
9+
10+
title: Persistent Memory Regions
11+
12+
description: |
13+
Persistent memory refers to a class of memory devices that are:
14+
15+
a) Usable as main system memory (i.e. cacheable), and
16+
b) Retain their contents across power failure.
17+
18+
Given b) it is best to think of persistent memory as a kind of memory mapped
19+
storage device. To ensure data integrity the operating system needs to manage
20+
persistent regions separately to the normal memory pool. To aid with that this
21+
binding provides a standardised interface for discovering where persistent
22+
memory regions exist inside the physical address space.
23+
24+
properties:
25+
compatible:
26+
const: pmem-region
27+
28+
reg:
29+
maxItems: 1
30+
31+
volatile:
32+
description:
33+
Indicates the region is volatile (non-persistent) and the OS can skip
34+
cache flushes for writes
35+
type: boolean
36+
37+
required:
38+
- compatible
39+
- reg
40+
41+
additionalProperties: false
42+
43+
examples:
44+
- |
45+
pmem@5000 {
46+
compatible = "pmem-region";
47+
reg = <0x00005000 0x00001000>;
48+
};

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13800,7 +13800,7 @@ M: Oliver O'Halloran <[email protected]>
1380013800
1380113801
S: Supported
1380213802
Q: https://patchwork.kernel.org/project/linux-nvdimm/list/
13803-
F: Documentation/devicetree/bindings/pmem/pmem-region.txt
13803+
F: Documentation/devicetree/bindings/pmem/pmem-region.yaml
1380413804
F: drivers/nvdimm/of_pmem.c
1380513805

1380613806
LIBNVDIMM: NON-VOLATILE MEMORY DEVICE SUBSYSTEM

0 commit comments

Comments
 (0)