[PATCH 0/4] arm64: dts: ti: AM6 and J721e display dts changes

[PATCH 0/4] arm64: dts: ti: AM6 and J721e display dts changes

[Tomi Valkeinen]

Hi,

linux-next now contains binding changes for "k3-am65: mark dss as
dma-coherent".

Also everything to get DP working is included in -rc1, except the two
dts patches in this series. Note that DisplayPort connector binding is
still in discussion [1]. I don't expect changes there, but if you want
to wait until those patches get merged, you could just pick the two am6
patches.

 Tomi

[1] https://www.spinics.net/lists/dri-devel/msg275245.html

Tomi Valkeinen (4):
  arm64: dts: ti: k3-j721e-main: add DP & DP PHY
  arm64: dts: ti: k3-j721e-common-proc-board: add DP to j7 evm
  arm64: dts: ti: k3-am65: mark dss as dma-coherent
  arm64: dts: ti: am654-base-board: fix clock node name

 arch/arm64/boot/dts/ti/k3-am65-main.dtsi      |   2 +
 .../arm64/boot/dts/ti/k3-am654-base-board.dts |   2 +-
 .../dts/ti/k3-j721e-common-proc-board.dts     |  72 ++++++++++++
 arch/arm64/boot/dts/ti/k3-j721e-main.dtsi     | 104 ++++++++++++++++++
 4 files changed, 179 insertions(+), 1 deletion(-)

-- 
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

[PATCH 1/4] arm64: dts: ti: k3-j721e-main: add DP & DP PHY

[Tomi Valkeinen]

Add DT nodes for DisplayPort and DisplayPort PHY. The DP is Cadence MHDP
8546 and the PHY is a Cadence Torrent PHY with TI WIZ wrapper.

A slight irregularity in the bindings is the DPTX PHY register block,
which is in the MHDP IP, but is needed and mapped by the PHY.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
 arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 104 ++++++++++++++++++++++
 1 file changed, 104 insertions(+)

diff --git a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
index e2a96b2c423c..e8384bc788d1 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
@@ -609,6 +609,82 @@ serdes3: serdes@5030000 {
 		};
 	};
 
+	serdes_wiz4: wiz@5050000 {
+		compatible = "ti,j721e-wiz-10g";
+		#address-cells = <1>;
+		#size-cells = <1>;
+		power-domains = <&k3_pds 297 TI_SCI_PD_EXCLUSIVE>;
+		clocks = <&k3_clks 297 1>, <&k3_clks 297 9>, <&dummy_cmn_refclk>;
+		clock-names = "fck", "core_ref_clk", "ext_ref_clk";
+		assigned-clocks = <&k3_clks 297 9>;
+		assigned-clock-parents = <&k3_clks 297 10>;
+		assigned-clock-rates = <19200000>;
+		num-lanes = <4>;
+		#reset-cells = <1>;
+		ranges = <0x5050000 0x0 0x5050000 0x10000>,
+			<0xa030a00 0x0 0xa030a00 0x40>;
+
+		wiz4_pll0_refclk: pll0-refclk {
+			clocks = <&k3_clks 297 9>, <&dummy_cmn_refclk>;
+			clock-output-names = "wiz4_pll0_refclk";
+			#clock-cells = <0>;
+			assigned-clocks = <&wiz4_pll0_refclk>;
+			assigned-clock-parents = <&k3_clks 297 9>;
+		};
+
+		wiz4_pll1_refclk: pll1-refclk {
+			clocks = <&k3_clks 297 9>, <&dummy_cmn_refclk>;
+			clock-output-names = "wiz4_pll1_refclk";
+			#clock-cells = <0>;
+			assigned-clocks = <&wiz4_pll1_refclk>;
+			assigned-clock-parents = <&k3_clks 297 9>;
+		};
+
+		wiz4_refclk_dig: refclk-dig {
+			clocks = <&k3_clks 297 9>, <&dummy_cmn_refclk>;
+			clock-output-names = "wiz4_refclk_dig";
+			#clock-cells = <0>;
+			assigned-clocks = <&wiz4_refclk_dig>;
+			assigned-clock-parents = <&k3_clks 297 9>;
+		};
+
+		wiz4_cmn_refclk_dig_div: cmn-refclk-dig-div {
+			clocks = <&wiz4_refclk_dig>;
+			#clock-cells = <0>;
+		};
+
+		wiz4_cmn_refclk1_dig_div: cmn-refclk1-dig-div {
+			clocks = <&wiz4_pll1_refclk>;
+			#clock-cells = <0>;
+		};
+
+		serdes4: serdes@5050000 {
+			/*
+			 * Note: we also map DPTX PHY registers as the Torrent
+			 * needs to manage those.
+			 */
+			compatible = "ti,j721e-serdes-10g";
+			reg = <0x5050000 0x10000>,
+			      <0xa030a00 0x40>; /* DPTX PHY */
+			reg-names = "torrent_phy", "dptx_phy";
+
+			resets = <&serdes_wiz4 0>;
+			reset-names = "torrent_reset";
+			clocks = <&wiz4_pll0_refclk>;
+			clock-names = "refclk";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			torrent_phy_dp: phy@0 {
+				reg = <0>;
+				resets = <&serdes_wiz4 1>;
+				cdns,phy-type = <PHY_TYPE_DP>;
+				cdns,num-lanes = <4>;
+				cdns,max-bit-rate = <5400>;
+				#phy-cells = <0>;
+			};
+		};
+	};
+
 	pcie0_rc: pcie@2900000 {
 		compatible = "ti,j721e-pcie-host";
 		reg = <0x00 0x02900000 0x00 0x1000>,
@@ -1278,6 +1354,34 @@ ufs@4e84000 {
 		};
 	};
 
