mbox

[GIT,PULL,1/3] omap non-urgent fixes for v3.20

Message ID pull-1421450357-648499
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.20/fixes-not-urgent-pt1

Message

Tony Lindgren Jan. 16, 2015, 11:21 p.m. UTC 
The following changes since commit 97bf6af1f928216fd6c5a66e8a57bfa95a659672:

  Linux 3.19-rc1 (2014-12-20 17:08:50 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.20/fixes-not-urgent-pt1

for you to fetch changes up to 13efcb188984f69e1f97b4d9e7d3663fb782946f:

  ARM: OMAP2+: Disable omap3 PM init for ti81xx (2015-01-14 17:37:16 -0800)

----------------------------------------------------------------
Non-urgent fixes for omap variant dm816x that has been in a sorry
broken half merged state for a few years now. This gets us to the
point where we can boot it properly once the related SoC data is
added. Note that we've already made dm816x device tree only by
removing the known broken board file.

----------------------------------------------------------------
Tony Lindgren (6):
      ARM: OMAP2+: Fix error handling for omap2_clk_enable_init_clocks
      ARM: OMAP2+: Fix ti81xx devtype
      ARM: OMAP2+: Fix ti81xx class type
      ARM: OMAP2+: Fix dm814 and dm816 for clocks and timer init
      ARM: OMAP2+: Fix reboot for 81xx
      ARM: OMAP2+: Disable omap3 PM init for ti81xx

 arch/arm/mach-omap2/Makefile                |  1 +
 arch/arm/mach-omap2/clock.c                 |  3 +++
 arch/arm/mach-omap2/common.h                | 11 +++++++++-
 arch/arm/mach-omap2/control.h               |  4 ++++
 arch/arm/mach-omap2/id.c                    |  2 ++
 arch/arm/mach-omap2/io.c                    | 26 +++++++++++++++++-----
 arch/arm/mach-omap2/powerdomains3xxx_data.c |  2 +-
 arch/arm/mach-omap2/prm_common.c            |  4 ++++
 arch/arm/mach-omap2/soc.h                   |  4 ++--
 arch/arm/mach-omap2/ti81xx-restart.c        | 34 +++++++++++++++++++++++++++++
 arch/arm/mach-omap2/timer.c                 |  2 ++
 11 files changed, 84 insertions(+), 9 deletions(-)
 create mode 100644 arch/arm/mach-omap2/ti81xx-restart.c

Comments

Olof Johansson Jan. 22, 2015, 12:50 a.m. UTC | #1 
On Fri, Jan 16, 2015 at 03:21:21PM -0800, Tony Lindgren wrote:
> The following changes since commit 97bf6af1f928216fd6c5a66e8a57bfa95a659672:
> 
>   Linux 3.19-rc1 (2014-12-20 17:08:50 -0800)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.20/cleanup-pt1
> 
> for you to fetch changes up to ca662ee7b8a85c54c1cb9ef34b7c6b4f67933a7e:
> 
>   ARM: OMAP2+: Remove unused ti81xx platform init code (2015-01-14 17:21:00 -0800)
> 
> ----------------------------------------------------------------
> Clean-up for omaps to remove dead code found with cppcheck after
> we've made several SoCs to boot in device tree only mode.
> 
> ----------------------------------------------------------------
> Rickard Strandqvist (10):
>       ARM: OMAP2+: clkt2xxx_apll.c: Remove some unused functions
>       ARM: OMAP2+: cm33xx.c: Remove some unused functions
>       ARM: OMAP2+: dpll44xx.c: Remove unused function
>       ARM: OMAP2+: omap_hwmod.c: Remove some unused functions
>       ARM: OMAP2+: powerdomain.c: Remove some unused functions
>       ARM: OMAP2+: voltage: Remove some unused functions
>       ARM: OMAP2+: omap-pm-noop.c: Remove some unused functions
>       ARM: OMAP1: irq.c: Remove unused function
>       ARM: OMAP1: timer32k.c: Remove unused function
>       ARM: OMAP: dma.c: Remove unused function
> 
> Tero Kristo (3):
>       ARM: OMAP2: clock: remove unused apll code
>       ARM: OMAP2: CM: remove unused PLL functions
>       ARM: OMAP3+: PRM: remove prm_get_reset_sources declaration from headers
> 
> Tony Lindgren (1):
>       ARM: OMAP2+: Remove unused ti81xx platform init code
> 
>  arch/arm/mach-omap1/irq.c               |   5 -
>  arch/arm/mach-omap1/timer32k.c          |   5 -
>  arch/arm/mach-omap2/Makefile            |   1 -
>  arch/arm/mach-omap2/cclock3xxx_data.c   |   6 +-
>  arch/arm/mach-omap2/clkt2xxx_apll.c     | 142 -------------------
>  arch/arm/mach-omap2/clock.h             |   1 -
>  arch/arm/mach-omap2/clock2xxx.h         |  11 --
>  arch/arm/mach-omap2/cm2xxx.c            |  10 --
>  arch/arm/mach-omap2/cm2xxx.h            |   2 -
>  arch/arm/mach-omap2/cm33xx.c            |  21 ---
>  arch/arm/mach-omap2/dpll44xx.c          |  20 ---
>  arch/arm/mach-omap2/omap-pm-noop.c      | 196 ---------------------------
>  arch/arm/mach-omap2/omap-pm.h           | 192 --------------------------
>  arch/arm/mach-omap2/omap_hwmod.c        | 232 --------------------------------
>  arch/arm/mach-omap2/omap_hwmod.h        |  16 ---
>  arch/arm/mach-omap2/omap_phy_internal.c |  35 -----
>  arch/arm/mach-omap2/powerdomain.c       |  82 -----------
>  arch/arm/mach-omap2/powerdomain.h       |   5 -
>  arch/arm/mach-omap2/prm3xxx.h           |   1 -
>  arch/arm/mach-omap2/prm44xx_54xx.h      |   1 -
>  arch/arm/mach-omap2/usb-musb.c          |  12 +-
>  arch/arm/mach-omap2/usb.h               |   2 -
>  arch/arm/mach-omap2/voltage.c           | 110 ---------------
>  arch/arm/mach-omap2/voltage.h           |  13 --
>  arch/arm/plat-omap/dma.c                |   8 --
>  25 files changed, 3 insertions(+), 1126 deletions(-)
>  delete mode 100644 arch/arm/mach-omap2/clkt2xxx_apll.c

Nice diffstat. Merged.

-Olof
Olof Johansson Jan. 22, 2015, 12:57 a.m. UTC | #2 
On Fri, Jan 16, 2015 at 03:21:22PM -0800, Tony Lindgren wrote:
> The following changes since commit 97bf6af1f928216fd6c5a66e8a57bfa95a659672:
> 
>   Linux 3.19-rc1 (2014-12-20 17:08:50 -0800)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.20/dt-pt1
> 
> for you to fetch changes up to 7300bfff886a1340cfeb252035303e265cd556d9:
> 
>   ARM: dts: omap3-gta04: Add handling for tv output (2015-01-13 08:02:21 -0800)
> 
> ----------------------------------------------------------------
> Device tree changes for omaps. Mostly to add support for new
> am437x-idk and update am437x-sk boards. Also enabling new
> devices for multiple boards.

Merged, thanks.


-Olof