From patchwork Thu Jul 27 21:51:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alain Volmat X-Patchwork-Id: 127220 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp42527vqg; Thu, 27 Jul 2023 15:18:41 -0700 (PDT) X-Google-Smtp-Source: APBJJlGjWzvdvOlzBbk2pUEFyG+LYaovA8954abOfO8N67NcZYrmllpCmg0merKLbEw4tVVWzCxW X-Received: by 2002:a9d:7d8c:0:b0:6b5:6b95:5876 with SMTP id j12-20020a9d7d8c000000b006b56b955876mr463549otn.25.1690496321025; Thu, 27 Jul 2023 15:18:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690496320; cv=none; d=google.com; s=arc-20160816; b=BD+z8aXQo+yALb1DMO9Ye+bls9r8uR3ysmAbGPy+jUjW4kCBYuYtbZQ5fD52H9EKBU +qFeXKiH7UlmWRfu4YLHQH+YXaolrxv2GZvXcydlVP+uUXS7s6xgpkOjHVqpdRPHSUr5 dS2NpbVOas2ENv6To+Ljv6qKzn5XyOBof8aRyg6niNDLrgycTDB14PtqEtq4WR4NqtrY aSgBdCgoLuQygrpDeSAYZtFJSh7KvCFHvii4U+QpoD9RA92LuXkH1YUTPJVkg6vzQPHO 9F/sc41Q0SYHxFDHn2OFACbFhQXppOHKxXMeIYarIzV9PAqgH4c/K6hR2YIOAjbs9xeB RmfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=HXQLqgiZg4lwSg7yuJp70xhHYQeGMquqwwsl6uxX+/s=; fh=arHEyEuWZlF99VKrh6xxMtrGoUvdlsvpYSYGEdDlimo=; b=CxJk9O01EKh4rMylmwmKDLnaN6dRn+B3WnszF7hgL0YPK9uXFeEoW8tmj2AVYqLdUd PbIjfvodRkAWRLYbEtm2MGuOQy8Ctub5jnsu0Nk3N12J5SnKl8so3Nb34Ahc8M1l+SFm BUQRq3iEBZSl4gxCqcI55DPHWeM/+7oBbHXedEG+L8R5695jVyHst7exiumyt3f+GcX4 jIKMbPwFRK+ubl2oSwRrBH3O7y8ECJ5XP2GTHrGJfoxOYahk/5Thl5S5EzvBJVYcsDcd xT8kTBn5Hd5fHJ0mWo9s9JJzb7w2/4CRf0UBMGvIkiw70447imiO28W1FItPPPcG1PV2 /dvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@me.com header.s=1a1hai header.b=iWSH1EJW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=me.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n12-20020a63e04c000000b00563fbc0000csi1834037pgj.254.2023.07.27.15.18.27; Thu, 27 Jul 2023 15:18:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@me.com header.s=1a1hai header.b=iWSH1EJW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=me.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232517AbjG0Vxv (ORCPT + 99 others); Thu, 27 Jul 2023 17:53:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232469AbjG0Vx0 (ORCPT ); Thu, 27 Jul 2023 17:53:26 -0400 Received: from qs51p00im-qukt01080301.me.com (qs51p00im-qukt01080301.me.com [17.57.155.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB77935A3 for ; Thu, 27 Jul 2023 14:52:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=me.com; s=1a1hai; t=1690494773; bh=HXQLqgiZg4lwSg7yuJp70xhHYQeGMquqwwsl6uxX+/s=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=iWSH1EJWwkMfSRqn9vJtLQPTLaZ45ToCmc5035Zl4yf9t6z4GcEA75Q5iEj5/fxsv rzI8ULoVds72y8jayIA8pvf0IslVNASIwoOS4/flQrYfIsh6HPC9mB4EE1FxIbNhJ9 o4lDZRViIyBF6y1Ow2ZgtiXApM3UvIKu10DYr8EePi7CreB9vLTK3XgxizKq6554GJ bYXuQxJVyhPuQu0PFc6w9wzu0epGloaMnSvrqLG2gMW3hP/CGanqPOBvITBXlA2mdQ P60FNgyU56tScM9fAEzmBNYGTDVVnzwPGCIuJx3xgpZ7xfKKsd3Cd/sonKqJBtkRLr T6Rq+voTi8D2w== Received: from localhost (qs51p00im-dlb-asmtp-mailmevip.me.com [17.57.155.28]) by qs51p00im-qukt01080301.me.com (Postfix) with ESMTPSA id EE2DA5F00408; Thu, 27 Jul 2023 21:52:52 +0000 (UTC) From: Alain Volmat To: Patrice Chotard , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Alain Volmat , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 11/14] ARM: dts: sti: move vtg_main / vtg_aux into stih407/stih410 dtsi Date: Thu, 27 Jul 2023 21:51:35 +0000 Message-Id: <20230727215141.53910-12-avolmat@me.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230727215141.53910-1-avolmat@me.com> References: <20230727215141.53910-1-avolmat@me.com> MIME-Version: 1.0 X-Proofpoint-GUID: H5CenQRAQ1tfGLGPSffjITEBYJ75K4oo X-Proofpoint-ORIG-GUID: H5CenQRAQ1tfGLGPSffjITEBYJ75K4oo X-Proofpoint-Virus-Version: =?utf-8?q?vendor=3Dfsecure_engine=3D1=2E1=2E170-?= =?utf-8?q?22c6f66c430a71ce266a39bfe25bc2903e8d5c8f=3A6=2E0=2E425=2C18=2E0?= =?utf-8?q?=2E572=2C17=2E0=2E605=2E474=2E0000000_definitions=3D2022-01-11=5F?= =?utf-8?q?01=3A2022-01-11=5F01=2C2020-02-14=5F11=2C2020-01-23=5F02_signatur?= =?utf-8?q?es=3D0?= X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 clxscore=1015 mlxlogscore=907 spamscore=0 bulkscore=0 malwarescore=0 adultscore=0 mlxscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2307270199 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772613869784084571 X-GMAIL-MSGID: 1772613869784084571 In preparation of introduction of display support in stih418, move the vtg nodes into stih407.dtsi and stih410.dtsi since vtg nodes will differ in case of the stih418 and thus cannot be kept as part of the stih407-family.dtsi. Signed-off-by: Alain Volmat --- arch/arm/boot/dts/st/stih407-family.dtsi | 13 ------------- arch/arm/boot/dts/st/stih407.dtsi | 12 ++++++++++++ arch/arm/boot/dts/st/stih410.dtsi | 12 ++++++++++++ 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/arch/arm/boot/dts/st/stih407-family.dtsi b/arch/arm/boot/dts/st/stih407-family.dtsi index 3f58383a7b59..6133c9934651 100644 --- a/arch/arm/boot/dts/st/stih407-family.dtsi +++ b/arch/arm/boot/dts/st/stih407-family.dtsi @@ -292,19 +292,6 @@ syscfg_lpm: lpm-syscfg@94b5100 { reg = <0x94b5100 0x1000>; }; - /* Display */ - vtg_main: sti-vtg-main@8d02800 { - compatible = "st,vtg"; - reg = <0x8d02800 0x200>; - interrupts = ; - }; - - vtg_aux: sti-vtg-aux@8d00200 { - compatible = "st,vtg"; - reg = <0x8d00200 0x100>; - interrupts = ; - }; - serial@9830000 { compatible = "st,asc"; reg = <0x9830000 0x2c>; diff --git a/arch/arm/boot/dts/st/stih407.dtsi b/arch/arm/boot/dts/st/stih407.dtsi index aca43d2bdaad..69430556edc4 100644 --- a/arch/arm/boot/dts/st/stih407.dtsi +++ b/arch/arm/boot/dts/st/stih407.dtsi @@ -8,6 +8,18 @@ #include / { soc { + vtg_main: sti-vtg-main@8d02800 { + compatible = "st,vtg"; + reg = <0x8d02800 0x200>; + interrupts = ; + }; + + vtg_aux: sti-vtg-aux@8d00200 { + compatible = "st,vtg"; + reg = <0x8d00200 0x100>; + interrupts = ; + }; + sti-display-subsystem@0 { compatible = "st,sti-display-subsystem"; #address-cells = <1>; diff --git a/arch/arm/boot/dts/st/stih410.dtsi b/arch/arm/boot/dts/st/stih410.dtsi index 29e95e9d3229..141db3dcaf1f 100644 --- a/arch/arm/boot/dts/st/stih410.dtsi +++ b/arch/arm/boot/dts/st/stih410.dtsi @@ -99,6 +99,18 @@ ehci1: usb@9a83e00 { status = "disabled"; }; + vtg_main: sti-vtg-main@8d02800 { + compatible = "st,vtg"; + reg = <0x8d02800 0x200>; + interrupts = ; + }; + + vtg_aux: sti-vtg-aux@8d00200 { + compatible = "st,vtg"; + reg = <0x8d00200 0x100>; + interrupts = ; + }; + sti-display-subsystem@0 { compatible = "st,sti-display-subsystem"; #address-cells = <1>;