From patchwork Thu May 13 18:13:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Marek X-Patchwork-Id: 437381 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=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 A2851C433ED for ; Thu, 13 May 2021 18:13:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7889761438 for ; Thu, 13 May 2021 18:13:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231653AbhEMSPF (ORCPT ); Thu, 13 May 2021 14:15:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231630AbhEMSPE (ORCPT ); Thu, 13 May 2021 14:15:04 -0400 Received: from mail-qt1-x835.google.com (mail-qt1-x835.google.com [IPv6:2607:f8b0:4864:20::835]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A733CC061756 for ; Thu, 13 May 2021 11:13:54 -0700 (PDT) Received: by mail-qt1-x835.google.com with SMTP id m13so5176073qtk.13 for ; Thu, 13 May 2021 11:13:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marek-ca.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ldYQvJj0KRbhIl/z5ApJ979hT82UmNbqcDoq3QhJiLI=; b=U2J1N/A9ZhX1Szit1iN3ukByjGJiCdHzUALcnisOGydgjN6s3ggdUIWRRPBRJ22UlD aMAu6vBH3KbTrXu5Bo79Wm+4oIs126Um2n/cyx9yfRdmTmFdQTeNXLRyqu6SyylXUxRR jhIKPMWhOP6HboQwgtTjlv51XVlFlLohk14B9q+QRcAfzuUTO8Hjkh2Zga2PMn82psYg dgauIdmmU7kNjJ4rrI6YX7PGgXuHYAjjoH7N6iG/a51EtaezuqT16InnnNqoBIgshjN5 YaAEMPPjGii2YFNvBdonU+Q5q8YNksRbVMVRjS8vhVGwS8aRXorSFMyUa6Ydi8iDf/D7 l5qA== 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:mime-version :content-transfer-encoding; bh=ldYQvJj0KRbhIl/z5ApJ979hT82UmNbqcDoq3QhJiLI=; b=dwo+CmrxtGViSCXXO6rjPmApUFiLk9BHMAYwaN7zZoMwXLE1VnbKaDEdbtGwwW3koz hllmmuGmx7bdshec1c2FSK3gFYvqhdadTabvWUxoXIbV+1UEi9g5kb6GKMYHXn+QKGH1 d0meJKYdkEyI6ANUfbDL6TLS8uUxbcvY3eq8bXzOAdyZLRNQO6NzVWgdhGN7qSvw99sI XhXOsvjhFVWYJSP9iT8bsirmt45N3r0NnXhbf1gYhZXOo12n9toQODvq4qjMCvt1Fo7B KsYJMcY5xe/FDy1bU0k/h0OCJsuHV5rA39Am79oRHFudA1m6N0Cj8hlcuxB30zELB3W1 F4wA== X-Gm-Message-State: AOAM531QvRLkxOgYCz+6Nr1C9H235KQd2p0AArO4x0wHbzu/G7N/uwN6 Tl+SkyEd3nydKYj6koNHqedZk73bJW2RBUAnekw= X-Google-Smtp-Source: ABdhPJyViVkXqngrTbPXR5baqsDGgSvGEqIvytRmZa5Jg4j9jhOzXSbt2XtpVyUpO0jdYBys3SUzBg== X-Received: by 2002:ac8:7d02:: with SMTP id g2mr8260611qtb.208.1620929633570; Thu, 13 May 2021 11:13:53 -0700 (PDT) Received: from localhost.localdomain (modemcable068.184-131-66.mc.videotron.ca. [66.131.184.68]) by smtp.gmail.com with ESMTPSA id y6sm3069492qkd.106.2021.05.13.11.13.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 May 2021 11:13:53 -0700 (PDT) From: Jonathan Marek To: linux-arm-msm@vger.kernel.org Cc: Andy Gross , Bjorn Andersson , Rob Herring , Vinod Koul , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 1/2] arm64: dts: qcom: sm8350: fix names of qupv3_id_0 and uart3 Date: Thu, 13 May 2021 14:13:08 -0400 Message-Id: <20210513181309.12491-1-jonathan@marek.ca> X-Mailer: git-send-email 2.26.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Use the correct names for these. Fixes: 0684074a46e8 ("arm64: dts: qcom: Add basic devicetree support for SM8350-MTP board") Fxies: 9208c19f2124 ("arm64: dts: qcom: Introduce SM8350 HDK") Signed-off-by: Jonathan Marek --- arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 6 +++--- arch/arm64/boot/dts/qcom/sm8350-mtp.dts | 6 +++--- arch/arm64/boot/dts/qcom/sm8350.dtsi | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8350-hdk.dts b/arch/arm64/boot/dts/qcom/sm8350-hdk.dts index f23a0cf3f7b7..8cc507ce2230 100644 --- a/arch/arm64/boot/dts/qcom/sm8350-hdk.dts +++ b/arch/arm64/boot/dts/qcom/sm8350-hdk.dts @@ -14,7 +14,7 @@ / { compatible = "qcom,sm8350-hdk", "qcom,sm8350"; aliases { - serial0 = &uart2; + serial0 = &uart3; }; chosen { @@ -219,7 +219,7 @@ &mpss { firmware-name = "qcom/sm8350/modem.mbn"; }; -&qupv3_id_1 { +&qupv3_id_0 { status = "okay"; }; @@ -232,7 +232,7 @@ &tlmm { gpio-reserved-ranges = <52 8>; }; -&uart2 { +&uart3 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/sm8350-mtp.dts b/arch/arm64/boot/dts/qcom/sm8350-mtp.dts index 6ca638b4e321..423581751ed0 100644 --- a/arch/arm64/boot/dts/qcom/sm8350-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sm8350-mtp.dts @@ -20,7 +20,7 @@ / { compatible = "qcom,sm8350-mtp", "qcom,sm8350"; aliases { - serial0 = &uart2; + serial0 = &uart3; }; chosen { @@ -286,7 +286,7 @@ &mpss { firmware-name = "qcom/sm8350/modem.mbn"; }; -&qupv3_id_1 { +&qupv3_id_0 { status = "okay"; }; @@ -299,7 +299,7 @@ &tlmm { gpio-reserved-ranges = <52 8>; }; -&uart2 { +&uart3 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi index ed0b51bc03ea..76a1df371b17 100644 --- a/arch/arm64/boot/dts/qcom/sm8350.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi @@ -443,7 +443,7 @@ ipcc: mailbox@408000 { #mbox-cells = <2>; }; - qupv3_id_1: geniqup@9c0000 { + qupv3_id_0: geniqup@9c0000 { compatible = "qcom,geni-se-qup"; reg = <0x0 0x009c0000 0x0 0x6000>; clock-names = "m-ahb", "s-ahb"; @@ -454,7 +454,7 @@ qupv3_id_1: geniqup@9c0000 { ranges; status = "disabled"; - uart2: serial@98c000 { + uart3: serial@98c000 { compatible = "qcom,geni-debug-uart"; reg = <0 0x0098c000 0 0x4000>; clock-names = "se"; From patchwork Thu May 13 18:13:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Marek X-Patchwork-Id: 439004 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=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, 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 EC6E7C43460 for ; Thu, 13 May 2021 18:13:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B87026143C for ; Thu, 13 May 2021 18:13:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231654AbhEMSPH (ORCPT ); Thu, 13 May 2021 14:15:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231630AbhEMSPF (ORCPT ); Thu, 13 May 2021 14:15:05 -0400 Received: from mail-qt1-x82c.google.com (mail-qt1-x82c.google.com [IPv6:2607:f8b0:4864:20::82c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E2A56C06175F for ; Thu, 13 May 2021 11:13:55 -0700 (PDT) Received: by mail-qt1-x82c.google.com with SMTP id 1so20447447qtb.0 for ; Thu, 13 May 2021 11:13:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marek-ca.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HXltQBvkx1uGuMaYPj9g2id51wvtZyhCM+wy/g4T8Fs=; b=IqyBLMHPnqOO1aMM6yaIY9uAFQDOUOb9efB8ywVoZQt0QjImKLmxQzp+QG49XLsESj jbDe5QoSSAtex00OLxYlHdAIM2i/wKq6HeMr4ytmC/9iQJ26L+RSK2QkQEtT9XbXJtMz lsXSc42Txy0pLw/IZK0V3EXPwP1aXfABAJn1YmEavYUNISYuzpdZHyQq92pl2YpCJP1C Zwag5XxrjST/OhEAMwstFsn1mlQ2hED1fEA5jGvotTER2luavibFw3rzkxQselJCCiQk oi5SsmXPBQ86j0pIXOT/jD0qU06NWC3NlUjJz1HyoGN3RcNi2FgwR8TGs1Zz5XL6EjLF JEig== 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=HXltQBvkx1uGuMaYPj9g2id51wvtZyhCM+wy/g4T8Fs=; b=tWD4eMZn1X/R14I2W0Y22FzKNzKA5pJgtCyO4hf/FTD9aQPkT9guADKUr4gW8ldFZD naVSO/RY8XufPBIPgI9I7DsWVdyebXdxY1Y+pU04PK4ClBruf9/X0TlxfyJ9mH0Tiv5j WtF0KYbLAtMGBBR1DWUxfr7HZi6ie92/2Ik3Vr+1HCuw1LDqGfl12UdZb/OW1kTHLVYJ dmftuUNvUeh9NPbQeyNqXXMh1CsppCYyy+miPmyALq2Y6yHw6S4lbY5Aa01jH5leJ0JK 1UXCXSZSW9K+qUCikfseADGSnEzuZU16dkIG0vbn4qfpO1zrw0uULt11CJvzTL4tJCqw ClwA== X-Gm-Message-State: AOAM532HxNEhNwQwuLOeaiKM8O8MRIUS08QKIYcB6GsA/aDH3jx3jCS5 lEn7vHg4fERe1i7t7T+TAnkACvQf91Ktdb0xTCw= X-Google-Smtp-Source: ABdhPJyEMR6sukN1MstuFcNht076AryZM0nX8XcmQwhDdctmhiQyIcYhqR3M6/fU8WTw2Cb1h6OzKQ== X-Received: by 2002:ac8:66da:: with SMTP id m26mr27531909qtp.102.1620929634885; Thu, 13 May 2021 11:13:54 -0700 (PDT) Received: from localhost.localdomain (modemcable068.184-131-66.mc.videotron.ca. [66.131.184.68]) by smtp.gmail.com with ESMTPSA id y6sm3069492qkd.106.2021.05.13.11.13.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 May 2021 11:13:54 -0700 (PDT) From: Jonathan Marek To: linux-arm-msm@vger.kernel.org Cc: Andy Gross , Bjorn Andersson , Rob Herring , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 2/2] arm64: dts: qcom: sm8350: add qupv3_id_1/i2c13 nodes Date: Thu, 13 May 2021 14:13:09 -0400 Message-Id: <20210513181309.12491-2-jonathan@marek.ca> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20210513181309.12491-1-jonathan@marek.ca> References: <20210513181309.12491-1-jonathan@marek.ca> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add the qupv3_id_1 node and the i2c13 child node used for i2c devices connected to gpio0/gpio1. Signed-off-by: Jonathan Marek --- arch/arm64/boot/dts/qcom/sm8350.dtsi | 38 ++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi index 76a1df371b17..b7b997dd1475 100644 --- a/arch/arm64/boot/dts/qcom/sm8350.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi @@ -468,6 +468,31 @@ uart3: serial@98c000 { }; }; + qupv3_id_1: geniqup@ac0000 { + compatible = "qcom,geni-se-qup"; + reg = <0x0 0x00ac0000 0x0 0x6000>; + clock-names = "m-ahb", "s-ahb"; + clocks = <&gcc GCC_QUPV3_WRAP_1_M_AHB_CLK>, + <&gcc GCC_QUPV3_WRAP_1_S_AHB_CLK>; + #address-cells = <2>; + #size-cells = <2>; + ranges; + status = "disabled"; + + i2c13: i2c@a94000 { + compatible = "qcom,geni-i2c"; + reg = <0 0x00a94000 0 0x4000>; + clock-names = "se"; + clocks = <&gcc GCC_QUPV3_WRAP1_S5_CLK>; + pinctrl-names = "default"; + pinctrl-0 = <&qup_i2c13_default_state>; + interrupts = ; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + }; + apps_smmu: iommu@15000000 { compatible = "qcom,sm8350-smmu-500", "arm,mmu-500"; reg = <0 0x15000000 0 0x100000>; @@ -760,6 +785,19 @@ tx { function = "qup3"; }; }; + + qup_i2c13_default_state: qup-i2c13-default-state { + mux { + pins = "gpio0", "gpio1"; + function = "qup13"; + }; + + config { + pins = "gpio0", "gpio1"; + drive-strength = <2>; + bias-pull-up; + }; + }; }; rng: rng@10d3000 {