+	mhdp: dp-bridge@a000000 {
+		compatible = "ti,j721e-mhdp8546";
+		/*
+		 * Note: we do not map DPTX PHY area, as that is handled by
+		 * the PHY driver.
+		 */
+		reg = <0x0 0xa000000 0x0 0x30a00>, /* DSS_EDP0_V2A_CORE_VP_REGS_APB */
+		      <0x0 0x4f40000 0x0 0x20>;    /* DSS_EDP0_INTG_CFG_VP */
+		reg-names = "mhdptx", "j721e-intg";
+
+		status = "disabled";
+
+		clocks = <&k3_clks 151 36>;
+
+		phys = <&torrent_phy_dp>;
+		phy-names = "dpphy";
+
+		interrupt-parent = <&gic500>;
+		interrupts = <GIC_SPI 614 IRQ_TYPE_LEVEL_HIGH>;
+
+		power-domains = <&k3_pds 151 TI_SCI_PD_EXCLUSIVE>;
+
+		dp0_ports: ports {
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+	};
+
 	dss: dss@04a00000 {
 		compatible = "ti,j721e-dss";
 		reg =
-- 
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

[PATCH 2/4] arm64: dts: ti: k3-j721e-common-proc-board: add DP to j7 evm

[Tomi Valkeinen]

Add DisplayPort support.

The DP PWR is currently set as 'regulator-always-on', as we don't have a
dp-connector driver that would handle the power. When we do get such a
driver, the 'regulator-always-on' can be dropped.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
 .../dts/ti/k3-j721e-common-proc-board.dts     | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
index 52e121155563..5a36d65755ee 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
@@ -83,6 +83,31 @@ sound0: sound@0 {
 			      "cpb-codec-scki",
 			      "cpb-codec-scki-48000", "cpb-codec-scki-44100";
 	};
+
+	dp_pwr_3v3: fixedregulator-dp-prw {
+		compatible = "regulator-fixed";
+		regulator-name = "dp-pwr";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		gpio = <&exp4 0 0>;	/* P0 - DP0_PWR_SW_EN */
+		enable-active-high;
+
+		/* Always on for now, until dp-connector driver can handle this */
+		regulator-always-on;
+	};
+
+	dp0: connector {
+		compatible = "dp-connector";
+		label = "DP0";
+		type = "full-size";
+		dp-pwr-supply = <&dp_pwr_3v3>;
+
+		port {
+			dp_connector_in: endpoint {
+				remote-endpoint = <&dp0_out>;
+			};
+		};
+	};
 };
 
 &main_pmx0 {
@@ -119,6 +144,12 @@ J721E_IOPAD(0x214, PIN_OUTPUT, 4) /* (V4) MCAN1_TX.USB1_DRVVBUS */
 		>;
 	};
 
+	dp0_pins_default: dp0_pins_default {
+		pinctrl-single,pins = <
+			J721E_IOPAD(0x1c4, PIN_INPUT, 5) /* SPI0_CS1.DP0_HPD */
+		>;
+	};
+
 	main_i2c1_exp4_pins_default: main-i2c1-exp4-pins-default {
 		pinctrl-single,pins = <
 			J721E_IOPAD(0x230, PIN_INPUT, 7) /* (U2) ECAP0_IN_APWM_OUT.GPIO1_11 */
@@ -538,6 +569,47 @@ &dss {
 				 <&k3_clks 152 6>,	/* PLL19_HSDIV0 */
 				 <&k3_clks 152 11>,	/* PLL18_HSDIV0 */
 				 <&k3_clks 152 18>;	/* PLL23_HSDIV0 */
+
+	status = "ok";
+};
+
+&dss_ports {
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	port@0 {
+		reg = <0>;
+
+		dpi0_out: endpoint {
+			remote-endpoint = <&dp0_in>;
+		};
+	};
+};
+
+&mhdp {
+	status = "ok";
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&dp0_pins_default>;
+};
+
+&dp0_ports {
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	port@0 {
+		reg = <0>;
+		dp0_in: endpoint {
+			remote-endpoint = <&dpi0_out>;
+		};
+	};
+
+	port@4 {
+		reg = <4>;
+		dp0_out: endpoint {
+			remote-endpoint = <&dp_connector_in>;
+		};
+	};
 };
 
 &mcasp10 {
-- 
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

[PATCH 3/4] arm64: dts: ti: k3-am65: mark dss as dma-coherent

[Tomi Valkeinen]

DSS is IO coherent on AM65, so we can mark it as such with
'dma-coherent' property in the DT file.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
 arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index 533525229a8d..a0b4a421026f 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -867,6 +867,8 @@ dss: dss@04a00000 {
 
 		status = "disabled";
 
+		dma-coherent;
+
 		dss_ports: ports {
 			#address-cells = <1>;
 			#size-cells = <0>;
-- 
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

[PATCH 4/4] arm64: dts: ti: am654-base-board: fix clock node name

[Tomi Valkeinen]

The fixed clock for OV5640 is named 'clock' which is a very generic name
and easily leads to conflicts. I encountered this with a similarly named
fixed-clock node in k3-am654-evm-tc358876.dtso, which then overrode the
OV5640 fixed clock, causing OV5640 not to work when tc358876 overlay had
been loaded.

Rename the node to 'fixed-clock-ov5640'.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
 arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
index d12dd89f3405..6801dbddeac5 100644
--- a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
@@ -55,7 +55,7 @@ sw6 {
 		};
 	};
 
-	clk_ov5640_fixed: clock {
+	clk_ov5640_fixed: fixed-clock-ov5640 {
 		compatible = "fixed-clock";
 		#clock-cells = <0>;
 		clock-frequency = <24000000>;
-- 
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

Re: [PATCH 2/4] arm64: dts: ti: k3-j721e-common-proc-board: add DP to j7 evm

[Nishanth Menon]

On 12:41-20201027, Tomi Valkeinen wrote:
[...]

> diff --git a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
> index 52e121155563..5a36d65755ee 100644
> --- a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
> +++ b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
> @@ -83,6 +83,31 @@ sound0: sound@0 {
>  			      "cpb-codec-scki",
>  			      "cpb-codec-scki-48000", "cpb-codec-scki-44100";
>  	};
> +
> +	dp_pwr_3v3: fixedregulator-dp-prw {
> +		compatible = "regulator-fixed";
> +		regulator-name = "dp-pwr";
> +		regulator-min-microvolt = <3300000>;
> +		regulator-max-microvolt = <3300000>;
> +		gpio = <&exp4 0 0>;	/* P0 - DP0_PWR_SW_EN */
> +		enable-active-high;
> +
> +		/* Always on for now, until dp-connector driver can handle this */
> +		regulator-always-on;
> +	};
> +
> +	dp0: connector {
> +		compatible = "dp-connector";

This is not documented? I see the following on checkpatch:
+WARNING: DT compatible string "dp-connector" appears un-documented -- check ./Documentation/devicetree/bindings/
+#42: FILE: arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts:100:
++              compatible = "dp-connector";
+      mechanically convert to the typical style using --fix or --fix-inplace.
+      them to the maintainer, see CHECKPATCH in MAINTAINERS.


> +		label = "DP0";
> +		type = "full-size";
> +		dp-pwr-supply = <&dp_pwr_3v3>;
> +
> +		port {
> +			dp_connector_in: endpoint {
> +				remote-endpoint = <&dp0_out>;
> +			};
> +		};
> +	};
>  };
>
>  &main_pmx0 {
> @@ -119,6 +144,12 @@ J721E_IOPAD(0x214, PIN_OUTPUT, 4) /* (V4) MCAN1_TX.USB1_DRVVBUS */
>  		>;
>  	};
>
> +	dp0_pins_default: dp0_pins_default {

please don't use _ in node names dp0-pins-default perhaps?

[...]
-- 
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D

Re: [PATCH 3/4] arm64: dts: ti: k3-am65: mark dss as dma-coherent

[Nishanth Menon]

On 12:41-20201027, Tomi Valkeinen wrote:
> DSS is IO coherent on AM65, so we can mark it as such with
> 'dma-coherent' property in the DT file.
> 
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
> ---
>  arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> index 533525229a8d..a0b4a421026f 100644
> --- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> @@ -867,6 +867,8 @@ dss: dss@04a00000 {
>  
>  		status = "disabled";
>  
> +		dma-coherent;
> +
>  		dss_ports: ports {
>  			#address-cells = <1>;
>  			#size-cells = <0>;
> -- 
> Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
> Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
> 

Does it need to be part of this series?

I'd appreciate an additional reviewed-by from folks..
-- 
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D

Re: [PATCH 4/4] arm64: dts: ti: am654-base-board: fix clock node name

[Nishanth Menon]

On 12:41-20201027, Tomi Valkeinen wrote:
> The fixed clock for OV5640 is named 'clock' which is a very generic name
> and easily leads to conflicts. I encountered this with a similarly named
> fixed-clock node in k3-am654-evm-tc358876.dtso, which then overrode the
> OV5640 fixed clock, causing OV5640 not to work when tc358876 overlay had
> been loaded.
> 
> Rename the node to 'fixed-clock-ov5640'.
> 
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
> ---
>  arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
> index d12dd89f3405..6801dbddeac5 100644
> --- a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
> +++ b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
> @@ -55,7 +55,7 @@ sw6 {
>  		};
>  	};
>  
> -	clk_ov5640_fixed: clock {
> +	clk_ov5640_fixed: fixed-clock-ov5640 {
>  		compatible = "fixed-clock";
>  		#clock-cells = <0>;
>  		clock-frequency = <24000000>;
> -- 
> Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
> Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
> 

I think you could post this independently as well.

https://github.com/devicetree-org/devicetree-specification/blob/v0.3/source/devicetree-basics.rst#generic-names-recommendation

There is a strong desire to use standard node names and
clock is recommended. even though there are tons of fixed-clock
compatible clocks in the kernel today, as of v5.10-rc1:

$ git grep fixed-clock- arch/arm64/boot/dts/
$ git grep fixed-clock- arch/arm/boot/dts/

As a node name is not used. Do you want to see how other
platforms are trying to resolve similar issues?

-- 
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D

Re: [PATCH 1/4] arm64: dts: ti: k3-j721e-main: add DP & DP PHY

[Nishanth Menon]

On 12:41-20201027, Tomi Valkeinen wrote:
> Add DT nodes for DisplayPort and DisplayPort PHY. The DP is Cadence MHDP
> 8546 and the PHY is a Cadence Torrent PHY with TI WIZ wrapper.
> 
> A slight irregularity in the bindings is the DPTX PHY register block,
> which is in the MHDP IP, but is needed and mapped by the PHY.
> 
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
> ---
>  arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 104 ++++++++++++++++++++++
>  1 file changed, 104 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
> index e2a96b2c423c..e8384bc788d1 100644
> --- a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
> @@ -609,6 +609,82 @@ serdes3: serdes@5030000 {
>  		};
>  	};
>  
> +	serdes_wiz4: wiz@5050000 {


Kishon: care to review and ack?

> +		compatible = "ti,j721e-wiz-10g";
> +		#address-cells = <1>;
> +		#size-cells = <1>;
> +		power-domains = <&k3_pds 297 TI_SCI_PD_EXCLUSIVE>;
> +		clocks = <&k3_clks 297 1>, <&k3_clks 297 9>, <&dummy_cmn_refclk>;
> +		clock-names = "fck", "core_ref_clk", "ext_ref_clk";
> +		assigned-clocks = <&k3_clks 297 9>;
> +		assigned-clock-parents = <&k3_clks 297 10>;
> +		assigned-clock-rates = <19200000>;
> +		num-lanes = <4>;
> +		#reset-cells = <1>;
> +		ranges = <0x5050000 0x0 0x5050000 0x10000>,
> +			<0xa030a00 0x0 0xa030a00 0x40>;
> +
> +		wiz4_pll0_refclk: pll0-refclk {
> +			clocks = <&k3_clks 297 9>, <&dummy_cmn_refclk>;
> +			clock-output-names = "wiz4_pll0_refclk";
> +			#clock-cells = <0>;
> +			assigned-clocks = <&wiz4_pll0_refclk>;
> +			assigned-clock-parents = <&k3_clks 297 9>;
> +		};
> +
> +		wiz4_pll1_refclk: pll1-refclk {
> +			clocks = <&k3_clks 297 9>, <&dummy_cmn_refclk>;
> +			clock-output-names = "wiz4_pll1_refclk";
> +			#clock-cells = <0>;
> +			assigned-clocks = <&wiz4_pll1_refclk>;
> +			assigned-clock-parents = <&k3_clks 297 9>;
> +		};
> +
> +		wiz4_refclk_dig: refclk-dig {
> +			clocks = <&k3_clks 297 9>, <&dummy_cmn_refclk>;
> +			clock-output-names = "wiz4_refclk_dig";
> +			#clock-cells = <0>;
> +			assigned-clocks = <&wiz4_refclk_dig>;
> +			assigned-clock-parents = <&k3_clks 297 9>;
> +		};
> +
> +		wiz4_cmn_refclk_dig_div: cmn-refclk-dig-div {
> +			clocks = <&wiz4_refclk_dig>;
> +			#clock-cells = <0>;
> +		};
> +
> +		wiz4_cmn_refclk1_dig_div: cmn-refclk1-dig-div {
> +			clocks = <&wiz4_pll1_refclk>;
> +			#clock-cells = <0>;
> +		};
> +
> +		serdes4: serdes@5050000 {
> +			/*
> +			 * Note: we also map DPTX PHY registers as the Torrent
> +			 * needs to manage those.
> +			 */
> +			compatible = "ti,j721e-serdes-10g";
> +			reg = <0x5050000 0x10000>,
> +			      <0xa030a00 0x40>; /* DPTX PHY */
> +			reg-names = "torrent_phy", "dptx_phy";
> +
> +			resets = <&serdes_wiz4 0>;
> +			reset-names = "torrent_reset";
> +			clocks = <&wiz4_pll0_refclk>;
> +			clock-names = "refclk";
> +			#address-cells = <1>;
> +			#size-cells = <0>;
> +			torrent_phy_dp: phy@0 {
> +				reg = <0>;
> +				resets = <&serdes_wiz4 1>;
> +				cdns,phy-type = <PHY_TYPE_DP>;
> +				cdns,num-lanes = <4>;
> +				cdns,max-bit-rate = <5400>;
> +				#phy-cells = <0>;
> +			};
> +		};
> +	};
> +
>  	pcie0_rc: pcie@2900000 {
>  		compatible = "ti,j721e-pcie-host";
>  		reg = <0x00 0x02900000 0x00 0x1000>,
> @@ -1278,6 +1354,34 @@ ufs@4e84000 {
>  		};
>  	};
>  
> +	mhdp: dp-bridge@a000000 {
> +		compatible = "ti,j721e-mhdp8546";
> +		/*
> +		 * Note: we do not map DPTX PHY area, as that is handled by
> +		 * the PHY driver.
> +		 */
> +		reg = <0x0 0xa000000 0x0 0x30a00>, /* DSS_EDP0_V2A_CORE_VP_REGS_APB */
> +		      <0x0 0x4f40000 0x0 0x20>;    /* DSS_EDP0_INTG_CFG_VP */
> +		reg-names = "mhdptx", "j721e-intg";
> +
> +		status = "disabled";
> +
> +		clocks = <&k3_clks 151 36>;
> +
> +		phys = <&torrent_phy_dp>;
> +		phy-names = "dpphy";
> +
> +		interrupt-parent = <&gic500>;
> +		interrupts = <GIC_SPI 614 IRQ_TYPE_LEVEL_HIGH>;
> +
> +		power-domains = <&k3_pds 151 TI_SCI_PD_EXCLUSIVE>;
> +
> +		dp0_ports: ports {
> +			#address-cells = <1>;
> +			#size-cells = <0>;
> +		};
> +	};
> +
>  	dss: dss@04a00000 {
>  		compatible = "ti,j721e-dss";
>  		reg =
> -- 
> Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
> Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
> 

-- 
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D

Re: [PATCH 2/4] arm64: dts: ti: k3-j721e-common-proc-board: add DP to j7 evm

[Tomi Valkeinen]

On 27/10/2020 14:20, Nishanth Menon wrote:
> On 12:41-20201027, Tomi Valkeinen wrote:
> [...]
> 
>> diff --git a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
>> index 52e121155563..5a36d65755ee 100644
>> --- a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
>> +++ b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
>> @@ -83,6 +83,31 @@ sound0: sound@0 {
>>  			      "cpb-codec-scki",
>>  			      "cpb-codec-scki-48000", "cpb-codec-scki-44100";
>>  	};
>> +
>> +	dp_pwr_3v3: fixedregulator-dp-prw {
>> +		compatible = "regulator-fixed";
>> +		regulator-name = "dp-pwr";
>> +		regulator-min-microvolt = <3300000>;
>> +		regulator-max-microvolt = <3300000>;
>> +		gpio = <&exp4 0 0>;	/* P0 - DP0_PWR_SW_EN */
>> +		enable-active-high;
>> +
>> +		/* Always on for now, until dp-connector driver can handle this */
>> +		regulator-always-on;
>> +	};
>> +
>> +	dp0: connector {
>> +		compatible = "dp-connector";
> 
> This is not documented? I see the following on checkpatch:
> +WARNING: DT compatible string "dp-connector" appears un-documented -- check ./Documentation/devicetree/bindings/
> +#42: FILE: arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts:100:
> ++              compatible = "dp-connector";
> +      mechanically convert to the typical style using --fix or --fix-inplace.
> +      them to the maintainer, see CHECKPATCH in MAINTAINERS.

Yes, I mentioned this in the cover letter.

> 
>> +		label = "DP0";
>> +		type = "full-size";
>> +		dp-pwr-supply = <&dp_pwr_3v3>;
>> +
>> +		port {
>> +			dp_connector_in: endpoint {
>> +				remote-endpoint = <&dp0_out>;
>> +			};
>> +		};
>> +	};
>>  };
>>
>>  &main_pmx0 {
>> @@ -119,6 +144,12 @@ J721E_IOPAD(0x214, PIN_OUTPUT, 4) /* (V4) MCAN1_TX.USB1_DRVVBUS */
>>  		>;
>>  	};
>>
>> +	dp0_pins_default: dp0_pins_default {
> 
> please don't use _ in node names dp0-pins-default perhaps?

Ok.

 Tomi

-- 
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

Re: [PATCH 3/4] arm64: dts: ti: k3-am65: mark dss as dma-coherent

[Tomi Valkeinen]

On 27/10/2020 14:34, Nishanth Menon wrote:
> On 12:41-20201027, Tomi Valkeinen wrote:
>> DSS is IO coherent on AM65, so we can mark it as such with
>> 'dma-coherent' property in the DT file.
>>
>> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
>> ---
>>  arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
>> index 533525229a8d..a0b4a421026f 100644
>> --- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
>> +++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
>> @@ -867,6 +867,8 @@ dss: dss@04a00000 {
>>  
>>  		status = "disabled";
>>  
>> +		dma-coherent;
>> +
>>  		dss_ports: ports {
>>  			#address-cells = <1>;
>>  			#size-cells = <0>;
>> -- 
>> Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
>> Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
>>
> 
> Does it need to be part of this series?

No. The two DP patches should go together, but the am6 ones can be applied independently.

 Tomi

-- 
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

Re: [PATCH 4/4] arm64: dts: ti: am654-base-board: fix clock node name

[Tomi Valkeinen]

On 27/10/2020 14:39, Nishanth Menon wrote:
> On 12:41-20201027, Tomi Valkeinen wrote:
>> The fixed clock for OV5640 is named 'clock' which is a very generic name
>> and easily leads to conflicts. I encountered this with a similarly named
>> fixed-clock node in k3-am654-evm-tc358876.dtso, which then overrode the
>> OV5640 fixed clock, causing OV5640 not to work when tc358876 overlay had
>> been loaded.
>>
>> Rename the node to 'fixed-clock-ov5640'.
>>
>> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
>> ---
>>  arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
>> index d12dd89f3405..6801dbddeac5 100644
>> --- a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
>> +++ b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
>> @@ -55,7 +55,7 @@ sw6 {
>>  		};
>>  	};
>>  
>> -	clk_ov5640_fixed: clock {
>> +	clk_ov5640_fixed: fixed-clock-ov5640 {
>>  		compatible = "fixed-clock";
>>  		#clock-cells = <0>;
>>  		clock-frequency = <24000000>;
>> -- 
>> Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
>> Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
>>
> 
> I think you could post this independently as well.
> 
> https://github.com/devicetree-org/devicetree-specification/blob/v0.3/source/devicetree-basics.rst#generic-names-recommendation
> 
> There is a strong desire to use standard node names and
> clock is recommended. even though there are tons of fixed-clock
> compatible clocks in the kernel today, as of v5.10-rc1:
> 
> $ git grep fixed-clock- arch/arm64/boot/dts/
> $ git grep fixed-clock- arch/arm/boot/dts/
> 
> As a node name is not used. Do you want to see how other
> platforms are trying to resolve similar issues?

There doesn't seem to be a standard:

$ git grep -B2 fixed-clock arch/arm/boot/dts/

The node names are just about everything.

 Tomi

-- 
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

Re: [PATCH 2/4] arm64: dts: ti: k3-j721e-common-proc-board: add DP to j7 evm

[Nishanth Menon]

On 16:44-20201027, Tomi Valkeinen wrote:
> On 27/10/2020 14:20, Nishanth Menon wrote:
> > On 12:41-20201027, Tomi Valkeinen wrote:
> > [...]
> > 
> >> diff --git a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
> >> index 52e121155563..5a36d65755ee 100644
> >> --- a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
> >> +++ b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
> >> @@ -83,6 +83,31 @@ sound0: sound@0 {
> >>  			      "cpb-codec-scki",
> >>  			      "cpb-codec-scki-48000", "cpb-codec-scki-44100";
> >>  	};
> >> +
> >> +	dp_pwr_3v3: fixedregulator-dp-prw {
> >> +		compatible = "regulator-fixed";
> >> +		regulator-name = "dp-pwr";
> >> +		regulator-min-microvolt = <3300000>;
> >> +		regulator-max-microvolt = <3300000>;
> >> +		gpio = <&exp4 0 0>;	/* P0 - DP0_PWR_SW_EN */
> >> +		enable-active-high;
> >> +
> >> +		/* Always on for now, until dp-connector driver can handle this */
> >> +		regulator-always-on;
> >> +	};
> >> +
> >> +	dp0: connector {
> >> +		compatible = "dp-connector";
> > 
> > This is not documented? I see the following on checkpatch:
> > +WARNING: DT compatible string "dp-connector" appears un-documented -- check ./Documentation/devicetree/bindings/
> > +#42: FILE: arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts:100:
> > ++              compatible = "dp-connector";
> > +      mechanically convert to the typical style using --fix or --fix-inplace.
> > +      them to the maintainer, see CHECKPATCH in MAINTAINERS.
> 
> Yes, I mentioned this in the cover letter.
> 
Aaah thanks. We may need to look at reposting this patch after it hits mainline.


-- 
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D

Re: [PATCH 3/4] arm64: dts: ti: k3-am65: mark dss as dma-coherent

[Nishanth Menon]

On 16:45-20201027, Tomi Valkeinen wrote:
> On 27/10/2020 14:34, Nishanth Menon wrote:
> > On 12:41-20201027, Tomi Valkeinen wrote:
> >> DSS is IO coherent on AM65, so we can mark it as such with
> >> 'dma-coherent' property in the DT file.
> >>
> >> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
> >> ---
> >>  arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 2 ++
> >>  1 file changed, 2 insertions(+)
> >>
> >> diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> >> index 533525229a8d..a0b4a421026f 100644
> >> --- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> >> +++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> >> @@ -867,6 +867,8 @@ dss: dss@04a00000 {
> >>  
> >>  		status = "disabled";
> >>  
> >> +		dma-coherent;
> >> +
> >>  		dss_ports: ports {
> >>  			#address-cells = <1>;
> >>  			#size-cells = <0>;
> >> -- 
> >> Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
> >> Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
> >>
> > 
> > Does it need to be part of this series?
> 
> No. The two DP patches should go together, but the am6 ones can be applied independently.


Please split accordingly.
-- 
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D

Re: [PATCH 4/4] arm64: dts: ti: am654-base-board: fix clock node name

[Nishanth Menon]

On 16:55-20201027, Tomi Valkeinen wrote:
> On 27/10/2020 14:39, Nishanth Menon wrote:
> > On 12:41-20201027, Tomi Valkeinen wrote:
> >> The fixed clock for OV5640 is named 'clock' which is a very generic name
> >> and easily leads to conflicts. I encountered this with a similarly named
> >> fixed-clock node in k3-am654-evm-tc358876.dtso, which then overrode the
> >> OV5640 fixed clock, causing OV5640 not to work when tc358876 overlay had
> >> been loaded.
> >>
> >> Rename the node to 'fixed-clock-ov5640'.
> >>
> >> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
> >> ---
> >>  arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 2 +-
> >>  1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
> >> index d12dd89f3405..6801dbddeac5 100644
> >> --- a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
> >> +++ b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
> >> @@ -55,7 +55,7 @@ sw6 {
> >>  		};
> >>  	};
> >>  
> >> -	clk_ov5640_fixed: clock {
> >> +	clk_ov5640_fixed: fixed-clock-ov5640 {
> >>  		compatible = "fixed-clock";
> >>  		#clock-cells = <0>;
> >>  		clock-frequency = <24000000>;
> > 
> > I think you could post this independently as well.
> > 
> > https://github.com/devicetree-org/devicetree-specification/blob/v0.3/source/devicetree-basics.rst#generic-names-recommendation
> > 
> > There is a strong desire to use standard node names and
> > clock is recommended. even though there are tons of fixed-clock
> > compatible clocks in the kernel today, as of v5.10-rc1:
> > 
> > $ git grep fixed-clock- arch/arm64/boot/dts/
> > $ git grep fixed-clock- arch/arm/boot/dts/
> > 
> > As a node name is not used. Do you want to see how other
> > platforms are trying to resolve similar issues?
> 
> There doesn't seem to be a standard:
> 
> $ git grep -B2 fixed-clock arch/arm/boot/dts/
> 
> The node names are just about everything.

Yeah - I just dont want us top be the one to go create yet another
variant.

You could make the node name stricter by adding something like the
following to the yaml:
Documentation/devicetree/bindings/clock/fixed-clock.yaml

I dont see anything explicit here:
https://github.com/devicetree-org/dt-schema/blob/master/schemas/clock/clock.yaml

properties:
  nodename:
    pattern: "^(clock)(@[0-9a-f]+|-[0-9a-f]+)?$"

Adding Mike and Stephen for thoughts..

-- 
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D