From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66589C43331 for ; Tue, 2 Mar 2021 07:09:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 198FD64DE8 for ; Tue, 2 Mar 2021 07:09:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1574759AbhCBDuY (ORCPT ); Mon, 1 Mar 2021 22:50:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244221AbhCAViL (ORCPT ); Mon, 1 Mar 2021 16:38:11 -0500 Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36FB3C06121E for ; Mon, 1 Mar 2021 13:34:52 -0800 (PST) Received: by mail-pf1-x432.google.com with SMTP id m6so12419749pfk.1 for ; Mon, 01 Mar 2021 13:34:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=V0ebxcgXbfQv5hp4rfD6Yg7e3MPCcpWELcwXvbVKAmU=; b=eikxe/oZZvFtL4ioJ8o67Jzm07Sp/7RDF5NaQpn6TnvW4pudGJta+MHvB9Eh/nxPR3 eWf7xfACZYmDN01pf/H1n6pmSeHDkKcLRHKeXR0eVnl3xyTgQrkDG0vcc2lQCW7oHrhW /Qf/VzyhGIDMyxUMBCZT2FWqT4UVlYi5tLXHQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=V0ebxcgXbfQv5hp4rfD6Yg7e3MPCcpWELcwXvbVKAmU=; b=il6GWC2x0+URFkA30zE7zRNe4WhDbl7/E81X91vOMvX0IqTPqiRw/erozb2kc8GD39 mSxJcyFxmw15bMzBcqXuiaAVOPjb/MDSeuai1cohQhuIinbwureaSGKV3Bd6Z/wVyVuh oxem0aVuqzkycuOuXmeMgbZyQKHYPYX+4KvVLBA4CHtj2BDhJkRKFY2R8k4c0ISd4U5T FucilIPJWOIus0q2CRNp9iiEsx95LtKNBLhHnziVL9EV0nvcxR4dgMJ7ofeqmxwuS0MQ ruiTHE2PfukMiqzyJ5NAnr/LMcNZimEggzQU+7hFLKYzZNs8F0ub3x9THyEGqpnKq2rr X9pw== X-Gm-Message-State: AOAM531Nkz/1wnx7Y/eFP9lxOlhuga11pKE4UdQT3BNA6a0oqA2W23od de1oHVSDWaowmfniMc1hUnvTiA== X-Google-Smtp-Source: ABdhPJxQAzkSFImr3H3hNeEOmB5bpk0C9a434SRfXl1AukyX37Q0h4TWQKBMN8iH9cefhl7wxfgJFQ== X-Received: by 2002:aa7:82cf:0:b029:1cc:5393:ad8e with SMTP id f15-20020aa782cf0000b02901cc5393ad8emr16984349pfn.3.1614634491803; Mon, 01 Mar 2021 13:34:51 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:c086:5f6:85dd:98c8]) by smtp.gmail.com with ESMTPSA id f13sm790366pjj.1.2021.03.01.13.34.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Mar 2021 13:34:51 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: Rob Clark , Alexandru M Stan , Stephen Boyd , Matthias Kaehlcke , Douglas Anderson , Andy Gross , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 04/13] arm64: dts: qcom: Unify the sc7180-trogdor panel nodes Date: Mon, 1 Mar 2021 13:34:28 -0800 Message-Id: <20210301133318.v2.4.I1483fac4c5ae4b2d7660290ff85d69945292618f@changeid> X-Mailer: git-send-email 2.30.1.766.gb4fecdf3b7-goog In-Reply-To: <20210301213437.4165775-1-dianders@chromium.org> References: <20210301213437.4165775-1-dianders@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Let's avoid a bit of duplication by pushing this up to the trogdor.dtsi file. Signed-off-by: Douglas Anderson Reviewed-by: Matthias Kaehlcke --- (no changes since v1) .../boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 21 ++++--------------- .../arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 19 ++++------------- arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 15 +++++++++++++ 3 files changed, 23 insertions(+), 32 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi index 11269522da50..5efa04d0d256 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi @@ -12,23 +12,6 @@ #include "sc7180-trogdor.dtsi" -/ { - panel: panel { - compatible = "boe,nv133fhm-n62"; - power-supply = <&pp3300_dx_edp>; - backlight = <&backlight>; - hpd-gpios = <&sn65dsi86_bridge 2 GPIO_ACTIVE_HIGH>; - - ports { - port { - panel_in_edp: endpoint { - remote-endpoint = <&sn65dsi86_out>; - }; - }; - }; - }; -}; - &ap_sar_sensor { semtech,cs0-ground; semtech,combined-sensors = <3>; @@ -58,6 +41,10 @@ ap_ts: touchscreen@10 { }; }; +&panel { + compatible = "boe,nv133fhm-n62"; +}; + &trackpad { interrupts = <58 IRQ_TYPE_EDGE_FALLING>; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts index bd2c783e0f2f..2b522f9e0d8f 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts @@ -17,21 +17,6 @@ / { model = "Google Trogdor (rev1+)"; compatible = "google,trogdor", "qcom,sc7180"; - - panel: panel { - compatible = "auo,b116xa01"; - power-supply = <&pp3300_dx_edp>; - backlight = <&backlight>; - hpd-gpios = <&sn65dsi86_bridge 2 GPIO_ACTIVE_HIGH>; - - ports { - port { - panel_in_edp: endpoint { - remote-endpoint = <&sn65dsi86_out>; - }; - }; - }; - }; }; ap_ts_pen_1v8: &i2c4 { @@ -53,6 +38,10 @@ ap_ts: touchscreen@10 { }; }; +&panel { + compatible = "auo,b116xa01"; +}; + &pp3300_hub { /* pp3300_l7c is used to power the USB hub */ /delete-property/regulator-always-on; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi index b471503e415e..7341fe6e2c0b 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -257,6 +257,21 @@ max98357a: audio-codec-0 { #sound-dai-cells = <0>; }; + panel: panel { + /* Compatible will be filled in per-board */ + power-supply = <&pp3300_dx_edp>; + backlight = <&backlight>; + hpd-gpios = <&sn65dsi86_bridge 2 GPIO_ACTIVE_HIGH>; + + ports { + port { + panel_in_edp: endpoint { + remote-endpoint = <&sn65dsi86_out>; + }; + }; + }; + }; + pwmleds { compatible = "pwm-leds"; keyboard_backlight: keyboard-backlight { -- 2.30.1.766.gb4fecdf3b7-goog