From patchwork Wed Dec 14 03:47:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Owen Yang X-Patchwork-Id: 13072763 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4EE0C001B2 for ; Wed, 14 Dec 2022 03:47:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236626AbiLNDr6 (ORCPT ); Tue, 13 Dec 2022 22:47:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236598AbiLNDr5 (ORCPT ); Tue, 13 Dec 2022 22:47:57 -0500 Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33920101D9; Tue, 13 Dec 2022 19:47:57 -0800 (PST) Received: by mail-pg1-x535.google.com with SMTP id s196so1194567pgs.3; Tue, 13 Dec 2022 19:47:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tiIUzn2EddNcRpM3N08+Qqa+e8XOkPQxsi5T8BK8zVw=; b=Z20/VECNGDJ+fdiwSWlYkmV00xGED3fXWdN6MmZulRGw7TFyaaM1cWxa7QBg+2bB10 uJNCRR37WRAL1o552kCDQ4tUA+dHUkCqLBxHhRmQGl5/jGElwAKCaMPoMpoRWbLRAgHy n/3ChyCo/ez44S1ETrwlCdLg27O30JW64jPaGsJzJmbBDNJlVj1eBQdHDg9sSwLRpDq/ FFqDr/zVI6MXEqNJiHWpDE9FXtHv8V8KDwFkLfNss/K18o/qicnq+Qkmv9jSUbElV2rk 7Ll9dnfpHO3boO+KkehaNhpSOfREDuD0bq6EWTBbt1Y6le1WKftCHuVykHLuJdYRN282 kZdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tiIUzn2EddNcRpM3N08+Qqa+e8XOkPQxsi5T8BK8zVw=; b=zoSU1fduq5FIodBW69eZgFIgPC0aUNqYM3dsHqXxYUclbIS8BPATfnMoJKI+uNLO7H bj3IWaYa+nXuf/A635Hp1ezuBQXn4JTBFwa6XD+CkrjKQE3viE7tmVrxHHhNCEq0npYs J8FdMGz/kSlQCPF/iRi7kTlBr5AcG2npvgx01I8tJeX2ztkOGUImPhV8F1L0PCsR+q4o V3+JaQnt7F5eH3wknzBjg+c/WolzJaKMnITeFxb+TEzPSdWhOxl6LW3jkShyrdEaUH9g M94iuKM5SGHcTFtZPNrH2gybosBkKpuC4SNr7oLeP0pHLysm4EvMKdk+8j638s8/hVLh DGXA== X-Gm-Message-State: ANoB5pkupJC1BV0iuwLaMpWuQzlDoYbiLC0xQUmvswSlnQnDlBOPIORo VS18jsg7UIcwzwbuOEkZtLHQWDugrvM= X-Google-Smtp-Source: AA0mqf6H2OBSBAxYI4WkZp03aw/T1TXpTZDT4oH8lB5YG7yctBHqLKsgGFZ1JT1R8EkRrKw6QC+I8w== X-Received: by 2002:a62:de04:0:b0:577:3885:9d43 with SMTP id h4-20020a62de04000000b0057738859d43mr23280525pfg.18.1670989676318; Tue, 13 Dec 2022 19:47:56 -0800 (PST) Received: from localhost.localdomain (2001-b400-e28b-7065-982a-58d7-b612-9bf3.emome-ip6.hinet.net. [2001:b400:e28b:7065:982a:58d7:b612:9bf3]) by smtp.gmail.com with ESMTPSA id o24-20020aa79798000000b005745eb7eccasm8319817pfp.112.2022.12.13.19.47.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Dec 2022 19:47:55 -0800 (PST) From: Owen Yang To: LKML Cc: Matthias Kaehlcke , Doug Anderson , Stephen Boyd , Abner Yen , Bob Moragues , Gavin Lee , Harvey , Owen Yang , Andy Gross , Bjorn Andersson , Konrad Dybcio , Krzysztof Kozlowski , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH 1/2] dt-bindings: arm: qcom: Add zombie with NVMe Date: Wed, 14 Dec 2022 11:47:48 +0800 Message-Id: <20221214114706.1.Ie4ca64ad56748de5aacd36237d42c80dd003c1a9@changeid> X-Mailer: git-send-email 2.17.1 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add entries in the device tree binding for sc7280-zombie with NVMe. Signed-off-by: Owen Yang Acked-by: Krzysztof Kozlowski Reviewed-by: Douglas Anderson --- Documentation/devicetree/bindings/arm/qcom.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml index 27063a045bd0..0f8fabcae907 100644 --- a/Documentation/devicetree/bindings/arm/qcom.yaml +++ b/Documentation/devicetree/bindings/arm/qcom.yaml @@ -679,6 +679,18 @@ properties: - const: google,zombie-sku512 - const: qcom,sc7280 + - description: Google Zombie with NVMe (newest rev) + items: + - const: google,zombie-sku2 + - const: google,zombie-sku3 + - const: google,zombie-sku515 + - const: qcom,sc7280 + + - description: Google Zombie with LTE and NVMe (newest rev) + items: + - const: google,zombie-sku514 + - const: qcom,sc7280 + - items: - enum: - lenovo,flex-5g From patchwork Wed Dec 14 03:47:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Owen Yang X-Patchwork-Id: 13072764 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 175BCC4167B for ; Wed, 14 Dec 2022 03:48:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237083AbiLNDsE (ORCPT ); Tue, 13 Dec 2022 22:48:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236598AbiLNDsB (ORCPT ); Tue, 13 Dec 2022 22:48:01 -0500 Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5C1910568; Tue, 13 Dec 2022 19:48:00 -0800 (PST) Received: by mail-pg1-x531.google.com with SMTP id 142so1199476pga.1; Tue, 13 Dec 2022 19:48:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=HamKy7IR/Br8fqE5z1cuQ1CwgOAI0Xc6SWFCDQRfIlA=; b=FstbXrekny+c3fAxfJoD7/51mHIURlQ0qcbL/i7M8JZlpNs2aHSjMhBhAHTwfYk+1J h6ntqBDk8En2BU0Hi2b/vrXQ3np6azGHw6raW0g9JjLt0H4k85b+YCr6KKATh/TNZIg5 fZu/aqLDfHYC7kGci4nLF4mMGXGLAZlTA86kZ262YjxRgvhFnVznU8rMxbAThUTJe/kB qedo7RUhRKVqhyEhbBfjtOZ6J/TjW+Neb3+rj1UosNDoez5Icu3kYhmOsAeMWytnilTB ERl4GL1exZDcMZVz15tzBTbuBBmhk7L+chSkesaS6iwBMBBgtIcDRtU2cMx6uLx4wuwD c9jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=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=HamKy7IR/Br8fqE5z1cuQ1CwgOAI0Xc6SWFCDQRfIlA=; b=EFz07r4dMolbLxcBflFxDX+3S8TFJ+I/G60JbMNaY110HiVqCMBtxahOmliwx0pS+O wL7jt3hkZzvQvoH6aDkP9qkX48uv9IkrvdE28Rsy3bpkBEapRP6jDetlxUOZ4luZrj7y 8bS6IYpUNCsQPi+jouoz5kJNutSMsMPxYndYwxMw0LbLgwpPbbb9fGOVWV2hxuVsCmOG Jy3/4tfz+FE+JBB5FW4KhRiVfhN67fP4kv5p/66gsyjNGfxwAP9BckMBRK8ZuH/zLovP 3qwuVP+OFiOSo1/5wc/ej/T+BswCZzzuMbzwYb4fIQEEPgBV8XdCzBGBEIaNbAuYAoV/ pLzQ== X-Gm-Message-State: ANoB5pnsJXyS1Wm5kPuRluulitRvR1kwWAs8wqFeQXHYC+XoErbzyU+F ERJgGmyQ+5CtgmDAUM5VKokXm8uRN40= X-Google-Smtp-Source: AA0mqf6xlyc3ZOyAxojnSAdmWVg8QyVKvg3vRCqPw10qLcIDqpTzMPVK1pifWg0bfSLNBjW9V6lXug== X-Received: by 2002:a62:1b94:0:b0:578:f6f:efab with SMTP id b142-20020a621b94000000b005780f6fefabmr18728620pfb.11.1670989679964; Tue, 13 Dec 2022 19:47:59 -0800 (PST) Received: from localhost.localdomain (2001-b400-e28b-7065-982a-58d7-b612-9bf3.emome-ip6.hinet.net. [2001:b400:e28b:7065:982a:58d7:b612:9bf3]) by smtp.gmail.com with ESMTPSA id o24-20020aa79798000000b005745eb7eccasm8319817pfp.112.2022.12.13.19.47.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Dec 2022 19:47:59 -0800 (PST) From: Owen Yang To: LKML Cc: Matthias Kaehlcke , Doug Anderson , Stephen Boyd , Abner Yen , Bob Moragues , Gavin Lee , Harvey , Owen Yang , Andy Gross , Bjorn Andersson , Konrad Dybcio , Krzysztof Kozlowski , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH 2/2] arm64: dts: qcom: sc7280: Add DT for sc7280-herobrine-zombie with NVMe Date: Wed, 14 Dec 2022 11:47:49 +0800 Message-Id: <20221214114706.2.I1a0c709f8ec86cc5b38f0fe9f9b26694b1eb69d6@changeid> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221214114706.1.Ie4ca64ad56748de5aacd36237d42c80dd003c1a9@changeid> References: <20221214114706.1.Ie4ca64ad56748de5aacd36237d42c80dd003c1a9@changeid> Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add DT for sc7280-herobrine-zombie with NVMe Signed-off-by: Owen Yang Reviewed-by: Douglas Anderson --- arch/arm64/boot/dts/qcom/Makefile | 2 ++ .../dts/qcom/sc7280-herobrine-nvme-sku.dtsi | 14 ++++++++++++++ .../qcom/sc7280-herobrine-zombie-nvme-lte.dts | 17 +++++++++++++++++ .../dts/qcom/sc7280-herobrine-zombie-nvme.dts | 17 +++++++++++++++++ .../boot/dts/qcom/sc7280-herobrine-zombie.dtsi | 10 ---------- 5 files changed, 50 insertions(+), 10 deletions(-) create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-nvme-sku.dtsi create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie-nvme-lte.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie-nvme.dts diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index 3e79496292e7..5dcb3dd9718f 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -121,6 +121,8 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-villager-r1.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-villager-r1-lte.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-zombie.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-zombie-lte.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-zombie-nvme.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-zombie-nvme-lte.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7280-idp.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7280-idp2.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7280-crd-r3.dtb diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-nvme-sku.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-nvme-sku.dtsi new file mode 100644 index 000000000000..1aed02297f44 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-nvme-sku.dtsi @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Herobrine dts fragment for NVMe SKUs + * + * Copyright 2022 Google LLC. + */ + +&pcie1 { + status = "okay"; +}; + +&pcie1_phy { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie-nvme-lte.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie-nvme-lte.dts new file mode 100644 index 000000000000..e1fcacdccd51 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie-nvme-lte.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Zombie board device tree source + * + * Copyright 2022 Google LLC. + */ + +/dts-v1/; + +#include "sc7280-herobrine-zombie.dtsi" +#include "sc7280-herobrine-lte-sku.dtsi" +#include "sc7280-herobrine-nvme-sku.dtsi" + +/ { + model = "Google Zombie with LTE and NVMe"; + compatible = "google,zombie-sku514", "qcom,sc7280"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie-nvme.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie-nvme.dts new file mode 100644 index 000000000000..e3d52c560363 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie-nvme.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Zombie board device tree source + * + * Copyright 2022 Google LLC. + */ + +/dts-v1/; + +#include "sc7280-herobrine-zombie.dtsi" +#include "sc7280-herobrine-wifi-sku.dtsi" +#include "sc7280-herobrine-nvme-sku.dtsi" + +/ { + model = "Google Zombie with NVMe"; + compatible = "google,zombie-sku2","google,zombie-sku3","google,zombie-sku515", "qcom,sc7280"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dtsi index 7fc0b6bfc0d6..4c49d14cca47 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dtsi @@ -60,16 +60,6 @@ ap_tp_i2c: &i2c0 { status = "okay"; }; -/* For nvme */ -&pcie1 { - status = "okay"; -}; - -/* For nvme */ -&pcie1_phy { - status = "okay"; -}; - &pm8350c_pwm_backlight{ /* Set the PWM period to 200 microseconds (5kHz duty cycle) */ pwms = <&pm8350c_pwm 3 200000>;