From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mailout1.samsung.com ([203.254.224.24]:24549 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757979AbbAIPX7 (ORCPT ); Fri, 9 Jan 2015 10:23:59 -0500 From: Jacek Anaszewski To: linux-leds@vger.kernel.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: devicetree@vger.kernel.org, kyungmin.park@samsung.com, b.zolnierkie@samsung.com, pavel@ucw.cz, cooloney@gmail.com, rpurdie@rpsys.net, sakari.ailus@iki.fi, s.nawrocki@samsung.com, Jacek Anaszewski , Chanwoo Choi , Lee Jones Subject: [PATCH/RFC v10 06/19] mfd: max77693: modifications around max77693_led_platform_data Date: Fri, 09 Jan 2015 16:22:56 +0100 Message-id: <1420816989-1808-7-git-send-email-j.anaszewski@samsung.com> In-reply-to: <1420816989-1808-1-git-send-email-j.anaszewski@samsung.com> References: <1420816989-1808-1-git-send-email-j.anaszewski@samsung.com> Sender: linux-media-owner@vger.kernel.org List-ID: 1. Rename max77693_led_platform_data to max77693_led_config_data to avoid making impression that the led driver expects a board file - it relies on Device Tree data. 2. Remove fleds array, as the DT binding design has changed 3. Add "label" array for Device Tree strings with the name of a LED device 4. Make flash_timeout a two element array, for caching the sub-led related flash timeout. 5. Remove trigger array as the related data will not be provided in the DT binding Signed-off-by: Jacek Anaszewski Acked-by: Kyungmin Park Cc: Chanwoo Choi Cc: Lee Jones --- include/linux/mfd/max77693.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/include/linux/mfd/max77693.h b/include/linux/mfd/max77693.h index f0b6585..c1ccb13 100644 --- a/include/linux/mfd/max77693.h +++ b/include/linux/mfd/max77693.h @@ -87,17 +87,16 @@ enum max77693_led_boost_mode { MAX77693_LED_BOOST_FIXED, }; -struct max77693_led_platform_data { - u32 fleds[2]; +struct max77693_led_config_data { + const char *label[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; + u32 trigger_type; }; /* MAX77693 */ -- 1.7.9.5