From: Jacek Anaszewski <j.anaszewski@samsung.com>
To: linux-leds@vger.kernel.org, linux-media@vger.kernel.org,
devicetree@vger.kernel.org
Cc: kyungmin.park@samsung.com, pavel@ucw.cz, cooloney@gmail.com,
rpurdie@rpsys.net, sakari.ailus@iki.fi, s.nawrocki@samsung.com,
Jacek Anaszewski <j.anaszewski@samsung.com>,
Chanwoo Choi <cw00.choi@samsung.com>,
Lee Jones <lee.jones@linaro.org>
Subject: [PATCH/RFC v11 08/20] mfd: max77693: Adjust FLASH_EN_SHIFT and TORCH_EN_SHIFT macros
Date: Wed, 18 Feb 2015 17:20:29 +0100 [thread overview]
Message-ID: <1424276441-3969-9-git-send-email-j.anaszewski@samsung.com> (raw)
In-Reply-To: <1424276441-3969-1-git-send-email-j.anaszewski@samsung.com>
Modify FLASH_EN_SHIFT and TORCH_EN_SHIFT macros to work properly
when passed enum max77693_fled values (0 for FLED1 and 1 for FLED2)
from leds-max77693 driver. Previous definitions were compatible with
one of the previous RFC versions of leds-max77693.c driver, which was
not merged.
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Chanwoo Choi <cw00.choi@samsung.com>
Cc: Lee Jones <lee.jones@linaro.org>
---
include/linux/mfd/max77693-private.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h
index 8770ce1..51633ea 100644
--- a/include/linux/mfd/max77693-private.h
+++ b/include/linux/mfd/max77693-private.h
@@ -114,8 +114,8 @@ enum max77693_pmic_reg {
#define FLASH_EN_FLASH 0x1
#define FLASH_EN_TORCH 0x2
#define FLASH_EN_ON 0x3
-#define FLASH_EN_SHIFT(x) (6 - ((x) - 1) * 2)
-#define TORCH_EN_SHIFT(x) (2 - ((x) - 1) * 2)
+#define FLASH_EN_SHIFT(x) (6 - (x) * 2)
+#define TORCH_EN_SHIFT(x) (2 - (x) * 2)
/* MAX77693 MAX_FLASH1 register */
#define MAX_FLASH1_MAX_FL_EN 0x80
--
1.7.9.5
next prev parent reply other threads:[~2015-02-18 16:20 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-18 16:20 [PATCH/RFC v11 00/20] LED / flash API integration Jacek Anaszewski
2015-02-18 16:20 ` [PATCH/RFC v11 01/20] leds: flash: document sysfs interface Jacek Anaszewski
2015-02-18 22:47 ` 0.led_name 2.other.led.name in /sysfs " Pavel Machek
2015-02-19 8:26 ` Jacek Anaszewski
2015-02-19 9:02 ` Sakari Ailus
2015-02-19 21:40 ` Greg KH
2015-02-20 7:56 ` Jacek Anaszewski
2015-02-20 8:16 ` Pavel Machek
2015-02-20 8:55 ` Jacek Anaszewski
2015-02-20 15:36 ` Greg KH
2015-02-20 16:15 ` Jacek Anaszewski
2015-02-21 19:42 ` Greg KH
2015-02-20 20:57 ` Pavel Machek
2015-02-21 10:57 ` Sakari Ailus
2015-02-21 19:42 ` Greg KH
2015-02-27 14:34 ` Jacek Anaszewski
2015-03-02 12:54 ` Sakari Ailus
2015-03-02 13:56 ` Jacek Anaszewski
2015-03-02 15:12 ` Pavel Machek
2015-02-18 16:20 ` [PATCH/RFC v11 02/20] leds: flash: Improve sync strobe related sysfs attributes Jacek Anaszewski
2015-02-18 16:20 ` [PATCH/RFC v11 03/20] Documentation: leds: Add description of LED Flash class extension Jacek Anaszewski
2015-02-18 16:20 ` [PATCH/RFC v11 04/20] dt-binding: leds: Add common LED DT bindings macros Jacek Anaszewski
2015-02-18 16:20 ` [PATCH/RFC v11 05/20] mfd: max77693: Modify flash cell name identifiers Jacek Anaszewski
2015-02-19 9:21 ` Sakari Ailus
2015-02-18 16:20 ` [PATCH/RFC v11 06/20] mfd: max77693: Remove struct max77693_led_platform_data Jacek Anaszewski
2015-02-18 16:20 ` [PATCH/RFC v11 07/20] mfd: max77693: add TORCH_IOUT_MASK macro Jacek Anaszewski
2015-02-18 16:20 ` Jacek Anaszewski [this message]
2015-02-18 16:20 ` [PATCH/RFC v11 09/20] leds: Add support for max77693 mfd flash cell Jacek Anaszewski
2015-02-18 16:20 ` [PATCH/RFC v11 10/20] DT: Add documentation for the mfd Maxim max77693 Jacek Anaszewski
2015-02-18 16:20 ` [PATCH/RFC v11 11/20] leds: Add driver for AAT1290 current regulator Jacek Anaszewski
2015-02-18 16:20 ` [PATCH/RFC v11 12/20] of: Add Skyworks Solutions, Inc. vendor prefix Jacek Anaszewski
2015-02-18 16:20 ` [PATCH/RFC v11 13/20] DT: Add documentation for the Skyworks AAT1290 Jacek Anaszewski
2015-02-18 16:20 ` [PATCH/RFC v11 14/20] exynos4-is: Add support for v4l2-flash subdevs Jacek Anaszewski
2015-02-18 16:20 ` [PATCH/RFC v11 15/20] v4l2-ctrls: Add V4L2_CID_FLASH_SYNC_STROBE control Jacek Anaszewski
2015-02-18 16:20 ` [PATCH/RFC v11 16/20] media: Add registration helpers for V4L2 flash sub-devices Jacek Anaszewski
2015-02-18 16:20 ` [PATCH/RFC v11 17/20] Documentation: leds: Add description of v4l2-flash sub-device Jacek Anaszewski
2015-02-18 16:20 ` [PATCH/RFC v11 18/20] DT: Add documentation for exynos4-is 'flashes' property Jacek Anaszewski
2015-02-18 16:20 ` [PATCH/RFC v11 19/20] leds: max77693: add support for V4L2 Flash sub-device Jacek Anaszewski
2015-02-18 16:20 ` [PATCH/RFC v11 20/20] leds: aat1290: " Jacek Anaszewski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1424276441-3969-9-git-send-email-j.anaszewski@samsung.com \
--to=j.anaszewski@samsung.com \
--cc=cooloney@gmail.com \
--cc=cw00.choi@samsung.com \
--cc=devicetree@vger.kernel.org \
--cc=kyungmin.park@samsung.com \
--cc=lee.jones@linaro.org \
--cc=linux-leds@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=rpurdie@rpsys.net \
--cc=s.nawrocki@samsung.com \
--cc=sakari.ailus@iki.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).