summaryrefslogtreecommitdiff
path: root/Documentation/driver-api
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2022-03-18 17:59:53 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2022-03-18 17:59:53 +0100
commit1bde8bddb5db59e5bcd090b227c74d48965cedef (patch)
tree48ff735d237d8135cdf68801c9349537ec947e85 /Documentation/driver-api
parent8a9bd50a9d68ba68c88cb5e8f64413a8520c33fe (diff)
parent830751d54b4abb2d4d9e5e8072dffdd8ce195f1f (diff)
Merge branch 'acpi-docs'
Make ACPI documentation updates for 5.18-rc1: - Update the ACPI device enumeration documentation and unify the ASL style in GPIO-related examples (Andy Shevchenko). * acpi-docs: ACPI: docs: gpio-properties: Unify ASL style for GPIO examples ACPI: docs: enumeration: Unify Package () for properties ACPI: docs: enumeration: Drop comma for terminator entry ACPI: docs: enumeration: Drop ugly ifdeffery from the examples ACPI: docs: enumeration: Amend PWM enumeration ASL example ACPI: docs: enumeration: Remove redundant .owner assignment ACPI: docs: enumeration: Update UART serial bus resource documentation ACPI: docs: enumeration: Discourage to use custom _DSM methods
Diffstat (limited to 'Documentation/driver-api')
-rw-r--r--Documentation/driver-api/gpio/board.rst21
1 files changed, 9 insertions, 12 deletions
diff --git a/Documentation/driver-api/gpio/board.rst b/Documentation/driver-api/gpio/board.rst
index 191fa867826a..4e3adf31c8d1 100644
--- a/Documentation/driver-api/gpio/board.rst
+++ b/Documentation/driver-api/gpio/board.rst
@@ -71,14 +71,14 @@ with the help of _DSD (Device Specific Data), introduced in ACPI 5.1::
Device (FOO) {
Name (_CRS, ResourceTemplate () {
- GpioIo (Exclusive, ..., IoRestrictionOutputOnly,
- "\\_SB.GPI0") {15} // red
- GpioIo (Exclusive, ..., IoRestrictionOutputOnly,
- "\\_SB.GPI0") {16} // green
- GpioIo (Exclusive, ..., IoRestrictionOutputOnly,
- "\\_SB.GPI0") {17} // blue
- GpioIo (Exclusive, ..., IoRestrictionOutputOnly,
- "\\_SB.GPI0") {1} // power
+ GpioIo (Exclusive, PullUp, 0, 0, IoRestrictionOutputOnly,
+ "\\_SB.GPI0", 0, ResourceConsumer) { 15 } // red
+ GpioIo (Exclusive, PullUp, 0, 0, IoRestrictionOutputOnly,
+ "\\_SB.GPI0", 0, ResourceConsumer) { 16 } // green
+ GpioIo (Exclusive, PullUp, 0, 0, IoRestrictionOutputOnly,
+ "\\_SB.GPI0", 0, ResourceConsumer) { 17 } // blue
+ GpioIo (Exclusive, PullNone, 0, 0, IoRestrictionOutputOnly,
+ "\\_SB.GPI0", 0, ResourceConsumer) { 1 } // power
})
Name (_DSD, Package () {
@@ -92,10 +92,7 @@ with the help of _DSD (Device Specific Data), introduced in ACPI 5.1::
^FOO, 2, 0, 1,
}
},
- Package () {
- "power-gpios",
- Package () {^FOO, 3, 0, 0},
- },
+ Package () { "power-gpios", Package () { ^FOO, 3, 0, 0 } },
}
})
}