linux-mips.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] dt/bindings: mips: Document Ingenic SoCs binding
@ 2019-07-22 17:55 Paul Cercueil
  2019-07-22 17:55 ` [PATCH 2/2] MIPS: dts: ingenic: Add 'cpus' node Paul Cercueil
  2019-08-12 23:43 ` [PATCH 1/2] dt/bindings: mips: Document Ingenic SoCs binding Rob Herring
  0 siblings, 2 replies; 5+ messages in thread
From: Paul Cercueil @ 2019-07-22 17:55 UTC (permalink / raw)
  To: Ralf Baechle, Paul Burton, James Hogan, Rob Herring, Mark Rutland
  Cc: od, linux-mips, devicetree, linux-kernel, Paul Cercueil

Document the available properties for the root node and the cpu nodes of
the devicetree for the Ingenic SoCs.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
 .../devicetree/bindings/mips/ingenic-socs.txt      | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/mips/ingenic-socs.txt

diff --git a/Documentation/devicetree/bindings/mips/ingenic-socs.txt b/Documentation/devicetree/bindings/mips/ingenic-socs.txt
new file mode 100644
index 000000000000..fea2e6ec10a3
--- /dev/null
+++ b/Documentation/devicetree/bindings/mips/ingenic-socs.txt
@@ -0,0 +1,14 @@
+Bindings for Ingenic JZ47xx family of SoCs
+
+Required properties for root node:
+- compatible: One of:
+  * ingenic,jz4740
+  * ingenic,jz4725b
+  * ingenic,jz4770
+  * ingenic,jz4780
+
+Required properties for CPU nodes:
+- compatible: One of:
+  * ingenic,xburst-d0
+  * ingenic,xburst-d1
+  * ingenic,xburst-e1
-- 
2.21.0.593.g511ec345e18


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH 2/2] MIPS: dts: ingenic: Add 'cpus' node
  2019-07-22 17:55 [PATCH 1/2] dt/bindings: mips: Document Ingenic SoCs binding Paul Cercueil
