[GIT,PULL] socfpga fix for 3.13
mbox

Message ID 1386106435-25013-1-git-send-email-dinguyen@altera.com
State New
Headers show

Pull-request

git://git.rocketboards.org/linux-socfpga-next.git tags/socfpga-dt-kconfig-fixes-for-3.13

Message

dinguyen@altera.com Dec. 3, 2013, 9:33 p.m. UTC
The following changes since commit b5afaa4672cc0f3d707ffa56c6b392646c323a8d:

  Linux 3.13-rc1 (2013-12-03 15:00:46 -0600)

are available in the git repository at:

  git://git.rocketboards.org/linux-socfpga-next.git tags/socfpga-dt-kconfig-fixes-for-3.13

for you to fetch changes up to 2f9f487fb54b4fa9c456921037fb508f5dd7e39b:

  arm: dts: socfpga: Change some clocks of gate-clk type to perip-clk (2013-12-03 15:03:19 -0600)

----------------------------------------------------------------
Because of commit :

[159c7f8 arm: socfpga: Add clock for smp_twd timer],

where the "arm,cortex-a9-twd-timer" is assigned the mpu_periph_clk, the twd
timer driver will grab and enable that clock. However, since the mpu_periph_clk
does not have a gate, the generic call to enable the clock will fail.

Commit : [2f9f487f arm: dts: socfpga: Change some clocks of gate-clk type to perip-clk] will fix this issue.

The 2nd commit : [73fa7bb arm: socfpga: Enable ARM_TWD for socfpga] enables the
ARM_TWD timer]

----------------------------------------------------------------
Dinh Nguyen (2):
      arm: socfpga: Enable ARM_TWD for socfpga
      arm: dts: socfpga: Change some clocks of gate-clk type to perip-clk

 arch/arm/boot/dts/socfpga.dtsi |    7 ++++---
 arch/arm/mach-socfpga/Kconfig  |    1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

Comments

Olof Johansson Dec. 3, 2013, 10:23 p.m. UTC | #1
Hi,

On Tue, Dec 3, 2013 at 1:33 PM,  <dinguyen@altera.com> wrote:
> The following changes since commit b5afaa4672cc0f3d707ffa56c6b392646c323a8d:
>
>   Linux 3.13-rc1 (2013-12-03 15:00:46 -0600)
>
> are available in the git repository at:
>
>   git://git.rocketboards.org/linux-socfpga-next.git tags/socfpga-dt-kconfig-fixes-for-3.13
>
> for you to fetch changes up to 2f9f487fb54b4fa9c456921037fb508f5dd7e39b:
>
>   arm: dts: socfpga: Change some clocks of gate-clk type to perip-clk (2013-12-03 15:03:19 -0600)

Something odd is going on with this repo. Seems like you rebased a
bunch of commits from mainline such that they now have you as
committer (and different SHAs).

I'll cherry-pick the two of your patches into fixes instead. Please
see if you can figure out what you made wrong to cause this though for
the future. :)


-Olof
dinguyen@altera.com Dec. 3, 2013, 10:26 p.m. UTC | #2
On Tue, 2013-12-03 at 14:23 -0800, Olof Johansson wrote:
> Hi,
> 
> On Tue, Dec 3, 2013 at 1:33 PM,  <dinguyen@altera.com> wrote:
> > The following changes since commit b5afaa4672cc0f3d707ffa56c6b392646c323a8d:
> >
> >   Linux 3.13-rc1 (2013-12-03 15:00:46 -0600)
> >
> > are available in the git repository at:
> >
> >   git://git.rocketboards.org/linux-socfpga-next.git tags/socfpga-dt-kconfig-fixes-for-3.13
> >
> > for you to fetch changes up to 2f9f487fb54b4fa9c456921037fb508f5dd7e39b:
> >
> >   arm: dts: socfpga: Change some clocks of gate-clk type to perip-clk (2013-12-03 15:03:19 -0600)
> 
> Something odd is going on with this repo. Seems like you rebased a
> bunch of commits from mainline such that they now have you as
> committer (and different SHAs).
> 
> I'll cherry-pick the two of your patches into fixes instead. Please
> see if you can figure out what you made wrong to cause this though for
> the future. :)

Thanks Olof. I'll look to clean it up.

Dinh
> 
> 
> -Olof
>