Skip to contentSkip to conversation

clk/watchdog/ARM: Cleanup of various S3C bits

PATCH Applied Krzysztof Kozlowski 9 participants 39 messages Aug 4, 2020 – Sep 6, 2020

Subsystems (9)
lore
Share & tools
lore

Krzysztof Kozlowski

author maintainer
#0 lore raw

v2 cover clk/watchdog/ARM: Cleanup of various S3C bits

Hi,

I tried to cleanup few warnings in S3C machine code which lead to finding some bigger issues.

The patchset touches clk and watchdog trees. I would appreciate acks so I can take everything through Samsung SoC tree. I have later a bigger set which would create conflicts with it [1].

Changes since v1:
1. Few new patches,
2. Addressed review around clk and watchdog changes (see change logs in individual patches).

[1] v2 of Arnd's work for making S3C24xx multiplatform:
https://github.com/krzk/linux/tree/for-next/s3c-multiplatform-cleanup-w1-warnings-v2

Best regards,
Krzysztof

Krzysztof Kozlowski (13):
clk: samsung: s3c64xx: declare s3c64xx_clk_init() in shared header
clk: samsung: s3c24xx: declare s3c24xx_common_clk_init() in shared
header
ARM: s3c64xx: include header to fix -Wmissing-prototypes
ARM: s3c: remove plat-samsung/.../samsung-time.h
ARM: samsung: fix language typo
ARM: samsung: remove HAVE_S3C2410_WATCHDOG and use direct dependencies
ARM: s3c64xx: switch to generic watchdog driver reset
ARM: s3c24xx: fix missing system reset
ARM: s3c24xx: include common.h header in s3c2443.c
ARM: s3c24xx: sdhci: include plat/sdhci.h header
ARM: s3c24xx: ts: include platform data header
ARM: s3c24xx: ts: document function argument
ARM: s3c24xx: camif: include header with prototypes and unify
declaration

 MAINTAINERS                                   |  1 +
 arch/arm/Kconfig                              |  3 +-
 arch/arm/mach-exynos/Kconfig                  |  1 -
 arch/arm/mach-s3c24xx/common.c                |  1 +
 arch/arm/mach-s3c24xx/common.h                | 25 +++--
 arch/arm/mach-s3c24xx/mach-amlm5900.c         |  2 -
 arch/arm/mach-s3c24xx/mach-anubis.c           |  1 -
 arch/arm/mach-s3c24xx/mach-at2440evb.c        |  1 -
 arch/arm/mach-s3c24xx/mach-bast.c             |  1 -
 arch/arm/mach-s3c24xx/mach-gta02.c            |  1 -
 arch/arm/mach-s3c24xx/mach-h1940.c            |  1 -
 arch/arm/mach-s3c24xx/mach-jive.c             |  1 -
 arch/arm/mach-s3c24xx/mach-mini2440.c         |  1 -
 arch/arm/mach-s3c24xx/mach-n30.c              |  1 -
 arch/arm/mach-s3c24xx/mach-nexcoder.c         |  1 -
 arch/arm/mach-s3c24xx/mach-osiris.c           |  1 -
 arch/arm/mach-s3c24xx/mach-otom.c             |  1 -
 arch/arm/mach-s3c24xx/mach-qt2410.c           |  1 -
 arch/arm/mach-s3c24xx/mach-rx1950.c           |  1 -
 arch/arm/mach-s3c24xx/mach-rx3715.c           |  1 -
 arch/arm/mach-s3c24xx/mach-smdk2410.c         |  1 -
 arch/arm/mach-s3c24xx/mach-smdk2413.c         |  1 -
 arch/arm/mach-s3c24xx/mach-smdk2416.c         |  1 -
 arch/arm/mach-s3c24xx/mach-smdk2440.c         |  1 -
 arch/arm/mach-s3c24xx/mach-smdk2443.c         |  1 -
 arch/arm/mach-s3c24xx/mach-tct_hammer.c       |  1 -
 arch/arm/mach-s3c24xx/mach-vr1000.c           |  1 -
 arch/arm/mach-s3c24xx/mach-vstms.c            |  1 -
 arch/arm/mach-s3c24xx/s3c2443.c               |  1 +
 arch/arm/mach-s3c24xx/setup-camif.c           |  5 +-
 arch/arm/mach-s3c24xx/setup-sdhci-gpio.c      |  1 +
 arch/arm/mach-s3c24xx/setup-ts.c              |  3 +
 arch/arm/mach-s3c64xx/Kconfig                 |  5 +-
 arch/arm/mach-s3c64xx/common.c                | 17 +---
 arch/arm/mach-s3c64xx/common.h                | 17 +++-
 arch/arm/mach-s3c64xx/mach-anw6410.c          |  2 -
 arch/arm/mach-s3c64xx/mach-crag6410.c         |  2 -
 arch/arm/mach-s3c64xx/mach-hmt.c              |  2 -
 arch/arm/mach-s3c64xx/mach-mini6410.c         |  2 -
 arch/arm/mach-s3c64xx/mach-ncp.c              |  2 -
 arch/arm/mach-s3c64xx/mach-real6410.c         |  2 -
 arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c       | 17 ----
 arch/arm/mach-s3c64xx/mach-smartq.c           |  1 -
 arch/arm/mach-s3c64xx/mach-smartq5.c          |  2 -
 arch/arm/mach-s3c64xx/mach-smartq7.c          |  2 -
 arch/arm/mach-s3c64xx/mach-smdk6400.c         |  2 -
 arch/arm/mach-s3c64xx/mach-smdk6410.c         |  2 -
 arch/arm/mach-s3c64xx/setup-spi.c             |  1 +
 arch/arm/mach-s3c64xx/watchdog-reset.h        | 16 ----
 arch/arm/mach-s5pv210/Kconfig                 |  1 -
 arch/arm/plat-samsung/Kconfig                 | 10 +-
 arch/arm/plat-samsung/Makefile                |  1 -
 .../plat-samsung/include/plat/samsung-time.h  | 26 ------
 arch/arm/plat-samsung/watchdog-reset.c        | 93 -------------------
 arch/arm64/Kconfig.platforms                  |  1 -
 drivers/clk/samsung/clk-s3c2410.c             |  1 +
 drivers/clk/samsung/clk-s3c2412.c             |  1 +
 drivers/clk/samsung/clk-s3c2443.c             |  1 +
 drivers/clk/samsung/clk-s3c64xx.c             |  1 +
 drivers/watchdog/Kconfig                      | 10 +-
 include/linux/clk/samsung.h                   | 56 +++++++++++
 61 files changed, 105 insertions(+), 256 deletions(-)
 delete mode 100644 arch/arm/mach-s3c64xx/watchdog-reset.h
 delete mode 100644 arch/arm/plat-samsung/include/plat/samsung-time.h
 delete mode 100644 arch/arm/plat-samsung/watchdog-reset.c
 create mode 100644 include/linux/clk/samsung.h
Signature · 1 line
2.17.1
author maintainer
#1 lore raw

PATCH v2 1/13 clk: samsung: s3c64xx: declare s3c64xx_clk_init() in shared header

The s3c64xx_clk_init() is defined and used by the clk-s3c64xx driver and also used in the mach-s3c64xx machine code. Move the declaration to a header to fix W=1 build warning:

