| Message ID | 1561435529-7835-3-git-send-email-bdodge09@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fix vendor prefix for arcxcnn driver and bindings | expand |
On Tue, Jun 25, 2019 at 12:05:29AM -0400, Brian Dodge wrote: > The original patch adding this driver and DT bindings improperly > used "arc" as the vendor-prefix. This adds "arctic" which is the > proper prefix and retains "arc" to allow existing users of the > "arc" prefix to update to new kernels. There is at least one > (Samsung Chromebook Plus) > > Signed-off-by: Brian Dodge <bdodge09@gmail.com> Still needs consensus on the DT bindings but for any future resends please add this (to this patch only): Acked-by: Daniel Thompson <daniel.thompson@linaro.org> Daniel. > --- > drivers/video/backlight/arcxcnn_bl.c | 35 +++++++++++++++++++++++++---------- > 1 file changed, 25 insertions(+), 10 deletions(-) > > diff --git a/drivers/video/backlight/arcxcnn_bl.c b/drivers/video/backlight/arcxcnn_bl.c > index 7b1c0a0..14c67f2 100644 > --- a/drivers/video/backlight/arcxcnn_bl.c > +++ b/drivers/video/backlight/arcxcnn_bl.c > @@ -1,9 +1,9 @@ > // SPDX-License-Identifier: GPL-2.0-only > /* > - * Backlight driver for ArcticSand ARC_X_C_0N_0N Devices > + * Backlight driver for pSemi (formerly ArcticSand) ARC_X_C_0N_0N Devices > * > - * Copyright 2016 ArcticSand, Inc. > - * Author : Brian Dodge <bdodge@arcticsand.com> > + * Copyright 2016-2019 pSemi, Inc. > + * Author : Brian Dodge <bdodge@psemi.com> > */ > > #include <linux/backlight.h> > @@ -191,27 +191,40 @@ static void arcxcnn_parse_dt(struct arcxcnn *lp) > if (ret == 0) > lp->pdata->initial_brightness = prog_val; > > - ret = of_property_read_u32(node, "arc,led-config-0", &prog_val); > + ret = of_property_read_u32(node, "arctic,led-config-0", &prog_val); > + if (ret) > + ret = of_property_read_u32(node, "arc,led-config-0", &prog_val); > if (ret == 0) > lp->pdata->led_config_0 = (u8)prog_val; > > - ret = of_property_read_u32(node, "arc,led-config-1", &prog_val); > + ret = of_property_read_u32(node, "arctic,led-config-1", &prog_val); > + if (ret) > + ret = of_property_read_u32(node, "arc,led-config-1", &prog_val); > if (ret == 0) > lp->pdata->led_config_1 = (u8)prog_val; > > - ret = of_property_read_u32(node, "arc,dim-freq", &prog_val); > + ret = of_property_read_u32(node, "arctic,dim-freq", &prog_val); > + if (ret) > + ret = of_property_read_u32(node, "arc,dim-freq", &prog_val); > if (ret == 0) > lp->pdata->dim_freq = (u8)prog_val; > > - ret = of_property_read_u32(node, "arc,comp-config", &prog_val); > + ret = of_property_read_u32(node, "arctic,comp-config", &prog_val); > + if (ret) > + ret = of_property_read_u32(node, "arc,comp-config", &prog_val); > if (ret == 0) > lp->pdata->comp_config = (u8)prog_val; > > - ret = of_property_read_u32(node, "arc,filter-config", &prog_val); > + ret = of_property_read_u32(node, "arctic,filter-config", &prog_val); > + if (ret) > + ret = of_property_read_u32(node, > + "arc,filter-config", &prog_val); > if (ret == 0) > lp->pdata->filter_config = (u8)prog_val; > > - ret = of_property_read_u32(node, "arc,trim-config", &prog_val); > + ret = of_property_read_u32(node, "arctic,trim-config", &prog_val); > + if (ret) > + ret = of_property_read_u32(node, "arc,trim-config", &prog_val); > if (ret == 0) > lp->pdata->trim_config = (u8)prog_val; > > @@ -381,6 +394,8 @@ static int arcxcnn_remove(struct i2c_client *cl) > } > > static const struct of_device_id arcxcnn_dt_ids[] = { > + { .compatible = "arctic,arc2c0608" }, > + /* here to remaim compatible with an older binding, do not use */ > { .compatible = "arc,arc2c0608" }, > { } > }; > @@ -404,5 +419,5 @@ static struct i2c_driver arcxcnn_driver = { > module_i2c_driver(arcxcnn_driver); > > MODULE_LICENSE("GPL v2"); > -MODULE_AUTHOR("Brian Dodge <bdodge@arcticsand.com>"); > +MODULE_AUTHOR("Brian Dodge <bdodge@psemi.com>"); > MODULE_DESCRIPTION("ARCXCNN Backlight driver"); > -- > 2.7.4 >
Hello On 6/24/19 11:05 PM, Brian Dodge wrote: > The original patch adding this driver and DT bindings improperly > used "arc" as the vendor-prefix. This adds "arctic" which is the > proper prefix and retains "arc" to allow existing users of the > "arc" prefix to update to new kernels. There is at least one > (Samsung Chromebook Plus) > > Signed-off-by: Brian Dodge <bdodge09@gmail.com> > --- > drivers/video/backlight/arcxcnn_bl.c | 35 +++++++++++++++++++++++++---------- > 1 file changed, 25 insertions(+), 10 deletions(-) > > diff --git a/drivers/video/backlight/arcxcnn_bl.c b/drivers/video/backlight/arcxcnn_bl.c > index 7b1c0a0..14c67f2 100644 > --- a/drivers/video/backlight/arcxcnn_bl.c > +++ b/drivers/video/backlight/arcxcnn_bl.c > @@ -1,9 +1,9 @@ > // SPDX-License-Identifier: GPL-2.0-only > /* > - * Backlight driver for ArcticSand ARC_X_C_0N_0N Devices > + * Backlight driver for pSemi (formerly ArcticSand) ARC_X_C_0N_0N Devices > * > - * Copyright 2016 ArcticSand, Inc. > - * Author : Brian Dodge <bdodge@arcticsand.com> > + * Copyright 2016-2019 pSemi, Inc. > + * Author : Brian Dodge <bdodge@psemi.com> > */ > > #include <linux/backlight.h> > @@ -191,27 +191,40 @@ static void arcxcnn_parse_dt(struct arcxcnn *lp) > if (ret == 0) > lp->pdata->initial_brightness = prog_val; > > - ret = of_property_read_u32(node, "arc,led-config-0", &prog_val); > + ret = of_property_read_u32(node, "arctic,led-config-0", &prog_val); > + if (ret) > + ret = of_property_read_u32(node, "arc,led-config-0", &prog_val); Can you add new lines between these and all below > if (ret == 0) > lp->pdata->led_config_0 = (u8)prog_val; > > - ret = of_property_read_u32(node, "arc,led-config-1", &prog_val); > + ret = of_property_read_u32(node, "arctic,led-config-1", &prog_val); > + if (ret) > + ret = of_property_read_u32(node, "arc,led-config-1", &prog_val); > if (ret == 0) > lp->pdata->led_config_1 = (u8)prog_val; > > - ret = of_property_read_u32(node, "arc,dim-freq", &prog_val); > + ret = of_property_read_u32(node, "arctic,dim-freq", &prog_val); > + if (ret) > + ret = of_property_read_u32(node, "arc,dim-freq", &prog_val); > if (ret == 0) > lp->pdata->dim_freq = (u8)prog_val; > > - ret = of_property_read_u32(node, "arc,comp-config", &prog_val); > + ret = of_property_read_u32(node, "arctic,comp-config", &prog_val); > + if (ret) > + ret = of_property_read_u32(node, "arc,comp-config", &prog_val); > if (ret == 0) > lp->pdata->comp_config = (u8)prog_val; > > - ret = of_property_read_u32(node, "arc,filter-config", &prog_val); > + ret = of_property_read_u32(node, "arctic,filter-config", &prog_val); > + if (ret) > + ret = of_property_read_u32(node, > + "arc,filter-config", &prog_val); > if (ret == 0) > lp->pdata->filter_config = (u8)prog_val; > > - ret = of_property_read_u32(node, "arc,trim-config", &prog_val); > + ret = of_property_read_u32(node, "arctic,trim-config", &prog_val); > + if (ret) > + ret = of_property_read_u32(node, "arc,trim-config", &prog_val); > if (ret == 0) > lp->pdata->trim_config = (u8)prog_val; > > @@ -381,6 +394,8 @@ static int arcxcnn_remove(struct i2c_client *cl) > } > > static const struct of_device_id arcxcnn_dt_ids[] = { > + { .compatible = "arctic,arc2c0608" }, > + /* here to remaim compatible with an older binding, do not use */ s/remaim/remain > { .compatible = "arc,arc2c0608" }, > { } > }; > @@ -404,5 +419,5 @@ static struct i2c_driver arcxcnn_driver = { > module_i2c_driver(arcxcnn_driver); > > MODULE_LICENSE("GPL v2"); > -MODULE_AUTHOR("Brian Dodge <bdodge@arcticsand.com>"); > +MODULE_AUTHOR("Brian Dodge <bdodge@psemi.com>"); > MODULE_DESCRIPTION("ARCXCNN Backlight driver");
Hello One other thing On 6/26/19 6:42 AM, Dan Murphy wrote: > Hello > > On 6/24/19 11:05 PM, Brian Dodge wrote: >> The original patch adding this driver and DT bindings improperly >> used "arc" as the vendor-prefix. This adds "arctic" which is the >> proper prefix and retains "arc" to allow existing users of the >> "arc" prefix to update to new kernels. There is at least one >> (Samsung Chromebook Plus) >> >> Signed-off-by: Brian Dodge <bdodge09@gmail.com> >> --- >> drivers/video/backlight/arcxcnn_bl.c | 35 >> +++++++++++++++++++++++++---------- >> 1 file changed, 25 insertions(+), 10 deletions(-) >> >> diff --git a/drivers/video/backlight/arcxcnn_bl.c >> b/drivers/video/backlight/arcxcnn_bl.c >> index 7b1c0a0..14c67f2 100644 >> --- a/drivers/video/backlight/arcxcnn_bl.c >> +++ b/drivers/video/backlight/arcxcnn_bl.c >> @@ -1,9 +1,9 @@ >> // SPDX-License-Identifier: GPL-2.0-only >> /* >> - * Backlight driver for ArcticSand ARC_X_C_0N_0N Devices >> + * Backlight driver for pSemi (formerly ArcticSand) ARC_X_C_0N_0N >> Devices >> * >> - * Copyright 2016 ArcticSand, Inc. >> - * Author : Brian Dodge <bdodge@arcticsand.com> >> + * Copyright 2016-2019 pSemi, Inc. >> + * Author : Brian Dodge <bdodge@psemi.com> >> */ >> #include <linux/backlight.h> >> @@ -191,27 +191,40 @@ static void arcxcnn_parse_dt(struct arcxcnn *lp) >> if (ret == 0) >> lp->pdata->initial_brightness = prog_val; >> - ret = of_property_read_u32(node, "arc,led-config-0", &prog_val); >> + ret = of_property_read_u32(node, "arctic,led-config-0", &prog_val); >> + if (ret) >> + ret = of_property_read_u32(node, "arc,led-config-0", >> &prog_val); > Can you add new lines between these and all below Maybe add a dev_info here to indicate that this is being deprecated. It will make the Chrome book console noisy but at least it won't go silent. Dan >> if (ret == 0) >> lp->pdata->led_config_0 = (u8)prog_val; >> - ret = of_property_read_u32(node, "arc,led-config-1", &prog_val); >> + ret = of_property_read_u32(node, "arctic,led-config-1", &prog_val); >> + if (ret) >> + ret = of_property_read_u32(node, "arc,led-config-1", >> &prog_val); >> if (ret == 0) >> lp->pdata->led_config_1 = (u8)prog_val; >> - ret = of_property_read_u32(node, "arc,dim-freq", &prog_val); >> + ret = of_property_read_u32(node, "arctic,dim-freq", &prog_val); >> + if (ret) >> + ret = of_property_read_u32(node, "arc,dim-freq", &prog_val); >> if (ret == 0) >> lp->pdata->dim_freq = (u8)prog_val; >> - ret = of_property_read_u32(node, "arc,comp-config", &prog_val); >> + ret = of_property_read_u32(node, "arctic,comp-config", &prog_val); >> + if (ret) >> + ret = of_property_read_u32(node, "arc,comp-config", &prog_val); >> if (ret == 0) >> lp->pdata->comp_config = (u8)prog_val; >> - ret = of_property_read_u32(node, "arc,filter-config", &prog_val); >> + ret = of_property_read_u32(node, "arctic,filter-config", >> &prog_val); >> + if (ret) >> + ret = of_property_read_u32(node, >> + "arc,filter-config", &prog_val); >> if (ret == 0) >> lp->pdata->filter_config = (u8)prog_val; >> - ret = of_property_read_u32(node, "arc,trim-config", &prog_val); >> + ret = of_property_read_u32(node, "arctic,trim-config", &prog_val); >> + if (ret) >> + ret = of_property_read_u32(node, "arc,trim-config", &prog_val); >> if (ret == 0) >> lp->pdata->trim_config = (u8)prog_val; >> @@ -381,6 +394,8 @@ static int arcxcnn_remove(struct i2c_client *cl) >> } >> static const struct of_device_id arcxcnn_dt_ids[] = { >> + { .compatible = "arctic,arc2c0608" }, >> + /* here to remaim compatible with an older binding, do not use */ > > s/remaim/remain > > >> { .compatible = "arc,arc2c0608" }, >> { } >> }; >> @@ -404,5 +419,5 @@ static struct i2c_driver arcxcnn_driver = { >> module_i2c_driver(arcxcnn_driver); >> MODULE_LICENSE("GPL v2"); >> -MODULE_AUTHOR("Brian Dodge <bdodge@arcticsand.com>"); >> +MODULE_AUTHOR("Brian Dodge <bdodge@psemi.com>"); >> MODULE_DESCRIPTION("ARCXCNN Backlight driver");
diff --git a/drivers/video/backlight/arcxcnn_bl.c b/drivers/video/backlight/arcxcnn_bl.c index 7b1c0a0..14c67f2 100644 --- a/drivers/video/backlight/arcxcnn_bl.c +++ b/drivers/video/backlight/arcxcnn_bl.c @@ -1,9 +1,9 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Backlight driver for ArcticSand ARC_X_C_0N_0N Devices + * Backlight driver for pSemi (formerly ArcticSand) ARC_X_C_0N_0N Devices * - * Copyright 2016 ArcticSand, Inc. - * Author : Brian Dodge <bdodge@arcticsand.com> + * Copyright 2016-2019 pSemi, Inc. + * Author : Brian Dodge <bdodge@psemi.com> */ #include <linux/backlight.h> @@ -191,27 +191,40 @@ static void arcxcnn_parse_dt(struct arcxcnn *lp) if (ret == 0) lp->pdata->initial_brightness = prog_val; - ret = of_property_read_u32(node, "arc,led-config-0", &prog_val); + ret = of_property_read_u32(node, "arctic,led-config-0", &prog_val); + if (ret) + ret = of_property_read_u32(node, "arc,led-config-0", &prog_val); if (ret == 0) lp->pdata->led_config_0 = (u8)prog_val; - ret = of_property_read_u32(node, "arc,led-config-1", &prog_val); + ret = of_property_read_u32(node, "arctic,led-config-1", &prog_val); + if (ret) + ret = of_property_read_u32(node, "arc,led-config-1", &prog_val); if (ret == 0) lp->pdata->led_config_1 = (u8)prog_val; - ret = of_property_read_u32(node, "arc,dim-freq", &prog_val); + ret = of_property_read_u32(node, "arctic,dim-freq", &prog_val); + if (ret) + ret = of_property_read_u32(node, "arc,dim-freq", &prog_val); if (ret == 0) lp->pdata->dim_freq = (u8)prog_val; - ret = of_property_read_u32(node, "arc,comp-config", &prog_val); + ret = of_property_read_u32(node, "arctic,comp-config", &prog_val); + if (ret) + ret = of_property_read_u32(node, "arc,comp-config", &prog_val); if (ret == 0) lp->pdata->comp_config = (u8)prog_val; - ret = of_property_read_u32(node, "arc,filter-config", &prog_val); + ret = of_property_read_u32(node, "arctic,filter-config", &prog_val); + if (ret) + ret = of_property_read_u32(node, + "arc,filter-config", &prog_val); if (ret == 0) lp->pdata->filter_config = (u8)prog_val; - ret = of_property_read_u32(node, "arc,trim-config", &prog_val); + ret = of_property_read_u32(node, "arctic,trim-config", &prog_val); + if (ret) + ret = of_property_read_u32(node, "arc,trim-config", &prog_val); if (ret == 0) lp->pdata->trim_config = (u8)prog_val; @@ -381,6 +394,8 @@ static int arcxcnn_remove(struct i2c_client *cl) } static const struct of_device_id arcxcnn_dt_ids[] = { + { .compatible = "arctic,arc2c0608" }, + /* here to remaim compatible with an older binding, do not use */ { .compatible = "arc,arc2c0608" }, { } }; @@ -404,5 +419,5 @@ static struct i2c_driver arcxcnn_driver = { module_i2c_driver(arcxcnn_driver); MODULE_LICENSE("GPL v2"); -MODULE_AUTHOR("Brian Dodge <bdodge@arcticsand.com>"); +MODULE_AUTHOR("Brian Dodge <bdodge@psemi.com>"); MODULE_DESCRIPTION("ARCXCNN Backlight driver");
The original patch adding this driver and DT bindings improperly used "arc" as the vendor-prefix. This adds "arctic" which is the proper prefix and retains "arc" to allow existing users of the "arc" prefix to update to new kernels. There is at least one (Samsung Chromebook Plus) Signed-off-by: Brian Dodge <bdodge09@gmail.com> --- drivers/video/backlight/arcxcnn_bl.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-)