DSS: Add support for DisplayPort
Subsystems (2)
v3 cover DSS: Add support for DisplayPort
The following series of patches enables DisplayPort on j721e-evm
Tomi Valkeinen (2):
arm64: dts: ti: k3-j721e-main: add DP & DP PHY
arm64: dts: ti: k3-j721e-common-proc-board: add DP to j7 evm
v2:
- use phandle with a parameter to refer clocks insted of sub nodes in serdes_wiz node
- move phy link node to board DTS file
v3:
- Fix the regulator node name as per the DT spec
- Use Macro for GPIO type
kernel patch verify report:
https://gist.githubusercontent.com/ravi-rahul/a982fef3fae03ec0dbdd5cb475a4cb25/raw/c8230370746e9878daf9527c3aa9d82eed7aa33c/report-kernel-patch-verify.txt
.../dts/ti/k3-j721e-common-proc-board.dts | 78 ++++++++++++++++++- arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 65 ++++++++++++++++ 2 files changed, 139 insertions(+), 4 deletions(-)
Signature · 1 line
2.17.1
PATCH v3 1/2 arm64: dts: ti: k3-j721e-main: add DP & DP PHY
From: Tomi Valkeinen <[email protected]>
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.
--- arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 65 +++++++++++++++++++++++ 1 file changed, 65 insertions(+)
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi +65 -0
@@ -5,6 +5,7 @@ * Copyright (C) 2016-2020 Texas Instruments Incorporated - https://www.ti.com/ */ #include <dt-bindings/phy/phy.h> +#include <dt-bindings/phy/phy-ti.h> #include <dt-bindings/mux/mux.h> #include <dt-bindings/mux/ti-serdes.h>
@@ -789,6 +790,47 @@ #size-cells = <2>; }; + serdes_wiz4: wiz@5050000 { + compatible = "ti,am64-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>, <&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>; + #clock-cells = <1>; + ranges = <0x5050000 0x0 0x5050000 0x10000>, + <0xa030a00 0x0 0xa030a00 0x40>; + + 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 = <&serdes_wiz4 TI_WIZ_PLL0_REFCLK>; + clock-names = "refclk"; + assigned-clocks = <&serdes_wiz4 TI_WIZ_PLL0_REFCLK>, + <&serdes_wiz4 TI_WIZ_PLL1_REFCLK>, + <&serdes_wiz4 TI_WIZ_REFCLK_DIG>; + assigned-clock-parents = <&k3_clks 297 9>, + <&k3_clks 297 9>, + <&k3_clks 297 9>; + #address-cells = <1>; + #size-cells = <0>; + }; + }; + main_uart0: serial@2800000 { compatible = "ti,j721e-uart", "ti,am654-uart"; reg = <0x00 0x02800000 0x00 0x100>;
@@ -1267,6 +1309,29 @@ }; }; + 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"; + + clocks = <&k3_clks 151 36>; + + 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@4a00000 { compatible = "ti,j721e-dss"; reg =
Signature · 1 line
2.17.1
Vignesh Raghavendra
maintainerRe: [PATCH v3 1/2] arm64: dts: ti: k3-j721e-main: add DP & DP PHY
Quoted 35 lines · Rahul T R
From: Tomi Valkeinen <[email protected]>
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 <[email protected]>Signed-off-by Rahul T R <[email protected]>--- arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 65 +++++++++++++++++++++++ 1 file changed, 65 insertions(+)arch/arm64/boot/dts/ti/k3-j721e-main.dtsi +6
-0@@ -5,6 +5,7 @@ * Copyright (C) 2016-2020 Texas Instruments Incorporated - https://www.ti.com/ */ #include <dt-bindings/phy/phy.h> +#include <dt-bindings/phy/phy-ti.h> #include <dt-bindings/mux/mux.h> #include <dt-bindings/mux/ti-serdes.h>@@ -789,6 +790,47 @@ #size-cells = <2>; }; + serdes_wiz4: wiz@5050000 { + compatible = "ti,am64-wiz-10g"; + #address-cells = <1>; + #size-cells = <1>; + power-domains = <&k3_pds 297 TI_SCI_PD_EXCLUSIVE>;
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi line 807
Quoted 10 lines
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi +10
-0+ clocks = <&k3_clks 297 1>, <&k3_clks 297 9>, <&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>; + #clock-cells = <1>; + ranges = <0x5050000 0x0 0x5050000 0x10000>, + <0xa030a00 0x0 0xa030a00 0x40>;
Add leading 0s to align to 8 digit value like rest of the file:
ranges = <0x05050000 0x00 0x05050000 0x10000>, <0x0a030a00 0x00 0x0a030a00 0x40>;
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi line 816
Quoted 9 lines
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi +9
-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 */
Same here.
Quoted 22 lines
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi +17
-0+ reg-names = "torrent_phy", "dptx_phy"; + + resets = <&serdes_wiz4 0>; + reset-names = "torrent_reset"; + clocks = <&serdes_wiz4 TI_WIZ_PLL0_REFCLK>; + clock-names = "refclk"; + assigned-clocks = <&serdes_wiz4 TI_WIZ_PLL0_REFCLK>, + <&serdes_wiz4 TI_WIZ_PLL1_REFCLK>, + <&serdes_wiz4 TI_WIZ_REFCLK_DIG>; + assigned-clock-parents = <&k3_clks 297 9>, + <&k3_clks 297 9>, + <&k3_clks 297 9>; + #address-cells = <1>; + #size-cells = <0>; + }; + }; + main_uart0: serial@2800000 { compatible = "ti,j721e-uart", "ti,am654-uart"; reg = <0x00 0x02800000 0x00 0x100>;@@ -1267,6 +1309,29 @@ };
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi line 1319
Quoted 10 lines
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi +8
-0}; + 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 */
Please use 0x00 as rest of the file like:
reg = <0x00 0x0a000000 0x00 0x30a00>, <0x00 0x04f40000 0x00 0x20>;
Quoted 18 lines
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi +15
-0+ reg-names = "mhdptx", "j721e-intg"; + + clocks = <&k3_clks 151 36>; + + 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@4a00000 { compatible = "ti,j721e-dss"; reg =
PATCH v3 2/2 arm64: dts: ti: k3-j721e-common-proc-board: add DP to j7 evm
In reply to Rahul T RFrom: Tomi Valkeinen <[email protected]>
Add the endpoint nodes to describe connection from DSS => MHDP => DisplayPort connector.
Also add the phy link node and required pinmux nodes for hotplug.
--- .../dts/ti/k3-j721e-common-proc-board.dts | 78 ++++++++++++++++++- 1 file changed, 74 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts +74 -4
@@ -148,6 +148,28 @@ pinctrl-0 = <&main_mcan2_gpio_pins_default>; standby-gpios = <&main_gpio0 127 GPIO_ACTIVE_HIGH>; }; + + dp_pwr_3v3: regulator-dp-prw { + compatible = "regulator-fixed"; + regulator-name = "dp-pwr"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&exp4 0 GPIO_ACTIVE_HIGH>; /* P0 - DP0_PWR_SW_EN */ + enable-active-high; + }; + + 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 {
@@ -190,6 +212,12 @@ >; }; + 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 */
@@ -658,6 +686,41 @@ <&k3_clks 152 18>; /* PLL23_HSDIV0 */ }; +&dss_ports { + port@0 { + reg = <0>; + dpi0_out: endpoint { + remote-endpoint = <&dp0_in>; + }; + }; +}; + +&mhdp { + phys = <&torrent_phy_dp>; + phy-names = "dpphy"; + 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>; + }; + }; +}; + &mcasp0 { status = "disabled"; };
@@ -793,6 +856,17 @@ }; }; +&serdes4 { + 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 { reset-gpios = <&exp1 6 GPIO_ACTIVE_HIGH>; phys = <&serdes0_pcie_link>;
@@ -843,10 +917,6 @@ status = "disabled"; }; -&dss { - status = "disabled"; -}; - &icssg0_mdio { status = "disabled"; };
Signature · 1 line
2.17.1
Vignesh Raghavendra
maintainerQuoted 16 lines · Rahul T R
The following series of patches enables DisplayPort on j721e-evm
Tomi Valkeinen (2):
arm64: dts: ti: k3-j721e-main: add DP & DP PHY
arm64: dts: ti: k3-j721e-common-proc-board: add DP to j7 evmv2:
- use phandle with a parameter to refer clocks insted of sub nodes inserdes_wiznode
- move phy link node to board DTS filev3:
- Fix the regulator node name as per the DT spec
- Use Macro for GPIO type
Quoted 5 lines
boot logs:
https://gist.githubusercontent.com/ravi-rahul/1bdbc3f77ab381e486c8394650c2e85d/raw/f04584c30181821c4ee83aee7781a9ba143cd3f3/j7_DP_upstream.logkernel patch verify report:
https://gist.githubusercontent.com/ravi-rahul/a982fef3fae03ec0dbdd5cb475a4cb25/raw/c8230370746e9878daf9527c3aa9d82eed7aa33c/report-kernel-patch-verify.txt
Hmm, With dtbs_check I see (on v5.18-rc1 tag)
+/workdir/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dtb: dp-bridge@a000000: ports: 'port@0' is a required property +/workdir/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dtb: dp-bridge@a000000: ports: 'port@4' is a required property +/workdir/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dtb: dp-bridge@a000000: 'phys' is a required property +/workdir/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dtb: dp-bridge@a000000: 'phy-names' is a required property
This goes away with 2/2 although adds:
+<stdout>: Warning (graph_child_address): /bus@100000/dss@4a00000/ports: graph node has single child node 'port@0', #address-cells/#size-cells are not necessary
Do we need to have empty ports node in j721e-main.dtsi for dp-bridge? And something similar wrt phys as well?
Regards
Vignesh
Quoted 5 lines
.../dts/ti/k3-j721e-common-proc-board.dts | 78 ++++++++++++++++++- arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 65 ++++++++++++++++ 2 files changed, 139 insertions(+), 4 deletions(-)
Quoted 32 lines · Vignesh Raghavendra
Quoted 16 lines · Rahul T R
The following series of patches enables DisplayPort on j721e-evm
Tomi Valkeinen (2):
arm64: dts: ti: k3-j721e-main: add DP & DP PHY
arm64: dts: ti: k3-j721e-common-proc-board: add DP to j7 evmv2:
- use phandle with a parameter to refer clocks insted of sub nodes inserdes_wiznode
- move phy link node to board DTS filev3:
- Fix the regulator node name as per the DT spec
- Use Macro for GPIO typeQuoted 5 lines
boot logs:
https://gist.githubusercontent.com/ravi-rahul/1bdbc3f77ab381e486c8394650c2e85d/raw/f04584c30181821c4ee83aee7781a9ba143cd3f3/j7_DP_upstream.logkernel patch verify report:
https://gist.githubusercontent.com/ravi-rahul/a982fef3fae03ec0dbdd5cb475a4cb25/raw/c8230370746e9878daf9527c3aa9d82eed7aa33c/report-kernel-patch-verify.txtHmm, With
dtbs_checkI see (on v5.18-rc1 tag)(quoted diff) +4
-0+/workdir/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dtb: dp-bridge@a000000: ports: 'port@0' is a required property +/workdir/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dtb: dp-bridge@a000000: ports: 'port@4' is a required property +/workdir/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dtb: dp-bridge@a000000: 'phys' is a required property +/workdir/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dtb: dp-bridge@a000000: 'phy-names' is a required property
Quoted 8 lines
This goes away with 2/2 although adds:
+<stdout>: Warning (graph_child_address): /bus@100000/dss@4a00000/ports: graph node has single child node 'port@0', #address-cells/#size-cells are not necessaryDo we need to have empty ports node in
j721e-main.dtsifor dp-bridge? And something similar wrt phys as well?Regards
Vignesh
Hi Vignesh,
Thanks for the review!
Not sure why kernel patch verify did not catch this
I can fix the warnings for ports by adding empty ports in 1/2 For "phys" I can move the phy node from 2/2 to 1/2 But the commit will spill over both dtsi and dts files is that okay, can you please give your inputs here
Regards
Rahul T R
Quoted 6 lines
Quoted 6 lines
.../dts/ti/k3-j721e-common-proc-board.dts | 78 ++++++++++++++++++- arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 65 ++++++++++++++++ 2 files changed, 139 insertions(+), 4 deletions(-)
Nishanth Menon
maintainerQuoted 39 lines · Rahul T R
Quoted 38 lines · Vignesh Raghavendra
Quoted 16 lines · Rahul T R
The following series of patches enables DisplayPort on j721e-evm
Tomi Valkeinen (2):
arm64: dts: ti: k3-j721e-main: add DP & DP PHY
arm64: dts: ti: k3-j721e-common-proc-board: add DP to j7 evmv2:
- use phandle with a parameter to refer clocks insted of sub nodes inserdes_wiznode
- move phy link node to board DTS filev3:
- Fix the regulator node name as per the DT spec
- Use Macro for GPIO typeQuoted 5 lines
boot logs:
https://gist.githubusercontent.com/ravi-rahul/1bdbc3f77ab381e486c8394650c2e85d/raw/f04584c30181821c4ee83aee7781a9ba143cd3f3/j7_DP_upstream.logkernel patch verify report:
https://gist.githubusercontent.com/ravi-rahul/a982fef3fae03ec0dbdd5cb475a4cb25/raw/c8230370746e9878daf9527c3aa9d82eed7aa33c/report-kernel-patch-verify.txtHmm, With
dtbs_checkI see (on v5.18-rc1 tag)(quoted diff) +4
-0+/workdir/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dtb: dp-bridge@a000000: ports: 'port@0' is a required property +/workdir/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dtb: dp-bridge@a000000: ports: 'port@4' is a required property +/workdir/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dtb: dp-bridge@a000000: 'phys' is a required property +/workdir/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dtb: dp-bridge@a000000: 'phy-names' is a required propertyThis goes away with 2/2 although adds:
+<stdout>: Warning (graph_child_address): /bus@100000/dss@4a00000/ports: graph node has single child node 'port@0', #address-cells/#size-cells are not necessaryDo we need to have empty ports node in
j721e-main.dtsifor dp-bridge? And something similar wrt phys as well?
Quoted 7 lines
Quoted 2 lines
Regards
VigneshHi Vignesh,
Thanks for the review!
Not sure why kernel patch verify did not catch this
if you are'nt able to install all the required packages and version of packages, then use the kpv wrapper script for docker container that already packages things.
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
Quoted 45 lines · Nishanth Menon
Quoted 44 lines · Rahul T R
Quoted 32 lines · Vignesh Raghavendra
Quoted 16 lines · Rahul T R
The following series of patches enables DisplayPort on j721e-evm
Tomi Valkeinen (2):
arm64: dts: ti: k3-j721e-main: add DP & DP PHY
arm64: dts: ti: k3-j721e-common-proc-board: add DP to j7 evmv2:
- use phandle with a parameter to refer clocks insted of sub nodes inserdes_wiznode
- move phy link node to board DTS filev3:
- Fix the regulator node name as per the DT spec
- Use Macro for GPIO typeQuoted 5 lines
boot logs:
https://gist.githubusercontent.com/ravi-rahul/1bdbc3f77ab381e486c8394650c2e85d/raw/f04584c30181821c4ee83aee7781a9ba143cd3f3/j7_DP_upstream.logkernel patch verify report:
https://gist.githubusercontent.com/ravi-rahul/a982fef3fae03ec0dbdd5cb475a4cb25/raw/c8230370746e9878daf9527c3aa9d82eed7aa33c/report-kernel-patch-verify.txtHmm, With
dtbs_checkI see (on v5.18-rc1 tag)(quoted diff) +4
-0+/workdir/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dtb: dp-bridge@a000000: ports: 'port@0' is a required property +/workdir/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dtb: dp-bridge@a000000: ports: 'port@4' is a required property +/workdir/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dtb: dp-bridge@a000000: 'phys' is a required property +/workdir/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dtb: dp-bridge@a000000: 'phy-names' is a required propertyQuoted 8 lines
This goes away with 2/2 although adds:
+<stdout>: Warning (graph_child_address): /bus@100000/dss@4a00000/ports: graph node has single child node 'port@0', #address-cells/#size-cells are not necessaryDo we need to have empty ports node in
j721e-main.dtsifor dp-bridge? And something similar wrt phys as well?Regards
VigneshHi Vignesh,
Quoted 6 lines
Quoted 2 lines
Thanks for the review!
Not sure why kernel patch verify did not catch thisif you are'nt able to install all the required packages and version of packages, then use the kpv wrapper script for docker container that already packages things.
Hi Nishanth,
kpv is expecting cross compile toolchain to be present in /opt of host. Once I copied the toolchain to /opt tests are running fine
I have fixed the dtbs_checks warnings, will send v4 with the fixes
Thanks
Rahul T R
Quoted 4 lines
Signature · 3 lines
Regards, Nishanth Menon K ey (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D