Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1431621 > unrolled thread

[PATCH 1/5] rtc: ds17287: remove unused header

Started byAlexandre Belloni <alexandre.belloni@free-electrons.com>
First post2016-06-27 00:10 +0200
Last post2016-06-27 18:20 +0200
Articles 7 — 4 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH 1/5] rtc: ds17287: remove unused header Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2016-06-27 00:10 +0200
    [PATCH 3/5] rtc: ds2404: move rtc-ds2404.h to platform_data Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2016-06-27 00:10 +0200
    [PATCH 2/5] rtc: ds1286: move header to linux/rtc Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2016-06-27 00:10 +0200
    [PATCH 4/5] rtc: m48t86: move m48t86.h to platform_data Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2016-06-27 00:10 +0200
      Re: [PATCH 4/5] rtc: m48t86: move m48t86.h to platform_data Alexander Clouter <alex@digriz.org.uk> - 2016-06-27 09:40 +0200
      Re: [PATCH 4/5] rtc: m48t86: move m48t86.h to platform_data Jason Cooper <jason@lakedaemon.net> - 2016-06-27 18:20 +0200
      RE: [PATCH 4/5] rtc: m48t86: move m48t86.h to platform_data Hartley Sweeten <HartleyS@visionengravers.com> - 2016-06-27 18:20 +0200

#1431621 — [PATCH 1/5] rtc: ds17287: remove unused header

