mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/leds/leds-pwm.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * linux/drivers/leds-pwm.c
3
4
  *
..
..
@@ -6,10 +7,6 @@
6
7
  * Copyright 2009 Luotao Fu @ Pengutronix (l.fu@pengutronix.de)
7
8
  *
8
9
  * based on leds-gpio.c by Raphael Assenat <raph@8d.com>
9
- *
10
- * This program is free software; you can redistribute it and/or modify
11
- * it under the terms of the GNU General Public License version 2 as
12
- * published by the Free Software Foundation.
13
10
  */
14
11
 
15
12
 #include <linux/module.h>
..
..
@@ -19,33 +16,25 @@
19
16
 #include <linux/leds.h>
20
17
 #include <linux/err.h>
21
18
 #include <linux/pwm.h>
22
-#include <linux/leds_pwm.h>
23
19
 #include <linux/slab.h>
20
+
21
+struct led_pwm {
22
+	const char	*name;
23
+	u8		active_low;
24
+	unsigned int	max_brightness;
25
+};
24
26
 
25
27
 struct led_pwm_data {
26
28
 	struct led_classdev	cdev;
27
29
 	struct pwm_device	*pwm;
30
+	struct pwm_state	pwmstate;
28
31
 	unsigned int		active_low;
29
-	unsigned int		period;
30
-	int			duty;
31
32
 };
32
33
 
33
34
 struct led_pwm_priv {
34
35
 	int num_leds;
35
-	struct led_pwm_data leds[0];
36
+	struct led_pwm_data leds[];
36
37
 };
37
-
38
-static void __led_pwm_set(struct led_pwm_data *led_dat)
39
-{
40
-	int new_duty = led_dat->duty;
41
-
42
-	pwm_config(led_dat->pwm, new_duty, led_dat->period);
43
-
44
-	if (new_duty == 0)
45
-		pwm_disable(led_dat->pwm);
46
-	else
47
-		pwm_enable(led_dat->pwm);
48
-}
49
38
 
50
39
 static int led_pwm_set(struct led_classdev *led_cdev,
51
40
 		       enum led_brightness brightness)
..
..
@@ -53,106 +42,87 @@
53
42
 	struct led_pwm_data *led_dat =
54
43
 		container_of(led_cdev, struct led_pwm_data, cdev);
55
44
 	unsigned int max = led_dat->cdev.max_brightness;
56
-	unsigned long long duty =  led_dat->period;
45
+	unsigned long long duty = led_dat->pwmstate.period;
57
46
 
58
47
 	duty *= brightness;
59
48
 	do_div(duty, max);
60
49
 
61
50
 	if (led_dat->active_low)
62
-		duty = led_dat->period - duty;
51
+		duty = led_dat->pwmstate.period - duty;
63
52
 
64
-	led_dat->duty = duty;
65
-
66
-	__led_pwm_set(led_dat);
67
-
68
-	return 0;
53
+	led_dat->pwmstate.duty_cycle = duty;
54
+	led_dat->pwmstate.enabled = duty > 0;
55
+	return pwm_apply_state(led_dat->pwm, &led_dat->pwmstate);
69
56
 }
70
57
 
