| Message ID | 20250506-ipq6018-drop-smem-v1-1-af99d177be2f@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | arm64: dts: ipq6018: drop standalone 'smem' node | expand |
On 5/6/2025 7:07 PM, Gabor Juhos wrote: > Since commit b5af64fceb04 ("soc: qcom: smem: Support reserved-memory > description") the SMEM device can be instantiated directly from a > reserved-memory node. > > The 'smem' node is defined in this way for each modern IPQ SoCs except for > IPQ6018. In order to make it inline with the others, move the 'compatible' > and the 'hwlock' properties into the respective reserved-memory node, and > drop the standalone 'smem' node. > > Signed-off-by: Gabor Juhos <j4g8y7@gmail.com> > --- Reviewed-by: Kathiravan Thirumoorthy <kathiravan.thirumoorthy@oss.qualcomm.com>
On Tue, 06 May 2025 15:37:47 +0200, Gabor Juhos wrote: > Since commit b5af64fceb04 ("soc: qcom: smem: Support reserved-memory > description") the SMEM device can be instantiated directly from a > reserved-memory node. > > The 'smem' node is defined in this way for each modern IPQ SoCs except for > IPQ6018. In order to make it inline with the others, move the 'compatible' > and the 'hwlock' properties into the respective reserved-memory node, and > drop the standalone 'smem' node. > > [...] Applied, thanks! [1/1] arm64: dts: ipq6018: drop standalone 'smem' node commit: d8b462c44a0399e220a44c81cf562b909448bada Best regards,
diff --git a/arch/arm64/boot/dts/qcom/ipq6018.dtsi b/arch/arm64/boot/dts/qcom/ipq6018.dtsi index dbf6716bcb59a04939c2b994d85cf58c12365962..b5266702accb62056eb57d9ef75ee0383c8bd54f 100644 --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi @@ -210,8 +210,11 @@ tz: memory@4a600000 { }; smem_region: memory@4aa00000 { + compatible = "qcom,smem"; reg = <0x0 0x4aa00000 0x0 0x100000>; no-map; + + hwlocks = <&tcsr_mutex 3>; }; q6_region: memory@4ab00000 { @@ -220,12 +223,6 @@ q6_region: memory@4ab00000 { }; }; - smem { - compatible = "qcom,smem"; - memory-region = <&smem_region>; - hwlocks = <&tcsr_mutex 3>; - }; - soc: soc@0 { #address-cells = <2>; #size-cells = <2>;
Since commit b5af64fceb04 ("soc: qcom: smem: Support reserved-memory description") the SMEM device can be instantiated directly from a reserved-memory node. The 'smem' node is defined in this way for each modern IPQ SoCs except for IPQ6018. In order to make it inline with the others, move the 'compatible' and the 'hwlock' properties into the respective reserved-memory node, and drop the standalone 'smem' node. Signed-off-by: Gabor Juhos <j4g8y7@gmail.com> --- Note: dtbcheck produces the warnings below, but those are present even without the patch. DTC [C] arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dtb arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dtb: qusb@59000: 'vdd-supply' is a required property from schema $id: http://devicetree.org/schemas/phy/qcom,qusb2-phy.yaml# arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dtb: qusb@59000: 'vdda-pll-supply' is a required property from schema $id: http://devicetree.org/schemas/phy/qcom,qusb2-phy.yaml# arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dtb: qusb@59000: 'vdda-phy-dpdm-supply' is a required property from schema $id: http://devicetree.org/schemas/phy/qcom,qusb2-phy.yaml# arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dtb: /soc@0/remoteproc@cd00000: failed to match any schema with compatible: ['qcom,ipq6018-wcss-pil'] --- arch/arm64/boot/dts/qcom/ipq6018.dtsi | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) --- base-commit: 92a09c47464d040866cf2b4cd052bc60555185fb change-id: 20250506-ipq6018-drop-smem-e9f9793ea440 Best regards,