@ 2019-07-22 17:55 ` Paul Cercueil
  2019-07-22 22:28   ` Paul Burton
  2019-08-12 23:43 ` [PATCH 1/2] dt/bindings: mips: Document Ingenic SoCs binding Rob Herring
  1 sibling, 1 reply; 5+ messages in thread
From: Paul Cercueil @ 2019-07-22 17:55 UTC (permalink / raw)
  To: Ralf Baechle, Paul Burton, James Hogan, Rob Herring, Mark Rutland
  Cc: od, linux-mips, devicetree, linux-kernel, Paul Cercueil

Add 'cpus' node to the jz4740.dtsi, jz4770.dtsi, jz4780.dtsi files.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
 arch/mips/boot/dts/ingenic/jz4740.dtsi | 19 +++++++++++
 arch/mips/boot/dts/ingenic/jz4770.dtsi | 29 ++++++++++++++++
 arch/mips/boot/dts/ingenic/jz4780.dtsi | 47 ++++++++++++++++++++++++++
 3 files changed, 95 insertions(+)

diff --git a/arch/mips/boot/dts/ingenic/jz4740.dtsi b/arch/mips/boot/dts/ingenic/jz4740.dtsi
index 2beb78a62b7d..14d777dae87d 100644
--- a/arch/mips/boot/dts/ingenic/jz4740.dtsi
+++ b/arch/mips/boot/dts/ingenic/jz4740.dtsi
@@ -6,6 +6,25 @@
 	#size-cells = <1>;
 	compatible = "ingenic,jz4740";
 
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu0: cpu@0 {
+			device_type = "cpu";
+			compatible = "ingenic,xburst-d0";
+			reg = <0>;
+			clocks = <&cgu JZ4740_CLK_CCLK>;
+			clock-names = "cpu";
+
+			i-cache-size = <0x4000>;
+			i-cache-block-size = <32>;
+
+			d-cache-size = <0x4000>;
+			d-cache-block-size = <32>;
+		};
+	};
+
 	cpuintc: interrupt-controller {
 		#address-cells = <0>;
 		#interrupt-cells = <1>;
diff --git a/arch/mips/boot/dts/ingenic/jz4770.dtsi b/arch/mips/boot/dts/ingenic/jz4770.dtsi
index 49ede6c14ff3..83ee526fbe10 100644
--- a/arch/mips/boot/dts/ingenic/jz4770.dtsi
+++ b/arch/mips/boot/dts/ingenic/jz4770.dtsi
@@ -7,6 +7,35 @@
 	#size-cells = <1>;
 	compatible = "ingenic,jz4770";
 
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu0: cpu@0 {
+			device_type = "cpu";
+			compatible = "ingenic,xburst-d1";
+			reg = <0>;
+			clocks = <&cgu JZ4770_CLK_CCLK>;
+			clock-names = "cpu";
+
+			i-cache-size = <0x4000>;
+			i-cache-block-size = <32>;
+
+			d-cache-size = <0x4000>;
+			d-cache-block-size = <32>;
+
+			next-level-cache = <&L2_cache>;
+
+			L2_cache: cache-controller {
+				compatible = "cache";
+				cache-unified;
+				cache-level = <2>;
+				cache-size = <0x40000>;
+				cache-block-size = <32>;
+			};
+		};
+	};
+
 	cpuintc: interrupt-controller {
 		#address-cells = <0>;
 		#interrupt-cells = <1>;
diff --git a/arch/mips/boot/dts/ingenic/jz4780.dtsi b/arch/mips/boot/dts/ingenic/jz4780.dtsi
index b03cdec56de9..3339b37101c0 100644
--- a/arch/mips/boot/dts/ingenic/jz4780.dtsi
+++ b/arch/mips/boot/dts/ingenic/jz4780.dtsi
@@ -7,6 +7,53 @@
 	#size-cells = <1>;
 	compatible = "ingenic,jz4780";
 
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu0: cpu@0 {
+			device_type = "cpu";
+			compatible = "ingenic,xburst-e1";
+			reg = <0>;
+
+			clocks = <&cgu JZ4780_CLK_CPU>;
+			clock-names = "cpu";
+
+			i-cache-size = <0x8000>;
+			i-cache-block-size = <32>;
+
+			d-cache-size = <0x8000>;
+			d-cache-block-size = <32>;
+
+			next-level-cache = <&L2_cache>;
+
+			L2_cache: l2-cache {
+				compatible = "cache";
+				cache-unified;
+				cache-level = <2>;
+				cache-size = <0x80000>;
+				cache-block-size = <32>;
+			};
+		};
+
+		cpu1: cpu@1 {
+			device_type = "cpu";
+			compatible = "ingenic,xburst-e1";
+			reg = <1>;
+
+			clocks = <&cgu JZ4780_CLK_CORE1>;
+			clock-names = "cpu";
+
+			i-cache-size = <0x8000>;
+			i-cache-block-size = <32>;
+
+			d-cache-size = <0x8000>;
+			d-cache-block-size = <32>;
+
+			next-level-cache = <&L2_cache>;
+		};
+	};
+
 	cpuintc: interrupt-controller {
 		#address-cells = <0>;
 		#interrupt-cells = <1>;
-- 
2.21.0.593.g511ec345e18


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH 2/2] MIPS: dts: ingenic: Add 'cpus' node
  2019-07-22 17:55 ` [PATCH 2/2] MIPS: dts: ingenic: Add 'cpus' node Paul Cercueil
@ 2019-07-22 22:28   ` Paul Burton
  2019-07-24 17:58     ` Paul Cercueil
  0 siblings, 1 reply; 5+ messages in thread
From: Paul Burton @ 2019-07-22 22:28 UTC (permalink / raw)
  To: Paul Cercueil
  Cc: Ralf Baechle, James Hogan, Rob Herring, Mark Rutland, od,
	linux-mips, devicetree, linux-kernel

