linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mfd: arizona: Remove some duplicate defines
@ 2016-06-13 12:37 Charles Keepax
  2016-06-15 15:43 ` Lee Jones
  0 siblings, 1 reply; 2+ messages in thread
From: Charles Keepax @ 2016-06-13 12:37 UTC (permalink / raw)
  To: lee.jones; +Cc: linux-kernel, patches

Some duplicate defines seem to have snuck into the registers file, this
patch simply removes them.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
 include/linux/mfd/arizona/registers.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/include/linux/mfd/arizona/registers.h b/include/linux/mfd/arizona/registers.h
index cd7e78e..0d06c5d 100644
--- a/include/linux/mfd/arizona/registers.h
+++ b/include/linux/mfd/arizona/registers.h
@@ -856,12 +856,6 @@
 #define ARIZONA_ISRC1INT4MIX_INPUT_1_SOURCE      0xB38
 #define ARIZONA_ISRC2DEC1MIX_INPUT_1_SOURCE      0xB40
 #define ARIZONA_ISRC2DEC2MIX_INPUT_1_SOURCE      0xB48
-#define ARIZONA_ISRC2INT1MIX_INPUT_1_SOURCE      0xB60
-#define ARIZONA_ISRC2INT2MIX_INPUT_1_SOURCE      0xB68
-#define ARIZONA_ISRC1INT3MIX_INPUT_1_SOURCE      0xB30
-#define ARIZONA_ISRC1INT4MIX_INPUT_1_SOURCE      0xB38
-#define ARIZONA_ISRC2DEC1MIX_INPUT_1_SOURCE      0xB40
-#define ARIZONA_ISRC2DEC2MIX_INPUT_1_SOURCE      0xB48
 #define ARIZONA_ISRC2DEC3MIX_INPUT_1_SOURCE      0xB50
 #define ARIZONA_ISRC2DEC4MIX_INPUT_1_SOURCE      0xB58
 #define ARIZONA_ISRC2INT1MIX_INPUT_1_SOURCE      0xB60
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] mfd: arizona: Remove some duplicate defines
  2016-06-13 12:37 [PATCH] mfd: arizona: Remove some duplicate defines Charles Keepax
@ 2016-06-15 15:43 ` Lee Jones
  0 siblings, 0 replies; 2+ messages in thread
From: Lee Jones @ 2016-06-15 15:43 UTC (permalink / raw)
  To: Charles Keepax; +Cc: linux-kernel, patches

On Mon, 13 Jun 2016, Charles Keepax wrote:

> Some duplicate defines seem to have snuck into the registers file, this
> patch simply removes them.
> 
> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
> ---
>  include/linux/mfd/arizona/registers.h | 6 ------
>  1 file changed, 6 deletions(-)

Applied, thanks.

> diff --git a/include/linux/mfd/arizona/registers.h b/include/linux/mfd/arizona/registers.h
> index cd7e78e..0d06c5d 100644
> --- a/include/linux/mfd/arizona/registers.h
> +++ b/include/linux/mfd/arizona/registers.h
> @@ -856,12 +856,6 @@
>  #define ARIZONA_ISRC1INT4MIX_INPUT_1_SOURCE      0xB38
>  #define ARIZONA_ISRC2DEC1MIX_INPUT_1_SOURCE      0xB40
>  #define ARIZONA_ISRC2DEC2MIX_INPUT_1_SOURCE      0xB48
> -#define ARIZONA_ISRC2INT1MIX_INPUT_1_SOURCE      0xB60
> -#define ARIZONA_ISRC2INT2MIX_INPUT_1_SOURCE      0xB68
> -#define ARIZONA_ISRC1INT3MIX_INPUT_1_SOURCE      0xB30
> -#define ARIZONA_ISRC1INT4MIX_INPUT_1_SOURCE      0xB38
> -#define ARIZONA_ISRC2DEC1MIX_INPUT_1_SOURCE      0xB40
> -#define ARIZONA_ISRC2DEC2MIX_INPUT_1_SOURCE      0xB48
>  #define ARIZONA_ISRC2DEC3MIX_INPUT_1_SOURCE      0xB50
>  #define ARIZONA_ISRC2DEC4MIX_INPUT_1_SOURCE      0xB58
>  #define ARIZONA_ISRC2INT1MIX_INPUT_1_SOURCE      0xB60

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-06-15 15:42 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-13 12:37 [PATCH] mfd: arizona: Remove some duplicate defines Charles Keepax
2016-06-15 15:43 ` Lee Jones

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).