From patchwork Tue Mar 5 23:18:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13583084 Received: from ahti.lucaweiss.eu (ahti.lucaweiss.eu [128.199.32.197]) (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 9093712D210; Tue, 5 Mar 2024 23:26:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=128.199.32.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709681209; cv=none; b=eJvoQ3T2oNzolG+NWVwsYG2arv/rdROPuZw0aVTQWxaDSiT5PZhSBYZPam/fuENojPtsUgdmzTQDs14RgUyHOPpu9lu7Bnzg1Tfs+t0p9BYUqJuvL6w4XyyPq27Sr3SLgzD3Nl/q6/aGOz//Qg22dm4N1IV2Lt2SGjqNzdTlWZ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709681209; c=relaxed/simple; bh=jLpcizMG9m6smy+sfVYj6nIGQ7x4GGdWHU14fZkh1G8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MCP8EIoChKFxIV3hUqP0IJoVI1xR3e0RwhPLpvJ7ZKarM6AHRVHk0JnPwb0Pciahjq2qxxAn3XOZQJUJXF716pxq0r3wq8435zpZ4VkCtefvT23WK4qNOzGMPEHWu3chki6vOGHeOudkDH8pP/6eem0myP3rlw+ZcHe03N0tsr8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=z3ntu.xyz; spf=pass smtp.mailfrom=z3ntu.xyz; dkim=pass (1024-bit key) header.d=z3ntu.xyz header.i=@z3ntu.xyz header.b=sfGqy1Q0; arc=none smtp.client-ip=128.199.32.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=z3ntu.xyz Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=z3ntu.xyz Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=z3ntu.xyz header.i=@z3ntu.xyz header.b="sfGqy1Q0" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=z3ntu.xyz; s=s1; t=1709680705; bh=jLpcizMG9m6smy+sfVYj6nIGQ7x4GGdWHU14fZkh1G8=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=sfGqy1Q0pppPv2zTd6+FVgei1xudvu3iM9GSR1l+euUekZ6btrIkh3i+4MrAsZWS0 hwTTg0tW1hnY0Jzm/1bXd0asV5+3yGL4xneMxCkNCFJ31fxRs+vG+yRTU54vG/vSor pXwsn/1kg7SjOr8xngNxcXJiUJSutP5CL2O0mThk= From: Luca Weiss Date: Wed, 06 Mar 2024 00:18:04 +0100 Subject: [PATCH 1/5] ARM: dts: qcom: msm8974pro-castor: Clean up formatting Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240306-castor-changes-v1-1-2286eaf85fff@z3ntu.xyz> References: <20240306-castor-changes-v1-0-2286eaf85fff@z3ntu.xyz> In-Reply-To: <20240306-castor-changes-v1-0-2286eaf85fff@z3ntu.xyz> To: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andy Gross Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Luca Weiss X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=6482; i=luca@z3ntu.xyz; h=from:subject:message-id; bh=jLpcizMG9m6smy+sfVYj6nIGQ7x4GGdWHU14fZkh1G8=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBl56g7WwXzYZMJFK3azJXJzROXMz2wgDC78KV3c ZIxHm8sQTCJAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZeeoOwAKCRBy2EO4nU3X VkDdD/9CydSEVn4limvreJnnGIlfNI9QiWj00RThUXEGDflqf9FjOcKSFZIO1M979cMiol3T+qz 9B+Q6N+4whNIV40eJlT+6radviHJ/XWi0OMk/v7BoJuNXAQC4QLgsqUvUqEn0eMi3fDbw0yGI0Z zuCUS9UAzj7zcEqknvkf33NXCjszRqzVwycy4fsBTBKPnbOCIxOJq6pTO2vC3u99vZngvTU7MY6 q0WlK9yGcCGQmCowDBnQ4dtlFEFGQVUGqBwqXZD3eIneG3vq4aFTyHpW/tv3C5GYcGAV0pFhqbk 4zFdpqUDa1t64Aa0uAPv8oEFkQAN10+kpTC+51I6C5hCflkOBSrZY7f2MvHzUE85O/SW4R8YcKZ WH9G9rBwBOO53LAhM1C4TOWetlcUIrB+Ubye6iXA69yvM7ueXRIsXiODjZg0wCGRL1RHnpC3QqY 7C98C43GELAZhGoDuCsFcKtT0jADt5H8ipzVCszv2aFWhb5Alby5fbzoCIzwIsSiWY/t4/c4ZoC 5+tMmxv3okIX7izSgQ6gxtCr0XAo2dkn0ehmIfdbOWl9cs2dMjo0THmAiXrkHmSkoDG3liLfuAb dL0yKke0bp1QowL1ERRqC6AvN7B8xy4wGZomUhqKydnk3Ts0g2CTEXNfj9GPRb6TUymIun33bZM DDZsmInPbSq8skg== X-Developer-Key: i=luca@z3ntu.xyz; a=openpgp; fpr=BD04DA24C971B8D587B2B8D7FAF69CF6CD2D02CD Clean up some easy things do prepare the dts for further changes. * Move pinctrl-names below pinctrl-* * Move status as last property * Remove default linux,input-type value Signed-off-by: Luca Weiss Reviewed-by: Konrad Dybcio --- .../qcom-msm8974pro-sony-xperia-shinano-castor.dts | 65 +++++++++------------- 1 file changed, 27 insertions(+), 38 deletions(-) diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts index ee94741a26ed..2db2ddf00580 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts @@ -23,34 +23,30 @@ chosen { gpio-keys { compatible = "gpio-keys"; - pinctrl-names = "default"; pinctrl-0 = <&gpio_keys_pin_a>; + pinctrl-names = "default"; key-volume-down { label = "volume_down"; gpios = <&pm8941_gpios 2 GPIO_ACTIVE_LOW>; - linux,input-type = <1>; linux,code = ; }; key-camera-snapshot { label = "camera_snapshot"; gpios = <&pm8941_gpios 3 GPIO_ACTIVE_LOW>; - linux,input-type = <1>; linux,code = ; }; key-camera-focus { label = "camera_focus"; gpios = <&pm8941_gpios 4 GPIO_ACTIVE_LOW>; - linux,input-type = <1>; linux,code = ; }; key-volume-up { label = "volume_up"; gpios = <&pm8941_gpios 5 GPIO_ACTIVE_LOW>; - linux,input-type = <1>; linux,code = ; }; }; @@ -67,8 +63,8 @@ vreg_bl_vddio: lcd-backlight-vddio { vin-supply = <&pm8941_s3>; startup-delay-us = <70000>; - pinctrl-names = "default"; pinctrl-0 = <&lcd_backlight_en_pin_a>; + pinctrl-names = "default"; }; vreg_vsp: lcd-dcdc-regulator { @@ -80,8 +76,8 @@ vreg_vsp: lcd-dcdc-regulator { gpio = <&pm8941_gpios 20 GPIO_ACTIVE_HIGH>; enable-active-high; - pinctrl-names = "default"; pinctrl-0 = <&lcd_dcdc_en_pin_a>; + pinctrl-names = "default"; }; vreg_boost: vreg-boost { @@ -121,8 +117,8 @@ vreg_wlan: wlan-regulator { gpio = <&pm8941_gpios 18 GPIO_ACTIVE_HIGH>; enable-active-high; - pinctrl-names = "default"; pinctrl-0 = <&wlan_regulator_pin>; + pinctrl-names = "default"; }; }; @@ -131,9 +127,10 @@ &blsp1_uart2 { }; &blsp2_i2c2 { - status = "okay"; clock-frequency = <355000>; + status = "okay"; + synaptics@2c { compatible = "syna,rmi4-i2c"; reg = <0x2c>; @@ -147,8 +144,8 @@ synaptics@2c { vdd-supply = <&pm8941_l22>; vio-supply = <&pm8941_lvs3>; - pinctrl-names = "default"; pinctrl-0 = <&ts_int_pin>; + pinctrl-names = "default"; syna,startup-delay-ms = <100>; @@ -166,9 +163,10 @@ rmi4-f11@11 { }; &blsp2_i2c5 { - status = "okay"; clock-frequency = <355000>; + status = "okay"; + lp8566_wled: backlight@2c { compatible = "ti,lp8556"; reg = <0x2c>; @@ -232,8 +230,8 @@ bluetooth { compatible = "brcm,bcm43438-bt"; max-speed = <3000000>; - pinctrl-names = "default"; pinctrl-0 = <&bt_host_wake_pin>, <&bt_dev_wake_pin>, <&bt_reg_on_pin>; + pinctrl-names = "default"; host-wakeup-gpios = <&tlmm 95 GPIO_ACTIVE_HIGH>; device-wakeup-gpios = <&tlmm 96 GPIO_ACTIVE_HIGH>; @@ -242,17 +240,16 @@ bluetooth { }; &pm8941_coincell { - status = "okay"; - qcom,rset-ohms = <2100>; qcom,vset-millivolts = <3000>; + + status = "okay"; }; &pm8941_gpios { gpio_keys_pin_a: gpio-keys-active-state { pins = "gpio2", "gpio5"; function = "normal"; - bias-pull-up; power-source = ; }; @@ -260,7 +257,6 @@ gpio_keys_pin_a: gpio-keys-active-state { bt_reg_on_pin: bt-reg-on-state { pins = "gpio16"; function = "normal"; - output-low; power-source = ; }; @@ -268,7 +264,6 @@ bt_reg_on_pin: bt-reg-on-state { wlan_sleep_clk_pin: wl-sleep-clk-state { pins = "gpio17"; function = "func2"; - output-high; power-source = ; }; @@ -276,7 +271,6 @@ wlan_sleep_clk_pin: wl-sleep-clk-state { wlan_regulator_pin: wl-reg-active-state { pins = "gpio18"; function = "normal"; - bias-disable; power-source = ; }; @@ -284,20 +278,18 @@ wlan_regulator_pin: wl-reg-active-state { lcd_dcdc_en_pin_a: lcd-dcdc-en-active-state { pins = "gpio20"; function = "normal"; - bias-disable; power-source = ; input-disable; output-low; }; - }; &pm8941_lpg { - status = "okay"; - qcom,power-source = <1>; + status = "okay"; + multi-led { color = ; function = LED_FUNCTION_STATUS; @@ -530,41 +522,38 @@ pm8941_l24: l24 { }; &sdhc_1 { - status = "okay"; - vmmc-supply = <&pm8941_l20>; vqmmc-supply = <&pm8941_s3>; - pinctrl-names = "default", "sleep"; pinctrl-0 = <&sdc1_on>; pinctrl-1 = <&sdc1_off>; + pinctrl-names = "default", "sleep"; + + status = "okay"; }; &sdhc_2 { - status = "okay"; - vmmc-supply = <&pm8941_l21>; vqmmc-supply = <&pm8941_l13>; cd-gpios = <&tlmm 62 GPIO_ACTIVE_LOW>; - pinctrl-names = "default", "sleep"; pinctrl-0 = <&sdc2_on>; pinctrl-1 = <&sdc2_off>; + pinctrl-names = "default", "sleep"; + + status = "okay"; }; &sdhc_3 { - status = "okay"; - max-frequency = <100000000>; vmmc-supply = <&vreg_wlan>; non-removable; - pinctrl-names = "default"; pinctrl-0 = <&sdc3_on>; + pinctrl-names = "default"; - #address-cells = <1>; - #size-cells = <0>; + status = "okay"; bcrmf@1 { compatible = "brcm,bcm4339-fmac", "brcm,bcm4329-fmac"; @@ -572,8 +561,8 @@ bcrmf@1 { brcm,drive-strength = <10>; - pinctrl-names = "default"; pinctrl-0 = <&wlan_sleep_clk_pin>; + pinctrl-names = "default"; }; }; @@ -682,8 +671,6 @@ bt_dev_wake_pin: bt-dev-wake-state { }; &usb { - status = "okay"; - phys = <&usb_hs1_phy>; phy-select = <&tcsr 0xb000 0>; extcon = <&smbb>, <&usb_id>; @@ -692,14 +679,16 @@ &usb { hnp-disable; srp-disable; adp-disable; + + status = "okay"; }; &usb_hs1_phy { - status = "okay"; - v1p8-supply = <&pm8941_l6>; v3p3-supply = <&pm8941_l24>; extcon = <&smbb>; qcom,init-seq = /bits/ 8 <0x1 0x64>; + + status = "okay"; }; From patchwork Tue Mar 5 23:18:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13583082 Received: from ahti.lucaweiss.eu (ahti.lucaweiss.eu [128.199.32.197]) (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 8E0A312D20D; Tue, 5 Mar 2024 23:26:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=128.199.32.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709681208; cv=none; b=YY46E9RCZaNT3H0DJUZoZ9FKPrrsgCyG0lHuUPVl08VXrKoJiGwfHjRgDKTU4C9YVMbKf0nfcekGj5pV5Qo8MkD35cNWozpLEaMAfYXbbc+Qr4Sy2qIdKtP/FxKeCtbeu6H/dSKbS1PzjtKS2PHsRay7RsUfXDz0XH+zEpS4Wgk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709681208; c=relaxed/simple; bh=31ibeEGJ5Em1DeIcxHNvakpTfpM5nu/ekQP55sZySEU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=p/1K8y5jTgOFUAUkIvh3dwbXdhztey0sKeI8c4Z2veg2Qk/oqML4egd/C0R9C9HXYHpq0t870r38HhwqcydwCa9wR9cjsHBPoWNfvm4fl5LsYRokIf3mPlGkEmei8F7LJTLOgg+teqXMGgtd4oz0U15z/rnMoHCK0ZOBgiCxwEc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=z3ntu.xyz; spf=pass smtp.mailfrom=z3ntu.xyz; dkim=pass (1024-bit key) header.d=z3ntu.xyz header.i=@z3ntu.xyz header.b=LnNfVQGt; arc=none smtp.client-ip=128.199.32.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=z3ntu.xyz Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=z3ntu.xyz Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=z3ntu.xyz header.i=@z3ntu.xyz header.b="LnNfVQGt" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=z3ntu.xyz; s=s1; t=1709680705; bh=31ibeEGJ5Em1DeIcxHNvakpTfpM5nu/ekQP55sZySEU=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=LnNfVQGtVh/089VnLWPm5bpqlJmpPTz36nu89g/EIwQRcYJmAmRXdZOqdmbDpC9vR qAClE+Uvbo9tVfDsBfmFR59sscXGwovyxPItCUu0yoS2CMhfqbxBGrcJfPvsIVv4nI Mc0W7N32YsVC0w2eWBXc5/dECbKacVZFj8in61qU= From: Luca Weiss Date: Wed, 06 Mar 2024 00:18:05 +0100 Subject: [PATCH 2/5] ARM: dts: qcom: msm8974pro-castor: Add mmc aliases Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240306-castor-changes-v1-2-2286eaf85fff@z3ntu.xyz> References: <20240306-castor-changes-v1-0-2286eaf85fff@z3ntu.xyz> In-Reply-To: <20240306-castor-changes-v1-0-2286eaf85fff@z3ntu.xyz> To: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andy Gross Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Luca Weiss X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=822; i=luca@z3ntu.xyz; h=from:subject:message-id; bh=31ibeEGJ5Em1DeIcxHNvakpTfpM5nu/ekQP55sZySEU=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBl56g8h6ORRDJyVZSt309qt0OmUG3CrqdTbuf8s qFMJlsELrKJAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZeeoPAAKCRBy2EO4nU3X Viz8EADOuKWvxh6qAS6qgr7ptj0750yFhmVJA8pdL0r1EMca+TYmDjHaSfkWqwHCTbBjVKg4HX7 dyAx/ut+Q5odb/O4X+2MUEnIBM9L2KS+s1eVwOAZYLdz+wkeyoVgbeaX50Pb3QP76MvjMAgHjdA uChP186u1AXncRsXD0j4CK163pcElrAkkNPFbT9C4yOWQssWSGda6wkp5Zm9uu9dY+NqTrU3vme E4PDNQ/sPOvEFODW1aK2fH4sm0xqNmsLMFmBAdaMCHZTOwJDWDslZAG8bF3nqiq5aBZ0x9BQsIt nF2d464OwcXzAEv6wQBcjrx31M9qOSXJGlkeJB6Tq1Bw50eGlaVZjcQptCG7MGLWBFAgs2EprI0 Tr4bai7GjFDajUmHw4Wdzji5I+YdwmcP5MDq6UWGtUrzdUAs53poDPOEwCli87SJPfEVvwaMbR6 +Hr96diSucU2pvK1ZP/YWSp9q6u6xHFETtveqpWFFU82AgvRDwvgOQk3OhADVuCtebNE87slWOj kiJNlOXuldl1sjDRvp/qy6A+k6X2q2eED2CMS8g4Cqf3OvUWtVqznUDr5xAT9JCLpNwNRjCrrtF gUKtbqUQ5KFWQ9jFKm9L9pK3XEmeYEzhyMwTrxH6BWI4YUhW3i67gzgJIUEzOoR3We+uFuPrlbx GnD5fJmTvMRfIeg== X-Developer-Key: i=luca@z3ntu.xyz; a=openpgp; fpr=BD04DA24C971B8D587B2B8D7FAF69CF6CD2D02CD Add the mmc0 & mmc1 aliases to make sure internal storage always becomes /dev/mmcblk0 and SD card becomes /dev/mmcblk1 Signed-off-by: Luca Weiss Reviewed-by: Dmitry Baryshkov --- arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts index 2db2ddf00580..da554f72528a 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts @@ -12,6 +12,8 @@ / { chassis-type = "tablet"; aliases { + mmc0 = &sdhc_1; + mmc1 = &sdhc_2; serial0 = &blsp1_uart2; serial1 = &blsp2_uart1; }; From patchwork Tue Mar 5 23:18:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13583085 Received: from ahti.lucaweiss.eu (ahti.lucaweiss.eu [128.199.32.197]) (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 8E05C12CDB5; Tue, 5 Mar 2024 23:26:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=128.199.32.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709681209; cv=none; b=JzHT6AmkiN9hwWwFdh1wa/vT5AZ797RZhn++ml6qQpNVluA0sOshQJxPyllFQAD0o3XKAxSbHPRpbOWP+IXELzaTjwVBaamW+cUIY/vfB/WU6q+LYtR3VukhZsp2wj0xI17geCIj0X9vSZmFzT0tN/pHms1b4tTZHxcwXG6EUNQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709681209; c=relaxed/simple; bh=x9Y9xwhGkS+LUjC9Tovi4kF2u2FKvyUY6KkNZLsfsDk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SXknNmGhyt6A4ZY5baqUPxgak0SjO4GF/gryA9KEUc+r0CscHtEn/GSOzm0Dup522173fAGtd4JiUbF7Zs7dlch7Szfurmn81wYFy3Kd34EjbeGF/bev39vXWDjpLJm7Mxy2NKlwBmQKru0XEGv25qtfjEM4YoE97aQycMRtNN8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=z3ntu.xyz; spf=pass smtp.mailfrom=z3ntu.xyz; dkim=pass (1024-bit key) header.d=z3ntu.xyz header.i=@z3ntu.xyz header.b=74jOMO84; arc=none smtp.client-ip=128.199.32.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=z3ntu.xyz Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=z3ntu.xyz Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=z3ntu.xyz header.i=@z3ntu.xyz header.b="74jOMO84" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=z3ntu.xyz; s=s1; t=1709680706; bh=x9Y9xwhGkS+LUjC9Tovi4kF2u2FKvyUY6KkNZLsfsDk=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=74jOMO84QrDCSHxsak6DHbDY/ThEHp6Hr2HMdcDEmgW5BQ3FALinfCpD+qciY030i I6H5KeofgfA6R2rJ49uF+ibX0uhDmS/GsAdFI2hJUNPVakuARLzAI7YEgF6k3vZpfn ovJePfVKzY/K+fNExCkkJZ+1XrZC9fKlal5g7z2c= From: Luca Weiss Date: Wed, 06 Mar 2024 00:18:06 +0100 Subject: [PATCH 3/5] ARM: dts: qcom: msm8974pro-castor: Remove camera button definitions Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240306-castor-changes-v1-3-2286eaf85fff@z3ntu.xyz> References: <20240306-castor-changes-v1-0-2286eaf85fff@z3ntu.xyz> In-Reply-To: <20240306-castor-changes-v1-0-2286eaf85fff@z3ntu.xyz> To: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andy Gross Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Luca Weiss X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1221; i=luca@z3ntu.xyz; h=from:subject:message-id; bh=x9Y9xwhGkS+LUjC9Tovi4kF2u2FKvyUY6KkNZLsfsDk=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBl56g9PrxAuZFa4AyvTXxOy25WvQjQY/lFQieDE R956vCcXTyJAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZeeoPQAKCRBy2EO4nU3X VrOTEAC/YZwp8VNwuXdews+YsEVRSc5aXsmDiryjUvjAvepWBCa31qutCZbgI1S4JyHROjvVnwd ahjm1Omo9emOenigrezRSbUCUr0l+eWNNyHCs1kyNHjNqCgH8KVxQpGQ69SAc1ieRCSfKYaaoW8 ymYf/HK866XmRuceBDSMjhxRy8d7vS8ybL1uWJACzveirCyPM77JgBT20KR0m2T9LwsZBsLBHN1 fJ+OsqdBtyky3tuY55Mz3jnUd21n1MyTSpleGUHhaw2GtNjVfePV4olXiUUYTUcJEV2qDwSXz0x /n4wJOCSSuMuvn39GF+7Zv/qvYuEPJPl9w+TCqezBhnjSZ031gm6sTkFBBb+BZoUC1cr8pHyb4I aRYftiEuX45kGeD+kiUVxluA1D5W9ZLUyqHznI9dY5z2Kp8tCXvxyOAUuzl/zwzcVsO1Jxrrv3u ZzYWeulVsRADrTit2zRk6UwNJi9nueFL3H3c6ZwkXIo9PEtoIAv81tzQHLDzw4Xp30uY8W+h/Vp RgH4xrcl4FYWgJKPYGojZSQDk91/XPxRljVb+yOu/9DQcV0PAfHOgqLw0eyj9uy3oMmLiFl8NUH oQUgNqfq7VQobQzjyu1zFZtkKowlXKK5HPpvh9k5lEG3y837SIS0W8GlwDwtbLk1ZDqMzzSSpkA POIXc7cawmHmH8g== X-Developer-Key: i=luca@z3ntu.xyz; a=openpgp; fpr=BD04DA24C971B8D587B2B8D7FAF69CF6CD2D02CD From what I can tell, the camera buttons are not part of Z2 Tablet hardware even though other devices based on 'shinano' do have them. Fixes: ab80661883de ("ARM: dts: qcom: msm8974: Add Sony Xperia Z2 Tablet") Signed-off-by: Luca Weiss Reviewed-by: Konrad Dybcio --- .../dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts index da554f72528a..97b55bda9189 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts @@ -34,18 +34,6 @@ key-volume-down { linux,code = ; }; - key-camera-snapshot { - label = "camera_snapshot"; - gpios = <&pm8941_gpios 3 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - - key-camera-focus { - label = "camera_focus"; - gpios = <&pm8941_gpios 4 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - key-volume-up { label = "volume_up"; gpios = <&pm8941_gpios 5 GPIO_ACTIVE_LOW>; From patchwork Tue Mar 5 23:18:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13583081 Received: from ahti.lucaweiss.eu (ahti.lucaweiss.eu [128.199.32.197]) (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 8DEEB128374; Tue, 5 Mar 2024 23:26:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=128.199.32.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709681208; cv=none; b=bmnMPzHfBd0eOE5oVm+G1Whg59KKmI7I7CQf4QNkkvzbjG8higx1C+7bBBBSPlLsmuPKbLzWLmW3ApWGzO3OAhvzugqNf8a1ri0a1FFIKPu7Tbgx9Rlqlip0O9Ke5DHHN08v+ieE2H6OPdkWWINfFi3VFA1CjAgEz6MuNfg94a8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709681208; c=relaxed/simple; bh=2BAC8prJg5yf1usqspCzk9cPk0M5L7xBiL4UcGSLCPs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VKZZgl8wxFFR3vF5H4/MrglLPKaIjja2uA/+chv8/ORkZMHy6SgrbR2jfr5VxV6Lo7vt25OLEiorQLBiNdbBzNkbhpZmy/XZ+0i93n6MVUWIaeH1r9Tdp3hPy4HEbB19Gul9pmYP28K74CbvRa6GcFNn4GR9XzrtAfRxUks59UE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=z3ntu.xyz; spf=pass smtp.mailfrom=z3ntu.xyz; dkim=pass (1024-bit key) header.d=z3ntu.xyz header.i=@z3ntu.xyz header.b=sbaTKvBm; arc=none smtp.client-ip=128.199.32.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=z3ntu.xyz Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=z3ntu.xyz Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=z3ntu.xyz header.i=@z3ntu.xyz header.b="sbaTKvBm" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=z3ntu.xyz; s=s1; t=1709680706; bh=2BAC8prJg5yf1usqspCzk9cPk0M5L7xBiL4UcGSLCPs=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=sbaTKvBmDiFRC5opqIOvKpWJEWQSUiwSeIMvhetcVaIdepjIH6TA/Vdo2EqnubMPo m2FNfte4jkS/BskyLsU+Q6adePa3/EHQRg95hOemrYsd4wF47i1x7GhklAObAlNNtK B6Y2A3C0nChgdPbH/gPmhGZFM5+tkART1I8PRxC0= From: Luca Weiss Date: Wed, 06 Mar 2024 00:18:07 +0100 Subject: [PATCH 4/5] ARM: dts: qcom: msm8974pro-castor: Add debounce-interval for keys Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240306-castor-changes-v1-4-2286eaf85fff@z3ntu.xyz> References: <20240306-castor-changes-v1-0-2286eaf85fff@z3ntu.xyz> In-Reply-To: <20240306-castor-changes-v1-0-2286eaf85fff@z3ntu.xyz> To: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andy Gross Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Luca Weiss X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=945; i=luca@z3ntu.xyz; h=from:subject:message-id; bh=2BAC8prJg5yf1usqspCzk9cPk0M5L7xBiL4UcGSLCPs=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBl56g+F6B1hXGnRxC7F7HnYyGoBzsyRRhWlb1u6 j+kcTJVZOGJAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZeeoPgAKCRBy2EO4nU3X VpTxEACPdpFe1qyZ6hvdzwvq40zADoUQCaSgjW2AFeriE0Sabq2gduhNdxczGm/jEM0rCfh7eR1 w1/LxUk5MMquVTQYCwc5JujKb6eYxptuNPFCTjHS+JbbO7/NroKbSScOb4lIPav+h0ATnThUTwK RxdydhhrCr0nQwomrn84gLHwwNg45LI0SO260XEIrhhUKAJmggX7iJuspI/xSDzwyz0JSFe8TWG 8oh+qZifqWd6bcTX6acon4ShWItv/KqYWOvphPWzxtTglAwb4/VnIYtIa0wXtLeUhJFQmCf7jkp e3ToZnBdrdTILi16CycuxcjYbPM6oM28145MdQwnE1zNzQkg5jY4cHsLsHC4EopAYadl/7P5ggm GwwYPqFeGvT8pwS7hWdUtR4pJmmLcJxzNtn2p8WkX/6gI8ZxhUZbqO33AJLzfwHMClvin4VPm5D xDnO5dgALY3mjukmqOvRfnUv/8fo5aAyzjvqivCVVbd/gt2v7LBlK+nRcVvSsxITARvH+rOW1Qf 2Zv3uxbtx9dwYqk764oboqCqtdNopCcSa5nk6aQsRVGkfBD1fDPEvyZGXsH14EE8GkFzJIcQUEl 8mVremH+dxIdkG8vvR8FJPTOX1uoyCyZFjimV5eYxrkbJweobmwmrk3WKd+tEyrkhBotQ0Fbzvv RItRR2nP2WsnKaw== X-Developer-Key: i=luca@z3ntu.xyz; a=openpgp; fpr=BD04DA24C971B8D587B2B8D7FAF69CF6CD2D02CD Set the debounce-interval for the GPIO keys. Signed-off-by: Luca Weiss Reviewed-by: Dmitry Baryshkov --- arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts index 97b55bda9189..c9f74bf2f8bd 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts @@ -32,12 +32,14 @@ key-volume-down { label = "volume_down"; gpios = <&pm8941_gpios 2 GPIO_ACTIVE_LOW>; linux,code = ; + debounce-interval = <15>; }; key-volume-up { label = "volume_up"; gpios = <&pm8941_gpios 5 GPIO_ACTIVE_LOW>; linux,code = ; + debounce-interval = <15>; }; }; From patchwork Tue Mar 5 23:18:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13583080 Received: from ahti.lucaweiss.eu (ahti.lucaweiss.eu [128.199.32.197]) (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 7880F1426F; Tue, 5 Mar 2024 23:18:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=128.199.32.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709680716; cv=none; b=AE9uGflt4Tj1w9J8d10Y7SRgqm0nFBQB7xdy68BV27PRQfIL+fPkwR04kqV9yskJIbHm523F6e5RRrGmzFt5jzNzHv6cI5l7H5Om0RnRBfSRj95HdW+WXcO90h//hOOAjvaKsglIgMLhp90wPZGOb5s1E4nISFMW+tNy3GB++Uo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709680716; c=relaxed/simple; bh=/C52Li910U/Xv4kbIe7X14ZNBKEUjlNpqKLVWNOvhnc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bbzIiXqrxVKe5G/8qtvR8TPKrbSsockKZaRzhyTB/Zk2dh88r19JrKOiQ+GcnyPnq3tXiglFmmby82cT2owqLWihHHoC5cJFui+wet6K5EUiYt6Yrh6llNEZ2adwYYmaS1RsG6Ir28NbpGfCaK+0wmwralCjccd0R53VStLT9Ow= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=z3ntu.xyz; spf=pass smtp.mailfrom=z3ntu.xyz; dkim=pass (1024-bit key) header.d=z3ntu.xyz header.i=@z3ntu.xyz header.b=ObgII6FR; arc=none smtp.client-ip=128.199.32.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=z3ntu.xyz Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=z3ntu.xyz Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=z3ntu.xyz header.i=@z3ntu.xyz header.b="ObgII6FR" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=z3ntu.xyz; s=s1; t=1709680706; bh=/C52Li910U/Xv4kbIe7X14ZNBKEUjlNpqKLVWNOvhnc=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=ObgII6FRsRxQKfJWCEZIZI2sbkhAWko8Tyc8SUiqkDB9JODY7wksWDtANJdktTJBM LpiKRyhUaPaUuDIuhxwBsc7UfABMwcP3cHg8VZHQpTykGAXR6ROh4jGMSOT2ft42ER 0QmChD4CVLjt7dW/UHbSDgzqTkXdbsMhZ1Wvdpvk= From: Luca Weiss Date: Wed, 06 Mar 2024 00:18:08 +0100 Subject: [PATCH 5/5] ARM: dts: qcom: msm8974pro-castor: Rename wifi node name Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240306-castor-changes-v1-5-2286eaf85fff@z3ntu.xyz> References: <20240306-castor-changes-v1-0-2286eaf85fff@z3ntu.xyz> In-Reply-To: <20240306-castor-changes-v1-0-2286eaf85fff@z3ntu.xyz> To: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andy Gross Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Luca Weiss X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=753; i=luca@z3ntu.xyz; h=from:subject:message-id; bh=/C52Li910U/Xv4kbIe7X14ZNBKEUjlNpqKLVWNOvhnc=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBl56g/3eUrJtBMR8VCVrRvCl1GSrxTDzhsfdlPP gqBPHO/R06JAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZeeoPwAKCRBy2EO4nU3X VtK9EACTRjjDnqwPDz+cWdlPlvDgsujpyQZ3JoVP4JpuuewjzZ29hsMUMVs2HX5J5gwdLXHJpok NJRpPFaMODJKDPy+9XsNM/e8wDke150Ka4lz1LBgL2TmFsIui1/pAyf1LtV3arZ7ApLkvd/LtA0 2xm8dAjB6X72IVYPwhSLqwe3QKxMFM+ALK7pQ9HU/8hPOtLYke50fW3JeAKh0ZeJtBBfUGc6TGh TUMQp0BBjNYKaXJmYuR/R8hcJ7xnkAYA1wtNGmj4eVHdvDrOOn8l6AaHJ/1MV4LrAcnkoRJFN3q jsdnyVmghdvJztv5I13cVNhmUmkGWgjy/lPMKw3SEMHXjxXV3YSgcpsx0mJ8sSiNyTDPsEUlgp1 X1wG6Z39UPscRglJETlkfRtXPY/gda0/JkRZTyrqWVZFNx2O/h14QpbPn5E4bUo3Ho9edl++1kz ypiuqHKspfXUg9Kgo9JTiwxnBXzq60Fdx6Rv5mD9Gl8u25Eez10UtZb+FIw2s1/MYV1msWUdj/r Z0wqrqxnc/2b6YgnYVbmXbdeagRILe9j1zfi5oGvvqIJzeXkcfnbTwEQnKfXP/iXBeBNUBH9gLr 7Ump4bs/pPOERsRIK5/PuPIGFW3GPlROE9a+9cNPrwepQPLetPv4qrlDRHOS01+5KzgXtqj0ZmV NxTaWzEzpSJi7WQ== X-Developer-Key: i=luca@z3ntu.xyz; a=openpgp; fpr=BD04DA24C971B8D587B2B8D7FAF69CF6CD2D02CD Give the wifi node a generic node name 'wifi'. Signed-off-by: Luca Weiss Reviewed-by: Dmitry Baryshkov --- arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts index c9f74bf2f8bd..20f98a9e49ea 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts @@ -547,7 +547,7 @@ &sdhc_3 { status = "okay"; - bcrmf@1 { + wifi@1 { compatible = "brcm,bcm4339-fmac", "brcm,bcm4329-fmac"; reg = <1>;