* [GIT PULL 1/2] omap board removal for some omap3 boards for v3.13 merge window
@ 2013-10-17 20:00 Tony Lindgren
2013-10-17 20:00 ` [GIT PULL 2/2] omap changes for am43xx hwmod " Tony Lindgren
0 siblings, 1 reply; 3+ messages in thread
From: Tony Lindgren @ 2013-10-17 20:00 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit f41509ad0d4c11d0911630440749d409ce2aa1aa:
Merge branches 'omap-for-v3.13/dt' and 'omap-for-v3.13/quirk' into omap-for-v3.13/board-removal (2013-10-14 11:33:07 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.13/board-removal-signed
for you to fetch changes up to f0c09b7c3b4e6b2fe501b3e888797b470de8320c:
ARM: OMAP2+: Remove legacy support for zoom platforms (2013-10-15 17:38:21 -0700)
----------------------------------------------------------------
Changes needed to drop legacy booting support for some
omap3 boards.
Note that that these are based on a merge of the
following for the dependencies:
- v3.12-rc5 for fixes to pinctrl mask
- omap-for-v3.13/dt-signed to avoid pointless merge conflicts
- omap-for-v3.13/quirk-signed for legacy pdata handling
----------------------------------------------------------------
Aaro Koskinen (2):
ARM: dts: add minimal DT support for Nokia N950 & N9 phones
ARM: OMAP2: delete board-rm680
Tony Lindgren (6):
ARM: dts: Shared file for omap GPMC connected smsc911x
ARM: dts: Add common support for omap3-evm
ARM: dts: Add basic support for TMDSEVM3730 (Mistral AM/DM37x EVM)
ARM: dts: Add basic support for zoom3
ARM: OMAP2+: Remove legacy booting support for omap3 EVM
ARM: OMAP2+: Remove legacy support for zoom platforms
arch/arm/boot/dts/Makefile | 4 +
arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi | 52 ++
arch/arm/boot/dts/omap-zoom-common.dtsi | 33 ++
arch/arm/boot/dts/omap3-evm-37xx.dts | 146 ++++++
arch/arm/boot/dts/omap3-evm-common.dtsi | 96 ++++
arch/arm/boot/dts/omap3-evm.dts | 58 +-
arch/arm/boot/dts/omap3-igep0020.dts | 45 +-
arch/arm/boot/dts/omap3-n9.dts | 18 +
arch/arm/boot/dts/omap3-n950-n9.dtsi | 174 ++++++
arch/arm/boot/dts/omap3-n950.dts | 18 +
arch/arm/boot/dts/omap3-zoom3.dts | 217 ++++++++
arch/arm/mach-omap2/Kconfig | 33 --
arch/arm/mach-omap2/Makefile | 11 -
arch/arm/mach-omap2/board-3630sdp.c | 225 --------
arch/arm/mach-omap2/board-ldp.c | 3 +-
arch/arm/mach-omap2/board-omap3evm.c | 756 ---------------------------
arch/arm/mach-omap2/board-rm680.c | 167 ------
arch/arm/mach-omap2/board-zoom-debugboard.c | 139 -----
arch/arm/mach-omap2/board-zoom-display.c | 71 ---
arch/arm/mach-omap2/board-zoom-peripherals.c | 360 -------------
arch/arm/mach-omap2/board-zoom.c | 159 ------
arch/arm/mach-omap2/board-zoom.h | 10 -
22 files changed, 763 insertions(+), 2032 deletions(-)
create mode 100644 arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi
create mode 100644 arch/arm/boot/dts/omap-zoom-common.dtsi
create mode 100644 arch/arm/boot/dts/omap3-evm-37xx.dts
create mode 100644 arch/arm/boot/dts/omap3-evm-common.dtsi
create mode 100644 arch/arm/boot/dts/omap3-n9.dts
create mode 100644 arch/arm/boot/dts/omap3-n950-n9.dtsi
create mode 100644 arch/arm/boot/dts/omap3-n950.dts
create mode 100644 arch/arm/boot/dts/omap3-zoom3.dts
delete mode 100644 arch/arm/mach-omap2/board-3630sdp.c
delete mode 100644 arch/arm/mach-omap2/board-omap3evm.c
delete mode 100644 arch/arm/mach-omap2/board-rm680.c
delete mode 100644 arch/arm/mach-omap2/board-zoom-debugboard.c
delete mode 100644 arch/arm/mach-omap2/board-zoom-display.c
delete mode 100644 arch/arm/mach-omap2/board-zoom-peripherals.c
delete mode 100644 arch/arm/mach-omap2/board-zoom.c
delete mode 100644 arch/arm/mach-omap2/board-zoom.h
^ permalink raw reply [flat|nested] 3+ messages in thread
* [GIT PULL 2/2] omap changes for am43xx hwmod for v3.13 merge window
2013-10-17 20:00 [GIT PULL 1/2] omap board removal for some omap3 boards for v3.13 merge window Tony Lindgren
@ 2013-10-17 20:00 ` Tony Lindgren
0 siblings, 0 replies; 3+ messages in thread
From: Tony Lindgren @ 2013-10-17 20:00 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 254f57a92987b6cde6004f58d6b847813dfb9e0e:
ARM: OMAP5: hwmod: add missing ocp2scp hwmod data (2013-10-11 15:37:05 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.13/am43xx-hwmod-signed
for you to fetch changes up to 811e7c87340b75dce5c488d9496075b00853942b:
Merge tag 'for-v3.13/am43xx-support' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.13/hwmod (2013-10-17 10:37:27 -0700)
----------------------------------------------------------------
Changes needed for am43xx for the hwmod data.
This will be the last new set of hwmod data for any SoC
as future SoCs will use a driver and device tree based
approach. But before that can be dealt with, we need to
first sort out the pending driver/clk issues.
Queued by Paul Walmsley <paul@pwsan.com>:
Add hwmod and PRCM data for the TI AM43xx family of SoCs.
Under normal circumstances, these patches would not be merged.
The hwmod and PRCM data should be moved out either to DT data or
to drivers/. Also, the current implementation trades off lines
of diff by dynamically rewriting static data at runtime, which is
a bad practice - it causes future maintenance headaches.
However, after speaking with my upstream, it sounds like it's
better to merge these patches in their current state, due to long
term considerations.
Basic test logs are here:
http://www.pwsan.com/omap/testlogs/am43xx_support_v3.13/20131015213706/
Due to the lack of an AM43xx board and any available public
documentation, it's impossible for me to review or test that
platform in any meaningful way. But at least the tests above
verify that the patches don't affect existing platforms -
particularly AM33xx.
----------------------------------------------------------------
Afzal Mohammed (7):
ARM: OMAP2+: hwmod: AM335x/AM43x: move common data
ARM: OMAP2+: hwmod: AM335x: runtime register update
ARM: OMAP2+: hwmod: AM335x: remove static register offs
ARM: OMAP2+: PRCM: AM43x definitions
ARM: OMAP2+: hwmod: AM43x support
ARM: OMAP2+: hwmod: AM43x operations
ARM: OMAP2+: AM43x: PRCM kbuild
Ambresh K (3):
ARM: OMAP2+: PM: AM43x powerdomain data
ARM: OMAP2+: CM: AM43x clockdomain data
ARM: OMAP2+: AM43x PRCM init
Ankur Kishore (1):
ARM: OMAP2+: CM: cm_inst offset s16->u16
George Cherian (1):
ARM: OMAP2+: hwmod: Add USB hwmod data for AM437x.
Sourav Poddar (1):
ARM: OMAP2: hwmod: Add qspi data for am437x.
Tony Lindgren (1):
Merge tag 'for-v3.13/am43xx-support' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.13/hwmod
arch/arm/mach-omap2/Makefile | 9 +-
arch/arm/mach-omap2/clockdomain.h | 4 +-
arch/arm/mach-omap2/clockdomains43xx_data.c | 196 ++
arch/arm/mach-omap2/cm33xx.c | 16 +-
arch/arm/mach-omap2/cm33xx.h | 12 +-
arch/arm/mach-omap2/cminst44xx.c | 29 +-
arch/arm/mach-omap2/cminst44xx.h | 26 +-
arch/arm/mach-omap2/io.c | 6 +
arch/arm/mach-omap2/omap_hwmod.c | 8 +
arch/arm/mach-omap2/omap_hwmod.h | 1 +
.../mach-omap2/omap_hwmod_33xx_43xx_common_data.h | 163 ++
.../omap_hwmod_33xx_43xx_interconnect_data.c | 643 ++++++
.../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 1469 +++++++++++++
arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 2263 ++------------------
arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 758 +++++++
arch/arm/mach-omap2/powerdomain.h | 1 +
arch/arm/mach-omap2/powerdomains43xx_data.c | 136 ++
arch/arm/mach-omap2/prcm43xx.h | 146 ++
18 files changed, 3728 insertions(+), 2158 deletions(-)
create mode 100644 arch/arm/mach-omap2/clockdomains43xx_data.c
create mode 100644 arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h
create mode 100644 arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c
create mode 100644 arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c
create mode 100644 arch/arm/mach-omap2/omap_hwmod_43xx_data.c
create mode 100644 arch/arm/mach-omap2/powerdomains43xx_data.c
create mode 100644 arch/arm/mach-omap2/prcm43xx.h
^ permalink raw reply [flat|nested] 3+ messages in thread
* [GIT PULL 2/2] omap changes for am43xx hwmod for v3.13 merge window
[not found] <526041df.4740e50a.3954.5084SMTPIN_ADDED_MISSING@mx.google.com>
@ 2013-10-18 14:53 ` Kevin Hilman
0 siblings, 0 replies; 3+ messages in thread
From: Kevin Hilman @ 2013-10-18 14:53 UTC (permalink / raw)
To: linux-arm-kernel
Tony Lindgren <tony@atomide.com> writes:
> The following changes since commit 254f57a92987b6cde6004f58d6b847813dfb9e0e:
>
> ARM: OMAP5: hwmod: add missing ocp2scp hwmod data (2013-10-11 15:37:05 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.13/am43xx-hwmod-signed
>
> for you to fetch changes up to 811e7c87340b75dce5c488d9496075b00853942b:
>
> Merge tag 'for-v3.13/am43xx-support' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.13/hwmod (2013-10-17 10:37:27 -0700)
>
> ----------------------------------------------------------------
>
> Changes needed for am43xx for the hwmod data.
>
> This will be the last new set of hwmod data for any SoC
> as future SoCs will use a driver and device tree based
> approach. But before that can be dealt with, we need to
> first sort out the pending driver/clk issues.
>
> Queued by Paul Walmsley <paul@pwsan.com>:
>
> Add hwmod and PRCM data for the TI AM43xx family of SoCs.
>
> Under normal circumstances, these patches would not be merged.
> The hwmod and PRCM data should be moved out either to DT data or
> to drivers/. Also, the current implementation trades off lines
> of diff by dynamically rewriting static data at runtime, which is
> a bad practice - it causes future maintenance headaches.
> However, after speaking with my upstream, it sounds like it's
> better to merge these patches in their current state, due to long
> term considerations.
>
> Basic test logs are here:
>
> http://www.pwsan.com/omap/testlogs/am43xx_support_v3.13/20131015213706/
>
> Due to the lack of an AM43xx board and any available public
> documentation, it's impossible for me to review or test that
> platform in any meaningful way. But at least the tests above
> verify that the patches don't affect existing platforms -
> particularly AM33xx.
>
> ----------------------------------------------------------------
Pulled into next/soc.
Thanks,
Kevin
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-10-18 14:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-17 20:00 [GIT PULL 1/2] omap board removal for some omap3 boards for v3.13 merge window Tony Lindgren
2013-10-17 20:00 ` [GIT PULL 2/2] omap changes for am43xx hwmod " Tony Lindgren
[not found] <526041df.4740e50a.3954.5084SMTPIN_ADDED_MISSING@mx.google.com>
2013-10-18 14:53 ` Kevin Hilman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).