From patchwork Mon Mar 19 16:01:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132069 Delivered-To: patch@linaro.org Received: by 10.80.152.129 with SMTP id j1csp3115820edb; Mon, 19 Mar 2018 11:08:26 -0700 (PDT) X-Google-Smtp-Source: AG47ELttxywPBA9cmXRqpyNfvlguoF1NBrWD/vpsvnWQ06zXk8Vhela+hA8tp7oiTOj3LrQWNEHX X-Received: by 10.98.198.146 with SMTP id x18mr11004716pfk.22.1521482906270; Mon, 19 Mar 2018 11:08:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521482906; cv=none; d=google.com; s=arc-20160816; b=sInY8TOMDo0lQZcu2lv8RyCDTEmYurSF1/UyPFsM270d2t7sZqV+2wTJPooLvQ1CRU vGmk6e8DnPdG1RAfqy5RXLN4Y3oMPc7jDwiktFyztbuZdGm80DgEJ0C1s0mNgJgKqeTd b8V6WTagNqIY7LCzl4CNLIJkeXjUH2k/6ZS50sMBBrA58tltAz8Gyxyb6F8yygsNFj4n FBacishi8vyTJIIVK1bVdKsM16A99aXXssfLiRtHkottJGKheWWjCZ20CGcIZ93gLPYp +LBUyeH2xFA5IucA5yCR5i9n5eoyCGmb8i9JVsSPjV6PkLbJko3M/GMQfT2tMYW4QjE6 a1Vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=70xCEdlHWi8aTrpwhcaYzB1G1UYbBkSOsS+2eFP14PM=; b=lxm+jPjLjFaoTF03imaVfcI3oGdzE2Nszg26BtYtWjC87hrhSKf14mKReLKI9RVR4d i7CNGrkxKpqqQTUI3N0dCGmOp82y+3NDlL+onm5FBcrUsRsmzgqlbKfmpCGiLTEwKjWH 4oawVidhlR9l/UUE/8OpjauTnFfArLm6NUhp1Ms/sb4x75I6zk84H7hsqqGL+hCxAjN4 ww1uI+qj7NUnmlIOHHfP9sIFQCXa78+kEANqYj6nuQxyy5o3TGzN0bDQWxyosMMKoEhm 3DUn9CPlixrIPnIAxhI4SdibOMGjgggm9alZ5Xl/QdKYwI6axwv1LmKVJI5TJhfYRPGe W/VA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=QcEdX7Li; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e28si301810pgn.621.2018.03.19.11.08.26; Mon, 19 Mar 2018 11:08:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=QcEdX7Li; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965588AbeCSSIY (ORCPT + 10 others); Mon, 19 Mar 2018 14:08:24 -0400 Received: from mail-cys01nam02on0139.outbound.protection.outlook.com ([104.47.37.139]:43744 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965554AbeCSQDO (ORCPT ); Mon, 19 Mar 2018 12:03:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=70xCEdlHWi8aTrpwhcaYzB1G1UYbBkSOsS+2eFP14PM=; b=QcEdX7Li4S0l/Jn+VWZdHW/6aFy0vi76KIOql21o8hZJIa/+zR1cEpYAjbrTnSyiRjy0q+fOwt3GbX7PaMO6o5ef6uhumdIjw4RDDak/N1JxzuH1pVIkBBkPqDGLjnLP4Yc/r8H3Qp4rLxrakOJhdxEg9o8ILEFSEFSPO2ZNe9k= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0725.namprd21.prod.outlook.com (10.167.107.167) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.631.0; Mon, 19 Mar 2018 16:03:07 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::3d9b:79e7:94eb:5d62]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::3d9b:79e7:94eb:5d62%5]) with mapi id 15.20.0631.004; Mon, 19 Mar 2018 16:03:07 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Maxime Ripard , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 173/281] dt-bindings: display: sun4i: Add allwinner,tcon-channel property Thread-Topic: [PATCH AUTOSEL for 4.9 173/281] dt-bindings: display: sun4i: Add allwinner,tcon-channel property Thread-Index: AQHTv5uEyhRuuojrb0qhu15AHcMSUQ== Date: Mon, 19 Mar 2018 16:01:18 +0000 Message-ID: <20180319155742.13731-173-alexander.levin@microsoft.com> References: <20180319155742.13731-1-alexander.levin@microsoft.com> In-Reply-To: <20180319155742.13731-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB0725; 7:tLTXo4x7zXxPzplYz9Y4r0GKYDvnhDp8mdlr2Mc8LsUlp5G6Q882/QXFJRgUNjMdDUr37sUkQ9pgEOvrAeuEBNA4HgauOgL/yilTaivvb3LZdj9v+SNpW2Ahtt8jL/ymnVgovjUpuLFYu2l9eP7Kua0DZ5XzSgCGqYuGEZMZsGFABXsNlSvm8kNKDWKOBwfup93asoMYlxkCPC1Z0igqkfcG7yoK2TH1YrzZAU5W+RgMtREjZoUmpCFT025ntiAZ; 20:Is8sEkTnSMu6P4YSO7U2xfHQA/VlAfG3+KjwVf38UEKpqtYN1KH2Riqz0LNtzUo0ba+uCZrJAjkZYQW/rn4dcmNjwqvRjd9HeHVKbl5Opo1m24voH6LkCFbP0tK3/ONXjVX7aBRIu/VEuoMUG7DzP0HvkG2UrQfy7YFcXzj8mDg= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 919a95d2-4b9d-4f22-3b4f-08d58db2e7dd x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB0725; x-ms-traffictypediagnostic: DM5PR2101MB0725: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(58145275503218); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501300)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:DM5PR2101MB0725; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0725; x-forefront-prvs: 06167FAD59 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(39860400002)(376002)(346002)(366004)(39380400002)(199004)(189003)(2900100001)(4326008)(54906003)(10090500001)(81166006)(316002)(2906002)(14454004)(110136005)(107886003)(6506007)(186003)(81156014)(22452003)(68736007)(53936002)(3660700001)(478600001)(5250100002)(2501003)(99286004)(36756003)(105586002)(6116002)(3846002)(5660300001)(72206003)(1076002)(2950100002)(6666003)(305945005)(6436002)(86612001)(66066001)(10290500003)(76176011)(97736004)(8676002)(7736002)(8936002)(6512007)(102836004)(106356001)(3280700002)(6486002)(86362001)(25786009)(26005)(22906009)(142933001)(32563001)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0725; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: DEdLATIpTDJDJnj75qDArJEfeivu03hghvrZ1BGzg+xHTHxrZCKvS96wlRokxN60CY94XBxRvAJsPIWoPSxUppV3xGe9I3S3JiIUXPJG/5Uf5jUt3oEhP+KBk8N15OypB36YWPVdyO3FfRCVWarGjheUfLHDVEfjprAq80MOXvtpBeYzN1yc+BoPaN0NYX1rzazEakw/zI3C+Y82OTidWGAkhdjrmgHhCcXKZRMLVJor1SrouF+hF2YLVqKmDPhhAupuKUnVdrONqQBt0raeXjJaIBJvhBH9zk4/vdxj3FjIWOkByu75PAeFRnIs3cP1n/AGN/Y0NcgABniSSvKC4w== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 919a95d2-4b9d-4f22-3b4f-08d58db2e7dd X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2018 16:01:18.1577 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0725 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Maxime Ripard [ Upstream commit 22662f12768f971809b478386d9cc4947d00497a ] The Allwinner Timings Controller has two, mutually exclusive, channels. When the binding has been introduced, it was assumed that there would be only a single user per channel in the system. While this is likely for the channel 0 which only connects to LCD displays, it turns out that the channel 1 can be connected to multiple controllers in the SoC (HDMI and TV encoders for example). And while the simultaneous use of HDMI and TV outputs cannot be achieved, switching from one to the other at runtime definitely sounds plausible. Add an extra property, allwinner,tcon-channel, to specify for a given endpoint which TCON channel it is connected to, while falling back to the previous mechanism if that property is missing. Acked-by: Chen-Yu Tsai Acked-by: Rob Herring Signed-off-by: Maxime Ripard Signed-off-by: Sasha Levin --- Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) -- 2.14.1 diff --git a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt index 4f7ae7555758..bda9d6fab6b4 100644 --- a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt +++ b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt @@ -47,10 +47,13 @@ Required properties: Documentation/devicetree/bindings/media/video-interfaces.txt. The first port should be the input endpoint, the second one the output - The output should have two endpoints. The first is the block - connected to the TCON channel 0 (usually a panel or a bridge), the - second the block connected to the TCON channel 1 (usually the TV - encoder) + The output may have multiple endpoints. The TCON has two channels, + usually with the first channel being used for the panels interfaces + (RGB, LVDS, etc.), and the second being used for the outputs that + require another controller (TV Encoder, HDMI, etc.). The endpoints + will take an extra property, allwinner,tcon-channel, to specify the + channel the endpoint is associated to. If that property is not + present, the endpoint number will be used as the channel number. On SoCs other than the A33, there is one more clock required: - 'tcon-ch1': The clock driving the TCON channel 1