[GIT PULL] clk/samsung updates for v4.15, part 2

[GIT PULL] clk/samsung updates for v4.15, part 2

[Sylwester Nawrocki]

Hi Stephen, Mike,

This change set is based off of your clk-pm-runtime branch, I needed to
do it that way as there were dependencies on the newly added clk runtime
PM feature.  In this tag there is also a fix commit related to changes 
introduced in the clk-pm-runtime branch. There will be a merge conflict, 
you can find the conflict resolution hint below. 

The following changes since commit ae432a9b314e07d486acfadc4df2f922721e6757:

  clk: samsung: exynos-audss: Add support for runtime PM (2017-09-07 15:26:01 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git tags/clk-v4.15-exynos-pm

for you to fetch changes up to 7679eb20353dc74e47fbc97b2d77fd4f88a77c0f:

  clk: samsung: Add a separate driver for Exynos4412 ISP clocks (2017-10-16 11:25:50 +0200)

----------------------------------------------------------------
clk/samsung updates for v4.15, part 2

 - An addition of separate driver for the Exynos 4412 ISP CMU, needed
   to model and properly handle the clock controller's dependencies
   on the ISP power domain.
 - Adding __maybe_unused attributes to the exynos5433_cmu_{suspend,
   resume} ops to suppress compiler warnings with CONFIG_PM disabled.

----------------------------------------------------------------
Arnd Bergmann (1):
      clk: samsung: exynos5433: mark PM functions as __maybe_unused

Marek Szyprowski (3):
      clk: samsung: Instantiate Exynos4412 ISP clocks only when available
      clk: samsung: Add dt bindings for Exynos4412 ISP clock controller
      clk: samsung: Add a separate driver for Exynos4412 ISP clocks

 .../devicetree/bindings/clock/exynos4-clock.txt  |  43 +++++
 drivers/clk/samsung/Makefile                     |   1 +
 drivers/clk/samsung/clk-exynos4.c                |  31 +++-
 drivers/clk/samsung/clk-exynos4412-isp.c         | 179 +++++++++++++++++++
 drivers/clk/samsung/clk-exynos5433.c             |   4 +-
 include/dt-bindings/clock/exynos4.h              |  35 ++++
 6 files changed, 284 insertions(+), 9 deletions(-)
 create mode 100644 drivers/clk/samsung/clk-exynos4412-isp.c


-------8<----------
 +
 +		of_address_to_resource(np, 0, &res);
 +		if (resource_size(&res) > 0x18000) {
 +			samsung_clk_register_div(ctx, exynos4x12_isp_div_clks,
 +				ARRAY_SIZE(exynos4x12_isp_div_clks));
 +			samsung_clk_register_gate(ctx, exynos4x12_isp_gate_clks,
 +				ARRAY_SIZE(exynos4x12_isp_gate_clks));
 +		}
 +
- 		if (of_machine_is_compatible("samsung,exynos4412")) {
- 			exynos_register_cpu_clock(ctx, CLK_ARM_CLK, "armclk",
- 				mout_core_p4x12[0], mout_core_p4x12[1], 0x14200,
- 				e4412_armclk_d, ARRAY_SIZE(e4412_armclk_d),
- 				CLK_CPU_NEEDS_DEBUG_ALT_DIV | CLK_CPU_HAS_DIV1);
- 		} else {
- 			exynos_register_cpu_clock(ctx, CLK_ARM_CLK, "armclk",
- 				mout_core_p4x12[0], mout_core_p4x12[1], 0x14200,
- 				e4212_armclk_d, ARRAY_SIZE(e4212_armclk_d),
- 				CLK_CPU_NEEDS_DEBUG_ALT_DIV | CLK_CPU_HAS_DIV1);
- 		}
+ 		exynos_register_cpu_clock(ctx, CLK_ARM_CLK, "armclk",
+ 			mout_core_p4x12[0], mout_core_p4x12[1], 0x14200,
+ 			e4412_armclk_d, ARRAY_SIZE(e4412_armclk_d),
+ 			CLK_CPU_NEEDS_DEBUG_ALT_DIV | CLK_CPU_HAS_DIV1);
  	}
-------8<----------

-- 
Thanks,
Sylwester

Re: [GIT PULL] clk/samsung updates for v4.15, part 2

[Stephen Boyd]

