From: olof@lixom.net (Olof Johansson)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 10/12] ARM: soc: device tree updates, take 2
Date: Mon, 1 Oct 2012 16:57:05 -0700 [thread overview]
Message-ID: <1349135827-24790-11-git-send-email-olof@lixom.net> (raw)
In-Reply-To: <1349135827-24790-1-git-send-email-olof@lixom.net>
This branch contains mostly a set of changes for device tree bindings
on Samsung Exynos. It was staged behind the other branches due to
dependencies on pincontrol and board changes.
Conflicts:
* remove/remove conflict in arch/arm/mach-exynos/clock-exynos5.c. Remove
both sides, i.e. the whole first entry.
----------------------------------------------------------------
The following changes since commit a8e1ceb728d249fbe0bc5e30b9b8ceb0f33b54f5:
Merge branch 'next/boards' into HEAD
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/dt2
for you to fetch changes up to 7b27fa258c8f2670a8c09bbc6c4b2c874d155da2:
Merge branch 'next/dt2' into HEAD
----------------------------------------------------------------
Kukjin Kim (3):
ARM: dts: use uart2 for console on smdkv310 and smdk5250
Merge branches 'next/pinctrl-samsung' and 'next/board-samsung' into next/dt-samsung-new
Merge branch 'next/dt-samsung' into next/dt-samsung-new
Olof Johansson (4):
Merge branch 'samsung/boards' into next/dt2
Merge branch 'samsung/pinctrl' into next/dt2
Merge branch 'next/dt-samsung-new' of git://git.kernel.org/.../kgene/linux-samsung into next/dt2
Merge branch 'next/dt2' into HEAD
Thomas Abraham (3):
ARM: EXYNOS: Add support for MSHC controller clocks
ARM: EXYNOS: Add AUXDATA support for MSHC controllers
ARM: dts: Add nodes for dw_mmc controllers for Samsung EXYNOS5250 platforms
Tomasz Figa (6):
ARM: dts: Move parts common to EXYNOS4 from exynos4210.dtsi to exynos4.dtsi
ARM: EXYNOS: Use exynos4 prefix instead of exynos4210 on exynos4-dt
ARM: dts: Assume status of all optional nodes as disabled for exynos4
ARM: dts: Specify address and size cells for i2c controllers for EXYNOS4
ARM: EXYNOS: Add OF compatibility lookups for EXYNOS4 i2c adapters
ARM: dts: Add basic dts file for Samsung Trats board
Tushar Behera (1):
ARM: dts: Enable on-board keys as wakeup source for exynos4210-origen
arch/arm/boot/dts/exynos4.dtsi | 248 +++++++++++++++++++++++++
arch/arm/boot/dts/exynos4210-origen.dts | 63 +------
arch/arm/boot/dts/exynos4210-smdkv310.dts | 54 +-----
arch/arm/boot/dts/exynos4210-trats.dts | 237 +++++++++++++++++++++++
arch/arm/boot/dts/exynos4210.dtsi | 186 +------------------
arch/arm/boot/dts/exynos5250-smdk5250.dts | 59 +++++-
arch/arm/boot/dts/exynos5250.dtsi | 32 ++++
arch/arm/mach-exynos/Makefile.boot | 2 +-
arch/arm/mach-exynos/clock-exynos5.c | 45 ++---
arch/arm/mach-exynos/include/mach/map.h | 4 +
arch/arm/mach-exynos/mach-exynos4-dt.c | 32 +++-
arch/arm/mach-exynos/mach-exynos5-dt.c | 8 +
12 files changed, 644 insertions(+), 326 deletions(-)
create mode 100644 arch/arm/boot/dts/exynos4.dtsi
create mode 100644 arch/arm/boot/dts/exynos4210-trats.dts
next prev parent reply other threads:[~2012-10-01 23:57 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-01 23:56 [GIT PULL 0/12] ARM: soc: updates for 3.7, first batch Olof Johansson
2012-10-01 23:56 ` [GIT PULL 1/12] ARM: soc: non-critical bug fixes Olof Johansson
2012-10-01 23:56 ` [GIT PULL 2/12] ARM: soc: general cleanups Olof Johansson
2012-10-01 23:56 ` [GIT PULL 3/12] ARM: soc: MAINTAINERS updates Olof Johansson
2012-10-01 23:56 ` [GIT PULL 4/12] ARM: soc: soc-specific updates Olof Johansson
2012-10-01 23:57 ` [GIT PULL 5/12] ARM: soc: device tree updates Olof Johansson
2012-10-01 23:57 ` [GIT PULL 6/12] ARM: soc: cleanups, part 2 Olof Johansson
2012-10-01 23:57 ` [GIT PULL 7/12] ARM: soc: soc-specific updates, take 2 Olof Johansson
2012-10-01 23:57 ` [GIT PULL 8/12] ARM: soc: driver specific changes Olof Johansson
2012-10-01 23:57 ` [GIT PULL 9/12] ARM: soc: board specific updates Olof Johansson
2012-10-01 23:57 ` Olof Johansson [this message]
2012-10-01 23:57 ` [GIT PULL 11/12] ARM: soc: documentation updates Olof Johansson
2012-10-01 23:57 ` [GIT PULL 12/12] ARM: soc: multiplatform enablement Olof Johansson
2012-10-02 2:22 ` [GIT PULL 0/12] ARM: soc: updates for 3.7, first batch Linus Torvalds
2012-10-02 2:26 ` Linus Torvalds
2012-10-02 2:43 ` Olof Johansson
2012-10-02 2:34 ` Olof Johansson
2012-10-02 3:03 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1349135827-24790-11-git-send-email-olof@lixom.net \
--to=olof@lixom.net \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).