From: Sasha Levin Date: Fri, 21 Feb 2020 18:56:38 +0000 (-0500) Subject: Add rtc-kconfig-select-regmap_i2c-when-necessary.patch X-Git-Tag: v4.19.106~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e4d026b28e1bd9d120be009a30fba510d1961151;p=thirdparty%2Fkernel%2Fstable-queue.git Add rtc-kconfig-select-regmap_i2c-when-necessary.patch Signed-off-by: Sasha Levin --- diff --git a/queue-5.4/rtc-kconfig-select-regmap_i2c-when-necessary.patch b/queue-5.4/rtc-kconfig-select-regmap_i2c-when-necessary.patch new file mode 100644 index 00000000000..7713a4667c4 --- /dev/null +++ b/queue-5.4/rtc-kconfig-select-regmap_i2c-when-necessary.patch @@ -0,0 +1,58 @@ +From e2bc17bb948f2f9880ba1860b106939bc81abce1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 27 Jan 2020 23:17:24 +0100 +Subject: rtc: Kconfig: select REGMAP_I2C when necessary + +From: Alexandre Belloni + +[ Upstream commit 578c2b661e2b1b474ea3571a3c3c6d57bae89e8d ] + +Some i2c RTC drivers are using regmap but are not selecting REGMAP_I2C +which may lead to build failures. + +Link: https://lore.kernel.org/r/20200127221724.10160-2-alexandre.belloni@bootlin.com +Signed-off-by: Alexandre Belloni +Signed-off-by: Sasha Levin +--- + drivers/rtc/Kconfig | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig +index 5efc6af539c0d..5d502fbd58039 100644 +--- a/drivers/rtc/Kconfig ++++ b/drivers/rtc/Kconfig +@@ -240,6 +240,7 @@ config RTC_DRV_AS3722 + + config RTC_DRV_DS1307 + tristate "Dallas/Maxim DS1307/37/38/39/40/41, ST M41T00, EPSON RX-8025, ISL12057" ++ select REGMAP_I2C + help + If you say yes here you get support for various compatible RTC + chips (often with battery backup) connected with I2C. This driver +@@ -632,6 +633,7 @@ config RTC_DRV_RX8010 + + config RTC_DRV_RX8581 + tristate "Epson RX-8571/RX-8581" ++ select REGMAP_I2C + help + If you say yes here you will get support for the Epson RX-8571/ + RX-8581. +@@ -659,6 +661,7 @@ config RTC_DRV_EM3027 + + config RTC_DRV_RV3028 + tristate "Micro Crystal RV3028" ++ select REGMAP_I2C + help + If you say yes here you get support for the Micro Crystal + RV3028. +@@ -688,6 +691,7 @@ config RTC_DRV_S5M + + config RTC_DRV_SD3078 + tristate "ZXW Shenzhen whwave SD3078" ++ select REGMAP_I2C + help + If you say yes here you get support for the ZXW Shenzhen whwave + SD3078 RTC chips. +-- +2.20.1 + diff --git a/queue-5.4/series b/queue-5.4/series index b70fd60ed3d..0bfad1824c5 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -339,3 +339,4 @@ mlxsw-spectrum_dpipe-add-missing-error-path.patch s390-pci-recover-handle-in-clp_set_pci_fn.patch drm-amdgpu-display-handle-multiple-numbers-of-fclks-.patch bcache-properly-initialize-path-and-err-in-register_.patch +rtc-kconfig-select-regmap_i2c-when-necessary.patch diff --git a/queue-5.5/rtc-kconfig-select-regmap_i2c-when-necessary.patch b/queue-5.5/rtc-kconfig-select-regmap_i2c-when-necessary.patch new file mode 100644 index 00000000000..35fd513fb96 --- /dev/null +++ b/queue-5.5/rtc-kconfig-select-regmap_i2c-when-necessary.patch @@ -0,0 +1,58 @@ +From 2f3bf03ae45b6b8b93a8adb792917873663d2f41 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 27 Jan 2020 23:17:24 +0100 +Subject: rtc: Kconfig: select REGMAP_I2C when necessary + +From: Alexandre Belloni + +[ Upstream commit 578c2b661e2b1b474ea3571a3c3c6d57bae89e8d ] + +Some i2c RTC drivers are using regmap but are not selecting REGMAP_I2C +which may lead to build failures. + +Link: https://lore.kernel.org/r/20200127221724.10160-2-alexandre.belloni@bootlin.com +Signed-off-by: Alexandre Belloni +Signed-off-by: Sasha Levin +--- + drivers/rtc/Kconfig | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig +index 738fa07188409..0f46e4a428896 100644 +--- a/drivers/rtc/Kconfig ++++ b/drivers/rtc/Kconfig +@@ -240,6 +240,7 @@ config RTC_DRV_AS3722 + + config RTC_DRV_DS1307 + tristate "Dallas/Maxim DS1307/37/38/39/40/41, ST M41T00, EPSON RX-8025, ISL12057" ++ select REGMAP_I2C + help + If you say yes here you get support for various compatible RTC + chips (often with battery backup) connected with I2C. This driver +@@ -621,6 +622,7 @@ config RTC_DRV_RX8010 + + config RTC_DRV_RX8581 + tristate "Epson RX-8571/RX-8581" ++ select REGMAP_I2C + help + If you say yes here you will get support for the Epson RX-8571/ + RX-8581. +@@ -648,6 +650,7 @@ config RTC_DRV_EM3027 + + config RTC_DRV_RV3028 + tristate "Micro Crystal RV3028" ++ select REGMAP_I2C + help + If you say yes here you get support for the Micro Crystal + RV3028. +@@ -677,6 +680,7 @@ config RTC_DRV_S5M + + config RTC_DRV_SD3078 + tristate "ZXW Shenzhen whwave SD3078" ++ select REGMAP_I2C + help + If you say yes here you get support for the ZXW Shenzhen whwave + SD3078 RTC chips. +-- +2.20.1 + diff --git a/queue-5.5/series b/queue-5.5/series index a22629f8cc9..f499fb293d5 100644 --- a/queue-5.5/series +++ b/queue-5.5/series @@ -394,3 +394,4 @@ mlxsw-spectrum_dpipe-add-missing-error-path.patch s390-pci-recover-handle-in-clp_set_pci_fn.patch drm-amdgpu-display-handle-multiple-numbers-of-fclks-.patch bcache-properly-initialize-path-and-err-in-register_.patch +rtc-kconfig-select-regmap_i2c-when-necessary.patch