* [GIT PULL] arm-soc new SOCs for 3.1
@ 2011-07-26 22:24 Arnd Bergmann
2011-07-26 22:31 ` [GIT PULL] arm-soc bug fixes (part 2) " Arnd Bergmann
0 siblings, 1 reply; 8+ messages in thread
From: Arnd Bergmann @ 2011-07-26 22:24 UTC (permalink / raw)
To: Linus Torvalds
Cc: Thomas Gleixner, Nicolas Pitre, linux-kernel, linux-arm-kernel,
Russell King, Paul Walmsley, Tony Lindgren
Hi Linus,
This adds support for two new platforms and a new OMAP SOC in the
ARM architecture. The new platforms, zynq and prima2, are about as
good as it gets in following the latest set of guidelines for how
to do a platform in ARM. We are working on improving that further,
getting rid of the need for platform specific include/mach/*.h files
one by one, and moving the clock and timer code into drivers.
The infrastructure required for those changes is not there yet, and
I see no reason to keep the new platforms out while waiting for it.
If everything goes well, they will become even cleaner in 3.2 and can
serve as examples for the other platforms in the meantime, showing
everyone where we are headed with the move to device trees instead
of board files.
The OMAP4460 is the current platform from TI, it still largely follows
the same basic pattern as other OMAP, which I think is the best
we can do for that right now. There is a small conflict in
cm-regbits-44xx.h, my solution was
+/* Renamed from DELTAMSTEP Used by CM_SSC_DELTAMSTEP_DPLL_USB */
+#define OMAP4460_DELTAMSTEP_0_20_SHIFT 0
+#define OMAP4460_DELTAMSTEP_0_20_MASK (0x1fffff << 0)
+
- /* Used by CM_SHADOW_FREQ_CONFIG1, CM_SHADOW_FREQ_CONFIG1_RESTORE */
- #define OMAP4430_DLL_OVERRIDE_SHIFT 2
- #define OMAP4430_DLL_OVERRIDE_MASK (1 << 2)
+ /* Used by CM_DLL_CTRL */
+ #define OMAP4430_DLL_OVERRIDE_SHIFT 0
+ #define OMAP4430_DLL_OVERRIDE_MASK (1 << 0)
- /* Renamed from DLL_OVERRIDE Used by CM_DLL_CTRL */
- #define OMAP4430_DLL_OVERRIDE_0_0_SHIFT 0
- #define OMAP4430_DLL_OVERRIDE_0_0_MASK (1 << 0)
+ /* Renamed from DLL_OVERRIDE Used by CM_SHADOW_FREQ_CONFIG1 */
+ #define OMAP4430_DLL_OVERRIDE_2_2_SHIFT 2
+ #define OMAP4430_DLL_OVERRIDE_2_2_MASK (1 << 2)
All the branches I'm sending today are also merged in the for-next
branch of arm-soc, so you can also pull that one instead if you get
bored by the conflicts and just want to have it all.
The diffstat below is the one I generated post-merge, for reasons
I still need to understand better, git-request-pull would otherwise
add the diffstat for the omap/cleanup branch that you have already
pulled.
Arnd
The following changes since commit ba5b56cb3e3d2cab73d4fee9a022bb69462a8cd9:
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client (2011-07-26 13:38:50 -0700)
are available in the git repository at:
git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc.git/ next/soc
Aneesh V (2):
OMAP: ID: introduce chip detection for OMAP4460
OMAP4: ID: add omap_has_feature for max freq supported
Arnd Bergmann (3):
ARM: Xilinx: merge board file into main platform code
Merge branch 'zynq/master' of git+ssh://master.kernel.org/.../arm/linux-arm-soc into next/soc
Merge branch 'omap/4460' of git+ssh://master.kernel.org/.../arm/linux-arm-soc into next/soc
Barry Song (2):
ARM: CSR: mapping early DEBUG_LL uart
MAINTAINERS: add maintainer of CSR SiRFprimaII machine
Binghua Duan (1):
ARM: CSR: Adding CSR SiRFprimaII board support
John Linn (1):
ARM: Xilinx: Adding Xilinx board support
Rajendra Nayak (2):
OMAP4: PRCM: OMAP4460 specific PRM and CM register bitshifts
OMAP4: clocks: Update the clock tree with 4460 clock nodes
Rongjun Ying (1):
ARM: CSR: initializing L2 cache
Documentation/devicetree/bindings/arm/sirf.txt | 3 +
Documentation/devicetree/bindings/arm/xilinx.txt | 7 +
MAINTAINERS | 6 +
arch/arm/Kconfig | 26 ++
arch/arm/Makefile | 3 +
arch/arm/boot/dts/prima2-cb.dts | 416 ++++++++++++++++++
arch/arm/boot/dts/zynq-ep107.dts | 52 +++
arch/arm/mach-omap2/clock44xx_data.c | 39 ++
arch/arm/mach-omap2/cm-regbits-44xx.h | 36 ++
arch/arm/mach-omap2/id.c | 53 ++-
arch/arm/mach-omap2/prm-regbits-44xx.h | 8 +
arch/arm/mach-prima2/Makefile | 7 +
arch/arm/mach-prima2/Makefile.boot | 3 +
arch/arm/mach-prima2/clock.c | 509 ++++++++++++++++++++++
arch/arm/mach-prima2/common.h | 26 ++
arch/arm/mach-prima2/include/mach/clkdev.h | 15 +
arch/arm/mach-prima2/include/mach/debug-macro.S | 29 ++
arch/arm/mach-prima2/include/mach/entry-macro.S | 29 ++
arch/arm/mach-prima2/include/mach/hardware.h | 15 +
arch/arm/mach-prima2/include/mach/io.h | 16 +
arch/arm/mach-prima2/include/mach/irqs.h | 17 +
arch/arm/mach-prima2/include/mach/map.h | 16 +
arch/arm/mach-prima2/include/mach/memory.h | 21 +
arch/arm/mach-prima2/include/mach/system.h | 29 ++
arch/arm/mach-prima2/include/mach/timex.h | 14 +
arch/arm/mach-prima2/include/mach/uart.h | 23 +
arch/arm/mach-prima2/include/mach/uncompress.h | 40 ++
arch/arm/mach-prima2/include/mach/vmalloc.h | 16 +
arch/arm/mach-prima2/irq.c | 71 +++
arch/arm/mach-prima2/l2x0.c | 59 +++
arch/arm/mach-prima2/lluart.c | 25 +
arch/arm/mach-prima2/prima2.c | 41 ++
arch/arm/mach-prima2/rstc.c | 69 +++
arch/arm/mach-prima2/timer.c | 217 +++++++++
arch/arm/mach-zynq/Makefile | 6 +
arch/arm/mach-zynq/Makefile.boot | 3 +
arch/arm/mach-zynq/common.c | 118 +++++
arch/arm/mach-zynq/common.h | 24 +
arch/arm/mach-zynq/include/mach/clkdev.h | 32 ++
arch/arm/mach-zynq/include/mach/debug-macro.S | 36 ++
arch/arm/mach-zynq/include/mach/entry-macro.S | 30 ++
arch/arm/mach-zynq/include/mach/hardware.h | 18 +
arch/arm/mach-zynq/include/mach/io.h | 33 ++
arch/arm/mach-zynq/include/mach/irqs.h | 21 +
arch/arm/mach-zynq/include/mach/memory.h | 22 +
arch/arm/mach-zynq/include/mach/system.h | 28 ++
arch/arm/mach-zynq/include/mach/timex.h | 23 +
arch/arm/mach-zynq/include/mach/uart.h | 25 +
arch/arm/mach-zynq/include/mach/uncompress.h | 51 +++
arch/arm/mach-zynq/include/mach/vmalloc.h | 20 +
arch/arm/mach-zynq/include/mach/zynq_soc.h | 48 ++
arch/arm/mach-zynq/timer.c | 298 +++++++++++++
arch/arm/mm/Kconfig | 3 +-
arch/arm/plat-omap/include/plat/clkdev_omap.h | 1 +
arch/arm/plat-omap/include/plat/clock.h | 2 +
arch/arm/plat-omap/include/plat/cpu.h | 35 ++-
56 files changed, 2820 insertions(+), 13 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/sirf.txt
create mode 100644 Documentation/devicetree/bindings/arm/xilinx.txt
create mode 100644 arch/arm/boot/dts/prima2-cb.dts
create mode 100644 arch/arm/boot/dts/zynq-ep107.dts
create mode 100644 arch/arm/mach-prima2/Makefile
create mode 100644 arch/arm/mach-prima2/Makefile.boot
create mode 100644 arch/arm/mach-prima2/clock.c
create mode 100644 arch/arm/mach-prima2/common.h
create mode 100644 arch/arm/mach-prima2/include/mach/clkdev.h
create mode 100644 arch/arm/mach-prima2/include/mach/debug-macro.S
create mode 100644 arch/arm/mach-prima2/include/mach/entry-macro.S
create mode 100644 arch/arm/mach-prima2/include/mach/hardware.h
create mode 100644 arch/arm/mach-prima2/include/mach/io.h
create mode 100644 arch/arm/mach-prima2/include/mach/irqs.h
create mode 100644 arch/arm/mach-prima2/include/mach/map.h
create mode 100644 arch/arm/mach-prima2/include/mach/memory.h
create mode 100644 arch/arm/mach-prima2/include/mach/system.h
create mode 100644 arch/arm/mach-prima2/include/mach/timex.h
create mode 100644 arch/arm/mach-prima2/include/mach/uart.h
create mode 100644 arch/arm/mach-prima2/include/mach/uncompress.h
create mode 100644 arch/arm/mach-prima2/include/mach/vmalloc.h
create mode 100644 arch/arm/mach-prima2/irq.c
create mode 100644 arch/arm/mach-prima2/l2x0.c
create mode 100644 arch/arm/mach-prima2/lluart.c
create mode 100644 arch/arm/mach-prima2/prima2.c
create mode 100644 arch/arm/mach-prima2/rstc.c
create mode 100644 arch/arm/mach-prima2/timer.c
create mode 100644 arch/arm/mach-zynq/Makefile
create mode 100644 arch/arm/mach-zynq/Makefile.boot
create mode 100644 arch/arm/mach-zynq/board_dt.c
create mode 100644 arch/arm/mach-zynq/common.c
create mode 100644 arch/arm/mach-zynq/common.h
create mode 100644 arch/arm/mach-zynq/include/mach/clkdev.h
create mode 100644 arch/arm/mach-zynq/include/mach/debug-macro.S
create mode 100644 arch/arm/mach-zynq/include/mach/entry-macro.S
create mode 100644 arch/arm/mach-zynq/include/mach/hardware.h
create mode 100644 arch/arm/mach-zynq/include/mach/io.h
create mode 100644 arch/arm/mach-zynq/include/mach/irqs.h
create mode 100644 arch/arm/mach-zynq/include/mach/memory.h
create mode 100644 arch/arm/mach-zynq/include/mach/system.h
create mode 100644 arch/arm/mach-zynq/include/mach/timex.h
create mode 100644 arch/arm/mach-zynq/include/mach/uart.h
create mode 100644 arch/arm/mach-zynq/include/mach/uncompress.h
create mode 100644 arch/arm/mach-zynq/include/mach/vmalloc.h
create mode 100644 arch/arm/mach-zynq/include/mach/zynq_soc.h
create mode 100644 arch/arm/mach-zynq/timer.c
^ permalink raw reply [flat|nested] 8+ messages in thread
* [GIT PULL] arm-soc bug fixes (part 2) for 3.1
2011-07-26 22:24 [GIT PULL] arm-soc new SOCs for 3.1 Arnd Bergmann
@ 2011-07-26 22:31 ` Arnd Bergmann
2011-07-26 22:36 ` [GIT PULL] arm-soc cross-platform cleanups " Arnd Bergmann
0 siblings, 1 reply; 8+ messages in thread
From: Arnd Bergmann @ 2011-07-26 22:31 UTC (permalink / raw)
To: Linus Torvalds
Cc: Thomas Gleixner, Nicolas Pitre, linux-kernel, linux-arm-kernel,
Russell King, Paul Walmsley, Tony Lindgren
Hi Linus,
This branch contains more bug fixes, all for the omap platform. They were not
part of the first pull request because they depend on branches that you
have pulled in the meantime.
Arnd
The following changes since commit ba5b56cb3e3d2cab73d4fee9a022bb69462a8cd9:
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client (2011-07-26 13:38:50 -0700)
are available in the git repository at:
git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc.git/ next/fixes2
Ambresh K (1):
OMAP4: DMTIMER: enable autoidle mode
Andy Green (6):
I2C: OMAP2+: Set hwmod flags to only allow 16-bit accesses to i2c
I2C: OMAP2+: increase omap_i2c_dev_attr flags from u8 to u32
I2C: OMAP2+: Introduce I2C IP versioning constants
I2C: OMAP1/OMAP2+: create omap I2C functionality flags for each cpu_... test
I2C: OMAP2+: Tag all OMAP2+ hwmod defintions with I2C IP revision
I2C: OMAP2+: add correct functionality flags to all omap2plus i2c dev_attr
Arnd Bergmann (1):
Merge branch 'fixes-part-2' of git://git.kernel.org/.../tmlind/linux-omap-2.6 into omap/fixes
Avinash.H.M (1):
OMAP: hwmod: fix the i2c-reset timeout during bootup
Benoit Cousson (1):
OMAP4: powerdomain data: Fix core mem states and missing cefuse flag
Charulatha V (1):
omap: ZOOM: QUART: Request reset GPIO
Daniel Mack (1):
omap: Overo: remove duplicate call to overo_ads7846_init()
Igor Grinberg (2):
arm: omap3: cm-t35: minor comments fixes
arm: omap3: cm-t35: fix slow path warning
Julia Lawall (1):
arch/arm/mach-omap2/clock.c: add missing clk_put
Ohad Ben-Cohen (2):
omap: iovmm: s/sg_dma_len(sg)/sg->length/
OMAP4: iommu: fix clock name
Paul Walmsley (2):
Merge branches 'powerdomain_fixes_3.1', 'hardware_workarounds_3.1', 'hwmod_dss_fix_3.1' and 'i2c_fixes_3.1' into prcm-fixes-3.1
ASoC: omap: McBSP: fix build breakage on OMAP1
Rajendra Nayak (1):
OMAP2+: PM: Initialise sleep_switch to a non-valid value
Santosh Shilimkar (2):
OMAP4: clock data: Keep GPMC clocks always enabled and hardware managed
OMAP4: powerdomain data: Remove unsupported MPU powerdomain state
Silesh C V (1):
omap: HSMMC: Fix GPIO muxing
Suman Anna (1):
omap: iommu: fix pte programming
Tomi Valkeinen (2):
OMAP4: hwmod data: Modify DSS opt clocks
OMAP4: hwmod data: Change DSS main_clk scheme
Tony Lindgren (2):
Merge branch 'iommu-for-tony' of git://github.com/ohadbc/omap-iommu into devel-fixes
Merge branch 'prcm-fixes-3.1' of git://git.pwsan.com/linux-2.6 into fixes-part-2
arch/arm/mach-omap2/board-cm-t35.c | 18 ++----
arch/arm/mach-omap2/board-overo.c | 1 -
arch/arm/mach-omap2/board-zoom-debugboard.c | 9 +++
arch/arm/mach-omap2/clock.c | 1 +
arch/arm/mach-omap2/clock44xx_data.c | 9 ++-
arch/arm/mach-omap2/hsmmc.c | 7 +-
arch/arm/mach-omap2/i2c.c | 68 +++++++++++++++++++++
arch/arm/mach-omap2/iommu2.c | 4 +-
arch/arm/mach-omap2/omap-iommu.c | 2 +-
arch/arm/mach-omap2/omap_hwmod.c | 27 +++++++++
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 9 +++-
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 7 ++
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 18 +++++-
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 81 ++++++++++++++++++++------
arch/arm/mach-omap2/pm.c | 2 +-
arch/arm/mach-omap2/powerdomains44xx_data.c | 9 ++-
arch/arm/plat-omap/dmtimer.c | 4 +-
arch/arm/plat-omap/include/plat/i2c.h | 6 ++-
arch/arm/plat-omap/include/plat/omap_hwmod.h | 1 +
arch/arm/plat-omap/iovmm.c | 6 +-
arch/arm/plat-omap/mcbsp.c | 27 +++++++++
include/linux/i2c-omap.h | 27 +++++++++
22 files changed, 288 insertions(+), 55 deletions(-)
^ permalink raw reply [flat|nested] 8+ messages in thread
* [GIT PULL] arm-soc cross-platform cleanups for 3.1
2011-07-26 22:31 ` [GIT PULL] arm-soc bug fixes (part 2) " Arnd Bergmann
@ 2011-07-26 22:36 ` Arnd Bergmann
2011-07-26 23:01 ` [GIT PULL] arm-soc new board support " Arnd Bergmann
0 siblings, 1 reply; 8+ messages in thread
From: Arnd Bergmann @ 2011-07-26 22:36 UTC (permalink / raw)
To: Linus Torvalds
Cc: Thomas Gleixner, Nicolas Pitre, linux-kernel, linux-arm-kernel,
Russell King
Hi Linus,
These are cleanups that unify code across platforms in the arm architecture,
as opposed to the earlier cleanups I sent that clean up code within
each platform. There is a small merge conflict in the
arch/microblaze/include/asm/pci-bridge.h file that should be resolved
by simply removing the enum that was changed in another branch.
Arnd
The following changes since commit ba5b56cb3e3d2cab73d4fee9a022bb69462a8cd9:
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client (2011-07-26 13:38:50 -0700)
are available in the git repository at:
git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc.git/ next/cross-platform
Arnd Bergmann (1):
Merge branch 'cross-platform/clkdev' into next/cross-platform
Kyungmin Park (1):
ARM: Consolidate the clkdev header files
Rob Herring (6):
powerpc: rename ppc_pci_*_flags to pci_*_flags
pci: move microblaze and powerpc pci flag functions into asm-generic
ARM: remove unnecessary mach/hardware.h includes
ARM: pci: make pcibios_assign_all_busses use pci_has_flag
ARM: convert PCI defines to variables
ARM: set vga memory base at run-time
arch/arm/Kconfig | 6 ++
arch/arm/include/asm/clkdev.h | 5 ++
arch/arm/include/asm/pci.h | 12 ++++-
arch/arm/include/asm/vga.h | 5 +-
arch/arm/lib/ecard.S | 1 -
arch/arm/lib/io-readsw-armv3.S | 1 -
arch/arm/lib/io-writesw-armv3.S | 1 -
arch/arm/mach-at91/include/mach/clkdev.h | 7 --
arch/arm/mach-bcmring/include/mach/clkdev.h | 7 --
arch/arm/mach-bcmring/include/mach/hardware.h | 2 -
arch/arm/mach-cns3xxx/cns3420vb.c | 1 -
arch/arm/mach-cns3xxx/include/mach/hardware.h | 22 -------
arch/arm/mach-cns3xxx/pcie.c | 3 +
arch/arm/mach-davinci/include/mach/clkdev.h | 15 -----
arch/arm/mach-dove/include/mach/hardware.h | 7 --
arch/arm/mach-dove/pcie.c | 3 +
arch/arm/mach-ep93xx/include/mach/clkdev.h | 11 ----
arch/arm/mach-ep93xx/include/mach/hardware.h | 2 -
arch/arm/mach-footbridge/dc21285.c | 3 +
arch/arm/mach-footbridge/include/mach/hardware.h | 5 --
arch/arm/mach-integrator/include/mach/hardware.h | 7 --
arch/arm/mach-integrator/pci_v3.c | 5 ++
arch/arm/mach-iop13xx/include/mach/hardware.h | 7 --
arch/arm/mach-iop13xx/pci.c | 5 +-
arch/arm/mach-iop32x/include/mach/hardware.h | 3 -
arch/arm/mach-iop33x/include/mach/hardware.h | 3 -
arch/arm/mach-ixp2000/include/mach/hardware.h | 8 ---
arch/arm/mach-ixp2000/pci.c | 5 ++
arch/arm/mach-ixp23xx/include/mach/hardware.h | 4 -
arch/arm/mach-ixp23xx/pci.c | 5 ++
arch/arm/mach-ixp4xx/common-pci.c | 5 ++
arch/arm/mach-ixp4xx/include/mach/hardware.h | 5 --
arch/arm/mach-kirkwood/include/mach/hardware.h | 7 --
arch/arm/mach-kirkwood/pcie.c | 3 +
arch/arm/mach-ks8695/include/mach/hardware.h | 9 ---
arch/arm/mach-ks8695/pci.c | 3 +
arch/arm/mach-lpc32xx/include/mach/clkdev.h | 25 --------
arch/arm/mach-mmp/include/mach/clkdev.h | 7 --
arch/arm/mach-msm/include/mach/clkdev.h | 19 ------
arch/arm/mach-mv78xx0/include/mach/hardware.h | 7 --
arch/arm/mach-mv78xx0/pcie.c | 3 +
arch/arm/mach-mxs/include/mach/clkdev.h | 7 --
arch/arm/mach-nomadik/include/mach/clkdev.h | 7 --
arch/arm/mach-nuc93x/include/mach/clkdev.h | 7 --
arch/arm/mach-omap1/include/mach/clkdev.h | 5 --
arch/arm/mach-omap2/include/mach/clkdev.h | 5 --
arch/arm/mach-orion5x/include/mach/hardware.h | 7 --
arch/arm/mach-orion5x/pci.c | 2 +
arch/arm/mach-pnx4008/include/mach/clkdev.h | 7 --
arch/arm/mach-pxa/cm-x2xx-pci.c | 3 +
arch/arm/mach-pxa/include/mach/clkdev.h | 7 --
arch/arm/mach-pxa/include/mach/hardware.h | 3 -
arch/arm/mach-sa1100/include/mach/hardware.h | 8 ---
arch/arm/mach-sa1100/pci-nanoengine.c | 3 +
arch/arm/mach-shark/include/mach/hardware.h | 6 --
arch/arm/mach-shark/pci.c | 12 +++-
arch/arm/mach-spear3xx/include/mach/clkdev.h | 19 ------
arch/arm/mach-spear6xx/include/mach/clkdev.h | 19 ------
arch/arm/mach-tegra/include/mach/clkdev.h | 34 -----------
arch/arm/mach-tegra/include/mach/hardware.h | 28 ---------
arch/arm/mach-tegra/include/mach/system.h | 1 -
arch/arm/mach-tegra/io.c | 1 -
arch/arm/mach-tegra/pcie.c | 2 +
arch/arm/mach-tegra/platsmp.c | 1 -
arch/arm/mach-ux500/include/mach/clkdev.h | 7 --
arch/arm/mach-versatile/include/mach/hardware.h | 6 --
arch/arm/mach-versatile/pci.c | 3 +
arch/arm/mach-w90x900/include/mach/clkdev.h | 7 --
arch/arm/mm/iomap.c | 12 ++++
arch/arm/mm/proc-xsc3.S | 1 -
arch/arm/plat-iop/pci.c | 3 +
arch/arm/plat-mxc/include/mach/clkdev.h | 7 --
arch/arm/plat-omap/include/plat/clkdev.h | 13 ----
arch/arm/plat-spear/include/plat/clkdev.h | 20 -------
arch/arm/plat-tcc/include/mach/clkdev.h | 7 --
arch/microblaze/include/asm/pci-bridge.h | 67 +++------------------
arch/powerpc/include/asm/pci-bridge.h | 50 +----------------
arch/powerpc/include/asm/pci.h | 2 +-
arch/powerpc/kernel/pci-common.c | 22 ++++----
arch/powerpc/kernel/pci_32.c | 2 +-
arch/powerpc/kernel/pci_64.c | 4 +-
arch/powerpc/kernel/rtas_pci.c | 2 +-
arch/powerpc/platforms/40x/ep405.c | 2 +-
arch/powerpc/platforms/40x/ppc40x_simple.c | 2 +-
arch/powerpc/platforms/40x/walnut.c | 2 +-
arch/powerpc/platforms/44x/canyonlands.c | 2 +-
arch/powerpc/platforms/44x/ebony.c | 2 +-
arch/powerpc/platforms/44x/ppc44x_simple.c | 2 +-
arch/powerpc/platforms/44x/sam440ep.c | 2 +-
arch/powerpc/platforms/52xx/mpc52xx_pci.c | 2 +-
arch/powerpc/platforms/82xx/pq2.c | 2 +-
arch/powerpc/platforms/chrp/pci.c | 2 +-
arch/powerpc/platforms/powermac/pci.c | 6 +-
arch/powerpc/sysdev/fsl_pci.c | 4 +-
arch/powerpc/sysdev/grackle.c | 2 +-
arch/powerpc/sysdev/ppc4xx_pci.c | 2 +-
drivers/clk/Kconfig | 3 +
include/asm-generic/pci-bridge.h | 62 ++++++++++++++++++++
98 files changed, 212 insertions(+), 580 deletions(-)
delete mode 100644 arch/arm/mach-at91/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-cns3xxx/include/mach/hardware.h
delete mode 100644 arch/arm/mach-davinci/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-ep93xx/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-lpc32xx/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-mmp/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-msm/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-mxs/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-nomadik/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-nuc93x/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-omap1/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-omap2/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-pnx4008/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-pxa/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-spear3xx/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-spear6xx/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-tegra/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-tegra/include/mach/hardware.h
delete mode 100644 arch/arm/mach-ux500/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-w90x900/include/mach/clkdev.h
delete mode 100644 arch/arm/plat-mxc/include/mach/clkdev.h
delete mode 100644 arch/arm/plat-omap/include/plat/clkdev.h
delete mode 100644 arch/arm/plat-spear/include/plat/clkdev.h
delete mode 100644 arch/arm/plat-tcc/include/mach/clkdev.h
create mode 100644 include/asm-generic/pci-bridge.h
^ permalink raw reply [flat|nested] 8+ messages in thread
* [GIT PULL] arm-soc new board support for 3.1
2011-07-26 22:36 ` [GIT PULL] arm-soc cross-platform cleanups " Arnd Bergmann
@ 2011-07-26 23:01 ` Arnd Bergmann
2011-07-26 23:25 ` [GIT PULL] arm-soc new features (part 1/2) " Arnd Bergmann
0 siblings, 1 reply; 8+ messages in thread
From: Arnd Bergmann @ 2011-07-26 23:01 UTC (permalink / raw)
To: Linus Torvalds
Cc: Thomas Gleixner, Nicolas Pitre, linux-kernel, linux-arm-kernel,
Russell King
Hi Linus,
This adds support for new boards in the TI omap and samsung s3c platforms.
These platforms are still a long way from being able to add support for
new boards just with a device tree instead of a board file, but it's
clear from the work going into these platforms that the maintainers
are actively working on changing that.
Once we get to the point that the platforms can describe a board using
a device tree, we will start removing existing board files and no longer
allow new ones. Until then, my feeling is that we need to allow additional
boards to be added when they are clean enough and work is proceeding on
obsoleting them.
Arnd
The following changes since commit ba5b56cb3e3d2cab73d4fee9a022bb69462a8cd9:
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client (2011-07-26 13:38:50 -0700)
are available in the git repository at:
git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc.git/ next/board
Ambresh K (1):
OMAP4: DMTIMER: enable autoidle mode
Ameya Palande (1):
omap: rx51: Platform support for lp5523 led chip
Arnd Bergmann (2):
Merge branch 'omap/board' of git+ssh://master.kernel.org/.../arm/linux-arm-soc into next/board
Merge branch 'next-samsung-board' of git://git.kernel.org/.../kgene/linux-samsung into next/board
Charulatha V (1):
omap: ZOOM: QUART: Request reset GPIO
Daniel Mack (1):
omap: Overo: remove duplicate call to overo_ads7846_init()
Igor Grinberg (3):
arm: omap3: cm-t35: minor comments fixes
arm: omap3: cm-t35: fix slow path warning
arm: omap3: cm-t35: add support for cm-t3730
Joel A Fernandes (1):
OMAP3: beagle: add support for beagleboard xM revision C
Julia Lawall (1):
arch/arm/mach-omap2/clock.c: add missing clk_put
Kalle Jokiniemi (1):
OMAP3: rx-51: Add full regulator definitions
Mark Brown (5):
ARM: S3C64XX: Initial support for Wolfson/Simtec Cragganmore/Banff
ARM: S3C64XX: Refresh Cragganmore support
ARM: S3C64XX: Configure supplies for all Cragganmore regulators
Ohad Ben-Cohen (2):
omap: iovmm: s/sg_dma_len(sg)/sg->length/
OMAP4: iommu: fix clock name
Shubhrajyoti Datta (1):
OMAP4: Keyboard: Mux changes in the board file
Silesh C V (2):
omap: HSMMC: Fix GPIO muxing
omap: 4430SDP: Register the card detect GPIO properly
Suman Anna (1):
omap: iommu: fix pte programming
Tony Lindgren (2):
Merge branch 'iommu-for-tony' of git://github.com/ohadbc/omap-iommu into devel-fixes
Merge branch 'cleanup-part-2' into devel-board
Vishal Mahaveer (1):
omap: blaze: add mmc5/wl1283 device support
arch/arm/mach-omap2/Kconfig | 6 +-
arch/arm/mach-omap2/board-4430sdp.c | 148 +++++-
arch/arm/mach-omap2/board-cm-t35.c | 95 ++-
arch/arm/mach-omap2/board-omap3beagle.c | 78 ++-
arch/arm/mach-omap2/board-overo.c | 1 -
arch/arm/mach-omap2/board-rx51-peripherals.c | 135 ++++
arch/arm/mach-omap2/board-zoom-debugboard.c | 9 +
arch/arm/mach-omap2/clock.c | 1 +
arch/arm/mach-omap2/devices.c | 3 +-
arch/arm/mach-omap2/hsmmc.c | 7 +-
arch/arm/mach-omap2/iommu2.c | 4 +-
arch/arm/mach-omap2/omap-iommu.c | 2 +-
arch/arm/mach-s3c64xx/Kconfig | 23 +
arch/arm/mach-s3c64xx/Makefile | 1 +
arch/arm/mach-s3c64xx/include/mach/irqs.h | 4 +-
arch/arm/mach-s3c64xx/mach-crag6410.c | 774 ++++++++++++++++++++++++
arch/arm/plat-omap/dmtimer.c | 4 +-
arch/arm/plat-omap/include/plat/omap4-keypad.h | 3 +-
arch/arm/plat-omap/include/plat/uncompress.h | 1 +
arch/arm/plat-omap/iovmm.c | 6 +-
20 files changed, 1233 insertions(+), 72 deletions(-)
^ permalink raw reply [flat|nested] 8+ messages in thread
* [GIT PULL] arm-soc new features (part 1/2) for 3.1
2011-07-26 23:01 ` [GIT PULL] arm-soc new board support " Arnd Bergmann
@ 2011-07-26 23:25 ` Arnd Bergmann
2011-07-26 23:36 ` [GIT PULL] arm-soc new features (part 2/2) " Arnd Bergmann
0 siblings, 1 reply; 8+ messages in thread
From: Arnd Bergmann @ 2011-07-26 23:25 UTC (permalink / raw)
To: Linus Torvalds
Cc: Thomas Gleixner, Nicolas Pitre, linux-kernel, linux-arm-kernel,
Russell King
Hi Linus,
This is the largest set of changes from arm-soc for 3.1, and unfortunately
causes a number of merge conflicts with branches you pulled earlier.
The conflicts are all resolved in the for-next branch (which also contains
the other branches I submitted today), so if you like to resolve them
yourself, you can check if I came to the same conclusion. Alternatively,
I can send you a new branch that is already merged against your tree.
The changes in here are all over the ARM platforms, they mostly consist
of adding support for hardware in the platform code that has seen the
drivers getting added in other trees. This is to some degree churn that
shouldn't be necessary, but cannot be avoided completely as long as we
are still in the process of cleaning up the platforms to convert to
device tree probing form.
Some of the changes in here are also cleanups and other code that I would
have preferred to put in the other pull requests, but it's sometimes
hard to separate and we are still in the process of formalizing the rules
for this.
Arnd
The following changes since commit ba5b56cb3e3d2cab73d4fee9a022bb69462a8cd9:
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client (2011-07-26 13:38:50 -0700)
are available in the git repository at:
git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc.git/ next/devel
Andre Silva (7):
ARM: mach-mx5/mx53_ard: Add support for i.MX53 ARD board
ARM:mach-mx5/board-mx53_loco: Add CD and WP GPIOs
ARM:mach-mx5/board-mx51_babbage: Add CD and WP GPIOs
ARM:mach-mx5/mx53_ard: Add ESDHC support
ARM:mach-mx5/mx53_ard: Add Watchdog timer support
ARM:mx53: Add I2C3 support
ARM:mach-mx5/mx53_ard: Add I2C2 and I2C3 support
Anton Vorontsov (1):
ARM: cns3xxx: Add support for L2 Cache Controller
Arnd Bergmann (1):
Merge branches 'cns3xxx/devel', 'davinci/devel', 'imx/devel', 'lpc32xx/devel', 'pxa/devel', 'tegra/devel' and
'stericsson/master' of git+ssh://master.kernel.org/.../arm/linux-arm-soc into next/devel
Christian Riesch (1):
davinci: da850: add a .set_rate method to ref_clk
Colin Cross (3):
ARM: tegra: remove mach/barriers.h
ARM: tegra: remove copy-and-pasted i2c platform data in boards
ARM: tegra: remove copy-and-pasted usb platform data from boards
Daiane Angolini (1):
ARM: mach-mx5/mx53_ard: Add gpio_keys support
Dinh Nguyen (1):
ARM: mx51: Add support for low power suspend on MX51
Eric Miao (6):
ARM: pxa: enable AUTO_ZRELADDR
ARM: pxa: add common header file for pxa3xx
ARM: pxa: avoid accessing interrupt registers directly
ARM: pxa: introduce {icip,ichp}_handle_irq() to prepare MULTI_IRQ_HANDLER
ARM: pxa: move declarations from generic.h to <soc>.h
ARM: pxa: enable MULTI_IRQ_HANDLER for all boards
Fabio Estevam (11):
ARM: mx5/mx53_loco: Add support for LED
ARM: mx5/mx53_evk: Add support for LED
ARM: mx53: Add SDMA clock
ARM: mx53: Add SDMA support for MX53
ARM: imx2: Fix GPIO iosize
ARM: mach-imx/mx27_3ds: Add LCD support
ARM: mach-imx/mx27_3ds: Add touchscreen support
ARM: mx53: Add support for missing UARTs
ARM: mx53: Add SSI suport
ARM: mx53: Add keypad support
ARM: mach-mx5/mx53_ard: Add missing definition
Haojian Zhuang (2):
ARM: pxa: add clk_set_rate()
ARM: mmp/dkb: enable max7312 gpio expander
Imre Kaloz (1):
ARM: cns3xxx: Should select CPU_V6K
Jürgen Lambrecht (1):
Enable RTC driver.
KOSAKI Motohiro (1):
arm,tegra: replace cpu_set() with modern api
Linus Walleij (9):
mach-ux500: add HREFv60 Kconfig option
mach-ux500: fix HREFv60 regression
mach-ux500: correct MMC/SDI parameters
mach-ux500: activate USB in the U8500 defconfig
mach-ux500: complete regulator constraints for MOP500 board
mach-u300: cleanup clockevent code
mach-u300: set apropriate FIFO trigger levels
mach-ux500: register a clock for the SMP TWD
mach-ux500: fix USB build error
Marc Dietrich (5):
ARM: tegra: paz00: whitespace cleanup
ARM: tegra: paz00: register i2c busses
ARM: tegra: paz00: enable usb ports
ARM: tegra: paz00: cleanup sdhci ports
ARM: tegra: paz00: change the machine name
Mathieu J. Poirier (3):
mach-ux500: setting proper uart for snowball
mach-ux500: Add SDI support for snowball board
mach-ux500: Kconfig for snowball board
Mattias Wallin (1):
mach-ux500: iomap PRCMU TCDM memory
Mike Rapoport (3):
ARM: tegra: trimslice: register i2c busses and devices
ARM: tegra: trimslice: add audio devices and clocks
ARM: tegra: trimslice: enable USB ports
Robert Marklund (4):
mach-x500: fix SECTION warnings in uib
mach-ux500: add basic support for snowball board
mach-ux500: Add pin configuration for snowball board
mach-ux500: add configs for snowball board
Robert Morell (1):
arm: tegra: remove generic disp clock divisor flag
Russell King - ARM Linux (1):
ARM: introduce handle_IRQ() not to dump exception stack
Sascha Hauer (1):
Merge remote-tracking branch 'grant/gpio/next-mx' into devel-features
Sekhar Nori (4):
davinci: pass clock flags to davinci_psc_config()
davinci: enable forced transitions on PSC
davinci: da850: add support for SATA interface
davinci: da850 evm: register SATA device
Shawn Guo (5):
ARM: mxs_defconfig: Add mx23evk and mx28evk build
ARM: mxs/mx28evk: add leds-gpio device for heartbeat
ARM: mxc: convert tzic to use generic irq chip
ARM: mxc: clean up imx-dma device registration
dmaengine: imx-sdma: pass sdma firmware name via platform data
Stephen Warren (1):
ARM: Tegra: Seaboard: Re-order sdhci device registration
Tanmay Upadhyay (3):
ARM: pxa168: Add support for UART3
ARM: pxa168: Add support for Ethernet
ARM: pxa168: Add board support for gplugD
Vasily Khoruzhick (1):
ARM: pxa/z2: add poweroff function
Wolfram Sang (3):
arm: mxs: add mmc-device for mach-tx28
arm: lpc32xx: add tsc-device
arm: lpc32xx: add rtc-device
arch/arm/Kconfig | 8 +-
arch/arm/common/gic.c | 6 -
arch/arm/configs/mxs_defconfig | 2 +
arch/arm/configs/u8500_defconfig | 32 +-
arch/arm/include/asm/hardware/gic.h | 6 +
arch/arm/include/asm/irq.h | 1 +
arch/arm/kernel/irq.c | 19 +-
arch/arm/mach-cns3xxx/cns3420vb.c | 2 +
arch/arm/mach-cns3xxx/core.c | 43 ++
arch/arm/mach-cns3xxx/core.h | 6 +
arch/arm/mach-davinci/board-da850-evm.c | 7 +
arch/arm/mach-davinci/clock.c | 8 +-
arch/arm/mach-davinci/clock.h | 1 +
arch/arm/mach-davinci/da850.c | 10 +
arch/arm/mach-davinci/devices-da8xx.c | 126 ++++
arch/arm/mach-davinci/include/mach/da8xx.h | 2 +
arch/arm/mach-davinci/include/mach/psc.h | 7 +-
arch/arm/mach-davinci/psc.c | 14 +-
arch/arm/mach-exynos4/Kconfig | 33 +-
arch/arm/mach-exynos4/Makefile | 11 +-
arch/arm/mach-exynos4/clock.c | 61 ++
arch/arm/mach-exynos4/cpu.c | 39 +-
arch/arm/mach-exynos4/dev-audio.c | 2 +
arch/arm/mach-exynos4/dev-dwmci.c | 82 +++
arch/arm/mach-exynos4/hotplug.c | 13 +-
arch/arm/mach-exynos4/include/mach/dwmci.h | 20 +
arch/arm/mach-exynos4/include/mach/entry-macro.S | 11 +-
arch/arm/mach-exynos4/include/mach/irqs.h | 196 +++---
arch/arm/mach-exynos4/include/mach/map.h | 19 +-
arch/arm/mach-exynos4/include/mach/pm-core.h | 10 +
arch/arm/mach-exynos4/include/mach/pmu.h | 25 +
arch/arm/mach-exynos4/include/mach/regs-audss.h | 18 +
arch/arm/mach-exynos4/include/mach/regs-clock.h | 12 +
arch/arm/mach-exynos4/include/mach/regs-pmu.h | 1 +
arch/arm/mach-exynos4/localtimer.c | 26 -
arch/arm/mach-exynos4/mach-nuri.c | 753 +++++++++++++++++++++-
arch/arm/mach-exynos4/mach-smdkc210.c | 73 +++
arch/arm/mach-exynos4/mach-smdkv310.c | 3 +
arch/arm/mach-exynos4/mach-universal_c210.c | 121 ++++
arch/arm/mach-exynos4/mct.c | 2 +-
arch/arm/mach-exynos4/platsmp.c | 57 ++-
arch/arm/mach-exynos4/pm.c | 248 +++++---
arch/arm/mach-exynos4/pmu.c | 175 +++++
arch/arm/mach-exynos4/setup-fimd0.c | 43 ++
arch/arm/mach-exynos4/time.c | 301 ---------
arch/arm/mach-imx/Kconfig | 1 +
arch/arm/mach-imx/mach-mx27_3ds.c | 93 +++-
arch/arm/mach-imx/mm-imx1.c | 10 +
arch/arm/mach-imx/mm-imx21.c | 12 +
arch/arm/mach-imx/mm-imx25.c | 32 +
arch/arm/mach-imx/mm-imx27.c | 12 +
arch/arm/mach-imx/mm-imx31.c | 33 +
arch/arm/mach-imx/mm-imx35.c | 53 ++
arch/arm/mach-lpc32xx/clock.c | 2 +-
arch/arm/mach-lpc32xx/common.c | 42 ++
arch/arm/mach-lpc32xx/common.h | 2 +
arch/arm/mach-mmp/Kconfig | 7 +
arch/arm/mach-mmp/Makefile | 1 +
arch/arm/mach-mmp/clock.c | 15 +
arch/arm/mach-mmp/clock.h | 1 +
arch/arm/mach-mmp/gplugd.c | 189 ++++++
arch/arm/mach-mmp/include/mach/mfp-gplugd.h | 52 ++
arch/arm/mach-mmp/include/mach/mfp-pxa168.h | 19 +
arch/arm/mach-mmp/include/mach/pxa168.h | 8 +
arch/arm/mach-mmp/include/mach/regs-apmu.h | 1 +
arch/arm/mach-mmp/pxa168.c | 6 +
arch/arm/mach-mmp/ttc_dkb.c | 31 +-
arch/arm/mach-mx5/Kconfig | 14 +
arch/arm/mach-mx5/Makefile | 2 +
arch/arm/mach-mx5/board-mx51_babbage.c | 22 +-
arch/arm/mach-mx5/board-mx53_ard.c | 254 ++++++++
arch/arm/mach-mx5/board-mx53_evk.c | 17 +
arch/arm/mach-mx5/board-mx53_loco.c | 35 +-
arch/arm/mach-mx5/clock-mx51-mx53.c | 18 +
arch/arm/mach-mx5/crm_regs.h | 2 +
arch/arm/mach-mx5/devices-imx53.h | 8 +
arch/arm/mach-mx5/mm.c | 61 ++
arch/arm/mach-mx5/pm-imx5.c | 73 +++
arch/arm/mach-mxs/Kconfig | 2 +
arch/arm/mach-mxs/mach-mx28evk.c | 21 +
arch/arm/mach-mxs/mach-tx28.c | 6 +
arch/arm/mach-pxa/balloon3.c | 1 +
arch/arm/mach-pxa/capc7117.c | 1 +
arch/arm/mach-pxa/clock.c | 15 +
arch/arm/mach-pxa/clock.h | 1 +
arch/arm/mach-pxa/cm-x2xx.c | 5 +-
arch/arm/mach-pxa/cm-x300.c | 1 +
arch/arm/mach-pxa/colibri-pxa270.c | 2 +
arch/arm/mach-pxa/colibri-pxa300.c | 1 +
arch/arm/mach-pxa/colibri-pxa320.c | 4 +-
arch/arm/mach-pxa/corgi.c | 3 +
arch/arm/mach-pxa/csb726.c | 4 +-
arch/arm/mach-pxa/em-x270.c | 2 +
arch/arm/mach-pxa/eseries.c | 6 +
arch/arm/mach-pxa/ezx.c | 6 +
arch/arm/mach-pxa/generic.h | 13 -
arch/arm/mach-pxa/gumstix.c | 1 +
arch/arm/mach-pxa/h5000.c | 2 +
arch/arm/mach-pxa/himalaya.c | 4 +-
arch/arm/mach-pxa/hx4700.c | 1 +
arch/arm/mach-pxa/icontrol.c | 1 +
arch/arm/mach-pxa/idp.c | 1 +
arch/arm/mach-pxa/include/mach/irqs.h | 12 +
arch/arm/mach-pxa/include/mach/pxa25x.h | 9 +
arch/arm/mach-pxa/include/mach/pxa27x.h | 5 +
arch/arm/mach-pxa/include/mach/pxa300.h | 3 +-
arch/arm/mach-pxa/include/mach/pxa320.h | 3 +-
arch/arm/mach-pxa/include/mach/pxa3xx.h | 14 +
arch/arm/mach-pxa/include/mach/pxa930.h | 3 +-
arch/arm/mach-pxa/include/mach/regs-intc.h | 30 -
arch/arm/mach-pxa/irq.c | 36 +-
arch/arm/mach-pxa/littleton.c | 1 +
arch/arm/mach-pxa/lpd270.c | 1 +
arch/arm/mach-pxa/lubbock.c | 1 +
arch/arm/mach-pxa/magician.c | 1 +
arch/arm/mach-pxa/mainstone.c | 1 +
arch/arm/mach-pxa/mioa701.c | 1 +
arch/arm/mach-pxa/mp900.c | 1 +
arch/arm/mach-pxa/palmld.c | 1 +
arch/arm/mach-pxa/palmt5.c | 1 +
arch/arm/mach-pxa/palmtc.c | 4 +-
arch/arm/mach-pxa/palmte2.c | 3 +-
arch/arm/mach-pxa/palmtreo.c | 2 +
arch/arm/mach-pxa/palmtx.c | 1 +
arch/arm/mach-pxa/palmz72.c | 1 +
arch/arm/mach-pxa/pcm027.c | 1 +
arch/arm/mach-pxa/poodle.c | 1 +
arch/arm/mach-pxa/pxa3xx.c | 5 +-
arch/arm/mach-pxa/pxa95x.c | 1 -
arch/arm/mach-pxa/raumfeld.c | 8 +-
arch/arm/mach-pxa/saar.c | 1 +
arch/arm/mach-pxa/saarb.c | 1 +
arch/arm/mach-pxa/spitz.c | 3 +
arch/arm/mach-pxa/stargate2.c | 2 +
arch/arm/mach-pxa/tavorevb.c | 1 +
arch/arm/mach-pxa/tavorevb3.c | 1 +
arch/arm/mach-pxa/tosa.c | 1 +
arch/arm/mach-pxa/trizeps4.c | 2 +
arch/arm/mach-pxa/viper.c | 1 +
arch/arm/mach-pxa/vpac270.c | 1 +
arch/arm/mach-pxa/xcep.c | 4 +-
arch/arm/mach-pxa/z2.c | 18 +
arch/arm/mach-pxa/zeus.c | 4 +-
arch/arm/mach-pxa/zylonite.c | 3 +-
arch/arm/mach-s3c2410/include/mach/pm-core.h | 3 +
arch/arm/mach-s3c64xx/include/mach/irqs.h | 1 +
arch/arm/mach-s3c64xx/include/mach/pm-core.h | 19 +-
arch/arm/mach-s3c64xx/irq.c | 12 +-
arch/arm/mach-s5p64x0/Makefile | 2 +-
arch/arm/mach-s5p64x0/include/mach/irqs.h | 2 +
arch/arm/mach-s5p64x0/include/mach/regs-gpio.h | 10 +
arch/arm/mach-s5p64x0/irq-eint.c | 152 +++++
arch/arm/mach-s5pv210/Kconfig | 1 +
arch/arm/mach-s5pv210/clock.c | 7 +
arch/arm/mach-s5pv210/cpu.c | 2 +-
arch/arm/mach-s5pv210/dev-audio.c | 2 +
arch/arm/mach-s5pv210/include/mach/map.h | 3 +
arch/arm/mach-s5pv210/include/mach/pm-core.h | 3 +
arch/arm/mach-s5pv210/include/mach/regs-audss.h | 18 +
arch/arm/mach-s5pv210/mach-goni.c | 13 +
arch/arm/mach-s5pv210/mach-smdkv210.c | 1 +
arch/arm/mach-tegra/board-harmony.c | 22 -
arch/arm/mach-tegra/board-paz00-pinmux.c | 10 +-
arch/arm/mach-tegra/board-paz00.c | 31 +-
arch/arm/mach-tegra/board-paz00.h | 10 +-
arch/arm/mach-tegra/board-seaboard.c | 26 +-
arch/arm/mach-tegra/board-trimslice-pinmux.c | 7 +-
arch/arm/mach-tegra/board-trimslice.c | 56 ++
arch/arm/mach-tegra/board-trimslice.h | 3 +
arch/arm/mach-tegra/devices.c | 53 ++-
arch/arm/mach-tegra/include/mach/barriers.h | 30 -
arch/arm/mach-tegra/platsmp.c | 2 +-
arch/arm/mach-tegra/tegra2_clocks.c | 4 +-
arch/arm/mach-u300/spi.c | 4 +-
arch/arm/mach-u300/timer.c | 33 +-
arch/arm/mach-ux500/Kconfig | 15 +-
arch/arm/mach-ux500/board-mop500-pins.c | 43 ++
arch/arm/mach-ux500/board-mop500-regulators.c | 9 +-
arch/arm/mach-ux500/board-mop500-sdi.c | 61 ++-
arch/arm/mach-ux500/board-mop500-uib.c | 2 +-
arch/arm/mach-ux500/board-mop500.c | 154 +++++-
arch/arm/mach-ux500/board-mop500.h | 5 +
arch/arm/mach-ux500/clock.c | 48 ++
arch/arm/mach-ux500/cpu-db5500.c | 1 +
arch/arm/mach-ux500/include/mach/uncompress.h | 3 +-
arch/arm/mach-ux500/usb.c | 1 +
arch/arm/mm/Kconfig | 2 +-
arch/arm/plat-mxc/devices.c | 16 +-
arch/arm/plat-mxc/devices/platform-imx-dma.c | 204 +------
arch/arm/plat-mxc/devices/platform-imx-i2c.c | 3 +-
arch/arm/plat-mxc/devices/platform-imx-keypad.c | 5 +
arch/arm/plat-mxc/devices/platform-imx-ssi.c | 10 +
arch/arm/plat-mxc/devices/platform-imx-uart.c | 2 +
arch/arm/plat-mxc/include/mach/devices-common.h | 6 +
arch/arm/plat-mxc/include/mach/mx53.h | 28 +-
arch/arm/plat-mxc/include/mach/sdma.h | 6 +-
arch/arm/plat-mxc/include/mach/uncompress.h | 1 +
arch/arm/plat-mxc/irq-common.c | 13 +-
arch/arm/plat-mxc/tzic.c | 97 +--
arch/arm/plat-s5p/Kconfig | 11 +
arch/arm/plat-s5p/Makefile | 3 +-
arch/arm/plat-s5p/dev-fimd0.c | 67 ++
arch/arm/plat-s5p/dev-mfc.c | 123 ++++
arch/arm/plat-s5p/include/plat/map-s5p.h | 5 +-
arch/arm/plat-s5p/include/plat/mfc.h | 27 +
arch/arm/plat-samsung/adc.c | 84 ++-
arch/arm/plat-samsung/dev-asocdma.c | 10 +
arch/arm/plat-samsung/include/plat/audio.h | 1 +
arch/arm/plat-samsung/include/plat/devs.h | 6 +
arch/arm/plat-samsung/include/plat/fb-core.h | 15 +
arch/arm/plat-samsung/include/plat/fb.h | 15 +
arch/arm/plat-samsung/include/plat/regs-adc.h | 1 +
arch/arm/plat-samsung/irq-uart.c | 7 +
arch/arm/plat-samsung/pm.c | 2 +
drivers/dma/imx-sdma.c | 6 +-
215 files changed, 4611 insertions(+), 1130 deletions(-)
^ permalink raw reply [flat|nested] 8+ messages in thread
* [GIT PULL] arm-soc new features (part 2/2) for 3.1
2011-07-26 23:25 ` [GIT PULL] arm-soc new features (part 1/2) " Arnd Bergmann
@ 2011-07-26 23:36 ` Arnd Bergmann
2011-07-27 0:51 ` Linus Torvalds
0 siblings, 1 reply; 8+ messages in thread
From: Arnd Bergmann @ 2011-07-26 23:36 UTC (permalink / raw)
To: Linus Torvalds
Cc: Thomas Gleixner, Nicolas Pitre, linux-kernel, linux-arm-kernel,
Russell King
Hi Linus,
This is the final branch I have for now, although I hope to get one more
for actual device tree conversions for a lot of drivers.
This one contains more new development for the omap platform that could
reasonably be split from the other features. There is on the one hand
support for the twl6040 support chip used in some new boards, and then
a series of changes for the 'prcm' code in omap that I don't understand
but trust to be moving in the right direction.
Arnd
The following changes since commit 6fd4ce886440c7a1b08b6642e606ee19097829df:
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus (2011-07-26 14:17:28 -0700)
are available in the git repository at:
git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc.git/ next/devel2
Andy Green (6):
I2C: OMAP2+: Set hwmod flags to only allow 16-bit accesses to i2c
I2C: OMAP2+: increase omap_i2c_dev_attr flags from u8 to u32
I2C: OMAP2+: Introduce I2C IP versioning constants
I2C: OMAP1/OMAP2+: create omap I2C functionality flags for each cpu_... test
I2C: OMAP2+: Tag all OMAP2+ hwmod defintions with I2C IP revision
I2C: OMAP2+: add correct functionality flags to all omap2plus i2c dev_attr
Arnd Bergmann (1):
Merge branches 'omap/prcm' and 'omap/mfd' of git+ssh://master.kernel.org/.../arm/linux-arm-soc into next/devel-2
Avinash.H.M (1):
OMAP: hwmod: fix the i2c-reset timeout during bootup
Axel Castaneda Gonzalez (1):
ASoC: twl6040: Configure ramp step based on platform
Benoit Cousson (14):
OMAP4: powerdomain data: Fix core mem states and missing cefuse flag
OMAP: omap_device: Create clkdev entry for hwmod main_clk
OMAP4: hwmod data: Add clock domain attribute
OMAP2+: hwmod: Init clkdm field at boot time
OMAP4: hwmod: Replace CLKCTRL absolute address with offset macros
OMAP: hwmod: Wait the idle status to be disabled
OMAP4: hwmod: Replace RSTCTRL absolute address with offset macros
OMAP4: prm: Replace warm reset API with the offset based version
OMAP4: prm: Remove deprecated functions
OMAP4: hwmod data: Add PRM context register offset
OMAP4: hwmod data: Add modulemode entry in omap_hwmod structure
OMAP4: cm: Add two new APIs for modulemode control
OMAP4: hwmod: Introduce the module control in hwmod control
OMAP2+: clockdomain: Add 2 APIs to control clockdomain from hwmod framework
Jon Hunter (1):
OMAP: Add debugfs node to show the summary of all clocks
Liam Girdwood (3):
ASoC: twl6040: add all ABE DAIs
ASoC: twl6040: Support other sample rates in constraints.
ASoC: twl6040: set default constraints.
Misael Lopez Cruz (5):
mfd: twl6040: Add initial support
ASoC: twl6040: Convert into TWL6040 MFD child
input: Add initial support for TWL6040 vibrator
ASoC: twl6040: Remove pll and headset mode dependency
OMAP4: SDP4430: Add twl6040 codec platform support
Paul Walmsley (4):
Merge branches 'powerdomain_fixes_3.1', 'hardware_workarounds_3.1', 'hwmod_dss_fix_3.1' and 'i2c_fixes_3.1' into prcm-fixes-3.1
OMAP2+: clockdomain: add clkdm_in_hwsup()
OMAP2+: clock: allow per-SoC clock init code to prevent clockdomain calls from clock code
Merge branches 'omap4_clockdomain_hwmod_3.1', 'clock_debugfs_a_3.1', 'omap4_clock_auxclk_3.1' and 'omap_device_a_3.1' into
prcm-devel-3.1
Peter Ujfalusi (17):
MFD: twl4030-codec: Rename internals from codec to audio
MFD: twl4030-codec -> twl4030-audio: Rename the driver
MFD: twl4030-audio: Rename platform data
MFD: twl6040: Change platform data for soc codec driver
OMAP4: SDP4430: Add twl6040 vibrator platform support
MFD: twl6040: Use resource to provide irq number for slaves
input: twl6040-vibra: Do not use wrapper for irq request
ASoC: twl6040: Do not use wrapper for irq request
MFD: twl6040: Demand valid interrupt configuration
MFD: twl6040: Remove wrapper for threaded irq request
ASoC: twl6040: Use neutral name for power mode text/enum
ASoC: twl6040: Move PLL selection to codec driver
ASoC: twl6040: Simplify sample rate constraint handling
ASoC: twl6040: Configure PLL only once
MFD: twl6040: Remove enum for PLL tracking
ASoC: twl6040: No need to convert the PLL ID
ASoC: twl6040: Add back support for legacy mode
Rajendra Nayak (5):
OMAP2+: PM: Initialise sleep_switch to a non-valid value
OMAP4: clock data: Add missing divider selection for auxclks
OMAP2+: PM: idle clkdms only if already in idle
OMAP2+: clockdomain: Add per clkdm lock to prevent concurrent state programming
OMAP2+: hwmod: Follow the recommended PRCM module enable sequence
Santosh Shilimkar (2):
OMAP4: clock data: Keep GPMC clocks always enabled and hardware managed
OMAP4: powerdomain data: Remove unsupported MPU powerdomain state
Tomi Valkeinen (2):
OMAP4: hwmod data: Modify DSS opt clocks
OMAP4: hwmod data: Change DSS main_clk scheme
Tony Lindgren (1):
Merge branch 'peter/topic/for-tony' of git://gitorious.org/omap-audio/linux-audio into twl-asoc
Vaibhav Bedia (1):
OMAP: clockdomain: Remove redundant call to pwrdm_wait_transition()
arch/arm/mach-omap2/board-4430sdp.c | 56 ++
arch/arm/mach-omap2/board-rx51-peripherals.c | 6 +-
arch/arm/mach-omap2/board-zoom-peripherals.c | 10 +-
arch/arm/mach-omap2/clock.c | 27 +-
arch/arm/mach-omap2/clock.h | 3 +
arch/arm/mach-omap2/clock2420_data.c | 22 +-
arch/arm/mach-omap2/clock2430_data.c | 32 +-
arch/arm/mach-omap2/clock3xxx_data.c | 44 +-
arch/arm/mach-omap2/clock44xx_data.c | 224 +++++--
arch/arm/mach-omap2/clockdomain.c | 210 +++++--
arch/arm/mach-omap2/clockdomain.h | 11 +
arch/arm/mach-omap2/clockdomain2xxx_3xxx.c | 6 +-
arch/arm/mach-omap2/clockdomain44xx.c | 13 +-
arch/arm/mach-omap2/clockdomains44xx_data.c | 2 +-
arch/arm/mach-omap2/cm44xx.h | 8 +-
arch/arm/mach-omap2/cminst44xx.c | 150 ++++-
arch/arm/mach-omap2/cminst44xx.h | 10 +-
arch/arm/mach-omap2/i2c.c | 68 ++
arch/arm/mach-omap2/omap_hwmod.c | 261 ++++++-
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 9 +-
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 7 +
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 18 +-
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 491 +++++++++++---
arch/arm/mach-omap2/pm.c | 6 +-
arch/arm/mach-omap2/powerdomains44xx_data.c | 9 +-
arch/arm/mach-omap2/prcm.c | 2 +-
arch/arm/mach-omap2/prm44xx.c | 145 +----
arch/arm/mach-omap2/prm44xx.h | 10 -
arch/arm/mach-omap2/prminst44xx.c | 112 +++-
arch/arm/mach-omap2/prminst44xx.h | 12 +-
arch/arm/mach-omap2/twl-common.c | 10 +-
arch/arm/plat-omap/clock.c | 39 +
arch/arm/plat-omap/include/plat/i2c.h | 6 +-
arch/arm/plat-omap/include/plat/irqs.h | 12 +-
arch/arm/plat-omap/include/plat/omap_hwmod.h | 15 +-
arch/arm/plat-omap/omap_device.c | 85 ++-
drivers/input/misc/Kconfig | 13 +-
drivers/input/misc/Makefile | 1 +
drivers/input/misc/twl4030-vibra.c | 12 +-
drivers/input/misc/twl6040-vibra.c | 423 +++++++++++
drivers/mfd/Kconfig | 8 +-
drivers/mfd/Makefile | 3 +-
drivers/mfd/twl-core.c | 13 +-
drivers/mfd/twl4030-audio.c | 277 ++++++++
drivers/mfd/twl4030-codec.c | 277 --------
drivers/mfd/twl6040-core.c | 620 +++++++++++++++++
drivers/mfd/twl6040-irq.c | 191 +++++
include/linux/i2c-omap.h | 27 +
include/linux/i2c/twl.h | 25 +-
.../linux/mfd/{twl4030-codec.h => twl4030-audio.h} | 16 +-
include/linux/mfd/twl6040.h | 228 ++++++
sound/soc/codecs/Kconfig | 3 +-
sound/soc/codecs/twl4030.c | 22 +-
sound/soc/codecs/twl6040.c | 733 +++++++++-----------
sound/soc/codecs/twl6040.h | 119 +----
sound/soc/omap/sdp3430.c | 2 +-
sound/soc/omap/sdp4430.c | 52 +--
sound/soc/omap/zoom2.c | 2 +-
58 files changed, 3808 insertions(+), 1410 deletions(-)
create mode 100644 drivers/input/misc/twl6040-vibra.c
create mode 100644 drivers/mfd/twl4030-audio.c
delete mode 100644 drivers/mfd/twl4030-codec.c
create mode 100644 drivers/mfd/twl6040-core.c
create mode 100644 drivers/mfd/twl6040-irq.c
rename include/linux/mfd/{twl4030-codec.h => twl4030-audio.h} (96%)
create mode 100644 include/linux/mfd/twl6040.h
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [GIT PULL] arm-soc new features (part 2/2) for 3.1
2011-07-26 23:36 ` [GIT PULL] arm-soc new features (part 2/2) " Arnd Bergmann
@ 2011-07-27 0:51 ` Linus Torvalds
2011-07-27 15:07 ` Arnd Bergmann
0 siblings, 1 reply; 8+ messages in thread
From: Linus Torvalds @ 2011-07-27 0:51 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Thomas Gleixner, Nicolas Pitre, linux-kernel, linux-arm-kernel,
Russell King
On Tue, Jul 26, 2011 at 4:36 PM, Arnd Bergmann <arnd@arndb.de> wrote:
>
> This is the final branch I have for now, although I hope to get one more
> for actual device tree conversions for a lot of drivers.
Ok, everything merged.
I compared the end result with yours, and we did some things a bit
differently, but on the whole it looks pretty identical. We have a
different resolution for "exynos4_cpu_suspend()", but afaik mine is
better (it looks like from a type standpoint it should return int, but
due to the panic it doesn't matter). And we did those
OMAP4430_DLL_OVERRIDE_SHIFT/MASK defines in a different order. I have
some other changes in my tree (Andrew's patch-set for asm/atomic.h
etc), so that makes for other differences in arch/arm, but it looks
like it's ok.
But you should double-check. I didn't compile-test any of it, I don't
do the cross-compile thing, and maybe I missed something.
Linus
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [GIT PULL] arm-soc new features (part 2/2) for 3.1
2011-07-27 0:51 ` Linus Torvalds
@ 2011-07-27 15:07 ` Arnd Bergmann
0 siblings, 0 replies; 8+ messages in thread
From: Arnd Bergmann @ 2011-07-27 15:07 UTC (permalink / raw)
To: Linus Torvalds
Cc: Thomas Gleixner, Nicolas Pitre, linux-kernel, linux-arm-kernel,
Russell King
On Wednesday 27 July 2011, Linus Torvalds wrote:
> I compared the end result with yours, and we did some things a bit
> differently, but on the whole it looks pretty identical. We have a
> different resolution for "exynos4_cpu_suspend()", but afaik mine is
> better (it looks like from a type standpoint it should return int, but
> due to the panic it doesn't matter). And we did those
> OMAP4430_DLL_OVERRIDE_SHIFT/MASK defines in a different order. I have
> some other changes in my tree (Andrew's patch-set for asm/atomic.h
> etc), so that makes for other differences in arch/arm, but it looks
> like it's ok.
>
> But you should double-check. I didn't compile-test any of it, I don't
> do the cross-compile thing, and maybe I missed something.
Looks all good as far as I can tell. Your exynos4_cpu_suspend is
better than the solution I had in next and everything else
is equivalent.
I'm still in the process of fixing randconfig builds that have never
been working for most arm platforms, so I can do a better job
at automatically doing build tests myself. My guess is that there
will be several build regressions due to stuff coming in but that
they are not the result of mismerges.
Arnd
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2011-07-27 15:08 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-26 22:24 [GIT PULL] arm-soc new SOCs for 3.1 Arnd Bergmann
2011-07-26 22:31 ` [GIT PULL] arm-soc bug fixes (part 2) " Arnd Bergmann
2011-07-26 22:36 ` [GIT PULL] arm-soc cross-platform cleanups " Arnd Bergmann
2011-07-26 23:01 ` [GIT PULL] arm-soc new board support " Arnd Bergmann
2011-07-26 23:25 ` [GIT PULL] arm-soc new features (part 1/2) " Arnd Bergmann
2011-07-26 23:36 ` [GIT PULL] arm-soc new features (part 2/2) " Arnd Bergmann
2011-07-27 0:51 ` Linus Torvalds
2011-07-27 15:07 ` Arnd Bergmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox