From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752785AbcELO77 (ORCPT <rfc822;w@1wt.eu>);
	Thu, 12 May 2016 10:59:59 -0400
Received: from mailgw02.mediatek.com ([210.61.82.184]:11614 "EHLO
	mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org
	with ESMTP id S1751675AbcELO75 (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Thu, 12 May 2016 10:59:57 -0400
Message-ID: <1463065184.17225.2.camel@mtksdaap41>
Subject: Re: [RFC 1/3] dt-bindings: drm/mediatek: Add display binding for
 Mediatek SoC MT2701
From: Yingjoe Chen <yingjoe.chen@mediatek.com>
To: <yt.shen@mediatek.com>
CC: <dri-devel@lists.freedesktop.org>, Philipp Zabel <p.zabel@pengutronix.de>,
        Mark Rutland <mark.rutland@arm.com>, <devicetree@vger.kernel.org>,
        "Russell King" <linux@arm.linux.org.uk>, <srv_heupstream@mediatek.com>,
        Pawel Moll <pawel.moll@arm.com>,
        Ian Campbell <ijc+devicetree@hellion.org.uk>,
        "David Airlie" <airlied@linux.ie>, <linux-kernel@vger.kernel.org>,
        Mao Huang <littlecvr@chromium.org>, CK Hu <ck.hu@mediatek.com>,
        Rob Herring <robh+dt@kernel.org>, <linux-mediatek@lists.infradead.org>,
        Bibby Hsieh <bibby.hsieh@mediatek.com>,
        Kumar Gala <galak@codeaurora.org>,
        "Matthias Brugger" <matthias.bgg@gmail.com>,
        Sascha Hauer <kernel@pengutronix.de>,
        <linux-arm-kernel@lists.infradead.org>, <weiqing.kong@mediatek.com>
Date: Thu, 12 May 2016 22:59:44 +0800
In-Reply-To: <1463053795-55455-2-git-send-email-yt.shen@mediatek.com>
References: <1463053795-55455-1-git-send-email-yt.shen@mediatek.com>
	 <1463053795-55455-2-git-send-email-yt.shen@mediatek.com>
Content-Type: text/plain; charset="UTF-8"
X-Mailer: Evolution 3.2.3-0ubuntu6 
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MTK: N
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, 2016-05-12 at 19:49 +0800, yt.shen@mediatek.com wrote:
> From: YT Shen <yt.shen@mediatek.com>
> 
> Add device tree binding documentation for the display subsystem in
> Mediatek SoC MT2701
> 
> Signed-off-by: YT Shen <yt.shen@mediatek.com>
> ---
>  .../bindings/display/mediatek/mediatek,disp.txt    |    1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt b/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt
> index db6e77e..53b3cc3 100644
> --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt
> +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt
> @@ -40,6 +40,7 @@ Required properties (all function blocks):
>  	"mediatek,<chip>-dpi"        - DPI controller, see mediatek,dpi.txt
>  	"mediatek,<chip>-disp-mutex" - display mutex
>  	"mediatek,<chip>-disp-od"    - overdrive
> +	"mediatek,<chip>-disp-bls"   - backlight
>  - reg: Physical base address and length of the function block register space
>  - interrupts: The interrupt signal from the function block (required, except for
>    merge and split function blocks).


Hi,

This one is in conflict with "Support Mediatek Soc MT2701 disp pwm"
series Weiqing sent last week, which add disp-bls support to display pwm
driver.

Joe.C