From patchwork Tue Jun 4 21:42:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 801711 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9A00314BFBC for ; Tue, 4 Jun 2024 21:42:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717537359; cv=none; b=cwu5YayRv9EqRQNpm78Dupj+1C0zU6OtN12Z0PbMvK1MhMgj4wBXNkm48UMve+GocprAfKfRVBzTjhWdlTIto2Xnft/BZ0OH6eYMWJ/Pc4dTsGJWPb+jH1Gt/uN7Lx3raqW4lTUYYw+wvbDrBJD1tD/4lhSC5YTJcCWdyXfx4GQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717537359; c=relaxed/simple; bh=IOvBn7Nyio2Q5k5EJinHxCGnyjUHnIrr3ge6E0zpSHE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iWHon+5Ro+LZy0/wx/p/ruorx12ZzFalxMDJthWBi0SgIizW5r2QH2syWlbk89bAFJPRS7IQbDTsyfxorE/nP4ePIREi/K2g6yPtMur1Tk+7dBCjFbOrGD/oEhdE/7m8d54G9gWr9BYUAuqqxKI/UPh/wyfXe6ihq9/Nwo57WJU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=mUnRLdGv; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="mUnRLdGv" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1f61f775738so43437315ad.2 for ; Tue, 04 Jun 2024 14:42:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1717537357; x=1718142157; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SqRKPEKWRhplNDOM25p5twkIQfLSqkZ96KCbc1M+Mzk=; b=mUnRLdGv5Fa2RdJPVbPK/VA4ywRULMLrTl9ZokPrkJvnktC/W5p9x5xou/SATv9HTs FWr/oAOY5N26Pv48iRT2nYDDhQIOpP9S9hI+byLdPOveQ4JvH5e3Hku91LTE1//XMekX l7buNQmOInKww6R8g6IDD9e8EIS1dfTA+sNEE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717537357; x=1718142157; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SqRKPEKWRhplNDOM25p5twkIQfLSqkZ96KCbc1M+Mzk=; b=hsltrr7SZXm3g1HlHLZjUInToTPv1ZQFFZq3jO/P0MH0KPDqMDrovB1LBvmHXXqnxM OzFtJ2MKbdebrOR8K2wTsEu6ILArMFjQ2nWvS5U3D2aYW00+9KH3+qFTFrlr6K44vf1P gtgJShByhw//8v8rsOx7s81sMtKriIo48ULzmHp7FK1EdoRvsqKWg02PaRBSBFnODJMC Df6DdA2b8RvrhT9uz5Ei+H2X7Ac87ARCwUKdKD5XcpSVc86cDjXk3SSjYQsnMHpExuTv U5Zb5nTEDHLjSs9jnNnyka7pF9OH1ZlgoxxMSUmx8DJMU5c9Eq1U/xm3wE+NfVGc85e4 U/2A== X-Forwarded-Encrypted: i=1; AJvYcCV6nGtTl4Elauxc1op75EyKM18Fg16WFjXmNWVH8+B6PNX6M8COAHj9AyiTE1jBsHb+I8d5HYn/Lo+dp1wfEgse1Av1tPFGhUtPxQL8Mg== X-Gm-Message-State: AOJu0YxVRmC8Olc1QBuwfEyv9h0qkCS9/95U+NzPiF3ZHNX43zJ+c0jE tc7BUVh/qyirXPuxE1ZMda6gOfPg/hdAY+dezOpVPUjLHGpF4hnmnTeF+nejRA== X-Google-Smtp-Source: AGHT+IGUaXR2dqUozpVweS1vyHr9chwC5OlcDsV5AJ7BJUmAiiMFibIo5WHvLjglWhoIQUC3RvtDRw== X-Received: by 2002:a17:902:f606:b0:1f4:64d9:5cfd with SMTP id d9443c01a7336-1f6a5a5ca36mr10300155ad.42.1717537356867; Tue, 04 Jun 2024 14:42:36 -0700 (PDT) Received: from localhost (132.197.125.34.bc.googleusercontent.com. [34.125.197.132]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-1f6a39bb488sm5416775ad.267.2024.06.04.14.42.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 04 Jun 2024 14:42:36 -0700 (PDT) From: Stephen Boyd To: Konrad Dybcio , Bjorn Andersson Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, patches@lists.linux.dev, cros-qcom-dts-watchers@chromium.org, Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Pin-yen Lin , Dmitry Baryshkov , Douglas Anderson Subject: [PATCH 1/3] arm64: dts: qcom: sc7180: quackingstick: Disable instead of delete usb_c1 Date: Tue, 4 Jun 2024 14:42:30 -0700 Message-ID: <20240604214233.3551692-2-swboyd@chromium.org> X-Mailer: git-send-email 2.45.1.288.g0e0cd299f1-goog In-Reply-To: <20240604214233.3551692-1-swboyd@chromium.org> References: <20240604214233.3551692-1-swboyd@chromium.org> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 It's simpler to reason about things if we disable nodes instead of deleting them. Disable the second usb type-c connector node on quackingstick instead of deleting it so that we can reason about ports more easily. Cc: Cc: Bjorn Andersson Cc: Konrad Dybcio Cc: Rob Herring Cc: Krzysztof Kozlowski Cc: Conor Dooley Cc: Cc: Cc: Pin-yen Lin Reviewed-by: Dmitry Baryshkov Reviewed-by: Douglas Anderson Signed-off-by: Stephen Boyd --- .../arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi index 5f06842c683b..b7de9fd3fa20 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi @@ -10,9 +10,6 @@ #include "sc7180-trogdor.dtsi" #include "sc7180-trogdor-rt5682i-sku.dtsi" -/* This board only has 1 USB Type-C port. */ -/delete-node/ &usb_c1; - / { ppvar_lcd: ppvar-lcd-regulator { compatible = "regulator-fixed"; @@ -136,6 +133,11 @@ pp3300_disp_on: &pp3300_dx_edp { gpio = <&tlmm 67 GPIO_ACTIVE_HIGH>; }; +/* This board only has 1 USB Type-C port. */ +&usb_c1 { + status = "disabled"; +}; + /* PINCTRL - modifications to sc7180-trogdor.dtsi */ /* From patchwork Tue Jun 4 21:42:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 801438 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E317214C5A5 for ; Tue, 4 Jun 2024 21:42:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717537360; cv=none; b=C7Vz2xQ1kCADk/TzjsTK8szWGBS2/Dp+5o/uyw9UQh+r2qU35c4AyeIx4krCru/1lfCM+Tjpm0b7w68yM+3eAee0P38x867W4NdMaadiO1+t2wlcY+ornJM0l6TpawGvACCJQR0uCiOOHRd47jfc6sb58Xfnv/vz54et126qOTo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717537360; c=relaxed/simple; bh=DR4noGTvQJfxqZgaRPYStAP3sxtorZHW3MerXwYFYK0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nQ2rBFYJtKxDqwXwrDGIIKqJAvuymYvuQHKZHZ+ZvCzpY8VscZ4iUkHb3NCnMkPiTX0FlS3DIIaj9HrQDI0cSZ9+XSA6rgCAknwBjAzfxavWMcHFNRgIScdb8ZH09h9Dr4Yq9AdCz9+1b1a/f3U478Q2bVXplIH9bVBw1AbHA0M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=GbijcIrX; arc=none smtp.client-ip=209.85.214.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="GbijcIrX" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1f64ecb1766so13900985ad.1 for ; Tue, 04 Jun 2024 14:42:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1717537358; x=1718142158; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RYm2Ihcymc0GYYvAeFdOt61hcsgG8S3It6RMdtYbi9k=; b=GbijcIrXMRHO0d/7I+IjGT8Cj+XG/7mYMDHgInqqYXbroH08fHVwhCxZh5vaQsJFTJ FcJfSJrX6Q1SEfUC7upYnBMeDIxMyfGtbLBx0dCxIsMSybRRj//dE36yv1AvwfJCQ7fi WSpykp60ocoOBcyRX7zBwFEQnhItQctlw3wkc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717537358; x=1718142158; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RYm2Ihcymc0GYYvAeFdOt61hcsgG8S3It6RMdtYbi9k=; b=XH9m749K0Ri/FelctIvKbgi9DJVigoHWSoMUbU6mlckj/jwV3zicX8jSjErqhE1Va/ QZYAEDDxW6zkqDdO+H67a32G5jS/zMUZ8birCeQc47xX0nDFK+2Y4imgm2imEWmHSuDP cePIzOrq9djtYbmGUfbqtSbiulywTN1jrfjGTMirrS1OFN2KMrb22IxfRXw0MH/WMq5m MN7f3s/+OiTeYrywUo3IgnfZlDqZ7Skked7Uwq21m964bwUQTWJLwCam+JBkKs4m0eHo 0Ft3ycVdRG5bFXzG4+UqD8OfWVna6WlGIUsKmeEqNUQQosumINRAx3Q45pbZkHW6lbr/ SgBA== X-Forwarded-Encrypted: i=1; AJvYcCWV6eS5HNNY2WOOiexkuKKDfQfjHLhucAupb0labGSrEK9XiBwruwIJX6byeLMSFUgCj4l2suMSlVFIxzXUXov8J2htXVhJ+kzqRocKbg== X-Gm-Message-State: AOJu0YwMTEOWGp7+/dp1AoiKypRhH1qE+r03+k7YnyxMb5kFbqRDhKZ9 sWCxDhb8aJ+rZWBX9ecCkyz8IKWsxa3ygCzQoaslbMGe2CHh1hiZw8tplVlW+A== X-Google-Smtp-Source: AGHT+IFhf8nAUYL+FNdvnpqa7A/O+7CUJFcajK2GH8sYTtYnOeRE9RYY6Tu3RIZW/OiV5NO7hyrY8Q== X-Received: by 2002:a17:902:e543:b0:1f6:5551:9e6c with SMTP id d9443c01a7336-1f6a5a6b42amr9616895ad.54.1717537358165; Tue, 04 Jun 2024 14:42:38 -0700 (PDT) Received: from localhost (132.197.125.34.bc.googleusercontent.com. [34.125.197.132]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-1f66c412fd2sm51747355ad.283.2024.06.04.14.42.37 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 04 Jun 2024 14:42:37 -0700 (PDT) From: Stephen Boyd To: Konrad Dybcio , Bjorn Andersson Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, patches@lists.linux.dev, cros-qcom-dts-watchers@chromium.org, Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Pin-yen Lin , Dmitry Baryshkov , Douglas Anderson Subject: [PATCH 2/3] arm64: dts: qcom: sc7180: pazquel: Add missing comment header Date: Tue, 4 Jun 2024 14:42:31 -0700 Message-ID: <20240604214233.3551692-3-swboyd@chromium.org> X-Mailer: git-send-email 2.45.1.288.g0e0cd299f1-goog In-Reply-To: <20240604214233.3551692-1-swboyd@chromium.org> References: <20240604214233.3551692-1-swboyd@chromium.org> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 We put a header before modifying pinctrl nodes defined in sc7180-trogdor.dtsi in every other file. Add one here so we know that this section is for pinctrl modifications. Cc: Cc: Bjorn Andersson Cc: Konrad Dybcio Cc: Rob Herring Cc: Krzysztof Kozlowski Cc: Conor Dooley Cc: Cc: Cc: Pin-yen Lin Reviewed-by: Dmitry Baryshkov Reviewed-by: Douglas Anderson Signed-off-by: Stephen Boyd --- arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel.dtsi index 8823edbb4d6e..73aa75621721 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel.dtsi @@ -83,6 +83,8 @@ &pp3300_dx_edp { gpio = <&tlmm 67 GPIO_ACTIVE_HIGH>; }; +/* PINCTRL - modifications to sc7180-trogdor.dtsi */ + &en_pp3300_dx_edp { pins = "gpio67"; }; From patchwork Tue Jun 4 21:42:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 801710 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F367414D28A for ; Tue, 4 Jun 2024 21:42:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717537361; cv=none; b=fizDlh8PG15XTZ8dzm1BaIGs6X3SqsBWIFY+37UclWMD5BL37iAja3rBrQS/1VTeIYHLMICCE581vNDp+5Aah8AUpyJ7YAb1vXCladYJnQ1lcO/kkbC2LhyKNxF2dFFysw/xSrupZa/K+ltRP47SQdGt5Gi9qN8tBurg5OPJoW4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717537361; c=relaxed/simple; bh=xAp5WZlsM/Hkn85zeDB+4PP5CKeQf8054xAI8p5QoAA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=c4k7Q87aV3bLNUy9uE0itOvsjpuF7Oar33imeqs2rbqhu7/muyQ9F8uZKJyXtZnPNlyLSW+/4RRIcKzoGQtqGm5jgzVV6pKhOZGOngRA3ijjow9qaNg8fDJ9BnySY/dNYbLlDH8gLxPiec5wd9hPFe5cBTU0sjiOf+GSMnfF8H8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=CGO2u1dw; arc=none smtp.client-ip=209.85.214.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="CGO2u1dw" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1f6559668e1so26483925ad.3 for ; Tue, 04 Jun 2024 14:42:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1717537359; x=1718142159; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UdCQAM7e5bMqyS7h48dH9IJa2aicn6jIduH8LQ8/gwo=; b=CGO2u1dwmaZUGko3ucGmc0K7ubTApQaDL0g2vTPPGgiHuYDtvWKBB3KURl6oWY+em8 6hUkCKK5sxNczqvoui43bqougXZuec9UBuQmZiAc9sVDj2Fiz7+R+KEJke96vwLC/vMs hsWdXuFI/uAPtk3bGUKtjvGRkqXJTGB2XjKfc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717537359; x=1718142159; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UdCQAM7e5bMqyS7h48dH9IJa2aicn6jIduH8LQ8/gwo=; b=PswSwJx3cxG37KxC0wZ211oA4pxVJt5uTYNxDs8S2zX0vHpIHjdhRWdrvTZoIflkI9 gDA3KfHVlCvcwN2h6q/2QUvPLhQdDXxqtVk+FdOT9M57foM3Bz8imFn4p2Www9Ez0QwT cC/3smfv17mHhfwD9GjGb05+V5b0b1oO6HguYFjOC6gWJ9rjY/7fkHVH9tIRolKiLoFt 32T7Dz2R+c1Skyudk1Jd9lbVYmV8ODdPuIdRpkMiqHXtOhR2rbt8FrLd+iDfZ/1arq3f HiL91yZZZI9ES1nO9NUlISUjZ+W78a4TbwmflA01E012sBPdyyzmDo420r5tRNyTR8y0 bs4g== X-Forwarded-Encrypted: i=1; AJvYcCWZDAzjvD/W3NLLMZrBXyQ8Npa75ICEOpXs0jKF9gJTS4IcsoR6Tq5TxDaIpu2WO6js5p3yAFXmkXSPERXosbX7smNYHBP1Ysvj2xFvFQ== X-Gm-Message-State: AOJu0Yx1yABSsj5ft3OWkbfWvRqFluyf/HJBuJdhdR4s3mPSS0vQSLXE gJjCyMzWFjSzoPpfnRfWAAejKngbbONfzwSP4RDNK9m+1uEiLdR5hXNnP9AUfA== X-Google-Smtp-Source: AGHT+IHACVwMOBPFrf+eB5iYX0aACOfsfuqCORLFufTgaSTpclbakbGsz+yHvN2MJs5N4qePFzU54w== X-Received: by 2002:a17:902:ec91:b0:1f6:8290:175a with SMTP id d9443c01a7336-1f6a5a1a254mr8417235ad.40.1717537359406; Tue, 04 Jun 2024 14:42:39 -0700 (PDT) Received: from localhost (132.197.125.34.bc.googleusercontent.com. [34.125.197.132]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-1f63240134fsm88399035ad.243.2024.06.04.14.42.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 04 Jun 2024 14:42:39 -0700 (PDT) From: Stephen Boyd To: Konrad Dybcio , Bjorn Andersson Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, patches@lists.linux.dev, cros-qcom-dts-watchers@chromium.org, Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Pin-yen Lin Subject: [PATCH 3/3] arm64: dts: qcom: sc7180-trogdor: Make clamshell/detachable fragments Date: Tue, 4 Jun 2024 14:42:32 -0700 Message-ID: <20240604214233.3551692-4-swboyd@chromium.org> X-Mailer: git-send-email 2.45.1.288.g0e0cd299f1-goog In-Reply-To: <20240604214233.3551692-1-swboyd@chromium.org> References: <20240604214233.3551692-1-swboyd@chromium.org> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 At a high-level, detachable Trogdors (sometimes known as Strongbads) don't have a cros_ec keyboard, while all clamshell Trogdors (only known as Trogdors) always have a cros_ec keyboard. Looking closer though, all clamshells have a USB type-A connector and a hardwired USB camera. And all detachables replace the USB camera with a MIPI based one and swap the USB type-a connector for the detachable keyboard pogo pins. Split the detachable and clamshell bits into different files so we can describe these differences in one place instead of in each board that includes sc7180-trogdor.dtsi. For now this is just the keyboard part, but eventually this will include the type-a port and the pogo pins. Cc: Cc: Bjorn Andersson Cc: Konrad Dybcio Cc: Rob Herring Cc: Krzysztof Kozlowski Cc: Conor Dooley Cc: Cc: Cc: Pin-yen Lin Signed-off-by: Stephen Boyd Reviewed-by: Douglas Anderson --- .../boot/dts/qcom/sc7180-trogdor-clamshell.dtsi | 9 +++++++++ arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 5 +---- .../boot/dts/qcom/sc7180-trogdor-detachable.dtsi | 13 +++++++++++++ .../boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 9 +-------- .../boot/dts/qcom/sc7180-trogdor-kingoftown.dts | 2 +- arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 3 +-- .../arm64/boot/dts/qcom/sc7180-trogdor-pazquel.dtsi | 3 +-- arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 3 +-- .../boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi | 7 +------ arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 3 +-- .../boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi | 5 +---- 11 files changed, 31 insertions(+), 31 deletions(-) create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-clamshell.dtsi create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-detachable.dtsi diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-clamshell.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-clamshell.dtsi new file mode 100644 index 000000000000..d91533b80e76 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-clamshell.dtsi @@ -0,0 +1,9 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Trogdor dts fragment for clamshells + * + * Copyright 2024 Google LLC. + */ + +/* This file must be included after sc7180-trogdor.dtsi to modify cros_ec */ +#include diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi index 7765c8f64905..6e6a4643c4dd 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi @@ -7,6 +7,7 @@ #include "sc7180-trogdor.dtsi" #include "sc7180-trogdor-ti-sn65dsi86.dtsi" +#include "sc7180-trogdor-detachable.dtsi" /* Deleted nodes from sc7180-trogdor.dtsi */ @@ -80,10 +81,6 @@ &camcc { }; &cros_ec { - keyboard-controller { - compatible = "google,cros-ec-keyb-switches"; - }; - cros_ec_proximity: proximity { compatible = "google,cros-ec-mkbp-proximity"; label = "proximity-wifi"; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-detachable.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-detachable.dtsi new file mode 100644 index 000000000000..7c5d8a57ef7f --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-detachable.dtsi @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Trogdor dts fragment for detachables + * + * Copyright 2024 Google LLC. + */ + +/* This file must be included after sc7180-trogdor.dtsi to modify cros_ec */ +&cros_ec { + keyboard-controller { + compatible = "google,cros-ec-keyb-switches"; + }; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi index 2ba3bbf3b9ad..8846a7c4e636 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi @@ -5,9 +5,8 @@ * Copyright 2021 Google LLC. */ -/* This file must be included after sc7180-trogdor.dtsi */ - #include "sc7180-trogdor-rt5682i-sku.dtsi" +#include "sc7180-trogdor-detachable.dtsi" / { /* BOARD-SPECIFIC TOP LEVEL NODES */ @@ -135,12 +134,6 @@ &camcc { status = "okay"; }; -&cros_ec { - keyboard-controller { - compatible = "google,cros-ec-keyb-switches"; - }; -}; - &panel { compatible = "samsung,atna33xc20"; enable-gpios = <&tlmm 12 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dts index d6db7d83adcf..655bea928e52 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dts @@ -9,7 +9,7 @@ #include "sc7180-trogdor.dtsi" #include "sc7180-trogdor-parade-ps8640.dtsi" -#include +#include "sc7180-trogdor-clamshell.dtsi" #include "sc7180-trogdor-lte-sku.dtsi" #include "sc7180-trogdor-rt5682s-sku.dtsi" diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi index e9f213d27711..c3fd6760de7a 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi @@ -5,8 +5,7 @@ * Copyright 2020 Google LLC. */ -/* This file must be included after sc7180-trogdor.dtsi */ -#include +#include "sc7180-trogdor-clamshell.dtsi" &ap_sar_sensor { semtech,cs0-ground; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel.dtsi index 73aa75621721..cc2c5610a279 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel.dtsi @@ -5,8 +5,7 @@ * Copyright 2021 Google LLC. */ -/* This file must be included after sc7180-trogdor.dtsi */ -#include +#include "sc7180-trogdor-clamshell.dtsi" &ap_sar_sensor { compatible = "semtech,sx9324"; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi index 067813f5f437..8214a61276fe 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi @@ -6,8 +6,7 @@ */ #include "sc7180-trogdor.dtsi" -/* Must come after sc7180-trogdor.dtsi to modify cros_ec */ -#include +#include "sc7180-trogdor-clamshell.dtsi" #include "sc7180-trogdor-rt5682i-sku.dtsi" #include "sc7180-trogdor-ti-sn65dsi86.dtsi" diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi index b7de9fd3fa20..00229b1515e6 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi @@ -9,6 +9,7 @@ #include "sc7180-trogdor.dtsi" #include "sc7180-trogdor-rt5682i-sku.dtsi" +#include "sc7180-trogdor-detachable.dtsi" / { ppvar_lcd: ppvar-lcd-regulator { @@ -44,12 +45,6 @@ &camcc { status = "okay"; }; -&cros_ec { - keyboard-controller { - compatible = "google,cros-ec-keyb-switches"; - }; -}; - &gpio_keys { status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts index c9667751a990..d393a2712ce6 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts @@ -8,8 +8,7 @@ /dts-v1/; #include "sc7180-trogdor.dtsi" -/* Must come after sc7180-trogdor.dtsi to modify cros_ec */ -#include +#include "sc7180-trogdor-clamshell.dtsi" #include "sc7180-trogdor-rt5682i-sku.dtsi" #include "sc7180-trogdor-ti-sn65dsi86.dtsi" diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi index 305ad127246e..1d9fc61b6550 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi @@ -8,6 +8,7 @@ /dts-v1/; #include "sc7180-trogdor.dtsi" +#include "sc7180-trogdor-detachable.dtsi" / { avdd_lcd: avdd-lcd-regulator { @@ -104,10 +105,6 @@ &cros_ec { base_detection: cbas { compatible = "google,cros-cbas"; }; - - keyboard-controller { - compatible = "google,cros-ec-keyb-switches"; - }; }; &i2c4 {