[GIT PULL] clk: socfpga: Clean-ups for 3.14

[GIT PULL] clk: socfpga: Clean-ups for 3.14

[dinguyen at altera.com]

Hi Mike,

Please pull in these 3 patches that cleans up the SOCFPGA clock driver.

Thanks,

Dinh

The following changes since commit 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae:

  Linux 3.13-rc1 (2013-11-22 11:30:55 -0800)

are available in the git repository at:

  git://git.rocketboards.org/linux-socfpga-next.git tags/socfpga-clk-for-3.14

for you to fetch changes up to be4cf9f262a069a91d095b9c17aed44e12699236:

  clk: socfpga: Remove socfpga_init_clocks (2013-12-13 16:54:38 -0600)

----------------------------------------------------------------
SOCFPGA clk cleanups for 3.14

----------------------------------------------------------------
Dinh Nguyen (3):
      clk: socfpga: Map the clk manager base address in the clock driver
      clk: socfpga: Look for the GPIO_DB_CLK by its offset
      clk: socfpga: Remove socfpga_init_clocks

 arch/arm/mach-socfpga/socfpga.c |    5 -----
 drivers/clk/socfpga/clk.c       |   31 +++++++++++++++++--------------
 2 files changed, 17 insertions(+), 19 deletions(-)

[GIT PULL] clk: socfpga: Clean-ups for 3.14

[Mike Turquette]

Quoting dinguyen at altera.com (2013-12-13 15:07:11)
> Hi Mike,
> 
> Please pull in these 3 patches that cleans up the SOCFPGA clock driver.

Hi Dinh,

Patch #2, "clk: socfpga: Look for the GPIO_DB_CLK by its offset" throws
the following error during compilation:

drivers/clk/socfpga/clk.c: In function ?socfpga_clk_recalc_rate?:
drivers/clk/socfpga/clk.c:238:27: error: invalid operands to binary & (have ?void *? and ?int?)
   if (socfpgaclk->div_reg & SOCFPGA_GPIO_DB_CLK_OFFSET)
                           ^
make[3]: *** [drivers/clk/socfpga/clk.o] Error 1
make[2]: *** [drivers/clk/socfpga] Error 2
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [drivers/clk] Error 2
make[1]: *** Waiting for unfinished jobs....
make: *** [drivers] Error 2
make: *** Waiting for unfinished jobs....

Compilation can continue with the following change:

