From patchwork Sat Feb 3 19:11:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Bambura X-Patchwork-Id: 196359 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp46655dyb; Sat, 3 Feb 2024 11:14:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IFD3aegYuyHn7H52AG778qSde/Je1nJsGHZ/4vd2Q9cMvv4rNRcRZ0tR+5lENwF6d6C6El2 X-Received: by 2002:ae9:f810:0:b0:785:3889:a9d4 with SMTP id x16-20020ae9f810000000b007853889a9d4mr9412740qkh.48.1706987644685; Sat, 03 Feb 2024 11:14:04 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706987644; cv=pass; d=google.com; s=arc-20160816; b=vZZFJAnhyji2EKwZn+mAxCSZIlMrmkNyJYI2QM5/ZuYtnv0SdQwirDLNcnnibpfoeB grjzxjsFiymUAxp2089MhABHP15drDJ+jeKQ2GMfQxj8xDEurDdix+Qv3PjdXz2Ak3nB iKYeQo8bukWwa84cB9BUK8zfx/aekRrrDCGgVDzN/C1cnbauoAwQdbssG5WUGicJ/RNq 3o9w0QEY5BoDGQ5kjsWqdLc4wV9y2VB1mzdy78tq7vG9cfIa+jzpO9ceQckAZJlBWd6Y ijS9dxOkz7CxNsonoF1GRVRSmO9NIYBKsrHodtgoKFF3vkv28ZHhOo0oVEj7T1w0kZup TP6Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=k8u/VoqVTUPlxnhfNHXLj42MX1rvQDLgTi15K0P6Loc=; fh=g3M3h80+pThWdJCJm+YsnDUf85g/Zd99FsCgc9SAyGk=; b=Hl6htf3n40IXQzCuvRvrX2FyvIJdJ4wzhibIQLOoGId4ESrWC+1kRtie/ARA2Ys+BX bHF5Nv4trHERJJ0Ejd3WWVWXMUuFQBGWTeOsSIdFF8lwwOQsAhR6okO65b+Lh484hIjK Krghbq+SGyxfOgwAsK/Kvhwl/zZuA9WTdK6wZZO9ii9dpO6oiSOkFa5WhOLuXbFcfqJX wddpBKVcAvajONjHxNouRaKWAVkXFrI96I6Vs7l8lI8+3MxGce/qTdKjcNHP0KlTbNlw jNSJd+lDv18Qw71yDbIuJl+E+zprfgargo8o7VhFLyBRSRlwTxqEP4kuBn9eY6QxAQ21 mgxg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@postmarketos.org header.s=key1 header.b=igtWCgzx; arc=pass (i=1 spf=pass spfdomain=postmarketos.org dkim=pass dkdomain=postmarketos.org dmarc=pass fromdomain=postmarketos.org); spf=pass (google.com: domain of linux-kernel+bounces-51258-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-51258-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=postmarketos.org X-Forwarded-Encrypted: i=1; AJvYcCU5LK6xPqblHoJluXNrqsFGKkb3Q4K7UndNi66ldI6pHTzmQpHpBejEI61PmwdW1DLo4ICr/erHWb4WOJRTWTVezaBxAA== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id g20-20020a05620a109400b00783feb94122si4907539qkk.717.2024.02.03.11.14.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Feb 2024 11:14:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-51258-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@postmarketos.org header.s=key1 header.b=igtWCgzx; arc=pass (i=1 spf=pass spfdomain=postmarketos.org dkim=pass dkdomain=postmarketos.org dmarc=pass fromdomain=postmarketos.org); spf=pass (google.com: domain of linux-kernel+bounces-51258-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-51258-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=postmarketos.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 7A0711C21D28 for ; Sat, 3 Feb 2024 19:14:04 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 41C9761663; Sat, 3 Feb 2024 19:12:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=postmarketos.org header.i=@postmarketos.org header.b="igtWCgzx" Received: from out-171.mta0.migadu.com (out-171.mta0.migadu.com [91.218.175.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 33E675FBB4 for ; Sat, 3 Feb 2024 19:12:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706987550; cv=none; b=drWl3v49cExkN2bYsji7yvUpmQuLsTLqHvQsZyp570T1P6gaRi2ufUq0GCWHDWp0Pbm/FEdLwl9cOGqGpTU/pXM0baE3St8VpAbigiiVX80LuY4t5ZfwmeTl1H20VcfaXZJh6xtNDy6NTJS6id5ypXmxAOOMiFkV0FtNV8zfpQs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706987550; c=relaxed/simple; bh=giYyQ4lqO2YoScnu5Fp4JQtpjhwywXg+LNVOFgiaUWk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Btk3Gm2WrfjuaO8elAy+1fPZPXcfsAlW5Y5ldeJJSmH1Ot4l9PYTbgfu6+go6uuh2sg7uqiYmhew1mE59X8EnNxV4qQwaBcal7+xM3sFSUFCIkUXDGnH6PY7fS1XcVCburSyobntBq5idFBtT4Yn4yL8dJo7pFJltfNizSwb8W8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=postmarketos.org; spf=pass smtp.mailfrom=postmarketos.org; dkim=pass (2048-bit key) header.d=postmarketos.org header.i=@postmarketos.org header.b=igtWCgzx; arc=none smtp.client-ip=91.218.175.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=postmarketos.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=postmarketos.org X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=postmarketos.org; s=key1; t=1706987547; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=k8u/VoqVTUPlxnhfNHXLj42MX1rvQDLgTi15K0P6Loc=; b=igtWCgzxSlUCY3vSNXhlX14Ld4HMdQpGC5OG1/xekfw1Iw7LK9I+a7JvnL26JGiJnJo5Y7 FP9Jee7bYrhOo7U9FN8YZ5lR2KUNeQG+kLvgEYTt101d+yY7+iFifakR41ZvDiNnBJ0b4J sbMONfaK0/k27pCQGvFhgLBMrd9l/77Y85KwTYql02DuDTSMT3JzsPvO6zNkeCWDhoiSZa g5NO19QNoHLDepK++u0ln4Y+gHT2tdLMR4SnVDAJn7biNNpbgBtfuNAugU2sHnI+/HOq+E fWjDThdRgxx04oIaw+xV6cictjDm6Taek0dtySMNGx8Kgc7iGLS+5yyngfOqdw== From: Anton Bambura To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/6] arm64: dts: qcom: sc8180x-lenovo-flex-5g: move pinctrl to appropriate nodes Date: Sat, 3 Feb 2024 21:11:57 +0200 Message-ID: <20240203191200.99185-4-jenneron@postmarketos.org> In-Reply-To: <20240203191200.99185-1-jenneron@postmarketos.org> References: <20240203191200.99185-1-jenneron@postmarketos.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789906276563081554 X-GMAIL-MSGID: 1789906276563081554 Split keyboard and touchpad pinctrl nodes since they are for different devices and move keyboard, touchpad and touchscreen pinctrl references to appropriate nodes. Signed-off-by: Anton Bambura Reviewed-by: Konrad Dybcio --- .../boot/dts/qcom/sc8180x-lenovo-flex-5g.dts | 41 +++++++++++++------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts b/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts index af61acf58d68..6ae6cb030b70 100644 --- a/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts +++ b/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts @@ -357,7 +357,7 @@ zap-shader { &i2c1 { clock-frequency = <100000>; - pinctrl-0 = <&i2c1_active>, <&i2c1_hid_active>; + pinctrl-0 = <&i2c1_active>; pinctrl-names = "default"; status = "okay"; @@ -368,13 +368,16 @@ touchscreen@10 { hid-descr-addr = <0x1>; interrupts-extended = <&tlmm 122 IRQ_TYPE_LEVEL_LOW>; + + pinctrl-0 = <&ts_int_default>; + pinctrl-names = "default"; }; }; &i2c7 { clock-frequency = <100000>; - pinctrl-0 = <&i2c7_active>, <&i2c7_hid_active>; + pinctrl-0 = <&i2c7_active>; pinctrl-names = "default"; status = "okay"; @@ -385,6 +388,9 @@ keyboard@5 { hid-descr-addr = <0x20>; interrupts-extended = <&tlmm 37 IRQ_TYPE_LEVEL_LOW>; + + pinctrl-0 = <&kb_int_default>; + pinctrl-names = "default"; }; touchpad@2c { @@ -393,6 +399,9 @@ touchpad@2c { hid-descr-addr = <0x20>; interrupts-extended = <&tlmm 24 IRQ_TYPE_LEVEL_LOW>; + + pinctrl-0 = <&tp_int_default>; + pinctrl-names = "default"; }; }; @@ -669,14 +678,6 @@ i2c1_active: i2c1-active-state { drive-strength = <2>; }; - i2c1_hid_active: i2c1-hid-active-state { - pins = "gpio122"; - function = "gpio"; - - bias-pull-up; - drive-strength = <2>; - }; - i2c7_active: i2c7-active-state { pins = "gpio98", "gpio99"; function = "qup7"; @@ -685,8 +686,8 @@ i2c7_active: i2c7-active-state { drive-strength = <2>; }; - i2c7_hid_active: i2c7-hid-active-state { - pins = "gpio37", "gpio24"; + kb_int_default: kb-int-default-state { + pins = "gpio37"; function = "gpio"; bias-pull-up; @@ -718,6 +719,22 @@ wake-n-pins { }; }; + tp_int_default: tp-int-default-state { + pins = "gpio24"; + function = "gpio"; + + bias-pull-up; + drive-strength = <2>; + }; + + ts_int_default: ts-int-default-state { + pins = "gpio122"; + function = "gpio"; + + bias-pull-up; + drive-strength = <2>; + }; + usbprim_sbu_default: usbprim-sbu-state { oe-n-pins { pins = "gpio152";