From patchwork Sat Oct 19 18:12:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 13842857 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2B945D3C926 for ; Sat, 19 Oct 2024 18:15:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=kHW4PIhIrPnVV90qCB+AN2oU4d/tHLYXOYbamaR1+Pg=; b=HlDS+rqd8pMo1Qd6sf3YjK4E6H rtFRTIvX5kurzbKxLlo/cB5RupJa2IakMW2swnEigqyUmEoQLX2Fc3AK+k7O1+4vdWO+Dzd0mPah4 XIA3obRlpR/IuTG7tFfHbWDzXww/CvgvCd1RkIkll7vs0wjQV+M7dBRwptVdBjFKG+qxdhvb7fbiz Oa3hFy9ug2sS4Ss1YPJAckJjq3H10TdKgFq31DdAmZd9X5DyaWmwbW5/Fy7VNrJ7AazzMGr+GVXy1 Uon/Tt2ozD7jp9NPGIuArnBGhVALPM9jK5FzLIXCrCXZuPc59CKkb4kjNQnVMCPoqvbDSVGRfnZJi 9wpnpg6A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t2Dz5-00000003lBx-0TUS; Sat, 19 Oct 2024 18:15:27 +0000 Received: from mail-lf1-x132.google.com ([2a00:1450:4864:20::132]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t2DwC-00000003l1z-0YH3 for linux-arm-kernel@lists.infradead.org; Sat, 19 Oct 2024 18:12:30 +0000 Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-539f76a6f0dso2819864e87.1 for ; Sat, 19 Oct 2024 11:12:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1729361546; x=1729966346; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=kHW4PIhIrPnVV90qCB+AN2oU4d/tHLYXOYbamaR1+Pg=; b=I71SUIMotNlQL3YnsXlkmqKEqGiEIm/bCoTPx7zaMuVsTvQbvXR4ltnCfhK+m5rMrA MP7U7EyvM67xFN0OO9QKOSt4w/vc/3zsFl23gw9zFI30//5KHX7mvU6yUKrCiPHz9yS9 NzESfWjGrl/SgtC4mDmmD4+csHPM02fq6bNjQ20gdMNc0l9W8Mt1G8L2JpdFLvkuunPX 4EbopV67DKOnbugARqSrWUGK4uvIHMT5j5olBGpkbKbd35lpw838YrJ+a1n17FQyJ1bS W+QVP3QJmS04xT8zhIe+0AYYwopYvHGfRGh/90tm2kkaPUDqSk3xxH9f3PLA+faAeeaV 8XZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729361546; x=1729966346; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kHW4PIhIrPnVV90qCB+AN2oU4d/tHLYXOYbamaR1+Pg=; b=vuIRSc8rxAJQf1CbrLBwGQAVxEC0uGP7f6H7iDz7RW1l05X9ILPfo4Grwz+tbtC0W6 J9jbkIWzILFnKXZ8sgGcbe8aA3geDQoeKD7XImFFgxnNycMsnvNyN9Hj45Y1Ks+dRB62 8EnEbGHzRO8CfYS3S1V0SSJ6tOBs8pHXLTjdDp6xzN7wH6+lrGyPS1cufW1cVB/IYvk5 9MsPWEh+JIiZ7TzYLmAItWHssSJAsI12tuaxn8n8dyAio4I2GcoSgZ6n52T1J4Zz9wQA vEsiZRDDB7qC8mndX3dOIOexfa6xi6SPFtdMLmNH4Zi+NtZlFPNBUToanALr6laZibCp IDCw== X-Gm-Message-State: AOJu0YwNXd9GJPf3sZQyqpAItjt2w76WMnhfS/Xibf4IQyOyIuxcoHSa gWzRitplnttOZBMDM1xOB64RqybPlMz4/t/sFVZPKnEQtfLSG4c3Vog26UlUrySP9BOfiZYS/4k 7 X-Google-Smtp-Source: AGHT+IEL5ILu375mzZYAk48lkEW19l3a+i3XSz9GFhcnAAj05r1b3xKrc2X4/8jqQDSDjwulxmW/nQ== X-Received: by 2002:a05:6512:3991:b0:539:f51e:2465 with SMTP id 2adb3069b0e04-53a1549181fmr3572341e87.22.1729361546070; Sat, 19 Oct 2024 11:12:26 -0700 (PDT) Received: from Fecusia.lan (c-92-34-211-33.bbcust.telenor.se. [92.34.211.33]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-53a22420322sm7194e87.166.2024.10.19.11.12.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Oct 2024 11:12:25 -0700 (PDT) From: Linus Walleij Date: Sat, 19 Oct 2024 20:12:24 +0200 Subject: [PATCH 1/2] ARM: dts: ux500: Add touchkeys to Codinas MIME-Version: 1.0 Message-Id: <20241019-ux500-dts-updates-v1-1-a89bfbd0f680@linaro.org> References: <20241019-ux500-dts-updates-v1-0-a89bfbd0f680@linaro.org> In-Reply-To: <20241019-ux500-dts-updates-v1-0-a89bfbd0f680@linaro.org> To: linux-arm-kernel@lists.infradead.org, Linus Walleij Cc: Nikita Travkin X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241019_111228_206307_ECE2E52F X-CRM114-Status: GOOD ( 11.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The Codina Zinitix touchscreens have touchkeys for HOME and BACK, add these now that the driver and bindings support it. Cc: Nikita Travkin Signed-off-by: Linus Walleij --- arch/arm/boot/dts/st/ste-ux500-samsung-codina-tmo.dts | 1 + arch/arm/boot/dts/st/ste-ux500-samsung-codina.dts | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/st/ste-ux500-samsung-codina-tmo.dts b/arch/arm/boot/dts/st/ste-ux500-samsung-codina-tmo.dts index c623cc35c5ea23abb3d8883b2abf62ae199a2b0b..404d4ea9347b99a4b5116692d0ab3e1a1472bf18 100644 --- a/arch/arm/boot/dts/st/ste-ux500-samsung-codina-tmo.dts +++ b/arch/arm/boot/dts/st/ste-ux500-samsung-codina-tmo.dts @@ -544,6 +544,7 @@ touchscreen@20 { touchscreen-size-y = <800>; pinctrl-names = "default"; pinctrl-0 = <&tsp_default>; + linux,keycodes = , ; }; }; diff --git a/arch/arm/boot/dts/st/ste-ux500-samsung-codina.dts b/arch/arm/boot/dts/st/ste-ux500-samsung-codina.dts index 2355ca6e9ad6c6ff3040801f4c805c44a5abcc0c..a86e7f7f391fac40f51c1409d1e614b726c481f2 100644 --- a/arch/arm/boot/dts/st/ste-ux500-samsung-codina.dts +++ b/arch/arm/boot/dts/st/ste-ux500-samsung-codina.dts @@ -644,6 +644,7 @@ touchscreen@20 { touchscreen-size-y = <800>; pinctrl-names = "default"; pinctrl-0 = <&tsp_default>; + linux,keycodes = , ; }; }; From patchwork Sat Oct 19 18:12:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 13842858 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3ED27D3C926 for ; Sat, 19 Oct 2024 18:17:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=aOPEubHZIhhiRdT2eXiROOpjXok0tAhCbrnMnrQQXSA=; b=BzuPNmZiwL911DOvwRxqlLnwgM HHBoMsCxOeD/1YRl9fgeZBO4oKqyYmS3Mms2AGLVOIYQq0Ml0+oTgZWSrtr8vIXLbo0fR6W+5iXqc OKstu/hef3CxMODRieVssHKz0o0empGqfjj8dwelTVNr2AD/HWXmMyTssOBE/zAYGh9ctmxKSKAnn MJ3+QXYWP0Mfr2YMbQVc8N02ZlZe9FZzCiC04IEI70J6F+9Ng/uSDSCcWFR/76v1oNB0/YI1dV8Oi 5rGOXt2KbL0F4JxTUSl1QiI3OVpxzJvVV6pM8YUIP48feCEodWER5yT+uUOMblg16gDhyGDTHinBu 8UFVp4yQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t2E0W-00000003lKR-272U; Sat, 19 Oct 2024 18:16:56 +0000 Received: from mail-lj1-x232.google.com ([2a00:1450:4864:20::232]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t2DwE-00000003l31-0dHQ for linux-arm-kernel@lists.infradead.org; Sat, 19 Oct 2024 18:12:31 +0000 Received: by mail-lj1-x232.google.com with SMTP id 38308e7fff4ca-2fb4af0b6beso51254201fa.3 for ; Sat, 19 Oct 2024 11:12:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1729361548; x=1729966348; darn=lists.infradead.org; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=aOPEubHZIhhiRdT2eXiROOpjXok0tAhCbrnMnrQQXSA=; b=k57NVaaMtlIGVSkVTxz40h8reEFCKTB2dZngyMT4pg+mgpnKOVFN1h+gyEfYdMUbWV eff9yrlBP94+HxhHcW8I7b9/wxHxZ/9hHDG5DXBayVtKacRJ35DwLcyk2EvuraeTDGV1 KzEVxn474LRSlLloKimU0Dtp2CXHzOw5QenrlxltUulRzDhr26nERVtbrjQIr0GPSGE9 BLXk82qdZn4UTPjgFMoSuXD63d7dtum7ceDU8Ind3srzwDonkqyCvq4DizeYlEUM09ES xhLvOQ4fzvvCl2K2d4i6uHwqlGFkQXwLgR5FDZsPuNliG2SyOEMGWXOcoirb1L1a+6V9 WC1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729361548; x=1729966348; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aOPEubHZIhhiRdT2eXiROOpjXok0tAhCbrnMnrQQXSA=; b=KUSgciHnoMkzZ6Yn44LhLB3c1U4/PjovD+wDHJALIR0ODHeIoFuLlY/xnD3eimcRJt /pvRXP60xWgE8lW3B6pkj87FB/XNLXdVqRzNbFnmOwWsktBAl6RNdLiwHPx+znm+R7Lq yLTYe3G1Dv7gYmTm6Iathsq4aJ8Db9drHRO3AqgKijGwCoSmvj0snJMhJpftn/LLhV7I EiPkBLKiHqDMZ6tAVRpI8irPTjdDsuRSUEZLEyepkUrXUrpw2HuMBmq0rsSkJKZTxcpS wGoIXYIqB1h9HqdQ5jFvFna2yWq1tYGYHWo0kJY6brPscCNHQYW/q8p2QjoeWPZprRtC bkQA== X-Gm-Message-State: AOJu0YxJRysBSfM0e2G9IeWqkqR+bpBhSBFRfqPVSTmMpCrC/3/cPF4Q pBwiY323XqrHHwQK0lULD1loFe5yWk+D6JPVwjDDMwX8F413K+bg6jzkcYAP7aVli+Y4fGbB6n3 K X-Google-Smtp-Source: AGHT+IFyYDdSW88tDCHNyszE152JCAPJqX+Vhdk3sIdQHeBpca8Mz7iTQsL7FRSbyaY3zN+JTXM2ug== X-Received: by 2002:a05:6512:3ca8:b0:536:a4f1:d214 with SMTP id 2adb3069b0e04-53a1544519emr4981444e87.19.1729361548206; Sat, 19 Oct 2024 11:12:28 -0700 (PDT) Received: from Fecusia.lan (c-92-34-211-33.bbcust.telenor.se. [92.34.211.33]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-53a22420322sm7194e87.166.2024.10.19.11.12.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Oct 2024 11:12:26 -0700 (PDT) From: Linus Walleij Date: Sat, 19 Oct 2024 20:12:25 +0200 Subject: [PATCH 2/2] ARM: dts: Reconfigure the MC2 eMMC interface MIME-Version: 1.0 Message-Id: <20241019-ux500-dts-updates-v1-2-a89bfbd0f680@linaro.org> References: <20241019-ux500-dts-updates-v1-0-a89bfbd0f680@linaro.org> In-Reply-To: <20241019-ux500-dts-updates-v1-0-a89bfbd0f680@linaro.org> To: linux-arm-kernel@lists.infradead.org, Linus Walleij X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241019_111230_231793_CFDA5537 X-CRM114-Status: GOOD ( 16.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The eMMC interface was configured to configure the FBCLK into the Alt A setting, but this should be in GPIO mode and available for use as a reset line. Move it to the new mc_a_2 setting, and define this config in the generic options. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/st/ste-dbx5x0-pinctrl.dtsi | 49 +++++++++++++++++++++++ arch/arm/boot/dts/st/ste-ux500-samsung-codina.dts | 26 +++++++----- 2 files changed, 64 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/st/ste-dbx5x0-pinctrl.dtsi b/arch/arm/boot/dts/st/ste-dbx5x0-pinctrl.dtsi index 31a86606bedaede9539a950c127bcd2b8d03e112..9a6304b7ab2566bc5bac49f13816cb9884398f74 100644 --- a/arch/arm/boot/dts/st/ste-dbx5x0-pinctrl.dtsi +++ b/arch/arm/boot/dts/st/ste-dbx5x0-pinctrl.dtsi @@ -454,6 +454,31 @@ default_cfg3 { }; }; + /* MC2 without feedback clock on A8 */ + mc2_a_2_default: mc2_a_2_default { + default_mux { + function = "mc2"; + groups = "mc2_a_2"; + }; + default_cfg1 { + pins = "GPIO128_A5"; /* CLK */ + ste,config = <&out_lo>; + }; + default_cfg2 { + pins = + "GPIO129_B4", /* CMD */ + "GPIO131_A12", /* DAT0 */ + "GPIO132_C10", /* DAT1 */ + "GPIO133_B10", /* DAT2 */ + "GPIO134_B9", /* DAT3 */ + "GPIO135_A9", /* DAT4 */ + "GPIO136_C7", /* DAT5 */ + "GPIO137_A7", /* DAT6 */ + "GPIO138_C5"; /* DAT7 */ + ste,config = <&in_pu>; + }; + }; + mc2_a_1_sleep: mc2_a_1_sleep { sleep_cfg1 { pins = "GPIO128_A5"; /* CLK */ @@ -478,6 +503,30 @@ sleep_cfg3 { ste,config = <&in_wkup_pdis>; }; }; + + mc2_a_2_sleep: mc2_a_2_sleep { + sleep_cfg1 { + pins = "GPIO128_A5"; /* CLK */ + ste,config = <&out_lo_wkup_pdis>; + }; + sleep_cfg2 { + pins = + "GPIO129_B4"; /* CMD */ + ste,config = <&in_wkup_pdis_en>; + }; + sleep_cfg3 { + pins = + "GPIO131_A12", /* DAT0 */ + "GPIO132_C10", /* DAT1 */ + "GPIO133_B10", /* DAT2 */ + "GPIO134_B9", /* DAT3 */ + "GPIO135_A9", /* DAT4 */ + "GPIO136_C7", /* DAT5 */ + "GPIO137_A7", /* DAT6 */ + "GPIO138_C5"; /* DAT7 */ + ste,config = <&in_wkup_pdis>; + }; + }; }; sdi4 { diff --git a/arch/arm/boot/dts/st/ste-ux500-samsung-codina.dts b/arch/arm/boot/dts/st/ste-ux500-samsung-codina.dts index a86e7f7f391fac40f51c1409d1e614b726c481f2..40b0d92dfb1546ed6a8becf607217dcf0d18fe68 100644 --- a/arch/arm/boot/dts/st/ste-ux500-samsung-codina.dts +++ b/arch/arm/boot/dts/st/ste-ux500-samsung-codina.dts @@ -451,13 +451,17 @@ mmc@80005000 { no-sdio; no-sd; vmmc-supply = <&ldo_3v3_reg>; + vqmmc-supply = <&db8500_vsmps2_reg>; pinctrl-names = "default", "sleep"; /* - * GPIO130 will be set to input no pull-up resulting in a resistor - * pulling the reset high and taking the memory out of reset. + * This muxing excludes the feedback clock on GPIO130 + * which is instead used for reset of the eMMC. + * GPIO130 will be set to input no pull-up resulting in + * a resistor pulling the reset high and taking the + * memory out of reset. */ - pinctrl-0 = <&mc2_a_1_default>; - pinctrl-1 = <&mc2_a_1_sleep>; + pinctrl-0 = <&mc2_a_2_default>; + pinctrl-1 = <&mc2_a_2_sleep>; status = "okay"; }; @@ -678,14 +682,14 @@ default_cfg4 { sdi2 { /* * This will make the resistor mounted in R0.0 pull up - * the reset line and take the eMMC out of reset. On - * R0.4 variants, GPIO130 should be set in GPIO mode and - * pulled down. (Not connected.) + * the reset line and take the eMMC out of reset so set to + * GPIO input mode, no pull-up. On R0.4 variants, GPIO130 + * could be set in GPIO mode and pulled down. (Not connected.) */ - mc2_a_1_default { - default_cfg2 { - pins = "GPIO130_C8"; /* FBCLK */ - ste,config = <&in_nopull>; + mc2_a_2_default { + default_cfg3 { + pins = "GPIO130_C8"; /* RST_N */ + ste,config = <&gpio_in_nopull>; }; }; };