From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kishon Vijay Abraham I Subject: [PATCH 0/2] ARM: dts: Add subnode for ocp2scp Date: Wed, 19 Sep 2012 16:02:50 +0530 Message-ID: <1348050772-27819-1-git-send-email-kishon@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org Sender: "devicetree-discuss" To: grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org, rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org, rob-VoJi6FS/r0vR7s880joybQ@public.gmane.org, linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org, kishon-l0cyMroinI0@public.gmane.org, arnd-r2nGTMty4D4@public.gmane.org, balbi-l0cyMroinI0@public.gmane.org, b-cousson-l0cyMroinI0@public.gmane.org, tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org, linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org List-Id: devicetree@vger.kernel.org This patch series contains a patch to explicitly add reg property to the ocp2scp dt node and a patch to add the subnode for ocp2scp (omap-usb2). Since the original patch series that adds ocp2scp driver and ocp2scp data are merged in arm-soc, I'm sending this patch series based on the same tree. git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git But Benoit already pointed out that there's going to be merge conflicts as he has sent a bunch of dt data patches to linux-omap (devel-dt) tree. So now I'm not sure how that can be actually avoided. Kishon Vijay Abraham I (2): ARM: dts: omap4: add *reg* property for ocp2scp ARM: dts: omap: Add omap-usb2 dt data .../devicetree/bindings/bus/omap-ocp2scp.txt | 14 ++++++++++++++ arch/arm/boot/dts/omap4.dtsi | 8 +++++++- 2 files changed, 21 insertions(+), 1 deletion(-) -- 1.7.9.5