aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.10/842-v5.15-leds-pca955x-implement-the-default-state-property.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-06-22 11:58:33 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-06-27 00:57:15 +0200
commit9e5d743422edc4036cda7d96b96ba62705f382de (patch)
tree513649e78319d217fc9b7c8eaa164d8f34c19dbd /target/linux/generic/backport-5.10/842-v5.15-leds-pca955x-implement-the-default-state-property.patch
parent5202a511cc4557303d4b77bf77ebb66e524dcddf (diff)
downloadupstream-9e5d743422edc4036cda7d96b96ba62705f382de.tar.gz
upstream-9e5d743422edc4036cda7d96b96ba62705f382de.tar.bz2
upstream-9e5d743422edc4036cda7d96b96ba62705f382de.zip
kernel: bump 5.10 to 5.10.124
All patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/generic/backport-5.10/842-v5.15-leds-pca955x-implement-the-default-state-property.patch')
-rw-r--r--target/linux/generic/backport-5.10/842-v5.15-leds-pca955x-implement-the-default-state-property.patch12
1 files changed, 5 insertions, 7 deletions
diff --git a/target/linux/generic/backport-5.10/842-v5.15-leds-pca955x-implement-the-default-state-property.patch b/target/linux/generic/backport-5.10/842-v5.15-leds-pca955x-implement-the-default-state-property.patch
index 055801f096..8c79eb1b67 100644
--- a/target/linux/generic/backport-5.10/842-v5.15-leds-pca955x-implement-the-default-state-property.patch
+++ b/target/linux/generic/backport-5.10/842-v5.15-leds-pca955x-implement-the-default-state-property.patch
@@ -13,8 +13,6 @@ Signed-off-by: Pavel Machek <pavel@ucw.cz>
drivers/leds/leds-pca955x.c | 54 +++++++++++++++++++++++++++++++------
1 file changed, 46 insertions(+), 8 deletions(-)
-diff --git a/drivers/leds/leds-pca955x.c b/drivers/leds/leds-pca955x.c
-index e47ba7c3b7c7d8..fa1d77d86ef67b 100644
--- a/drivers/leds/leds-pca955x.c
+++ b/drivers/leds/leds-pca955x.c
@@ -129,6 +129,7 @@ struct pca955x_led {
@@ -25,7 +23,7 @@ index e47ba7c3b7c7d8..fa1d77d86ef67b 100644
const char *default_trigger;
};
-@@ -439,6 +440,7 @@ pca955x_get_pdata(struct i2c_client *client, struct pca955x_chipdef *chip)
+@@ -439,6 +440,7 @@ pca955x_get_pdata(struct i2c_client *cli
device_for_each_child_node(&client->dev, child) {
const char *name;
@@ -33,7 +31,7 @@ index e47ba7c3b7c7d8..fa1d77d86ef67b 100644
u32 reg;
int res;
-@@ -457,6 +459,18 @@ pca955x_get_pdata(struct i2c_client *client, struct pca955x_chipdef *chip)
+@@ -457,6 +459,18 @@ pca955x_get_pdata(struct i2c_client *cli
fwnode_property_read_u32(child, "type", &led->type);
fwnode_property_read_string(child, "linux,default-trigger",
&led->default_trigger);
@@ -52,7 +50,7 @@ index e47ba7c3b7c7d8..fa1d77d86ef67b 100644
}
pdata->num_leds = chip->bits;
-@@ -485,6 +499,7 @@ static int pca955x_probe(struct i2c_client *client,
+@@ -485,6 +499,7 @@ static int pca955x_probe(struct i2c_clie
int i, err;
struct pca955x_platform_data *pdata;
int ngpios = 0;
@@ -60,7 +58,7 @@ index e47ba7c3b7c7d8..fa1d77d86ef67b 100644
chip = &pca955x_chipdefs[id->driver_data];
adapter = client->adapter;
-@@ -565,14 +580,35 @@ static int pca955x_probe(struct i2c_client *client,
+@@ -565,14 +580,35 @@ static int pca955x_probe(struct i2c_clie
led->brightness_set_blocking = pca955x_led_set;
led->brightness_get = pca955x_led_get;
@@ -100,7 +98,7 @@ index e47ba7c3b7c7d8..fa1d77d86ef67b 100644
}
}
-@@ -581,10 +617,12 @@ static int pca955x_probe(struct i2c_client *client,
+@@ -581,10 +617,12 @@ static int pca955x_probe(struct i2c_clie
if (err)
return err;