linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 00/13] MMP DTS updates for 5.9
@ 2020-07-18 20:50 Lubomir Rintel
  2020-07-18 20:50 ` [PATCH v2 01/13] ARM: dts: mmp2-olpc-xo-1-75: Fix camera I2C node validation Lubomir Rintel
                   ` (12 more replies)
  0 siblings, 13 replies; 15+ messages in thread
From: Lubomir Rintel @ 2020-07-18 20:50 UTC (permalink / raw)
  To: Arnd Bergmann, Olof Johansson
  Cc: SoC Team, Rob Herring, linux-arm-kernel, devicetree, linux-kernel

Hi,

chained to this message is a patch set I hope would end up queued into
soc/arm/dt for 5.9.

I've checked I'm not adding new validation errors and booted the v5.8-rc1
kernels with appended DTBs on the XO-1.75 and Dell Ariel board.

Compared to v1 I've fixed one wording error in last patch, and
added soc@ to cc.

Lubo




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

* [PATCH v2 01/13] ARM: dts: mmp2-olpc-xo-1-75: Fix camera I2C node validation
  2020-07-18 20:50 [PATCH v2 00/13] MMP DTS updates for 5.9 Lubomir Rintel
@ 2020-07-18 20:50 ` Lubomir Rintel
  2020-07-18 20:50 ` [PATCH v2 02/13] ARM: dts: mmp2-olpc-xo-1-75: Delete #address-cells from ssp3 Lubomir Rintel
                   ` (11 subsequent siblings)
  12 siblings, 0 replies; 15+ messages in thread
From: Lubomir Rintel @ 2020-07-18 20:50 UTC (permalink / raw)
  To: Arnd Bergmann, Olof Johansson
  Cc: SoC Team, Rob Herring, linux-arm-kernel, devicetree,
	linux-kernel, Lubomir Rintel

  mmp2-olpc-xo-1-75.dt.yaml: camera_i2c: $nodename:0:
      'camera_i2c' does not match '^i2c(@.*)?'
  mmp2-olpc-xo-1-75.dt.yaml: camera_i2c: 'sda-gpios' is a required property
  mmp2-olpc-xo-1-75.dt.yaml: camera_i2c: 'scl-gpios' is a required property

The "gpios" property actually was documented as deprecated, but got dropped
in commit 0175ce4a58d6 ("dt-bindings: i2c: Convert i2c-gpio binding to
json-schema"). It's probably best kept forgotten though.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
 arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts b/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts
index 6cfa0d4a18845..02f4005a654b9 100644
--- a/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts
+++ b/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts
@@ -77,10 +77,10 @@ headphone_insert {
 		};
 	};
 
-	camera_i2c {
+	i2c {
 		compatible = "i2c-gpio";
-		gpios = <&gpio 109 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>,
-			<&gpio 108 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+		sda-gpios = <&gpio 109 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+		scl-gpios = <&gpio 108 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 		#address-cells = <1>;
 		#size-cells = <0>;
 		i2c-gpio,timeout-ms = <1000>;
-- 
2.26.2


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

* [PATCH v2 02/13] ARM: dts: mmp2-olpc-xo-1-75: Delete #address-cells from ssp3
  2020-07-18 20:50 [PATCH v2 00/13] MMP DTS updates for 5.9 Lubomir Rintel
  2020-07-18 20:50 ` [PATCH v2 01/13] ARM: dts: mmp2-olpc-xo-1-75: Fix camera I2C node validation Lubomir Rintel
@ 2020-07-18 20:50 ` Lubomir Rintel
  2020-11-10  3:19   ` Florian Fainelli
  2020-07-18 20:50 ` [PATCH v2 03/13] ARM: dts: mmp2: Add #power-domain-cells to /clocks Lubomir Rintel
                   ` (10 subsequent siblings)
  12 siblings, 1 reply; 15+ messages in thread
From: Lubomir Rintel @ 2020-07-18 20:50 UTC (permalink / raw)
  To: Arnd Bergmann, Olof Johansson
  Cc: SoC Team, Rob Herring, linux-arm-kernel, devicetree,
	linux-kernel, Lubomir Rintel

On the XO-1.75, this node represents a bus interface that operates in slave
mode and thus is only able to accommodate a single subnode; no address
cells are necessary.

The Documentation/devicetree/bindings/spi/spi-controller.yaml binding
prefers that we drop the property instead of setting it to zero.

This fixes a DT validation error:

  arch/arm/boot/dts/mmp2-olpc-xo-1-75.dt.yaml: spi@d4037000:
      { ... } is valid under each of {'required': ['spi-slave']},
                                     {'required': ['#address-cells']}