drivers/clk/samsung/clk-s3c64xx.c:391:13: warning: no previous prototype for 's3c64xx_clk_init' [-Wmissing-prototypes]
391 | void __init s3c64xx_clk_init(struct device_node *np, unsigned long xtal_f,

---

Changes since v1:
1. Drop __init from header (as suggested by Stephen),
2. Add necessary header and forward declaration (as suggested by Stephen),
3. Add review tag.

---
 MAINTAINERS                       |  1 +
 arch/arm/mach-s3c64xx/common.c    |  1 +
 arch/arm/mach-s3c64xx/common.h    |  2 --
 drivers/clk/samsung/clk-s3c64xx.c |  1 +
 include/linux/clk/samsung.h       | 24 ++++++++++++++++++++++++
 5 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 include/linux/clk/samsung.h
MAINTAINERS +1 -0
index a2885ec15bb8..5675fc9bfa00 100644
@@ -15294,6 +15294,7 @@ F:	Documentation/devicetree/bindings/clock/samsung,s3c*
 F:	Documentation/devicetree/bindings/clock/samsung,s5p*
 F:	drivers/clk/samsung/
 F:	include/dt-bindings/clock/exynos*.h
+F:	include/linux/clk/samsung.h
 
 SAMSUNG SPI DRIVERS
 M:	Kukjin Kim <[email protected]>
arch/arm/mach-s3c64xx/common.c +1 -0
index 13e91074308a..a655bf0c7802 100644
@@ -24,6 +24,7 @@
 #include <linux/platform_device.h>
 #include <linux/reboot.h>
 #include <linux/io.h>
+#include <linux/clk/samsung.h>
 #include <linux/dma-mapping.h>
 #include <linux/irq.h>
 #include <linux/gpio.h>
arch/arm/mach-s3c64xx/common.h +0 -2
index 03670887a764..f4eca42cdc86 100644
@@ -22,8 +22,6 @@ void s3c64xx_init_io(struct map_desc *mach_desc, int size);
 void s3c64xx_restart(enum reboot_mode mode, const char *cmd);
 
 struct device_node;
-void s3c64xx_clk_init(struct device_node *np, unsigned long xtal_f,
-	unsigned long xusbxti_f, bool is_s3c6400, void __iomem *reg_base);
 void s3c64xx_set_xtal_freq(unsigned long freq);
 void s3c64xx_set_xusbxti_freq(unsigned long freq);
 
drivers/clk/samsung/clk-s3c64xx.c +1 -0
index b96d33e5eb45..56f95b63f71f 100644
@@ -7,6 +7,7 @@
 
 #include <linux/slab.h>
 #include <linux/clk-provider.h>
+#include <linux/clk/samsung.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
 
include/linux/clk/samsung.h new file +24 -0
new file mode 100644
index 000000000000..7a0824b22eed
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (c) 2020 Krzysztof Kozlowski <[email protected]>
+ */
+
+#ifndef __LINUX_CLK_SAMSUNG_H_
+#define __LINUX_CLK_SAMSUNG_H_
+
+#include <linux/compiler_types.h>
+
+struct device_node;
+
+#ifdef CONFIG_ARCH_S3C64XX
+void s3c64xx_clk_init(struct device_node *np, unsigned long xtal_f,
+		      unsigned long xusbxti_f, bool s3c6400,
+		      void __iomem *base);
+#else
+static inline void s3c64xx_clk_init(struct device_node *np,
+				    unsigned long xtal_f,
+				    unsigned long xusbxti_f,
+				    bool s3c6400, void __iomem *base) { }
+#endif /* CONFIG_ARCH_S3C64XX */
+
+#endif /* __LINUX_CLK_SAMSUNG_H_ */
Signature · 1 line
2.17.1
maintainer Acked-by on v2 1/13
#2 lore raw

Re: [PATCH v2 01/13] clk: samsung: s3c64xx: declare s3c64xx_clk_init() in shared header

Hi Krzysztof,

Quoted 17 lines · Krzysztof Kozlowski

The s3c64xx_clk_init() is defined and used by the clk-s3c64xx driver and also used in the mach-s3c64xx machine code. Move the declaration to a header to fix W=1 build warning:

drivers/clk/samsung/clk-s3c64xx.c:391:13: warning: no previous prototype for 's3c64xx_clk_init' [-Wmissing-prototypes]
391 | void __init s3c64xx_clk_init(struct device_node *np, unsigned long xtal_f,

---

Changes since v1:
1. Drop __init from header (as suggested by Stephen),
2. Add necessary header and forward declaration (as suggested by Stephen),
3. Add review tag.

Quoted 9 lines
---
 MAINTAINERS                       |  1 +
 arch/arm/mach-s3c64xx/common.c    |  1 +
 arch/arm/mach-s3c64xx/common.h    |  2 --
 drivers/clk/samsung/clk-s3c64xx.c |  1 +
 include/linux/clk/samsung.h       | 24 ++++++++++++++++++++++++
 5 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 include/linux/clk/samsung.h

(snip)

Looks good to me. Thanks.

Signature · 3 lines
Best Regards,
Chanwoo Choi
Samsung Electronics
maintainer Reviewed-by on v2 1/13
#3 lore raw

Re: [PATCH v2 01/13] clk: samsung: s3c64xx: declare s3c64xx_clk_init() in shared header

In reply to Krzysztof Kozlowski

Quoting Krzysztof Kozlowski (2020-08-04 12:26:42)

Quoted 11 lines

The s3c64xx_clk_init() is defined and used by the clk-s3c64xx driver and also used in the mach-s3c64xx machine code. Move the declaration to a header to fix W=1 build warning:

drivers/clk/samsung/clk-s3c64xx.c:391:13: warning: no previous prototype for 's3c64xx_clk_init' [-Wmissing-prototypes]
391 | void __init s3c64xx_clk_init(struct device_node *np, unsigned long xtal_f,

---

author maintainer
#4 lore raw

PATCH v2 2/13 clk: samsung: s3c24xx: declare s3c24xx_common_clk_init() in shared header

In reply to Krzysztof Kozlowski

The s3c2410_common_clk_init() and others are defined and used by the clk-s3c24xx driver and also used in the mach-s3c24xx machine code. Move the declaration to a header to fix W=1 build warnings:

drivers/clk/samsung/clk-s3c2410.c:320:13: warning: no previous prototype for 's3c2410_common_clk_init' [-Wmissing-prototypes]
320 | void __init s3c2410_common_clk_init(struct device_node *np, unsigned long xti_f,
drivers/clk/samsung/clk-s3c2412.c:205:13: warning: no previous prototype for 's3c2412_common_clk_init' [-Wmissing-prototypes]
205 | void __init s3c2412_common_clk_init(struct device_node *np, unsigned long xti_f,
drivers/clk/samsung/clk-s3c2443.c:341:13: warning: no previous prototype for 's3c2443_common_clk_init' [-Wmissing-prototypes]
341 | void __init s3c2443_common_clk_init(struct device_node *np, unsigned long xti_f,

---

Changes since v1:
1. New patch

---
 arch/arm/mach-s3c24xx/common.c    |  1 +
 arch/arm/mach-s3c24xx/common.h    | 15 ---------------
 drivers/clk/samsung/clk-s3c2410.c |  1 +
 drivers/clk/samsung/clk-s3c2412.c |  1 +
 drivers/clk/samsung/clk-s3c2443.c |  1 +
 include/linux/clk/samsung.h       | 32 +++++++++++++++++++++++++++++++
 6 files changed, 36 insertions(+), 15 deletions(-)
arch/arm/mach-s3c24xx/common.c +1 -0
index 3dc029c2d2cb..0d55e88ee0a8 100644
@@ -19,6 +19,7 @@
 #include <linux/io.h>
 #include <linux/platform_data/dma-s3c24xx.h>
 #include <linux/dmaengine.h>
+#include <linux/clk/samsung.h>
 
 #include <mach/hardware.h>
 #include <mach/regs-clock.h>
arch/arm/mach-s3c24xx/common.h +0 -15
index d087b20e8857..12d2a112eec7 100644
@@ -108,19 +108,4 @@ extern struct platform_device s3c2443_device_dma;
 
 extern struct platform_device s3c2410_device_dclk;
 
-#ifdef CONFIG_S3C2410_COMMON_CLK
-void __init s3c2410_common_clk_init(struct device_node *np, unsigned long xti_f,
-				    int current_soc,
-				    void __iomem *reg_base);
-#endif
-#ifdef CONFIG_S3C2412_COMMON_CLK
-void __init s3c2412_common_clk_init(struct device_node *np, unsigned long xti_f,
-				unsigned long ext_f, void __iomem *reg_base);
-#endif
-#ifdef CONFIG_S3C2443_COMMON_CLK
-void __init s3c2443_common_clk_init(struct device_node *np, unsigned long xti_f,
-				    int current_soc,
-				    void __iomem *reg_base);
-#endif
-
 #endif /* __ARCH_ARM_MACH_S3C24XX_COMMON_H */
drivers/clk/samsung/clk-s3c2410.c +1 -0
index fcf6764693cc..5831d0606077 100644
@@ -6,6 +6,7 @@
  */
 
 #include <linux/clk-provider.h>
+#include <linux/clk/samsung.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
 
drivers/clk/samsung/clk-s3c2412.c +1 -0
index a95ab5f75163..724ef642f048 100644
@@ -6,6 +6,7 @@
  */
 
 #include <linux/clk-provider.h>
+#include <linux/clk/samsung.h>
 #include <linux/io.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
drivers/clk/samsung/clk-s3c2443.c +1 -0
index c7aba1e1af70..a827d63766d1 100644
@@ -6,6 +6,7 @@
  */
 
 #include <linux/clk-provider.h>
+#include <linux/clk/samsung.h>
 #include <linux/io.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
include/linux/clk/samsung.h +32 -0
index 7a0824b22eed..79097e365f7f 100644
@@ -21,4 +21,36 @@ static inline void s3c64xx_clk_init(struct device_node *np,
 				    bool s3c6400, void __iomem *base) { }
 #endif /* CONFIG_ARCH_S3C64XX */
 
+#ifdef CONFIG_S3C2410_COMMON_CLK
+void s3c2410_common_clk_init(struct device_node *np, unsigned long xti_f,
+			     int current_soc,
+			     void __iomem *reg_base);
+#else
+static inline void s3c2410_common_clk_init(struct device_node *np,
+					   unsigned long xti_f,
+					   int current_soc,
+					   void __iomem *reg_base) { }
+#endif /* CONFIG_S3C2410_COMMON_CLK */
+
+#ifdef CONFIG_S3C2412_COMMON_CLK
+void s3c2412_common_clk_init(struct device_node *np, unsigned long xti_f,
+			     unsigned long ext_f, void __iomem *reg_base);
+#else
+static inline void s3c2412_common_clk_init(struct device_node *np,
+					   unsigned long xti_f,
+					   unsigned long ext_f,
+					   void __iomem *reg_base) { }
+#endif /* CONFIG_S3C2412_COMMON_CLK */
+
+#ifdef CONFIG_S3C2443_COMMON_CLK
+void s3c2443_common_clk_init(struct device_node *np, unsigned long xti_f,
+			     int current_soc,
+			     void __iomem *reg_base);
+#else
+static inline void s3c2443_common_clk_init(struct device_node *np,
+					   unsigned long xti_f,
+					   int current_soc,
+					   void __iomem *reg_base) { }
+#endif /* CONFIG_S3C2443_COMMON_CLK */
+
 #endif /* __LINUX_CLK_SAMSUNG_H_ */
Signature · 1 line
2.17.1
maintainer Acked-by on v2 2/13
#5 lore raw

Re: [PATCH v2 02/13] clk: samsung: s3c24xx: declare s3c24xx_common_clk_init() in shared header

Hi Krzysztof,

Quoted 25 lines · Krzysztof Kozlowski

The s3c2410_common_clk_init() and others are defined and used by the clk-s3c24xx driver and also used in the mach-s3c24xx machine code. Move the declaration to a header to fix W=1 build warnings:

drivers/clk/samsung/clk-s3c2410.c:320:13: warning: no previous prototype for 's3c2410_common_clk_init' [-Wmissing-prototypes]
320 | void __init s3c2410_common_clk_init(struct device_node *np, unsigned long xti_f,
drivers/clk/samsung/clk-s3c2412.c:205:13: warning: no previous prototype for 's3c2412_common_clk_init' [-Wmissing-prototypes]
205 | void __init s3c2412_common_clk_init(struct device_node *np, unsigned long xti_f,
drivers/clk/samsung/clk-s3c2443.c:341:13: warning: no previous prototype for 's3c2443_common_clk_init' [-Wmissing-prototypes]
341 | void __init s3c2443_common_clk_init(struct device_node *np, unsigned long xti_f,

---

Changes since v1:
1. New patch

---
 arch/arm/mach-s3c24xx/common.c    |  1 +
 arch/arm/mach-s3c24xx/common.h    | 15 ---------------
 drivers/clk/samsung/clk-s3c2410.c |  1 +
 drivers/clk/samsung/clk-s3c2412.c |  1 +
 drivers/clk/samsung/clk-s3c2443.c |  1 +
 include/linux/clk/samsung.h       | 32 +++++++++++++++++++++++++++++++
 6 files changed, 36 insertions(+), 15 deletions(-)

(snip)

Signature · 3 lines
Best Regards,
Chanwoo Choi
Samsung Electronics
maintainer Reviewed-by on v2 2/13
#6 lore raw

Re: [PATCH v2 02/13] clk: samsung: s3c24xx: declare s3c24xx_common_clk_init() in shared header

In reply to Krzysztof Kozlowski

Quoting Krzysztof Kozlowski (2020-08-04 12:26:43)

Quoted 11 lines

The s3c2410_common_clk_init() and others are defined and used by the clk-s3c24xx driver and also used in the mach-s3c24xx machine code. Move the declaration to a header to fix W=1 build warnings:

drivers/clk/samsung/clk-s3c2410.c:320:13: warning: no previous prototype for 's3c2410_common_clk_init' [-Wmissing-prototypes]
320 | void __init s3c2410_common_clk_init(struct device_node *np, unsigned long xti_f,
drivers/clk/samsung/clk-s3c2412.c:205:13: warning: no previous prototype for 's3c2412_common_clk_init' [-Wmissing-prototypes]
205 | void __init s3c2412_common_clk_init(struct device_node *np, unsigned long xti_f,
drivers/clk/samsung/clk-s3c2443.c:341:13: warning: no previous prototype for 's3c2443_common_clk_init' [-Wmissing-prototypes]
341 | void __init s3c2443_common_clk_init(struct device_node *np, unsigned long xti_f,

Quoted 3 lines

---

author maintainer
#7 lore raw

PATCH v2 3/13 ARM: s3c64xx: include header to fix -Wmissing-prototypes

In reply to Krzysztof Kozlowski

Include the spi-s3c64xx.h header to fix W=1 build warning:

    arch/arm/mach-s3c64xx/setup-spi.c:11:5: warning:
        no previous prototype for 's3c64xx_spi0_cfg_gpio' [-Wmissing-prototypes]
       11 | int s3c64xx_spi0_cfg_gpio(void)

---

Changes since v1:
1. Add review tag.

---
 arch/arm/mach-s3c64xx/setup-spi.c | 1 +
 1 file changed, 1 insertion(+)
arch/arm/mach-s3c64xx/setup-spi.c +1 -0
index 39dfae1f46e7..03c9d296bb0f 100644
@@ -4,6 +4,7 @@
 //		http://www.samsung.com/
 
 #include <linux/gpio.h>
+#include <linux/platform_data/spi-s3c64xx.h>
 #include <plat/gpio-cfg.h>
 #include <mach/gpio-samsung.h>
 
Signature · 1 line
2.17.1
maintainer Reviewed-by on v2 3/13
#8 lore raw

Re: [PATCH v2 03/13] ARM: s3c64xx: include header to fix -Wmissing-prototypes

Quoting Krzysztof Kozlowski (2020-08-04 12:26:44)

Quoted 10 lines

Include the spi-s3c64xx.h header to fix W=1 build warning:

    arch/arm/mach-s3c64xx/setup-spi.c:11:5: warning:
        no previous prototype for 's3c64xx_spi0_cfg_gpio' [-Wmissing-prototypes]
       11 | int s3c64xx_spi0_cfg_gpio(void)

---

author maintainer
#9 lore raw

PATCH v2 4/13 ARM: s3c: remove plat-samsung/.../samsung-time.h

In reply to Krzysztof Kozlowski

Remove the arch/arm/plat-samsung/include/plat/samsung-time.h header and move the contents to common.h headers in mach-s3c24xx and mach-s3c64xx. The definition of declared functions is already in common.c in mach directories, so it is logically to put declaration next to them.

This is also one step further towards removal of plat-samsung directory and it fixes W=1 build warnings:

arch/arm/mach-s3c64xx/common.c:174:13: warning:
no previous prototype for 'samsung_set_timer_source' [-Wmissing-prototypes]
174 | void __init samsung_set_timer_source(unsigned int event, unsigned int source)

arch/arm/mach-s3c64xx/common.c:180:13: warning:
no previous prototype for 'samsung_timer_init' [-Wmissing-prototypes]
180 | void __init samsung_timer_init(void)

---

Changes since v1:
1. Add review tag.

---
 arch/arm/mach-s3c24xx/common.h                | 12 +++++++++
 arch/arm/mach-s3c24xx/mach-amlm5900.c         |  2 --
 arch/arm/mach-s3c24xx/mach-anubis.c           |  1 -
 arch/arm/mach-s3c24xx/mach-at2440evb.c        |  1 -
 arch/arm/mach-s3c24xx/mach-bast.c             |  1 -
 arch/arm/mach-s3c24xx/mach-gta02.c            |  1 -
 arch/arm/mach-s3c24xx/mach-h1940.c            |  1 -
 arch/arm/mach-s3c24xx/mach-jive.c             |  1 -
 arch/arm/mach-s3c24xx/mach-mini2440.c         |  1 -
 arch/arm/mach-s3c24xx/mach-n30.c              |  1 -
 arch/arm/mach-s3c24xx/mach-nexcoder.c         |  1 -
 arch/arm/mach-s3c24xx/mach-osiris.c           |  1 -
 arch/arm/mach-s3c24xx/mach-otom.c             |  1 -
 arch/arm/mach-s3c24xx/mach-qt2410.c           |  1 -
 arch/arm/mach-s3c24xx/mach-rx1950.c           |  1 -
 arch/arm/mach-s3c24xx/mach-rx3715.c           |  1 -
 arch/arm/mach-s3c24xx/mach-smdk2410.c         |  1 -
 arch/arm/mach-s3c24xx/mach-smdk2413.c         |  1 -
 arch/arm/mach-s3c24xx/mach-smdk2416.c         |  1 -
 arch/arm/mach-s3c24xx/mach-smdk2440.c         |  1 -
 arch/arm/mach-s3c24xx/mach-smdk2443.c         |  1 -
 arch/arm/mach-s3c24xx/mach-tct_hammer.c       |  1 -
 arch/arm/mach-s3c24xx/mach-vr1000.c           |  1 -
 arch/arm/mach-s3c24xx/mach-vstms.c            |  1 -
 arch/arm/mach-s3c64xx/common.h                | 13 ++++++++++
 arch/arm/mach-s3c64xx/mach-anw6410.c          |  1 -
 arch/arm/mach-s3c64xx/mach-crag6410.c         |  1 -
 arch/arm/mach-s3c64xx/mach-hmt.c              |  1 -
 arch/arm/mach-s3c64xx/mach-mini6410.c         |  1 -
 arch/arm/mach-s3c64xx/mach-ncp.c              |  1 -
 arch/arm/mach-s3c64xx/mach-real6410.c         |  1 -
 arch/arm/mach-s3c64xx/mach-smartq.c           |  1 -
 arch/arm/mach-s3c64xx/mach-smartq5.c          |  1 -
 arch/arm/mach-s3c64xx/mach-smartq7.c          |  1 -
 arch/arm/mach-s3c64xx/mach-smdk6400.c         |  1 -
 arch/arm/mach-s3c64xx/mach-smdk6410.c         |  1 -
 .../plat-samsung/include/plat/samsung-time.h  | 26 -------------------
 37 files changed, 25 insertions(+), 61 deletions(-)
 delete mode 100644 arch/arm/plat-samsung/include/plat/samsung-time.h
arch/arm/mach-s3c24xx/common.h +12 -0
index 12d2a112eec7..8d2e2c6ae7eb 100644
@@ -108,4 +108,16 @@ extern struct platform_device s3c2443_device_dma;
 
 extern struct platform_device s3c2410_device_dclk;
 
+enum samsung_timer_mode {
+	SAMSUNG_PWM0,
+	SAMSUNG_PWM1,
+	SAMSUNG_PWM2,
+	SAMSUNG_PWM3,
+	SAMSUNG_PWM4,
+};
+
+extern void __init samsung_set_timer_source(enum samsung_timer_mode event,
+					    enum samsung_timer_mode source);
+extern void __init samsung_timer_init(void);
+
 #endif /* __ARCH_ARM_MACH_S3C24XX_COMMON_H */
arch/arm/mach-s3c24xx/mach-amlm5900.c +0 -2
index 9a9daf526d0c..623c320f8253 100644
@@ -45,8 +45,6 @@
 #include <linux/mtd/map.h>
 #include <linux/mtd/physmap.h>
 
-#include <plat/samsung-time.h>
-
 #include "common.h"
 
 static struct resource amlm5900_nor_resource =
arch/arm/mach-s3c24xx/mach-anubis.c +0 -1
index 072966dcad78..44338dfb5470 100644
@@ -44,7 +44,6 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <linux/platform_data/asoc-s3c24xx_simtec.h>
-#include <plat/samsung-time.h>
 
 #include "anubis.h"
 #include "common.h"
arch/arm/mach-s3c24xx/mach-at2440evb.c +0 -1
index 58c5ef3cf1d7..02ac2e240bd7 100644
@@ -43,7 +43,6 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <linux/platform_data/mmc-s3cmci.h>
-#include <plat/samsung-time.h>
 
 #include "common.h"
 
arch/arm/mach-s3c24xx/mach-bast.c +0 -1
index a7c3955ae8f6..cd67d00a46e4 100644
@@ -50,7 +50,6 @@
 #include <plat/cpu-freq.h>
 #include <plat/devs.h>
 #include <plat/gpio-cfg.h>
-#include <plat/samsung-time.h>
 
 #include "bast.h"
 #include "common.h"
arch/arm/mach-s3c24xx/mach-gta02.c +0 -1
index 594901f3b8e5..81d94a75d1c2 100644
@@ -67,7 +67,6 @@
 #include <plat/devs.h>
 #include <plat/gpio-cfg.h>
 #include <plat/pm.h>
-#include <plat/samsung-time.h>
 
 #include "common.h"
 #include "gta02.h"
arch/arm/mach-s3c24xx/mach-h1940.c +0 -1
index df652b332275..c09f61d35d57 100644
@@ -58,7 +58,6 @@
 #include <plat/devs.h>
 #include <plat/gpio-cfg.h>
 #include <plat/pm.h>
-#include <plat/samsung-time.h>
 
 #include "common.h"
 #include "h1940.h"
arch/arm/mach-s3c24xx/mach-jive.c +0 -1
index 885e8f12e4b9..2c630ade08bb 100644
@@ -48,7 +48,6 @@
 #include <plat/cpu.h>
 #include <plat/pm.h>
 #include <linux/platform_data/usb-s3c2410_udc.h>
-#include <plat/samsung-time.h>
 
 #include "common.h"
 #include "s3c2412-power.h"
arch/arm/mach-s3c24xx/mach-mini2440.c +0 -1
index 235749448311..936f7e3b7213 100644
@@ -52,7 +52,6 @@
 #include <plat/gpio-cfg.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/samsung-time.h>
 
 #include <sound/s3c24xx_uda134x.h>
 
arch/arm/mach-s3c24xx/mach-n30.c +0 -1
index 998ccff3c174..b9ceacfdd6ef 100644
@@ -48,7 +48,6 @@
 #include <plat/gpio-cfg.h>
 #include <linux/platform_data/mmc-s3cmci.h>
 #include <linux/platform_data/usb-s3c2410_udc.h>
-#include <plat/samsung-time.h>
 
 #include "common.h"
 
arch/arm/mach-s3c24xx/mach-nexcoder.c +0 -1
index c2f34758ccb6..92ecc15c4320 100644
@@ -40,7 +40,6 @@
 #include <plat/gpio-cfg.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/samsung-time.h>
 
 #include "common.h"
 
arch/arm/mach-s3c24xx/mach-osiris.c +0 -1
index ee3630cb236a..ed03928dffe4 100644
@@ -40,7 +40,6 @@
 #include <plat/cpu-freq.h>
 #include <plat/devs.h>
 #include <plat/gpio-cfg.h>
-#include <plat/samsung-time.h>
 
 #include <mach/hardware.h>
 #include <mach/regs-gpio.h>
arch/arm/mach-s3c24xx/mach-otom.c +0 -1
index 4e24d89e870b..d65c65ca1a38 100644
@@ -27,7 +27,6 @@
 
 #include <plat/cpu.h>
 #include <plat/devs.h>
-#include <plat/samsung-time.h>
 
 #include "common.h"
 #include "otom.h"
arch/arm/mach-s3c24xx/mach-qt2410.c +0 -1
index ff9e3197309b..2f3c8b31a08a 100644
@@ -44,7 +44,6 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/pm.h>
-#include <plat/samsung-time.h>
 
 #include "common.h"
 #include "common-smdk.h"
arch/arm/mach-s3c24xx/mach-rx1950.c +0 -1
index fde98b175c75..c46fb6b9e11a 100644
@@ -53,7 +53,6 @@
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <plat/pm.h>
-#include <plat/samsung-time.h>
 #include <plat/gpio-cfg.h>
 
 #include "common.h"
arch/arm/mach-s3c24xx/mach-rx3715.c +0 -1
index 995f1ff34a1b..740865ef8e23 100644
@@ -43,7 +43,6 @@
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <plat/pm.h>
-#include <plat/samsung-time.h>
 
 #include "common.h"
 #include "h1940.h"
arch/arm/mach-s3c24xx/mach-smdk2410.c +0 -1
index 18dfef52c8bf..1c2f20ab0520 100644
@@ -32,7 +32,6 @@
 
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/samsung-time.h>
 
 #include "common.h"
 #include "common-smdk.h"
arch/arm/mach-s3c24xx/mach-smdk2413.c +0 -1
index ca80167f268d..9782cc3e698c 100644
@@ -40,7 +40,6 @@
 
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/samsung-time.h>
 
 #include "common.h"
 #include "common-smdk.h"
arch/arm/mach-s3c24xx/mach-smdk2416.c +0 -1
index 61c3e45898d3..f98feb45568d 100644
@@ -44,7 +44,6 @@
 #include <plat/sdhci.h>
 #include <linux/platform_data/usb-s3c2410_udc.h>
 #include <linux/platform_data/s3c-hsudc.h>
-#include <plat/samsung-time.h>
 
 #include <plat/fb.h>
 
arch/arm/mach-s3c24xx/mach-smdk2440.c +0 -1
index 7bafcd8ea104..ebc184cd9aba 100644
@@ -35,7 +35,6 @@
 
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/samsung-time.h>
 
 #include "common.h"
 #include "common-smdk.h"
arch/arm/mach-s3c24xx/mach-smdk2443.c +0 -1
index 2358ed5ed7be..dcc4e446938a 100644
@@ -34,7 +34,6 @@
 
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/samsung-time.h>
 
 #include "common.h"
 #include "common-smdk.h"
arch/arm/mach-s3c24xx/mach-tct_hammer.c +0 -1
index 8d8ddd6ea305..e334ddf0832f 100644
@@ -36,7 +36,6 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/physmap.h>
-#include <plat/samsung-time.h>
 
 #include "common.h"
 
arch/arm/mach-s3c24xx/mach-vr1000.c +0 -1
index 6a3fb2becc7c..2f00217fa44e 100644
@@ -42,7 +42,6 @@
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <plat/gpio-cfg.h>
-#include <plat/samsung-time.h>
 
 #include "bast.h"
 #include "common.h"
arch/arm/mach-s3c24xx/mach-vstms.c +0 -1
index d76b28b65e65..9f479e28b8fd 100644
@@ -39,7 +39,6 @@
 
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/samsung-time.h>
 
 #include "common.h"
 
arch/arm/mach-s3c64xx/common.h +13 -0
index f4eca42cdc86..6fcfb0e0ffa5 100644
@@ -52,4 +52,17 @@ extern struct pl08x_platform_data s3c64xx_dma0_plat_data;
 extern struct pl08x_platform_data s3c64xx_dma1_plat_data;
 #endif
 
+/* Samsung HR-Timer Clock mode */
+enum samsung_timer_mode {
+	SAMSUNG_PWM0,
+	SAMSUNG_PWM1,
+	SAMSUNG_PWM2,
+	SAMSUNG_PWM3,
+	SAMSUNG_PWM4,
+};
+
+extern void __init samsung_set_timer_source(enum samsung_timer_mode event,
+					    enum samsung_timer_mode source);
+extern void __init samsung_timer_init(void);
+
 #endif /* __ARCH_ARM_MACH_S3C64XX_COMMON_H */
arch/arm/mach-s3c64xx/mach-anw6410.c +0 -1
index 0d3d5befb806..495549573d36 100644
@@ -44,7 +44,6 @@
 #include <mach/irqs.h>
 #include <mach/regs-gpio.h>
 #include <mach/gpio-samsung.h>
-#include <plat/samsung-time.h>
 
 #include "common.h"
 #include "regs-modem.h"
arch/arm/mach-s3c64xx/mach-crag6410.c +0 -1
index da9654255e3f..3cb43a33e3f8 100644
@@ -61,7 +61,6 @@
 #include <plat/adc.h>
 #include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/pm.h>
-#include <plat/samsung-time.h>
 
 #include "common.h"
 #include "crag6410.h"
arch/arm/mach-s3c64xx/mach-hmt.c +0 -1
index e7080215c624..cadb63103517 100644
@@ -39,7 +39,6 @@
 
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/samsung-time.h>
 
 #include "common.h"
 
arch/arm/mach-s3c64xx/mach-mini6410.c +0 -1
index 0dd36ae49e6a..77bad2891020 100644
@@ -39,7 +39,6 @@
 
 #include <video/platform_lcd.h>
 #include <video/samsung_fimd.h>
-#include <plat/samsung-time.h>
 
 #include "common.h"
 #include "regs-modem.h"
arch/arm/mach-s3c64xx/mach-ncp.c +0 -1
index 13fea5c86ca3..a7c328d32824 100644
@@ -36,7 +36,6 @@
 
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/samsung-time.h>
 
 #include "common.h"
 
arch/arm/mach-s3c64xx/mach-real6410.c +0 -1
index 0ff88b6859c4..993ce7bdd740 100644
@@ -38,7 +38,6 @@
 
 #include <video/platform_lcd.h>
 #include <video/samsung_fimd.h>
-#include <plat/samsung-time.h>
 
 #include "common.h"
 #include "regs-modem.h"
arch/arm/mach-s3c64xx/mach-smartq.c +0 -1
index 5025db607c0f..37d878909b17 100644
@@ -32,7 +32,6 @@
 #include <linux/platform_data/touchscreen-s3c2410.h>
 
 #include <video/platform_lcd.h>
-#include <plat/samsung-time.h>
 
 #include "common.h"
 #include "mach-smartq.h"
arch/arm/mach-s3c64xx/mach-smartq5.c +0 -1
index 44e9edb144fa..c1d173a97f2a 100644
@@ -23,7 +23,6 @@
 #include <plat/devs.h>
 #include <plat/fb.h>
 #include <plat/gpio-cfg.h>
-#include <plat/samsung-time.h>
 
 #include "common.h"
 #include "mach-smartq.h"
arch/arm/mach-s3c64xx/mach-smartq7.c +0 -1
index 815ee7d0b5e3..493fd8cd83eb 100644
@@ -23,7 +23,6 @@
 #include <plat/devs.h>
 #include <plat/fb.h>
 #include <plat/gpio-cfg.h>
-#include <plat/samsung-time.h>
 
 #include "common.h"
 #include "mach-smartq.h"
arch/arm/mach-s3c64xx/mach-smdk6400.c +0 -1
index cbd16843c7d1..76b676b6acbb 100644
@@ -30,7 +30,6 @@
 #include <plat/cpu.h>
 #include <linux/platform_data/i2c-s3c2410.h>
 #include <mach/gpio-samsung.h>
-#include <plat/samsung-time.h>
 
 #include "common.h"
 
arch/arm/mach-s3c64xx/mach-smdk6410.c +0 -1
index 56f406c0c3dd..3bd13701d01c 100644
@@ -64,7 +64,6 @@
 #include <plat/adc.h>
 #include <linux/platform_data/touchscreen-s3c2410.h>
 #include <plat/keypad.h>
-#include <plat/samsung-time.h>
 
 #include "backlight.h"
 #include "common.h"
arch/arm/plat-samsung/include/plat/samsung-time.h deleted +0 -26
deleted file mode 100644
index 32ab0860f631..000000000000
@@ -1,26 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Copyright 2011 Samsung Electronics Co., Ltd.
- *		http://www.samsung.com/
- *
- * Header file for samsung s3c and s5p time support
- */
-
-#ifndef __ASM_PLAT_SAMSUNG_TIME_H
-#define __ASM_PLAT_SAMSUNG_TIME_H __FILE__
-
-/* Samsung HR-Timer Clock mode */
-enum samsung_timer_mode {
-	SAMSUNG_PWM0,
-	SAMSUNG_PWM1,
-	SAMSUNG_PWM2,
-	SAMSUNG_PWM3,
-	SAMSUNG_PWM4,
-};
-
-extern void __init samsung_set_timer_source(enum samsung_timer_mode event,
-					enum samsung_timer_mode source);
-
-extern void __init samsung_timer_init(void);
-
-#endif /* __ASM_PLAT_SAMSUNG_TIME_H */
Signature · 1 line
2.17.1
author maintainer
#10 lore raw

PATCH v2 5/13 ARM: samsung: fix language typo

In reply to Krzysztof Kozlowski

Fix Complie -> Compile

---
 arch/arm/plat-samsung/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/plat-samsung/Kconfig +2 -2
index 301e572651c0..43a8b2bd16ff 100644
@@ -154,7 +154,7 @@ config S3C_DEV_WDT
 	bool
 	default y if ARCH_S3C24XX
 	help
-	  Complie in platform device definition for Watchdog Timer
+	  Compile in platform device definition for Watchdog Timer
 
 config S3C_DEV_NAND
 	bool
@@ -169,7 +169,7 @@ config S3C_DEV_ONENAND
 config S3C_DEV_RTC
 	bool
 	help
-	  Complie in platform device definition for RTC
+	  Compile in platform device definition for RTC
 
 config SAMSUNG_DEV_ADC
 	bool
Signature · 1 line
2.17.1
author maintainer
#12 lore raw

PATCH v2 6/13 ARM: samsung: remove HAVE_S3C2410_WATCHDOG and use direct dependencies

In reply to Krzysztof Kozlowski

A separate Kconfig option HAVE_S3C2410_WATCHDOG for Samsung SoCs is not really needed and the s3c24xx watchdog driver can depend on Samsung ARM architectures instead.

The "HAVE_xxx_WATCHDOG" pattern of dependency is not popular and Samsung platforms are here exceptions. All others just depend on CONFIG_ARCH_xxx.

This makes the code slightly smaller without any change in functionality.

---

Changes since v1:
1. Re-add the dependency on architectures to keep same functionality.

---
 arch/arm/Kconfig              |  1 -
 arch/arm/mach-exynos/Kconfig  |  1 -
 arch/arm/mach-s3c64xx/Kconfig |  2 --
 arch/arm/mach-s5pv210/Kconfig |  1 -
 arch/arm64/Kconfig.platforms  |  1 -
 drivers/watchdog/Kconfig      | 10 ++--------
 6 files changed, 2 insertions(+), 14 deletions(-)
arch/arm/Kconfig +0 -1
index 7564f293f107..fe95777af653 100644
@@ -504,7 +504,6 @@ config ARCH_S3C24XX
 	select GPIOLIB
 	select GENERIC_IRQ_MULTI_HANDLER
 	select HAVE_S3C2410_I2C if I2C
-	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_S3C_RTC if RTC_CLASS
 	select NEED_MACH_IO_H
 	select SAMSUNG_ATAGS
arch/arm/mach-exynos/Kconfig +0 -1
index f185cd3d4c62..d2d249706ebb 100644
@@ -24,7 +24,6 @@ menuconfig ARCH_EXYNOS
 	select HAVE_ARM_ARCH_TIMER if ARCH_EXYNOS5
 	select HAVE_ARM_SCU if SMP
 	select HAVE_S3C2410_I2C if I2C
-	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_S3C_RTC if RTC_CLASS
 	select PINCTRL
 	select PINCTRL_EXYNOS
arch/arm/mach-s3c64xx/Kconfig +0 -2
index ac3e3563487f..e208c2b48853 100644
@@ -13,7 +13,6 @@ menuconfig ARCH_S3C64XX
 	select GPIO_SAMSUNG if ATAGS
 	select GPIOLIB
 	select HAVE_S3C2410_I2C if I2C
-	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_TCM
 	select PLAT_SAMSUNG
 	select PM_GENERIC_DOMAINS if PM
@@ -165,7 +164,6 @@ config MACH_SMDK6410
 	bool "SMDK6410"
 	depends on ATAGS
 	select CPU_S3C6410
-	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select S3C64XX_SETUP_FB_24BPP
 	select S3C64XX_SETUP_I2C1
 	select S3C64XX_SETUP_IDE
arch/arm/mach-s5pv210/Kconfig +0 -1
index 03984a791879..b3db1191e437 100644
@@ -14,7 +14,6 @@ config ARCH_S5PV210
 	select COMMON_CLK_SAMSUNG
 	select GPIOLIB
 	select HAVE_S3C2410_I2C if I2C
-	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_S3C_RTC if RTC_CLASS
 	select PINCTRL
 	select PINCTRL_EXYNOS
arch/arm64/Kconfig.platforms +0 -1
index cd58f8495c45..d235b27cf372 100644
@@ -80,7 +80,6 @@ config ARCH_EXYNOS
 	select EXYNOS_CHIPID
 	select EXYNOS_PM_DOMAINS if PM_GENERIC_DOMAINS
 	select EXYNOS_PMU
-	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_S3C_RTC if RTC_CLASS
 	select PINCTRL
 	select PINCTRL_EXYNOS
drivers/watchdog/Kconfig +2 -8
index 4f4687c46d38..297af1c40643 100644
@@ -478,16 +478,10 @@ config IXP4XX_WATCHDOG
 
 	  Say N if you are unsure.
 
-config HAVE_S3C2410_WATCHDOG
-	bool
-	help
-	  This will include watchdog timer support for Samsung SoCs. If
-	  you want to include watchdog support for any machine, kindly
-	  select this in the respective mach-XXXX/Kconfig file.
-
 config S3C2410_WATCHDOG
 	tristate "S3C2410 Watchdog"
-	depends on HAVE_S3C2410_WATCHDOG || COMPILE_TEST
+	depends on ARCH_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210 || ARCH_EXYNOS || \
+		   COMPILE_TEST
 	select WATCHDOG_CORE
 	select MFD_SYSCON if ARCH_EXYNOS
 	help
Signature · 1 line
2.17.1
author maintainer
#13 lore raw

Re: [PATCH v2 06/13] ARM: samsung: remove HAVE_S3C2410_WATCHDOG and use direct dependencies

Quoted 11 lines · Krzysztof Kozlowski

A separate Kconfig option HAVE_S3C2410_WATCHDOG for Samsung SoCs is not really needed and the s3c24xx watchdog driver can depend on Samsung ARM architectures instead.

The "HAVE_xxx_WATCHDOG" pattern of dependency is not popular and Samsung platforms are here exceptions. All others just depend on CONFIG_ARCH_xxx.

This makes the code slightly smaller without any change in functionality.

Quoted 6 lines

---

Changes since v1:
1. Re-add the dependency on architectures to keep same functionality.

Hi Guenter, Tomasz,

Does such removal of HAVE_S3C2410_WATCHDOG makes sense for you?

Best regards,
Krzysztof

Quoted 103 lines
---
 arch/arm/Kconfig              |  1 -
 arch/arm/mach-exynos/Kconfig  |  1 -
 arch/arm/mach-s3c64xx/Kconfig |  2 --
 arch/arm/mach-s5pv210/Kconfig |  1 -
 arch/arm64/Kconfig.platforms  |  1 -
 drivers/watchdog/Kconfig      | 10 ++--------
 6 files changed, 2 insertions(+), 14 deletions(-)
arch/arm/Kconfig +0 -1
index 7564f293f107..fe95777af653 100644
@@ -504,7 +504,6 @@ config ARCH_S3C24XX
 	select GPIOLIB
 	select GENERIC_IRQ_MULTI_HANDLER
 	select HAVE_S3C2410_I2C if I2C
-	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_S3C_RTC if RTC_CLASS
 	select NEED_MACH_IO_H
 	select SAMSUNG_ATAGS
arch/arm/mach-exynos/Kconfig +0 -1
index f185cd3d4c62..d2d249706ebb 100644
@@ -24,7 +24,6 @@ menuconfig ARCH_EXYNOS
 	select HAVE_ARM_ARCH_TIMER if ARCH_EXYNOS5
 	select HAVE_ARM_SCU if SMP
 	select HAVE_S3C2410_I2C if I2C
-	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_S3C_RTC if RTC_CLASS
 	select PINCTRL
 	select PINCTRL_EXYNOS
arch/arm/mach-s3c64xx/Kconfig +0 -2
index ac3e3563487f..e208c2b48853 100644
@@ -13,7 +13,6 @@ menuconfig ARCH_S3C64XX
 	select GPIO_SAMSUNG if ATAGS
 	select GPIOLIB
 	select HAVE_S3C2410_I2C if I2C
-	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_TCM
 	select PLAT_SAMSUNG
 	select PM_GENERIC_DOMAINS if PM
@@ -165,7 +164,6 @@ config MACH_SMDK6410
 	bool "SMDK6410"
 	depends on ATAGS
 	select CPU_S3C6410
-	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select S3C64XX_SETUP_FB_24BPP
 	select S3C64XX_SETUP_I2C1
 	select S3C64XX_SETUP_IDE
arch/arm/mach-s5pv210/Kconfig +0 -1
index 03984a791879..b3db1191e437 100644
@@ -14,7 +14,6 @@ config ARCH_S5PV210
 	select COMMON_CLK_SAMSUNG
 	select GPIOLIB
 	select HAVE_S3C2410_I2C if I2C
-	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_S3C_RTC if RTC_CLASS
 	select PINCTRL
 	select PINCTRL_EXYNOS
arch/arm64/Kconfig.platforms +0 -1
index cd58f8495c45..d235b27cf372 100644
@@ -80,7 +80,6 @@ config ARCH_EXYNOS
 	select EXYNOS_CHIPID
 	select EXYNOS_PM_DOMAINS if PM_GENERIC_DOMAINS
 	select EXYNOS_PMU
-	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_S3C_RTC if RTC_CLASS
 	select PINCTRL
 	select PINCTRL_EXYNOS
drivers/watchdog/Kconfig +2 -8
index 4f4687c46d38..297af1c40643 100644
@@ -478,16 +478,10 @@ config IXP4XX_WATCHDOG
 
 	  Say N if you are unsure.
 
-config HAVE_S3C2410_WATCHDOG
-	bool
-	help
-	  This will include watchdog timer support for Samsung SoCs. If
-	  you want to include watchdog support for any machine, kindly
-	  select this in the respective mach-XXXX/Kconfig file.
-
 config S3C2410_WATCHDOG
 	tristate "S3C2410 Watchdog"
-	depends on HAVE_S3C2410_WATCHDOG || COMPILE_TEST
+	depends on ARCH_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210 || ARCH_EXYNOS || \
+		   COMPILE_TEST
 	select WATCHDOG_CORE
 	select MFD_SYSCON if ARCH_EXYNOS
 	help
Signature · 1 line
2.17.1

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#14 lore raw

Re: [PATCH v2 06/13] ARM: samsung: remove HAVE_S3C2410_WATCHDOG and use direct dependencies

2020年8月17日(月) 18:57 Krzysztof Kozlowski <[email protected]>:

Quoted 15 lines · Krzysztof Kozlowski
Quoted 13 lines

A separate Kconfig option HAVE_S3C2410_WATCHDOG for Samsung SoCs is not really needed and the s3c24xx watchdog driver can depend on Samsung ARM architectures instead.

The "HAVE_xxx_WATCHDOG" pattern of dependency is not popular and Samsung platforms are here exceptions. All others just depend on CONFIG_ARCH_xxx.

This makes the code slightly smaller without any change in functionality.

Quoted 8 lines
Quoted 4 lines

---

Changes since v1:
1. Re-add the dependency on architectures to keep same functionality.

Hi Guenter, Tomasz,

Does such removal of HAVE_S3C2410_WATCHDOG makes sense for you?

I don't have any objections and the patch itself is trivial.

Best regards,
Tomasz

maintainer Acked-by
#15 lore raw

Re: [PATCH v2 06/13] ARM: samsung: remove HAVE_S3C2410_WATCHDOG and use direct dependencies

In reply to Krzysztof Kozlowski
Quoted 14 lines · Krzysztof Kozlowski
Quoted 13 lines · Krzysztof Kozlowski

A separate Kconfig option HAVE_S3C2410_WATCHDOG for Samsung SoCs is not really needed and the s3c24xx watchdog driver can depend on Samsung ARM architectures instead.

The "HAVE_xxx_WATCHDOG" pattern of dependency is not popular and Samsung platforms are here exceptions. All others just depend on CONFIG_ARCH_xxx.

This makes the code slightly smaller without any change in functionality.

Quoted 9 lines
Quoted 4 lines

---

Changes since v1:
1. Re-add the dependency on architectures to keep same functionality.

Hi Guenter, Tomasz,

Does such removal of HAVE_S3C2410_WATCHDOG makes sense for you?

Umm ... answering the question, no, it doesn't make sense to me. If I were to immediately change all code under my "jurisdiction" whenever something runs out of favor, I'd do nothing else, and in this case the only real difference I can see is that the code will be more difficult to maintain going forward.

Having said that, I don't really care one way or another as long as the change does not result in compile failures for other architectures/platforms. With that in mind, feel free to add

to the patch.

Thanks,
Guenter

Quoted 107 lines

Best regards,
Krzysztof

Quoted 103 lines
---
 arch/arm/Kconfig              |  1 -
 arch/arm/mach-exynos/Kconfig  |  1 -
 arch/arm/mach-s3c64xx/Kconfig |  2 --
 arch/arm/mach-s5pv210/Kconfig |  1 -
 arch/arm64/Kconfig.platforms  |  1 -
 drivers/watchdog/Kconfig      | 10 ++--------
 6 files changed, 2 insertions(+), 14 deletions(-)
arch/arm/Kconfig +0 -1
index 7564f293f107..fe95777af653 100644
@@ -504,7 +504,6 @@ config ARCH_S3C24XX
 	select GPIOLIB
 	select GENERIC_IRQ_MULTI_HANDLER
 	select HAVE_S3C2410_I2C if I2C
-	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_S3C_RTC if RTC_CLASS
 	select NEED_MACH_IO_H
 	select SAMSUNG_ATAGS
arch/arm/mach-exynos/Kconfig +0 -1
index f185cd3d4c62..d2d249706ebb 100644
@@ -24,7 +24,6 @@ menuconfig ARCH_EXYNOS
 	select HAVE_ARM_ARCH_TIMER if ARCH_EXYNOS5
 	select HAVE_ARM_SCU if SMP
 	select HAVE_S3C2410_I2C if I2C
-	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_S3C_RTC if RTC_CLASS
 	select PINCTRL
 	select PINCTRL_EXYNOS
arch/arm/mach-s3c64xx/Kconfig +0 -2
index ac3e3563487f..e208c2b48853 100644
@@ -13,7 +13,6 @@ menuconfig ARCH_S3C64XX
 	select GPIO_SAMSUNG if ATAGS
 	select GPIOLIB
 	select HAVE_S3C2410_I2C if I2C
-	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_TCM
 	select PLAT_SAMSUNG
 	select PM_GENERIC_DOMAINS if PM
@@ -165,7 +164,6 @@ config MACH_SMDK6410
 	bool "SMDK6410"
 	depends on ATAGS
 	select CPU_S3C6410
-	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select S3C64XX_SETUP_FB_24BPP
 	select S3C64XX_SETUP_I2C1
 	select S3C64XX_SETUP_IDE
arch/arm/mach-s5pv210/Kconfig +0 -1
index 03984a791879..b3db1191e437 100644
@@ -14,7 +14,6 @@ config ARCH_S5PV210
 	select COMMON_CLK_SAMSUNG
 	select GPIOLIB
 	select HAVE_S3C2410_I2C if I2C
-	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_S3C_RTC if RTC_CLASS
 	select PINCTRL
 	select PINCTRL_EXYNOS
arch/arm64/Kconfig.platforms +0 -1
index cd58f8495c45..d235b27cf372 100644
@@ -80,7 +80,6 @@ config ARCH_EXYNOS
 	select EXYNOS_CHIPID
 	select EXYNOS_PM_DOMAINS if PM_GENERIC_DOMAINS
 	select EXYNOS_PMU
-	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_S3C_RTC if RTC_CLASS
 	select PINCTRL
 	select PINCTRL_EXYNOS
drivers/watchdog/Kconfig +2 -8
index 4f4687c46d38..297af1c40643 100644
@@ -478,16 +478,10 @@ config IXP4XX_WATCHDOG
 
 	  Say N if you are unsure.
 
-config HAVE_S3C2410_WATCHDOG
-	bool
-	help
-	  This will include watchdog timer support for Samsung SoCs. If
-	  you want to include watchdog support for any machine, kindly
-	  select this in the respective mach-XXXX/Kconfig file.
-
 config S3C2410_WATCHDOG
 	tristate "S3C2410 Watchdog"
-	depends on HAVE_S3C2410_WATCHDOG || COMPILE_TEST
+	depends on ARCH_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210 || ARCH_EXYNOS || \
+		   COMPILE_TEST
 	select WATCHDOG_CORE
 	select MFD_SYSCON if ARCH_EXYNOS
 	help
Signature · 1 line
2.17.1
author maintainer Applied
#16 lore raw

Re: [PATCH v2 06/13] ARM: samsung: remove HAVE_S3C2410_WATCHDOG and use direct dependencies

In reply to Krzysztof Kozlowski
Quoted 11 lines · Krzysztof Kozlowski

A separate Kconfig option HAVE_S3C2410_WATCHDOG for Samsung SoCs is not really needed and the s3c24xx watchdog driver can depend on Samsung ARM architectures instead.

The "HAVE_xxx_WATCHDOG" pattern of dependency is not popular and Samsung platforms are here exceptions. All others just depend on CONFIG_ARCH_xxx.

This makes the code slightly smaller without any change in functionality.

Applied.

Best regards,
Krzysztof

author maintainer
#17 lore raw

PATCH v2 7/13 ARM: s3c64xx: switch to generic watchdog driver reset

In reply to Krzysztof Kozlowski

Similarly to commit f6361c6b3880 ("ARM: S3C24XX: remove separate restart code"), the platform watchdog reset code can be removed in favor of a generic watchdog driver which already handles reset.

This allows removal of a bunch of machine code and fixes also W=1 compile warnings:

arch/arm/plat-samsung/watchdog-reset.c:29:6: warning: no previous prototype for 'samsung_wdt_reset' [-Wmissing-prototypes]
29 | void samsung_wdt_reset(void)
arch/arm/plat-samsung/watchdog-reset.c:69:13: warning: no previous prototype for 'samsung_wdt_reset_of_init' [-Wmissing-prototypes]
69 | void __init samsung_wdt_reset_of_init(void)
arch/arm/plat-samsung/watchdog-reset.c:89:13: warning: no previous prototype for 'samsung_wdt_reset_init' [-Wmissing-prototypes]
89 | void __init samsung_wdt_reset_init(void __iomem *base)

The generic watchdog-based system reset is not exactly the same as before. The previous method had a fallback to soft_restart() which now is gone.

The commit also removes a FIXME note about calling s3c64xx_clk_init() inside s3c64xx_init_irq(). No one fixed this since long time and the note is not meaningful anymore because watchdog part is removed.

---

Changes since v1:
1. Drop FIXME note and update commit msg, after talks with Tomasz,
2. Add Tomasz's review tag.

---
 arch/arm/mach-s3c64xx/Kconfig           |  3 +-
 arch/arm/mach-s3c64xx/common.c          | 16 -----
 arch/arm/mach-s3c64xx/common.h          |  2 -
 arch/arm/mach-s3c64xx/mach-anw6410.c    |  1 -
 arch/arm/mach-s3c64xx/mach-crag6410.c   |  1 -
 arch/arm/mach-s3c64xx/mach-hmt.c        |  1 -
 arch/arm/mach-s3c64xx/mach-mini6410.c   |  1 -
 arch/arm/mach-s3c64xx/mach-ncp.c        |  1 -
 arch/arm/mach-s3c64xx/mach-real6410.c   |  1 -
 arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c | 17 -----
 arch/arm/mach-s3c64xx/mach-smartq5.c    |  1 -
 arch/arm/mach-s3c64xx/mach-smartq7.c    |  1 -
 arch/arm/mach-s3c64xx/mach-smdk6400.c   |  1 -
 arch/arm/mach-s3c64xx/mach-smdk6410.c   |  1 -
 arch/arm/mach-s3c64xx/watchdog-reset.h  | 16 -----
 arch/arm/plat-samsung/Kconfig           |  6 --
 arch/arm/plat-samsung/Makefile          |  1 -
 arch/arm/plat-samsung/watchdog-reset.c  | 93 -------------------------
 18 files changed, 2 insertions(+), 162 deletions(-)
 delete mode 100644 arch/arm/mach-s3c64xx/watchdog-reset.h
 delete mode 100644 arch/arm/plat-samsung/watchdog-reset.c
arch/arm/mach-s3c64xx/Kconfig +2 -1
index e208c2b48853..f3fcb570edf5 100644
@@ -18,9 +18,10 @@ menuconfig ARCH_S3C64XX
 	select PM_GENERIC_DOMAINS if PM
 	select S3C_DEV_NAND if ATAGS
 	select S3C_GPIO_TRACK if ATAGS
+	select S3C2410_WATCHDOG
 	select SAMSUNG_ATAGS if ATAGS
 	select SAMSUNG_WAKEMASK if PM
-	select SAMSUNG_WDT_RESET
+	select WATCHDOG
 	help
 	  Samsung S3C64XX series based systems
 
arch/arm/mach-s3c64xx/common.c +0 -16
index a655bf0c7802..c9c20256488b 100644
@@ -50,7 +50,6 @@
 
 #include "common.h"
 #include "irq-uart.h"
-#include "watchdog-reset.h"
 
 /* External clock frequency */
 static unsigned long xtal_f __ro_after_init = 12000000;
@@ -229,13 +228,7 @@ core_initcall(s3c64xx_dev_init);
 
 void __init s3c64xx_init_irq(u32 vic0_valid, u32 vic1_valid)
 {
-	/*
-	 * FIXME: there is no better place to put this at the moment
-	 * (s3c64xx_clk_init needs ioremap and must happen before init_time
-	 * samsung_wdt_reset_init needs clocks)
-	 */
 	s3c64xx_clk_init(NULL, xtal_f, xusbxti_f, soc_is_s3c6400(), S3C_VA_SYS);
-	samsung_wdt_reset_init(S3C_VA_WATCHDOG);
 
 	printk(KERN_DEBUG "%s: initialising interrupts\n", __func__);
 
@@ -429,12 +422,3 @@ static int __init s3c64xx_init_irq_eint(void)
 	return 0;
 }
 arch_initcall(s3c64xx_init_irq_eint);
-
-void s3c64xx_restart(enum reboot_mode mode, const char *cmd)
-{
-	if (mode != REBOOT_SOFT)
-		samsung_wdt_reset();
-
-	/* if all else fails, or mode was for soft, jump to 0 */
-	soft_restart(0);
-}
arch/arm/mach-s3c64xx/common.h +0 -2
index 6fcfb0e0ffa5..567bf3017171 100644
@@ -19,8 +19,6 @@
 void s3c64xx_init_irq(u32 vic0, u32 vic1);
 void s3c64xx_init_io(struct map_desc *mach_desc, int size);
 
-void s3c64xx_restart(enum reboot_mode mode, const char *cmd);
-
 struct device_node;
 void s3c64xx_set_xtal_freq(unsigned long freq);
 void s3c64xx_set_xusbxti_freq(unsigned long freq);
arch/arm/mach-s3c64xx/mach-anw6410.c +0 -1
index 495549573d36..e783f5b3593a 100644
@@ -228,5 +228,4 @@ MACHINE_START(ANW6410, "A&W6410")
 	.map_io		= anw6410_map_io,
 	.init_machine	= anw6410_machine_init,
 	.init_time	= samsung_timer_init,
-	.restart	= s3c64xx_restart,
 MACHINE_END
arch/arm/mach-s3c64xx/mach-crag6410.c +0 -1
index 3cb43a33e3f8..223a3d51d8b6 100644
@@ -877,5 +877,4 @@ MACHINE_START(WLF_CRAGG_6410, "Wolfson Cragganmore 6410")
 	.map_io		= crag6410_map_io,
 	.init_machine	= crag6410_machine_init,
 	.init_time	= samsung_timer_init,
-	.restart	= s3c64xx_restart,
 MACHINE_END
arch/arm/mach-s3c64xx/mach-hmt.c +0 -1
index cadb63103517..ad15260c12b4 100644
@@ -280,5 +280,4 @@ MACHINE_START(HMT, "Airgoo-HMT")
 	.map_io		= hmt_map_io,
 	.init_machine	= hmt_machine_init,
 	.init_time	= samsung_timer_init,
-	.restart	= s3c64xx_restart,
 MACHINE_END
arch/arm/mach-s3c64xx/mach-mini6410.c +0 -1
index 77bad2891020..636d312add81 100644
@@ -362,5 +362,4 @@ MACHINE_START(MINI6410, "MINI6410")
 	.map_io		= mini6410_map_io,
 	.init_machine	= mini6410_machine_init,
 	.init_time	= samsung_timer_init,
-	.restart	= s3c64xx_restart,
 MACHINE_END
arch/arm/mach-s3c64xx/mach-ncp.c +0 -1
index a7c328d32824..0a67ff173575 100644
@@ -98,5 +98,4 @@ MACHINE_START(NCP, "NCP")
 	.map_io		= ncp_map_io,
 	.init_machine	= ncp_machine_init,
 	.init_time	= samsung_timer_init,
-	.restart	= s3c64xx_restart,
 MACHINE_END
arch/arm/mach-s3c64xx/mach-real6410.c +0 -1
index 993ce7bdd740..56fc21f02c7b 100644
@@ -330,5 +330,4 @@ MACHINE_START(REAL6410, "REAL6410")
 	.map_io		= real6410_map_io,
 	.init_machine	= real6410_machine_init,
 	.init_time	= samsung_timer_init,
-	.restart	= s3c64xx_restart,
 MACHINE_END
arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c +0 -17
index 1724f5ea5c46..09c4e8742629 100644
@@ -12,7 +12,6 @@
 #include <mach/map.h>
 
 #include "common.h"
-#include "watchdog-reset.h"
 
 /*
  * IO mapping for shared system controller IP.
@@ -39,20 +38,6 @@ static void __init s3c64xx_dt_map_io(void)
 		panic("SoC is not S3C64xx!");
 }
 
-static void __init s3c64xx_dt_init_machine(void)
-{
-	samsung_wdt_reset_of_init();
-}
-
-static void s3c64xx_dt_restart(enum reboot_mode mode, const char *cmd)
-{
-	if (mode != REBOOT_SOFT)
-		samsung_wdt_reset();
-
-	/* if all else fails, or mode was for soft, jump to 0 */
-	soft_restart(0);
-}
-
 static const char *const s3c64xx_dt_compat[] __initconst = {
 	"samsung,s3c6400",
 	"samsung,s3c6410",
@@ -63,6 +48,4 @@ DT_MACHINE_START(S3C6400_DT, "Samsung S3C64xx (Flattened Device Tree)")
 	/* Maintainer: Tomasz Figa <[email protected]> */
 	.dt_compat	= s3c64xx_dt_compat,
 	.map_io		= s3c64xx_dt_map_io,
-	.init_machine	= s3c64xx_dt_init_machine,
-	.restart        = s3c64xx_dt_restart,
 MACHINE_END
arch/arm/mach-s3c64xx/mach-smartq5.c +0 -1
index c1d173a97f2a..789876a20534 100644
@@ -151,5 +151,4 @@ MACHINE_START(SMARTQ5, "SmartQ 5")
 	.map_io		= smartq_map_io,
 	.init_machine	= smartq5_machine_init,
 	.init_time	= samsung_timer_init,
-	.restart	= s3c64xx_restart,
 MACHINE_END
arch/arm/mach-s3c64xx/mach-smartq7.c +0 -1
index 493fd8cd83eb..d004e34b63bb 100644
@@ -167,5 +167,4 @@ MACHINE_START(SMARTQ7, "SmartQ 7")
 	.map_io		= smartq_map_io,
 	.init_machine	= smartq7_machine_init,
 	.init_time	= samsung_timer_init,
-	.restart	= s3c64xx_restart,
 MACHINE_END
arch/arm/mach-s3c64xx/mach-smdk6400.c +0 -1
index 76b676b6acbb..d24899dd3883 100644
@@ -88,5 +88,4 @@ MACHINE_START(SMDK6400, "SMDK6400")
 	.map_io		= smdk6400_map_io,
 	.init_machine	= smdk6400_machine_init,
 	.init_time	= samsung_timer_init,
-	.restart	= s3c64xx_restart,
 MACHINE_END
arch/arm/mach-s3c64xx/mach-smdk6410.c +0 -1
index 3bd13701d01c..104548fb192a 100644
@@ -704,5 +704,4 @@ MACHINE_START(SMDK6410, "SMDK6410")
 	.map_io		= smdk6410_map_io,
 	.init_machine	= smdk6410_machine_init,
 	.init_time	= samsung_timer_init,
-	.restart	= s3c64xx_restart,
 MACHINE_END
arch/arm/mach-s3c64xx/watchdog-reset.h deleted +0 -16
deleted file mode 100644
index 1042d6c463dc..000000000000
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Copyright (c) 2008 Simtec Electronics
- *	Ben Dooks <[email protected]>
- *
- * S3C2410 - System define for arch_reset() function
- */
-
-#ifndef __PLAT_SAMSUNG_WATCHDOG_RESET_H
-#define __PLAT_SAMSUNG_WATCHDOG_RESET_H
-
-extern void samsung_wdt_reset(void);
-extern void samsung_wdt_reset_of_init(void);
-extern void samsung_wdt_reset_init(void __iomem *base);
-
-#endif /* __PLAT_SAMSUNG_WATCHDOG_RESET_H */
arch/arm/plat-samsung/Kconfig +0 -6
index 43a8b2bd16ff..3aca01067b3c 100644
@@ -290,12 +290,6 @@ config SAMSUNG_WAKEMASK
 	  and above. This code allows a set of interrupt to wakeup-mask
 	  mappings. See <plat/wakeup-mask.h>
 
-config SAMSUNG_WDT_RESET
-	bool
-	help
-	  Compile support for system restart by triggering watchdog reset.
-	  Used on SoCs that do not provide dedicated reset control.
-
 config DEBUG_S3C_UART
 	depends on PLAT_SAMSUNG
 	int
arch/arm/plat-samsung/Makefile +0 -1
index 3db9d2c38258..ce339a96fbf7 100644
@@ -32,4 +32,3 @@ obj-$(CONFIG_SAMSUNG_PM_CHECK)	+= pm-check.o
 obj-$(CONFIG_SAMSUNG_PM_DEBUG)	+= pm-debug.o
 
 obj-$(CONFIG_SAMSUNG_WAKEMASK)	+= wakeup-mask.o
-obj-$(CONFIG_SAMSUNG_WDT_RESET)	+= watchdog-reset.o
arch/arm/plat-samsung/watchdog-reset.c deleted +0 -93

93 lines not on this page · raw message

Signature · 1 line
2.17.1
author maintainer Applied
#18 lore raw

Re: [PATCH v2 07/13] ARM: s3c64xx: switch to generic watchdog driver reset

Quoted 18 lines · Krzysztof Kozlowski

Similarly to commit f6361c6b3880 ("ARM: S3C24XX: remove separate restart code"), the platform watchdog reset code can be removed in favor of a generic watchdog driver which already handles reset.

This allows removal of a bunch of machine code and fixes also W=1 compile warnings:

arch/arm/plat-samsung/watchdog-reset.c:29:6: warning: no previous prototype for 'samsung_wdt_reset' [-Wmissing-prototypes]
29 | void samsung_wdt_reset(void)
arch/arm/plat-samsung/watchdog-reset.c:69:13: warning: no previous prototype for 'samsung_wdt_reset_of_init' [-Wmissing-prototypes]
69 | void __init samsung_wdt_reset_of_init(void)
arch/arm/plat-samsung/watchdog-reset.c:89:13: warning: no previous prototype for 'samsung_wdt_reset_init' [-Wmissing-prototypes]
89 | void __init samsung_wdt_reset_init(void __iomem *base)

The generic watchdog-based system reset is not exactly the same as before. The previous method had a fallback to soft_restart() which now is gone.

Quoted 6 lines

The commit also removes a FIXME note about calling s3c64xx_clk_init() inside s3c64xx_init_irq(). No one fixed this since long time and the note is not meaningful anymore because watchdog part is removed.

Applied.

Best regards,
Krzysztof

author maintainer
#19 lore raw

PATCH v2 8/13 ARM: s3c24xx: fix missing system reset

In reply to Krzysztof Kozlowski

Commit f6361c6b3880 ("ARM: S3C24XX: remove separate restart code") removed usage of the watchdog reset platform code in favor of the Samsung SoC watchdog driver. However the latter was not selected thus S3C24xx platforms lost reset abilities.

Fixes f6361c6b3880 ("ARM: S3C24XX: remove separate restart code")
---
 arch/arm/Kconfig | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/Kconfig +2 -0
index fe95777af653..063018c387be 100644
@@ -506,8 +506,10 @@ config ARCH_S3C24XX
 	select HAVE_S3C2410_I2C if I2C
 	select HAVE_S3C_RTC if RTC_CLASS
 	select NEED_MACH_IO_H
+	select S3C2410_WATCHDOG
 	select SAMSUNG_ATAGS
 	select USE_OF
+	select WATCHDOG
 	help
 	  Samsung S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443
 	  and S3C2450 SoCs based systems, such as the Simtec Electronics BAST
Signature · 1 line
2.17.1
author maintainer Applied
#20 lore raw

Re: [PATCH v2 08/13] ARM: s3c24xx: fix missing system reset

Quoted 10 lines · Krzysztof Kozlowski

Commit f6361c6b3880 ("ARM: S3C24XX: remove separate restart code") removed usage of the watchdog reset platform code in favor of the Samsung SoC watchdog driver. However the latter was not selected thus S3C24xx platforms lost reset abilities.

Fixes f6361c6b3880 ("ARM: S3C24XX: remove separate restart code")
---
 arch/arm/Kconfig | 2 ++

Applied.

Best regards,
Krzysztof

author maintainer
#21 lore raw

PATCH v2 9/13 ARM: s3c24xx: include common.h header in s3c2443.c

In reply to Krzysztof Kozlowski

Include common.h header in the s3c2443.c to bring the prototypes of defined functions and fix W=1 compile warnings:

    arch/arm/mach-s3c24xx/s3c2443.c:60:12: warning: no previous prototype for 's3c2443_init' [-Wmissing-prototypes]
       60 | int __init s3c2443_init(void)
    arch/arm/mach-s3c24xx/s3c2443.c:77:13: warning: no previous prototype for 's3c2443_init_uarts' [-Wmissing-prototypes]
       77 | void __init s3c2443_init_uarts(struct s3c2410_uartcfg *cfg, int no)
    arch/arm/mach-s3c24xx/s3c2443.c:88:13: warning: no previous prototype for 's3c2443_map_io' [-Wmissing-prototypes]
       88 | void __init s3c2443_map_io(void)

---

Changes since v1:
1. New patch

---
 arch/arm/mach-s3c24xx/s3c2443.c | 1 +
 1 file changed, 1 insertion(+)
arch/arm/mach-s3c24xx/s3c2443.c +1 -0
index 4cbeb74cf3d6..c278cfc10ba5 100644
@@ -38,6 +38,7 @@
 #include <plat/cpu.h>
 #include <plat/adc-core.h>
 
+#include "common.h"
 #include "fb-core.h"
 #include "nand-core.h"
 #include "spi-core.h"
Signature · 1 line
2.17.1
author maintainer
#22 lore raw

PATCH v2 10/13 ARM: s3c24xx: sdhci: include plat/sdhci.h header

In reply to Krzysztof Kozlowski

Include plat/sdhci.h header in the sdhci code to bring the prototypes of defined functions and fix W=1 compile warnings:

arch/arm/mach-s3c24xx/setup-sdhci-gpio.c:21:6: warning: no previous prototype for 's3c2416_setup_sdhci0_cfg_gpio' [-Wmissing-prototypes]
21 | void s3c2416_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
arch/arm/mach-s3c24xx/setup-sdhci-gpio.c:26:6: warning: no previous prototype for 's3c2416_setup_sdhci1_cfg_gpio' [-Wmissing-prototypes]
26 | void s3c2416_setup_sdhci1_cfg_gpio(struct platform_device *dev, int width)

---

Changes since v1:
1. New patch

---
 arch/arm/mach-s3c24xx/setup-sdhci-gpio.c | 1 +
 1 file changed, 1 insertion(+)
arch/arm/mach-s3c24xx/setup-sdhci-gpio.c +1 -0
index 218346a36d1e..ff5c0a51ded5 100644
@@ -17,6 +17,7 @@
 #include <mach/regs-gpio.h>
 #include <mach/gpio-samsung.h>
 #include <plat/gpio-cfg.h>
+#include <plat/sdhci.h>
 
 void s3c2416_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
 {
Signature · 1 line
2.17.1
author maintainer
#23 lore raw

PATCH v2 11/13 ARM: s3c24xx: ts: include platform data header

In reply to Krzysztof Kozlowski

Include platform_data/touchscreen-s3c2410.h header in the touchscreen code to bring the prototypes of defined functions and fix W=1 compile warning:

arch/arm/mach-s3c24xx/setup-ts.c:24:6: warning: no previous prototype for 's3c24xx_ts_cfg_gpio' [-Wmissing-prototypes]
24 | void s3c24xx_ts_cfg_gpio(struct platform_device *dev)

---

Changes since v1:
1. New patch

---
 arch/arm/mach-s3c24xx/setup-ts.c | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/mach-s3c24xx/setup-ts.c +2 -0
index 53a14d4f4852..bf1a7fcf465f 100644
@@ -10,6 +10,8 @@
 
 struct platform_device; /* don't need the contents */
 
+#include <linux/platform_data/touchscreen-s3c2410.h>
+
 #include <plat/gpio-cfg.h>
 #include <mach/hardware.h>
 #include <mach/gpio-samsung.h>
Signature · 1 line
2.17.1
author maintainer
#24 lore raw

PATCH v2 12/13 ARM: s3c24xx: ts: document function argument

In reply to Krzysztof Kozlowski

Document function argument in kerneldoc comment to fix W=1 compile warning:

arch/arm/mach-s3c24xx/setup-ts.c:27: warning: Function parameter or member 'dev' not described in 's3c24xx_ts_cfg_gpio'

---

Changes since v1:
1. New patch

---
 arch/arm/mach-s3c24xx/setup-ts.c | 1 +
 1 file changed, 1 insertion(+)
arch/arm/mach-s3c24xx/setup-ts.c +1 -0
index bf1a7fcf465f..272d65400b71 100644
@@ -18,6 +18,7 @@ struct platform_device; /* don't need the contents */
 
 /**
  * s3c24xx_ts_cfg_gpio - configure gpio for s3c2410 systems
+ * @dev: Device to configure GPIO for (ignored)
  *
  * Configure the GPIO for the S3C2410 system, where we have external FETs
  * connected to the device (later systems such as the S3C2440 integrate
Signature · 1 line
2.17.1
author maintainer
#25 lore raw

PATCH v2 13/13 ARM: s3c24xx: camif: include header with prototypes and unify declaration

In reply to Krzysztof Kozlowski

The s3c_camif_gpio_put() declaration in include/media/drv-intf/s3c_camif.h header was different than definition. Fixing this allows to include that header to also fix the W=1 compile warnings:

arch/arm/mach-s3c24xx/setup-camif.c:28:5: warning: no previous prototype for 's3c_camif_gpio_get' [-Wmissing-prototypes]
28 | int s3c_camif_gpio_get(void)
arch/arm/mach-s3c24xx/setup-camif.c:56:6: warning: no previous prototype for 's3c_camif_gpio_put' [-Wmissing-prototypes]
56 | void s3c_camif_gpio_put(void)

---

Changes since v1:
1. New patch

---
 arch/arm/mach-s3c24xx/setup-camif.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
arch/arm/mach-s3c24xx/setup-camif.c +4 -1
index 2b262fae3f61..4046afaad645 100644
@@ -7,6 +7,7 @@
 #include <linux/gpio.h>
 #include <plat/gpio-cfg.h>
 #include <mach/gpio-samsung.h>
+#include <media/drv-intf/s3c_camif.h>
 
 /* Number of camera port pins, without FIELD */
 #define S3C_CAMIF_NUM_GPIOS	13
@@ -53,7 +54,7 @@ int s3c_camif_gpio_get(void)
 	return 0;
 }
 
-void s3c_camif_gpio_put(void)
+int s3c_camif_gpio_put(void)
 {
 	int i, gpio_start, gpio_reset;
 
@@ -64,4 +65,6 @@ void s3c_camif_gpio_put(void)
 		if (gpio != gpio_reset)
 			gpio_free(gpio);
 	}
+
+	return 0;
 }
Signature · 1 line
2.17.1
maintainer
#26 lore raw

Re: [PATCH v2 13/13] ARM: s3c24xx: camif: include header with prototypes and unify declaration

Quoting Krzysztof Kozlowski (2020-08-04 12:26:54)

Quoted 9 lines

The s3c_camif_gpio_put() declaration in include/media/drv-intf/s3c_camif.h header was different than definition. Fixing this allows to include that header to also fix the W=1 compile warnings:

arch/arm/mach-s3c24xx/setup-camif.c:28:5: warning: no previous prototype for 's3c_camif_gpio_get' [-Wmissing-prototypes]
28 | int s3c_camif_gpio_get(void)
arch/arm/mach-s3c24xx/setup-camif.c:56:6: warning: no previous prototype for 's3c_camif_gpio_put' [-Wmissing-prototypes]
56 | void s3c_camif_gpio_put(void)

Maybe it should have been void all along?

#27 lore raw

Re: [PATCH v2 13/13] ARM: s3c24xx: camif: include header with prototypes and unify declaration

Quoted 6 lines · Stephen Boyd

Quoting Krzysztof Kozlowski (2020-08-04 12:26:54)

Quoted 5 lines

The s3c_camif_gpio_put() declaration in include/media/drv-intf/s3c_camif.h header was different than definition. Fixing this allows to include that header to also fix the W=1 compile warnings:

Quoted 6 lines
Quoted 4 lines

arch/arm/mach-s3c24xx/setup-camif.c:28:5: warning: no previous prototype for 's3c_camif_gpio_get' [-Wmissing-prototypes]
28 | int s3c_camif_gpio_get(void)
arch/arm/mach-s3c24xx/setup-camif.c:56:6: warning: no previous prototype for 's3c_camif_gpio_put' [-Wmissing-prototypes]
56 | void s3c_camif_gpio_put(void)

Maybe it should have been void all along?

It seems there have never been any callers and the entire file can just be removed, with the rest of that platform_data header file moved to drivers/media/platform/s3c-camif/.

Arnd

#28 lore raw

Re: [PATCH v2 13/13] ARM: s3c24xx: camif: include header with prototypes and unify declaration

Quoted 12 lines · Arnd Bergmann
Quoted 11 lines · Stephen Boyd

Quoting Krzysztof Kozlowski (2020-08-04 12:26:54)

Quoted 9 lines

The s3c_camif_gpio_put() declaration in include/media/drv-intf/s3c_camif.h header was different than definition. Fixing this allows to include that header to also fix the W=1 compile warnings:

arch/arm/mach-s3c24xx/setup-camif.c:28:5: warning: no previous prototype for 's3c_camif_gpio_get' [-Wmissing-prototypes]
28 | int s3c_camif_gpio_get(void)
arch/arm/mach-s3c24xx/setup-camif.c:56:6: warning: no previous prototype for 's3c_camif_gpio_put' [-Wmissing-prototypes]
56 | void s3c_camif_gpio_put(void)

Quoted 5 lines
Quoted 1 line

Maybe it should have been void all along?

It seems there have never been any callers and the entire file can just be removed, with the rest of that platform_data header file moved to drivers/media/platform/s3c-camif/.

Yes, it seems that patch never made it to mainline:
https://git.linuxtv.org/snawrocki/media.git/commit/?h=testing/s3c-camif&id=355cbf835aff2aabf78390931cbbaa608af77967

I doubt there are still users of camera on the s3c2440 boards with current mainline kernels, if any at all, there are much better HW alternatives right now.

#29 lore raw

Re: [PATCH v2 13/13] ARM: s3c24xx: camif: include header with prototypes and unify declaration

Quoted 8 lines · Sylwester Nawrocki
Quoted 4 lines · Arnd Bergmann

It seems there have never been any callers and the entire file can just be removed, with the rest of that platform_data header file moved to drivers/media/platform/s3c-camif/.

Yes, it seems that patch never made it to mainline:
https://git.linuxtv.org/snawrocki/media.git/commit/?h=testing/s3c-camif&id=355cbf835aff2aabf78390931cbbaa608af77967

I suppose it would still apply if anyone was interested, but I see your point.

Quoted 3 lines

I doubt there are still users of camera on the s3c2440 boards with current mainline kernels, if any at all, there are much better HW alternatives right now.

I see two board files (and no DT) instantiate the camif device:
NexVision Nexcoder 2440 and the FriendlyARM mini2440.

Can you say whether the camif on those would actually work at all without your patch? If not, we know that there are no users of that driver and could either drop it completely or move it to staging for a release or two.

Arnd

#30 lore raw

Re: [PATCH v2 13/13] ARM: s3c24xx: camif: include header with prototypes and unify declaration

Quoted 18 lines · Arnd Bergmann
Quoted 8 lines · Sylwester Nawrocki
Quoted 4 lines · Arnd Bergmann

It seems there have never been any callers and the entire file can just be removed, with the rest of that platform_data header file moved to drivers/media/platform/s3c-camif/.

Yes, it seems that patch never made it to mainline:
https://protect2.fireeye.com/v1/url?k=abe5f73a-f6293cfe-abe47c75-0cc47a314e9a-7fafe832d055d852&q=1&e=2596ffb6-c4cb-492a-8c6f-a0e261567842&u=https%3A%2F%2Fgit.linuxtv.org%2Fsnawrocki%2Fmedia.git%2Fcommit%2F%3Fh%3Dtesting%2Fs3c-camif%26id%3D355cbf835aff2aabf78390931cbbaa608af77967

I suppose it would still apply if anyone was interested, but I see your point.

Quoted 3 lines

I doubt there are still users of camera on the s3c2440 boards with current mainline kernels, if any at all, there are much better HW alternatives right now.

Quoted 7 lines

I see two board files (and no DT) instantiate the camif device:
NexVision Nexcoder 2440 and the FriendlyARM mini2440.

Can you say whether the camif on those would actually work at all without your patch? If not, we know that there are no users of that driver and could either drop it completely or move it to staging for a release or two.

Without additional patches the camif will not work, the driver needs an instance of struct s3c_camif_plat_data which specifies what image sensor is attached.

I think we can drop the driver, together with the s3c_camif_device platform device definitions. It can always be added again if anyone ever needs it or converts the platform to DT.

IMO all non-DT code in arch/arm/mach-s3c24xx is a candidate for removal, it just adds to the maintenance effort and I seriously doubt there are now any users of it.

Signature · 2 lines
Regards,
Sylwester
author maintainer
#31 lore raw

Re: [PATCH v2 13/13] ARM: s3c24xx: camif: include header with prototypes and unify declaration

Quoted 27 lines · Sylwester Nawrocki
Quoted 18 lines · Arnd Bergmann
Quoted 8 lines · Sylwester Nawrocki
Quoted 4 lines · Arnd Bergmann

It seems there have never been any callers and the entire file can just be removed, with the rest of that platform_data header file moved to drivers/media/platform/s3c-camif/.

Yes, it seems that patch never made it to mainline:
https://protect2.fireeye.com/v1/url?k=abe5f73a-f6293cfe-abe47c75-0cc47a314e9a-7fafe832d055d852&q=1&e=2596ffb6-c4cb-492a-8c6f-a0e261567842&u=https%3A%2F%2Fgit.linuxtv.org%2Fsnawrocki%2Fmedia.git%2Fcommit%2F%3Fh%3Dtesting%2Fs3c-camif%26id%3D355cbf835aff2aabf78390931cbbaa608af77967

I suppose it would still apply if anyone was interested, but I see your point.

Quoted 3 lines

I doubt there are still users of camera on the s3c2440 boards with current mainline kernels, if any at all, there are much better HW alternatives right now.

Quoted 7 lines

I see two board files (and no DT) instantiate the camif device:
NexVision Nexcoder 2440 and the FriendlyARM mini2440.

Can you say whether the camif on those would actually work at all without your patch? If not, we know that there are no users of that driver and could either drop it completely or move it to staging for a release or two.

Quoted 7 lines

Without additional patches the camif will not work, the driver needs an instance of struct s3c_camif_plat_data which specifies what image sensor is attached.

I think we can drop the driver, together with the s3c_camif_device platform device definitions. It can always be added again if anyone ever needs it or converts the platform to DT.

Since the header was in /include/media I assumed there might be some user-space tools using it. But if it is not the case, I'll drop the code then.

Quoted 3 lines

IMO all non-DT code in arch/arm/mach-s3c24xx is a candidate for removal, it just adds to the maintenance effort and I seriously doubt there are now any users of it.

That is quite tricky... I really do not know whether there are any real world users of S3C24xx and S3C64xx platforms. Evalkits are mostly not available for buying so I do not expect new designs. However still existing ones might be somewhere... Few years ago, back in Samsung, I mentioned removing them. That time I think Marek or you Sylwester, said that there are industrial applications using S3C24xx. I believe, why not. The trouble is - how to find such users? How to get in touch for testing or at least for bug reports if something is broken?

Or even more important - is it worth to spend effort and time on this? If there is no single production system using recent Linux kernel, the answer should be negative...

Best regards,
Krzysztof

#32 lore raw

Re: [PATCH v2 13/13] ARM: s3c24xx: camif: include header with prototypes and unify declaration

Quoted 18 lines · Krzysztof Kozlowski
Quoted 17 lines · Sylwester Nawrocki
Quoted 11 lines · Arnd Bergmann
Quoted 1 line · Sylwester Nawrocki

On 12.08.2020 11:14, Arnd Bergmann wrote:

I see two board files (and no DT) instantiate the camif device:
NexVision Nexcoder 2440 and the FriendlyARM mini2440.

Can you say whether the camif on those would actually work at all without your patch? If not, we know that there are no users of that driver and could either drop it completely or move it to staging for a release or two.

Without additional patches the camif will not work, the driver needs an instance of struct s3c_camif_plat_data which specifies what image sensor is attached.

Quoted 7 lines
Quoted 3 lines

I think we can drop the driver, together with the s3c_camif_device platform device definitions. It can always be added again if anyone ever needs it or converts the platform to DT.

Since the header was in /include/media I assumed there might be some user-space tools using it. But if it is not the case, I'll drop the code then.

That's a kernel internal header, only for board files, it should really have been added to include/linux/platform_data.

Quoted 4 lines
Quoted 3 lines

IMO all non-DT code in arch/arm/mach-s3c24xx is a candidate for removal, it just adds to the maintenance effort and I seriously doubt there are now any users of it.

Quoted 8 lines

That is quite tricky... I really do not know whether there are any real world users of S3C24xx and S3C64xx platforms. Evalkits are mostly not available for buying so I do not expect new designs. However still existing ones might be somewhere... Few years ago, back in Samsung, I mentioned removing them. That time I think Marek or you Sylwester, said that there are industrial applications using S3C24xx. I believe, why not. The trouble is - how to find such users? How to get in touch for testing or at least for bug reports if something is broken?

I believe if there any such applications of the S3C24XX SoCs still existing somewhere their long term support doesn't include updating to new kernels. I used to keep a running S3C2440 SoC based board just for the purpose of testing patches touching the common code, but I stopped it, I think it is not worth to waste time and health on it any more. For example support for the OSELAS.BSP-Pengutronix-Mini2440 BSP I used for tests ended 5 years ago [1].

Quoted 3 lines

Or even more important - is it worth to spend effort and time on this? If there is no single production system using recent Linux kernel, the answer should be negative...

I suspect nobody cares about that code (non-DT s3c24xx) any more for other than sentimental reasons.

[1] https://git.pengutronix.de/cgit/OSELAS.BSP-Pengutronix-Mini2440

Signature · 2 lines
Regards,
Sylwester
author maintainer
#33 lore raw

Re: [PATCH v2 13/13] ARM: s3c24xx: camif: include header with prototypes and unify declaration

Quoted 51 lines · Sylwester Nawrocki
Quoted 18 lines · Krzysztof Kozlowski
Quoted 17 lines · Sylwester Nawrocki
Quoted 11 lines · Arnd Bergmann
Quoted 1 line · Sylwester Nawrocki

On 12.08.2020 11:14, Arnd Bergmann wrote:

I see two board files (and no DT) instantiate the camif device:
NexVision Nexcoder 2440 and the FriendlyARM mini2440.

Can you say whether the camif on those would actually work at all without your patch? If not, we know that there are no users of that driver and could either drop it completely or move it to staging for a release or two.

Without additional patches the camif will not work, the driver needs an instance of struct s3c_camif_plat_data which specifies what image sensor is attached.

Quoted 7 lines
Quoted 3 lines

I think we can drop the driver, together with the s3c_camif_device platform device definitions. It can always be added again if anyone ever needs it or converts the platform to DT.

Since the header was in /include/media I assumed there might be some user-space tools using it. But if it is not the case, I'll drop the code then.

That's a kernel internal header, only for board files, it should really have been added to include/linux/platform_data.

Quoted 4 lines
Quoted 3 lines

IMO all non-DT code in arch/arm/mach-s3c24xx is a candidate for removal, it just adds to the maintenance effort and I seriously doubt there are now any users of it.

Quoted 8 lines

That is quite tricky... I really do not know whether there are any real world users of S3C24xx and S3C64xx platforms. Evalkits are mostly not available for buying so I do not expect new designs. However still existing ones might be somewhere... Few years ago, back in Samsung, I mentioned removing them. That time I think Marek or you Sylwester, said that there are industrial applications using S3C24xx. I believe, why not. The trouble is - how to find such users? How to get in touch for testing or at least for bug reports if something is broken?

I believe if there any such applications of the S3C24XX SoCs still existing somewhere their long term support doesn't include updating to new kernels. I used to keep a running S3C2440 SoC based board just for the purpose of testing patches touching the common code, but I stopped it, I think it is not worth to waste time and health on it any more. For example support for the OSELAS.BSP-Pengutronix-Mini2440 BSP I used for tests ended 5 years ago [1].

Quoted 6 lines
Quoted 3 lines

Or even more important - is it worth to spend effort and time on this? If there is no single production system using recent Linux kernel, the answer should be negative...

I suspect nobody cares about that code (non-DT s3c24xx) any more for other than sentimental reasons.

I'll start then with S3C camif driver. :) I guess drivers/media/platform/s3c-camif/ still should be left?

Best regards,
Krzysztof

#34 lore raw

Re: [PATCH v2 13/13] ARM: s3c24xx: camif: include header with prototypes and unify declaration

Quoted 2 lines · Krzysztof Kozlowski

I'll start then with S3C camif driver. :) I guess drivers/media/platform/s3c-camif/ still should be left?

No, if you want to remove the driver then this whole directory should be removed. The driver also supports the S3C6410 CAMIF but there is no s3c6410-camif devices instantiated in arch/arm/mach-s3c64xx either.

Signature · 2 lines
Regards,
Sylwester
#35 lore raw

Re: [PATCH v2 13/13] ARM: s3c24xx: camif: include header with prototypes and unify declaration

In reply to Krzysztof Kozlowski
Quoted 3 lines · Krzysztof Kozlowski

Or even more important - is it worth to spend effort and time on this? If there is no single production system using recent Linux kernel, the answer should be negative...

Well, I have a server running on mini2440 with a not-too-young but not-too-old kernel. I don't have much time to test recent kernels though so I guess that doesn't count.

author maintainer
#36 lore raw

Re: [PATCH v2 13/13] ARM: s3c24xx: camif: include header with prototypes and unify declaration

Quoted 9 lines · Cedric Roux
Quoted 3 lines · Krzysztof Kozlowski

Or even more important - is it worth to spend effort and time on this? If there is no single production system using recent Linux kernel, the answer should be negative...

Well, I have a server running on mini2440 with a not-too-young but not-too-old kernel. I don't have much time to test recent kernels though so I guess that doesn't count.

Actually good to hear. It counts a little bit :)

Best regards,
Krzysztof

#37 lore raw
In reply to Krzysztof Kozlowski

Hi Krzysztof,

Quoted 10 lines · Krzysztof Kozlowski

Hi,

I tried to cleanup few warnings in S3C machine code which lead to finding some bigger issues.

The patchset touches clk and watchdog trees. I would appreciate acks so I can take everything through Samsung SoC tree. I have later a bigger set which would create conflicts with it [1].

Quoted 8 lines

Changes since v1:
1. Few new patches,
2. Addressed review around clk and watchdog changes (see change logs in individual patches).

[1] v2 of Arnd's work for making S3C24xx multiplatform:
https://github.com/krzk/linux/tree/for-next/s3c-multiplatform-cleanup-w1-warnings-v2

I gave a build and boot test. My TINY6410 board still works! Actually I had did the same test for Arnd's branch with linux v5.5 and it works too!

Best regards
Lihua

Quoted 80 lines

Best regards,
Krzysztof

Krzysztof Kozlowski (13):
clk: samsung: s3c64xx: declare s3c64xx_clk_init() in shared header
clk: samsung: s3c24xx: declare s3c24xx_common_clk_init() in shared
header
ARM: s3c64xx: include header to fix -Wmissing-prototypes
ARM: s3c: remove plat-samsung/.../samsung-time.h
ARM: samsung: fix language typo
ARM: samsung: remove HAVE_S3C2410_WATCHDOG and use direct dependencies
ARM: s3c64xx: switch to generic watchdog driver reset
ARM: s3c24xx: fix missing system reset
ARM: s3c24xx: include common.h header in s3c2443.c
ARM: s3c24xx: sdhci: include plat/sdhci.h header
ARM: s3c24xx: ts: include platform data header
ARM: s3c24xx: ts: document function argument
ARM: s3c24xx: camif: include header with prototypes and unify
declaration

 MAINTAINERS                                   |  1 +
 arch/arm/Kconfig                              |  3 +-
 arch/arm/mach-exynos/Kconfig                  |  1 -
 arch/arm/mach-s3c24xx/common.c                |  1 +
 arch/arm/mach-s3c24xx/common.h                | 25 +++--
 arch/arm/mach-s3c24xx/mach-amlm5900.c         |  2 -
 arch/arm/mach-s3c24xx/mach-anubis.c           |  1 -
 arch/arm/mach-s3c24xx/mach-at2440evb.c        |  1 -
 arch/arm/mach-s3c24xx/mach-bast.c             |  1 -
 arch/arm/mach-s3c24xx/mach-gta02.c            |  1 -
 arch/arm/mach-s3c24xx/mach-h1940.c            |  1 -
 arch/arm/mach-s3c24xx/mach-jive.c             |  1 -
 arch/arm/mach-s3c24xx/mach-mini2440.c         |  1 -
 arch/arm/mach-s3c24xx/mach-n30.c              |  1 -
 arch/arm/mach-s3c24xx/mach-nexcoder.c         |  1 -
 arch/arm/mach-s3c24xx/mach-osiris.c           |  1 -
 arch/arm/mach-s3c24xx/mach-otom.c             |  1 -
 arch/arm/mach-s3c24xx/mach-qt2410.c           |  1 -
 arch/arm/mach-s3c24xx/mach-rx1950.c           |  1 -
 arch/arm/mach-s3c24xx/mach-rx3715.c           |  1 -
 arch/arm/mach-s3c24xx/mach-smdk2410.c         |  1 -
 arch/arm/mach-s3c24xx/mach-smdk2413.c         |  1 -
 arch/arm/mach-s3c24xx/mach-smdk2416.c         |  1 -
 arch/arm/mach-s3c24xx/mach-smdk2440.c         |  1 -
 arch/arm/mach-s3c24xx/mach-smdk2443.c         |  1 -
 arch/arm/mach-s3c24xx/mach-tct_hammer.c       |  1 -
 arch/arm/mach-s3c24xx/mach-vr1000.c           |  1 -
 arch/arm/mach-s3c24xx/mach-vstms.c            |  1 -
 arch/arm/mach-s3c24xx/s3c2443.c               |  1 +
 arch/arm/mach-s3c24xx/setup-camif.c           |  5 +-
 arch/arm/mach-s3c24xx/setup-sdhci-gpio.c      |  1 +
 arch/arm/mach-s3c24xx/setup-ts.c              |  3 +
 arch/arm/mach-s3c64xx/Kconfig                 |  5 +-
 arch/arm/mach-s3c64xx/common.c                | 17 +---
 arch/arm/mach-s3c64xx/common.h                | 17 +++-
 arch/arm/mach-s3c64xx/mach-anw6410.c          |  2 -
 arch/arm/mach-s3c64xx/mach-crag6410.c         |  2 -
 arch/arm/mach-s3c64xx/mach-hmt.c              |  2 -
 arch/arm/mach-s3c64xx/mach-mini6410.c         |  2 -
 arch/arm/mach-s3c64xx/mach-ncp.c              |  2 -
 arch/arm/mach-s3c64xx/mach-real6410.c         |  2 -
 arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c       | 17 ----
 arch/arm/mach-s3c64xx/mach-smartq.c           |  1 -
 arch/arm/mach-s3c64xx/mach-smartq5.c          |  2 -
 arch/arm/mach-s3c64xx/mach-smartq7.c          |  2 -
 arch/arm/mach-s3c64xx/mach-smdk6400.c         |  2 -
 arch/arm/mach-s3c64xx/mach-smdk6410.c         |  2 -
 arch/arm/mach-s3c64xx/setup-spi.c             |  1 +
 arch/arm/mach-s3c64xx/watchdog-reset.h        | 16 ----
 arch/arm/mach-s5pv210/Kconfig                 |  1 -
 arch/arm/plat-samsung/Kconfig                 | 10 +-
 arch/arm/plat-samsung/Makefile                |  1 -
 .../plat-samsung/include/plat/samsung-time.h  | 26 ------
 arch/arm/plat-samsung/watchdog-reset.c        | 93 -------------------
 arch/arm64/Kconfig.platforms                  |  1 -
 drivers/clk/samsung/clk-s3c2410.c             |  1 +
 drivers/clk/samsung/clk-s3c2412.c             |  1 +
 drivers/clk/samsung/clk-s3c2443.c             |  1 +
Quoted 9 lines
 drivers/clk/samsung/clk-s3c64xx.c             |  1 +
 drivers/watchdog/Kconfig                      | 10 +-
 include/linux/clk/samsung.h                   | 56 +++++++++++
 61 files changed, 105 insertions(+), 256 deletions(-)
 delete mode 100644 arch/arm/mach-s3c64xx/watchdog-reset.h
 delete mode 100644 arch/arm/plat-samsung/include/plat/samsung-time.h
 delete mode 100644 arch/arm/plat-samsung/watchdog-reset.c
 create mode 100644 include/linux/clk/samsung.h

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

author maintainer
#38 lore raw
Quoted 19 lines · Lihua Yao

Hi Krzysztof,

Quoted 16 lines · Krzysztof Kozlowski

Hi,

I tried to cleanup few warnings in S3C machine code which lead to finding some bigger issues.

The patchset touches clk and watchdog trees. I would appreciate acks so I can take everything through Samsung SoC tree. I have later a bigger set which would create conflicts with it [1].

Changes since v1:
1. Few new patches,
2. Addressed review around clk and watchdog changes (see change logs in individual patches).

Quoted 5 lines
Quoted 2 lines

[1] v2 of Arnd's work for making S3C24xx multiplatform:
https://github.com/krzk/linux/tree/for-next/s3c-multiplatform-cleanup-w1-warnings-v2

I gave a build and boot test. My TINY6410 board still works! Actually I had did the same test for Arnd's branch with linux v5.5 and it works too!

Great! Thanks for testing.

Best regards,
Krzysztof

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel