From patchwork Tue Feb 25 09:05:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13989566 X-Patchwork-Delegate: quic_jjohnson@quicinc.com Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) (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 84D87266EF4 for ; Tue, 25 Feb 2025 09:05:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740474348; cv=none; b=k7a1ioAJMk9yEUpqCKjRJJsr2Xo1tAfPDNpwLLW0wJW/0UOdev3PY1AdyqLWAXbCgULqvtT6pZmMJn8k2t/sazvTsA90XenukrFRPLx9ExD4E+dRuKOK77mDTBfQJ55tiAuOcashHKLBYD5JVNPjPHdFL+E7RMZmNe7jRTUQs5o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740474348; c=relaxed/simple; bh=VbFmmIDF/8jKLhSs1wa1TXVWPdXSYsgH25cB1B+83/E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gGew11Rze2z+4ACC3pSuYoGeqQO5Oe+NHvxTqM5Buyt+1/dazJnlFo57Io3M/vRdADIa0cYlU21k1ADv/jbEU1xlKXfaLxaJqq+7F/0nF5aA1iVGEV9mtCvSfivltK06Rf0cjnjCpiRFA3cYtzhKgpzmiQHrEKxtPe2doNjfoDQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=cfkzFHq+; arc=none smtp.client-ip=209.85.218.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="cfkzFHq+" Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-ab7d8953b48so85576166b.2 for ; Tue, 25 Feb 2025 01:05:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740474344; x=1741079144; darn=vger.kernel.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=zo1pjQ68yeCzhbkpB7J7V47zeMnYxLOEDsgL4uzRgNQ=; b=cfkzFHq+TH3Cd/oBAf6IHI3IlHaMNnr4drjCbuugq7Dtfjix0he8FCfb0ZYiSgmD6h 794FBneJ5k/UrjeVY7SBNBZqeCXYGz0+mlS7DxK1zBCFQtSDVQ0o2Ndijw5r1bO6gCxr XnGnynzaLZl89k2Z8qoD59WqGRIkw9uBwPmw/S59+k5OyVmaYRzRXHJPFqXaOC9G7eZR P944pHhYnioT4bdqOpvnj4EWKwUgVIWAmyR0duus2cj+en3xFYb9LBqjUhxoO+4GwZvk rIGcGwMo/hyj2OXsZvgV3nfXiPZ6vcQPBLwkZ+39h0gCjgadQBEEM1pbre4XUX2A1d/F o2wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740474344; x=1741079144; 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=zo1pjQ68yeCzhbkpB7J7V47zeMnYxLOEDsgL4uzRgNQ=; b=TMqIUNWZ0zftjvLJ7Mf/2Gxtj9UJrvblw06lmtGjMsfcQkqADbmnwzR4gxKS6sRzgr 3IGe2h/mgW0uLNekLo5MgDyodXzeJDjrK6Ozlqs1s29qweuizXcc5TX3pdB6BCvAahrg m5ss/Pflxm+cG2n5HnUgOrtphIhhyDajON25UUEYARXV6SY/51bTgID/rgwBW50eYbpO L35WoL3hvh/Nlina+JwVNkxFouKeN8y58PJBsQeXG2pC9CiezsDEpsLrGPibiBuxSVFL JazuyIz5JguTqu5Y/vM+lAiXud3D10qo/ntj3n//0DLQ+/7NZYXb+vy72eIheGt0n2tT kHbQ== X-Gm-Message-State: AOJu0Yx7AHiMFbwnohJ1PAnce4hdfJMntXzPLXXaxLMLjJ3jNRTtiY7B oL1muy/AdMNyqbXabw+7vIqB7OzL663Wcer9Wo1Mg23CfbU9FZzfMUlT/D8h6c11TuDP4Ryj0No xCJE= X-Gm-Gg: ASbGncv5Zof9DHNm5uhijCGHkXzNXENLZywse1FW7rIYIIyircUrD38cvTroUsR0qq8 /mBYiMMeHKxnQQRfem7PNB7ptMhkUerI8fH5DnQP0SLymaJF857cE9R9ZMAxIo3M+z2tFLCPiXd RyhXlprDYGcsRvIhIhRRmJVgwFwr/WYZoracAlsUdWS6jYULbhuCQK0DVszgxgHefsdq+jW1LUo I+VlPu79bIX50kz4/zSD/ykoHkADxlzcF6obJI2c9bmM2xcFTNfhV493jYCheMyEOppqQpwGyQR jAT4JrjohWTnBceuVyl0DROpGogGUlq/EHbNNTMaHOb98ucXe9I9nLDrOlBSDhGloA2axFqzk7/ l X-Google-Smtp-Source: AGHT+IFfZNdXDJRzlMISFU49LCOakhBuM69LkIjmx8fbF/w1knTVG5tWk4V0qemTNqYROdbFXsCH5A== X-Received: by 2002:a17:907:9814:b0:ab7:cd83:98b7 with SMTP id a640c23a62f3a-abc09e5bf1fmr582403866b.11.1740474344247; Tue, 25 Feb 2025 01:05:44 -0800 (PST) Received: from [127.0.1.1] (78-11-220-99.static.ip.netia.com.pl. [78.11.220.99]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abed2054d58sm106681566b.148.2025.02.25.01.05.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:05:43 -0800 (PST) From: Krzysztof Kozlowski Date: Tue, 25 Feb 2025 10:05:32 +0100 Subject: [PATCH 1/5] dt-bindings: wireless: ath10k: Strip ath10k prefix from calibration properties Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250225-b-wifi-qcom-calibration-variant-v1-1-3b2aa3f89c53@linaro.org> References: <20250225-b-wifi-qcom-calibration-variant-v1-0-3b2aa3f89c53@linaro.org> In-Reply-To: <20250225-b-wifi-qcom-calibration-variant-v1-0-3b2aa3f89c53@linaro.org> To: Johannes Berg , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jeff Johnson Cc: linux-wireless@vger.kernel.org, devicetree@vger.kernel.org, ath10k@lists.infradead.org, linux-kernel@vger.kernel.org, ath11k@lists.infradead.org, ath12k@lists.infradead.org, Krzysztof Kozlowski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2764; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=VbFmmIDF/8jKLhSs1wa1TXVWPdXSYsgH25cB1B+83/E=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBnvYfgQSbcaZwR2tq3fhOVEdWBllORf8viADQmn Wu6612ZHpeJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZ72H4AAKCRDBN2bmhouD 17M6EACV7hPG3YBlQRRjYC7EqbUoc5wWOSqUvEuuy6qx6Dkd22qcQJXm7ZEr5U3XQFvCuAcZ7nX ACotRz7PjoieH49a1VCo4LhSjbYT3qRDxskFF9VVdvWraUtphgnj55kdkw0d6KEoM9Y2prvbFGx LwZ6AFFEZj3eKiuVZlSkvEQ70viWCjCYqiZR2QFMRKlvZZuHWJhiULlNBkIIaXtkQ0/hhqz8sCi jbkmRLbYo8CG5ub9/uOxn7ZNwZUB+Y7UjpCC4egJne/B0v6mgaqxMIsCiFDkTZlyH89+homyqmK M2sLBHzdCnG/X+RK4yEu8W1sfdlS1U/ZFu0zm+q1CpYqT/RaDgNjVJu+8s5yP4XbdgVFoYDWtfU +fHcN+LTSeqxR5wOQ8rXc2jpyjWbN5UX+jM5Co6DALIbxv1i79LgBgg4sm4XyiwAcNuhpHi2RA1 HZ3HNsftjAVMCnFi7erV1zzJdAugML21xyV1TkfKM50rWs8a1XGQXKWl/+w/KVfyrdKlQvSwV8G MluzY10xipB+fslPuWy0qRzM/tZriEjVywT9W6Yf3JCkPYTDyukCrpLYGMbEWARCXC5MyvhPDbz fWqno2SzFzSuwr+j5l7N5hKlf2zdeQawJ1uscMWElYBbziUO7ghhwFAu8gg7avuY/BFH6Qzbz0/ Aoh6IGtBcs3DYZw== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B Devicetree properties describing exactly the same thing should be reusable between device bindings. All Qualcomm Atheros WiFi chips needs certain calibration data, so properties should not be prefixed with device family (ath10k). Deprecate qcom,ath10k-calibration-variant and alike, so we gradually switch to a common property. This will also allow moving these properties to common schema, if desired. Signed-off-by: Krzysztof Kozlowski Acked-by: Rob Herring (Arm) --- Why? Because people add qcom,ath12k-calibration-data and probably they will add qcom,ath13k-calibration-data, qcom,ath14k-calibration-data and so on. --- .../bindings/net/wireless/qcom,ath10k.yaml | 25 ++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/net/wireless/qcom,ath10k.yaml b/Documentation/devicetree/bindings/net/wireless/qcom,ath10k.yaml index aace072e2d52a6830b98dd3f52d61380105c8aa1..f2440d39b7ebcda77db592de85573bec902fb334 100644 --- a/Documentation/devicetree/bindings/net/wireless/qcom,ath10k.yaml +++ b/Documentation/devicetree/bindings/net/wireless/qcom,ath10k.yaml @@ -92,20 +92,41 @@ properties: ieee80211-freq-limit: true - qcom,ath10k-calibration-data: + qcom,calibration-data: $ref: /schemas/types.yaml#/definitions/uint8-array description: Calibration data + board-specific data as a byte array. The length can vary between hardware versions. - qcom,ath10k-calibration-variant: + qcom,ath10k-calibration-data: + $ref: /schemas/types.yaml#/definitions/uint8-array + deprecated: true + description: + Calibration data + board-specific data as a byte array. The length + can vary between hardware versions. + + qcom,calibration-variant: $ref: /schemas/types.yaml#/definitions/string description: Unique variant identifier of the calibration data in board-2.bin for designs with colliding bus and device specific ids + qcom,ath10k-calibration-variant: + $ref: /schemas/types.yaml#/definitions/string + deprecated: true + description: + Unique variant identifier of the calibration data in board-2.bin + for designs with colliding bus and device specific ids + + qcom,pre-calibration-data: + $ref: /schemas/types.yaml#/definitions/uint8-array + description: + Pre-calibration data as a byte array. The length can vary between + hardware versions. + qcom,ath10k-pre-calibration-data: $ref: /schemas/types.yaml#/definitions/uint8-array + deprecated: true description: Pre-calibration data as a byte array. The length can vary between hardware versions. From patchwork Tue Feb 25 09:05:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13989567 X-Patchwork-Delegate: quic_jjohnson@quicinc.com Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) (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 DE75B261360 for ; Tue, 25 Feb 2025 09:05:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740474349; cv=none; b=jnbgDEkvPBnfkZNOKUnQN8XOibkJ2wHxo8XFwOAnXhREMrM/uS9Ix+A0sAqU7wOuoaNtHxsuzHlXShYiCmo7KZZ9N5zXqjDaZdx4tCdsIwdeyLowUB2QI9GjMkdItvE4fUP0Tj+CwRHxidud6OFJusIkhdAeljZgSJWGzDH/feQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740474349; c=relaxed/simple; bh=8usnTAEFm1Piu5Yd2wL1LXpPE1HGz8E+rmzlqa0grM8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tjT8npHIYZrgPn3yQT8Cr18riQBp71xA/3Vzq2NM1yJ9Qtd8LnQQDdZd5y8l9/9/iOT78+2qINtHm4jQ4ZCznwiA6HYP0jIdBPPBNACkxBTmMAoyK8yr5CwWFjnr572cYVxhaS0sd0au8QH394PPy82K0WlDBhRjKN1Ymq4NSqU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=ZvyjRDyW; arc=none smtp.client-ip=209.85.218.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="ZvyjRDyW" Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-abc28af1ba4so46397766b.1 for ; Tue, 25 Feb 2025 01:05:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740474346; x=1741079146; darn=vger.kernel.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=fY0h+JkzJEPC+Fr2bSYHihmywLYc/knwfAjtuNnsAeo=; b=ZvyjRDyWyuzvdhfxc4IqorIjCR9E6jeug4IXPPdsKBCVchDAiv4mAYAINQcYbY3lSJ KDLvG7PTyIB7vc7Aa2P7KhQUK51i8xXDZb37hU23vWK5kVDrIpytfdrgH1BuzRGgqFqs q0xS4mww45KeXQdJb6EgxtuATDkrLrTux7o7fDDv4QD7d+CKlSPS/lgSWkvQEHO6/hyY tgQvI+URPj0h+Uwws4ZJYYnQFWaF9Q1UvyRIao522uvXBY29COLOawly6AhUtU8IhauB 7u6bJmjwigRTU5hiUIBkCY6ikmlMnAHj1ChfS91cQhDwDLjrrUvLZrY6rmQqmJS5TvA3 LhyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740474346; x=1741079146; 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=fY0h+JkzJEPC+Fr2bSYHihmywLYc/knwfAjtuNnsAeo=; b=pza2ZgfQCK1XH/yxx8tVDu8atFmZZ0gt6tMEt387+cMwDEVhqkVVzXt7D5UORUDN1P jd9g3LwM9tYASfNyJ45uzsBH7v2iPbPALzfMPkOOggyzjX24eY8v0ty189vPTWDktg54 jO7gsBCyiRVvX3n3U45OdIPtHHEGhu3dKOHEESo2vamsQ0E6lsDuX0cWh+GMSZMP4H5j Le34o5baA7Y5WcIN9z1evFPHs2QwSrjfW5WpimYJRCw3gLVbACwtkOOaljJFUCe1L8jE Dkk4yWHM3IBJLBTTn/Am4MfhKcTK1XKvx+ZJjMK1akS00U0/Ne48OALSgIpGWwrfxwaP E01A== X-Gm-Message-State: AOJu0YzNXhdkqYDbHIPNeMEQqq0aUD1BE8EPve7s0gFqnhU0zAi6xRkS HqrPrs7RVvPEGcri1yV9OeonttGGf0TPlUKiKb7flsviqLtAvYXYI4S/wKXy0WBgWzd6PYoTqxd 0px4= X-Gm-Gg: ASbGncs8SXFjg6sG8h5z2t4wyIFnezwJ1TEzN4mDznJquy6+GbAtfwF7FuL0zOA3rKd Co2nW9kpa/WSYv00JXJlnWRr8rdh6XD3eEilstNr3DeYV7549evXhhs0YRRCyz6Enu4zGIOjaBq zYcgDqNZgUy5QHihCQ43/FeoBYWKQcR2AO2JQ7y2JSqF/YhgMAgeSZwtnYQ3hUHU0K5lICI+sT3 siMBi79KA7qD6B2jRdnHbhJaAjfh1OXCz1hYsiV2IEK1bTXMd/A7DA50ro4fGmIz/Iemo8FxWlg h6Ew80KJ0uZrexfCETo5VPnMLXhVx8666adFxPOm0yDnhiv+R1y3QH9pBGHEv5bSy34UQ3Qq9cE J X-Google-Smtp-Source: AGHT+IGkqhINat7Gxz1iDEnab5crobr9JPjoaawiIMmvU8LrPtIbqlI6khHbhhpw1r11PcRLe2kLUA== X-Received: by 2002:a17:907:3d8e:b0:ab3:2719:ca30 with SMTP id a640c23a62f3a-abc09bcce60mr682984466b.10.1740474345817; Tue, 25 Feb 2025 01:05:45 -0800 (PST) Received: from [127.0.1.1] (78-11-220-99.static.ip.netia.com.pl. [78.11.220.99]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abed2054d58sm106681566b.148.2025.02.25.01.05.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:05:45 -0800 (PST) From: Krzysztof Kozlowski Date: Tue, 25 Feb 2025 10:05:33 +0100 Subject: [PATCH 2/5] dt-bindings: wireless: ath11k: Strip ath11k prefix from calibration property Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250225-b-wifi-qcom-calibration-variant-v1-2-3b2aa3f89c53@linaro.org> References: <20250225-b-wifi-qcom-calibration-variant-v1-0-3b2aa3f89c53@linaro.org> In-Reply-To: <20250225-b-wifi-qcom-calibration-variant-v1-0-3b2aa3f89c53@linaro.org> To: Johannes Berg , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jeff Johnson Cc: linux-wireless@vger.kernel.org, devicetree@vger.kernel.org, ath10k@lists.infradead.org, linux-kernel@vger.kernel.org, ath11k@lists.infradead.org, ath12k@lists.infradead.org, Krzysztof Kozlowski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2961; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=8usnTAEFm1Piu5Yd2wL1LXpPE1HGz8E+rmzlqa0grM8=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBnvYfh6CpkJd8c70kQJfWzDAjgLHF01wrk68d68 hSc3oJt3RyJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZ72H4QAKCRDBN2bmhouD 11UmD/wNk1W++Osvh3b2yso4MtXvuq3PwwRO5Yiz8g4FfR+ea8vdj3Um0ZQ6m48tUIyZ+JMX9St URu3XSQHi//YmHCI9eyHnkTUvxjvVLjgee37/OiwUTVMXN4xN6cKjHE1+mGQDP0JzPQGkdTDlIK TxSazB/bESJwr2RzDNB9MQIRwUDiWjAJ9oTP6661PQsMlRW0XF+H2OSJ+JDe1lPAbF7/wK4D9uL C1IG0uzI2RPu39ZzHnyo9uvdnE8SRQ+Xd+Dbzz4TH8zzEKXaVJljrMLWVF/A/oNGbsZxmRvi5Q6 VDPw7Xfz5PIY/P++793HL5UFBlqQtl43wRKIOKFMaaUE6z60LM4a1YyMErH3vVXD5bcdeT/WE1q Ph+mzNZANDXPdL7CpefayVOEFupDOR5aijsD+z5gOF6pHSxk1HLL0jMRXW90/8PkxsyK5iQI47/ ZMCrjf0D+KHE+V0sWqazBQyizUIfEDnvImMIrWx3YyPcza/apucuDYzppT4nD+/k4TKUZVBlaC+ fAhFxaRn3YR9/2+0cbJAi3lyAfLdBTahyMEvV6OA2c83nf+a/jLiCyXikoVwOOrSzlIMJcXhEdd c+qjpbafFiIf04McwHGosxH8vkeAkYvgojJ4K+LDDM5tBGfmHfZpLsB3RdhAu3u2nFVm6w3VfMt cHMvTQ/ajd2nsBA== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B Devicetree properties describing exactly the same thing should be reusable between device bindings. All Qualcomm Atheros WiFi chips needs certain calibration data, so properties should not be prefixed with device family (ath11k). Deprecate qcom,ath11k-calibration-variant and alike, so we gradually switch to a common property. This will also allow moving these properties to common schema, if desired. Signed-off-by: Krzysztof Kozlowski Acked-by: Rob Herring (Arm) --- .../devicetree/bindings/net/wireless/qcom,ath11k-pci.yaml | 9 ++++++++- Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml | 7 +++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/net/wireless/qcom,ath11k-pci.yaml b/Documentation/devicetree/bindings/net/wireless/qcom,ath11k-pci.yaml index a4425cf196aba58e4181e690a0448236aee15e50..653b319fee880ef0944d8e35c545890b60611756 100644 --- a/Documentation/devicetree/bindings/net/wireless/qcom,ath11k-pci.yaml +++ b/Documentation/devicetree/bindings/net/wireless/qcom,ath11k-pci.yaml @@ -22,8 +22,15 @@ properties: reg: maxItems: 1 + qcom,calibration-variant: + $ref: /schemas/types.yaml#/definitions/string + description: | + string to uniquely identify variant of the calibration data for designs + with colliding bus and device ids + qcom,ath11k-calibration-variant: $ref: /schemas/types.yaml#/definitions/string + deprecated: true description: | string to uniquely identify variant of the calibration data for designs with colliding bus and device ids @@ -127,7 +134,7 @@ examples: vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>; vddrfa1p8-supply = <&vreg_pmu_rfa_1p7>; - qcom,ath11k-calibration-variant = "LE_X13S"; + qcom,calibration-variant = "LE_X13S"; }; }; }; diff --git a/Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml b/Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml index a69ffb7b3cb884a4eeb51064cc1c8136b433f285..c089677702cf17f3016b054d21494d2a7706ce5d 100644 --- a/Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml +++ b/Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml @@ -41,8 +41,15 @@ properties: * reg * reg-names + qcom,calibration-variant: + $ref: /schemas/types.yaml#/definitions/string + description: + string to uniquely identify variant of the calibration data in the + board-2.bin for designs with colliding bus and device specific ids + qcom,ath11k-calibration-variant: $ref: /schemas/types.yaml#/definitions/string + deprecated: true description: string to uniquely identify variant of the calibration data in the board-2.bin for designs with colliding bus and device specific ids From patchwork Tue Feb 25 09:05:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13989568 X-Patchwork-Delegate: quic_jjohnson@quicinc.com Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) (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 D611E269828 for ; Tue, 25 Feb 2025 09:05:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740474352; cv=none; b=HCNM6ZMh2w6ba2aoIuD/R1eR3RojOyf93Rv54w5POkwn+962sClmuRtXIdrlh3M41Z5VdCefh+CfZYCORzYt9g2/GdrbwHgKgSRtl86fyjsUUhWejs+RIxQ1+5z81JEv/d2HlTw5TOw9QeV7K8455EdnsVaZSZfSu2xBNweYwGA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740474352; c=relaxed/simple; bh=JTVJkXQ8vZ6nxJX4jG3BnwDYUC+zBILYi0/GP0SyV34=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=EVGdTMysFXkBofskhtNr4k4DHUUPrfL0UMOxjSZ1dwecheFwoXmS4fffSc1rQsvYymNvdCFDYP+Yon9m77dN6m+2XvF5kGgQaaVSPnBEx0LfllOOX/hCdWogUCXhTUuh3PqlCUhRC9uzSpooisC4NrVTmRDFRosH5VUo9NYe06c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=HUsJ0JZZ; arc=none smtp.client-ip=209.85.218.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="HUsJ0JZZ" Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-abb9fac29d8so81191766b.0 for ; Tue, 25 Feb 2025 01:05:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740474349; x=1741079149; darn=vger.kernel.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=5sAL967SIYKC/s55u5inAE7XXnuMpEFX5DsCH7UXWsg=; b=HUsJ0JZZoXi4Ve5GDn1QZdj4oEyV4iZo6rXORGGcIK55Sh5i8cn1J63R954ivbK3Ea YjI2EXejdAdooyB2JgRY1XiU0ObrbrXZokCkpXclQJXFw0CGqGx9aG00hQfrzHxAUnQ2 KtUad4eKqGYY+yTW5kLf3XAcTRBMRG3vnFfVsmoaStcQHrLwyxlSwhHxQuMAfSOL+XGS TZ2MVJsT2jTKjiw6SN4DDVm6rfQ8JiR1Xpkktyz4ctOIwBUg5FeiFSMBPcuoCWL9K/fG BWGOWRrCZz+ZVyZ/Yn1HLjtCwgtY6XArshVJK/cZICzvXGP73jr5RN3ZVNcz7CxUO/SE +5nA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740474349; x=1741079149; 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=5sAL967SIYKC/s55u5inAE7XXnuMpEFX5DsCH7UXWsg=; b=S+b75Cs/B8q+JSM+KuIkYkosJYM3l/r0e7JALMr1CX2oZjXqM+YIjpM7qj7FE4gFtI KenauhJw8ZdMrORJb6LmNvp0OUxP/UvzkM03T0XZ01VV5DgiowolTuJ7qugZuFIN+kyV fz9i5ZLER862AjW29cZa5fEBJV/jlD5CWQZq0kdTH6E+Hb7SDbfwQ/C+h19JJjuGEQOp H0DKuFb8ocynxpgC+Fv0fkmVRHiex0GgVnzokoMdSOZ8Mb+VdQTmvfIHVS0E89zij7ZE slWHcPErNzDYudC01acH/yLacBTvkldVH9A0xnxDZblBpABvMC2krT7NIOTg8hC+zi8P 3jEQ== X-Gm-Message-State: AOJu0Yyxg6CG8ytRP+ZN8U8iyfOV6qvXJTnSLtAVIV1Luy8mtoeXn/uw PJoG34zsRxjk6uNRvwEDuWKjaL94wmUAApt5MUYZySPVn2ExvYh99ZWeMLtgmo8rLvT6i89T5Pj 3W0s= X-Gm-Gg: ASbGncu9+5H2OixpEU6o5OWcXspA+o69Jac0zpYz9JCjaAzIKcCIQ7fu8bos94sEUEh hrmNaBlmW7F4aS/rfEjSsTO2DVifA2kUCXbRMdYdUM+Nt3BLIQRh6z1BF50M6LRNmaahLoS3o1T aSSS3n+Pl/0lyYqxhvlCkL958+pZEGj2MvAPqNp5N+dsXGdsk2oo+HvpC8weP5w2ry2b8o08eww ngY29pGJyG/Ckg68w4J/KPBXwqdF9gpgBBUGwzHeS9fGnNlDejCGOqoDwLJibRN+zioCDRocfNd tGT4qIOtqB3b9Fm8T8zJ+kJ4LuuSNG4WNohJQUNglPHC+nr3G5ofLCa66uo9qczFRj0/+IINw0P f X-Google-Smtp-Source: AGHT+IGN/O451uNdobw5eR4f+pisbXs6lLZFYeSNFMLURRhFrS1Naf+7h53+qP3DXrYTQROzZHfugA== X-Received: by 2002:a17:907:9713:b0:ab7:5fcd:d4be with SMTP id a640c23a62f3a-abc099c6a2dmr697998666b.1.1740474348822; Tue, 25 Feb 2025 01:05:48 -0800 (PST) Received: from [127.0.1.1] (78-11-220-99.static.ip.netia.com.pl. [78.11.220.99]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abed2054d58sm106681566b.148.2025.02.25.01.05.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:05:47 -0800 (PST) From: Krzysztof Kozlowski Date: Tue, 25 Feb 2025 10:05:34 +0100 Subject: [PATCH 3/5] dt-bindings: wireless: ath12k: Strip ath12k prefix from calibration property Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250225-b-wifi-qcom-calibration-variant-v1-3-3b2aa3f89c53@linaro.org> References: <20250225-b-wifi-qcom-calibration-variant-v1-0-3b2aa3f89c53@linaro.org> In-Reply-To: <20250225-b-wifi-qcom-calibration-variant-v1-0-3b2aa3f89c53@linaro.org> To: Johannes Berg , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jeff Johnson Cc: linux-wireless@vger.kernel.org, devicetree@vger.kernel.org, ath10k@lists.infradead.org, linux-kernel@vger.kernel.org, ath11k@lists.infradead.org, ath12k@lists.infradead.org, Krzysztof Kozlowski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2540; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=JTVJkXQ8vZ6nxJX4jG3BnwDYUC+zBILYi0/GP0SyV34=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBnvYfiP7AFaiu4hFbS1G2fGNJ16ZvacyJZZcJr4 ReBMJiTMmSJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZ72H4gAKCRDBN2bmhouD 163kD/9429RBSJrEM4OsIa9/ktExaWuclrDJQb33xACbdd4jmZjrfjtDiE3ESWVQIMqreGJF05i UgWZj38mrrVTZYpuTLyBQzdQ4EMS3tkMqaqKDCaLrfiAXybkDMtJ4FeU/TUcHmixMaEjJRiln6/ 7xfL/EYwvmiiaT3MWxptJ1udSDkqiHc6HUNvTxU7aUT53fQhKxwaju1811sc174zOGGfgTKchfU 3Y2+ngkl3645+n3JUwq5RJc7Ynwc0mWKFohm6IbFyBS9Oc7YI10FY55siDqulHQDf8Vee8PVrvG 5ySm+X0rcV9Kz/oZwClVEAXUPTAjEMzU24eNl+fK2gU2ze4c87Y19xDYsPhpDnnXxAhP3KXpyYj onMZ+FQeuDpZE8Bb84fXSI78eUUuJn6zQabIo3iFuETZRoUlDY03EXWXBpx0iGm+52mO1KS6lRm MMiwgTopTmUTsof2I+Jylsyxn12jyIkRAk40ThFH62eb+Ey186eN6Z+C8M90Qtn8acrN8ZU2+J9 Vodz/d1LBcFeNHFVqwL02bkAe8oDr61MQS7cmmQv26tAqwiU+pueOt8BZYq4q+hKiOMlbUE/NkN ucrK4S2RMjgglWL2lf93gqTRFRgt88OZxY8QVyFaphwzPZAHYjSD22jvfZoknxC9ak3zscZDi0n T5wq/ixczbgRvAw== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B Devicetree properties describing exactly the same thing should be reusable between device bindings. All Qualcomm Atheros WiFi chips needs certain calibration data, so properties should not be prefixed with device family (ath12k). Deprecate qcom,ath12k-calibration-variant and alike, so we gradually switch to a common property. This will also allow moving these properties to common schema, if desired. Signed-off-by: Krzysztof Kozlowski Acked-by: Rob Herring (Arm) --- .../devicetree/bindings/net/wireless/qcom,ath12k-wsi.yaml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/net/wireless/qcom,ath12k-wsi.yaml b/Documentation/devicetree/bindings/net/wireless/qcom,ath12k-wsi.yaml index 318f305405e3b34e66a31bec7460c0a9d020ebc1..589960144fe1d56eb6f15f63a2d594210e045d27 100644 --- a/Documentation/devicetree/bindings/net/wireless/qcom,ath12k-wsi.yaml +++ b/Documentation/devicetree/bindings/net/wireless/qcom,ath12k-wsi.yaml @@ -52,8 +52,15 @@ properties: reg: maxItems: 1 + qcom,calibration-variant: + $ref: /schemas/types.yaml#/definitions/string + description: + String to uniquely identify variant of the calibration data for designs + with colliding bus and device ids + qcom,ath12k-calibration-variant: $ref: /schemas/types.yaml#/definitions/string + deprecated: true description: String to uniquely identify variant of the calibration data for designs with colliding bus and device ids @@ -103,7 +110,7 @@ examples: compatible = "pci17cb,1109"; reg = <0x0 0x0 0x0 0x0 0x0>; - qcom,ath12k-calibration-variant = "RDP433_1"; + qcom,calibration-variant = "RDP433_1"; ports { #address-cells = <1>; @@ -139,7 +146,7 @@ examples: compatible = "pci17cb,1109"; reg = <0x0 0x0 0x0 0x0 0x0>; - qcom,ath12k-calibration-variant = "RDP433_2"; + qcom,calibration-variant = "RDP433_2"; qcom,wsi-controller; ports { @@ -176,7 +183,7 @@ examples: compatible = "pci17cb,1109"; reg = <0x0 0x0 0x0 0x0 0x0>; - qcom,ath12k-calibration-variant = "RDP433_3"; + qcom,calibration-variant = "RDP433_3"; ports { #address-cells = <1>; From patchwork Tue Feb 25 09:05:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13989569 X-Patchwork-Delegate: quic_jjohnson@quicinc.com Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) (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 C57C626988E for ; Tue, 25 Feb 2025 09:05:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740474354; cv=none; b=Fe6B5Sf+chTtPy5oYgCzhFm89OwQ4pn1wYZBNWaKp1jmDiRHrjy0Jj+xZrEv0NOhV2nlNFKePrw4USOV3MZ6V5yLZG9kjyFq0TfbImMhgFlw08oRRNVqbGInI7oe4UiSdmhxb+MQXKQ7d277EgWBgzo4hUcRgJdiS77qP1LEJgs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740474354; c=relaxed/simple; bh=Dz5yNmE8eSdxa0CmdJl8w6wvj0WWXjGEMcH+7qjSCmE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JlPcjcNgVSst+caeVgFK0H3LdxbXmOY3PLjcjQt7/gG5hWxs/gq8RRqX2ioXjSegg/bhj6IEMo6QUxE/aXMVRxydokndQjSYwKvxIKChzUY3DAzmz4uULOX8SQvTR5aMPY99A4/kyNqXiHfxDDTj6d8QSZHudDtNBwtNZoqD+eI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=R/FGa+3V; arc=none smtp.client-ip=209.85.218.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="R/FGa+3V" Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-ab7f9f57192so70746966b.3 for ; Tue, 25 Feb 2025 01:05:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740474350; x=1741079150; darn=vger.kernel.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=fCfhYp/tqNoV2tEavI68DM4qQ3+PDh9QaJPfXDvyBHc=; b=R/FGa+3VNGlsdc8bJjGQ49drRlnxRJ2z4JmPXlB5kXuPmeFbbnuieqpl7J6hHiHehv /cnzfInXRusMVV35qtUWkTPrFYHFhna4QxrNZA/q4gG/ec3PHIwWo7FLNulPaVaNNnQS L+h7S1I2H6ast4vKDCeagfap8fZYiqZielH8BKFSyYUFFnd1AkPVVHJ/dwjUjfdMJ00p Cnr4uf1Dphj5U77sabmQrm8Xtl89eBwlc64AQqOHnb2Dq2Js56BoxfwD+433VP4D8NTf PQ+SfNogYllh1FKCK9uSzA3b1H6ZtwXu5s8Jd16IbeKkHJn3T7PKN+WIrFNFBVEhTxjr BiKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740474350; x=1741079150; 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=fCfhYp/tqNoV2tEavI68DM4qQ3+PDh9QaJPfXDvyBHc=; b=StH/+6nRZE+YD8zSFhplXn/XPXHndfCcZm9fbyiA1l+P7ex+ZN+ofXxJh6pINuxahy rIwwEcfeOcIv1pk4tKMdDXqc4uIzHQLVm9wytZ1j9/rZ2Ubq9mG6aUBjJGMlb1BBIlfU bwpsvY7PqaFUxzm6N3fUpvs2eWK7DjkMimgMgqDv+g4XKwP4S+fjqvuLYP7+ZCt7JGOd h2ZVcVCNZoGEH0t9tkTTjHF+iIZO1Lp+xDoYMr/G3XQeZZQenyIghMLYdwHYirEISmP6 RmflYqdWM7jXkvgSM6LnktQU2cl1WjNDcSX2isa+PCPdhjCA9wia7IXid2X7oJYgGgEx ONjA== X-Gm-Message-State: AOJu0Yy4/X0/mpSh3hF8cSyMuY8RmTOF6ZwB0qNzgsqxoJC6jP4RYMfZ rf3EDP1iLYa2lQYeMFumKDmsCRgEh4j7JiSu6syKTO7kW1y/1fqbLa6JZyXqUR5UGhcWc90EQfo Q1eI= X-Gm-Gg: ASbGncsIAz6BoKDf6yscpuU5ybMWKcL6hhW5K8KNPcMDhIq7BMJDG0SMu0ZDTj8EQau qhQ1+EOb/XLAyX4ZVvljFT/umCoRO6xLK4ta6exsoaedSnHyyu1///ztfsUhb33vn0cfTmJgWgG 4nbB/74JcHs+dygp/8+kDuC9cZGMRJPalVv/pDhgb1znYwVcedXssreTO3tGRODR63u3iavA2b3 mTyBUg4nAgE94cZ98ekTgkaOjbfwhaQ1ctxZaZ7tozq+NQdFv8gdzonS/fkmLB2/umzmM+4xjoN weLNDNmLSU9I0uBvdZlZ39BH28nnMAZOhLgn3uhWB1Q1aOfZL7r1ukOL1Q//08PDXIfeemB+L5e V X-Google-Smtp-Source: AGHT+IHtKrgOP/DE1J4J0Y0A0ldGOKWtPV8QRy1Ye1jhGLz4Lda7FRnPOyCqYEGlT4EJBTKJOYvyIw== X-Received: by 2002:a17:907:7f17:b0:ab7:63fa:e35a with SMTP id a640c23a62f3a-abc099e1dafmr622362066b.2.1740474350361; Tue, 25 Feb 2025 01:05:50 -0800 (PST) Received: from [127.0.1.1] (78-11-220-99.static.ip.netia.com.pl. [78.11.220.99]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abed2054d58sm106681566b.148.2025.02.25.01.05.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:05:49 -0800 (PST) From: Krzysztof Kozlowski Date: Tue, 25 Feb 2025 10:05:35 +0100 Subject: [PATCH 4/5] wifi: ath10k: Deprecate qcom,ath10k-calibration-variant properties Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250225-b-wifi-qcom-calibration-variant-v1-4-3b2aa3f89c53@linaro.org> References: <20250225-b-wifi-qcom-calibration-variant-v1-0-3b2aa3f89c53@linaro.org> In-Reply-To: <20250225-b-wifi-qcom-calibration-variant-v1-0-3b2aa3f89c53@linaro.org> To: Johannes Berg , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jeff Johnson Cc: linux-wireless@vger.kernel.org, devicetree@vger.kernel.org, ath10k@lists.infradead.org, linux-kernel@vger.kernel.org, ath11k@lists.infradead.org, ath12k@lists.infradead.org, Krzysztof Kozlowski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1977; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=Dz5yNmE8eSdxa0CmdJl8w6wvj0WWXjGEMcH+7qjSCmE=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBnvYfj60TnvUIEnv7U3Skox2u9XlT7lKh41uz9Y LYH4CNb/eSJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZ72H4wAKCRDBN2bmhouD 161WD/9+7eNP22O1Oi7cVRGHtqvvI7AoMm3h0LaGetUerCD1eAKZJHbQ3ecjiMPTc0nT7VFIOCw 3QOup8KQRLR2Ad9a8S/wxCAj3co/NXb1sVBb6JYaGjBcDLQLADmaN4emAwavL8SWzD2vy0cL08z 5OJ3jyibeH1W4qGX8N1BRK5gGpazHOAw6aguwdtqdGT6JTVfbhwXcNhcamzfXvOXfc6O2cKm2dw Jt6r36tA914fiY3AHnZX6lE5Zv5mGEleylSa6rtxiCdmUTi3S1P6kWe8kJ6VUzkB5fdbUW5IA3T Fp4LCa7ziayx2L0QuJz1mdw5GDW1m8moNDTt/SfGRjQ2SKZMakXPcxkYQHMuhN2WhALPm7aDV3P wcB6732IeIZh3ELZHGhy3by02TPGmqey/phS7bhzaoIHdyV9oUd7qAKA+OvbbHmeFdEdFqeHyWq CVMNPqCW0ZeF93yytlQEo/n73t951xCiKgqQhNOQ7hkmxxCE2ZXH6m1WzvfhQeBdtLCj0vJwADV LnhjWjTsqO7Js2AWCtoK4pUGXI4NNP+rBXvUoxwy+1ovIb8jNiLAb94xArpXOqRpAtgLq0QyIkP A5M79qCl+RbiGigr2q+kdL3MtVIXdTMd4+Qnl+RCeKcskpiD1/Q7XYl/nu71067RPMVs41engGh 0P3cSdAcMOAX2zA== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B Add support for calibration-like properties without 'ath10k' prefix, while still keeping everything backwards compatible. Signed-off-by: Krzysztof Kozlowski --- drivers/net/wireless/ath/ath10k/core.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c index b3294287bce1f7785231d3bf0f90cb15806937b2..6d336e39d6738bbe7973a25e073d03a07b9ae733 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -1163,8 +1163,11 @@ int ath10k_core_check_dt(struct ath10k *ar) if (!node) return -ENOENT; - of_property_read_string(node, "qcom,ath10k-calibration-variant", + of_property_read_string(node, "qcom,calibration-variant", &variant); + if (!variant) + of_property_read_string(node, "qcom,ath10k-calibration-variant", + &variant); if (!variant) return -ENODATA; @@ -2259,7 +2262,9 @@ static int ath10k_core_pre_cal_download(struct ath10k *ar) "boot did not find a pre calibration file, try DT next: %d\n", ret); - ret = ath10k_download_cal_dt(ar, "qcom,ath10k-pre-calibration-data"); + ret = ath10k_download_cal_dt(ar, "qcom,pre-calibration-data"); + if (ret == -ENOENT) + ret = ath10k_download_cal_dt(ar, "qcom,ath10k-pre-calibration-data"); if (ret) { ath10k_dbg(ar, ATH10K_DBG_BOOT, "unable to load pre cal data from DT: %d\n", ret); @@ -2337,7 +2342,9 @@ static int ath10k_download_cal_data(struct ath10k *ar) "boot did not find a calibration file, try DT next: %d\n", ret); - ret = ath10k_download_cal_dt(ar, "qcom,ath10k-calibration-data"); + ret = ath10k_download_cal_dt(ar, "qcom,calibration-data"); + if (ret == -ENOENT) + ret = ath10k_download_cal_dt(ar, "qcom,ath10k-calibration-data"); if (ret == 0) { ar->cal_mode = ATH10K_CAL_MODE_DT; goto done; From patchwork Tue Feb 25 09:05:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13989570 X-Patchwork-Delegate: quic_jjohnson@quicinc.com Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (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 2E2D226989E for ; Tue, 25 Feb 2025 09:05:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740474355; cv=none; b=MNe7r24PI56F0Ze8AyTpvbGDrqMxA4F0TwaY3mFbLFfPYBMl+v7NlzBjiCxtuPHc30RfFqq4antWyydTFju/nhurfN6SAFO+8Ca+19R6EX2HcGZ56t0kF0IpT7wxdwser7yWT5gEescMTqh3eeKWVgA8TmQL4LXwMFgSPXJoqPk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740474355; c=relaxed/simple; bh=6hubkaofZnp2cNd0Rhz1Eeg6I+8WlSTKZLkOz9iuFt0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=h2erd8jIu850MeQeZAbqHN4Kasv/kZs7NIT9VmLxxA9MFgeUVIrN86X5/gW+WX+iLQnEzeUSfe4hzSF8/kT29AswHb3Vt1FsSXYlHIFLP/HJF8550oXoGE3y9QgyOoQSPK2Sjf3+s4vkIv2Lz/P9iHQ/fEu2maHgoXnBFjLCIQI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=H4Joi3Xe; arc=none smtp.client-ip=209.85.218.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="H4Joi3Xe" Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-ab7dd005cb0so76896466b.3 for ; Tue, 25 Feb 2025 01:05:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740474352; x=1741079152; darn=vger.kernel.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=06mNrTcXCt7RZqY/vp9hneEG+/6i/TGPCj+Z/hxHYlA=; b=H4Joi3XeBkOxEok8md9mK7FjSUBEeRHNCBzlY7aqub6tOmrr3IXvkqZCqGIBmauhNc bgGVlj/bmd7SX0UcJV2d4myCC5Qhgp36VA+UK9kWY4FnhJIpbluKO/ln7REEYrqti0zV M2a95iPxTt2YPjZTMtj3gDwXp3DX8LHJlFo0Q3/rbKM4/qcNAe1Ir+Tc4EvfwFXCVje7 QVaQrzqIUp8q8Pw+0blbjnkQgVhq0eXXL6XGUjmkfQOIv2fGbbvekprhwv1RGZmYqk9f 6c2lA9JwJBxij0ZrhTgPXsVogyr5/OaUeBsPQ/N/npjadPXI4JrENlkp/z/Xr2hp6Mxw MMmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740474352; x=1741079152; 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=06mNrTcXCt7RZqY/vp9hneEG+/6i/TGPCj+Z/hxHYlA=; b=iPFTYSl+QONTrvtDjjdIBbM5VNpnXUz8hQqMx3lCxrHvPBoIDmCBenrHNw0qbjO6Fx 6w7ZAWLjTPj+Jx2uhFA3CR/lk7TJJLaxtHIhiOFc1X/kjt8BXxp+gmIZydLmKrqF5p0A Pe3f+cc49TWG8YT11xkrgNVrnzvGCwHJd7x5yLhWaFmQp6LeULsTaFv3qdE0eMr8q/4H 8f+QLKJD18lSR8G90LmFJkNw9CM2sz0Tr/h9XJXBiyOVt4tnDiweVu12+Js/TsuVvLzC DKU7Vzd/qULMj9g/sOWKwrzhecV4kjZ3g4YscKY63Vv6GMNsApyuylLSO5Pjd7nmozv1 EpTg== X-Gm-Message-State: AOJu0YzAzWc0WGMnkU4H3qAdY/OZe0XcuXIXbHJA1fqorbLrAJJYj+Mn iUdQVJeIdRGSmIb7/QmtjkyiF0w5fG+iczTtT8EbDsSwzS9bDps+DAvWtcsjHq12Aggj54j5nUD grU8= X-Gm-Gg: ASbGncuOT45hGbRhDQJGXNxltt8MItc/rlvRViBFsCEydOtdl7o4DwdrwHgYWnoTclL /rNwoqtYrQZV2rQDX9rOREAAZt5aBqavipp8LanZZE083yQfpmZsvSatnGvFhk7Is/ZidllfHnw 7cu7sSe5TvTw3w/WYpgCZOpg7jisDYyX9HekoqLeSDkbPW+ImAhY9LEjX9d2hMDg13SoxlsVqEi aHKWn3FoscoABWs7MudS53NQp3SlDkPjs/MdK+6/hSXm/UDa0aXdzXPNSMSc/dDJTB3fh4qwbTj g4tId/IXGZvgDMPhZxk9oFXltCeX9Bo9qFVGeHXnmf8FlXGb5CzfNkxMto1UT+mnfAtNAsiipy0 N X-Google-Smtp-Source: AGHT+IEDtxGszf6g/Wz9H8n07kdbiLAguC+HTfb+C9KwF25d/EzVT9csBJyf0u8/TD2ag29O9+6D5Q== X-Received: by 2002:a17:907:2ce3:b0:ab7:cb76:1b0f with SMTP id a640c23a62f3a-abc09c13ac8mr618915866b.12.1740474351979; Tue, 25 Feb 2025 01:05:51 -0800 (PST) Received: from [127.0.1.1] (78-11-220-99.static.ip.netia.com.pl. [78.11.220.99]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abed2054d58sm106681566b.148.2025.02.25.01.05.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 01:05:51 -0800 (PST) From: Krzysztof Kozlowski Date: Tue, 25 Feb 2025 10:05:36 +0100 Subject: [PATCH 5/5] wifi: ath11k: Deprecate qcom,ath11k-calibration-variant properties Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250225-b-wifi-qcom-calibration-variant-v1-5-3b2aa3f89c53@linaro.org> References: <20250225-b-wifi-qcom-calibration-variant-v1-0-3b2aa3f89c53@linaro.org> In-Reply-To: <20250225-b-wifi-qcom-calibration-variant-v1-0-3b2aa3f89c53@linaro.org> To: Johannes Berg , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jeff Johnson Cc: linux-wireless@vger.kernel.org, devicetree@vger.kernel.org, ath10k@lists.infradead.org, linux-kernel@vger.kernel.org, ath11k@lists.infradead.org, ath12k@lists.infradead.org, Krzysztof Kozlowski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1001; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=6hubkaofZnp2cNd0Rhz1Eeg6I+8WlSTKZLkOz9iuFt0=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBnvYfkV8bTTIfHJhKZH87D8t+BgcreXLJCy72sZ kr5biFJ0H+JAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZ72H5AAKCRDBN2bmhouD 131xD/sHjN99Ymfgrof7h6Xr6tnzgJnCZgaEhjGTTNv3i80kqqMuWrb08dI1DUXY22yHravlpaC ZUCtjjHxy439Kos2aTAQFFLQlcjAS5Q5vyMm1C9yBba+euWva3DciwUtfp9zpCUF3din7QQDrTw hgqBZU9BGee9SB6ZtEAgjBbJK3ue3/zS3sBIauPN1SAnVUFW5dJvQ8lMoHYXoSVLjzyzwO1R5qU 8858f3uRrjAfQ0oKz07UPp00NnYA6VW/UnYJkL49kKLyezNTaE/BknhTCcJ3Fphl+dGxAxtYhmD fkVk1cfLYOIHpAwByhlwV4GF2CM4//LpLbIFkXwYgOfWWcWWrF0qZOtg83QgTwlprop/6MU33E+ 4gm42ueJZB53b8fxQwGrKsVs3UQuB/tn9V2ob5NxCZVzT9YW7QUwNR0KPz0iBalpSKT6HnqHlPt tYo174NQtWATN6pPGOtdfzq+mmrSQURPu9kLUpf4TqL2w9qgUxDItvNwDozEm92nNDEKKM5KmEL 6yqQ6r46sz8w/PLQKov5hhd0t6CqL4kOQPDZlh2LroRVS4ymjXPpJgF2Yk69RL1O13q4k7ONrnT 1JkELXUU8ds388D2EdpyLq5ddBmUjV8L4/wRtqqn1pAt9qQJglSaO6SmFxTFBfo/1VYcmu74vI2 vGjcKg39xJpbpmw== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B Add support for calibration-like properties without 'ath11k' prefix, while still keeping everything backwards compatible. Signed-off-by: Krzysztof Kozlowski --- drivers/net/wireless/ath/ath11k/core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c index 65bba0ae69a9a8e869e72b7e6d915577c8fb27d1..3d39ff85ba94ad7229764045e7e6dcab99dd51d5 100644 --- a/drivers/net/wireless/ath/ath11k/core.c +++ b/drivers/net/wireless/ath/ath11k/core.c @@ -1175,8 +1175,11 @@ int ath11k_core_check_dt(struct ath11k_base *ab) if (!node) return -ENOENT; - of_property_read_string(node, "qcom,ath11k-calibration-variant", + of_property_read_string(node, "qcom,calibration-variant", &variant); + if (!variant) + of_property_read_string(node, "qcom,ath11k-calibration-variant", + &variant); if (!variant) return -ENODATA;