We also need to drop #size-cells:

  arch/arm/boot/dts/mmp2-olpc-xo-1-75.dt.yaml: spi@d4037000:
      '#address-cells' is a dependency of '#size-cells'

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
 arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts b/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts
index 02f4005a654b9..392f546f7915b 100644
--- a/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts
+++ b/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts
@@ -221,7 +221,8 @@ accelerometer@1d {
 };
 
 &ssp3 {
-	#address-cells = <0>;
+	/delete-property/ #address-cells;
+	/delete-property/ #size-cells;
 	spi-slave;
 	status = "okay";
 	ready-gpio = <&gpio 125 GPIO_ACTIVE_HIGH>;
-- 
2.26.2


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

* [PATCH v2 03/13] ARM: dts: mmp2: Add #power-domain-cells to /clocks
  2020-07-18 20:50 [PATCH v2 00/13] MMP DTS updates for 5.9 Lubomir Rintel
  2020-07-18 20:50 ` [PATCH v2 01/13] ARM: dts: mmp2-olpc-xo-1-75: Fix camera I2C node validation Lubomir Rintel
  2020-07-18 20:50 ` [PATCH v2 02/13] ARM: dts: mmp2-olpc-xo-1-75: Delete #address-cells from ssp3 Lubomir Rintel
@ 2020-07-18 20:50 ` Lubomir Rintel
  2020-07-18 20:50 ` [PATCH v2 04/13] ARM: dts: mmp2: Extend the MPMU reg range Lubomir Rintel
                   ` (9 subsequent siblings)
  12 siblings, 0 replies; 15+ messages in thread
From: Lubomir Rintel @ 2020-07-18 20:50 UTC (permalink / raw)
  To: Arnd Bergmann, Olof Johansson
  Cc: SoC Team, Rob Herring, linux-arm-kernel, devicetree,
	linux-kernel, Lubomir Rintel

The power management unit, described by the soc_clocks node, controls the
power to the peripherals by the means of power domains with a single
cell -- the domain number.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
 arch/arm/boot/dts/mmp2.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/mmp2.dtsi b/arch/arm/boot/dts/mmp2.dtsi
index 4306f3a6742bf..9b8a156cf73e5 100644
--- a/arch/arm/boot/dts/mmp2.dtsi
+++ b/arch/arm/boot/dts/mmp2.dtsi
@@ -421,6 +421,7 @@ soc_clocks: clocks {
 			reg-names = "mpmu", "apmu", "apbc";
 			#clock-cells = <1>;
 			#reset-cells = <1>;
+			#power-domain-cells = <1>;
 		};
 	};
 };
-- 
2.26.2


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

* [PATCH v2 04/13] ARM: dts: mmp2: Extend the MPMU reg range
  2020-07-18 20:50 [PATCH v2 00/13] MMP DTS updates for 5.9 Lubomir Rintel
                   ` (2 preceding siblings ...)
  2020-07-18 20:50 ` [PATCH v2 03/13] ARM: dts: mmp2: Add #power-domain-cells to /clocks Lubomir Rintel
@ 2020-07-18 20:50 ` Lubomir Rintel
  2020-07-18 20:50 ` [PATCH v2 05/13] ARM: dts: mmp2: Add Audio SRAM Lubomir Rintel
                   ` (8 subsequent siblings)
  12 siblings, 0 replies; 15+ messages in thread
From: Lubomir Rintel @ 2020-07-18 20:50 UTC (permalink / raw)
  To: Arnd Bergmann, Olof Johansson
  Cc: SoC Team, Rob Herring, linux-arm-kernel, devicetree,
	linux-kernel, Lubomir Rintel

The ACGR register is at the offset of 0x1024, beyond the 4k originally
assigned to the MPMU range.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
 arch/arm/boot/dts/mmp2.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/mmp2.dtsi b/arch/arm/boot/dts/mmp2.dtsi
index 9b8a156cf73e5..9e77f685fb188 100644
--- a/arch/arm/boot/dts/mmp2.dtsi
+++ b/arch/arm/boot/dts/mmp2.dtsi
@@ -415,7 +415,7 @@ ssp4: spi@d4039000 {
 
 		soc_clocks: clocks {
 			compatible = "marvell,mmp2-clock";
-			reg = <0xd4050000 0x1000>,
+			reg = <0xd4050000 0x2000>,
 			      <0xd4282800 0x400>,
 			      <0xd4015000 0x1000>;
 			reg-names = "mpmu", "apmu", "apbc";
-- 
2.26.2


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

* [PATCH v2 05/13] ARM: dts: mmp2: Add Audio SRAM
  2020-07-18 20:50 [PATCH v2 00/13] MMP DTS updates for 5.9 Lubomir Rintel
                   ` (3 preceding siblings ...)
  2020-07-18 20:50 ` [PATCH v2 04/13] ARM: dts: mmp2: Extend the MPMU reg range Lubomir Rintel
@ 2020-07-18 20:50 ` Lubomir Rintel
  2020-07-18 20:50 ` [PATCH v2 06/13] ARM: dts: mmp2: Add DMA nodes Lubomir Rintel
                   ` (7 subsequent siblings)
  12 siblings, 0 replies; 15+ messages in thread
From: Lubomir Rintel @ 2020-07-18 20:50 UTC (permalink / raw)
  To: Arnd Bergmann, Olof Johansson
  Cc: SoC Team, Rob Herring, linux-arm-kernel, devicetree,
	linux-kernel, Lubomir Rintel

This memory is region is where the two-channel audio DMA can pump sound
samples into the SSPA's internal FIFO.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
 arch/arm/boot/dts/mmp2.dtsi | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/arch/arm/boot/dts/mmp2.dtsi b/arch/arm/boot/dts/mmp2.dtsi
index 9e77f685fb188..da2c92328464e 100644
--- a/arch/arm/boot/dts/mmp2.dtsi
+++ b/arch/arm/boot/dts/mmp2.dtsi
@@ -413,6 +413,15 @@ ssp4: spi@d4039000 {
 			};
 		};
 
+		asram: sram@e0000000 {
+			compatible = "mmio-sram";
+			reg = <0xe0000000 0x10000>;
+			ranges = <0 0xe0000000 0x10000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			status = "disabled";
+		};
+
 		soc_clocks: clocks {
 			compatible = "marvell,mmp2-clock";
 			reg = <0xd4050000 0x2000>,
-- 
2.26.2


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

* [PATCH v2 06/13] ARM: dts: mmp2: Add DMA nodes
  2020-07-18 20:50 [PATCH v2 00/13] MMP DTS updates for 5.9 Lubomir Rintel
                   ` (4 preceding siblings ...)
  2020-07-18 20:50 ` [PATCH v2 05/13] ARM: dts: mmp2: Add Audio SRAM Lubomir Rintel
@ 2020-07-18 20:50 ` Lubomir Rintel
  2020-07-18 20:50 ` [PATCH v2 07/13] ARM: dts: mmp2: Add Audio Clock controller Lubomir Rintel
                   ` (6 subsequent siblings)
  12 siblings, 0 replies; 15+ messages in thread
From: Lubomir Rintel @ 2020-07-18 20:50 UTC (permalink / raw)
  To: Arnd Bergmann, Olof Johansson
  Cc: SoC Team, Rob Herring, linux-arm-kernel, devicetree,
	linux-kernel, Lubomir Rintel

There is a 16-channel peripheral DMA controller along with two-channel
audio DMA engines.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
 arch/arm/boot/dts/mmp2.dtsi | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/arch/arm/boot/dts/mmp2.dtsi b/arch/arm/boot/dts/mmp2.dtsi
index da2c92328464e..b349f4f35706b 100644
--- a/arch/arm/boot/dts/mmp2.dtsi
+++ b/arch/arm/boot/dts/mmp2.dtsi
@@ -192,6 +192,24 @@ camera1: camera@d420a800 {
 				clock-output-names = "mclk";
 				status = "disabled";
 			};
+
+			adma0: dma-controller@d42a0800 {
+				compatible = "marvell,adma-1.0";
+				reg = <0xd42a0800 0x100>;
+				interrupts = <48>;
+				#dma-cells = <1>;
+				asram = <&asram>;
+				iram = <&asram>;
+				status = "disabled";
+			};
+
+			adma1: dma-controller@d42a0900 {
+				compatible = "marvell,adma-1.0";
+				reg = <0xd42a0900 0x100>;
+				interrupts = <48>;
+				#dma-cells = <1>;
+				status = "disabled";
+			};
 		};
 
 		apb@d4000000 {	/* APB */
@@ -201,6 +219,14 @@ apb@d4000000 {	/* APB */
 			reg = <0xd4000000 0x00200000>;
 			ranges;
 
+			dma-controller@d4000000 {
+				compatible = "marvell,pdma-1.0";
+				reg = <0xd4000000 0x10000>;
+				interrupts = <48>;
+				#dma-channels = <16>;
+				status = "disabled";
+			};
+
 			timer0: timer@d4014000 {
 				compatible = "mrvl,mmp-timer";
 				reg = <0xd4014000 0x100>;
-- 
2.26.2


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

* [PATCH v2 07/13] ARM: dts: mmp2: Add Audio Clock controller
  2020-07-18 20:50 [PATCH v2 00/13] MMP DTS updates for 5.9 Lubomir Rintel
                   ` (5 preceding siblings ...)
  2020-07-18 20:50 ` [PATCH v2 06/13] ARM: dts: mmp2: Add DMA nodes Lubomir Rintel
@ 2020-07-18 20:50 ` Lubomir Rintel
  2020-07-18 20:50 ` [PATCH v2 08/13] ARM: dts: mmp2: Add SSPA nodes Lubomir Rintel
                   ` (5 subsequent siblings)
  12 siblings, 0 replies; 15+ messages in thread
From: Lubomir Rintel @ 2020-07-18 20:50 UTC (permalink / raw)
  To: Arnd Bergmann, Olof Johansson
  Cc: SoC Team, Rob Herring, linux-arm-kernel, devicetree,
	linux-kernel, Lubomir Rintel

This device generates the audio codec master clock and bit clock.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
 arch/arm/boot/dts/mmp2.dtsi | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/arch/arm/boot/dts/mmp2.dtsi b/arch/arm/boot/dts/mmp2.dtsi
index b349f4f35706b..dd7fba65799ea 100644
--- a/arch/arm/boot/dts/mmp2.dtsi
+++ b/arch/arm/boot/dts/mmp2.dtsi
@@ -210,6 +210,19 @@ adma1: dma-controller@d42a0900 {
 				#dma-cells = <1>;
 				status = "disabled";
 			};
+
+			audio_clk: clocks@d42a0c30 {
+				compatible = "marvell,mmp2-audio-clock";
+				reg = <0xd42a0c30 0x10>;
+				clock-names = "audio", "vctcxo", "i2s0", "i2s1";
+				clocks = <&soc_clocks MMP2_CLK_AUDIO>,
+					 <&soc_clocks MMP2_CLK_VCTCXO>,
+					 <&soc_clocks MMP2_CLK_I2S0>,
+					 <&soc_clocks MMP2_CLK_I2S1>;
+				power-domains = <&soc_clocks MMP2_POWER_DOMAIN_AUDIO>;
+				#clock-cells = <1>;
+				status = "disabled";
+			};
 		};
 
 		apb@d4000000 {	/* APB */
-- 
2.26.2


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

* [PATCH v2 08/13] ARM: dts: mmp2: Add SSPA nodes
  2020-07-18 20:50 [PATCH v2 00/13] MMP DTS updates for 5.9 Lubomir Rintel
                   ` (6 preceding siblings ...)
  2020-07-18 20:50 ` [PATCH v2 07/13] ARM: dts: mmp2: Add Audio Clock controller Lubomir Rintel
@ 2020-07-18 20:50 ` Lubomir Rintel
  2020-07-18 20:50 ` [PATCH v2 09/13] ARM: dts: mmp2-olpc-xo-1-75: Enable audio support Lubomir Rintel
                   ` (4 subsequent siblings)
  12 siblings, 0 replies; 15+ messages in thread
From: Lubomir Rintel @ 2020-07-18 20:50 UTC (permalink / raw)
  To: Arnd Bergmann, Olof Johansson
  Cc: SoC Team, Rob Herring, linux-arm-kernel, devicetree,
	linux-kernel, Lubomir Rintel

There are two I2S-capable audio serial port blocks.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
 arch/arm/boot/dts/mmp2.dtsi | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/arch/arm/boot/dts/mmp2.dtsi b/arch/arm/boot/dts/mmp2.dtsi
index dd7fba65799ea..31592acd3ef4f 100644
--- a/arch/arm/boot/dts/mmp2.dtsi
+++ b/arch/arm/boot/dts/mmp2.dtsi
@@ -223,6 +223,32 @@ audio_clk: clocks@d42a0c30 {
 				#clock-cells = <1>;
 				status = "disabled";
 			};
+
+			sspa0: audio-controller@d42a0c00 {
+				compatible = "marvell,mmp-sspa";
+				reg = <0xd42a0c00 0x30>,
+				      <0xd42a0c80 0x30>;
+				interrupts = <2>;
+				clock-names = "audio", "bitclk";
+				clocks = <&soc_clocks MMP2_CLK_AUDIO>,
+					 <&audio_clk 1>;
+				power-domains = <&soc_clocks MMP2_POWER_DOMAIN_AUDIO>;
+				#sound-dai-cells = <0>;
+				status = "disabled";
+			};
+
+			sspa1: audio-controller@d42a0d00 {
+				compatible = "marvell,mmp-sspa";
+				reg = <0xd42a0d00 0x30>,
+				      <0xd42a0d80 0x30>;
+				interrupts = <3>;
+				clock-names = "audio", "bitclk";
+				clocks = <&soc_clocks MMP2_CLK_AUDIO>,
+					 <&audio_clk 2>;
+				power-domains = <&soc_clocks MMP2_POWER_DOMAIN_AUDIO>;
+				#sound-dai-cells = <0>;
+				status = "disabled";
+			};
 		};
 
 		apb@d4000000 {	/* APB */
-- 
2.26.2


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

* [PATCH v2 09/13] ARM: dts: mmp2-olpc-xo-1-75: Enable audio support
  2020-07-18 20:50 [PATCH v2 00/13] MMP DTS updates for 5.9 Lubomir Rintel
                   ` (7 preceding siblings ...)
  2020-07-18 20:50 ` [PATCH v2 08/13] ARM: dts: mmp2: Add SSPA nodes Lubomir Rintel
@ 2020-07-18 20:50 ` Lubomir Rintel
  2020-07-18 20:50 ` [PATCH v2 10/13] ARM: dts: mmp2: Add the GPU Lubomir Rintel
                   ` (3 subsequent siblings)
  12 siblings, 0 replies; 15+ messages in thread
From: Lubomir Rintel @ 2020-07-18 20:50 UTC (permalink / raw)
  To: Arnd Bergmann, Olof Johansson
  Cc: SoC Team, Rob Herring, linux-arm-kernel, devicetree,
	linux-kernel, Lubomir Rintel

This enables the audio SRAM, DMA engine, I2S interface, and codec, hooks
them together and adds a audio-graph-card instance.

It also removes the jack gpios from the gpio-keys instance, because the
audio jack driver registers an input device.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
 arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts | 65 ++++++++++++++++++-------
 1 file changed, 47 insertions(+), 18 deletions(-)

diff --git a/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts b/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts
index 392f546f7915b..5f1da58550987 100644
--- a/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts
+++ b/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts
@@ -57,24 +57,6 @@ tablet_mode {
 			linux,code = <SW_TABLET_MODE>;
 			wakeup-source;
 		};
-
-		microphone_insert {
-			label = "Microphone Plug";
-			gpios = <&gpio 96 GPIO_ACTIVE_HIGH>;
-			linux,input-type = <EV_SW>;
-			linux,code = <SW_MICROPHONE_INSERT>;
-			debounce-interval = <100>;
-			wakeup-source;
-		};
-
-		headphone_insert {
-			label = "Headphone Plug";
-			gpios = <&gpio 97 GPIO_ACTIVE_HIGH>;
-			linux,input-type = <EV_SW>;
-			linux,code = <SW_HEADPHONE_INSERT>;
-			debounce-interval = <100>;
-			wakeup-source;
-		};
 	};
 
 	i2c {
@@ -123,6 +105,18 @@ wlan_pwrseq: pwrseq0 {
 		reset-gpios = <&gpio 58 GPIO_ACTIVE_HIGH>;
 	};
 
+	sound-card {
+		compatible = "audio-graph-card";
+		label = "OLPC XO";
+		dais = <&sspa0_dai>;
+		routing = "Headphones", "HPOL",
+			  "Headphones", "HPOR",
+			  "MIC2", "Mic Jack";
+		widgets = "Headphone", "Headphones", "Microphone", "Mic Jack";
+		hp-det-gpio = <&gpio 97 GPIO_ACTIVE_HIGH>;
+		mic-det-gpio = <&gpio 96 GPIO_ACTIVE_HIGH>;
+	};
+
 	soc {
 		axi@d4200000 {
 			ap-sp@d4290000 {
@@ -197,6 +191,14 @@ audio-codec@1a {
 		compatible = "realtek,alc5631";
 		reg = <0x1a>;
 		status = "okay";
+
+		port {
+			rt5631_0: endpoint {
+				mclk-fs = <256>;
+				clocks = <&audio_clk 0>;
+				remote-endpoint = <&sspa0_0>;
+			};
+		};
 	};
 };
 
@@ -243,3 +245,30 @@ camera0_0: endpoint {
 		};
 	};
 };
+
+&asram {
+	status = "okay";
+};
+
+&adma0 {
+	status = "okay";
+};
+
+&audio_clk {
+	status = "okay";
+};
+
+&sspa0 {
+	status = "okay";
+	dmas = <&adma0 0>, <&adma0 1>;
+	dma-names = "tx", "rx";
+
+	sspa0_dai: port {
+		sspa0_0: endpoint {
+			remote-endpoint = <&rt5631_0>;
+			frame-master;
+			bitclock-master;
+			dai-format = "i2s";
+		};
+	};
+};
-- 
2.26.2


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

* [PATCH v2 10/13] ARM: dts: mmp2: Add the GPU
  2020-07-18 20:50 [PATCH v2 00/13] MMP DTS updates for 5.9 Lubomir Rintel
                   ` (8 preceding siblings ...)
  2020-07-18 20:50 ` [PATCH v2 09/13] ARM: dts: mmp2-olpc-xo-1-75: Enable audio support Lubomir Rintel
@ 2020-07-18 20:50 ` Lubomir Rintel
  2020-07-18 20:50 ` [PATCH v2 11/13] ARM: dts: mmp2-olpc-xo-1-75: Enable " Lubomir Rintel
                   ` (2 subsequent siblings)
  12 siblings, 0 replies; 15+ messages in thread
From: Lubomir Rintel @ 2020-07-18 20:50 UTC (permalink / raw)
  To: Arnd Bergmann, Olof Johansson
  Cc: SoC Team, Rob Herring, linux-arm-kernel, devicetree,
	linux-kernel, Lubomir Rintel

There's a GC860 2D + 3D core.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
 arch/arm/boot/dts/mmp2.dtsi | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/arch/arm/boot/dts/mmp2.dtsi b/arch/arm/boot/dts/mmp2.dtsi
index 31592acd3ef4f..445bdcd50b9ed 100644
--- a/arch/arm/boot/dts/mmp2.dtsi
+++ b/arch/arm/boot/dts/mmp2.dtsi
@@ -5,6 +5,7 @@
  */
 
 #include <dt-bindings/clock/marvell,mmp2.h>
+#include <dt-bindings/power/marvell,mmp2.h>
 
 / {
 	#address-cells = <1>;
@@ -38,6 +39,17 @@ axi@d4200000 {	/* AXI */
 			reg = <0xd4200000 0x00200000>;
 			ranges;
 
+			gpu: gpu@d420d000 {
+				compatible = "vivante,gc";
+				reg = <0xd420d000 0x4000>;
+				interrupts = <8>;
+				status = "disabled";
+				clocks = <&soc_clocks MMP2_CLK_GPU_3D>,
+					 <&soc_clocks MMP2_CLK_GPU_BUS>;
+				clock-names = "core", "bus";
+				power-domains = <&soc_clocks MMP2_POWER_DOMAIN_GPU>;
+			};
+
 			intc: interrupt-controller@d4282000 {
 				compatible = "mrvl,mmp2-intc";
 				interrupt-controller;
-- 
2.26.2


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

* [PATCH v2 11/13] ARM: dts: mmp2-olpc-xo-1-75: Enable the GPU
  2020-07-18 20:50 [PATCH v2 00/13] MMP DTS updates for 5.9 Lubomir Rintel
                   ` (9 preceding siblings ...)
  2020-07-18 20:50 ` [PATCH v2 10/13] ARM: dts: mmp2: Add the GPU Lubomir Rintel
@ 2020-07-18 20:50 ` Lubomir Rintel
  2020-07-18 20:50 ` [PATCH v2 12/13] ARM: dts: mmp3: Add " Lubomir Rintel
  2020-07-18 20:50 ` [PATCH v2 13/13] ARM: dts: mmp3-dell-ariel: Enable " Lubomir Rintel
  12 siblings, 0 replies; 15+ messages in thread
From: Lubomir Rintel @ 2020-07-18 20:50 UTC (permalink / raw)
  To: Arnd Bergmann, Olof Johansson
  Cc: SoC Team, Rob Herring, linux-arm-kernel, devicetree,
	linux-kernel, Lubomir Rintel

Enable the 3D + 2D (GC860) GPU core.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
 arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts b/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts
index 5f1da58550987..f1a41152e9dd7 100644
--- a/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts
+++ b/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts
@@ -272,3 +272,7 @@ sspa0_0: endpoint {
 		};
 	};
 };
+
+&gpu {
+	status = "okay";
+};
-- 
2.26.2


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

* [PATCH v2 12/13] ARM: dts: mmp3: Add the GPU
  2020-07-18 20:50 [PATCH v2 00/13] MMP DTS updates for 5.9 Lubomir Rintel
                   ` (10 preceding siblings ...)
  2020-07-18 20:50 ` [PATCH v2 11/13] ARM: dts: mmp2-olpc-xo-1-75: Enable " Lubomir Rintel
@ 2020-07-18 20:50 ` Lubomir Rintel
  2020-07-18 20:50 ` [PATCH v2 13/13] ARM: dts: mmp3-dell-ariel: Enable " Lubomir Rintel
  12 siblings, 0 replies; 15+ messages in thread
From: Lubomir Rintel @ 2020-07-18 20:50 UTC (permalink / raw)
  To: Arnd Bergmann, Olof Johansson
  Cc: SoC Team, Rob Herring, linux-arm-kernel, devicetree,
	linux-kernel, Lubomir Rintel

There's a GC2000 3D core accompanied by a GC300 2D core.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
 arch/arm/boot/dts/mmp3.dtsi | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/arch/arm/boot/dts/mmp3.dtsi b/arch/arm/boot/dts/mmp3.dtsi
index 57231d49d9386..cc4efd0efabd2 100644
--- a/arch/arm/boot/dts/mmp3.dtsi
+++ b/arch/arm/boot/dts/mmp3.dtsi
@@ -4,6 +4,7 @@
  */
 
 #include <dt-bindings/clock/marvell,mmp2.h>
+#include <dt-bindings/power/marvell,mmp2.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 
 / {
@@ -310,6 +311,30 @@ camera1: camera@d420a800 {
 				clock-output-names = "mclk";
 				status = "disabled";
 			};
+
+			gpu_3d: gpu@d420d000 {
+				compatible = "vivante,gc";
+				reg = <0xd420d000 0x2000>;
+				interrupt-parent = <&gpu_mux>;
+				interrupts = <0>;
+				status = "disabled";
+				clocks = <&soc_clocks MMP3_CLK_GPU_3D>,
+					 <&soc_clocks MMP3_CLK_GPU_BUS>;
+				clock-names = "core", "bus";
+				power-domains = <&soc_clocks MMP2_POWER_DOMAIN_GPU>;
+			};
+
+			gpu_2d: gpu@d420f000 {
+				compatible = "vivante,gc";
+				reg = <0xd420f000 0x2000>;
+				interrupt-parent = <&gpu_mux>;
+				interrupts = <2>;
+				status = "disabled";
+				clocks = <&soc_clocks MMP3_CLK_GPU_2D>,
+					 <&soc_clocks MMP3_CLK_GPU_BUS>;
+				clock-names = "core", "bus";
+				power-domains = <&soc_clocks MMP2_POWER_DOMAIN_GPU>;
+			};
 		};
 
 		apb@d4000000 {
-- 
2.26.2


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

* [PATCH v2 13/13] ARM: dts: mmp3-dell-ariel: Enable the GPU
  2020-07-18 20:50 [PATCH v2 00/13] MMP DTS updates for 5.9 Lubomir Rintel
                   ` (11 preceding siblings ...)
  2020-07-18 20:50 ` [PATCH v2 12/13] ARM: dts: mmp3: Add " Lubomir Rintel
@ 2020-07-18 20:50 ` Lubomir Rintel
  12 siblings, 0 replies; 15+ messages in thread
From: Lubomir Rintel @ 2020-07-18 20:50 UTC (permalink / raw)
  To: Arnd Bergmann, Olof Johansson
  Cc: SoC Team, Rob Herring, linux-arm-kernel, devicetree,
	linux-kernel, Lubomir Rintel

Enable the 2D (GC300) and the 3D (GC2000) GPUs cores.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>

---
Changes since v1:
- s/GC200/GC2000/ in patch description (pointed out by Pavel Machek)

 arch/arm/boot/dts/mmp3-dell-ariel.dts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm/boot/dts/mmp3-dell-ariel.dts b/arch/arm/boot/dts/mmp3-dell-ariel.dts
index b0ec14c421641..fe3b1cd695eeb 100644
--- a/arch/arm/boot/dts/mmp3-dell-ariel.dts
+++ b/arch/arm/boot/dts/mmp3-dell-ariel.dts
@@ -114,3 +114,11 @@ &ssp2 {
 	cs-gpios = <&gpio 56 GPIO_ACTIVE_LOW>;
 	status = "okay";
 };
+
+&gpu_2d {
+	status = "okay";
+};
+
+&gpu_3d {
+	status = "okay";
+};
-- 
2.26.2


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

* Re: [PATCH v2 02/13] ARM: dts: mmp2-olpc-xo-1-75: Delete #address-cells from ssp3
  2020-07-18 20:50 ` [PATCH v2 02/13] ARM: dts: mmp2-olpc-xo-1-75: Delete #address-cells from ssp3 Lubomir Rintel
@ 2020-11-10  3:19   ` Florian Fainelli
  0 siblings, 0 replies; 15+ messages in thread
From: Florian Fainelli @ 2020-11-10  3:19 UTC (permalink / raw)
  To: Lubomir Rintel, Arnd Bergmann, Olof Johansson, Rob Herring
  Cc: SoC Team, Rob Herring, linux-arm-kernel, devicetree, linux-kernel



On 7/18/2020 1:50 PM, Lubomir Rintel wrote:
> On the XO-1.75, this node represents a bus interface that operates in slave
> mode and thus is only able to accommodate a single subnode; no address
> cells are necessary.
> 
> The Documentation/devicetree/bindings/spi/spi-controller.yaml binding
> prefers that we drop the property instead of setting it to zero.
> 
> This fixes a DT validation error:
> 
>   arch/arm/boot/dts/mmp2-olpc-xo-1-75.dt.yaml: spi@d4037000:
>       { ... } is valid under each of {'required': ['spi-slave']},
>                                      {'required': ['#address-cells']}
> 
> We also need to drop #size-cells:
> 
>   arch/arm/boot/dts/mmp2-olpc-xo-1-75.dt.yaml: spi@d4037000:
>       '#address-cells' is a dependency of '#size-cells'
> 
> Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>

This patch causes the following warning to be issued when validating the
mmp2 DTS files against specific bindings:

arch/arm/boot/dts/mmp2.dtsi:472.23-480.6: Warning (spi_bus_bridge):
/soc/apb@d4000000/spi@d4037000: incorrect #address-cells for SPI bus
  also defined at arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts:225.7-237.3
arch/arm/boot/dts/mmp2.dtsi:472.23-480.6: Warning (spi_bus_bridge):
/soc/apb@d4000000/spi@d4037000: incorrect #size-cells for SPI bus
  also defined at arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts:225.7-237.3
arch/arm/boot/dts/mmp2-olpc-xo-1-75.dt.yaml: Warning (spi_bus_reg):
Failed prerequisite 'spi_bus_bridge'

Is there a fix that we can apply to silence this warning? Thanks!
-- 
Florian

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

end of thread, other threads:[~2020-11-10  3:19 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-18 20:50 [PATCH v2 00/13] MMP DTS updates for 5.9 Lubomir Rintel
2020-07-18 20:50 ` [PATCH v2 01/13] ARM: dts: mmp2-olpc-xo-1-75: Fix camera I2C node validation Lubomir Rintel
2020-07-18 20:50 ` [PATCH v2 02/13] ARM: dts: mmp2-olpc-xo-1-75: Delete #address-cells from ssp3 Lubomir Rintel
2020-11-10  3:19   ` Florian Fainelli
2020-07-18 20:50 ` [PATCH v2 03/13] ARM: dts: mmp2: Add #power-domain-cells to /clocks Lubomir Rintel
2020-07-18 20:50 ` [PATCH v2 04/13] ARM: dts: mmp2: Extend the MPMU reg range Lubomir Rintel
2020-07-18 20:50 ` [PATCH v2 05/13] ARM: dts: mmp2: Add Audio SRAM Lubomir Rintel
2020-07-18 20:50 ` [PATCH v2 06/13] ARM: dts: mmp2: Add DMA nodes Lubomir Rintel
2020-07-18 20:50 ` [PATCH v2 07/13] ARM: dts: mmp2: Add Audio Clock controller Lubomir Rintel
2020-07-18 20:50 ` [PATCH v2 08/13] ARM: dts: mmp2: Add SSPA nodes Lubomir Rintel
2020-07-18 20:50 ` [PATCH v2 09/13] ARM: dts: mmp2-olpc-xo-1-75: Enable audio support Lubomir Rintel
2020-07-18 20:50 ` [PATCH v2 10/13] ARM: dts: mmp2: Add the GPU Lubomir Rintel
2020-07-18 20:50 ` [PATCH v2 11/13] ARM: dts: mmp2-olpc-xo-1-75: Enable " Lubomir Rintel
2020-07-18 20:50 ` [PATCH v2 12/13] ARM: dts: mmp3: Add " Lubomir Rintel
2020-07-18 20:50 ` [PATCH v2 13/13] ARM: dts: mmp3-dell-ariel: Enable " Lubomir Rintel

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).