diff options
| author | Maxime Ripard <maxime.ripard@bootlin.com> | 2019-07-22 21:24:10 +0200 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@bootlin.com> | 2019-07-22 21:24:10 +0200 |
| commit | 03b0f2ce735e97e9f49790d4563c82515b8fa702 (patch) | |
| tree | da561805bffd06bfba81c867f83cacb28f3a64e5 /Documentation/ABI/testing/sysfs-platform-i2c-demux-pinctrl | |
| parent | e4f86e43716443e934d705952902d40de0fa9a05 (diff) | |
| parent | 5f9e832c137075045d15cd6899ab0505cfb2ca4b (diff) | |
Merge v5.3-rc1 into drm-misc-next
Noralf needs some SPI patches in 5.3 to merge some work on tinydrm.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Diffstat (limited to 'Documentation/ABI/testing/sysfs-platform-i2c-demux-pinctrl')
| -rw-r--r-- | Documentation/ABI/testing/sysfs-platform-i2c-demux-pinctrl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/ABI/testing/sysfs-platform-i2c-demux-pinctrl b/Documentation/ABI/testing/sysfs-platform-i2c-demux-pinctrl index 3c3514815cd5..c394b808be19 100644 --- a/Documentation/ABI/testing/sysfs-platform-i2c-demux-pinctrl +++ b/Documentation/ABI/testing/sysfs-platform-i2c-demux-pinctrl @@ -1,7 +1,7 @@ What: /sys/devices/platform/<i2c-demux-name>/available_masters Date: January 2016 KernelVersion: 4.6 -Contact: Wolfram Sang <wsa@the-dreams.de> +Contact: Wolfram Sang <wsa+renesas@sang-engineering.com> Description: Reading the file will give you a list of masters which can be selected for a demultiplexed bus. The format is @@ -12,7 +12,7 @@ Description: What: /sys/devices/platform/<i2c-demux-name>/current_master Date: January 2016 KernelVersion: 4.6 -Contact: Wolfram Sang <wsa@the-dreams.de> +Contact: Wolfram Sang <wsa+renesas@sang-engineering.com> Description: This file selects/shows the active I2C master for a demultiplexed bus. It uses the <index> value from the file 'available_masters'. |