71
-static inline size_t sizeof_pwm_leds_priv(int num_leds)
72
-{
73
-	return sizeof(struct led_pwm_priv) +
74
-		      (sizeof(struct led_pwm_data) * num_leds);
75
-}
76
-
77
-static void led_pwm_cleanup(struct led_pwm_priv *priv)
78
-{
79
-	while (priv->num_leds--)
80
-		led_classdev_unregister(&priv->leds[priv->num_leds].cdev);
81
-}
82
-
58
+__attribute__((nonnull))
83
59
 static int led_pwm_add(struct device *dev, struct led_pwm_priv *priv,
84
-		       struct led_pwm *led, struct device_node *child)
60
+		       struct led_pwm *led, struct fwnode_handle *fwnode)
85
61
 {
86
62
 	struct led_pwm_data *led_data = &priv->leds[priv->num_leds];
87
-	struct pwm_args pargs;
63
+	struct led_init_data init_data = { .fwnode = fwnode };
88
64
 	int ret;
89
65
 
90
66
 	led_data->active_low = led->active_low;
91
67
 	led_data->cdev.name = led->name;
92
-	led_data->cdev.default_trigger = led->default_trigger;
93
68
 	led_data->cdev.brightness = LED_OFF;
94
69
 	led_data->cdev.max_brightness = led->max_brightness;
95
70
 	led_data->cdev.flags = LED_CORE_SUSPENDRESUME;
96
71
 
97
-	if (child)
98
-		led_data->pwm = devm_of_pwm_get(dev, child, NULL);
99
-	else
100
-		led_data->pwm = devm_pwm_get(dev, led->name);
101
-	if (IS_ERR(led_data->pwm)) {
102
-		ret = PTR_ERR(led_data->pwm);
103
-		if (ret != -EPROBE_DEFER)
104
-			dev_err(dev, "unable to request PWM for %s: %d\n",
105
-				led->name, ret);
106
-		return ret;
107
-	}
72
+	led_data->pwm = devm_fwnode_pwm_get(dev, fwnode, NULL);
73
+	if (IS_ERR(led_data->pwm))
74
+		return dev_err_probe(dev, PTR_ERR(led_data->pwm),
75
+				     "unable to request PWM for %s\n",
76
+				     led->name);
108
77
 
109
78
 	led_data->cdev.brightness_set_blocking = led_pwm_set;
110
79
 
111
-	/*
112
-	 * FIXME: pwm_apply_args() should be removed when switching to the
113
-	 * atomic PWM API.
114
-	 */
115
-	pwm_apply_args(led_data->pwm);
80
+	pwm_init_state(led_data->pwm, &led_data->pwmstate);
116
81
 
117
-	pwm_get_args(led_data->pwm, &pargs);
118
-
119
-	led_data->period = pargs.period;
120
-	if (!led_data->period && (led->pwm_period_ns > 0))
121
-		led_data->period = led->pwm_period_ns;
122
-
123
-	ret = led_classdev_register(dev, &led_data->cdev);
124
-	if (ret == 0) {
125
-		priv->num_leds++;
126
-		led_pwm_set(&led_data->cdev, led_data->cdev.brightness);
127
-	} else {
82
+	ret = devm_led_classdev_register_ext(dev, &led_data->cdev, &init_data);
83
+	if (ret) {
128
84
 		dev_err(dev, "failed to register PWM led for %s: %d\n",
129
85
 			led->name, ret);
86
+		return ret;
130
87
 	}
131
88
 
132
-	return ret;
89
+	ret = led_pwm_set(&led_data->cdev, led_data->cdev.brightness);
90
+	if (ret) {
91
+		dev_err(dev, "failed to set led PWM value for %s: %d",
92
+			led->name, ret);
93
+		return ret;
94
+	}
95
+
96
+	priv->num_leds++;
97
+	return 0;
133
98
 }
134
99
 
135
-static int led_pwm_create_of(struct device *dev, struct led_pwm_priv *priv)
100
+static int led_pwm_create_fwnode(struct device *dev, struct led_pwm_priv *priv)
136
101
 {
137
-	struct device_node *child;
102
+	struct fwnode_handle *fwnode;
138
103
 	struct led_pwm led;
139
104
 	int ret = 0;
140
105
 
141
106
 	memset(&led, 0, sizeof(led));
142
107
 
143
-	for_each_child_of_node(dev->of_node, child) {
144
-		led.name = of_get_property(child, "label", NULL) ? :
145
-			   child->name;
108
+	device_for_each_child_node(dev, fwnode) {
109
+		ret = fwnode_property_read_string(fwnode, "label", &led.name);
110
+		if (ret && is_of_node(fwnode))
111
+			led.name = to_of_node(fwnode)->name;
146
112
 
147
-		led.default_trigger = of_get_property(child,
148
-						"linux,default-trigger", NULL);
149
-		led.active_low = of_property_read_bool(child, "active-low");
150
-		of_property_read_u32(child, "max-brightness",
151
-				     &led.max_brightness);
113
+		if (!led.name) {
114
+			fwnode_handle_put(fwnode);
115
+			return -EINVAL;
116
+		}
152
117
 
153
-		ret = led_pwm_add(dev, priv, &led, child);
118
+		led.active_low = fwnode_property_read_bool(fwnode,
119
+							   "active-low");
120
+		fwnode_property_read_u32(fwnode, "max-brightness",
121
+					 &led.max_brightness);
122
+
123
+		ret = led_pwm_add(dev, priv, &led, fwnode);
154
124
 		if (ret) {
155
-			of_node_put(child);
125
+			fwnode_handle_put(fwnode);
156
126
 			break;
157
127
 		}
158
128
 	}
..
..
@@ -162,50 +132,26 @@
162
132
 
163
133
 static int led_pwm_probe(struct platform_device *pdev)
164
134
 {
165
-	struct led_pwm_platform_data *pdata = dev_get_platdata(&pdev->dev);
166
135
 	struct led_pwm_priv *priv;
167
-	int count, i;
168
136
 	int ret = 0;
137
+	int count;
169
138
 
170
-	if (pdata)
171
-		count = pdata->num_leds;
172
-	else
173
-		count = of_get_child_count(pdev->dev.of_node);
139
+	count = device_get_child_node_count(&pdev->dev);
174
140
 
175
141
 	if (!count)
176
142
 		return -EINVAL;
177
143
 
178
-	priv = devm_kzalloc(&pdev->dev, sizeof_pwm_leds_priv(count),
144
+	priv = devm_kzalloc(&pdev->dev, struct_size(priv, leds, count),
179
145
 			    GFP_KERNEL);
180
146
 	if (!priv)
181
147
 		return -ENOMEM;
182
148
 
183
-	if (pdata) {
184
-		for (i = 0; i < count; i++) {
185
-			ret = led_pwm_add(&pdev->dev, priv, &pdata->leds[i],
186
-					  NULL);
187
-			if (ret)
188
-				break;
189
-		}
190
-	} else {
191
-		ret = led_pwm_create_of(&pdev->dev, priv);
192
-	}
149
+	ret = led_pwm_create_fwnode(&pdev->dev, priv);
193
150
 
194
-	if (ret) {
195
-		led_pwm_cleanup(priv);
151
+	if (ret)
196
152
 		return ret;
197
-	}
198
153
 
199
154
 	platform_set_drvdata(pdev, priv);
200
-
201
-	return 0;
202
-}
203
-
204
-static int led_pwm_remove(struct platform_device *pdev)
205
-{
206
-	struct led_pwm_priv *priv = platform_get_drvdata(pdev);
207
-
208
-	led_pwm_cleanup(priv);
209
155
 
210
156
 	return 0;
211
157
 }
..
..
@@ -218,7 +164,6 @@
218
164
 
219
165
 static struct platform_driver led_pwm_driver = {
220
166
 	.probe		= led_pwm_probe,
221
-	.remove		= led_pwm_remove,
222
167
 	.driver		= {
223
168
 		.name	= "leds_pwm",
224
169
 		.of_match_table = of_pwm_leds_match,