On 10/16, Sylwester Nawrocki wrote:
> Hi Stephen, Mike,
> 
> This change set is based off of your clk-pm-runtime branch, I needed to
> do it that way as there were dependencies on the newly added clk runtime
> PM feature.  In this tag there is also a fix commit related to changes 
> introduced in the clk-pm-runtime branch. There will be a merge conflict, 
> you can find the conflict resolution hint below. 
> 
> The following changes since commit ae432a9b314e07d486acfadc4df2f922721e6757:
> 
>   clk: samsung: exynos-audss: Add support for runtime PM (2017-09-07 15:26:01 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git tags/clk-v4.15-exynos-pm

Did you change keys recently? My older version of gnupg chokes on
your signature which is slightly concerning. The other PR didn't
have problems.

> 
> for you to fetch changes up to 7679eb20353dc74e47fbc97b2d77fd4f88a77c0f:
> 
>   clk: samsung: Add a separate driver for Exynos4412 ISP clocks (2017-10-16 11:25:50 +0200)
> 
> ----------------------------------------------------------------
> clk/samsung updates for v4.15, part 2
> 
>  - An addition of separate driver for the Exynos 4412 ISP CMU, needed
>    to model and properly handle the clock controller's dependencies
>    on the ISP power domain.

I find it sad that you opted to break the clk node up into two
nodes and clk providers purely to satisfy the requirement that
runtime PM be used with struct devices instead of solving the
problem of multiple power domains for a single struct device and
how that would work with runtime PM.

Anyway, who am I to stand in the way of progress! I'll pull this
into clk-next.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

Re: [GIT PULL] clk/samsung updates for v4.15, part 2

[Sylwester Nawrocki]

On 10/31/2017 10:51 PM, Stephen Boyd wrote:
> Did you change keys recently? My older version of gnupg chokes on
> your signature which is slightly concerning. The other PR didn't
> have problems.

I thought I didn't, In fact I moved the key from one machine to the other
recently, but both pull requests should be signed in same way. Let me
have a closer look.

-- 
Thanks,
Sylwester

Re: [GIT PULL] clk/samsung updates for v4.15, part 2

[Sylwester Nawrocki]

On 11/02/2017 05:24 PM, Sylwester Nawrocki wrote:
> On 10/31/2017 10:51 PM, Stephen Boyd wrote:
>> Did you change keys recently? My older version of gnupg chokes on
>> your signature which is slightly concerning. The other PR didn't
>> have problems.
> I thought I didn't, In fact I moved the key from one machine to the other
> recently, but both pull requests should be signed in same way. Let me
> have a closer look.

I couldn't find anything wrong, the signatures looked good and git tag -v 
didn't report any issues. I regenerated the tag and the pull request, it's
inlined below. I didn't noticed earlier the tag is already pulled into
clk-next.

-- 
Regards,
Sylwester


The following changes since commit ae432a9b314e07d486acfadc4df2f922721e6757:

  clk: samsung: exynos-audss: Add support for runtime PM (2017-09-07 15:26:01 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git tags/clk-v4.15-exynos-pm

for you to fetch changes up to 7679eb20353dc74e47fbc97b2d77fd4f88a77c0f:

  clk: samsung: Add a separate driver for Exynos4412 ISP clocks (2017-10-16 11:25:50 +0200)

----------------------------------------------------------------
clk/samsung updates for v4.15, part 2

 - An addition of separate driver for the Exynos 4412 ISP CMU, needed
   to model and properly handle the clock controller's dependencies
   on the ISP power domain.
 - Adding __maybe_unused attributes to the exynos5433_cmu_{suspend,
   resume} ops to suppress compiler warnings with CONFIG_PM disabled.

----------------------------------------------------------------
Arnd Bergmann (1):
      clk: samsung: exynos5433: mark PM functions as __maybe_unused

Marek Szyprowski (3):
      clk: samsung: Instantiate Exynos4412 ISP clocks only when available
      clk: samsung: Add dt bindings for Exynos4412 ISP clock controller
      clk: samsung: Add a separate driver for Exynos4412 ISP clocks

 Documentation/devicetree/bindings/clock/exynos4-clock.txt |  43 ++++++
 drivers/clk/samsung/Makefile                              |   1 +
 drivers/clk/samsung/clk-exynos4.c                         |  31 +++-
 drivers/clk/samsung/clk-exynos4412-isp.c                  | 179 ++++++++++++++++++++++++
 drivers/clk/samsung/clk-exynos5433.c                      |   4 +-
 include/dt-bindings/clock/exynos4.h                       |  35 +++++
 6 files changed, 284 insertions(+), 9 deletions(-)
 create mode 100644 drivers/clk/samsung/clk-exynos4412-isp.c