As suggested by Krzysztof[1], we can use the fallback compatible to
avoid duplicating the same device data.
Krzysztof already submitted a series[2] for this by reworking entire
binding and driver and it is conflicting with the Dmitry's series as
mentioned by Krzysztof[3].
So this series addresses IPQ SoCs alone, as I see no dependency with it.
[1]
https://lore.kernel.org/linux-arm-msm/[email protected]/
[2]
https://lore.kernel.org/linux-arm-msm/[email protected]/
[3]
https://lore.kernel.org/linux-arm-msm/[email protected]/
Kathiravan T (2):
dt-bindings: mailbox: qcom: use fallback for IPQ8074 SoC
mailbox: qcom-apcs-ipc: drop the IPQ8074 and IPQ5332 compatible
Krzysztof Kozlowski (1):
arm64: dts: qcom: ipq8074: add compatible fallback to mailbox
.../devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml | 5 +----
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 3 ++-
drivers/mailbox/qcom-apcs-ipc-mailbox.c | 2 --
3 files changed, 3 insertions(+), 7 deletions(-)
--
2.17.1
Since the IPQ8074 mailbox is compatible with the IPQ6018, lets create
the fallback to ipq6018 compatible, so that we don't bloat the of_device_id
table in the driver.
Suggested-by: Krzysztof Kozlowski <[email protected]>
Signed-off-by: Kathiravan T <[email protected]>
---
.../devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml b/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml
index d888ead09282..00f0ed354a6a 100644
--- a/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml
+++ b/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml
@@ -19,11 +19,10 @@ properties:
- items:
- enum:
- qcom,ipq5332-apcs-apps-global
+ - qcom,ipq8074-apcs-apps-global
- const: qcom,ipq6018-apcs-apps-global
- items:
- enum:
- - qcom,ipq6018-apcs-apps-global
- - qcom,ipq8074-apcs-apps-global
- qcom,msm8996-apcs-hmss-global
- qcom,msm8998-apcs-hmss-global
- qcom,qcm2290-apcs-hmss-global
@@ -111,7 +110,6 @@ allOf:
contains:
enum:
- qcom,ipq6018-apcs-apps-global
- - qcom,ipq8074-apcs-apps-global
then:
properties:
clocks:
@@ -152,7 +150,6 @@ allOf:
contains:
enum:
- qcom,ipq6018-apcs-apps-global
- - qcom,ipq8074-apcs-apps-global
then:
properties:
'#clock-cells':
--
2.17.1
Since the IPQ8074 and IPQ5332 mailbox are compatible with IPQ6018, we can
use the compatible fallback to IPQ6018. With that, we can drop the
IPQ8074 and IPQ5332 compatible references, as well we don't bloat the
of_device_id table.
Suggested-by: Krzysztof Kozlowski <[email protected]>
Signed-off-by: Kathiravan T <[email protected]>
---
drivers/mailbox/qcom-apcs-ipc-mailbox.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/mailbox/qcom-apcs-ipc-mailbox.c b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
index 6bbf87c6d60b..3906bd655991 100644
--- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c
+++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
@@ -141,9 +141,7 @@ static int qcom_apcs_ipc_remove(struct platform_device *pdev)
/* .data is the offset of the ipc register within the global block */
static const struct of_device_id qcom_apcs_ipc_of_match[] = {
- { .compatible = "qcom,ipq5332-apcs-apps-global", .data = &ipq6018_apcs_data },
{ .compatible = "qcom,ipq6018-apcs-apps-global", .data = &ipq6018_apcs_data },
- { .compatible = "qcom,ipq8074-apcs-apps-global", .data = &ipq6018_apcs_data },
{ .compatible = "qcom,msm8916-apcs-kpss-global", .data = &msm8916_apcs_data },
{ .compatible = "qcom,msm8939-apcs-kpss-global", .data = &msm8916_apcs_data },
{ .compatible = "qcom,msm8953-apcs-kpss-global", .data = &msm8994_apcs_data },
--
2.17.1
From: Krzysztof Kozlowski <[email protected]>
IPQ8074 mailbox is compatible with IPQ6018.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
Signed-off-by: Kathiravan T <[email protected]>
---
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
index 62d05d740646..3fa7a63db74e 100644
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
@@ -687,7 +687,8 @@
};
apcs_glb: mailbox@b111000 {
- compatible = "qcom,ipq8074-apcs-apps-global";
+ compatible = "qcom,ipq8074-apcs-apps-global",
+ "qcom,ipq6018-apcs-apps-global";
reg = <0x0b111000 0x1000>;
clocks = <&a53pll>, <&xo>;
clock-names = "pll", "xo";
--
2.17.1
On 14/03/2023 05:15, Kathiravan T wrote:
> From: Krzysztof Kozlowski <[email protected]>
>
> IPQ8074 mailbox is compatible with IPQ6018.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> Signed-off-by: Kathiravan T <[email protected]>
> ---
> arch/arm64/boot/dts/qcom/ipq8074.dtsi | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
What's this? Not even a dependency for something as it is last patch in
the series. What's the point?
Best regards,
Krzysztof
On 14/03/2023 05:15, Kathiravan T wrote:
> Since the IPQ8074 mailbox is compatible with the IPQ6018, lets create
> the fallback to ipq6018 compatible, so that we don't bloat the of_device_id
> table in the driver.
>
> Suggested-by: Krzysztof Kozlowski <[email protected]>
> Signed-off-by: Kathiravan T <[email protected]>
> ---
Why do you send conflicting patches and take out some pieces of my
patchset into yours?
This was send already 1.5 months ago:
https://lore.kernel.org/all/[email protected]/
NAK.
Best regards,
Krzysztof
On 14/03/2023 05:15, Kathiravan T wrote:
> Since the IPQ8074 and IPQ5332 mailbox are compatible with IPQ6018, we can
> use the compatible fallback to IPQ6018. With that, we can drop the
> IPQ8074 and IPQ5332 compatible references, as well we don't bloat the
> of_device_id table.
>
> Suggested-by: Krzysztof Kozlowski <[email protected]>
NAK. Breaks ABI and duplicates what I already sent (which you saw since
you took my patches from my thread).
https://lore.kernel.org/all/[email protected]/
Best regards,
Krzysztof
On 14/03/2023 07:45, Krzysztof Kozlowski wrote:
> On 14/03/2023 05:15, Kathiravan T wrote:
>> From: Krzysztof Kozlowski <[email protected]>
>>
>> IPQ8074 mailbox is compatible with IPQ6018.
>>
>> Signed-off-by: Krzysztof Kozlowski <[email protected]>
>> Signed-off-by: Kathiravan T <[email protected]>
>> ---
>> arch/arm64/boot/dts/qcom/ipq8074.dtsi | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> What's this? Not even a dependency for something as it is last patch in
> the series. What's the point?
To be clear - that's a NAK.
Best regards,
Krzysztof