From patchwork Mon Jul 16 07:10:48 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Pavel Machek <pavel@ucw.cz>
X-Patchwork-Id: 10525605
Return-Path: <linux-omap-owner@kernel.org>
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
	[172.30.200.125])
	by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id
	5B24860348 for <patchwork-linux-omap@patchwork.kernel.org>;
	Mon, 16 Jul 2018 07:10:54 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B8DB28ABB
	for <patchwork-linux-omap@patchwork.kernel.org>;
	Mon, 16 Jul 2018 07:10:54 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 3FFD728AA7; Mon, 16 Jul 2018 07:10:54 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	pdx-wl-mail.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI,
	RCVD_IN_DNSWL_HI,T_TVD_MIME_EPI autolearn=ham version=3.3.1
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 77FB228AB0
	for <patchwork-linux-omap@patchwork.kernel.org>;
	Mon, 16 Jul 2018 07:10:52 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1728833AbeGPHgr (ORCPT
	<rfc822;patchwork-linux-omap@patchwork.kernel.org>);
	Mon, 16 Jul 2018 03:36:47 -0400
Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]:60082 "EHLO
	atrey.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1727819AbeGPHgr (ORCPT
	<rfc822; linux-omap@vger.kernel.org>); Mon, 16 Jul 2018 03:36:47 -0400
Received: by atrey.karlin.mff.cuni.cz (Postfix, from userid 512)
	id 6B58D8050E; Mon, 16 Jul 2018 09:10:49 +0200 (CEST)
Date: Mon, 16 Jul 2018 09:10:48 +0200
From: Pavel Machek <pavel@ucw.cz>
To: Sebastian Reichel <sre@kernel.org>
Cc: Tony Lindgren <tony@atomide.com>,
	kernel list <linux-kernel@vger.kernel.org>,
	linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
	linux-omap@vger.kernel.org, nekit1000@gmail.com, mpartap@gmx.net,
	merlijn@wizzup.org
Subject: [PATCH] dts/droid4: fix dts w.r.t. pwm 
Message-ID: <20180716071048.GA23110@amd>
References: <20180709081534.GA6799@amd>
	<20180709214910.tes6u4ivxomd3aja@earth.universe>
	<20180709220211.GA7760@amd>
	<20180710101147.lyu65ro4czvrs2da@earth.universe>
	<20180710133040.GA4391@amd>
	<20180710161123.azym6sbboriuj4yc@earth.universe>
	<20180711080218.GA21225@amd> <20180711132739.GL99251@atomide.com>
	<20180711142526.dto6iost57zx5t5l@earth.universe>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <20180711142526.dto6iost57zx5t5l@earth.universe>
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-omap-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-omap.vger.kernel.org>
X-Mailing-List: linux-omap@vger.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

pwm node should not be under gpio6 node in the device tree.
   
This fixes detection of the pwm on Droid 4.
    
Signed-off-by: Pavel Machek <pavel@ucw.cz>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>

diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts
index 45305e8..c27fc87 100644
--- a/arch/arm/boot/dts/omap4-droid4-xt894.dts
+++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts
@@ -159,13 +159,7 @@
 
 		dais = <&mcbsp2_port>, <&mcbsp3_port>;
 	};
-};
-
-&dss {
-	status = "okay";
-};
 
-&gpio6 {
 	pwm8: dmtimer-pwm-8 {
 		pinctrl-names = "default";
 		pinctrl-0 = <&vibrator_direction_pin>;
@@ -192,7 +186,10 @@
 		pwm-names = "enable", "direction";
 		direction-duty-cycle-ns = <10000000>;
 	};
+};
 
+&dss {
+	status = "okay";
 };
 
 &dsi1 {