Skip to contentSkip to conversation

mfd: mc13xxx: Move definitions out of structures

PATCH Applied Alexander Shiyan 3 participants 10 messages Mar 15, 2014 – Mar 19, 2014 Multifunction devices (MFD)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mfd: mc13xxx: Move definitions out of structures

---
 include/linux/mfd/mc13xxx.h | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)
include/linux/mfd/mc13xxx.h +12 -10
index a326c85..d63b1d3 100644
@@ -117,10 +117,6 @@ struct mc13xxx_led_platform_data {
 
 #define MAX_LED_CONTROL_REGS	6
 
-struct mc13xxx_leds_platform_data {
-	struct mc13xxx_led_platform_data *led;
-	int num_leds;
-
 /* MC13783 LED Control 0 */
 #define MC13783_LED_C0_ENABLE		(1 << 0)
 #define MC13783_LED_C0_TRIODE_MD	(1 << 7)
@@ -169,10 +165,13 @@ struct mc13xxx_leds_platform_data {
 /* MC34708 LED Control 0 */
 #define MC34708_LED_C0_CURRENT_R(x)	(((x) & 0x3) << 9)
 #define MC34708_LED_C0_CURRENT_G(x)	(((x) & 0x3) << 21)
+
+struct mc13xxx_leds_platform_data {
+	struct mc13xxx_led_platform_data *led;
+	int num_leds;
 	u32 led_control[MAX_LED_CONTROL_REGS];
 };
 
-struct mc13xxx_buttons_platform_data {
 #define MC13783_BUTTON_DBNC_0MS		0
 #define MC13783_BUTTON_DBNC_30MS	1
 #define MC13783_BUTTON_DBNC_150MS	2
@@ -180,6 +179,8 @@ struct mc13xxx_buttons_platform_data {
 #define MC13783_BUTTON_ENABLE		(1 << 2)
 #define MC13783_BUTTON_POL_INVERT	(1 << 3)
 #define MC13783_BUTTON_RESET_EN		(1 << 4)
+
+struct mc13xxx_buttons_platform_data {
 	int b1on_flags;
 	unsigned short b1on_key;
 	int b2on_flags;
@@ -188,14 +189,14 @@ struct mc13xxx_buttons_platform_data {
 	unsigned short b3on_key;
 };
 
+#define MC13783_TS_ATO_FIRST	false
+#define MC13783_TS_ATO_EACH	true
+
 struct mc13xxx_ts_platform_data {
 	/* Delay between Touchscreen polarization and ADC Conversion.
 	 * Given in clock ticks of a 32 kHz clock which gives a granularity of
 	 * about 30.5ms */
 	u8 ato;
-
-#define MC13783_TS_ATO_FIRST false
-#define MC13783_TS_ATO_EACH  true
 	/* Use the ATO delay only for the first conversion or for each one */
 	bool atox;
 };
@@ -210,11 +211,12 @@ struct mc13xxx_codec_platform_data {
 	enum mc13783_ssi_port dac_ssi_port;
 };
 
-struct mc13xxx_platform_data {
-#define MC13XXX_USE_TOUCHSCREEN (1 << 0)
+#define MC13XXX_USE_TOUCHSCREEN	(1 << 0)
 #define MC13XXX_USE_CODEC	(1 << 1)
 #define MC13XXX_USE_ADC		(1 << 2)
 #define MC13XXX_USE_RTC		(1 << 3)
+
+struct mc13xxx_platform_data {
 	unsigned int flags;
 
 	struct mc13xxx_regulator_platform_data regulators;
Signature · 1 line
1.8.3.2
Applied
#1 lore raw
Quoted 4 lines
---
 include/linux/mfd/mc13xxx.h | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

Applied, thanks.

Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#2 lore raw
In reply to Alexander Shiyan
Quoted 21 lines
---
 include/linux/mfd/mc13xxx.h | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)
include/linux/mfd/mc13xxx.h +0 -4
index a326c85..d63b1d3 100644
@@ -117,10 +117,6 @@ struct mc13xxx_led_platform_data {
 
 #define MAX_LED_CONTROL_REGS	6
 
-struct mc13xxx_leds_platform_data {
-	struct mc13xxx_led_platform_data *led;
-	int num_leds;
-
 /* MC13783 LED Control 0 */
 #define MC13783_LED_C0_ENABLE		(1 << 0)
 #define MC13783_LED_C0_TRIODE_MD	(1 << 7)

include/linux/mfd/mc13xxx.h struct mc13xxx_leds_platform_data { · line 165

Quoted 1 line
include/linux/mfd/mc13xxx.h +0 -0
@@ -169,10 +165,13 @@ struct mc13xxx_leds_platform_data {
 /* MC34708 LED Control 0 */

I don't see the line above in the MFD tree?

Which commit/branch/repo is this patch based on?

Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#3 lore raw

Tue, 18 Mar 2014 09:02:37 +0000 от Lee Jones <[email protected]>:

Quoted 25 lines
Quoted 21 lines
---
 include/linux/mfd/mc13xxx.h | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)
include/linux/mfd/mc13xxx.h +0 -4
index a326c85..d63b1d3 100644
@@ -117,10 +117,6 @@ struct mc13xxx_led_platform_data {
 
 #define MAX_LED_CONTROL_REGS	6
 
-struct mc13xxx_leds_platform_data {
-	struct mc13xxx_led_platform_data *led;
-	int num_leds;
-
 /* MC13783 LED Control 0 */
 #define MC13783_LED_C0_ENABLE		(1 << 0)
 #define MC13783_LED_C0_TRIODE_MD	(1 << 7)

include/linux/mfd/mc13xxx.h struct mc13xxx_leds_platform_data { · line 165

Quoted 1 line
include/linux/mfd/mc13xxx.h +0 -0
@@ -169,10 +165,13 @@ struct mc13xxx_leds_platform_data {
 /* MC34708 LED Control 0 */

I don't see the line above in the MFD tree?

Quoted 1 line

Which commit/branch/repo is this patch based on?

Dependency:
linux-next, a59ce6584d (leds: leds-mc13783: Add MC34708 LED support)

https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/include/linux/mfd/mc13xxx.h?id=a59ce6584d566847980f9dcad5343cd9856145c8

---

���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m���� ������?�I�

#4 lore raw
Quoted 25 lines
Quoted 25 lines
Quoted 21 lines
---
 include/linux/mfd/mc13xxx.h | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)
include/linux/mfd/mc13xxx.h +0 -4
index a326c85..d63b1d3 100644
@@ -117,10 +117,6 @@ struct mc13xxx_led_platform_data {
 
 #define MAX_LED_CONTROL_REGS	6
 
-struct mc13xxx_leds_platform_data {
-	struct mc13xxx_led_platform_data *led;
-	int num_leds;
-
 /* MC13783 LED Control 0 */
 #define MC13783_LED_C0_ENABLE		(1 << 0)
 #define MC13783_LED_C0_TRIODE_MD	(1 << 7)

include/linux/mfd/mc13xxx.h struct mc13xxx_leds_platform_data { · line 165

Quoted 1 line
include/linux/mfd/mc13xxx.h +0 -0
@@ -169,10 +165,13 @@ struct mc13xxx_leds_platform_data {
 /* MC34708 LED Control 0 */

I don't see the line above in the MFD tree?

Quoted 6 lines
Quoted 1 line

Which commit/branch/repo is this patch based on?

Dependency:
linux-next, a59ce6584d (leds: leds-mc13783: Add MC34708 LED support)

https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/include/linux/mfd/mc13xxx.h?id=a59ce6584d566847980f9dcad5343cd9856145c8

Ah, you can't do that, as it will cause conflicts and Linus will likely get upset.

Bryan you naughty boy! Why are you applying patches to files in MFD?

Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#5 lore raw

Tue, 18 Mar 2014 09:27:35 +0000 от Lee Jones <[email protected]>:

Quoted 27 lines
Quoted 27 lines
Quoted 26 lines
Quoted 21 lines
---
 include/linux/mfd/mc13xxx.h | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)
include/linux/mfd/mc13xxx.h +0 -4
index a326c85..d63b1d3 100644
@@ -117,10 +117,6 @@ struct mc13xxx_led_platform_data {
 
 #define MAX_LED_CONTROL_REGS	6
 
-struct mc13xxx_leds_platform_data {
-	struct mc13xxx_led_platform_data *led;
-	int num_leds;
-
 /* MC13783 LED Control 0 */
 #define MC13783_LED_C0_ENABLE		(1 << 0)
 #define MC13783_LED_C0_TRIODE_MD	(1 << 7)

include/linux/mfd/mc13xxx.h struct mc13xxx_leds_platform_data { · line 165

Quoted 1 line
include/linux/mfd/mc13xxx.h +0 -0
@@ -169,10 +165,13 @@ struct mc13xxx_leds_platform_data {
 /* MC34708 LED Control 0 */

I don't see the line above in the MFD tree?

Which commit/branch/repo is this patch based on?

Quoted 7 lines
Quoted 4 lines

Dependency:
linux-next, a59ce6584d (leds: leds-mc13783: Add MC34708 LED support)

https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/include/linux/mfd/mc13xxx.h?id=a59ce6584d566847980f9dcad5343cd9856145c8

Ah, you can't do that, as it will cause conflicts and Linus will likely get upset.

So what do we do now? What is the solution?

---

���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m���� ������?�I�

#6 lore raw
Quoted 30 lines
Quoted 30 lines
Quoted 30 lines
Quoted 25 lines
Quoted 21 lines
---
 include/linux/mfd/mc13xxx.h | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)
include/linux/mfd/mc13xxx.h +0 -4
index a326c85..d63b1d3 100644
@@ -117,10 +117,6 @@ struct mc13xxx_led_platform_data {
 
 #define MAX_LED_CONTROL_REGS	6
 
-struct mc13xxx_leds_platform_data {
-	struct mc13xxx_led_platform_data *led;
-	int num_leds;
-
 /* MC13783 LED Control 0 */
 #define MC13783_LED_C0_ENABLE		(1 << 0)
 #define MC13783_LED_C0_TRIODE_MD	(1 << 7)

include/linux/mfd/mc13xxx.h struct mc13xxx_leds_platform_data { · line 165

Quoted 1 line
include/linux/mfd/mc13xxx.h +0 -0
@@ -169,10 +165,13 @@ struct mc13xxx_leds_platform_data {
 /* MC34708 LED Control 0 */

I don't see the line above in the MFD tree?

Quoted 1 line

Which commit/branch/repo is this patch based on?

Dependency:
linux-next, a59ce6584d (leds: leds-mc13783: Add MC34708 LED support)

Quoted 6 lines
Quoted 4 lines
Quoted 1 line

https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/include/linux/mfd/mc13xxx.h?id=a59ce6584d566847980f9dcad5343cd9856145c8

Ah, you can't do that, as it will cause conflicts and Linus will likely get upset.

So what do we do now? What is the solution?

Don't worry about it. Bryan and I should be able to sort something out.

Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#7 lore raw
Quoted 30 lines · Lee Jones
Quoted 30 lines
Quoted 30 lines
Quoted 30 lines
Quoted 25 lines
Quoted 21 lines
---
 include/linux/mfd/mc13xxx.h | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)
include/linux/mfd/mc13xxx.h +0 -4
index a326c85..d63b1d3 100644
@@ -117,10 +117,6 @@ struct mc13xxx_led_platform_data {
 
 #define MAX_LED_CONTROL_REGS 6
 
-struct mc13xxx_leds_platform_data {
-     struct mc13xxx_led_platform_data *led;
-     int num_leds;
-
 /* MC13783 LED Control 0 */
 #define MC13783_LED_C0_ENABLE                (1 << 0)
 #define MC13783_LED_C0_TRIODE_MD     (1 << 7)

include/linux/mfd/mc13xxx.h struct mc13xxx_leds_platform_data { · line 165

Quoted 1 line
include/linux/mfd/mc13xxx.h +0 -0
@@ -169,10 +165,13 @@ struct mc13xxx_leds_platform_data {
 /* MC34708 LED Control 0 */

I don't see the line above in the MFD tree?

Quoted 1 line

Which commit/branch/repo is this patch based on?

Dependency:
linux-next, a59ce6584d (leds: leds-mc13783: Add MC34708 LED support)

Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Quoted 1 line

https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/include/linux/mfd/mc13xxx.h?id=a59ce6584d566847980f9dcad5343cd9856145c8

Ah, you can't do that, as it will cause conflicts and Linus will likely get upset.

So what do we do now? What is the solution?

Don't worry about it. Bryan and I should be able to sort something out.

I lost the context here.

I merged Alexander's patch as a59ce6584d566847980f9dcad5343cd9856145c8 which modified the mc13xxx.h. But all things are related to LED driver and only add several lines. Next time I will ask Lee to give an review and ack.

So probably this patch has to wait for
a59ce6584d566847980f9dcad5343cd9856145c8 merged.

Thanks,
-Bryan

#8 lore raw
Quoted 42 lines · Bryan Wu
Quoted 30 lines · Lee Jones
Quoted 30 lines
Quoted 30 lines
Quoted 30 lines
Quoted 25 lines
Quoted 21 lines
---
 include/linux/mfd/mc13xxx.h | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)
include/linux/mfd/mc13xxx.h +0 -4
index a326c85..d63b1d3 100644
@@ -117,10 +117,6 @@ struct mc13xxx_led_platform_data {
 
 #define MAX_LED_CONTROL_REGS 6
 
-struct mc13xxx_leds_platform_data {
-     struct mc13xxx_led_platform_data *led;
-     int num_leds;
-
 /* MC13783 LED Control 0 */
 #define MC13783_LED_C0_ENABLE                (1 << 0)
 #define MC13783_LED_C0_TRIODE_MD     (1 << 7)

include/linux/mfd/mc13xxx.h struct mc13xxx_leds_platform_data { · line 165

Quoted 1 line
include/linux/mfd/mc13xxx.h +0 -0
@@ -169,10 +165,13 @@ struct mc13xxx_leds_platform_data {
 /* MC34708 LED Control 0 */

I don't see the line above in the MFD tree?

Quoted 1 line

Which commit/branch/repo is this patch based on?

Dependency:
linux-next, a59ce6584d (leds: leds-mc13783: Add MC34708 LED support)

Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Quoted 1 line

https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/include/linux/mfd/mc13xxx.h?id=a59ce6584d566847980f9dcad5343cd9856145c8

Ah, you can't do that, as it will cause conflicts and Linus will likely get upset.

So what do we do now? What is the solution?

Don't worry about it. Bryan and I should be able to sort something out.

I lost the context here.

Quoted 7 lines

I merged Alexander's patch as a59ce6584d566847980f9dcad5343cd9856145c8 which modified the mc13xxx.h. But all things are related to LED driver and only add several lines. Next time I will ask Lee to give an review and ack.

So probably this patch has to wait for
a59ce6584d566847980f9dcad5343cd9856145c8 merged.

Yes, I think this is the best idea.

Alexander, can you re-send this patch with my Ack after the next merge window please?

Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#9 lore raw

Wed, 19 Mar 2014 08:51:44 +0000 от Lee Jones <[email protected]>:

Quoted 49 lines · Bryan Wu
Quoted 48 lines · Lee Jones
Quoted 30 lines
Quoted 30 lines
Quoted 30 lines
Quoted 30 lines
Quoted 25 lines
Quoted 21 lines
---
 include/linux/mfd/mc13xxx.h | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)
include/linux/mfd/mc13xxx.h +0 -4
index a326c85..d63b1d3 100644
@@ -117,10 +117,6 @@ struct mc13xxx_led_platform_data {
 
 #define MAX_LED_CONTROL_REGS 6
 
-struct mc13xxx_leds_platform_data {
-     struct mc13xxx_led_platform_data *led;
-     int num_leds;
-
 /* MC13783 LED Control 0 */
 #define MC13783_LED_C0_ENABLE                (1 << 0)
 #define MC13783_LED_C0_TRIODE_MD     (1 << 7)

include/linux/mfd/mc13xxx.h struct mc13xxx_leds_platform_data { · line 165

Quoted 1 line
include/linux/mfd/mc13xxx.h +0 -0
@@ -169,10 +165,13 @@ struct mc13xxx_leds_platform_data {
 /* MC34708 LED Control 0 */

I don't see the line above in the MFD tree?

Quoted 1 line

Which commit/branch/repo is this patch based on?

Dependency:
linux-next, a59ce6584d (leds: leds-mc13783: Add MC34708 LED support)

Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Quoted 1 line

https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/include/linux/mfd/mc13xxx.h?id=a59ce6584d566847980f9dcad5343cd9856145c8

Ah, you can't do that, as it will cause conflicts and Linus will likely get upset.

So what do we do now? What is the solution?

Don't worry about it. Bryan and I should be able to sort something out.

I lost the context here.

I merged Alexander's patch as a59ce6584d566847980f9dcad5343cd9856145c8 which modified the mc13xxx.h. But all things are related to LED driver and only add several lines. Next time I will ask Lee to give an review and ack.

Quoted 7 lines
Quoted 2 lines

So probably this patch has to wait for
a59ce6584d566847980f9dcad5343cd9856145c8 merged.

Yes, I think this is the best idea.

Alexander, can you re-send this patch with my Ack after the next merge window please?

Sure.

---

���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m���� ������?�I