Adding I2C support to RX6110 RTC

Hi,

based on the last feedback round we decided to remove the ACPI patch from this patchset for now until we have the correct one. I have also moved the typo fix to the front, so it can be applied independently.

best regards,
Claudius

Changes from v2:
- removed unused variables
- reordered patches for easy partial application
- removed ACPI patch, because we are investigating ACPI name change

Changes from v1:
- moved common probing code into its own function rx6110_probe
- added a small patch to fix a type in the Kconfig

Claudius Heine (2):
rtc: Kconfig: Fix typo in help message of rx 6110
rtc: rx6110: add i2c support

 drivers/rtc/Kconfig      |  20 ++---
 drivers/rtc/rtc-rx6110.c | 165 +++++++++++++++++++++++++++++++++------
 2 files changed, 153 insertions(+), 32 deletions(-)

2.20.1

The help message in the Kconfig for the RX-6110 erronously stated RX-6610.

---
 drivers/rtc/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 65ad9d0b47ab..f74c7aad126a 100644
@@ -821,7 +821,7 @@ config RTC_DRV_RX6110
 	tristate "Epson RX-6110"
 	select REGMAP_SPI
 	help
-	  If you say yes here you will get support for the Epson RX-6610.
+	  If you say yes here you will get support for the Epson RX-6110.
 
 	  This driver can also be built as a module. If so the module
 	  will be called rtc-rx6110.

2.20.1

The RX6110 also supports I2C, so this patch adds support for it to the driver.

This also renames the SPI specific functions and variables to include _spi_ in their names.

---
 drivers/rtc/Kconfig      |  20 ++---
 drivers/rtc/rtc-rx6110.c | 165 +++++++++++++++++++++++++++++++++------
 2 files changed, 153 insertions(+), 32 deletions(-)

index f74c7aad126a..c7fb749c1c2f 100644
@@ -817,15 +817,6 @@ config RTC_DRV_RX4581
 	  This driver can also be built as a module. If so the module
 	  will be called rtc-rx4581.
 
-config RTC_DRV_RX6110
-	tristate "Epson RX-6110"
-	select REGMAP_SPI
-	help
-	  If you say yes here you will get support for the Epson RX-6110.
-
-	  This driver can also be built as a module. If so the module
-	  will be called rtc-rx6110.
-
 config RTC_DRV_RS5C348
 	tristate "Ricoh RS5C348A/B"
 	help

@@ -936,6 +927,17 @@ config RTC_DRV_RV3029_HWMON
 	  Say Y here if you want to expose temperature sensor data on
 	  rtc-rv3029.
 
+config RTC_DRV_RX6110
+	tristate "Epson RX-6110"
+	depends on RTC_I2C_AND_SPI
+	select REGMAP_SPI if SPI_MASTER
+	select REGMAP_I2C if I2C
+	help
+	  If you say yes here you will get support for the Epson RX-6110.
+
+	  This driver can also be built as a module. If so the module
+	  will be called rtc-rx6110.
+
 comment "Platform RTC drivers"
 
 # this 'CMOS' RTC driver is arch dependent because it requires

2.20.1

Applied, thanks!

[1/2] rtc: Kconfig: Fix typo in help message of rx 6110

      commit: 7e6066ca1f1fa5c79915dfb4720ca20c5e62edcc
[2/2] rtc: rx6110: add i2c support
      commit: afa819c2c6bf0d6b99d3e41217a2c7d3b3b53228

Best regards,

Alexandre Belloni <[email protected]>