Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc162d31 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android11-5.4' into android11-5.4-lts 



Sync up with android11-5.4 for the following commits:

d0f21836 ANDROID: Revert "tracing/ring-buffer: Have polling block on watermark"
5a8d108c Merge "Merge tag 'android11-5.4.226_r00' into android11-5.4" into android11-5.4
c429b235 UPSTREAM: usb: gadget: f_hid: fix f_hidg lifetime vs cdev
28b985f1 UPSTREAM: usb: gadget: f_hid: optional SETUP/SET_REPORT mode
15a5e4ad ANDROID: add TEST_MAPPING for net/, include/net
f5b4a7be UPSTREAM: nfp: fix use-after-free in area_cache_get()
5a9d3554 UPSTREAM: proc: avoid integer type confusion in get_proc_long
cffda199 UPSTREAM: proc: proc_skip_spaces() shouldn't think it is working on C strings
e418b27c ANDROID: usb: f_accessory: Check buffer size when initialised via composite
98d86001 Merge tag 'android11-5.4.226_r00' into android11-5.4
8912db25 BACKPORT: mm: don't be stuck to rmap lock on reclaim path
a69a8cd3 ANDROID: Add more hvc devices for virtio-console.
7b7c361b UPSTREAM: HID: playstation: support updated DualSense rumble mode.
ff79b92f UPSTREAM: HID: playstation: add initial DualSense Edge controller support
9c127a4a UPSTREAM: HID: playstation: stop DualSense output work on remove.
b32bdd3e UPSTREAM: HID: playstation: convert to use dev_groups
c1ac1f80 UPSTREAM: HID: playstation: fix return from dualsense_player_led_set_brightness()
d4454553 UPSTREAM: HID: playstation: expose DualSense player LEDs through LED class.
07dd46d2 BACKPORT: leds: add new LED_FUNCTION_PLAYER for player LEDs for game controllers.
f91c45c1 UPSTREAM: HID: playstation: expose DualSense lightbar through a multi-color LED.
749207d9 UPSTREAM: leds: flash: Fix multicolor no-ops registration by return 0
3e667a08 UPSTREAM: leds: multicolor: Introduce a multicolor class definition
0b5ee17e ANDROID: GKI: enable mulitcolor-led
0ce03d16 BACKPORT: Kconfig.debug: provide a little extra FRAME_WARN leeway when KASAN is enabled
20fb10aa UPSTREAM: bpf: Ensure correct locking around vulnerable function find_vpid()
0ec48522 UPSTREAM: HID: roccat: Fix use-after-free in roccat_read()
cbbd7242 ANDROID: arm64: mm: perform clean & invalidation in __dma_map_area

Change-Id: I31bed9dd4eb36433c1028ab9073df4839f5a78f6
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents bc37d9c8 d0f21836

Documentation/ABI/testing/sysfs-class-led-multicolor

0 → 100644
+35 −0
Original line number Diff line number Diff line 
What:		/sys/class/leds/<led>/brightness

Date:		March 2020

KernelVersion:	5.9

Contact:	Dan Murphy <dmurphy@ti.com>

Description:	read/write

		Writing to this file will update all LEDs within the group to a

		calculated percentage of what each color LED intensity is set

		to. The percentage is calculated for each grouped LED via the

		equation below:



		led_brightness = brightness * multi_intensity/max_brightness



		For additional details please refer to

		Documentation/leds/leds-class-multicolor.rst.



		The value of the LED is from 0 to

		/sys/class/leds/<led>/max_brightness.



What:		/sys/class/leds/<led>/multi_index

Date:		March 2020

KernelVersion:	5.9

Contact:	Dan Murphy <dmurphy@ti.com>

Description:	read

		The multi_index array, when read, will output the LED colors

		as an array of strings as they are indexed in the

		multi_intensity file.



What:		/sys/class/leds/<led>/multi_intensity

Date:		March 2020