FromAlexandre Belloni <alexandre.belloni@free-electrons.com>
Date2016-06-27 00:10 +0200
Subject[PATCH 1/5] rtc: ds17287: remove unused header
Message-ID<rOqpz-5R-3@gated-at.bofh.it>
ds17287rtc.h is unused since commit 15beb694c661 ("mips: ip32: add
platform data hooks to use DS1685 driver"), remove it.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 include/linux/ds17287rtc.h | 66 ----------------------------------------------
 1 file changed, 66 deletions(-)
 delete mode 100644 include/linux/ds17287rtc.h

diff --git a/include/linux/ds17287rtc.h b/include/linux/ds17287rtc.h
deleted file mode 100644
index d85d3f497b96..000000000000
--- a/include/linux/ds17287rtc.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * ds17287rtc.h - register definitions for the ds1728[57] RTC / CMOS RAM
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * (C) 2003 Guido Guenther <agx@sigxcpu.org>
- */
-#ifndef __LINUX_DS17287RTC_H
-#define __LINUX_DS17287RTC_H
-
-#include <linux/rtc.h>			/* get the user-level API */
-#include <linux/mc146818rtc.h>
-
-/* Register A */
-#define DS_REGA_DV2	0x40		/* countdown chain */
-#define DS_REGA_DV1	0x20		/* oscillator enable */
-#define DS_REGA_DV0	0x10		/* bank select */
-
-/* bank 1 registers */
-#define DS_B1_MODEL	0x40		/* model number byte */
-#define DS_B1_SN1 	0x41		/* serial number byte 1 */
-#define DS_B1_SN2 	0x42		/* serial number byte 2 */
-#define DS_B1_SN3 	0x43		/* serial number byte 3 */
-#define DS_B1_SN4 	0x44		/* serial number byte 4 */
-#define DS_B1_SN5 	0x45		/* serial number byte 5 */
-#define DS_B1_SN6 	0x46		/* serial number byte 6 */
-#define DS_B1_CRC 	0x47		/* CRC byte */
-#define DS_B1_CENTURY 	0x48		/* Century byte */
-#define DS_B1_DALARM 	0x49		/* date alarm */
-#define DS_B1_XCTRL4A	0x4a		/* extendec control register 4a */
-#define DS_B1_XCTRL4B	0x4b		/* extendec control register 4b */
-#define DS_B1_RTCADDR2 	0x4e		/* rtc address 2 */
-#define DS_B1_RTCADDR3 	0x4f		/* rtc address 3 */
-#define DS_B1_RAMLSB	0x50		/* extended ram LSB */
-#define DS_B1_RAMMSB	0x51		/* extended ram MSB */
-#define DS_B1_RAMDPORT	0x53		/* extended ram data port */
-
-/* register details */
-/* extended control register 4a */
-#define DS_XCTRL4A_VRT2	0x80 		/* valid ram and time */
-#define DS_XCTRL4A_INCR	0x40		/* increment progress status */
-#define DS_XCTRL4A_BME	0x20		/* burst mode enable */
-#define DS_XCTRL4A_PAB	0x08		/* power active bar ctrl */
-#define DS_XCTRL4A_RF	0x04		/* ram clear flag */
-#define DS_XCTRL4A_WF	0x02		/* wake up alarm flag */
-#define DS_XCTRL4A_KF	0x01		/* kickstart flag */
-
-/* interrupt causes */
-#define DS_XCTRL4A_IFS	(DS_XCTRL4A_RF|DS_XCTRL4A_WF|DS_XCTRL4A_KF)
-
-/* extended control register 4b */
-#define DS_XCTRL4B_ABE	0x80 		/* auxiliary battery enable */
-#define DS_XCTRL4B_E32K	0x40		/* enable 32.768 kHz Output */
-#define DS_XCTRL4B_CS	0x20		/* crystal select */
-#define DS_XCTRL4B_RCE	0x10		/* ram clear enable */
-#define DS_XCTRL4B_PRS	0x08		/* PAB resec select */
-#define DS_XCTRL4B_RIE	0x04		/* ram clear interrupt enable */
-#define DS_XCTRL4B_WFE	0x02		/* wake up alarm interrupt enable */
-#define DS_XCTRL4B_KFE	0x01		/* kickstart interrupt enable */
-
-/* interrupt enable bits */
-#define DS_XCTRL4B_IFES	(DS_XCTRL4B_RIE|DS_XCTRL4B_WFE|DS_XCTRL4B_KFE)
-
-#endif /* __LINUX_DS17287RTC_H */
-- 
2.8.1

[toc] | [next] | [standalone]

#1431622 — [PATCH 3/5] rtc: ds2404: move rtc-ds2404.h to platform_data

FromAlexandre Belloni <alexandre.belloni@free-electrons.com>
Date2016-06-27 00:10 +0200
Subject[PATCH 3/5] rtc: ds2404: move rtc-ds2404.h to platform_data
Message-ID<rOqpA-5R-33@gated-at.bofh.it>
In reply to#1431621
rtc-ds2404.h belongs to include/linux/platform_data/

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 drivers/rtc/rtc-ds2404.c                       | 2 +-
 include/linux/{ => platform_data}/rtc-ds2404.h | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename include/linux/{ => platform_data}/rtc-ds2404.h (100%)

diff --git a/drivers/rtc/rtc-ds2404.c b/drivers/rtc/rtc-ds2404.c
index 16310fe79d76..9a1582ed7070 100644
--- a/drivers/rtc/rtc-ds2404.c
+++ b/drivers/rtc/rtc-ds2404.c
@@ -13,7 +13,7 @@
 #include <linux/rtc.h>
 #include <linux/types.h>
 #include <linux/bcd.h>
-#include <linux/rtc-ds2404.h>
+#include <linux/platform_data/rtc-ds2404.h>
 #include <linux/delay.h>
 #include <linux/gpio.h>
 #include <linux/slab.h>
diff --git a/include/linux/rtc-ds2404.h b/include/linux/platform_data/rtc-ds2404.h
similarity index 100%
rename from include/linux/rtc-ds2404.h
rename to include/linux/platform_data/rtc-ds2404.h
-- 
2.8.1

[toc] | [prev] | [next] | [standalone]

#1431623 — [PATCH 2/5] rtc: ds1286: move header to linux/rtc

FromAlexandre Belloni <alexandre.belloni@free-electrons.com>
Date2016-06-27 00:10 +0200
Subject[PATCH 2/5] rtc: ds1286: move header to linux/rtc
Message-ID<rOqpA-5R-25@gated-at.bofh.it>
In reply to#1431621
Move ds1286.h to rtc specific folder.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
 arch/mips/sgi-ip22/ip22-reset.c  | 2 +-
 drivers/rtc/rtc-ds1286.c         | 2 +-
 include/linux/{ => rtc}/ds1286.h | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename include/linux/{ => rtc}/ds1286.h (100%)

diff --git a/arch/mips/sgi-ip22/ip22-reset.c b/arch/mips/sgi-ip22/ip22-reset.c
index 063c2dd31e72..2f45b0357021 100644
--- a/arch/mips/sgi-ip22/ip22-reset.c
+++ b/arch/mips/sgi-ip22/ip22-reset.c
@@ -7,7 +7,7 @@
  */
 #include <linux/linkage.h>
 #include <linux/init.h>
-#include <linux/ds1286.h>
+#include <linux/rtc/ds1286.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
diff --git a/drivers/rtc/rtc-ds1286.c b/drivers/rtc/rtc-ds1286.c
index 756e509f6ed2..ef75c349dff9 100644
--- a/drivers/rtc/rtc-ds1286.c
+++ b/drivers/rtc/rtc-ds1286.c
@@ -16,7 +16,7 @@
 #include <linux/rtc.h>
 #include <linux/platform_device.h>
 #include <linux/bcd.h>
-#include <linux/ds1286.h>
+#include <linux/rtc/ds1286.h>
 #include <linux/io.h>
 #include <linux/slab.h>
 
diff --git a/include/linux/ds1286.h b/include/linux/rtc/ds1286.h
similarity index 100%
rename from include/linux/ds1286.h
rename to include/linux/rtc/ds1286.h
-- 
2.8.1

[toc] | [prev] | [next] | [standalone]

#1431628 — [PATCH 4/5] rtc: m48t86: move m48t86.h to platform_data

FromAlexandre Belloni <alexandre.belloni@free-electrons.com>
Date2016-06-27 00:10 +0200
Subject[PATCH 4/5] rtc: m48t86: move m48t86.h to platform_data
Message-ID<rOqpB-5R-43@gated-at.bofh.it>
In reply to#1431621
m48t86.h belongs to include/linux/platform_data/

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
Cc: Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ryan Mallon <rmallon@gmail.com>
Cc: Alexander Clouter <alex@digriz.org.uk>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Gregory Clement <gregory.clement@free-electrons.com>
Cc: linux-arm-kernel@lists.infradead.org

 arch/arm/mach-ep93xx/ts72xx.c                          | 2 +-
 arch/arm/mach-orion5x/ts78xx-setup.c                   | 2 +-
 drivers/rtc/rtc-m48t86.c                               | 2 +-
 include/linux/{m48t86.h => platform_data/rtc-m48t86.h} | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename include/linux/{m48t86.h => platform_data/rtc-m48t86.h} (100%)

diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c
index 45b81a2bcd4b..3b39ea353d30 100644
--- a/arch/arm/mach-ep93xx/ts72xx.c
+++ b/arch/arm/mach-ep93xx/ts72xx.c
@@ -16,7 +16,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
-#include <linux/m48t86.h>
+#include <linux/platform_data/rtc-m48t86.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c
index 3a58a5d4a28a..8d597267d0c4 100644
--- a/arch/arm/mach-orion5x/ts78xx-setup.c
+++ b/arch/arm/mach-orion5x/ts78xx-setup.c
@@ -16,7 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/ata_platform.h>
-#include <linux/m48t86.h>
+#include <linux/platform_data/rtc-m48t86.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/timeriomem-rng.h>
diff --git a/drivers/rtc/rtc-m48t86.c b/drivers/rtc/rtc-m48t86.c
index f72b91f2501f..0eeb5714c00f 100644
--- a/drivers/rtc/rtc-m48t86.c
+++ b/drivers/rtc/rtc-m48t86.c
@@ -16,7 +16,7 @@
 #include <linux/module.h>
 #include <linux/rtc.h>
 #include <linux/platform_device.h>
-#include <linux/m48t86.h>
+#include <linux/platform_data/rtc-m48t86.h>
 #include <linux/bcd.h>
 
 #define M48T86_REG_SEC		0x00
diff --git a/include/linux/m48t86.h b/include/linux/platform_data/rtc-m48t86.h
similarity index 100%
rename from include/linux/m48t86.h
rename to include/linux/platform_data/rtc-m48t86.h
-- 
2.8.1

[toc] | [prev] | [next] | [standalone]

#1431776 — Re: [PATCH 4/5] rtc: m48t86: move m48t86.h to platform_data

FromAlexander Clouter <alex@digriz.org.uk>
Date2016-06-27 09:40 +0200
SubjectRe: [PATCH 4/5] rtc: m48t86: move m48t86.h to platform_data
Message-ID<rOzjb-5CO-7@gated-at.bofh.it>
In reply to#1431628
Acked-by: Alexander Clouter <alex@digriz.org.uk>

On Mon, Jun 27, 2016 at 12:03:02AM +0200, Alexandre Belloni wrote:
>m48t86.h belongs to include/linux/platform_data/
>
>Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
>---
>Cc: Hartley Sweeten <hsweeten@visionengravers.com>
>Cc: Ryan Mallon <rmallon@gmail.com>
>Cc: Alexander Clouter <alex@digriz.org.uk>
>Cc: Jason Cooper <jason@lakedaemon.net>
>Cc: Andrew Lunn <andrew@lunn.ch>
>Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>Cc: Gregory Clement <gregory.clement@free-electrons.com>
>Cc: linux-arm-kernel@lists.infradead.org
>
> arch/arm/mach-ep93xx/ts72xx.c                          | 2 +-
> arch/arm/mach-orion5x/ts78xx-setup.c                   | 2 +-
> drivers/rtc/rtc-m48t86.c                               | 2 +-
> include/linux/{m48t86.h => platform_data/rtc-m48t86.h} | 0
> 4 files changed, 3 insertions(+), 3 deletions(-)
> rename include/linux/{m48t86.h => platform_data/rtc-m48t86.h} (100%)
>
>diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c
>index 45b81a2bcd4b..3b39ea353d30 100644
>--- a/arch/arm/mach-ep93xx/ts72xx.c
>+++ b/arch/arm/mach-ep93xx/ts72xx.c
>@@ -16,7 +16,7 @@
> #include <linux/init.h>
> #include <linux/platform_device.h>
> #include <linux/io.h>
>-#include <linux/m48t86.h>
>+#include <linux/platform_data/rtc-m48t86.h>
> #include <linux/mtd/nand.h>
> #include <linux/mtd/partitions.h>
>
>diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c
>index 3a58a5d4a28a..8d597267d0c4 100644
>--- a/arch/arm/mach-orion5x/ts78xx-setup.c
>+++ b/arch/arm/mach-orion5x/ts78xx-setup.c
>@@ -16,7 +16,7 @@
> #include <linux/platform_device.h>
> #include <linux/mv643xx_eth.h>
> #include <linux/ata_platform.h>
>-#include <linux/m48t86.h>
>+#include <linux/platform_data/rtc-m48t86.h>
> #include <linux/mtd/nand.h>
> #include <linux/mtd/partitions.h>
> #include <linux/timeriomem-rng.h>
>diff --git a/drivers/rtc/rtc-m48t86.c b/drivers/rtc/rtc-m48t86.c
>index f72b91f2501f..0eeb5714c00f 100644
>--- a/drivers/rtc/rtc-m48t86.c
>+++ b/drivers/rtc/rtc-m48t86.c
>@@ -16,7 +16,7 @@
> #include <linux/module.h>
> #include <linux/rtc.h>
> #include <linux/platform_device.h>
>-#include <linux/m48t86.h>
>+#include <linux/platform_data/rtc-m48t86.h>
> #include <linux/bcd.h>
>
> #define M48T86_REG_SEC		0x00
>diff --git a/include/linux/m48t86.h b/include/linux/platform_data/rtc-m48t86.h
>similarity index 100%
>rename from include/linux/m48t86.h
>rename to include/linux/platform_data/rtc-m48t86.h

[toc] | [prev] | [next] | [standalone]

#1432143 — Re: [PATCH 4/5] rtc: m48t86: move m48t86.h to platform_data

FromJason Cooper <jason@lakedaemon.net>
Date2016-06-27 18:20 +0200
SubjectRe: [PATCH 4/5] rtc: m48t86: move m48t86.h to platform_data
Message-ID<rOHqp-2AK-3@gated-at.bofh.it>
In reply to#1431628
Hey Alexandre,

On Mon, Jun 27, 2016 at 12:03:02AM +0200, Alexandre Belloni wrote:
> m48t86.h belongs to include/linux/platform_data/
> 
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> ---
> Cc: Hartley Sweeten <hsweeten@visionengravers.com>
> Cc: Ryan Mallon <rmallon@gmail.com>
> Cc: Alexander Clouter <alex@digriz.org.uk>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> Cc: linux-arm-kernel@lists.infradead.org
> 
>  arch/arm/mach-ep93xx/ts72xx.c                          | 2 +-
>  arch/arm/mach-orion5x/ts78xx-setup.c                   | 2 +-
>  drivers/rtc/rtc-m48t86.c                               | 2 +-
>  include/linux/{m48t86.h => platform_data/rtc-m48t86.h} | 0
>  4 files changed, 3 insertions(+), 3 deletions(-)
>  rename include/linux/{m48t86.h => platform_data/rtc-m48t86.h} (100%)

For the orion5x bit,

Acked-by: Jason Cooper <jason@lakedaemon.net>

thx,

Jason.

[toc] | [prev] | [next] | [standalone]

#1432146 — RE: [PATCH 4/5] rtc: m48t86: move m48t86.h to platform_data

FromHartley Sweeten <HartleyS@visionengravers.com>
Date2016-06-27 18:20 +0200
SubjectRE: [PATCH 4/5] rtc: m48t86: move m48t86.h to platform_data
Message-ID<rOHqq-2AK-13@gated-at.bofh.it>
In reply to#1431628
On Sunday, June 26, 2016 3:03 PM, Alexandre Belloni wrote:
> m48t86.h belongs to include/linux/platform_data/
>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> ---
> Cc: Hartley Sweeten <hsweeten@visionengravers.com>
> Cc: Ryan Mallon <rmallon@gmail.com>
> Cc: Alexander Clouter <alex@digriz.org.uk>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> Cc: linux-arm-kernel@lists.infradead.org
>
>  arch/arm/mach-ep93xx/ts72xx.c                          | 2 +-
>  arch/arm/mach-orion5x/ts78xx-setup.c                   | 2 +-
>  drivers/rtc/rtc-m48t86.c                               | 2 +-
>  include/linux/{m48t86.h => platform_data/rtc-m48t86.h} | 0
>  4 files changed, 3 insertions(+), 3 deletions(-)
>  rename include/linux/{m48t86.h => platform_data/rtc-m48t86.h} (100%)

For ep93xx:

Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web