From: Thierry Reding <thierry.reding@gmail•com>
To: Kishon Vijay Abraham I <kishon@ti•com>,
Tony Lindgren <tony@atomide•com>, Greg KH <greg@kroah•com>,
Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>,
linux-arm-kernel@lists•infradead.org
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the arm-soc tree
Date: Tue, 22 Oct 2013 17:10:48 +0200 [thread overview]
Message-ID: <1382454649-16442-4-git-send-email-treding@nvidia.com> (raw)
In-Reply-To: <1382454649-16442-1-git-send-email-treding@nvidia.com>
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/boot/dts/omap3-evm.dts
caused by commits 975d963 (ARM: dts: omap: update usb_otg_hs data) and
465ce68 (ARM: dts: Add common support for omap3-evm).
I fixed it up (see below). Please verify that the resolution looks good.
Note that the resolution adds the phys and phy-names properties in the
usb_otg_hs node to complement the common omap3-evm DTSI introduced in
465ce68 with the changes done in 975d963.
Thanks,
Thierry
---
diff --cc arch/arm/boot/dts/omap3-evm-common.dtsi
index 0000000,b549329..3007e79
mode 000000,100644..100644
--- a/arch/arm/boot/dts/omap3-evm-common.dtsi
+++ b/arch/arm/boot/dts/omap3-evm-common.dtsi
@@@ -1,0 -1,94 +1,96 @@@
+ /*
+ * Common support for omap3 EVM boards
+ */
+
+ #include "omap-gpmc-smsc911x.dtsi"
+
+ / {
+ cpus {
+ cpu@0 {
+ cpu0-supply = <&vcc>;
+ };
+ };
+
+ leds {
+ compatible = "gpio-leds";
+ ledb {
+ label = "omap3evm::ledb";
+ gpios = <&twl_gpio 19 GPIO_ACTIVE_HIGH>; /* LEDB */
+ linux,default-trigger = "default-on";
+ };
+ };
+
+ wl12xx_vmmc: wl12xx_vmmc {
+ compatible = "regulator-fixed";
+ regulator-name = "vwl1271";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ gpio = <&gpio5 22 0>; /* gpio150 */
+ startup-delay-us = <70000>;
+ enable-active-high;
+ vin-supply = <&vmmc2>;
+ };
+ };
+
+ &i2c1 {
+ clock-frequency = <2600000>;
+
+ twl: twl@48 {
+ reg = <0x48>;
+ interrupts = <7>; /* SYS_NIRQ cascaded to intc */
+ interrupt-parent = <&intc>;
+ };
+ };
+
+ #include "twl4030.dtsi"
+ #include "twl4030_omap3.dtsi"
+
+ &i2c2 {
+ clock-frequency = <400000>;
+ };
+
+ &i2c3 {
+ clock-frequency = <400000>;
+
+ /*
+ * TVP5146 Video decoder-in for analog input support.
+ */
+ tvp5146@5c {
+ compatible = "ti,tvp5146m2";
+ reg = <0x5c>;
+ };
+ };
+
+ &mmc1 {
+ vmmc-supply = <&vmmc1>;
+ vmmc_aux-supply = <&vsim>;
+ bus-width = <8>;
+ };
+
+ &mmc2 {
+ vmmc-supply = <&wl12xx_vmmc>;
+ non-removable;
+ bus-width = <4>;
+ cap-power-off-card;
+ };
+
+ &twl_gpio {
+ ti,use-leds;
+ };
+
+ &usb_otg_hs {
+ interface-type = <0>;
+ usb-phy = <&usb2_phy>;
++ phys = <&usb2_phy>;
++ phy-names = "usb2-phy";
+ mode = <3>;
+ power = <50>;
+ };
+
+ &gpmc {
+ ethernet@gpmc {
+ interrupt-parent = <&gpio6>;
+ interrupts = <16 8>;
+ reg = <5 0 0xff>;
+ };
+ };
next prev parent reply other threads:[~2013-10-22 15:10 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-21 15:36 linux-next: Tree for Oct 21 Thierry Reding
2013-10-21 23:20 ` linux-next: Tree for Oct 21 (panel-simple.c) Randy Dunlap
2013-10-22 8:10 ` Thierry Reding
2013-10-22 0:58 ` linux-next: Tree for Oct 21 (sound/pci/hda/patch_hdmi.c) Randy Dunlap
2013-10-22 7:42 ` Takashi Iwai
2013-10-22 15:10 ` linux-next: manual merge of the net-next tree Thierry Reding
2013-10-22 15:10 ` linux-next: manual merge of the wireless-next tree Thierry Reding
2013-10-22 15:10 ` linux-next: manual merge of the drm tree Thierry Reding
2013-10-22 15:10 ` Thierry Reding [this message]
2013-10-23 12:19 ` linux-next: manual merge of the arm-soc tree Tony Lindgren
2013-10-22 15:10 ` linux-next: manual merge of the mvebu tree Thierry Reding
2013-10-23 8:59 ` Jason Cooper
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=1382454649-16442-4-git-send-email-treding@nvidia.com \
--to=thierry.reding@gmail$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=greg@kroah$(echo .)com \
--cc=kishon@ti$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=tony@atomide$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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