KernelVersion:	5.9

Contact:	Dan Murphy <dmurphy@ti.com>

Description:	read/write

		This file contains array of integers. Order of components is

		described by the multi_index array. The maximum intensity should

		not exceed /sys/class/leds/<led>/max_brightness.

Documentation/leds/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ LEDs 


   leds-class

   leds-class-flash

   leds-class-multicolor

   ledtrig-oneshot

   ledtrig-transient

   ledtrig-usbport

Documentation/leds/leds-class-multicolor.rst

0 → 100644
+86 −0
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



====================================

Multicolor LED handling under Linux

====================================



Description

===========

The multicolor class groups monochrome LEDs and allows controlling two

aspects of the final combined color: hue and lightness. The former is

controlled via the multi_intensity array file and the latter is controlled

via brightness file.



Multicolor Class Control

========================

The multicolor class presents files that groups the colors as indexes in an

array.  These files are children under the LED parent node created by the

led_class framework.  The led_class framework is documented in led-class.rst

within this documentation directory.



Each colored LED will be indexed under the multi_* files. The order of the

colors will be arbitrary. The multi_index file can be read to determine the

color name to indexed value.



The multi_index file is an array that contains the string list of the colors as

they are defined in each multi_* array file.



The multi_intensity is an array that can be read or written to for the

individual color intensities.  All elements within this array must be written in

order for the color LED intensities to be updated.



Directory Layout Example

========================

root:/sys/class/leds/multicolor:status# ls -lR

-rw-r--r--    1 root     root          4096 Oct 19 16:16 brightness

-r--r--r--    1 root     root          4096 Oct 19 16:16 max_brightness

-r--r--r--    1 root     root          4096 Oct 19 16:16 multi_index

-rw-r--r--    1 root     root          4096 Oct 19 16:16 multi_intensity



Multicolor Class Brightness Control

===================================

The brightness level for each LED is calculated based on the color LED

intensity setting divided by the global max_brightness setting multiplied by

the requested brightness.



led_brightness = brightness * multi_intensity/max_brightness



Example:

A user first writes the multi_intensity file with the brightness levels

for each LED that are necessary to achieve a certain color output from a

multicolor LED group.



cat /sys/class/leds/multicolor:status/multi_index

green blue red



echo 43 226 138 > /sys/class/leds/multicolor:status/multi_intensity



red -

	intensity = 138

	max_brightness = 255

green -

	intensity = 43

	max_brightness = 255

blue -

	intensity = 226

	max_brightness = 255



The user can control the brightness of that multicolor LED group by writing the

global 'brightness' control.  Assuming a max_brightness of 255 the user

may want to dim the LED color group to half.  The user would write a value of

128 to the global brightness file then the values written to each LED will be

adjusted base on this value.



cat /sys/class/leds/multicolor:status/max_brightness

255

echo 128 > /sys/class/leds/multicolor:status/brightness



adjusted_red_value = 128 * 138/255 = 69

adjusted_green_value = 128 * 43/255 = 21

adjusted_blue_value = 128 * 226/255 = 113



Reading the global brightness file will return the current brightness value of

the color LED group.



cat /sys/class/leds/multicolor:status/brightness

128

arch/arm64/configs/gki_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -434,6 +434,7 @@ CONFIG_MMC_CRYPTO=y 
CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_LEDS_CLASS_FLASH=y

CONFIG_LEDS_CLASS_MULTICOLOR=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_EDAC=y

CONFIG_RTC_CLASS=y

arch/arm64/mm/cache.S

+2 −0
Original line number Diff line number Diff line
@@ -228,6 +228,8 @@ ENDPIPROC(__dma_flush_area) 
 *	- dir	- DMA direction

 */

ENTRY(__dma_map_area)

	cmp	w2, #DMA_FROM_DEVICE

	b.eq	__dma_flush_area

	b	__dma_clean_area

ENDPIPROC(__dma_map_area)