From 71d17d8d211cdff64f9efd00be7a930b1fb82890 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 13 Feb 2020 15:04:30 -0800 Subject: [PATCH] drop rtc-i2c-spi-avoid-inclusion-of-regmap-support-when-not-needed.patch --- ...on-of-regmap-support-when-not-needed.patch | 70 ------------------- queue-5.4/series | 1 - ...on-of-regmap-support-when-not-needed.patch | 70 ------------------- queue-5.5/series | 1 - 4 files changed, 142 deletions(-) delete mode 100644 queue-5.4/rtc-i2c-spi-avoid-inclusion-of-regmap-support-when-not-needed.patch delete mode 100644 queue-5.5/rtc-i2c-spi-avoid-inclusion-of-regmap-support-when-not-needed.patch diff --git a/queue-5.4/rtc-i2c-spi-avoid-inclusion-of-regmap-support-when-not-needed.patch b/queue-5.4/rtc-i2c-spi-avoid-inclusion-of-regmap-support-when-not-needed.patch deleted file mode 100644 index abd044116b6..00000000000 --- a/queue-5.4/rtc-i2c-spi-avoid-inclusion-of-regmap-support-when-not-needed.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 34719de919af07682861cb0fa2bcf64da33ecf44 Mon Sep 17 00:00:00 2001 -From: Geert Uytterhoeven -Date: Sun, 12 Jan 2020 18:13:49 +0100 -Subject: rtc: i2c/spi: Avoid inclusion of REGMAP support when not needed - -From: Geert Uytterhoeven - -commit 34719de919af07682861cb0fa2bcf64da33ecf44 upstream. - -Merely enabling I2C and RTC selects REGMAP_I2C and REGMAP_SPI, even when -no driver needs it. While the former can be moduler, the latter cannot, -and thus becomes built-in. - -Fix this by moving the select statements for REGMAP_I2C and REGMAP_SPI -from the RTC_I2C_AND_SPI helper to the individual drivers that depend on -it. - -Note that the comment for RTC_I2C_AND_SPI refers to SND_SOC_I2C_AND_SPI -for more information, but the latter does not select REGMAP_{I2C,SPI} -itself, and defers that to the individual drivers, too. - -Fixes: 080481f54ef62121 ("rtc: merge ds3232 and ds3234") -Signed-off-by: Geert Uytterhoeven -Reported-by: kbuild test robot -Reported-by: kbuild test robot -Link: https://lore.kernel.org/r/20200112171349.22268-1-geert@linux-m68k.org -Signed-off-by: Alexandre Belloni -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/rtc/Kconfig | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - ---- a/drivers/rtc/Kconfig -+++ b/drivers/rtc/Kconfig -@@ -859,14 +859,14 @@ config RTC_I2C_AND_SPI - default m if I2C=m - default y if I2C=y - default y if SPI_MASTER=y -- select REGMAP_I2C if I2C -- select REGMAP_SPI if SPI_MASTER - - comment "SPI and I2C RTC drivers" - - config RTC_DRV_DS3232 - tristate "Dallas/Maxim DS3232/DS3234" - depends on RTC_I2C_AND_SPI -+ select REGMAP_I2C if I2C -+ select REGMAP_SPI if SPI_MASTER - help - If you say yes here you get support for Dallas Semiconductor - DS3232 and DS3234 real-time clock chips. If an interrupt is associated -@@ -886,6 +886,8 @@ config RTC_DRV_DS3232_HWMON - config RTC_DRV_PCF2127 - tristate "NXP PCF2127" - depends on RTC_I2C_AND_SPI -+ select REGMAP_I2C if I2C -+ select REGMAP_SPI if SPI_MASTER - select WATCHDOG_CORE if WATCHDOG - help - If you say yes here you get support for the NXP PCF2127/29 RTC -@@ -902,6 +904,8 @@ config RTC_DRV_PCF2127 - config RTC_DRV_RV3029C2 - tristate "Micro Crystal RV3029/3049" - depends on RTC_I2C_AND_SPI -+ select REGMAP_I2C if I2C -+ select REGMAP_SPI if SPI_MASTER - help - If you say yes here you get support for the Micro Crystal - RV3029 and RV3049 RTC chips. diff --git a/queue-5.4/series b/queue-5.4/series index 9bd068b3d35..ae0a0977496 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -33,7 +33,6 @@ nfsv4-try-lease-recovery-on-nfs4err_expired.patch nfsv4.0-nfs4_do_fsinfo-should-not-do-implicit-lease-renewals.patch x86-boot-handle-malformed-srat-tables-during-early-a.patch rtc-hym8563-return-einval-if-the-time-is-known-to-be-invalid.patch -rtc-i2c-spi-avoid-inclusion-of-regmap-support-when-not-needed.patch rtc-cmos-stop-using-shared-irq.patch watchdog-qcom-use-platform_get_irq_optional-for-bark-irq.patch arc-add-missing-multicast-filter-number-to-gmac-node.patch diff --git a/queue-5.5/rtc-i2c-spi-avoid-inclusion-of-regmap-support-when-not-needed.patch b/queue-5.5/rtc-i2c-spi-avoid-inclusion-of-regmap-support-when-not-needed.patch deleted file mode 100644 index e0819e08fe2..00000000000 --- a/queue-5.5/rtc-i2c-spi-avoid-inclusion-of-regmap-support-when-not-needed.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 34719de919af07682861cb0fa2bcf64da33ecf44 Mon Sep 17 00:00:00 2001 -From: Geert Uytterhoeven -Date: Sun, 12 Jan 2020 18:13:49 +0100 -Subject: rtc: i2c/spi: Avoid inclusion of REGMAP support when not needed - -From: Geert Uytterhoeven - -commit 34719de919af07682861cb0fa2bcf64da33ecf44 upstream. - -Merely enabling I2C and RTC selects REGMAP_I2C and REGMAP_SPI, even when -no driver needs it. While the former can be moduler, the latter cannot, -and thus becomes built-in. - -Fix this by moving the select statements for REGMAP_I2C and REGMAP_SPI -from the RTC_I2C_AND_SPI helper to the individual drivers that depend on -it. - -Note that the comment for RTC_I2C_AND_SPI refers to SND_SOC_I2C_AND_SPI -for more information, but the latter does not select REGMAP_{I2C,SPI} -itself, and defers that to the individual drivers, too. - -Fixes: 080481f54ef62121 ("rtc: merge ds3232 and ds3234") -Signed-off-by: Geert Uytterhoeven -Reported-by: kbuild test robot -Reported-by: kbuild test robot -Link: https://lore.kernel.org/r/20200112171349.22268-1-geert@linux-m68k.org -Signed-off-by: Alexandre Belloni -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/rtc/Kconfig | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - ---- a/drivers/rtc/Kconfig -+++ b/drivers/rtc/Kconfig -@@ -848,14 +848,14 @@ config RTC_I2C_AND_SPI - default m if I2C=m - default y if I2C=y - default y if SPI_MASTER=y -- select REGMAP_I2C if I2C -- select REGMAP_SPI if SPI_MASTER - - comment "SPI and I2C RTC drivers" - - config RTC_DRV_DS3232 - tristate "Dallas/Maxim DS3232/DS3234" - depends on RTC_I2C_AND_SPI -+ select REGMAP_I2C if I2C -+ select REGMAP_SPI if SPI_MASTER - help - If you say yes here you get support for Dallas Semiconductor - DS3232 and DS3234 real-time clock chips. If an interrupt is associated -@@ -875,6 +875,8 @@ config RTC_DRV_DS3232_HWMON - config RTC_DRV_PCF2127 - tristate "NXP PCF2127" - depends on RTC_I2C_AND_SPI -+ select REGMAP_I2C if I2C -+ select REGMAP_SPI if SPI_MASTER - select WATCHDOG_CORE if WATCHDOG - help - If you say yes here you get support for the NXP PCF2127/29 RTC -@@ -891,6 +893,8 @@ config RTC_DRV_PCF2127 - config RTC_DRV_RV3029C2 - tristate "Micro Crystal RV3029/3049" - depends on RTC_I2C_AND_SPI -+ select REGMAP_I2C if I2C -+ select REGMAP_SPI if SPI_MASTER - help - If you say yes here you get support for the Micro Crystal - RV3029 and RV3049 RTC chips. diff --git a/queue-5.5/series b/queue-5.5/series index d7f098da935..89398255762 100644 --- a/queue-5.5/series +++ b/queue-5.5/series @@ -46,7 +46,6 @@ netdevsim-fix-panic-in-nsim_dev_take_snapshot_write.patch netdevsim-use-__gfp_nowarn-to-avoid-memalloc-warning.patch rtc-mt6397-drop-free_irq-of-devm_-allocated-irq.patch rtc-hym8563-return-einval-if-the-time-is-known-to-be-invalid.patch -rtc-i2c-spi-avoid-inclusion-of-regmap-support-when-not-needed.patch rtc-cmos-stop-using-shared-irq.patch watchdog-qcom-use-platform_get_irq_optional-for-bark-irq.patch mips-loongson-fix-potential-null-dereference-in-loongson3_platform_init.patch -- 2.47.3