On Fri, 28 Nov 2014, Jacek Anaszewski wrote: > Add "label" array for Device Tree strings with > the name of a LED device and make flash_timeout > a two element array, for caching the sub-led > related flash timeout.
<-------------------------------------------------------------------------> Please use all of the 75 char buffer. > Signed-off-by: Jacek Anaszewski <j.anaszew...@samsung.com> > Signed-off-by: Andrzej Hajda <a.ha...@samsung.com> > Acked-by: Kyungmin Park <kyungmin.p...@samsung.com> > Cc: Lee Jones <lee.jo...@linaro.org> > Cc: SangYoung Son <hello....@smasung.com> > Cc: Samuel Ortiz <sa...@linux.intel.com> > --- > include/linux/mfd/max77693.h | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/include/linux/mfd/max77693.h b/include/linux/mfd/max77693.h > index f0b6585..30fa19ea 100644 > --- a/include/linux/mfd/max77693.h > +++ b/include/linux/mfd/max77693.h > @@ -88,14 +88,15 @@ enum max77693_led_boost_mode { > }; > > struct max77693_led_platform_data { > + const char *label[2]; > u32 fleds[2]; > u32 iout_torch[2]; > u32 iout_flash[2]; > u32 trigger[2]; > u32 trigger_type[2]; > + u32 flash_timeout[2]; > u32 num_leds; > u32 boost_mode; > - u32 flash_timeout; > u32 boost_vout; > u32 low_vsys; > }; I'm guessing this will effect the other patches in the set? -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html