From nobody Mon Feb 9 16:21:35 2026 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 00B28266B5D for ; Tue, 25 Feb 2025 09:05:45 +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=1740474347; cv=none; b=J6m34/qJm7cjdNvg66GX57NY/GviYR3UsjZxgvm0Xox2VZhQpIQ9HhuCfJqQ1qOqVR7DcavZNqgeLr09RA7RaOXmuosPZXV//uZ31ZaBS6hxboo+cg1R3lHC8lf+kS8rPqSbzYitMZ/yo7tJ82HF0KjX7FgDtmL5oe5xJF/5NCg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740474347; 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=HaB9UL1kJ99nQedFicSQUL5doaL1pFwPEO2hQY1CWg/2Nru9M9yQQiqBqi4FVm3F7y5r048RRSY3CSyJ4JTetoNctmUgvwbAN+ncqmcdkVhKlupIX70o9QM/P8FTL6x/MRF++mOARv0mpxQH7YIRjWSqvMaHPO+jYoXRxImHAPc= 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.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="cfkzFHq+" Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-abad214f9c9so99484166b.0 for ; Tue, 25 Feb 2025 01:05:45 -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=lIF7vcogCYAF/eLPEOPEZqMKobJ75lAM8WAhbvDwcULFUV88odS32i/auOp2sAIKyA QC5yTNRMhC87KCDkwIh+HJD7lKkJXVD1h+kNqgrI5HRc1vx3bWfFPE/Qk1Pb3PDT57E9 XHbMITK7fZ8ivYAOn2LA9MxmfpGr2m4JX7LD6m+2Y75x1P9SGAQj5a3akCBZRaptB/kZ vYLxFLAQRnVkg208Hl557GINPeHXuE3YZbEPFaSpzy7+3rUb36eMY656yyjs3FRbDRO5 o8Xh4s/KS5Mbupz7XPj5OlVzdM/keE8uXssbvJz478AKbaDTcO0KqpI6l9MwPftF3Zn+ aP9A== X-Forwarded-Encrypted: i=1; AJvYcCVJdCoBg4bQQhPDR6CGrY20Pq2dn1CXgixV/rxmZ4UhsB1zddmjkFvHL69Rhr4s42PnxPjCEuWpvMDRqBM=@vger.kernel.org X-Gm-Message-State: AOJu0YyfXCWRfQoc50ZHTBokzcSNoStyoNxcXIrGErgFNDs0kdZ6E6Nl Ga6OgQ16B1mpPKcOT1mUaNBkjcow1uNE35hBkMY7zhYmQwRB+X0xFNJQ/HBPv2k= X-Gm-Gg: ASbGncuHoBC6cewGmZhLmN+DnV7yUlobS4CptL7u9wGw4nvTCG78oOEBae0+TwHmvqx w9D69WP2+5lR9pOmiF5631lsNZ8NrI8uX0aWsZXWPTaVS6SevV1jZ9JbzkYciwYQZalPaOePhkz weVbnOlI+keL02E+zDl2E1uLl6brYC3/zixwUEBA+za3CVb9KUxWa3lH4ywkmDI8t9igfsF9DsN GmvRYO1it9/I8RJmfVXVc9TOB39ajXGIBVLF9L6r+yHbS98BPlzuTHK0y2bxaCoTmI4QmBf1Tk9 FcIU2Yueqk0Z7fMuibStam9w7stHLVCz56mTNJHa/Q6WGVyI1jc2Dn8VmuWLzBhkZHGEynBLsER 8 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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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) Reviewed-by: AngeloGioacchino Del Regno --- 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.yam= l b/Documentation/devicetree/bindings/net/wireless/qcom,ath10k.yaml index aace072e2d52a6830b98dd3f52d61380105c8aa1..f2440d39b7ebcda77db592de855= 73bec902fb334 100644 --- a/Documentation/devicetree/bindings/net/wireless/qcom,ath10k.yaml +++ b/Documentation/devicetree/bindings/net/wireless/qcom,ath10k.yaml @@ -92,20 +92,41 @@ properties: =20 ieee80211-freq-limit: true =20 - 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. =20 - 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 =20 + 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. --=20 2.43.0 From nobody Mon Feb 9 16:21:35 2026 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 74E4E268FF4 for ; Tue, 25 Feb 2025 09:05:47 +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=1740474349; cv=none; b=t011ci/ep3Xc9jZlQ/md0u7VZKYa+VamihVP8VeaKNABwSt5c8x+1kYIULIrpEuRVLI+nxFgrvYIwQbxOH9xR8gteHBcyB/V17mVzM2jEAIeGc65w7fYsuAuggkzywx3BekpIHk2EguYv8dnY+DtwWvxbsq7QhYMtgf1r9QwpoI= 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.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="ZvyjRDyW" Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-abc28af1ba4so46397366b.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=K6QvC1hoQ9ZaKLWf5+RayRFW1RtZthETtyvkOpsA2OSr66xleiAwSGRZYzD4w8hjCG fYkl/AydIdiv0ixp3JZHHX/xUAY8Dj/vmkNWPqmQZjDoTTM+Tvef/+vlfhQf2k5dzmpR 9eYe6DIPjnAxmr9fq4ENNyGIR01N6ez9l6Wyxr6nIUI0Mcd2Zze4bnCNrLZjz1Nd4hCj YFT/yOl8B6Brk0vh7IlEael/ltCEIzdcxK98G+2+aXhZXrq1e20KxRebE4SJSN8s30Ff WKzFcqfWKFL1BQuVKoIrQgg26S26Vcb9istBNOMkUCJSCz/HGJFegYNMyi3iDTJfrIq2 I4oQ== X-Forwarded-Encrypted: i=1; AJvYcCXxvwLPv0yEEAXU3itQARHJXLG1NyR74VrBwmCloWmYXNxAH9PRk0slBmOY+hfNUIKaRQ2AKKnj0Qa0sr8=@vger.kernel.org X-Gm-Message-State: AOJu0YzEEOAlVAwBsXIZBxSE2s2pqbvSqOl8kQbIiMgNwxPi+oWvneMI xXOQLNZOw8aDuThvDxnNkAiY41qiEf+MzWgRvnr8jIVnvgAoqqJgbz9lZeRUa3rkF4FTeB/GuGt 0xo0= X-Gm-Gg: ASbGnctDA9VNuoQY0MNhWxS6qJA5WS2bOg/16Nix9GT2bn/fKZj7kWq2bSu0ox4lyjZ PxY5SFnzUBj3Q4DpvJXzJSkjkFs10+Di4nSq9EFPDzVO/lMoa2rSSwm9m+ACZt3Uow3FtGGNrZJ QB0rcqCQfM/HZ2p+IbrNRJpOie1+WK2Z3O4axxlFAo17ZedBYAHHNPhdMlj849btlJKUE/+3FCK cL2APqt/f6kyuyiCo3WNaBX3t2nwWCrKT2iILewRpr08XcuyOawfNrj2F1jZVN0LS2One70wSCk VAUyWdAoyn7anD6aEh6YCpeIKEUzKBFmjvAahE5PsHZjejJ+9QW5EFvjn0bU/Tuah5wOkrKMTu3 a 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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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) Reviewed-by: AngeloGioacchino Del Regno --- .../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..653b319fee880ef0944d8e35c54= 5890b60611756 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 =20 + qcom,calibration-variant: + $ref: /schemas/types.yaml#/definitions/string + description: | + string to uniquely identify variant of the calibration data for desi= gns + 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 desi= gns with colliding bus and device ids @@ -127,7 +134,7 @@ examples: vddrfa1p2-supply =3D <&vreg_pmu_rfa_1p2>; vddrfa1p8-supply =3D <&vreg_pmu_rfa_1p7>; =20 - qcom,ath11k-calibration-variant =3D "LE_X13S"; + qcom,calibration-variant =3D "LE_X13S"; }; }; }; diff --git a/Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yam= l b/Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml index a69ffb7b3cb884a4eeb51064cc1c8136b433f285..c089677702cf17f3016b054d214= 94d2a7706ce5d 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 =20 + 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 --=20 2.43.0 From nobody Mon Feb 9 16:21:35 2026 Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) (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 9521A26981E for ; Tue, 25 Feb 2025 09:05:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740474353; cv=none; b=r6Xne1rKIbU7tpJUcIq9AnFK+MusjC8uFp/3W8nox3XRO/MHKUZIrAwTIwUPwnMYQ5lOy/3QresjnvHc6mwhzd0ij8WtBdeHW8NS3O21yc0iWBMLDcMS5RWpf7vIv2SGmSp9mCZriblgbUGGgSb2rNvWSMunm0bv5SIgBPXRR2Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740474353; c=relaxed/simple; bh=JTVJkXQ8vZ6nxJX4jG3BnwDYUC+zBILYi0/GP0SyV34=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FEd0FL5YtcbsQlRObuGOTaIJT10T8OWTInDhjINIacOQgFgRCvJfxZsn3YcnuFj8gR9xosM/OMWZIo+tNMbnSlkj0Q39sAgwjvkTmz37QKQpyjDkOkOr+ASVtGjtzXzvrAscK2i7D3d7vZeVoyFSy8SgsTNwhdfpApnckFLKBTw= 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.47 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-f47.google.com with SMTP id a640c23a62f3a-abb9fac29d8so81191366b.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=p5K/T5wNPMNAeOKrEVE5q8/EeAYGUwKBNlZO3T5/Wu/xgYl3jslO3jprFxOvfZOrZC k2lrX/fcryoUpEn52WOizC3AfL+nCfbOniVVWacrhKnXKMZTnpmyEC/KJoV2Zty70QLX Gn9LIGM8+c7khfgujm14GIn0UEkyOtK8ZUV3ZYRbYTgFXNaI9wPKWS4TKk+G/8eJGF1z okMFNzhoBp3roXENlubJcGQ9xSu4oboAm4KqT0nWWfj7xPjPxW44VGfXL6bIiUxVJZkF ke/hxBHlTsjf+ncXViNsArZZ+EuhB3rqEVaHrxqdBTmBG1eCIjQMoY17TdeagHILr3zB l9Ow== X-Forwarded-Encrypted: i=1; AJvYcCWx9bXnLR3E+6SRVrnA8wG5QKemEWSFRFe6N5tBBOVfmrPiEJEjNq+l6cb3uv9KyCK9UkaVMKbqG1HCpM8=@vger.kernel.org X-Gm-Message-State: AOJu0Yy+2qjKZu4UrDG80wMLWTlIKbo43mH535wzfmnXBmcYx64Qe4Vk 0jLDbyPyoRPf+49NDPBIkPfcD2NQnJnma5BoORDJQHxA3nCvwfUs8sK8cMen6Kk= X-Gm-Gg: ASbGncu2HwM+aA5acX2BJYd0xQWedyc176EynUezIFr3aXL+YUuWx8g6suk6e13iAdb dRAg88wBpFGDdlShZ1TTgLnPNk/PtxlZldfIG1bT7Qk7bvVkhhu9KM/MeqEZvrlSZ0/lFWZD2wE AbV+POldWR38MqDNB+Q5hal+R9KiJhAK6T0IW0TKCGU1NenI4jULmrChrF9lNNVvv1AltCN0t/4 +ObbufRtfDMIpeeJ1KK7aJYJ+NK1dt3oUhFjlaIzuefwu8pMone9T49/jq07RL8aV75/3ao+9FQ 4ziOEJHRfRyX9Rg8MAGzmn0qGW4IEoddOjzBsHD+yrevxSub8eay1aMuT7rcGouPqQloS4ueyhZ k 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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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) Reviewed-by: AngeloGioacchino Del Regno --- .../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..589960144fe1d56eb6f15f63a2d= 594210e045d27 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 =20 + qcom,calibration-variant: + $ref: /schemas/types.yaml#/definitions/string + description: + String to uniquely identify variant of the calibration data for desi= gns + 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 desi= gns with colliding bus and device ids @@ -103,7 +110,7 @@ examples: compatible =3D "pci17cb,1109"; reg =3D <0x0 0x0 0x0 0x0 0x0>; =20 - qcom,ath12k-calibration-variant =3D "RDP433_1"; + qcom,calibration-variant =3D "RDP433_1"; =20 ports { #address-cells =3D <1>; @@ -139,7 +146,7 @@ examples: compatible =3D "pci17cb,1109"; reg =3D <0x0 0x0 0x0 0x0 0x0>; =20 - qcom,ath12k-calibration-variant =3D "RDP433_2"; + qcom,calibration-variant =3D "RDP433_2"; qcom,wsi-controller; =20 ports { @@ -176,7 +183,7 @@ examples: compatible =3D "pci17cb,1109"; reg =3D <0x0 0x0 0x0 0x0 0x0>; =20 - qcom,ath12k-calibration-variant =3D "RDP433_3"; + qcom,calibration-variant =3D "RDP433_3"; =20 ports { #address-cells =3D <1>; --=20 2.43.0 From nobody Mon Feb 9 16:21:35 2026 Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) (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 1964726983A for ; Tue, 25 Feb 2025 09:05:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740474353; cv=none; b=O2iysWon7/S20an/EBnzhxK4nqpK+iunKDLxA+G0b18vjwRwOKPfecmYZ+u7KNMkeKCqJ9arxgfm1V2Puhw27NgiWmgSWIPSJjxES7ULGhBjEI4CmLtdL3KXeAKHv4YLLgC+xOQT7yU2xsfd7Sv5JTw1/52LyInOhjNMpt+r1Es= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740474353; c=relaxed/simple; bh=Dz5yNmE8eSdxa0CmdJl8w6wvj0WWXjGEMcH+7qjSCmE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ku9uUigfVnvtC2s205VQ3vJuUlE33AsofckBN1vUMg7mTyCTNuR+lbXC+OlSoVJBxSubY+Xoy0pssdQunwoQ3YLbqySpIdSrKsCdcR38bEgb00H98T+SU/RMpUXLXnyyDY24Y3mLTiltIKFzwu4haHcmX0GdXtkpErz1A5/NC7Y= 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.42 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-f42.google.com with SMTP id a640c23a62f3a-ab7098af6fdso69576966b.2 for ; Tue, 25 Feb 2025 01:05:51 -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=pgf3XtA2OdfrJJjBL8OB8/TWkT/2QhJuEA1QOQ/v0MFdQRMON1u7W1cXtIdMelawHQ Uysu1+P10/pPbTkZoTFqbY2xhVoaDXQHcKxfD3A4I1qYnvrYrlXoLssgY7iZ/Yi6FkA9 NjIrhwyoWQo8GehherTdg72IIwcI9b7Cklwc9X9KrwAVZNq1ak4ZxZQHrtKaWX41r7d/ 0LOWdi8MdduqjDQwrxnKkxY4j0XlRihn5+ZTISuBlRJs34mrZgxYMHI5fNMgTsBwWsd7 9cjMpaCjqIkAWfQZkcpt1QmB2Ixjs+Z8uPji3txI4b7J+fFIcPVFLVTrhSKPj6ibzIWH Djcw== X-Forwarded-Encrypted: i=1; AJvYcCURVpTAnXs1c7prXeliseqd6FDWAwMd7LY6KaKWSNym2/QlFf3smVhSxM6Qxi2AxXIIIS44EsfYdfj9hQ4=@vger.kernel.org X-Gm-Message-State: AOJu0Ywrm8pZ3TJo8yyvCr5DrMNMCZI856OIlVF8lSp30FIIa32C6V36 /DQU/crEJDNYNlSKECkYAZPclru/zCKtGXMAOA1ruRYVYaJP5r3oL5/G4R2c6DM= X-Gm-Gg: ASbGnctxYzMxsWnUOOeujSbV2NR7qKYwX9tG0uKys1TxDOllr1c+Qts8ikNj71JIk3G 2Zn6TPeL6hTR5itjBMyTp0zdjGxLT1PXjdCBlKqmXTuNOUR7CIYlF8bYp1MUuYu4wMsornrtmVn cFik2zzgwtlZ9AZf+1qd9970GBf7Kw6dTaa6Nn0xi+wEZQpOEjZWOpyqrvXe75bI2yYRJRqk4Ws N507E/maJ4HMFCwtWwZEghay2UZJfbC/VB6nwVrAGcgJy/n0T3xrBYZy9qo+s6ncNVo89c3w89M l8K5qk+0Ph7nj5EJ87H8lIGuXQxJo6iDDHfF1RGFebhhbIZtqKRzZqInawKW+7w9EyLNDhRyp+G r 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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 Reviewed-by: AngeloGioacchino Del Regno --- 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..6d336e39d6738bbe7973a25e073= d03a07b9ae733 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; =20 - 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; =20 @@ -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); =20 - ret =3D ath10k_download_cal_dt(ar, "qcom,ath10k-pre-calibration-data"); + ret =3D ath10k_download_cal_dt(ar, "qcom,pre-calibration-data"); + if (ret =3D=3D -ENOENT) + ret =3D 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); =20 - ret =3D ath10k_download_cal_dt(ar, "qcom,ath10k-calibration-data"); + ret =3D ath10k_download_cal_dt(ar, "qcom,calibration-data"); + if (ret =3D=3D -ENOENT) + ret =3D ath10k_download_cal_dt(ar, "qcom,ath10k-calibration-data"); if (ret =3D=3D 0) { ar->cal_mode =3D ATH10K_CAL_MODE_DT; goto done; --=20 2.43.0 From nobody Mon Feb 9 16:21:35 2026 Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) (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 B1139269896 for ; Tue, 25 Feb 2025 09:05:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740474355; cv=none; b=XXVeH8xkWl9Z7zSZs8ZNZDDmysSrlFj50JwAf9sr6vkKL6fDLIrVhQB+fMgDZPW8qY/BnFd7BuwtwAnk10MAh9+Hxz7S6aB0ABkMLTpx4cc4g5NjLCwOPtWQ/zJR4i3yMWYNJN3Lp2wGyG78BSgUymmGimnfrfiw0q+/muhsRbo= 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.208.46 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-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-5decbcd16d2so1041963a12.1 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=MzdRdR1oPF9OrzSLv+EBAOTnRJHQUilE4QypRl0KJp2tETUIpua8+WPVAHe6f0hh4m YHszI4k4feAICw185XK1RLjf9m7hH4e93cHLTz2Kvy7p1xLN4i1TEm+RQ30E1b80q8GK N9KHoEN1rQHBbGf/twEkegw3GiuBBnGziOfvsv1/ogjmxtmNpbt1AuRJJYpspnyTvGHw q1Q2fDnJVtCtTplhOKhzRQkDKkkB/bJhixyPJP7L9jrykY9et0IfNKzV89CLgPAR/C+o T/dvw4IW+3YFb8TickkYgK2Fqz29gX745qk0bo2mqV16LNYDKd81Deh0lkxfUVlZ8MlM IuQQ== X-Forwarded-Encrypted: i=1; AJvYcCXNu2cRZ6K6g26RGWShXu5I78nZAghVA9C1oBcCrlZ1Q+zBskMIUjTXj+KkgBMm2ET+FDeFfHLd9Hu7gig=@vger.kernel.org X-Gm-Message-State: AOJu0YzFW++OFj2dedcoHyIjTShX7O7jWTvEgdQH5x/EVCi+ljANT+de 2xx+EAezqGYggNOqLr5lnceCZ82OYINRCA/8oufaraYoavbZVO0xcJC7PmLjmyU= X-Gm-Gg: ASbGncuFKRtJHlu0PNZ6G0D0XcaDjZu1353k+uLLS/bC3PUBe3wxKARLrzNnrNwwg7G D32b7gxCXUEuDxKCWayIN/DdljFrreQwUwVivXV0O8pRu0nMVeLAjKMNU9kJlpvWwI500e2+cnv A9up8brP6BmiUassiQ/J2E1vYvlJINcC55Ff6jhxWd4kJCkKEE87SxY6m/+rqlhoqCvh2PkyfgE CW91cchy73KLcj0JyUAFu3wjko1oE6mEgz4kXYh4EifgYtZPjU8iQruHYLE9OnqGFyaJ7/ep7kq Qmr2goc3G54n1/RurM2yudKOxDkXkAEEntKJck02xN7fFtkTdEqnIkVThQFqJUZ6uoEuzCi7SXs D 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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 Reviewed-by: AngeloGioacchino Del Regno --- 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..3d39ff85ba94ad7229764045e7e= 6dcab99dd51d5 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; =20 - 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; =20 --=20 2.43.0