2020-07-02 23:30:56 +08:00
|
|
|
From 7a349e8c535d7327bf80710323c725df47149b8d Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Jean-Jacques Hiblot <jjhiblot@ti.com>
|
|
|
|
|
Date: Sun, 5 Jan 2020 23:31:14 +0100
|
|
|
|
|
Subject: [PATCH] leds: populate the device's of_node
|
|
|
|
|
|
|
|
|
|
If initialization data is available and its fwnode is actually a
|
|
|
|
|
of_node, store this information in the led device's structure. This
|
|
|
|
|
will allow the device to use or provide OF-based API such (devm_xxx).
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
|
|
|
|
|
Signed-off-by: Pavel Machek <pavel@ucw.cz>
|
|
|
|
|
[backport to 5.4]
|
|
|
|
|
---
|
|
|
|
|
|
|
|
|
|
--- a/drivers/leds/led-class.c
|
|
|
|
|
+++ b/drivers/leds/led-class.c
|
|
|
|
|
@@ -19,6 +19,7 @@
|
|
|
|
|
#include <linux/spinlock.h>
|
|
|
|
|
#include <linux/timer.h>
|
|
|
|
|
#include <uapi/linux/uleds.h>
|
|
|
|
|
+#include <linux/of.h>
|
|
|
|
|
#include "leds.h"
|
|
|
|
|
|
|
|
|
|
static struct class *leds_class;
|
kernel: bump to 4.14.193, 4.19.138, 5.4.59 (#5350)
kernel: bump to 4.14.193, 4.19.138, 5.4.59 (#5350)
431fb8c mac80211: add AQL improvements
6bdd4c9 mac80211: add missing backports for building with 4.14 kernels
0106820 mac80211: add missing return code checks in AQL improvements
e7f7101 mac80211: rework encapsulation offload support
[package]
base-files: add function for generating random MAC
dnsmasq: abort dhcp_check on interface state
boot: sync upstream source code
ath10k-ct-firmware/mt76/sch_cake: update to latest git HEAD
[script]
download: add China Mirror Station
[target]
Sync: arc770, ath79, bcm63xx, kirkwood, lantiq, layerscape,
mediatek, mvebu, octeon, oxnas, pistachio, uml
Sync most of the target patches.
Run-compiled-on: ipq40xx (4.19 & 5.4), ramips
2020-08-26 11:31:50 +08:00
|
|
|
@@ -277,8 +278,10 @@ int led_classdev_register_ext(struct dev
|
2020-07-02 23:30:56 +08:00
|
|
|
mutex_unlock(&led_cdev->led_access);
|
|
|
|
|
return PTR_ERR(led_cdev->dev);
|
|
|
|
|
}
|
|
|
|
|
- if (init_data && init_data->fwnode)
|
|
|
|
|
+ if (init_data && init_data->fwnode) {
|
|
|
|
|
led_cdev->dev->fwnode = init_data->fwnode;
|
|
|
|
|
+ led_cdev->dev->of_node = to_of_node(init_data->fwnode);
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
if (ret)
|
|
|
|
|
dev_warn(parent, "Led %s renamed to %s due to name collision",
|
