Skip to content

clk/watchdog/ARM: Cleanup of various S3C bits

Krzysztof Kozlowski linux-arm-kernel linux-clk linux-samsung-soc linux-watchdog stable 2 versions – Applied

Status from this message: Applied.

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest13 patches 25 repliesApplied
  2. v17 patches 16 repliesSuperseded

Changes in v2 from the cover letter

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

Patches in v2 Applied

#Subject and filesSizeRepliesApplied
1/13clk: samsung: s3c64xx: declare s3c64xx_clk_init() in shared headerMAINTAINERS arch/arm/mach-s3c64xx/common.c arch/arm/mach-s3c64xx/common.h +2 more+27 -22 replies
2/13clk: samsung: s3c24xx: declare s3c24xx_common_clk_init() in shared headerarch/arm/mach-s3c24xx/common.c arch/arm/mach-s3c24xx/common.h drivers/clk/samsung/clk-s3c2410.c +3 more+36 -152 replies
3/13ARM: s3c64xx: include header to fix -Wmissing-prototypesarch/arm/mach-s3c64xx/setup-spi.c+1 -01 reply
4/13ARM: s3c: remove plat-samsung/.../samsung-time.harch/arm/mach-s3c24xx/common.h arch/arm/mach-s3c24xx/mach-amlm5900.c arch/arm/mach-s3c24xx/mach-anubis.c +34 more+25 -610 replies
5/13ARM: samsung: fix language typoarch/arm/plat-samsung/Kconfig+2 -21 reply
6/13ARM: samsung: remove HAVE_S3C2410_WATCHDOG and use direct dependenciesarch/arm/Kconfig arch/arm/mach-exynos/Kconfig arch/arm/mach-s3c64xx/Kconfig +3 more+2 -144 replies
7/13ARM: s3c64xx: switch to generic watchdog driver resetarch/arm/mach-s3c64xx/Kconfig arch/arm/mach-s3c64xx/common.c arch/arm/mach-s3c64xx/common.h +15 more+2 -1621 reply
8/13ARM: s3c24xx: fix missing system resetarch/arm/Kconfig+2 -01 reply
9/13ARM: s3c24xx: include common.h header in s3c2443.carch/arm/mach-s3c24xx/s3c2443.c+1 -00 replies
10/13ARM: s3c24xx: sdhci: include plat/sdhci.h headerarch/arm/mach-s3c24xx/setup-sdhci-gpio.c+1 -00 replies
11/13ARM: s3c24xx: ts: include platform data headerarch/arm/mach-s3c24xx/setup-ts.c+2 -00 replies
12/13ARM: s3c24xx: ts: document function argumentarch/arm/mach-s3c24xx/setup-ts.c+1 -00 replies
13/13ARM: s3c24xx: camif: include header with prototypes and unify declarationarch/arm/mach-s3c24xx/setup-camif.c+4 -111 replies

Reviews trailers per patch

7 of 13 patches have a Reviewed-by or Acked-by.

PatchTomasz FigaChanwoo ChoiStephen BoydGuenter Roeck
1/13R-b A-b R-b
2/13A-b R-b
3/13R-b R-b
4/13R-b
5/13R-b
6/13A-b
7/13R-b
8/13
9/13
10/13
11/13
12/13
13/13

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.

Read the v2 thread

Cover letter [PATCH v2 00/13] 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