diff --git a/drivers/clk/socfpga/clk.c b/drivers/clk/socfpga/clk.c
index 9350071..da6d82c 100644
--- a/drivers/clk/socfpga/clk.c
+++ b/drivers/clk/socfpga/clk.c
@@ -235,7 +235,7 @@ static unsigned long socfpga_clk_recalc_rate(struct clk_hw *hwclk,
 		val = readl(socfpgaclk->div_reg) >> socfpgaclk->shift;
 		val &= div_mask(socfpgaclk->width);
 		/* Check for GPIO_DB_CLK by its offset */
-		if (socfpgaclk->div_reg & SOCFPGA_GPIO_DB_CLK_OFFSET)
+		if ((int) socfpgaclk->div_reg & SOCFPGA_GPIO_DB_CLK_OFFSET)
 			div = val + 1;
 		else
 			div = (1 << val);

I have not applied this change to the patch. Is there anything different
way of handling this that you would prefer?

Regards,
Mike

> 
> Thanks,
> 
> Dinh
> 
> The following changes since commit 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae:
> 
>   Linux 3.13-rc1 (2013-11-22 11:30:55 -0800)
> 
> are available in the git repository at:
> 
>   git://git.rocketboards.org/linux-socfpga-next.git tags/socfpga-clk-for-3.14
> 
> for you to fetch changes up to be4cf9f262a069a91d095b9c17aed44e12699236:
> 
>   clk: socfpga: Remove socfpga_init_clocks (2013-12-13 16:54:38 -0600)
> 
> ----------------------------------------------------------------
> SOCFPGA clk cleanups for 3.14
> 
> ----------------------------------------------------------------
> Dinh Nguyen (3):
>       clk: socfpga: Map the clk manager base address in the clock driver
>       clk: socfpga: Look for the GPIO_DB_CLK by its offset
>       clk: socfpga: Remove socfpga_init_clocks
> 
>  arch/arm/mach-socfpga/socfpga.c |    5 -----
>  drivers/clk/socfpga/clk.c       |   31 +++++++++++++++++--------------
>  2 files changed, 17 insertions(+), 19 deletions(-)
> 

[GIT PULL] clk: socfpga: Clean-ups for 3.14

[Dinh Nguyen]

Hi Mike,

On 12/29/13 1:05 PM, Mike Turquette wrote:
> Quoting dinguyen at altera.com (2013-12-13 15:07:11)
>> Hi Mike,
>>
>> Please pull in these 3 patches that cleans up the SOCFPGA clock driver.
> Hi Dinh,
>
> Patch #2, "clk: socfpga: Look for the GPIO_DB_CLK by its offset" throws
> the following error during compilation:
>
> drivers/clk/socfpga/clk.c: In function ?socfpga_clk_recalc_rate?:
> drivers/clk/socfpga/clk.c:238:27: error: invalid operands to binary & (have ?void *? and ?int?)
>    if (socfpgaclk->div_reg & SOCFPGA_GPIO_DB_CLK_OFFSET)
>                            ^
> make[3]: *** [drivers/clk/socfpga/clk.o] Error 1
> make[2]: *** [drivers/clk/socfpga] Error 2
> make[2]: *** Waiting for unfinished jobs....
> make[1]: *** [drivers/clk] Error 2
> make[1]: *** Waiting for unfinished jobs....
> make: *** [drivers] Error 2
> make: *** Waiting for unfinished jobs....
>
> Compilation can continue with the following change:
>
> diff --git a/drivers/clk/socfpga/clk.c b/drivers/clk/socfpga/clk.c
> index 9350071..da6d82c 100644
> --- a/drivers/clk/socfpga/clk.c
> +++ b/drivers/clk/socfpga/clk.c
> @@ -235,7 +235,7 @@ static unsigned long socfpga_clk_recalc_rate(struct clk_hw *hwclk,
>  		val = readl(socfpgaclk->div_reg) >> socfpgaclk->shift;
>  		val &= div_mask(socfpgaclk->width);
>  		/* Check for GPIO_DB_CLK by its offset */
> -		if (socfpgaclk->div_reg & SOCFPGA_GPIO_DB_CLK_OFFSET)
> +		if ((int) socfpgaclk->div_reg & SOCFPGA_GPIO_DB_CLK_OFFSET)
>  			div = val + 1;
>  		else
>  			div = (1 << val);
>
> I have not applied this change to the patch. Is there anything different
> way of handling this that you would prefer?

Let me clean this up and send you an updated pull request.

Thanks,
Dinh
>
> Regards,
> Mike
>
>> Thanks,
>>
>> Dinh
>>
>> The following changes since commit 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae:
>>
>>   Linux 3.13-rc1 (2013-11-22 11:30:55 -0800)
>>
>> are available in the git repository at:
>>
>>   git://git.rocketboards.org/linux-socfpga-next.git tags/socfpga-clk-for-3.14
>>
>> for you to fetch changes up to be4cf9f262a069a91d095b9c17aed44e12699236:
>>
>>   clk: socfpga: Remove socfpga_init_clocks (2013-12-13 16:54:38 -0600)
>>
>> ----------------------------------------------------------------
>> SOCFPGA clk cleanups for 3.14
>>
>> ----------------------------------------------------------------
>> Dinh Nguyen (3):
>>       clk: socfpga: Map the clk manager base address in the clock driver
>>       clk: socfpga: Look for the GPIO_DB_CLK by its offset
>>       clk: socfpga: Remove socfpga_init_clocks
>>
>>  arch/arm/mach-socfpga/socfpga.c |    5 -----
>>  drivers/clk/socfpga/clk.c       |   31 +++++++++++++++++--------------
>>  2 files changed, 17 insertions(+), 19 deletions(-)
>>

[GIT PULL] clk: socfpga: Clean-ups for 3.14

[dinguyen at altera.com]

Hi Mike,

Please pull in these patches that cleans up the SOCFPGA clock driver. This is
V2 of the pull request that includes 4 patches from Steffen Trumtrar.

Thanks,

Dinh

The following changes since commit 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae:

  Linux 3.13-rc1 (2013-11-22 11:30:55 -0800)

are available in the git repository at:

  git://git.rocketboards.org/linux-socfpga-next.git tags/socfpga-clk-for-3.14_v2

for you to fetch changes up to d5387681665e58bafc1a9c745182f03aab0579c3:

  clk: socfpga: split clk code (2014-01-06 11:22:22 -0600)

----------------------------------------------------------------
v2: SOCFPGA clk cleanups for 3.14

----------------------------------------------------------------
Dinh Nguyen (3):
      clk: socfpga: Map the clk manager base address in the clock driver
      clk: socfpga: Look for the GPIO_DB_CLK by its offset
      clk: socfpga: Remove socfpga_init_clocks

Steffen Trumtrar (4):
      clk: socfpga: remove unused field
      clk: socfpga: fix define typo
      clk: socfpga: fix compile error
      clk: socfpga: split clk code

 arch/arm/mach-socfpga/socfpga.c  |    5 -
 drivers/clk/socfpga/Makefile     |    3 +
 drivers/clk/socfpga/clk-gate.c   |  223 ++++++++++++++++++++++++++
 drivers/clk/socfpga/clk-periph.c |   94 +++++++++++
 drivers/clk/socfpga/clk-pll.c    |  111 +++++++++++++
 drivers/clk/socfpga/clk.c        |  328 ++------------------------------------
 drivers/clk/socfpga/clk.h        |   57 +++++++
 7 files changed, 500 insertions(+), 321 deletions(-)
 create mode 100644 drivers/clk/socfpga/clk-gate.c
 create mode 100644 drivers/clk/socfpga/clk-periph.c
 create mode 100644 drivers/clk/socfpga/clk-pll.c
 create mode 100644 drivers/clk/socfpga/clk.h

[GIT PULL] clk: socfpga: Clean-ups for 3.14

[Dinh Nguyen]

Hi Mike,

On 1/6/14 11:27 AM, dinguyen at altera.com wrote:
> Hi Mike,
>
> Please pull in these patches that cleans up the SOCFPGA clock driver. This is
> V2 of the pull request that includes 4 patches from Steffen Trumtrar.
>
> Thanks,
>
> Dinh
>
> The following changes since commit 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae:
>
>   Linux 3.13-rc1 (2013-11-22 11:30:55 -0800)
>
> are available in the git repository at:
>
>   git://git.rocketboards.org/linux-socfpga-next.git tags/socfpga-clk-for-3.14_v2
>
> for you to fetch changes up to d5387681665e58bafc1a9c745182f03aab0579c3:
>
>   clk: socfpga: split clk code (2014-01-06 11:22:22 -0600)
>
> ----------------------------------------------------------------
> v2: SOCFPGA clk cleanups for 3.14
>
> ----------------------------------------------------------------
> Dinh Nguyen (3):
>       clk: socfpga: Map the clk manager base address in the clock driver
>       clk: socfpga: Look for the GPIO_DB_CLK by its offset
>       clk: socfpga: Remove socfpga_init_clocks
>
> Steffen Trumtrar (4):
>       clk: socfpga: remove unused field
>       clk: socfpga: fix define typo
>       clk: socfpga: fix compile error
>       clk: socfpga: split clk code
>
>  arch/arm/mach-socfpga/socfpga.c  |    5 -
>  drivers/clk/socfpga/Makefile     |    3 +
>  drivers/clk/socfpga/clk-gate.c   |  223 ++++++++++++++++++++++++++
>  drivers/clk/socfpga/clk-periph.c |   94 +++++++++++
>  drivers/clk/socfpga/clk-pll.c    |  111 +++++++++++++
>  drivers/clk/socfpga/clk.c        |  328 ++------------------------------------
>  drivers/clk/socfpga/clk.h        |   57 +++++++
>  7 files changed, 500 insertions(+), 321 deletions(-)
>  create mode 100644 drivers/clk/socfpga/clk-gate.c
>  create mode 100644 drivers/clk/socfpga/clk-periph.c
>  create mode 100644 drivers/clk/socfpga/clk-pll.c
>  create mode 100644 drivers/clk/socfpga/clk.h
Please consider this pull-request.

Thanks,
Dinh

[GIT PULL] clk: socfpga: Clean-ups for 3.14

[Mike Turquette]

Quoting dinguyen at altera.com (2014-01-06 09:27:26)
> Hi Mike,
> 
> Please pull in these patches that cleans up the SOCFPGA clock driver. This is
> V2 of the pull request that includes 4 patches from Steffen Trumtrar.
> 
> Thanks,
> 
> Dinh
> 
> The following changes since commit 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae:
> 
>   Linux 3.13-rc1 (2013-11-22 11:30:55 -0800)
> 
> are available in the git repository at:
> 
>   git://git.rocketboards.org/linux-socfpga-next.git tags/socfpga-clk-for-3.14_v2
> 
> for you to fetch changes up to d5387681665e58bafc1a9c745182f03aab0579c3:
> 
>   clk: socfpga: split clk code (2014-01-06 11:22:22 -0600)
> 
> ----------------------------------------------------------------
> v2: SOCFPGA clk cleanups for 3.14
> 
> ----------------------------------------------------------------
> Dinh Nguyen (3):
>       clk: socfpga: Map the clk manager base address in the clock driver
>       clk: socfpga: Look for the GPIO_DB_CLK by its offset

Hi Dinh,

Patch "clk: socfpga: Look for the GPIO_DB_CLK by its offset" still
causes a compilation error. I know it gets fixed by "clk: socfpga: fix
compile error" later on but this still breaks git bisect.

Can you please fold the fixes into the patches that introduce the bugs?
No need to keep them separate since they are all part of the same pull
request.

Regards,
Mike

>       clk: socfpga: Remove socfpga_init_clocks
> 
> Steffen Trumtrar (4):
>       clk: socfpga: remove unused field
>       clk: socfpga: fix define typo
>       clk: socfpga: fix compile error
>       clk: socfpga: split clk code
> 
>  arch/arm/mach-socfpga/socfpga.c  |    5 -
>  drivers/clk/socfpga/Makefile     |    3 +
>  drivers/clk/socfpga/clk-gate.c   |  223 ++++++++++++++++++++++++++
>  drivers/clk/socfpga/clk-periph.c |   94 +++++++++++
>  drivers/clk/socfpga/clk-pll.c    |  111 +++++++++++++
>  drivers/clk/socfpga/clk.c        |  328 ++------------------------------------
>  drivers/clk/socfpga/clk.h        |   57 +++++++
>  7 files changed, 500 insertions(+), 321 deletions(-)
>  create mode 100644 drivers/clk/socfpga/clk-gate.c
>  create mode 100644 drivers/clk/socfpga/clk-periph.c
>  create mode 100644 drivers/clk/socfpga/clk-pll.c
>  create mode 100644 drivers/clk/socfpga/clk.h
> 

[GIT PULL] clk: socfpga: Clean-ups for 3.14

[Dinh Nguyen]

On 1/14/14 10:32 PM, Mike Turquette wrote:
> Quoting dinguyen at altera.com (2014-01-06 09:27:26)
>> Hi Mike,
>>
>> Please pull in these patches that cleans up the SOCFPGA clock driver. This is
>> V2 of the pull request that includes 4 patches from Steffen Trumtrar.
>>
>> Thanks,
>>
>> Dinh
>>
>> The following changes since commit 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae:
>>
>>   Linux 3.13-rc1 (2013-11-22 11:30:55 -0800)
>>
>> are available in the git repository at:
>>
>>   git://git.rocketboards.org/linux-socfpga-next.git tags/socfpga-clk-for-3.14_v2
>>
>> for you to fetch changes up to d5387681665e58bafc1a9c745182f03aab0579c3:
>>
>>   clk: socfpga: split clk code (2014-01-06 11:22:22 -0600)
>>
>> ----------------------------------------------------------------
>> v2: SOCFPGA clk cleanups for 3.14
>>
>> ----------------------------------------------------------------
>> Dinh Nguyen (3):
>>       clk: socfpga: Map the clk manager base address in the clock driver
>>       clk: socfpga: Look for the GPIO_DB_CLK by its offset
> Hi Dinh,
>
> Patch "clk: socfpga: Look for the GPIO_DB_CLK by its offset" still
> causes a compilation error. I know it gets fixed by "clk: socfpga: fix
> compile error" later on but this still breaks git bisect.
>
> Can you please fold the fixes into the patches that introduce the bugs?
> No need to keep them separate since they are all part of the same pull
> request.

I have sent you a v3 of the pull request that folds in the fix. Thanks
for the
advice. I'll be sure to do that in the future.

Dinh
>
> Regards,
> Mike
>
>>       clk: socfpga: Remove socfpga_init_clocks
>>
>> Steffen Trumtrar (4):
>>       clk: socfpga: remove unused field
>>       clk: socfpga: fix define typo
>>       clk: socfpga: fix compile error
>>       clk: socfpga: split clk code
>>
>>  arch/arm/mach-socfpga/socfpga.c  |    5 -
>>  drivers/clk/socfpga/Makefile     |    3 +
>>  drivers/clk/socfpga/clk-gate.c   |  223 ++++++++++++++++++++++++++
>>  drivers/clk/socfpga/clk-periph.c |   94 +++++++++++
>>  drivers/clk/socfpga/clk-pll.c    |  111 +++++++++++++
>>  drivers/clk/socfpga/clk.c        |  328 ++------------------------------------
>>  drivers/clk/socfpga/clk.h        |   57 +++++++
>>  7 files changed, 500 insertions(+), 321 deletions(-)
>>  create mode 100644 drivers/clk/socfpga/clk-gate.c
>>  create mode 100644 drivers/clk/socfpga/clk-periph.c
>>  create mode 100644 drivers/clk/socfpga/clk-pll.c
>>  create mode 100644 drivers/clk/socfpga/clk.h
>>