* [PATCH 2/5] riscv: dts: sifive: fix Unleashed board compatible
2021-08-19 16:59 [PATCH 1/5] dt-bindings: mtd: jedec,spi-nor: document issi,is25wp256 Krzysztof Kozlowski
@ 2021-08-19 16:59 ` Krzysztof Kozlowski
2021-08-19 16:59 ` [PATCH 3/5] riscv: dts: sifive: drop duplicated nodes and properties in sifive Krzysztof Kozlowski
` (3 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Krzysztof Kozlowski @ 2021-08-19 16:59 UTC (permalink / raw)
To: Miquel Raynal, Richard Weinberger, Vignesh Raghavendra,
Rob Herring, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Atish Patra, Sagar Shrikant Kadam, linux-mtd, devicetree,
linux-kernel, linux-riscv
Cc: Krzysztof Kozlowski
Add missing sifive,fu540 compatible to fix dtbs_check warnings:
arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dt.yaml: /: compatible: 'oneOf' conditional failed, one must be fixed:
['sifive,hifive-unleashed-a00', 'sifive,fu540-c000'] is too short
'sifive,hifive-unleashed-a00' is not one of ['sifive,hifive-unmatched-a00']
'sifive,fu740-c000' was expected
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts b/arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts
index 60846e88ae4b..c960e19cfa70 100644
--- a/arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts
+++ b/arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts
@@ -11,7 +11,8 @@ / {
#address-cells = <2>;
#size-cells = <2>;
model = "SiFive HiFive Unleashed A00";
- compatible = "sifive,hifive-unleashed-a00", "sifive,fu540-c000";
+ compatible = "sifive,hifive-unleashed-a00", "sifive,fu540-c000",
+ "sifive,fu540";
chosen {
stdout-path = "serial0";
--
2.30.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/5] riscv: dts: sifive: drop duplicated nodes and properties in sifive
2021-08-19 16:59 [PATCH 1/5] dt-bindings: mtd: jedec,spi-nor: document issi,is25wp256 Krzysztof Kozlowski
2021-08-19 16:59 ` [PATCH 2/5] riscv: dts: sifive: fix Unleashed board compatible Krzysztof Kozlowski
@ 2021-08-19 16:59 ` Krzysztof Kozlowski
2021-08-19 16:59 ` [PATCH 4/5] riscv: dts: microchip: add missing compatibles for clint and plic Krzysztof Kozlowski
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Krzysztof Kozlowski @ 2021-08-19 16:59 UTC (permalink / raw)
To: Miquel Raynal, Richard Weinberger, Vignesh Raghavendra,
Rob Herring, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Atish Patra, Sagar Shrikant Kadam, linux-mtd, devicetree,
linux-kernel, linux-riscv
Cc: Krzysztof Kozlowski
The DTSI file defines soc node and address/size cells, so there is no
point in duplicating it in DTS file.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts | 5 -----
arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts | 5 -----
2 files changed, 10 deletions(-)
diff --git a/arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts b/arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts
index c960e19cfa70..ed2c2429c6c2 100644
--- a/arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts
+++ b/arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts
@@ -8,8 +8,6 @@
#define RTCCLK_FREQ 1000000
/ {
- #address-cells = <2>;
- #size-cells = <2>;
model = "SiFive HiFive Unleashed A00";
compatible = "sifive,hifive-unleashed-a00", "sifive,fu540-c000",
"sifive,fu540";
@@ -27,9 +25,6 @@ memory@80000000 {
reg = <0x0 0x80000000 0x2 0x00000000>;
};
- soc {
- };
-
hfclk: hfclk {
#clock-cells = <0>;
compatible = "fixed-clock";
diff --git a/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts b/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts
index 2e4ea84f27e7..960d65ca5d4f 100644
--- a/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts
+++ b/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts
@@ -8,8 +8,6 @@
#define RTCCLK_FREQ 1000000
/ {
- #address-cells = <2>;
- #size-cells = <2>;
model = "SiFive HiFive Unmatched A00";
compatible = "sifive,hifive-unmatched-a00", "sifive,fu740-c000",
"sifive,fu740";
@@ -27,9 +25,6 @@ memory@80000000 {
reg = <0x0 0x80000000 0x4 0x00000000>;
};
- soc {
- };
-
hfclk: hfclk {
#clock-cells = <0>;
compatible = "fixed-clock";
--
2.30.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 4/5] riscv: dts: microchip: add missing compatibles for clint and plic
2021-08-19 16:59 [PATCH 1/5] dt-bindings: mtd: jedec,spi-nor: document issi,is25wp256 Krzysztof Kozlowski
2021-08-19 16:59 ` [PATCH 2/5] riscv: dts: sifive: fix Unleashed board compatible Krzysztof Kozlowski
2021-08-19 16:59 ` [PATCH 3/5] riscv: dts: sifive: drop duplicated nodes and properties in sifive Krzysztof Kozlowski
@ 2021-08-19 16:59 ` Krzysztof Kozlowski
2021-08-19 16:59 ` [PATCH 5/5] riscv: dts: sifive: add missing compatible for plic Krzysztof Kozlowski
2021-08-19 17:28 ` [PATCH 1/5] dt-bindings: mtd: jedec,spi-nor: document issi,is25wp256 Pratyush Yadav
4 siblings, 0 replies; 9+ messages in thread
From: Krzysztof Kozlowski @ 2021-08-19 16:59 UTC (permalink / raw)
To: Miquel Raynal, Richard Weinberger, Vignesh Raghavendra,
Rob Herring, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Atish Patra, Sagar Shrikant Kadam, linux-mtd, devicetree,
linux-kernel, linux-riscv
Cc: Krzysztof Kozlowski
The Microchip Icicle kit uses SiFive E51 and U54 cores, so it looks that
also Core Local Interruptor and Platform-Level Interrupt Controller are
coming from SiFive. Add proper compatibles to silence dtbs_check
warnings:
clint@2000000: compatible:0: 'sifive,clint0' is not one of ['sifive,fu540-c000-clint', 'canaan,k210-clint']
interrupt-controller@c000000: compatible:0: 'sifive,plic-1.0.0' is not one of ['sifive,fu540-c000-plic', 'canaan,k210-plic']
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
index d9f7ee747d0d..6f843afacfad 100644
--- a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
+++ b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
@@ -161,7 +161,7 @@ cache-controller@2010000 {
};
clint@2000000 {
- compatible = "sifive,clint0";
+ compatible = "sifive,fu540-c000-clint", "sifive,clint0";
reg = <0x0 0x2000000 0x0 0xC000>;
interrupts-extended = <&cpu0_intc 3 &cpu0_intc 7
&cpu1_intc 3 &cpu1_intc 7
@@ -172,7 +172,7 @@ &cpu3_intc 3 &cpu3_intc 7
plic: interrupt-controller@c000000 {
#interrupt-cells = <1>;
- compatible = "sifive,plic-1.0.0";
+ compatible = "sifive,fu540-c000-plic", "sifive,plic-1.0.0";
reg = <0x0 0xc000000 0x0 0x4000000>;
riscv,ndev = <186>;
interrupt-controller;
--
2.30.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 5/5] riscv: dts: sifive: add missing compatible for plic
2021-08-19 16:59 [PATCH 1/5] dt-bindings: mtd: jedec,spi-nor: document issi,is25wp256 Krzysztof Kozlowski
` (2 preceding siblings ...)
2021-08-19 16:59 ` [PATCH 4/5] riscv: dts: microchip: add missing compatibles for clint and plic Krzysztof Kozlowski
@ 2021-08-19 16:59 ` Krzysztof Kozlowski
2021-08-19 17:28 ` [PATCH 1/5] dt-bindings: mtd: jedec,spi-nor: document issi,is25wp256 Pratyush Yadav
4 siblings, 0 replies; 9+ messages in thread
From: Krzysztof Kozlowski @ 2021-08-19 16:59 UTC (permalink / raw)
To: Miquel Raynal, Richard Weinberger, Vignesh Raghavendra,
Rob Herring, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Atish Patra, Sagar Shrikant Kadam, linux-mtd, devicetree,
linux-kernel, linux-riscv
Cc: Krzysztof Kozlowski
Add proper compatible for Platform-Level Interrupt Controller to silence
dtbs_check warnings:
interrupt-controller@c000000: compatible: ['sifive,plic-1.0.0'] is too short
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/riscv/boot/dts/sifive/fu540-c000.dtsi b/arch/riscv/boot/dts/sifive/fu540-c000.dtsi
index 7db861053483..0655b5c4201d 100644
--- a/arch/riscv/boot/dts/sifive/fu540-c000.dtsi
+++ b/arch/riscv/boot/dts/sifive/fu540-c000.dtsi
@@ -141,7 +141,7 @@ soc {
ranges;
plic0: interrupt-controller@c000000 {
#interrupt-cells = <1>;
- compatible = "sifive,plic-1.0.0";
+ compatible = "sifive,fu540-c000-plic", "sifive,plic-1.0.0";
reg = <0x0 0xc000000 0x0 0x4000000>;
riscv,ndev = <53>;
interrupt-controller;
--
2.30.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/5] dt-bindings: mtd: jedec,spi-nor: document issi,is25wp256
2021-08-19 16:59 [PATCH 1/5] dt-bindings: mtd: jedec,spi-nor: document issi,is25wp256 Krzysztof Kozlowski
` (3 preceding siblings ...)
2021-08-19 16:59 ` [PATCH 5/5] riscv: dts: sifive: add missing compatible for plic Krzysztof Kozlowski
@ 2021-08-19 17:28 ` Pratyush Yadav
2021-08-19 17:36 ` Krzysztof Kozlowski
4 siblings, 1 reply; 9+ messages in thread
From: Pratyush Yadav @ 2021-08-19 17:28 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Miquel Raynal, Richard Weinberger, Vignesh Raghavendra,
Rob Herring, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Atish Patra, Sagar Shrikant Kadam, Tudor Ambarus, linux-mtd,
devicetree, linux-kernel, linux-riscv
+ Tudor (you should be listed as a maintainer for this file IMO)
On 19/08/21 06:59PM, Krzysztof Kozlowski wrote:
> Document bindings for the issi,is25wp256 SPI NOR flash.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
> ---
> Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml
> index ed590d7c6e37..0db64ac7dc33 100644
> --- a/Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml
> +++ b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml
> @@ -33,6 +33,7 @@ properties:
> - items:
> - enum:
> - issi,is25lp016d
> + - issi,is25wp256
I don't think we want to add any new flash specific compatibles. Why is
"jedec,spi-nor" not enough for you?
> - micron,mt25qu02g
> - mxicy,mx25r1635f
> - mxicy,mx25u6435f
> --
> 2.30.2
>
>
> ______________________________________________________
> Linux MTD discussion mailing list
> http://lists.infradead.org/mailman/listinfo/linux-mtd/
--
Regards,
Pratyush Yadav
Texas Instruments Inc.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/5] dt-bindings: mtd: jedec,spi-nor: document issi,is25wp256
2021-08-19 17:28 ` [PATCH 1/5] dt-bindings: mtd: jedec,spi-nor: document issi,is25wp256 Pratyush Yadav
@ 2021-08-19 17:36 ` Krzysztof Kozlowski
2021-08-20 13:28 ` Tudor.Ambarus
0 siblings, 1 reply; 9+ messages in thread
From: Krzysztof Kozlowski @ 2021-08-19 17:36 UTC (permalink / raw)
To: Pratyush Yadav
Cc: Miquel Raynal, Richard Weinberger, Vignesh Raghavendra,
Rob Herring, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Atish Patra, Sagar Shrikant Kadam, Tudor Ambarus, linux-mtd,
devicetree, linux-kernel, linux-riscv
On 19/08/2021 19:28, Pratyush Yadav wrote:
> + Tudor (you should be listed as a maintainer for this file IMO)
>
> On 19/08/21 06:59PM, Krzysztof Kozlowski wrote:
>> Document bindings for the issi,is25wp256 SPI NOR flash.
>>
>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
>> ---
>> Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml
>> index ed590d7c6e37..0db64ac7dc33 100644
>> --- a/Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml
>> +++ b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml
>> @@ -33,6 +33,7 @@ properties:
>> - items:
>> - enum:
>> - issi,is25lp016d
>> + - issi,is25wp256
>
> I don't think we want to add any new flash specific compatibles. Why is
> "jedec,spi-nor" not enough for you?
It's fine for me. I had impression that specific compatibles are still
preferred and one of boards is using this one. The other way is to
remove this compatible from the board DTS.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/5] dt-bindings: mtd: jedec,spi-nor: document issi,is25wp256
2021-08-19 17:36 ` Krzysztof Kozlowski
@ 2021-08-20 13:28 ` Tudor.Ambarus
2021-08-25 12:56 ` Krzysztof Kozlowski
0 siblings, 1 reply; 9+ messages in thread
From: Tudor.Ambarus @ 2021-08-20 13:28 UTC (permalink / raw)
To: krzysztof.kozlowski, p.yadav
Cc: miquel.raynal, richard, vigneshr, robh+dt, paul.walmsley, palmer,
aou, atish.patra, sagar.kadam, linux-mtd, devicetree,
linux-kernel, linux-riscv
On 8/19/21 8:36 PM, Krzysztof Kozlowski wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> On 19/08/2021 19:28, Pratyush Yadav wrote:
>> + Tudor (you should be listed as a maintainer for this file IMO)
>>
>> On 19/08/21 06:59PM, Krzysztof Kozlowski wrote:
>>> Document bindings for the issi,is25wp256 SPI NOR flash.
>>>
>>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
>>> ---
>>> Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml | 1 +
>>> 1 file changed, 1 insertion(+)
>>>
>>> diff --git a/Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml
>>> index ed590d7c6e37..0db64ac7dc33 100644
>>> --- a/Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml
>>> +++ b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml
>>> @@ -33,6 +33,7 @@ properties:
>>> - items:
>>> - enum:
>>> - issi,is25lp016d
>>> + - issi,is25wp256
>>
>> I don't think we want to add any new flash specific compatibles. Why is
>> "jedec,spi-nor" not enough for you?
>
> It's fine for me. I had impression that specific compatibles are still
> preferred and one of boards is using this one. The other way is to
> remove this compatible from the board DTS.
>
Pratyush is right, we prefer to bind just to the generic "jedec,spi-nor"
compatible whenever possible.
Cheers,
ta
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/5] dt-bindings: mtd: jedec,spi-nor: document issi,is25wp256
2021-08-20 13:28 ` Tudor.Ambarus
@ 2021-08-25 12:56 ` Krzysztof Kozlowski
0 siblings, 0 replies; 9+ messages in thread
From: Krzysztof Kozlowski @ 2021-08-25 12:56 UTC (permalink / raw)
To: Tudor.Ambarus, p.yadav
Cc: miquel.raynal, richard, vigneshr, robh+dt, paul.walmsley, palmer,
aou, atish.patra, sagar.kadam, linux-mtd, devicetree,
linux-kernel, linux-riscv
On 20/08/2021 15:28, Tudor.Ambarus@microchip.com wrote:
> On 8/19/21 8:36 PM, Krzysztof Kozlowski wrote:
>> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>>
>> On 19/08/2021 19:28, Pratyush Yadav wrote:
>>> + Tudor (you should be listed as a maintainer for this file IMO)
>>>
>>> On 19/08/21 06:59PM, Krzysztof Kozlowski wrote:
>>>> Document bindings for the issi,is25wp256 SPI NOR flash.
>>>>
>>>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
>>>> ---
>>>> Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml | 1 +
>>>> 1 file changed, 1 insertion(+)
>>>>
>>>> diff --git a/Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml
>>>> index ed590d7c6e37..0db64ac7dc33 100644
>>>> --- a/Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml
>>>> +++ b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml
>>>> @@ -33,6 +33,7 @@ properties:
>>>> - items:
>>>> - enum:
>>>> - issi,is25lp016d
>>>> + - issi,is25wp256
>>>
>>> I don't think we want to add any new flash specific compatibles. Why is
>>> "jedec,spi-nor" not enough for you?
>>
>> It's fine for me. I had impression that specific compatibles are still
>> preferred and one of boards is using this one. The other way is to
>> remove this compatible from the board DTS.
>>
>
> Pratyush is right, we prefer to bind just to the generic "jedec,spi-nor"
> compatible whenever possible.
Thanks for confirming this. I'll fixup the dts.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 9+ messages in thread