2018-07-26 17:22:42

by Alexandre Belloni

Subject: [PATCH] MIPS: TXx9: remove useless RTC definitions

The RTC definitions were moved to the driver, remove them from the platform
header.

Signed-off-by: Alexandre Belloni <[email protected]>
---
arch/mips/include/asm/txx9/tx4939.h | 27 ---------------------------
1 file changed, 27 deletions(-)

diff --git a/arch/mips/include/asm/txx9/tx4939.h b/arch/mips/include/asm/txx9/tx4939.h
index 6d667087f2aa..f173bef405d3 100644
--- a/arch/mips/include/asm/txx9/tx4939.h
+++ b/arch/mips/include/asm/txx9/tx4939.h
@@ -101,13 +101,6 @@ struct tx4939_irc_reg {
struct tx4939_le_reg maskext;
};

-struct tx4939_rtc_reg {
- __u32 ctl;
- __u32 adr;
- __u32 dat;
- __u32 tbc;
-};
-
struct tx4939_crypto_reg {
struct tx4939_le_reg csr;
struct tx4939_le_reg idesptr;
@@ -369,26 +362,6 @@ struct tx4939_vpc_desc {
#define TX4939_CLKCTR_SIO0RST 0x00000002
#define TX4939_CLKCTR_CYPRST 0x00000001

-/*
- * RTC
- */
-#define TX4939_RTCCTL_ALME 0x00000080
-#define TX4939_RTCCTL_ALMD 0x00000040
-#define TX4939_RTCCTL_BUSY 0x00000020
-
-#define TX4939_RTCCTL_COMMAND 0x00000007
-#define TX4939_RTCCTL_COMMAND_NOP 0x00000000
-#define TX4939_RTCCTL_COMMAND_GETTIME 0x00000001
-#define TX4939_RTCCTL_COMMAND_SETTIME 0x00000002
-#define TX4939_RTCCTL_COMMAND_GETALARM 0x00000003
-#define TX4939_RTCCTL_COMMAND_SETALARM 0x00000004
-
-#define TX4939_RTCTBC_PM 0x00000080
-#define TX4939_RTCTBC_COMP 0x0000007f
-
-#define TX4939_RTC_REG_RAMSIZE 0x00000100
-#define TX4939_RTC_REG_RWBSIZE 0x00000006
-
/*
* CRYPTO
*/
--
2.18.0

2018-07-26 18:28:25

by Paul Burton

Subject: Re: [PATCH] MIPS: TXx9: remove useless RTC definitions

Hi Alexandre,

On Thu, Jul 26, 2018 at 06:40:54PM +0200, Alexandre Belloni wrote:
> The RTC definitions were moved to the driver, remove them from the platform
> header.
>
> Signed-off-by: Alexandre Belloni <[email protected]>
> ---
> arch/mips/include/asm/txx9/tx4939.h | 27 ---------------------------
> 1 file changed, 27 deletions(-)

Thanks - applied to mips-next for 4.19, with a small change to also
remove the tx4939_rtc_reg macro.

Paul

2018-07-26 19:36:40

by Alexandre Belloni

Subject: Re: [PATCH] MIPS: TXx9: remove useless RTC definitions

On 26/07/2018 10:40:15-0700, Paul Burton wrote:
> Hi Alexandre,
>
> On Thu, Jul 26, 2018 at 06:40:54PM +0200, Alexandre Belloni wrote:
> > The RTC definitions were moved to the driver, remove them from the platform
> > header.
> >
> > Signed-off-by: Alexandre Belloni <[email protected]>
> > ---
> > arch/mips/include/asm/txx9/tx4939.h | 27 ---------------------------
> > 1 file changed, 27 deletions(-)
>
> Thanks - applied to mips-next for 4.19, with a small change to also
> remove the tx4939_rtc_reg macro.
>

Ah, thanks, I missed that one as it was not used.

--
Alexandre Belloni, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com