Hi Paul,

On Mon, Jul 22, 2019 at 01:55:48PM -0400, Paul Cercueil wrote:
> Add 'cpus' node to the jz4740.dtsi, jz4770.dtsi, jz4780.dtsi files.

What's the motivation for this?

If it's to silence the "cacheinfo: Unable to detect cache hierarchy"
messages, does commit b8bea8a5e5d9 ("mips: fix cacheinfo") from
mips-fixes work for you instead?

I'm not seeing much point listing cache setup in DT when we already
detect it from cop0 anyway.

Thanks,
    Paul

> Signed-off-by: Paul Cercueil <paul@crapouillou.net>
> ---
>  arch/mips/boot/dts/ingenic/jz4740.dtsi | 19 +++++++++++
>  arch/mips/boot/dts/ingenic/jz4770.dtsi | 29 ++++++++++++++++
>  arch/mips/boot/dts/ingenic/jz4780.dtsi | 47 ++++++++++++++++++++++++++
>  3 files changed, 95 insertions(+)
> 
> diff --git a/arch/mips/boot/dts/ingenic/jz4740.dtsi b/arch/mips/boot/dts/ingenic/jz4740.dtsi
> index 2beb78a62b7d..14d777dae87d 100644
> --- a/arch/mips/boot/dts/ingenic/jz4740.dtsi
> +++ b/arch/mips/boot/dts/ingenic/jz4740.dtsi
> @@ -6,6 +6,25 @@
>  	#size-cells = <1>;
>  	compatible = "ingenic,jz4740";
>  
> +	cpus {
> +		#address-cells = <1>;
> +		#size-cells = <0>;
> +
> +		cpu0: cpu@0 {
> +			device_type = "cpu";
> +			compatible = "ingenic,xburst-d0";
> +			reg = <0>;
> +			clocks = <&cgu JZ4740_CLK_CCLK>;
> +			clock-names = "cpu";
> +
> +			i-cache-size = <0x4000>;
> +			i-cache-block-size = <32>;
> +
> +			d-cache-size = <0x4000>;
> +			d-cache-block-size = <32>;
> +		};
> +	};
> +
>  	cpuintc: interrupt-controller {
>  		#address-cells = <0>;
>  		#interrupt-cells = <1>;
> diff --git a/arch/mips/boot/dts/ingenic/jz4770.dtsi b/arch/mips/boot/dts/ingenic/jz4770.dtsi
> index 49ede6c14ff3..83ee526fbe10 100644
> --- a/arch/mips/boot/dts/ingenic/jz4770.dtsi
> +++ b/arch/mips/boot/dts/ingenic/jz4770.dtsi
> @@ -7,6 +7,35 @@
>  	#size-cells = <1>;
>  	compatible = "ingenic,jz4770";
>  
> +	cpus {
> +		#address-cells = <1>;
> +		#size-cells = <0>;
> +
> +		cpu0: cpu@0 {
> +			device_type = "cpu";
> +			compatible = "ingenic,xburst-d1";
> +			reg = <0>;
> +			clocks = <&cgu JZ4770_CLK_CCLK>;
> +			clock-names = "cpu";
> +
> +			i-cache-size = <0x4000>;
> +			i-cache-block-size = <32>;
> +
> +			d-cache-size = <0x4000>;
> +			d-cache-block-size = <32>;
> +
> +			next-level-cache = <&L2_cache>;
> +
> +			L2_cache: cache-controller {
> +				compatible = "cache";
> +				cache-unified;
> +				cache-level = <2>;
> +				cache-size = <0x40000>;
> +				cache-block-size = <32>;
> +			};
> +		};
> +	};
> +
>  	cpuintc: interrupt-controller {
>  		#address-cells = <0>;
>  		#interrupt-cells = <1>;
> diff --git a/arch/mips/boot/dts/ingenic/jz4780.dtsi b/arch/mips/boot/dts/ingenic/jz4780.dtsi
> index b03cdec56de9..3339b37101c0 100644
> --- a/arch/mips/boot/dts/ingenic/jz4780.dtsi
> +++ b/arch/mips/boot/dts/ingenic/jz4780.dtsi
> @@ -7,6 +7,53 @@
>  	#size-cells = <1>;
>  	compatible = "ingenic,jz4780";
>  
> +	cpus {
> +		#address-cells = <1>;
> +		#size-cells = <0>;
> +
> +		cpu0: cpu@0 {
> +			device_type = "cpu";
> +			compatible = "ingenic,xburst-e1";
> +			reg = <0>;
> +
> +			clocks = <&cgu JZ4780_CLK_CPU>;
> +			clock-names = "cpu";
> +
> +			i-cache-size = <0x8000>;
> +			i-cache-block-size = <32>;
> +
> +			d-cache-size = <0x8000>;
> +			d-cache-block-size = <32>;
> +
> +			next-level-cache = <&L2_cache>;
> +
> +			L2_cache: l2-cache {
> +				compatible = "cache";
> +				cache-unified;
> +				cache-level = <2>;
> +				cache-size = <0x80000>;
> +				cache-block-size = <32>;
> +			};
> +		};
> +
> +		cpu1: cpu@1 {
> +			device_type = "cpu";
> +			compatible = "ingenic,xburst-e1";
> +			reg = <1>;
> +
> +			clocks = <&cgu JZ4780_CLK_CORE1>;
> +			clock-names = "cpu";
> +
> +			i-cache-size = <0x8000>;
> +			i-cache-block-size = <32>;
> +
> +			d-cache-size = <0x8000>;
> +			d-cache-block-size = <32>;
> +
> +			next-level-cache = <&L2_cache>;
> +		};
> +	};
> +
>  	cpuintc: interrupt-controller {
>  		#address-cells = <0>;
>  		#interrupt-cells = <1>;
> -- 
> 2.21.0.593.g511ec345e18
> 

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 2/2] MIPS: dts: ingenic: Add 'cpus' node
  2019-07-22 22:28   ` Paul Burton
@ 2019-07-24 17:58     ` Paul Cercueil
  0 siblings, 0 replies; 5+ messages in thread
From: Paul Cercueil @ 2019-07-24 17:58 UTC (permalink / raw)
  To: Paul Burton
  Cc: Ralf Baechle, James Hogan, Rob Herring, Mark Rutland, od,
	linux-mips, devicetree, linux-kernel



Le lun. 22 juil. 2019 à 18:28, Paul Burton <paul.burton@mips.com> a 
écrit :
> Hi Paul,
> 
> On Mon, Jul 22, 2019 at 01:55:48PM -0400, Paul Cercueil wrote:
>>  Add 'cpus' node to the jz4740.dtsi, jz4770.dtsi, jz4780.dtsi files.
> 
> What's the motivation for this?
> 
> If it's to silence the "cacheinfo: Unable to detect cache hierarchy"
> messages, does commit b8bea8a5e5d9 ("mips: fix cacheinfo") from
> mips-fixes work for you instead?
> 
> I'm not seeing much point listing cache setup in DT when we already
> detect it from cop0 anyway.

Ok, just drop this patchset then.

> 
> Thanks,
>     Paul
> 
>>  Signed-off-by: Paul Cercueil <paul@crapouillou.net>
>>  ---
>>   arch/mips/boot/dts/ingenic/jz4740.dtsi | 19 +++++++++++
>>   arch/mips/boot/dts/ingenic/jz4770.dtsi | 29 ++++++++++++++++
>>   arch/mips/boot/dts/ingenic/jz4780.dtsi | 47 
>> ++++++++++++++++++++++++++
>>   3 files changed, 95 insertions(+)
>> 
>>  diff --git a/arch/mips/boot/dts/ingenic/jz4740.dtsi 
>> b/arch/mips/boot/dts/ingenic/jz4740.dtsi
>>  index 2beb78a62b7d..14d777dae87d 100644
>>  --- a/arch/mips/boot/dts/ingenic/jz4740.dtsi
>>  +++ b/arch/mips/boot/dts/ingenic/jz4740.dtsi
>>  @@ -6,6 +6,25 @@
>>   	#size-cells = <1>;
>>   	compatible = "ingenic,jz4740";
>> 
>>  +	cpus {
>>  +		#address-cells = <1>;
>>  +		#size-cells = <0>;
>>  +
>>  +		cpu0: cpu@0 {
>>  +			device_type = "cpu";
>>  +			compatible = "ingenic,xburst-d0";
>>  +			reg = <0>;
>>  +			clocks = <&cgu JZ4740_CLK_CCLK>;
>>  +			clock-names = "cpu";
>>  +
>>  +			i-cache-size = <0x4000>;
>>  +			i-cache-block-size = <32>;
>>  +
>>  +			d-cache-size = <0x4000>;
>>  +			d-cache-block-size = <32>;
>>  +		};
>>  +	};
>>  +
>>   	cpuintc: interrupt-controller {
>>   		#address-cells = <0>;
>>   		#interrupt-cells = <1>;
>>  diff --git a/arch/mips/boot/dts/ingenic/jz4770.dtsi 
>> b/arch/mips/boot/dts/ingenic/jz4770.dtsi
>>  index 49ede6c14ff3..83ee526fbe10 100644
>>  --- a/arch/mips/boot/dts/ingenic/jz4770.dtsi
>>  +++ b/arch/mips/boot/dts/ingenic/jz4770.dtsi
>>  @@ -7,6 +7,35 @@
>>   	#size-cells = <1>;
>>   	compatible = "ingenic,jz4770";
>> 
>>  +	cpus {
>>  +		#address-cells = <1>;
>>  +		#size-cells = <0>;
>>  +
>>  +		cpu0: cpu@0 {
>>  +			device_type = "cpu";
>>  +			compatible = "ingenic,xburst-d1";
>>  +			reg = <0>;
>>  +			clocks = <&cgu JZ4770_CLK_CCLK>;
>>  +			clock-names = "cpu";
>>  +
>>  +			i-cache-size = <0x4000>;
>>  +			i-cache-block-size = <32>;
>>  +
>>  +			d-cache-size = <0x4000>;
>>  +			d-cache-block-size = <32>;
>>  +
>>  +			next-level-cache = <&L2_cache>;
>>  +
>>  +			L2_cache: cache-controller {
>>  +				compatible = "cache";
>>  +				cache-unified;
>>  +				cache-level = <2>;
>>  +				cache-size = <0x40000>;
>>  +				cache-block-size = <32>;
>>  +			};
>>  +		};
>>  +	};
>>  +
>>   	cpuintc: interrupt-controller {
>>   		#address-cells = <0>;
>>   		#interrupt-cells = <1>;
>>  diff --git a/arch/mips/boot/dts/ingenic/jz4780.dtsi 
>> b/arch/mips/boot/dts/ingenic/jz4780.dtsi
>>  index b03cdec56de9..3339b37101c0 100644
>>  --- a/arch/mips/boot/dts/ingenic/jz4780.dtsi
>>  +++ b/arch/mips/boot/dts/ingenic/jz4780.dtsi
>>  @@ -7,6 +7,53 @@
>>   	#size-cells = <1>;
>>   	compatible = "ingenic,jz4780";
>> 
>>  +	cpus {
>>  +		#address-cells = <1>;
>>  +		#size-cells = <0>;
>>  +
>>  +		cpu0: cpu@0 {
>>  +			device_type = "cpu";
>>  +			compatible = "ingenic,xburst-e1";
>>  +			reg = <0>;
>>  +
>>  +			clocks = <&cgu JZ4780_CLK_CPU>;
>>  +			clock-names = "cpu";
>>  +
>>  +			i-cache-size = <0x8000>;
>>  +			i-cache-block-size = <32>;
>>  +
>>  +			d-cache-size = <0x8000>;
>>  +			d-cache-block-size = <32>;
>>  +
>>  +			next-level-cache = <&L2_cache>;
>>  +
>>  +			L2_cache: l2-cache {
>>  +				compatible = "cache";
>>  +				cache-unified;
>>  +				cache-level = <2>;
>>  +				cache-size = <0x80000>;
>>  +				cache-block-size = <32>;
>>  +			};
>>  +		};
>>  +
>>  +		cpu1: cpu@1 {
>>  +			device_type = "cpu";
>>  +			compatible = "ingenic,xburst-e1";
>>  +			reg = <1>;
>>  +
>>  +			clocks = <&cgu JZ4780_CLK_CORE1>;
>>  +			clock-names = "cpu";
>>  +
>>  +			i-cache-size = <0x8000>;
>>  +			i-cache-block-size = <32>;
>>  +
>>  +			d-cache-size = <0x8000>;
>>  +			d-cache-block-size = <32>;
>>  +
>>  +			next-level-cache = <&L2_cache>;
>>  +		};
>>  +	};
>>  +
>>   	cpuintc: interrupt-controller {
>>   		#address-cells = <0>;
>>   		#interrupt-cells = <1>;
>>  --
>>  2.21.0.593.g511ec345e18
>> 



^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/2] dt/bindings: mips: Document Ingenic SoCs binding
  2019-07-22 17:55 [PATCH 1/2] dt/bindings: mips: Document Ingenic SoCs binding Paul Cercueil
  2019-07-22 17:55 ` [PATCH 2/2] MIPS: dts: ingenic: Add 'cpus' node Paul Cercueil
@ 2019-08-12 23:43 ` Rob Herring
  1 sibling, 0 replies; 5+ messages in thread
From: Rob Herring @ 2019-08-12 23:43 UTC (permalink / raw)
  To: Paul Cercueil
  Cc: Ralf Baechle, Paul Burton, James Hogan, Mark Rutland, od,
	linux-mips, devicetree, linux-kernel

On Mon, Jul 22, 2019 at 01:55:47PM -0400, Paul Cercueil wrote:
> Document the available properties for the root node and the cpu nodes of
> the devicetree for the Ingenic SoCs.
> 
> Signed-off-by: Paul Cercueil <paul@crapouillou.net>
> ---
>  .../devicetree/bindings/mips/ingenic-socs.txt      | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)
>  create mode 100644 Documentation/devicetree/bindings/mips/ingenic-socs.txt

Please convert this to DT schema.

> diff --git a/Documentation/devicetree/bindings/mips/ingenic-socs.txt b/Documentation/devicetree/bindings/mips/ingenic-socs.txt
> new file mode 100644
> index 000000000000..fea2e6ec10a3
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/mips/ingenic-socs.txt
> @@ -0,0 +1,14 @@
> +Bindings for Ingenic JZ47xx family of SoCs
> +
> +Required properties for root node:
> +- compatible: One of:
> +  * ingenic,jz4740
> +  * ingenic,jz4725b
> +  * ingenic,jz4770
> +  * ingenic,jz4780
> +
> +Required properties for CPU nodes:
> +- compatible: One of:
> +  * ingenic,xburst-d0
> +  * ingenic,xburst-d1
> +  * ingenic,xburst-e1

Root node and cpu bindings should be separate files. The CPU nodes 
should have much more than just a compatible string.

Rob

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2019-08-12 23:43 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-22 17:55 [PATCH 1/2] dt/bindings: mips: Document Ingenic SoCs binding Paul Cercueil
2019-07-22 17:55 ` [PATCH 2/2] MIPS: dts: ingenic: Add 'cpus' node Paul Cercueil
2019-07-22 22:28   ` Paul Burton
2019-07-24 17:58     ` Paul Cercueil
2019-08-12 23:43 ` [PATCH 1/2] dt/bindings: mips: Document Ingenic SoCs binding Rob Herring

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).