Initial support for Cadence MHDP8501(HDMI/DP) for i.MX8MQ
Subsystems (6)
v6 cover Initial support for Cadence MHDP8501(HDMI/DP) for i.MX8MQ
The patch set initial support for Cadence MHDP8501(HDMI/DP) DRM bridge drivers and Cadence HDP-TX PHY(HDMI/DP) drivers for Freescale i.MX8MQ.
The patch set compose of DRM bridge drivers and PHY drivers.
Both of them need the followed two patches to pass build.
drm: bridge: Cadence: convert mailbox functions to macro functions
phy: Add HDMI configuration options
DRM bridges driver patches:
dt-bindings: display: bridge: Add Cadence MHDP8501 HDMI and DP
drm: bridge: Cadence: Add MHDP8501 DP driver
drm: bridge: Cadence: Add MHDP8501 HDMI driver
PHY driver patches:
dt-bindings: phy: Add Freescale iMX8MQ DP and HDMI PHY
phy: freescale: Add DisplayPort PHY driver for i.MX8MQ
phy: freescale: Add HDMI PHY driver for i.MX8MQ
v5->v6:
HDMI/DP bridge driver
- 8501 is the part number of Cadence MHDP on i.MX8MQ.
Use MHDP8501 to name hdmi/dp drivers and files.
- Add compatible "fsl,imx8mq-mhdp8501-dp" for i.MX8MQ DP driver
- Add compatible "fsl,imx8mq-mhdp8501-hdmi" for i.MX8MQ HDMI driver
- Combine HDMI and DP dt-bindings into one file cdns,mhdp8501.yaml
- Fix HDMI scrambling is not enable issue when driver working in 4Kp60 mode.
- Add HDMI/DP PHY API mailbox protect.
HDMI/DP PHY driver:
- Rename DP and HDMI PHY files and move to folder phy/freescale/
- Remove properties num_lanes and link_rate from DP PHY driver.
- Combine HDMI and DP dt-bindings into one file fsl,imx8mq-dp-hdmi-phy.yaml
- Update compatible string to "fsl,imx8mq-dp-phy".
- Update compatible string to "fsl,imx8mq-hdmi-phy".
v4->v5:
- Drop "clk" suffix in clock name.
- Add output port property in the example of hdmi/dp.
v3->v4:
dt-bindings:
- Correct dt-bindings coding style and address review comments.
- Add apb_clk description.
- Add output port for HDMI/DP connector
PHY:
- Alphabetically sorted in Kconfig and Makefile for DP and HDMI PHY
- Remove unused registers define from HDMI and DP PHY drivers.
- More description in phy_hdmi.h.
- Add apb_clk to HDMI and DP phy driver.
HDMI/DP:
- Use get_unaligned_le32() to replace hardcode type conversion in HDMI AVI infoframe data fill function.
- Add mailbox mutex lock in HDMI/DP driver for phy functions to reslove race conditions between HDMI/DP and PHY drivers.
- Add apb_clk to both HDMI and DP driver.
- Rename some function names and add prefix with "cdns_hdmi/cdns_dp".
- Remove bpc 12 and 16 optional that not supported.
v2->v3:
Address comments for dt-bindings files.
- Correct dts-bindings file names
Rename phy-cadence-hdptx-dp.yaml to cdns,mhdp-imx8mq-dp.yaml Rename phy-cadence-hdptx-hdmi.yaml to cdns,mhdp-imx8mq-hdmi.yaml
- Drop redundant words and descriptions.
- Correct hdmi/dp node name.
v2 is a completely different version compared to v1. Previous v1 can be available here [1].
v1->v2:
- Reuse Cadence mailbox access functions from mhdp8546 instead of rockchip DP.
- Mailbox access functions be convert to marco functions that will be referenced by HDP-TX PHY(HDMI/DP) driver too.
- Plain bridge instead of component driver.
- Standalone Cadence HDP-TX PHY(HDMI/DP) driver.
- Audio driver are removed from the patch set, it will be add in another patch set later.
[1] https://patchwork.kernel.org/project/linux-rockchip/cover/[email protected]/
Sandor Yu (8):
drm: bridge: Cadence: convert mailbox functions to macro functions
dt-bindings: display: bridge: Add Cadence MHDP8501 HDMI and DP
drm: bridge: Cadence: Add MHDP8501 DP driver
phy: Add HDMI configuration options
drm: bridge: Cadence: Add MHDP8501 HDMI driver
dt-bindings: phy: Add Freescale iMX8MQ DP and HDMI PHY
phy: freescale: Add DisplayPort PHY driver for i.MX8MQ
phy: freescale: Add HDMI PHY driver for i.MX8MQ
.../display/bridge/cdns,mhdp8501.yaml | 105 ++ .../bindings/phy/fsl,imx8mq-dp-hdmi-phy.yaml | 53 + drivers/gpu/drm/bridge/cadence/Kconfig | 25 + drivers/gpu/drm/bridge/cadence/Makefile | 3 + .../gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c | 1078 +++++++++++++++++ .../drm/bridge/cadence/cdns-mhdp8501-hdmi.c | 1024 ++++++++++++++++ .../gpu/drm/bridge/cadence/cdns-mhdp8501.h | 399 ++++++ .../drm/bridge/cadence/cdns-mhdp8546-core.c | 195 +-- .../drm/bridge/cadence/cdns-mhdp8546-core.h | 1 - drivers/phy/freescale/Kconfig | 18 + drivers/phy/freescale/Makefile | 2 + drivers/phy/freescale/phy-fsl-imx8mq-dp.c | 697 +++++++++++ drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c | 889 ++++++++++++++ include/drm/bridge/cdns-mhdp-mailbox.h | 240 ++++ include/linux/phy/phy-hdmi.h | 38 + include/linux/phy/phy.h | 7 +- 16 files changed, 4578 insertions(+), 196 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml create mode 100644 Documentation/devicetree/bindings/phy/fsl,imx8mq-dp-hdmi-phy.yaml create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8501.h create mode 100644 drivers/phy/freescale/phy-fsl-imx8mq-dp.c create mode 100644 drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c create mode 100644 include/drm/bridge/cdns-mhdp-mailbox.h create mode 100644 include/linux/phy/phy-hdmi.h
Signature · 1 line
2.34.1
PATCH v6 1/8 drm: bridge: Cadence: convert mailbox functions to macro functions
MHDP8546 mailbox access functions will be share to other mhdp driver and Cadence HDP-TX HDMI/DP PHY drivers.
Move those functions to head file include/drm/bridge/cdns-mhdp-mailbox.h and convert them to macro functions.
--- .../drm/bridge/cadence/cdns-mhdp8546-core.c | 195 +------------- .../drm/bridge/cadence/cdns-mhdp8546-core.h | 1 - include/drm/bridge/cdns-mhdp-mailbox.h | 240 ++++++++++++++++++ 3 files changed, 241 insertions(+), 195 deletions(-) create mode 100644 include/drm/bridge/cdns-mhdp-mailbox.h
drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c +1 -194
@@ -36,6 +36,7 @@#include <linux/slab.h> #include <linux/wait.h> +#include <drm/bridge/cdns-mhdp-mailbox.h> #include <drm/display/drm_dp_helper.h> #include <drm/display/drm_hdcp_helper.h> #include <drm/drm_atomic.h>
@@ -54,200 +55,6 @@#include "cdns-mhdp8546-hdcp.h" #include "cdns-mhdp8546-j721e.h" -static int cdns_mhdp_mailbox_read (struct cdns_mhdp_device *mhdp) -{ -int ret, empty; - -WARN_ON (!mutex_is_locked (&mhdp->mbox_mutex)); - - ret =readx_poll_timeout (readl, mhdp->regs +CDNS_MAILBOX_EMPTY , - empty, !empty,MAILBOX_RETRY_US , -MAILBOX_TIMEOUT_US ); -if (ret <0 ) -return ret; - -return readl (mhdp->regs +CDNS_MAILBOX_RX_DATA ) &0xff ; -} - -static int cdns_mhdp_mailbox_write (struct cdns_mhdp_device *mhdp,u8 val) -{ -int ret, full; - -WARN_ON (!mutex_is_locked (&mhdp->mbox_mutex)); - - ret =readx_poll_timeout (readl, mhdp->regs +CDNS_MAILBOX_FULL , - full, !full,MAILBOX_RETRY_US , -MAILBOX_TIMEOUT_US ); -if (ret <0 ) -return ret; - -writel (val, mhdp->regs +CDNS_MAILBOX_TX_DATA ); - -return 0 ; -} - -static int cdns_mhdp_mailbox_recv_header (struct cdns_mhdp_device *mhdp, -u8 module_id,u8 opcode, -u16 req_size) -{ -u32 mbox_size, i; -u8 header[4 ]; -int ret; - -/* read the header of the message */ -for (i =0 ; i <sizeof (header); i++) { - ret =cdns_mhdp_mailbox_read (mhdp); -if (ret <0 ) -return ret; - - header[i] = ret; - } - - mbox_size =get_unaligned_be16 (header +2 ); - -if (opcode != header[0 ] || module_id != header[1 ] || - req_size != mbox_size) { -/* -* If the message in mailbox is not what we want, we need to -* clear the mailbox by reading its contents. -*/ -for (i =0 ; i < mbox_size; i++) -if (cdns_mhdp_mailbox_read (mhdp) <0 ) -break ; - -return -EINVAL ; - } - -return 0 ; -} - -static int cdns_mhdp_mailbox_recv_data (struct cdns_mhdp_device *mhdp, -u8 *buff,u16 buff_size) -{ -u32 i; -int ret; - -for (i =0 ; i < buff_size; i++) { - ret =cdns_mhdp_mailbox_read (mhdp); -if (ret <0 ) -return ret; - - buff[i] = ret; - } - -return 0 ; -} - -static int cdns_mhdp_mailbox_send (struct cdns_mhdp_device *mhdp,u8 module_id, -u8 opcode,u16 size,u8 *message) -{ -u8 header[4 ]; -int ret, i; - - header[0 ] = opcode; - header[1 ] = module_id; -put_unaligned_be16 (size, header +2 ); - -for (i =0 ; i <sizeof (header); i++) { - ret =cdns_mhdp_mailbox_write (mhdp, header[i]); -if (ret) -return ret; - } - -for (i =0 ; i < size; i++) { - ret =cdns_mhdp_mailbox_write (mhdp, message[i]); -if (ret) -return ret; - } - -return 0 ; -} - -static -int cdns_mhdp_reg_read (struct cdns_mhdp_device *mhdp,u32 addr,u32 *value) -{ -u8 msg[4 ], resp[8 ]; -int ret; - -put_unaligned_be32 (addr, msg); - -mutex_lock (&mhdp->mbox_mutex); - - ret =cdns_mhdp_mailbox_send (mhdp,MB_MODULE_ID_GENERAL , -GENERAL_REGISTER_READ , -sizeof (msg), msg); -if (ret) - goto out; - - ret =cdns_mhdp_mailbox_recv_header (mhdp,MB_MODULE_ID_GENERAL , -GENERAL_REGISTER_READ , -sizeof (resp)); -if (ret) - goto out; - - ret =cdns_mhdp_mailbox_recv_data (mhdp, resp,sizeof (resp)); -if (ret) - goto out; - -/* Returned address value should be the same as requested */ -if (memcmp (msg, resp,sizeof (msg))) { - ret = -EINVAL ; - goto out; - } - - *value =get_unaligned_be32 (resp +4 ); - -out: -mutex_unlock (&mhdp->mbox_mutex); -if (ret) { -dev_err (mhdp->dev,"Failed to read register\n" ); - *value =0 ; - } - -return ret; -} - -static -int cdns_mhdp_reg_write (struct cdns_mhdp_device *mhdp,u16 addr,u32 val) -{ -u8 msg[6 ]; -int ret; - -put_unaligned_be16 (addr, msg); -put_unaligned_be32 (val, msg +2 ); - -mutex_lock (&mhdp->mbox_mutex); - - ret =cdns_mhdp_mailbox_send (mhdp,MB_MODULE_ID_DP_TX , -DPTX_WRITE_REGISTER ,sizeof (msg), msg); - -mutex_unlock (&mhdp->mbox_mutex); - -return ret; -} - -static -int cdns_mhdp_reg_write_bit (struct cdns_mhdp_device *mhdp,u16 addr, -u8 start_bit,u8 bits_no,u32 val) -{ -u8 field[8 ]; -int ret; - -put_unaligned_be16 (addr, field); - field[2 ] = start_bit; - field[3 ] = bits_no; -put_unaligned_be32 (val, field +4 ); - -mutex_lock (&mhdp->mbox_mutex); - - ret =cdns_mhdp_mailbox_send (mhdp,MB_MODULE_ID_DP_TX , -DPTX_WRITE_FIELD ,sizeof (field), field); - -mutex_unlock (&mhdp->mbox_mutex); - -return ret; -} -static int cdns_mhdp_dpcd_read (struct cdns_mhdp_device *mhdp,u32 addr,u8 *data,u16 len)
drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.h +0 -1
@@ -212,7 +212,6 @@ struct phy;#define MB_MODULE_ID_HDCP_TX 0x07#define MB_MODULE_ID_HDCP_RX 0x08#define MB_MODULE_ID_HDCP_GENERAL 0x09 -#define MB_MODULE_ID_GENERAL 0x0a/* firmware and opcodes */ #define FW_NAME "cadence/mhdp8546.bin"
include/drm/bridge/cdns-mhdp-mailbox.h new file +240 -0
240 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v6 2/8 dt-bindings: display: bridge: Add Cadence MHDP8501 HDMI and DP
In reply to Sandor YuAdd bindings for Cadence MHDP8501 DisplayPort and HDMI driver.
--- .../display/bridge/cdns,mhdp8501.yaml | 105 ++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml new file +105 -0
@@ -0,0 +1,105 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/bridge/cdns,mhdp8501.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Cadence MHDP8501 Displayport bridge + +maintainers: + - Sandor Yu <[email protected]> + +description: + The Cadence MHDP8501 Displayport/HDMI TX interface. + +properties: + compatible: + enum: + - cdns,mhdp8501-dp + - cdns,mhdp8501-hdmi + - fsl,imx8mq-mhdp8501-dp + - fsl,imx8mq-mhdp8501-hdmi + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + description: MHDP8501 DP/HDMI APB clock. + + phys: + maxItems: 1 + + interrupts: + items: + - description: Hotplug cable plugin. + - description: Hotplug cable plugout. + + interrupt-names: + items: + - const: plug_in + - const: plug_out + + ports: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + port@0: + $ref: /schemas/graph.yaml#/properties/port + description: + Input port from display controller output. + port@1: + $ref: /schemas/graph.yaml#/properties/port + description: + Output port to DP/HDMI connector. + + required: + - port@0 + - port@1 + +required: + - compatible + - reg + - clocks + - interrupts + - interrupt-names + - phys + - ports + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/imx8mq-clock.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + + mhdp_dp: dp-bridge@32c00000 { + compatible = "fsl,imx8mq-mhdp8501-dp"; + reg = <0x32c00000 0x100000>; + interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "plug_in", "plug_out"; + clocks = <&clk IMX8MQ_CLK_DISP_APB_ROOT>; + phys = <&dp_phy>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + mhdp_in: endpoint { + remote-endpoint = <&dcss_out>; + }; + }; + + port@1 { + reg = <1>; + + mhdp_out: endpoint { + remote-endpoint = <&dp_con>; + }; + }; + }; + };
Signature · 1 line
2.34.1
Re: [PATCH v6 2/8] dt-bindings: display: bridge: Add Cadence MHDP8501 HDMI and DP
Hi Sandor,
Am Donnerstag, 15. Juni 2023, 03:38:12 CEST schrieb Sandor Yu:
Quoted 65 lines
Add bindings for Cadence MHDP8501 DisplayPort and HDMI driver.
Signed-off-by Sandor Yu <[email protected]>--- .../display/bridge/cdns,mhdp8501.yaml | 105 ++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yamldiff --git
a/Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yamlb/Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yamlnew file mode 100644
index 000000000000..a54756815e6fDocumentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml new file +48
-0@@ -0,0 +1,105 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/bridge/cdns,mhdp8501.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Cadence MHDP8501 Displayport bridge + +maintainers: + - Sandor Yu <[email protected]> + +description: + The Cadence MHDP8501 Displayport/HDMI TX interface. + +properties: + compatible: + enum: + - cdns,mhdp8501-dp + - cdns,mhdp8501-hdmi + - fsl,imx8mq-mhdp8501-dp + - fsl,imx8mq-mhdp8501-hdmi + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + description: MHDP8501 DP/HDMI APB clock. + + phys: + maxItems: 1 + + interrupts: + items: + - description: Hotplug cable plugin. + - description: Hotplug cable plugout. + + interrupt-names: + items: + - const: plug_in + - const: plug_out + + ports: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + port@0: + $ref: /schemas/graph.yaml#/properties/port
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml line 58
Quoted 10 lines
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml new file +10
-0+ description: + Input port from display controller output. + port@1: + $ref: /schemas/graph.yaml#/properties/port + description: + Output port to DP/HDMI connector. + + required: + - port@0 + - port@1
You mark these ports as required, but apparently the drivers do not use them, AFAICT. E.g. missing port@1 is not resulting in an error, at lease for HDMI one.
Best regards,
Alexander
Quoted 47 lines
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml new file +47
-0+ +required: + - compatible + - reg + - clocks + - interrupts + - interrupt-names + - phys + - ports + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/imx8mq-clock.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + + mhdp_dp: dp-bridge@32c00000 { + compatible = "fsl,imx8mq-mhdp8501-dp"; + reg = <0x32c00000 0x100000>; + interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "plug_in", "plug_out"; + clocks = <&clk IMX8MQ_CLK_DISP_APB_ROOT>; + phys = <&dp_phy>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + mhdp_in: endpoint { + remote-endpoint = <&dcss_out>; + }; + }; + + port@1 { + reg = <1>; + + mhdp_out: endpoint { + remote-endpoint = <&dp_con>; + }; + }; + }; + };
Signature · 4 lines
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany Amtsgericht München, HRB 105018 Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider http://www.tq-group.com/
RE: [EXT] Re: [PATCH v6 2/8] dt-bindings: display: bridge: Add Cadence MHDP8501 HDMI and DP
Hi Alexander,
Thanks for your comments,
Quoted 130 lines
-----Original Message-----
From: Alexander Stein <[email protected]>
Sent: 2023年6月16日 17:32
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Cc: Oliver Brown <[email protected]>; Sandor Yu <[email protected]>; dl-linux-imx <[email protected]>; [email protected]; Sandor Yu <[email protected]>
Subject: [EXT] Re: [PATCH v6 2/8] dt-bindings: display: bridge: Add Cadence MHDP8501 HDMI and DPCaution: This is an external email. Please take care when clicking links or opening attachments. When in doubt, report the message using the 'Report this email' button
Hi Sandor,
Am Donnerstag, 15. Juni 2023, 03:38:12 CEST schrieb Sandor Yu:
Quoted 5 lines
Add bindings for Cadence MHDP8501 DisplayPort and HDMI driver.
Signed-off-by Sandor Yu <[email protected]>--- .../display/bridge/cdns,mhdp8501.yaml | 105++++++++++++++++++
Quoted 10 lines
1 file changed, 105 insertions(+) create mode 100644
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yamldiff --git
a/Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yamlb/Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yamlnew file mode 100644 index 000000000000..a54756815e6f
---/dev/null
+++b/Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.y
Review line 4
Quoted 7 lines
+++ aml
(quoted diff) +4
-0@@ -0,0 +1,105 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) %YAML 1.2 +--- +$id: +http://devi/+cetree.org%2Fschemas%2Fdisplay%2Fbridge%2Fcdns%2Cmhdp8501.yaml% 23&dat
Quoted 1 line
+a=05%7C01%7CSandor.yu%40nxp.com%7C6ef2c732b3674cb2896c08db6e4 c827b%7C
Quoted 1 line
+686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C63822504710561225 8%7CUnkno
Quoted 1 line
+wn%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1 haWwi
Quoted 1 line
+LCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=DGYYt2LQ%2FhlNBVd2m0s aXTm9IoKKwn
Review
Quoted 4 lines
(quoted diff) +3
-0+X7CTTplhbLxcI%3D&reserved=0 +$schema: +http://devi/+cetree.org%2Fmeta-schemas%2Fcore.yaml%23&data=05%7C01%7CSandor. yu%40n
Quoted 1 line
+xp.com%7C6ef2c732b3674cb2896c08db6e4c827b%7C686ea1d3bc2b4c6fa9 2cd99c5
Quoted 1 line
+c301635%7C0%7C0%7C638225047105612258%7CUnknown%7CTWFpbGZs b3d8eyJWIjoi
Quoted 1 line
+MC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3 000%7C%
Quoted 1 line
+7C%7C&sdata=SkTFYM7HHgJmFUkyo3Ftf%2B8FdGqlnty0Ch6ggwSPeLY%3D &reserved
Quoted 49 lines
+=0
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml new file +48
-0+ +title: Cadence MHDP8501 Displayport bridge + +maintainers: + - Sandor Yu <[email protected]> + +description: + The Cadence MHDP8501 Displayport/HDMI TX interface. + +properties: + compatible: + enum: + - cdns,mhdp8501-dp + - cdns,mhdp8501-hdmi + - fsl,imx8mq-mhdp8501-dp + - fsl,imx8mq-mhdp8501-hdmi + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + description: MHDP8501 DP/HDMI APB clock. + + phys: + maxItems: 1 + + interrupts: + items: + - description: Hotplug cable plugin. + - description: Hotplug cable plugout. + + interrupt-names: + items: + - const: plug_in + - const: plug_out + + ports: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + port@0: + $ref: /schemas/graph.yaml#/properties/port + description: + Input port from display controller output. + port@1: + $ref: /schemas/graph.yaml#/properties/port + description:
Quoted 9 lines
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml line 58
Quoted 5 lines
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml new file +5
-0+ Output port to DP/HDMI connector. + + required: + - port@0 + - port@1You mark these ports as required, but apparently the drivers do not use them, AFAICT. E.g. missing port@1 is not resulting in an error, at lease for HDMI one.
Yes, port@1 is not really needed, I add it just to follow HDMI/DP framework that same as other platforms in community code.
B.R
Sandor
Quoted 64 lines
Best regards,
AlexanderQuoted 37 lines
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml new file +37
-0+ +required: + - compatible + - reg + - clocks + - interrupts + - interrupt-names + - phys + - ports + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/imx8mq-clock.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + + mhdp_dp: dp-bridge@32c00000 { + compatible = "fsl,imx8mq-mhdp8501-dp"; + reg = <0x32c00000 0x100000>; + interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "plug_in", "plug_out"; + clocks = <&clk IMX8MQ_CLK_DISP_APB_ROOT>; + phys = <&dp_phy>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + mhdp_in: endpoint { + remote-endpoint = <&dcss_out>; + }; + };Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml line 105
Quoted 10 lines
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml new file +10
-0+ + port@1 { + reg = <1>; + + mhdp_out: endpoint { + remote-endpoint = <&dp_con>; + }; + }; + }; + };--
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany Amtsgericht München, HRB 105018
Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider
http://www.tq/
-group.com%2F&data=05%7C01%7CSandor.yu%40nxp.com%7C6ef2c732b367 4cb2896c08db6e4c827b%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C 0%7C638225047105612258%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4w LjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C %7C%7C&sdata=xJdLi2HJ72ShBwT%2FfUdZ3uLx%2FIJEPmTQJHGVXe0JVik%3 D&reserved=0
Rob Herring
maintainerRe: [PATCH v6 2/8] dt-bindings: display: bridge: Add Cadence MHDP8501 HDMI and DP
In reply to Alexander SteinQuoted 74 lines · Alexander Stein
Hi Sandor,
Am Donnerstag, 15. Juni 2023, 03:38:12 CEST schrieb Sandor Yu:
Quoted 71 lines
Add bindings for Cadence MHDP8501 DisplayPort and HDMI driver.
Signed-off-by Sandor Yu <[email protected]>--- .../display/bridge/cdns,mhdp8501.yaml | 105 ++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yamldiff --git
a/Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yamlb/Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yamlnew file mode 100644
index 000000000000..a54756815e6fDocumentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml new file +54
-0@@ -0,0 +1,105 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/bridge/cdns,mhdp8501.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Cadence MHDP8501 Displayport bridge + +maintainers: + - Sandor Yu <[email protected]> + +description: + The Cadence MHDP8501 Displayport/HDMI TX interface. + +properties: + compatible: + enum: + - cdns,mhdp8501-dp + - cdns,mhdp8501-hdmi + - fsl,imx8mq-mhdp8501-dp + - fsl,imx8mq-mhdp8501-hdmi + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + description: MHDP8501 DP/HDMI APB clock. + + phys: + maxItems: 1 + + interrupts: + items: + - description: Hotplug cable plugin. + - description: Hotplug cable plugout. + + interrupt-names: + items: + - const: plug_in + - const: plug_out + + ports: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + port@0: + $ref: /schemas/graph.yaml#/properties/port + description: + Input port from display controller output. + port@1: + $ref: /schemas/graph.yaml#/properties/port + description: + Output port to DP/HDMI connector.
Quoted 8 lines
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml line 58
Quoted 4 lines
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml new file +4
-0+ + required: + - port@0 + - port@1You mark these ports as required, but apparently the drivers do not use them, AFAICT. E.g. missing port@1 is not resulting in an error, at lease for HDMI one.
A connector node should be required whether a particular OS requires it or not. The bindings without predate defining a connector node.
Rob
Rob Herring
maintainerRe: [PATCH v6 2/8] dt-bindings: display: bridge: Add Cadence MHDP8501 HDMI and DP
In reply to Sandor YuQuoted 1 line · Sandor Yu
Add bindings for Cadence MHDP8501 DisplayPort and HDMI driver.
Bindings are for h/w, not a driver.
Quoted 24 lines
Signed-off-by Sandor Yu <[email protected]>--- .../display/bridge/cdns,mhdp8501.yaml | 105 ++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yamlDocumentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml new file +11
-0@@ -0,0 +1,105 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/bridge/cdns,mhdp8501.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Cadence MHDP8501 Displayport bridge + +maintainers: + - Sandor Yu <[email protected]> +
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml line 21
Quoted 10 lines
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml new file +10
-0+description: + The Cadence MHDP8501 Displayport/HDMI TX interface. + +properties: + compatible: + enum: + - cdns,mhdp8501-dp + - cdns,mhdp8501-hdmi + - fsl,imx8mq-mhdp8501-dp + - fsl,imx8mq-mhdp8501-hdmi
Is DP vs. HDMI fixed for a particular SoC implementation or it's a board level decision. In the latter case, the type of connector should determine the mode, not compatible.
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml line 28
Quoted 7 lines
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml new file +7
-0+ + reg: + maxItems: 1 + + clocks: + maxItems: 1 + description: MHDP8501 DP/HDMI APB clock.
Seems odd there's no clock tied to the pixel/serdes clock.
Quoted 80 lines
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml new file +77
-0+ + phys: + maxItems: 1 + + interrupts: + items: + - description: Hotplug cable plugin. + - description: Hotplug cable plugout. + + interrupt-names: + items: + - const: plug_in + - const: plug_out + + ports: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + port@0: + $ref: /schemas/graph.yaml#/properties/port + description: + Input port from display controller output. + port@1: + $ref: /schemas/graph.yaml#/properties/port + description: + Output port to DP/HDMI connector. + + required: + - port@0 + - port@1 + +required: + - compatible + - reg + - clocks + - interrupts + - interrupt-names + - phys + - ports + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/imx8mq-clock.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + + mhdp_dp: dp-bridge@32c00000 { + compatible = "fsl,imx8mq-mhdp8501-dp"; + reg = <0x32c00000 0x100000>; + interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "plug_in", "plug_out"; + clocks = <&clk IMX8MQ_CLK_DISP_APB_ROOT>; + phys = <&dp_phy>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + mhdp_in: endpoint { + remote-endpoint = <&dcss_out>; + }; + }; + + port@1 { + reg = <1>; + + mhdp_out: endpoint { + remote-endpoint = <&dp_con>; + }; + }; + }; + };Signature · 1 line
2.34.1
RE: [EXT] Re: [PATCH v6 2/8] dt-bindings: display: bridge: Add Cadence MHDP8501 HDMI and DP
Hi Rob,
Thanks for your comments,
Quoted 21 lines
-----Original Message-----
From: Rob Herring <[email protected]>
Sent: 2023年6月20日 23:49
To: Sandor Yu <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; dl-linux-imx <[email protected]>; Oliver Brown <[email protected]>
Subject: [EXT] Re: [PATCH v6 2/8] dt-bindings: display: bridge: Add Cadence MHDP8501 HDMI and DPCaution: This is an external email. Please take care when clicking links or opening attachments. When in doubt, report the message using the 'Report this email' button
Quoted 4 lines
Quoted 1 line · Sandor Yu
Add bindings for Cadence MHDP8501 DisplayPort and HDMI driver.
Bindings are for h/w, not a driver.
OK, I will change it in the next version.
Quoted 70 lines
Quoted 5 lines
Signed-off-by Sandor Yu <[email protected]>--- .../display/bridge/cdns,mhdp8501.yaml | 105++++++++++++++++++
Quoted 11 lines
1 file changed, 105 insertions(+) create mode 100644
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yamldiff --git
a/Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yamlb/Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yamlnew file mode 100644
index 000000000000..a54756815e6f
---/dev/null
+++b/Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.y
Review line 4
Quoted 7 lines
+++ aml
(quoted diff) +4
-0@@ -0,0 +1,105 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) %YAML 1.2 +--- +$id: +https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdevi+cetree.org%2Fschemas%2Fdisplay%2Fbridge%2Fcdns%2Cmhdp8501.yaml% 23&dat
Quoted 1 line
+a=05%7C01%7CSandor.yu%40nxp.com%7C4d4e118d60d744b5dba708db71 a5de79%7C
Quoted 1 line
+686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C63822872943965530 2%7CUnkno
Quoted 1 line
+wn%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1 haWwi
Quoted 1 line
+LCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=UEsMdkZBmfD7tM1wzJ71 DHQoi4zVOkpT
Review
Quoted 4 lines
(quoted diff) +3
-0+A9TNE7Rxn%2B8%3D&reserved=0 +$schema: +https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdevi+cetree.org%2Fmeta-schemas%2Fcore.yaml%23&data=05%7C01%7CSandor. yu%40n
Quoted 1 line
+xp.com%7C4d4e118d60d744b5dba708db71a5de79%7C686ea1d3bc2b4c6fa
92cd99c5Quoted 1 line
+c301635%7C0%7C0%7C638228729439655302%7CUnknown%7CTWFpbGZs b3d8eyJWIjoi
Quoted 1 line
+MC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3 000%7C%
Quoted 1 line
+7C%7C&sdata=Zu3v0yG2BXWXvTWV5oLiGvdu3O3PhK%2FrYNJIS2zHwpI%3 D&reserved
Quoted 13 lines
+=0
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml new file +12
-0+ +title: Cadence MHDP8501 Displayport bridge + +maintainers: + - Sandor Yu <[email protected]> + +description: + The Cadence MHDP8501 Displayport/HDMI TX interface. + +properties: + compatible: + enum:
Quoted 8 lines
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml line 21
Quoted 4 lines
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml new file +4
-0+ - cdns,mhdp8501-dp + - cdns,mhdp8501-hdmi + - fsl,imx8mq-mhdp8501-dp + - fsl,imx8mq-mhdp8501-hdmiIs DP vs. HDMI fixed for a particular SoC implementation or it's a board level decision. In the latter case, the type of connector should determine the mode, not compatible.
DP or HDMI is bord level decision.
Because DP and HDMI have different initialize process and less functions could be reuse, so they have different drivers. Please check it in patch
[PATCH v6 3/8] drm: bridge: Cadence: Add MHDP8501 DP driver
[PATCH v6 5/8] drm: bridge: Cadence: Add MHDP8501 HDMI driver
If use the type of connector to determine the mode, hdmi and DP driver have to combine into one driver. So the compatible may the better choice.
Quoted 10 lines
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml line 28
Quoted 8 lines
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml new file +7
-0+ + reg: + maxItems: 1 + + clocks: + maxItems: 1 + description: MHDP8501 DP/HDMI APB clock.Seems odd there's no clock tied to the pixel/serdes clock.
MHDP8501 for i.MX8MQ use the pixel clock from PHY PLL not from external CCM. The pixel clock will be set in function phy_configure
B.R
Sandor
Quoted 81 lines
Quoted 81 lines
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml new file +77
-1+ + phys: + maxItems: 1 + + interrupts: + items: + - description: Hotplug cable plugin. + - description: Hotplug cable plugout. + + interrupt-names: + items: + - const: plug_in + - const: plug_out + + ports: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + port@0: + $ref: /schemas/graph.yaml#/properties/port + description: + Input port from display controller output. + port@1: + $ref: /schemas/graph.yaml#/properties/port + description: + Output port to DP/HDMI connector. + + required: + - port@0 + - port@1 + +required: + - compatible + - reg + - clocks + - interrupts + - interrupt-names + - phys + - ports + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/imx8mq-clock.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + + mhdp_dp: dp-bridge@32c00000 { + compatible = "fsl,imx8mq-mhdp8501-dp"; + reg = <0x32c00000 0x100000>; + interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "plug_in", "plug_out"; + clocks = <&clk IMX8MQ_CLK_DISP_APB_ROOT>; + phys = <&dp_phy>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + mhdp_in: endpoint { + remote-endpoint = <&dcss_out>; + }; + }; + + port@1 { + reg = <1>; + + mhdp_out: endpoint { + remote-endpoint = <&dp_con>; + }; + }; + }; + }; --2.34.1
Re: [EXT] Re: [PATCH v6 2/8] dt-bindings: display: bridge: Add Cadence MHDP8501 HDMI and DP
Quoted 12 lines · Sandor Yu
Quoted 4 lines
Quoted 4 lines
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml new file +4
-0+ +properties: + compatible: + enum:Quoted 8 lines
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml line 21
Quoted 4 lines
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml new file +4
-0+ - cdns,mhdp8501-dp + - cdns,mhdp8501-hdmi + - fsl,imx8mq-mhdp8501-dp + - fsl,imx8mq-mhdp8501-hdmiIs DP vs. HDMI fixed for a particular SoC implementation or it's a board level decision. In the latter case, the type of connector should determine the mode, not compatible.
Quoted 1 line
DP or HDMI is bord level decision.
Then it's a connector, not compatible.
Quoted 1 line
Because DP and HDMI have different initialize process and less functions could be reuse, so they have different drivers.
How do you organize drivers is independent of bindings.
Quoted 6 lines
Please check it in patch
[PATCH v6 3/8] drm: bridge: Cadence: Add MHDP8501 DP driver [PATCH v6 5/8] drm: bridge: Cadence: Add MHDP8501 HDMI driverIf use the type of connector to determine the mode, hdmi and DP driver have to combine into one driver. So the compatible may the better choice.
Why? Because one driver implementation tells you to do that? Bindings are for hardware, not for driver, so whatever you have to do in drivers is not convincing argument.
Best regards,
Krzysztof
PATCH v6 3/8 drm: bridge: Cadence: Add MHDP8501 DP driver
In reply to Sandor YuAdd a new DRM DisplayPort bridge driver for Candence MHDP8501 used in i.MX8MQ SOC. MHDP8501 could support HDMI or DisplayPort standards according embedded Firmware running in the uCPU.
For iMX8MQ SOC, the DisplayPort FW was loaded and activated by SOC ROM code. Bootload binary included HDMI FW was required for the driver.
--- drivers/gpu/drm/bridge/cadence/Kconfig | 13 + drivers/gpu/drm/bridge/cadence/Makefile | 2 + .../gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c | 1078 +++++++++++++++++ .../gpu/drm/bridge/cadence/cdns-mhdp8501.h | 399 ++++++ 4 files changed, 1492 insertions(+) create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8501.h
drivers/gpu/drm/bridge/cadence/Kconfig +13 -0
@@ -46,3 +46,16 @@ config DRM_CDNS_MHDP8546_J721E initializes the J721E Display Port and sets up the clock and data muxes. endif + +config DRM_CDNS_MHDP8501_DP + tristate "Cadence MHDP8501 DP DRM driver" + select DRM_KMS_HELPER + select DRM_PANEL_BRIDGE + select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HELPER + select DRM_CDNS_AUDIO + depends on OF + help + Support Cadence MHDP8501 DisplayPort driver. + Cadence MHDP8501 Controller support one or more protocols, + DisplayPort firmware is required for this driver.
drivers/gpu/drm/bridge/cadence/Makefile +2 -0
@@ -5,3 +5,5 @@ cdns-dsi-$(CONFIG_DRM_CDNS_DSI_J721E) += cdns-dsi-j721e.o obj-$(CONFIG_DRM_CDNS_MHDP8546) += cdns-mhdp8546.o cdns-mhdp8546-y := cdns-mhdp8546-core.o cdns-mhdp8546-hdcp.o cdns-mhdp8546-$(CONFIG_DRM_CDNS_MHDP8546_J721E) += cdns-mhdp8546-j721e.o + +obj-$(CONFIG_DRM_CDNS_MHDP8501_DP) += cdns-mhdp8501-dp.o
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c new file +1078 -0
1,078 lines not on this page · raw message
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501.h new file +399 -0
399 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH v6 3/8] drm: bridge: Cadence: Add MHDP8501 DP driver
Hi Sandor,
Quoted 6 lines · Sandor Yu
Add a new DRM DisplayPort bridge driver for Candence MHDP8501 used in i.MX8MQ SOC. MHDP8501 could support HDMI or DisplayPort standards according embedded Firmware running in the uCPU.
For iMX8MQ SOC, the DisplayPort FW was loaded and activated by SOC ROM code. Bootload binary included HDMI FW was required for the driver.
The bridge driver supports creating a connector, but is this really necessary?
This part:
Quoted 22 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c new file +22
-0+static const struct drm_connector_funcs cdns_dp_connector_funcs = { + .fill_modes = drm_helper_probe_single_connector_modes, + .destroy = drm_connector_cleanup, + .reset = drm_atomic_helper_connector_reset, + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, +}; + +static const struct drm_connector_helper_funcs cdns_dp_connector_helper_funcs = { + .get_modes = cdns_dp_connector_get_modes, +}; + +static int cdns_dp_bridge_attach (struct drm_bridge *bridge, +enum drm_bridge_attach_flags flags) +{ +struct cdns_mhdp_device *mhdp = bridge->driver_private; +struct drm_encoder *encoder = bridge->encoder; +struct drm_connector *connector = &mhdp->connector; +int ret; + +if (!(flags &DRM_BRIDGE_ATTACH_NO_CONNECTOR )) { + connector->interlace_allowed =0 ;
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c line 742
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c new file +10
-0+ + connector->polled =DRM_CONNECTOR_POLL_HPD ; + +drm_connector_helper_add (connector, &cdns_dp_connector_helper_funcs); + +drm_connector_init (bridge->dev, connector, &cdns_dp_connector_funcs, + DRM_MODE_CONNECTOR_DisplayPort); + +drm_connector_attach_encoder (connector, encoder); + }
Unless you have a display driver that do not create their own connector then drop the above and error out if DRM_BRIDGE_ATTACH_NO_CONNECTOR is not set.
It is encouraged that display drivers create their own connector.
This was the only detail I looked for in the driver, I hope some else volunteer to review it.
Sam
RE: [EXT] Re: [PATCH v6 3/8] drm: bridge: Cadence: Add MHDP8501 DP driver
Hi Sam,
Thanks your comments,
For i.MX8MQ, the display driver DCSS had create its own connector. I will drop the code in the next version review patch set.
Thanks
Sandor
Quoted 83 lines
-----Original Message-----
From: Sam Ravnborg <[email protected]>
Sent: 2023年6月16日 0:33
To: Sandor Yu <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Oliver Brown <[email protected]>; dl-linux-imx <[email protected]>; [email protected]
Subject: [EXT] Re: [PATCH v6 3/8] drm: bridge: Cadence: Add MHDP8501 DP driverCaution: This is an external email. Please take care when clicking links or opening attachments. When in doubt, report the message using the 'Report this email' button
Hi Sandor,
Quoted 5 lines · Sandor Yu
Add a new DRM DisplayPort bridge driver for Candence MHDP8501 used in i.MX8MQ SOC. MHDP8501 could support HDMI or DisplayPort standards according embedded Firmware running in the uCPU.
For iMX8MQ SOC, the DisplayPort FW was loaded and activated by SOC
ROM
Quoted 1 line
code. Bootload binary included HDMI FW was required for the driver.
The bridge driver supports creating a connector, but is this really necessary?
This part:
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c new file +5
-0+static const struct drm_connector_funcs cdns_dp_connector_funcs = { + .fill_modes = drm_helper_probe_single_connector_modes, + .destroy = drm_connector_cleanup, + .reset = drm_atomic_helper_connector_reset, + .atomic_duplicate_state =
drm_atomic_helper_connector_duplicate_state,Review
Quoted 5 lines
(quoted diff) +5
-0+ .atomic_destroy_state = +drm_atomic_helper_connector_destroy_state, +}; + +static const struct drm_connector_helper_funcs
cdns_dp_connector_helper_funcs= {drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c line 724
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c new file +4
-0+ .get_modes = cdns_dp_connector_get_modes, }; + +static int cdns_dp_bridge_attach (struct drm_bridge *bridge, +enum drm_bridge_attach_flags flags){
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c new file +4
-0+struct cdns_mhdp_device *mhdp = bridge->driver_private; +struct drm_encoder *encoder = bridge->encoder; +struct drm_connector *connector = &mhdp->connector; +int ret;drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c new file +10
-0+ +if (!(flags &DRM_BRIDGE_ATTACH_NO_CONNECTOR )) { + connector->interlace_allowed =0 ; + + connector->polled =DRM_CONNECTOR_POLL_HPD ; + +drm_connector_helper_add (connector, + &cdns_dp_connector_helper_funcs); + + drm_connector_init(bridge->dev, connector,
&cdns_dp_connector_funcs,Quoted 1 line
+
DRM_MODE_CONNECTOR_DisplayPort);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c line 742
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c new file +3
-0+ +drm_connector_attach_encoder (connector, encoder); + }Unless you have a display driver that do not create their own connector then drop the above and error out if
DRM_BRIDGE_ATTACH_NO_CONNECTORis not set.
It is encouraged that display drivers create their own connector.This was the only detail I looked for in the driver, I hope some else volunteer to review it.
Sam
PATCH v6 4/8 phy: Add HDMI configuration options
In reply to Sandor YuAllow HDMI PHYs to be configured through the generic functions through a custom structure added to the generic union.
The parameters added here are based on HDMI PHY implementation practices. The current set of parameters should cover the potential users.
--- include/linux/phy/phy-hdmi.h | 38 ++++++++++++++++++++++++++++++++++++ include/linux/phy/phy.h | 7 ++++++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 include/linux/phy/phy-hdmi.h
include/linux/phy/phy-hdmi.h new file +38 -0
@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright 2022 NXP +*/ + +#ifndef __PHY_HDMI_H_ +#define __PHY_HDMI_H_ + +/** +* Pixel Encoding as HDMI Specification +* RGB, YUV422, YUV444:HDMI Specification 1.4a Section 6.5 +* YUV420: HDMI Specification 2.a Section 7.1 +*/ +enum hdmi_phy_colorspace { +HDMI_PHY_COLORSPACE_RGB ,/* RGB 4:4:4 */ +HDMI_PHY_COLORSPACE_YUV422 ,/* YCbCr 4:2:2 */ +HDMI_PHY_COLORSPACE_YUV444 ,/* YCbCr 4:4:4 */ +HDMI_PHY_COLORSPACE_YUV420 ,/* YCbCr 4:2:0 */ +HDMI_PHY_COLORSPACE_RESERVED4 , +HDMI_PHY_COLORSPACE_RESERVED5 , +HDMI_PHY_COLORSPACE_RESERVED6 , +}; + +/** +* struct phy_configure_opts_hdmi - HDMI configuration set +* @pixel_clk_rate: Pixel clock of video modes in KHz. +* @bpc: Maximum bits per color channel. +* @color_space: Colorspace in enum hdmi_phy_colorspace. +* +* This structure is used to represent the configuration state of a HDMI phy. +*/ +struct phy_configure_opts_hdmi { +unsigned int pixel_clk_rate; +unsigned int bpc; +enum hdmi_phy_colorspace color_space; +}; + +#endif /* __PHY_HDMI_H_ */
include/linux/phy/phy.h +6 -1
@@ -17,6 +17,7 @@#include <linux/regulator/consumer.h> #include <linux/phy/phy-dp.h> +#include <linux/phy/phy-hdmi.h> #include <linux/phy/phy-lvds.h> #include <linux/phy/phy-mipi-dphy.h>
@@ -42,7 +43,8 @@ enum phy_mode {PHY_MODE_MIPI_DPHY ,PHY_MODE_SATA ,PHY_MODE_LVDS , -PHY_MODE_DP +PHY_MODE_DP , + PHY_MODE_HDMI, }; enum phy_media {
@@ -60,11 +62,14 @@ enum phy_media {* the DisplayPort protocol. * @lvds: Configuration set applicable for phys supporting * the LVDS phy mode. +* @hdmi: Configuration set applicable for phys supporting +* the HDMI phy mode. */ union phy_configure_opts {struct phy_configure_opts_mipi_dphy mipi_dphy;struct phy_configure_opts_dp dp;struct phy_configure_opts_lvds lvds; +struct phy_configure_opts_hdmi hdmi; };/**
Signature · 1 line
2.34.1
Vinod Koul
maintainerRe: [PATCH v6 4/8] phy: Add HDMI configuration options
Quoted 28 lines · Sandor Yu
Allow HDMI PHYs to be configured through the generic functions through a custom structure added to the generic union.
The parameters added here are based on HDMI PHY implementation practices. The current set of parameters should cover the potential users.
Signed-off-by Sandor Yu <[email protected]>--- include/linux/phy/phy-hdmi.h | 38 ++++++++++++++++++++++++++++++++++++ include/linux/phy/phy.h | 7 ++++++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 include/linux/phy/phy-hdmi.hinclude/linux/phy/phy-hdmi.h new file +8
-0@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright 2022 NXP +*/ + +#ifndef __PHY_HDMI_H_ +#define __PHY_HDMI_H_ +
include/linux/phy/phy-hdmi.h line 18
Quoted 10 lines
include/linux/phy/phy-hdmi.h new file +10
-0+/** +* Pixel Encoding as HDMI Specification +* RGB, YUV422, YUV444:HDMI Specification 1.4a Section 6.5 +* YUV420: HDMI Specification 2.a Section 7.1 +*/ +enum hdmi_phy_colorspace { +HDMI_PHY_COLORSPACE_RGB ,/* RGB 4:4:4 */ +HDMI_PHY_COLORSPACE_YUV422 ,/* YCbCr 4:2:2 */ +HDMI_PHY_COLORSPACE_YUV444 ,/* YCbCr 4:4:4 */ +HDMI_PHY_COLORSPACE_YUV420 ,/* YCbCr 4:2:0 */
Better add this comments and above one as expected by kernel-doc for enum..
Quoted 59 lines
include/linux/phy/phy-hdmi.h new file +20
-0+HDMI_PHY_COLORSPACE_RESERVED4 , +HDMI_PHY_COLORSPACE_RESERVED5 , + HDMI_PHY_COLORSPACE_RESERVED6, +}; + +/** +* struct phy_configure_opts_hdmi - HDMI configuration set +* @pixel_clk_rate: Pixel clock of video modes in KHz. +* @bpc: Maximum bits per color channel. +* @color_space: Colorspace in enum hdmi_phy_colorspace. +* +* This structure is used to represent the configuration state of a HDMI phy. +*/ +struct phy_configure_opts_hdmi { +unsigned int pixel_clk_rate; +unsigned int bpc; +enum hdmi_phy_colorspace color_space; +}; + +#endif /* __PHY_HDMI_H_ */ include/linux/phy/phy.h +6
-1@@ -17,6 +17,7 @@#include <linux/regulator/consumer.h> #include <linux/phy/phy-dp.h> +#include <linux/phy/phy-hdmi.h> #include <linux/phy/phy-lvds.h> #include <linux/phy/phy-mipi-dphy.h> @@ -42,7 +43,8 @@ enum phy_mode {PHY_MODE_MIPI_DPHY ,PHY_MODE_SATA ,PHY_MODE_LVDS , -PHY_MODE_DP +PHY_MODE_DP , + PHY_MODE_HDMI, }; enum phy_media {@@ -60,11 +62,14 @@ enum phy_media {* the DisplayPort protocol. * @lvds: Configuration set applicable for phys supporting * the LVDS phy mode. +* @hdmi: Configuration set applicable for phys supporting +* the HDMI phy mode. */ union phy_configure_opts {struct phy_configure_opts_mipi_dphy mipi_dphy;struct phy_configure_opts_dp dp;struct phy_configure_opts_lvds lvds; +struct phy_configure_opts_hdmi hdmi; };/** Signature · 1 line
2.34.1
Signature · 1 line
~Vinod
RE: [EXT] Re: [PATCH v6 4/8] phy: Add HDMI configuration options
Hi Vinod,
Thanks for your comments,
Quoted 54 lines
-----Original Message-----
From: Vinod Koul <[email protected]>
Sent: 2023年6月21日 19:22
To: Sandor Yu <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; dl-linux-imx <[email protected]>; Oliver Brown <[email protected]>
Subject: [EXT] Re: [PATCH v6 4/8] phy: Add HDMI configuration optionsCaution: This is an external email. Please take care when clicking links or opening attachments. When in doubt, report the message using the 'Report this email' button
Quoted 10 lines · Sandor Yu
Allow HDMI PHYs to be configured through the generic functions through a custom structure added to the generic union.
The parameters added here are based on HDMI PHY implementation practices. The current set of parameters should cover the potential users.
Signed-off-by Sandor Yu <[email protected]>--- include/linux/phy/phy-hdmi.h | 38++++++++++++++++++++++++++++++++++++
Quoted 22 lines
include/linux/phy/phy.h | 7 ++++++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644
include/linux/phy/phy-hdmi.h(quoted diff) +0
-0
b/include/linux/phy/phy-hdmi.hnew file mode 100644 index 000000000000..5765aa5bc175include/linux/phy/phy-hdmi.h new file +12
-0@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright 2022 NXP +*/ + +#ifndef __PHY_HDMI_H_ +#define __PHY_HDMI_H_ + +/** +* Pixel Encoding as HDMI Specification +* RGB, YUV422, YUV444:HDMI Specification 1.4a Section 6.5 + * YUV420: HDMI Specification 2.a Section 7.1 */ enum
Quoted 8 lines
include/linux/phy/phy-hdmi.h line 18
Quoted 5 lines
include/linux/phy/phy-hdmi.h new file +5
-0+hdmi_phy_colorspace { +HDMI_PHY_COLORSPACE_RGB ,/* RGB 4:4:4 */ +HDMI_PHY_COLORSPACE_YUV422 ,/* YCbCr 4:2:2 */ +HDMI_PHY_COLORSPACE_YUV444 ,/* YCbCr 4:4:4 */ + HDMI_PHY_COLORSPACE_YUV420, /* YCbCr 4:2:0 */Better add this comments and above one as expected by kernel-doc for enum..
OK, I will add it and it will replace by enum hdmi_colorspace in <linux/hdmi.h> in the next version.
Quoted 56 lines
Quoted 56 lines
include/linux/phy/phy-hdmi.h new file +19
-0+HDMI_PHY_COLORSPACE_RESERVED4 , +HDMI_PHY_COLORSPACE_RESERVED5 , + HDMI_PHY_COLORSPACE_RESERVED6, +}; + +/** +* struct phy_configure_opts_hdmi - HDMI configuration set +* @pixel_clk_rate: Pixel clock of video modes in KHz. +* @bpc: Maximum bits per color channel. +* @color_space: Colorspace in enum hdmi_phy_colorspace. +* +* This structure is used to represent the configuration state of a HDMI phy. +*/ +struct phy_configure_opts_hdmi { +unsigned int pixel_clk_rate; +unsigned int bpc; +enum hdmi_phy_colorspace color_space; }; + +#endif /* __PHY_HDMI_H_ */ include/linux/phy/phy.h index renamed from include/linux/phy/phy.h +0
-0
3a570bc59fc7..93d77d45b1d4100644include/linux/phy/phy.h +6
-1@@ -17,6 +17,7 @@#include <linux/regulator/consumer.h> #include <linux/phy/phy-dp.h> +#include <linux/phy/phy-hdmi.h> #include <linux/phy/phy-lvds.h> #include <linux/phy/phy-mipi-dphy.h> @@ -42,7 +43,8 @@ enum phy_mode {PHY_MODE_MIPI_DPHY ,PHY_MODE_SATA ,PHY_MODE_LVDS , -PHY_MODE_DP +PHY_MODE_DP , + PHY_MODE_HDMI, }; enum phy_media {@@ -60,11 +62,14 @@ enum phy_media {* the DisplayPort protocol. * @lvds: Configuration set applicable for phys supporting * the LVDS phy mode. +* @hdmi: Configuration set applicable for phys supporting +* the HDMI phy mode. */ union phy_configure_opts {struct phy_configure_opts_mipi_dphy mipi_dphy;struct phy_configure_opts_dp dp;struct phy_configure_opts_lvds lvds; +struct phy_configure_opts_hdmi hdmi; };
Quoted 6 lines
Quoted 3 lines
include/linux/phy/phy.h +0
-1/** -- 2.34.1
--
~Vinod
B.R
Sandor
Re: [PATCH v6 4/8] phy: Add HDMI configuration options
In reply to Sandor YuQuoted 32 lines · Sandor Yu
Allow HDMI PHYs to be configured through the generic functions through a custom structure added to the generic union.
The parameters added here are based on HDMI PHY implementation practices. The current set of parameters should cover the potential users.
Signed-off-by Sandor Yu <[email protected]>--- include/linux/phy/phy-hdmi.h | 38 ++++++++++++++++++++++++++++++++++++ include/linux/phy/phy.h | 7 ++++++- 2 files changed, 44 insertions(+), 1 deletion(-)create mode 100644
include/linux/phy/phy-hdmi.hinclude/linux/phy/phy-hdmi.h new file +12
-0@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright 2022 NXP +*/ + +#ifndef __PHY_HDMI_H_ +#define __PHY_HDMI_H_ + +/** +* Pixel Encoding as HDMI Specification +* RGB, YUV422, YUV444:HDMI Specification 1.4a Section 6.5 +* YUV420: HDMI Specification 2.a Section 7.1
include/linux/phy/phy-hdmi.h line 22
Quoted 10 lines
include/linux/phy/phy-hdmi.h new file +10
-0+*/ +enum hdmi_phy_colorspace { +HDMI_PHY_COLORSPACE_RGB ,/* RGB 4:4:4 */ +HDMI_PHY_COLORSPACE_YUV422 ,/* YCbCr 4:2:2 */ +HDMI_PHY_COLORSPACE_YUV444 ,/* YCbCr 4:4:4 */ +HDMI_PHY_COLORSPACE_YUV420 ,/* YCbCr 4:2:0 */ +HDMI_PHY_COLORSPACE_RESERVED4 , +HDMI_PHY_COLORSPACE_RESERVED5 , +HDMI_PHY_COLORSPACE_RESERVED6 , +};
This enum duplicates enum hdmi_colorspace from <linux/hdmi.h> HDMI 2.0 defines '7' to be IDO-defined.
Would it be better to use that enum instead?
Quoted 6 lines
include/linux/phy/phy-hdmi.h new file +6
-0+ +/** +* struct phy_configure_opts_hdmi - HDMI configuration set +* @pixel_clk_rate: Pixel clock of video modes in KHz. +* @bpc: Maximum bits per color channel. +* @color_space: Colorspace in enum hdmi_phy_colorspace.
include/linux/phy/phy-hdmi.h line 38
Quoted 10 lines
include/linux/phy/phy-hdmi.h new file +10
-0+* +* This structure is used to represent the configuration state of a HDMI phy. +*/ +struct phy_configure_opts_hdmi { +unsigned int pixel_clk_rate; +unsigned int bpc; +enum hdmi_phy_colorspace color_space; +}; + +#endif /* __PHY_HDMI_H_ */
[skipped the rest]
Signature · 2 lines
With best wishes Dmitry
RE: [EXT] Re: [PATCH v6 4/8] phy: Add HDMI configuration options
Hi Dmitry,
Thanks for your comments,
Quoted 68 lines
-----Original Message-----
From: Dmitry Baryshkov <[email protected]>
Sent: 2023年6月25日 2:02
To: Sandor Yu <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Cc: [email protected]; dl-linux-imx <[email protected]>; Oliver Brown <[email protected]>
Subject: [EXT] Re: [PATCH v6 4/8] phy: Add HDMI configuration optionsCaution: This is an external email. Please take care when clicking links or opening attachments. When in doubt, report the message using the 'Report this email' button
Quoted 10 lines · Sandor Yu
Allow HDMI PHYs to be configured through the generic functions through a custom structure added to the generic union.
The parameters added here are based on HDMI PHY implementation practices. The current set of parameters should cover the potential users.
Signed-off-by Sandor Yu <[email protected]>--- include/linux/phy/phy-hdmi.h | 38++++++++++++++++++++++++++++++++++++
Quoted 21 lines
include/linux/phy/phy.h | 7 ++++++- 2 files changed, 44 insertions(+), 1 deletion(-)create mode 100644
include/linux/phy/phy-hdmi.h(quoted diff) +0
-0
b/include/linux/phy/phy-hdmi.hnew file mode 100644 index 000000000000..5765aa5bc175include/linux/phy/phy-hdmi.h new file +11
-0@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright 2022 NXP +*/ + +#ifndef __PHY_HDMI_H_ +#define __PHY_HDMI_H_ + +/** +* Pixel Encoding as HDMI Specification +* RGB, YUV422, YUV444:HDMI Specification 1.4a Section 6.5 include/linux/phy/phy-hdmi.h line 21
Quoted 10 lines
include/linux/phy/phy-hdmi.h new file +10
-0+* YUV420: HDMI Specification 2.a Section 7.1 */ enum +hdmi_phy_colorspace { +HDMI_PHY_COLORSPACE_RGB ,/* RGB 4:4:4 */ +HDMI_PHY_COLORSPACE_YUV422 ,/* YCbCr 4:2:2 */ +HDMI_PHY_COLORSPACE_YUV444 ,/* YCbCr 4:4:4 */ +HDMI_PHY_COLORSPACE_YUV420 ,/* YCbCr 4:2:0 */ +HDMI_PHY_COLORSPACE_RESERVED4 , +HDMI_PHY_COLORSPACE_RESERVED5 , +HDMI_PHY_COLORSPACE_RESERVED6 , +};This enum duplicates enum
hdmi_colorspacefrom <linux/hdmi.h> HDMI 2.0 defines '7' to be IDO-defined.
Quoted 1 line
Would it be better to use that enum instead?
Accept. I will create head file hdmi_colorspace.h to reuse enum hdmi_colorspace in <linux/hdmi.h>.
B.R
Sandor
Quoted 22 lines
Quoted 6 lines
include/linux/phy/phy-hdmi.h new file +5
-0+ +/** +* struct phy_configure_opts_hdmi - HDMI configuration set +* @pixel_clk_rate: Pixel clock of video modes in KHz. +* @bpc: Maximum bits per color channel. include/linux/phy/phy-hdmi.h line 38
Quoted 10 lines
include/linux/phy/phy-hdmi.h new file +10
-0+* @color_space: Colorspace in enum hdmi_phy_colorspace. +* +* This structure is used to represent the configuration state of a HDMI phy. +*/ +struct phy_configure_opts_hdmi { +unsigned int pixel_clk_rate; +unsigned int bpc; +enum hdmi_phy_colorspace color_space; }; + +#endif /* __PHY_HDMI_H_ */ [skipped the rest]
--
With best wishes
Dmitry
Re: [EXT] Re: [PATCH v6 4/8] phy: Add HDMI configuration options
Quoted 20 lines · Sandor Yu
Hi Dmitry,
Thanks for your comments,
Quoted 15 lines
-----Original Message-----
From: Dmitry Baryshkov <[email protected]>
Sent: 2023年6月25日 2:02
To: Sandor Yu <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Cc: [email protected]; dl-linux-imx <[email protected]>; Oliver Brown <[email protected]>
Subject: [EXT] Re: [PATCH v6 4/8] phy: Add HDMI configuration options
Is this part necessary?
Quoted 53 lines
Quoted 53 lines
Caution: This is an external email. Please take care when clicking links or opening attachments. When in doubt, report the message using the 'Report this email' button
Quoted 10 lines · Sandor Yu
Allow HDMI PHYs to be configured through the generic functions through a custom structure added to the generic union.
The parameters added here are based on HDMI PHY implementation practices. The current set of parameters should cover the potential users.
Signed-off-by Sandor Yu <[email protected]>--- include/linux/phy/phy-hdmi.h | 38++++++++++++++++++++++++++++++++++++
Quoted 21 lines
include/linux/phy/phy.h | 7 ++++++- 2 files changed, 44 insertions(+), 1 deletion(-)create mode 100644
include/linux/phy/phy-hdmi.h(quoted diff) +0
-0
b/include/linux/phy/phy-hdmi.hnew file mode 100644 index 000000000000..5765aa5bc175include/linux/phy/phy-hdmi.h new file +11
-0@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright 2022 NXP +*/ + +#ifndef __PHY_HDMI_H_ +#define __PHY_HDMI_H_ + +/** +* Pixel Encoding as HDMI Specification +* RGB, YUV422, YUV444:HDMI Specification 1.4a Section 6.5 include/linux/phy/phy-hdmi.h line 21
Quoted 10 lines
include/linux/phy/phy-hdmi.h new file +10
-0+* YUV420: HDMI Specification 2.a Section 7.1 */ enum +hdmi_phy_colorspace { +HDMI_PHY_COLORSPACE_RGB ,/* RGB 4:4:4 */ +HDMI_PHY_COLORSPACE_YUV422 ,/* YCbCr 4:2:2 */ +HDMI_PHY_COLORSPACE_YUV444 ,/* YCbCr 4:4:4 */ +HDMI_PHY_COLORSPACE_YUV420 ,/* YCbCr 4:2:0 */ +HDMI_PHY_COLORSPACE_RESERVED4 , +HDMI_PHY_COLORSPACE_RESERVED5 , +HDMI_PHY_COLORSPACE_RESERVED6 , +};This enum duplicates enum
hdmi_colorspacefrom <linux/hdmi.h> HDMI 2.0 defines '7' to be IDO-defined.
Quoted 2 lines
Quoted 1 line
Would it be better to use that enum instead?
Accept. I will create head file
hdmi_colorspace.hto reuse enumhdmi_colorspacein <linux/hdmi.h>.
Hmm, you need another header file to reuse this enum.
Quoted 26 lines
B.R
SandorQuoted 22 lines
Quoted 6 lines
include/linux/phy/phy-hdmi.h new file +5
-0+ +/** +* struct phy_configure_opts_hdmi - HDMI configuration set +* @pixel_clk_rate: Pixel clock of video modes in KHz. +* @bpc: Maximum bits per color channel. include/linux/phy/phy-hdmi.h line 38
Quoted 10 lines
include/linux/phy/phy-hdmi.h new file +10
-0+* @color_space: Colorspace in enum hdmi_phy_colorspace. +* +* This structure is used to represent the configuration state of a HDMI phy. +*/ +struct phy_configure_opts_hdmi { +unsigned int pixel_clk_rate; +unsigned int bpc; +enum hdmi_phy_colorspace color_space; }; + +#endif /* __PHY_HDMI_H_ */ [skipped the rest]
--
With best wishes
Dmitry
Signature · 2 lines
With best wishes Dmitry
RE: [EXT] Re: [PATCH v6 4/8] phy: Add HDMI configuration options
Quoted 42 lines
-----Original Message-----
From: Dmitry Baryshkov <[email protected]>
Sent: 2023年7月10日 15:30
To: Sandor Yu <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; dl-linux-imx <[email protected]>; Oliver Brown <[email protected]>
Subject: Re: [EXT] Re: [PATCH v6 4/8] phy: Add HDMI configuration optionsQuoted 21 lines · Sandor Yu
Hi Dmitry,
Thanks for your comments,
Quoted 16 lines
-----Original Message-----
From: Dmitry Baryshkov <[email protected]>
Sent: 2023年6月25日 2:02
To: Sandor Yu <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Cc: [email protected]; dl-linux-imx <[email protected]>; Oliver Brown <[email protected]>
Subject: [EXT] Re: [PATCH v6 4/8] phy: Add HDMI configuration options
Quoted 1 line
Is this part necessary?
No, forgot to remove the Caution it is auto added by mail system.
Quoted 88 lines
Quoted 53 lines
Quoted 53 lines
Caution: This is an external email. Please take care when clicking links or opening attachments. When in doubt, report the message using the 'Report this email' button
Quoted 10 lines · Sandor Yu
Allow HDMI PHYs to be configured through the generic functions through a custom structure added to the generic union.
The parameters added here are based on HDMI PHY implementation practices. The current set of parameters should cover the potential users.
Signed-off-by Sandor Yu <[email protected]>--- include/linux/phy/phy-hdmi.h | 38++++++++++++++++++++++++++++++++++++
Quoted 20 lines
include/linux/phy/phy.h | 7 ++++++- 2 files changed, 44 insertions(+), 1 deletion(-)create mode 100644
include/linux/phy/phy-hdmi.h(quoted diff) +0
-0
b/include/linux/phy/phy-hdmi.hnew file mode 100644 index 000000000000..5765aa5bc175include/linux/phy/phy-hdmi.h new file +10
-0@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright 2022 NXP +*/ + +#ifndef __PHY_HDMI_H_ +#define __PHY_HDMI_H_ + +/** +* Pixel Encoding as HDMI Specification include/linux/phy/phy-hdmi.h line 20
Quoted 10 lines
include/linux/phy/phy-hdmi.h new file +10
-0+* RGB, YUV422, YUV444:HDMI Specification 1.4a Section 6.5 +* YUV420: HDMI Specification 2.a Section 7.1 */ enum +hdmi_phy_colorspace { +HDMI_PHY_COLORSPACE_RGB ,/* RGB 4:4:4 */ +HDMI_PHY_COLORSPACE_YUV422 ,/* YCbCr 4:2:2 */ +HDMI_PHY_COLORSPACE_YUV444 ,/* YCbCr 4:4:4 */ +HDMI_PHY_COLORSPACE_YUV420 ,/* YCbCr 4:2:0 */ +HDMI_PHY_COLORSPACE_RESERVED4 , +HDMI_PHY_COLORSPACE_RESERVED5 , +HDMI_PHY_COLORSPACE_RESERVED6 , };This enum duplicates enum
hdmi_colorspacefrom <linux/hdmi.h> HDMI 2.0 defines '7' to be IDO-defined.Quoted 2 lines
Quoted 1 line
Would it be better to use that enum instead?
Accept. I will create head file
hdmi_colorspace.hto reuse enum
hdmi_colorspacein <linux/hdmi.h>.Hmm, you need another header file to reuse this enum.
Quoted 4 lines
B.R
SandorQuoted 1 line
Quoted 8 lines
Quoted 8 lines
include/linux/phy/phy-hdmi.h
Quoted 8 lines
include/linux/phy/phy-hdmi.h new file +8
-0+ +/** +* struct phy_configure_opts_hdmi - HDMI configuration set +* @pixel_clk_rate: Pixel clock of video modes in KHz. +* @bpc: Maximum bits per color channel. +* @color_space: Colorspace in enum hdmi_phy_colorspace. +* +* This structure is used to represent the configuration state of a HDMI phy.
Quoted 10 lines
Quoted 10 lines
include/linux/phy/phy-hdmi.h line 38
Quoted 7 lines
include/linux/phy/phy-hdmi.h new file +7
-0+*/ +struct phy_configure_opts_hdmi { +unsigned int pixel_clk_rate; +unsigned int bpc; +enum hdmi_phy_colorspace color_space; }; + +#endif /* __PHY_HDMI_H_ */ [skipped the rest]
Quoted 4 lines
Quoted 3 lines
--
With best wishes
Dmitry
Quoted 3 lines
--
With best wishes
Dmitry
B.R
Sandor
Re: [EXT] Re: [PATCH v6 4/8] phy: Add HDMI configuration options
In reply to Sandor YuQuoted 52 lines · Sandor Yu
Hi Dmitry,
Thanks for your comments,
Quoted 48 lines
From: Dmitry Baryshkov <[email protected]>
Quoted 10 lines · Sandor Yu
Allow HDMI PHYs to be configured through the generic functions through a custom structure added to the generic union.
The parameters added here are based on HDMI PHY implementation practices. The current set of parameters should cover the potential users.
Signed-off-by Sandor Yu <[email protected]>--- include/linux/phy/phy-hdmi.h | 38++++++++++++++++++++++++++++++++++++
Quoted 21 lines
include/linux/phy/phy.h | 7 ++++++- 2 files changed, 44 insertions(+), 1 deletion(-)create mode 100644
include/linux/phy/phy-hdmi.h(quoted diff) +0
-0
b/include/linux/phy/phy-hdmi.hnew file mode 100644 index 000000000000..5765aa5bc175include/linux/phy/phy-hdmi.h new file +11
-0@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright 2022 NXP +*/ + +#ifndef __PHY_HDMI_H_ +#define __PHY_HDMI_H_ + +/** +* Pixel Encoding as HDMI Specification +* RGB, YUV422, YUV444:HDMI Specification 1.4a Section 6.5 include/linux/phy/phy-hdmi.h line 21
Quoted 10 lines
include/linux/phy/phy-hdmi.h new file +10
-0+* YUV420: HDMI Specification 2.a Section 7.1 */ enum +hdmi_phy_colorspace { +HDMI_PHY_COLORSPACE_RGB ,/* RGB 4:4:4 */ +HDMI_PHY_COLORSPACE_YUV422 ,/* YCbCr 4:2:2 */ +HDMI_PHY_COLORSPACE_YUV444 ,/* YCbCr 4:4:4 */ +HDMI_PHY_COLORSPACE_YUV420 ,/* YCbCr 4:2:0 */ +HDMI_PHY_COLORSPACE_RESERVED4 , +HDMI_PHY_COLORSPACE_RESERVED5 , +HDMI_PHY_COLORSPACE_RESERVED6 , +};This enum duplicates enum
hdmi_colorspacefrom <linux/hdmi.h> HDMI 2.0 defines '7' to be IDO-defined.
Quoted 2 lines
Quoted 1 line
Would it be better to use that enum instead?
Accept. I will create head file
hdmi_colorspace.hto reuse enumhdmi_colorspacein <linux/hdmi.h>.
Excuse me, it was supposed to be a question.
Do you need another header file to reuse this enum?
Quoted 26 lines
B.R
SandorQuoted 22 lines
Quoted 6 lines
include/linux/phy/phy-hdmi.h new file +5
-0+ +/** +* struct phy_configure_opts_hdmi - HDMI configuration set +* @pixel_clk_rate: Pixel clock of video modes in KHz. +* @bpc: Maximum bits per color channel. include/linux/phy/phy-hdmi.h line 38
Quoted 10 lines
include/linux/phy/phy-hdmi.h new file +10
-0+* @color_space: Colorspace in enum hdmi_phy_colorspace. +* +* This structure is used to represent the configuration state of a HDMI phy. +*/ +struct phy_configure_opts_hdmi { +unsigned int pixel_clk_rate; +unsigned int bpc; +enum hdmi_phy_colorspace color_space; }; + +#endif /* __PHY_HDMI_H_ */ [skipped the rest]
--
With best wishes
Dmitry
Signature · 8 lines
With best wishes Dmitry -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
RE: [EXT] Re: [PATCH v6 4/8] phy: Add HDMI configuration options
Quoted 71 lines
-----Original Message-----
From: Dmitry Baryshkov <[email protected]>
Sent: 2023年7月10日 15:44
To: Sandor Yu <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Cc: [email protected]; dl-linux-imx <[email protected]>; Oliver Brown <[email protected]>
Subject: Re: [EXT] Re: [PATCH v6 4/8] phy: Add HDMI configuration optionsQuoted 51 lines · Sandor Yu
Hi Dmitry,
Thanks for your comments,
Quoted 47 lines
From: Dmitry Baryshkov <[email protected]> On 15/06/2023
Quoted 10 lines · Sandor Yu
Allow HDMI PHYs to be configured through the generic functions through a custom structure added to the generic union.
The parameters added here are based on HDMI PHY implementation practices. The current set of parameters should cover the potential users.
Signed-off-by Sandor Yu <[email protected]>--- include/linux/phy/phy-hdmi.h | 38++++++++++++++++++++++++++++++++++++
Quoted 20 lines
include/linux/phy/phy.h | 7 ++++++- 2 files changed, 44 insertions(+), 1 deletion(-)create mode 100644
include/linux/phy/phy-hdmi.h(quoted diff) +0
-0
b/include/linux/phy/phy-hdmi.hnew file mode 100644 index 000000000000..5765aa5bc175include/linux/phy/phy-hdmi.h new file +10
-0@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright 2022 NXP +*/ + +#ifndef __PHY_HDMI_H_ +#define __PHY_HDMI_H_ + +/** +* Pixel Encoding as HDMI Specification include/linux/phy/phy-hdmi.h line 20
Quoted 10 lines
include/linux/phy/phy-hdmi.h new file +10
-0+* RGB, YUV422, YUV444:HDMI Specification 1.4a Section 6.5 +* YUV420: HDMI Specification 2.a Section 7.1 */ enum +hdmi_phy_colorspace { +HDMI_PHY_COLORSPACE_RGB ,/* RGB 4:4:4 */ +HDMI_PHY_COLORSPACE_YUV422 ,/* YCbCr 4:2:2 */ +HDMI_PHY_COLORSPACE_YUV444 ,/* YCbCr 4:4:4 */ +HDMI_PHY_COLORSPACE_YUV420 ,/* YCbCr 4:2:0 */ +HDMI_PHY_COLORSPACE_RESERVED4 , +HDMI_PHY_COLORSPACE_RESERVED5 , +HDMI_PHY_COLORSPACE_RESERVED6 , };This enum duplicates enum
hdmi_colorspacefrom <linux/hdmi.h> HDMI 2.0 defines '7' to be IDO-defined.
Quoted 7 lines
Quoted 2 lines
Quoted 1 line
Would it be better to use that enum instead?
Accept. I will create head file
hdmi_colorspace.hto reuse enum
hdmi_colorspacein <linux/hdmi.h>.Excuse me, it was supposed to be a question.
Do you need another header file to reuse this enum?
I'm not sure community whether would accept the patch that simply include <linux/hdmi.h> in phy-hdmi.h because there are lots of other definition in <linux/hdmi.h> that not need by phy-hdmi.h. If the answer is yes, I happy to follow.
Quoted 24 lines
Quoted 5 lines
B.R
SandorQuoted 1 line
Quoted 8 lines
Quoted 8 lines
include/linux/phy/phy-hdmi.h
Quoted 8 lines
include/linux/phy/phy-hdmi.h new file +8
-0+ +/** +* struct phy_configure_opts_hdmi - HDMI configuration set +* @pixel_clk_rate: Pixel clock of video modes in KHz. +* @bpc: Maximum bits per color channel. +* @color_space: Colorspace in enum hdmi_phy_colorspace. +* +* This structure is used to represent the configuration state of a HDMI phy.
Quoted 10 lines
Quoted 10 lines
include/linux/phy/phy-hdmi.h line 38
Quoted 7 lines
include/linux/phy/phy-hdmi.h new file +7
-0+*/ +struct phy_configure_opts_hdmi { +unsigned int pixel_clk_rate; +unsigned int bpc; +enum hdmi_phy_colorspace color_space; }; + +#endif /* __PHY_HDMI_H_ */ [skipped the rest]
Quoted 8 lines
Quoted 4 lines
Quoted 3 lines
--
With best wishes
Dmitry--
With best wishes
Dmitry
B.R
Sandor
Re: [EXT] Re: [PATCH v6 4/8] phy: Add HDMI configuration options
Quoted 74 lines · Sandor Yu
Quoted 74 lines
-----Original Message-----
From: Dmitry Baryshkov <[email protected]>
Sent: 2023年7月10日 15:44
To: Sandor Yu <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Cc: [email protected]; dl-linux-imx <[email protected]>; Oliver Brown <[email protected]>
Subject: Re: [EXT] Re: [PATCH v6 4/8] phy: Add HDMI configuration optionsQuoted 53 lines · Sandor Yu
Hi Dmitry,
Thanks for your comments,
Quoted 47 lines
From: Dmitry Baryshkov <[email protected]> On 15/06/2023
Quoted 10 lines · Sandor Yu
Allow HDMI PHYs to be configured through the generic functions through a custom structure added to the generic union.
The parameters added here are based on HDMI PHY implementation practices. The current set of parameters should cover the potential users.
Signed-off-by Sandor Yu <[email protected]>--- include/linux/phy/phy-hdmi.h | 38++++++++++++++++++++++++++++++++++++
Quoted 20 lines
include/linux/phy/phy.h | 7 ++++++- 2 files changed, 44 insertions(+), 1 deletion(-)create mode 100644
include/linux/phy/phy-hdmi.h(quoted diff) +0
-0
b/include/linux/phy/phy-hdmi.hnew file mode 100644 index 000000000000..5765aa5bc175include/linux/phy/phy-hdmi.h new file +10
-0@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright 2022 NXP +*/ + +#ifndef __PHY_HDMI_H_ +#define __PHY_HDMI_H_ + +/** +* Pixel Encoding as HDMI Specification include/linux/phy/phy-hdmi.h line 20
Quoted 10 lines
include/linux/phy/phy-hdmi.h new file +10
-0+* RGB, YUV422, YUV444:HDMI Specification 1.4a Section 6.5 +* YUV420: HDMI Specification 2.a Section 7.1 */ enum +hdmi_phy_colorspace { +HDMI_PHY_COLORSPACE_RGB ,/* RGB 4:4:4 */ +HDMI_PHY_COLORSPACE_YUV422 ,/* YCbCr 4:2:2 */ +HDMI_PHY_COLORSPACE_YUV444 ,/* YCbCr 4:4:4 */ +HDMI_PHY_COLORSPACE_YUV420 ,/* YCbCr 4:2:0 */ +HDMI_PHY_COLORSPACE_RESERVED4 , +HDMI_PHY_COLORSPACE_RESERVED5 , +HDMI_PHY_COLORSPACE_RESERVED6 , };This enum duplicates enum
hdmi_colorspacefrom <linux/hdmi.h> HDMI 2.0 defines '7' to be IDO-defined.Quoted 1 line
Would it be better to use that enum instead?
Accept. I will create head file
hdmi_colorspace.hto reuse enum
Quoted 8 lines
Quoted 5 lines
hdmi_colorspacein <linux/hdmi.h>.Excuse me, it was supposed to be a question.
Do you need another header file to reuse this enum?
I'm not sure community whether would accept the patch that simply include <
linux/hdmi.h> inphy-hdmi.hbecause there are lots of other definition in <linux/hdmi.h> that not need byphy-hdmi.h. If the answer is yes, I happy to follow.
In my opinion it's a better alternative to creating yet another header.
Quoted 37 lines
Quoted 25 lines
Quoted 6 lines
B.R
SandorQuoted 1 line
Quoted 8 lines
Quoted 8 lines
include/linux/phy/phy-hdmi.h
Quoted 8 lines
include/linux/phy/phy-hdmi.h new file +8
-0+ +/** +* struct phy_configure_opts_hdmi - HDMI configuration set +* @pixel_clk_rate: Pixel clock of video modes in KHz. +* @bpc: Maximum bits per color channel. +* @color_space: Colorspace in enum hdmi_phy_colorspace. +* +* This structure is used to represent the configuration state of a HDMI phy.
Quoted 10 lines
Quoted 10 lines
include/linux/phy/phy-hdmi.h line 38
Quoted 7 lines
include/linux/phy/phy-hdmi.h new file +7
-0+*/ +struct phy_configure_opts_hdmi { +unsigned int pixel_clk_rate; +unsigned int bpc; +enum hdmi_phy_colorspace color_space; }; + +#endif /* __PHY_HDMI_H_ */ [skipped the rest]
Quoted 8 lines
Quoted 4 lines
Quoted 3 lines
--
With best wishes
Dmitry--
With best wishes
DmitryB.R
Sandor
Signature · 2 lines
With best wishes Dmitry
RE: [EXT] Re: [PATCH v6 4/8] phy: Add HDMI configuration options
Quoted 84 lines · Sandor Yu
Quoted 80 lines
Quoted 80 lines
-----Original Message-----
From: Dmitry Baryshkov <[email protected]>
Sent: 2023年7月10日 15:44
To: Sandor Yu <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Cc: [email protected]; dl-linux-imx <[email protected]>; Oliver Brown <[email protected]>
Subject: Re: [EXT] Re: [PATCH v6 4/8] phy: Add HDMI configuration optionsQuoted 52 lines · Sandor Yu
Hi Dmitry,
Thanks for your comments,
Quoted 48 lines
From: Dmitry Baryshkov <[email protected]> On
Quoted 10 lines · Sandor Yu
Allow HDMI PHYs to be configured through the generic functions through a custom structure added to the generic union.
The parameters added here are based on HDMI PHY implementation practices. The current set of parameters should cover the potential users.
Signed-off-by Sandor Yu <[email protected]>--- include/linux/phy/phy-hdmi.h | 38++++++++++++++++++++++++++++++++++++
Quoted 20 lines
include/linux/phy/phy.h | 7 ++++++- 2 files changed, 44 insertions(+), 1 deletion(-)create mode 100644
include/linux/phy/phy-hdmi.h(quoted diff) +0
-0
b/include/linux/phy/phy-hdmi.hnew file mode 100644 index 000000000000..5765aa5bc175include/linux/phy/phy-hdmi.h new file +10
-0@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright 2022 NXP +*/ + +#ifndef __PHY_HDMI_H_ +#define __PHY_HDMI_H_ + +/** +* Pixel Encoding as HDMI Specification include/linux/phy/phy-hdmi.h line 20
Quoted 10 lines
include/linux/phy/phy-hdmi.h new file +10
-0+* RGB, YUV422, YUV444:HDMI Specification 1.4a Section 6.5 +* YUV420: HDMI Specification 2.a Section 7.1 */ enum +hdmi_phy_colorspace { +HDMI_PHY_COLORSPACE_RGB ,/* RGB 4:4:4 */ +HDMI_PHY_COLORSPACE_YUV422 ,/* YCbCr 4:2:2 */ +HDMI_PHY_COLORSPACE_YUV444 ,/* YCbCr 4:4:4 */ +HDMI_PHY_COLORSPACE_YUV420 ,/* YCbCr 4:2:0 */ +HDMI_PHY_COLORSPACE_RESERVED4 , +HDMI_PHY_COLORSPACE_RESERVED5 , +HDMI_PHY_COLORSPACE_RESERVED6 , };This enum duplicates enum
hdmi_colorspacefrom <linux/hdmi.h> HDMI
2.0 defines '7' to be IDO-defined.Quoted 2 lines
Quoted 1 line
Would it be better to use that enum instead?
Accept. I will create head file
hdmi_colorspace.hto reuse enum
hdmi_colorspacein <linux/hdmi.h>.Excuse me, it was supposed to be a question.
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Do you need another header file to reuse this enum?
I'm not sure community whether would accept the patch that simply include <
linux/hdmi.h> inphy-hdmi.hbecause there are lots of otherdefinition in <
linux/hdmi.h> that not need byphy-hdmi.h.Quoted 1 line
If the answer is yes, I happy to follow.
In my opinion it's a better alternative to creating yet another header.
OK, I will try include <linux/hdmi.h> in phy-hdmi.h in the next version. Thanks for your comments.
B,R
Sandor
Quoted 44 lines
Quoted 32 lines
Quoted 32 lines
Quoted 7 lines
B.R
SandorQuoted 1 line
Quoted 9 lines
Quoted 9 lines
include/linux/phy/phy-hdmi.h
Quoted 9 lines
include/linux/phy/phy-hdmi.h new file +9
-0+ +/** +* struct phy_configure_opts_hdmi - HDMI configuration set +* @pixel_clk_rate: Pixel clock of video modes in KHz. +* @bpc: Maximum bits per color channel. +* @color_space: Colorspace in enum hdmi_phy_colorspace. +* +* This structure is used to represent the configuration state +of a HDMI phy.
Quoted 14 lines
Quoted 13 lines
include/linux/phy/phy-hdmi.h line 38
Quoted 7 lines
include/linux/phy/phy-hdmi.h new file +7
-0+*/ +struct phy_configure_opts_hdmi { +unsigned int pixel_clk_rate; +unsigned int bpc; +enum hdmi_phy_colorspace color_space; }; + +#endif /* __PHY_HDMI_H_ */ [skipped the rest]
--
With best wishes
DmitryQuoted 7 lines
Quoted 3 lines
--
With best wishes
DmitryB.R
Sandor--
With best wishes
Dmitry
PATCH v6 5/8 drm: bridge: Cadence: Add MHDP8501 HDMI driver
In reply to Sandor YuAdd a new DRM HDMI bridge driver for Cadence MHDP8501 that used in Freescale i.MX8MQ SoC.
MHDP8501 could support HDMI or DisplayPort standards according embedded Firmware running in the uCPU.
For iMX8MQ SoC, the HDMI FW was loaded and activated by SOC ROM code. Bootload binary included HDMI FW was required for the driver.
--- drivers/gpu/drm/bridge/cadence/Kconfig | 12 + drivers/gpu/drm/bridge/cadence/Makefile | 1 + .../drm/bridge/cadence/cdns-mhdp8501-hdmi.c | 1024 +++++++++++++++++ 3 files changed, 1037 insertions(+) create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
drivers/gpu/drm/bridge/cadence/Kconfig +12 -0
@@ -59,3 +59,15 @@ config DRM_CDNS_MHDP8501_DP Support Cadence MHDP8501 DisplayPort driver. Cadence MHDP8501 Controller support one or more protocols, DisplayPort firmware is required for this driver. + +config DRM_CDNS_MHDP8501_HDMI + tristate "Cadence MHDP8501 HDMI DRM driver" + select DRM_KMS_HELPER + select DRM_PANEL_BRIDGE + select DRM_DISPLAY_HELPER + select DRM_CDNS_AUDIO + depends on OF + help + Support Cadence MHDP8501 HDMI driver. + Cadence MHDP8501 Controller support one or more protocols, + HDMI firmware is required for this driver.
drivers/gpu/drm/bridge/cadence/Makefile +1 -0
@@ -7,3 +7,4 @@ cdns-mhdp8546-y := cdns-mhdp8546-core.o cdns-mhdp8546-hdcp.o cdns-mhdp8546-$(CONFIG_DRM_CDNS_MHDP8546_J721E) += cdns-mhdp8546-j721e.o obj-$(CONFIG_DRM_CDNS_MHDP8501_DP) += cdns-mhdp8501-dp.o +obj-$(CONFIG_DRM_CDNS_MHDP8501_HDMI) += cdns-mhdp8501-hdmi.o
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +1024 -0
1,024 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH v6 5/8] drm: bridge: Cadence: Add MHDP8501 HDMI driver
Hi Sandor,
thanks for sending a new version.
Am Donnerstag, 15. Juni 2023, 03:38:15 CEST schrieb Sandor Yu:
Quoted 52 lines
Add a new DRM HDMI bridge driver for Cadence MHDP8501 that used in Freescale i.MX8MQ SoC.
MHDP8501 could support HDMI or DisplayPort standards according embedded Firmware running in the uCPU.For iMX8MQ SoC, the HDMI FW was loaded and activated by SOC ROM code. Bootload binary included HDMI FW was required for the driver.
Signed-off-by Sandor Yu <[email protected]>--- drivers/gpu/drm/bridge/cadence/Kconfig | 12 + drivers/gpu/drm/bridge/cadence/Makefile | 1 + .../drm/bridge/cadence/cdns-mhdp8501-hdmi.c | 1024 +++++++++++++++++ 3 files changed, 1037 insertions(+) create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c(quoted diff) +0
-0b/drivers/gpu/drm/bridge/cadence/Kconfig index
5b7ec4e49aa1..bee05e834055100644drivers/gpu/drm/bridge/cadence/Kconfig +12
-0@@ -59,3 +59,15 @@ config DRM_CDNS_MHDP8501_DP Support Cadence MHDP8501 DisplayPort driver. Cadence MHDP8501 Controller support one or more protocols, DisplayPort firmware is required for this driver. + +config DRM_CDNS_MHDP8501_HDMI + tristate "Cadence MHDP8501 HDMI DRM driver" + select DRM_KMS_HELPER + select DRM_PANEL_BRIDGE + select DRM_DISPLAY_HELPER + select DRM_CDNS_AUDIO + depends on OF + help + Support Cadence MHDP8501 HDMI driver. + Cadence MHDP8501 Controller support one or more protocols, + HDMI firmware is required for this driver.(quoted diff) +0
-0b/drivers/gpu/drm/bridge/cadence/Makefile index
5842e4540c62..8a129c14ac14100644drivers/gpu/drm/bridge/cadence/Makefile +0
-0@@ -7,3 +7,4 @@ cdns-mhdp8546-y := cdns-mhdp8546-core.o cdns-mhdp8546-hdcp.ocdns-mhdp8546-$(CONFIG_DRM_CDNS_MHDP8546_J721E) += cdns-mhdp8546-j721e.o
obj-$(CONFIG_DRM_CDNS_MHDP8501_DP) += cdns-mhdp8501-dp.o
drivers/gpu/drm/bridge/cadence/Makefile +1
-0+obj-$(CONFIG_DRM_CDNS_MHDP8501_HDMI) += cdns-mhdp8501-hdmi.o(quoted diff) +0
-0
b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.cnew file mode 100644 index 000000000000..43673f1b50f6drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +0
-0
[...]
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 13 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +13
-0+static int cdns_hdmi_bridge_attach (struct drm_bridge *bridge, +enum drm_bridge_attach_flags flags) +{ +struct cdns_mhdp_device *mhdp = bridge->driver_private; +struct drm_mode_config *config = &bridge->dev->mode_config; +struct drm_encoder *encoder = bridge->encoder; +struct drm_connector *connector = &mhdp->connector; + +if (!(flags &DRM_BRIDGE_ATTACH_NO_CONNECTOR )) { + connector->interlace_allowed =0 ; + connector->polled =DRM_CONNECTOR_POLL_HPD ; + + drm_connector_helper_add(connector,
&cdns_hdmi_connector_helper_funcs);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +2
-0+ + drm_connector_init(bridge->dev, connector,
&cdns_hdmi_connector_funcs,
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 697
Quoted 7 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +4
-0+ DRM_MODE_CONNECTOR_HDMIA); + + drm_object_attach_property(&connector->base, + config-
hdr_output_metadata_property, 0);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +2
-0+ +if (!drm_mode_create_hdmi_colorspace_property (connector))
This is missing a 2nd parameter.
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 705
Quoted 9 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +2
-0+ drm_object_attach_property(&connector->base, + connector-
colorspace_property, 0);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +6
-0+ +drm_connector_attach_encoder (connector, encoder); + } + +return 0 ; +}
[...]
Best regards,
Alexander
Signature · 4 lines
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany Amtsgericht München, HRB 105018 Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider http://www.tq-group.com/
RE: [EXT] Re: [PATCH v6 5/8] drm: bridge: Cadence: Add MHDP8501 HDMI driver
Hi Alexander,
Thanks for your comments,
Quoted 106 lines
-----Original Message-----
From: Alexander Stein <[email protected]>
Sent: 2023年6月16日 17:30
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Cc: Oliver Brown <[email protected]>; Sandor Yu <[email protected]>; dl-linux-imx <[email protected]>; [email protected]; Sandor Yu <[email protected]>
Subject: [EXT] Re: [PATCH v6 5/8] drm: bridge: Cadence: Add MHDP8501 HDMI driverCaution: This is an external email. Please take care when clicking links or opening attachments. When in doubt, report the message using the 'Report this email' button
Hi Sandor,
thanks for sending a new version.
Am Donnerstag, 15. Juni 2023, 03:38:15 CEST schrieb Sandor Yu:
Quoted 6 lines
Add a new DRM HDMI bridge driver for Cadence MHDP8501 that used in Freescale i.MX8MQ SoC.
MHDP8501 could support HDMI or DisplayPort standards according embedded Firmware running in the uCPU.For iMX8MQ SoC, the HDMI FW was loaded and activated by SOC ROM
code.
Quoted 7 lines
Bootload binary included HDMI FW was required for the driver.
Signed-off-by Sandor Yu <[email protected]>--- drivers/gpu/drm/bridge/cadence/Kconfig | 12 + drivers/gpu/drm/bridge/cadence/Makefile | 1 + .../drm/bridge/cadence/cdns-mhdp8501-hdmi.c | 1024+++++++++++++++++
Quoted 44 lines
3 files changed, 1037 insertions(+) create mode 100644
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c(quoted diff) +0
-0b/drivers/gpu/drm/bridge/cadence/Kconfig index
5b7ec4e49aa1..bee05e834055
100644drivers/gpu/drm/bridge/cadence/Kconfig +12
-0@@ -59,3 +59,15 @@ config DRM_CDNS_MHDP8501_DP Support Cadence MHDP8501 DisplayPort driver. Cadence MHDP8501 Controller support one or more protocols, DisplayPort firmware is required for this driver. + +config DRM_CDNS_MHDP8501_HDMI + tristate "Cadence MHDP8501 HDMI DRM driver" + select DRM_KMS_HELPER + select DRM_PANEL_BRIDGE + select DRM_DISPLAY_HELPER + select DRM_CDNS_AUDIO + depends on OF + help + Support Cadence MHDP8501 HDMI driver. + Cadence MHDP8501 Controller support one or more protocols, + HDMI firmware is required for this driver.(quoted diff) +0
-0b/drivers/gpu/drm/bridge/cadence/Makefile index
5842e4540c62..8a129c14ac14
100644drivers/gpu/drm/bridge/cadence/Makefile +0
-0@@ -7,3 +7,4 @@ cdns-mhdp8546-y := cdns-mhdp8546-core.ocdns-mhdp8546-hdcp.o cdns-mhdp8546-$(CONFIG_DRM_CDNS_MHDP8546_J721E) += cdns-mhdp8546-j721e.o
obj-$(CONFIG_DRM_CDNS_MHDP8501_DP) += cdns-mhdp8501-dp.o
drivers/gpu/drm/bridge/cadence/Makefile +1
-0+obj-$(CONFIG_DRM_CDNS_MHDP8501_HDMI) += cdns-mhdp8501-hdmi.o(quoted diff) +0
-0
b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.cnew file mode 100644 index 000000000000..43673f1b50f6drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +0
-0[...]
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 678
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +2
-0+static int cdns_hdmi_bridge_attach (struct drm_bridge *bridge, +enum drm_bridge_attach_flags flags){
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +10
-0+struct cdns_mhdp_device *mhdp = bridge->driver_private; +struct drm_mode_config *config = &bridge->dev->mode_config; +struct drm_encoder *encoder = bridge->encoder; +struct drm_connector *connector = &mhdp->connector; + +if (!(flags &DRM_BRIDGE_ATTACH_NO_CONNECTOR )) { + connector->interlace_allowed =0 ; + connector->polled =DRM_CONNECTOR_POLL_HPD ; + + drm_connector_helper_add(connector,
&cdns_hdmi_connector_helper_funcs);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +2
-0+ + drm_connector_init(bridge->dev, connector,
&cdns_hdmi_connector_funcs,Quoted 1 line
+
DRM_MODE_CONNECTOR_HDMIA);
Quoted 9 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 7 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +3
-0+ + drm_object_attach_property(&connector->base, + config-
hdr_output_metadata_property, 0);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +3
-0+ +if + (!drm_mode_create_hdmi_colorspace_property (connector))This is missing a 2nd parameter.
I have not found function drm_mode_create_hdmi_colorspace_property need 2nd parameter in L6.1.
And those connector init functions will be remove in the next version according Sam's comments, because they are not really needed.
B.R
Sandor
Quoted 27 lines
Quoted 2 lines
+
drm_object_attach_property(&connector->base,
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 705
Quoted 8 lines
+ connector-
colorspace_property, 0);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +6
-0+ +drm_connector_attach_encoder (connector, encoder); + } + +return 0 ; +}[...]
Best regards,
Alexander
--
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany Amtsgericht München, HRB 105018
Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider
http://www.tq/
-group.com%2F&data=05%7C01%7CSandor.yu%40nxp.com%7C77fbaace052c 4ccf338c08db6e4c40cb%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C 0%7C638225046010817530%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4w LjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C %7C%7C&sdata=JJjeV2InXzHyefL4uiK9%2BRtSVjoBYd%2FwIqSbIQhDH90%3D &reserved=0
RE: [EXT] Re: [PATCH v6 5/8] drm: bridge: Cadence: Add MHDP8501 HDMI driver
Hi Sandor,
Am Montag, 19. Juni 2023, 05:11:02 CEST schrieb Sandor Yu:
Quoted 26 lines
Hi Alexander,
Thanks for your comments,
Quoted 21 lines
-----Original Message-----
From: Alexander Stein <[email protected]>
Sent: 2023年6月16日 17:30
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Cc: Oliver Brown <[email protected]>; Sandor Yu <[email protected]>; dl-linux-imx <[email protected]>; [email protected]; Sandor Yu <[email protected]>
Subject: [EXT] Re: [PATCH v6 5/8] drm: bridge: Cadence: Add MHDP8501 HDMI driverCaution: This is an external email. Please take care when clicking links or
opening attachments. When in doubt, report the message using the
Quoted 135 lines
Quoted 127 lines
'Report this email' button
Hi Sandor,
thanks for sending a new version.
Am Donnerstag, 15. Juni 2023, 03:38:15 CEST schrieb Sandor Yu:
Quoted 8 lines
Add a new DRM HDMI bridge driver for Cadence MHDP8501 that used in Freescale i.MX8MQ SoC.
MHDP8501 could support HDMI or DisplayPort standards according embedded Firmware running in the uCPU.For iMX8MQ SoC, the HDMI FW was loaded and activated by SOC ROM
code.
Quoted 10 lines
Bootload binary included HDMI FW was required for the driver.
Signed-off-by Sandor Yu <[email protected]>---
drivers/gpu/drm/bridge/cadence/Kconfig | 12 + drivers/gpu/drm/bridge/cadence/Makefile | 1 + .../drm/bridge/cadence/cdns-mhdp8501-hdmi.c | 1024+++++++++++++++++
Quoted 52 lines
3 files changed, 1037 insertions(+) create mode 100644
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c(quoted diff) +0
-0b/drivers/gpu/drm/bridge/cadence/Kconfig index
5b7ec4e49aa1..bee05e834055
100644drivers/gpu/drm/bridge/cadence/Kconfig +12
-0@@ -59,3 +59,15 @@ config DRM_CDNS_MHDP8501_DP Support Cadence MHDP8501 DisplayPort driver. Cadence MHDP8501 Controller support one or more protocols, DisplayPort firmware is required for this driver. + +config DRM_CDNS_MHDP8501_HDMI + tristate "Cadence MHDP8501 HDMI DRM driver" + select DRM_KMS_HELPER + select DRM_PANEL_BRIDGE + select DRM_DISPLAY_HELPER + select DRM_CDNS_AUDIO + depends on OF + help + Support Cadence MHDP8501 HDMI driver. + Cadence MHDP8501 Controller support one or more protocols, + HDMI firmware is required for this driver.(quoted diff) +0
-0b/drivers/gpu/drm/bridge/cadence/Makefile index
5842e4540c62..8a129c14ac14
100644drivers/gpu/drm/bridge/cadence/Makefile +0
-0@@ -7,3 +7,4 @@ cdns-mhdp8546-y := cdns-mhdp8546-core.ocdns-mhdp8546-hdcp.o cdns-mhdp8546-$(CONFIG_DRM_CDNS_MHDP8546_J721E) += cdns-mhdp8546-j721e.o
obj-$(CONFIG_DRM_CDNS_MHDP8501_DP) += cdns-mhdp8501-dp.o
drivers/gpu/drm/bridge/cadence/Makefile +1
-0+obj-$(CONFIG_DRM_CDNS_MHDP8501_HDMI) += cdns-mhdp8501-hdmi.o(quoted diff) +0
-0
b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.cnew file mode 100644 index 000000000000..43673f1b50f6drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +0
-0[...]
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 678
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +2
-0+static int cdns_hdmi_bridge_attach (struct drm_bridge *bridge, +enum drm_bridge_attach_flags flags){
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +10
-0+struct cdns_mhdp_device *mhdp = bridge->driver_private; +struct drm_mode_config *config = &bridge->dev->mode_config; +struct drm_encoder *encoder = bridge->encoder; +struct drm_connector *connector = &mhdp->connector; + +if (!(flags &DRM_BRIDGE_ATTACH_NO_CONNECTOR )) { + connector->interlace_allowed =0 ; + connector->polled =DRM_CONNECTOR_POLL_HPD ; + + drm_connector_helper_add(connector,
&cdns_hdmi_connector_helper_funcs);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +2
-0+ + drm_connector_init(bridge->dev, connector,
&cdns_hdmi_connector_funcs,Quoted 1 line
+
DRM_MODE_CONNECTOR_HDMIA);Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +3
-0+ + drm_object_attach_property(&connector->base, + config-
hdr_output_metadata_property, 0);Quoted 7 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +3
-0+ +if + (!drm_mode_create_hdmi_colorspace_property (connector))This is missing a 2nd parameter.
Quoted 2 lines
I have not found function
drm_mode_create_hdmi_colorspace_propertyneed 2nd parameter in L6.1.
Ah, I see. The new parameter is/will be part of v6.3.
Quoted 3 lines
And those connector init functions will be remove in
the next version according Sam's comments, because they are not really needed.
Okay, nice. Please put me on cc as well. Thanks.
Best regards,
Alexander
Quoted 41 lines
B.R
SandorQuoted 36 lines
Quoted 3 lines
+
drm_object_attach_property(&connector->base,
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 705
Quoted 10 lines
+ connector-
colorspace_property, 0);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +6
-0+ +drm_connector_attach_encoder (connector, encoder); + } + +return 0 ; +}[...]
Best regards,
Alexander
--
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany Amtsgericht München, HRB 105018
Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider
http://www.tq/
-group.com%2F&data=05%7C01%7CSandor.yu%40nxp.com%7C77fbaace052c 4ccf338c08db6e4c40cb%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C 0%7C638225046010817530%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4w LjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C %7C%7C&sdata=JJjeV2InXzHyefL4uiK9%2BRtSVjoBYd%2FwIqSbIQhDH90%3D &reserved=0
Signature · 4 lines
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany Amtsgericht München, HRB 105018 Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider http://www.tq-group.com/
PATCH v6 6/8 dt-bindings: phy: Add Freescale iMX8MQ DP and HDMI PHY
In reply to Sandor YuAdd bindings for Freescale iMX8MQ DP and HDMI PHY.
--- .../bindings/phy/fsl,imx8mq-dp-hdmi-phy.yaml | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/fsl,imx8mq-dp-hdmi-phy.yaml
Documentation/devicetree/bindings/phy/fsl,imx8mq-dp-hdmi-phy.yaml new file +53 -0
@@ -0,0 +1,53 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/phy/fsl,imx8mq-dp-hdmi-phy.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Cadence HDP-TX DP/HDMI PHY for Freescale i.MX8MQ SoC + +maintainers: + - Sandor Yu <[email protected]> + +properties: + compatible: + enum: + - fsl,imx8mq-dp-phy + - fsl,imx8mq-hdmi-phy + + reg: + maxItems: 1 + + clocks: + items: + - description: PHY reference clock. + - description: APB clock. + + clock-names: + items: + - const: ref + - const: apb + + "#phy-cells": + const: 0 + +required: + - compatible + - reg + - clocks + - clock-names + - "#phy-cells" + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/imx8mq-clock.h> + #include <dt-bindings/phy/phy.h> + dp_phy: phy@32c00000 { + compatible = "fsl,imx8mq-dp-phy"; + reg = <0x32c00000 0x100000>; + #phy-cells = <0>; + clocks = <&hdmi_phy_27m>, <&clk IMX8MQ_CLK_DISP_APB_ROOT>; + clock-names = "ref", "apb"; + };
Signature · 1 line
2.34.1
Re: [PATCH v6 6/8] dt-bindings: phy: Add Freescale iMX8MQ DP and HDMI PHY
Hi Sandor,
Am Donnerstag, 15. Juni 2023, 03:38:16 CEST schrieb Sandor Yu:
Quoted 23 lines
Add bindings for Freescale iMX8MQ DP and HDMI PHY.
Signed-off-by Sandor Yu <[email protected]>--- .../bindings/phy/fsl,imx8mq-dp-hdmi-phy.yaml | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644
Documentation/devicetree/bindings/phy/fsl,imx8mq-dp-hdmi-phy.yamldiff --git
a/Documentation/devicetree/bindings/phy/fsl,imx8mq-dp-hdmi-phy.yamlb/Documentation/devicetree/bindings/phy/fsl,imx8mq-dp-hdmi-phy.yamlnew file mode 100644
index 000000000000..917f113503dcDocumentation/devicetree/bindings/phy/fsl,imx8mq-dp-hdmi-phy.yaml new file +6
-0@@ -0,0 +1,53 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/phy/fsl,imx8mq-dp-hdmi-phy.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# +
Documentation/devicetree/bindings/phy/fsl,imx8mq-dp-hdmi-phy.yaml line 16
Quoted 10 lines
Documentation/devicetree/bindings/phy/fsl,imx8mq-dp-hdmi-phy.yaml new file +10
-0+title: Cadence HDP-TX DP/HDMI PHY for Freescale i.MX8MQ SoC + +maintainers: + - Sandor Yu <[email protected]> + +properties: + compatible: + enum: + - fsl,imx8mq-dp-phy + - fsl,imx8mq-hdmi-phy
How is it intended to select DP or HDMI? E.g. provide a single default dp-phy node in imx8mq.dtsi and change the compatible to HDMI on board-level?
Best regards,
Alexander
Quoted 37 lines
Documentation/devicetree/bindings/phy/fsl,imx8mq-dp-hdmi-phy.yaml new file +37
-0+ + reg: + maxItems: 1 + + clocks: + items: + - description: PHY reference clock. + - description: APB clock. + + clock-names: + items: + - const: ref + - const: apb + + "#phy-cells": + const: 0 + +required: + - compatible + - reg + - clocks + - clock-names + - "#phy-cells" + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/imx8mq-clock.h> + #include <dt-bindings/phy/phy.h> + dp_phy: phy@32c00000 { + compatible = "fsl,imx8mq-dp-phy"; + reg = <0x32c00000 0x100000>; + #phy-cells = <0>; + clocks = <&hdmi_phy_27m>, <&clk IMX8MQ_CLK_DISP_APB_ROOT>; + clock-names = "ref", "apb"; + };
Signature · 4 lines
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany Amtsgericht München, HRB 105018 Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider http://www.tq-group.com/
RE: [EXT] Re: [PATCH v6 6/8] dt-bindings: phy: Add Freescale iMX8MQ DP and HDMI PHY
Hi Alexander,
Thanks for your comments,
Quoted 81 lines
-----Original Message-----
From: Alexander Stein <[email protected]>
Sent: 2023年6月16日 17:35
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Cc: Oliver Brown <[email protected]>; Sandor Yu <[email protected]>; dl-linux-imx <[email protected]>; [email protected]; Sandor Yu <[email protected]>
Subject: [EXT] Re: [PATCH v6 6/8] dt-bindings: phy: Add Freescale iMX8MQ DP and HDMI PHYCaution: This is an external email. Please take care when clicking links or opening attachments. When in doubt, report the message using the 'Report this email' button
Hi Sandor,
Am Donnerstag, 15. Juni 2023, 03:38:16 CEST schrieb Sandor Yu:
Quoted 8 lines
Add bindings for Freescale iMX8MQ DP and HDMI PHY.
Signed-off-by Sandor Yu <[email protected]>--- .../bindings/phy/fsl,imx8mq-dp-hdmi-phy.yaml | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644Quoted 8 lines
Documentation/devicetree/bindings/phy/fsl,imx8mq-dp-hdmi-phy.yamldiff --git
a/Documentation/devicetree/bindings/phy/fsl,imx8mq-dp-hdmi-phy.yamlb/Documentation/devicetree/bindings/phy/fsl,imx8mq-dp-hdmi-phy.yamlnew file mode 100644 index 000000000000..917f113503dc ---/dev/null
+++b/Documentation/devicetree/bindings/phy/fsl,imx8mq-dp-hdmi-phy.yam
Review line 4
Quoted 7 lines
+++ l
(quoted diff) +4
-0@@ -0,0 +1,53 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) %YAML 1.2 +--- +$id: +http://devi/+cetree.org%2Fschemas%2Fphy%2Ffsl%2Cimx8mq-dp-hdmi-phy.yaml%23&d ata=05
Quoted 1 line
+%7C01%7CSandor.yu%40nxp.com%7Cf2d4e5ea99fa4f5776bf08db6e4ce7ba %7C686e
Quoted 1 line
+a1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C638225048817792176%7C Unknown%7
Quoted 1 line
+CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haW wiLCJX
Quoted 1 line
+VCI6Mn0%3D%7C3000%7C%7C%7C&sdata=ayYA0rayDR2w1LDgU53VtCitw MH9PnoblX2k
Review
Quoted 4 lines
(quoted diff) +3
-0+Jhbu6Gs%3D&reserved=0 +$schema: +http://devi/+cetree.org%2Fmeta-schemas%2Fcore.yaml%23&data=05%7C01%7CSandor. yu%40n
Quoted 1 line
+xp.com%7Cf2d4e5ea99fa4f5776bf08db6e4ce7ba%7C686ea1d3bc2b4c6fa92 cd99c5
Quoted 1 line
+c301635%7C0%7C0%7C638225048817792176%7CUnknown%7CTWFpbGZs b3d8eyJWIjoi
Quoted 1 line
+MC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3 000%7C%
Quoted 1 line
+7C%7C&sdata=DagQtrIblGEk3T1mamSmI2010SRszqhIpJ4piXy3L4M%3D&re served=0
Quoted 15 lines
Documentation/devicetree/bindings/phy/fsl,imx8mq-dp-hdmi-phy.yaml line 16
Quoted 11 lines
Documentation/devicetree/bindings/phy/fsl,imx8mq-dp-hdmi-phy.yaml new file +11
-0+ +title: Cadence HDP-TX DP/HDMI PHY for Freescale i.MX8MQ SoC + +maintainers: + - Sandor Yu <[email protected]> + +properties: + compatible: + enum: + - fsl,imx8mq-dp-phy + - fsl,imx8mq-hdmi-phyHow is it intended to select DP or HDMI? E.g. provide a single default dp-phy node in
imx8mq.dtsiand change the compatible to HDMI on board-level?
The PHY driver select should align with HDMI/DP driver base on board type.
For HDMI board: fsl,imx8mq-hdmi-phy + fsl,imx8mq-mhdp8501-hdmi For DP board: fsl,imx8mq-dp-phy + fsl,imx8mq-mhdp8501-dp
B.R
Sandor
Quoted 55 lines
Best regards,
AlexanderQuoted 25 lines
Documentation/devicetree/bindings/phy/fsl,imx8mq-dp-hdmi-phy.yaml new file +25
-0+ + reg: + maxItems: 1 + + clocks: + items: + - description: PHY reference clock. + - description: APB clock. + + clock-names: + items: + - const: ref + - const: apb + + "#phy-cells": + const: 0 + +required: + - compatible + - reg + - clocks + - clock-names + - "#phy-cells" + +additionalProperties: falseDocumentation/devicetree/bindings/phy/fsl,imx8mq-dp-hdmi-phy.yaml
Quoted 10 lines
Documentation/devicetree/bindings/phy/fsl,imx8mq-dp-hdmi-phy.yaml new file +10
-0+ +examples: + - | + #include <dt-bindings/clock/imx8mq-clock.h> + #include <dt-bindings/phy/phy.h> + dp_phy: phy@32c00000 { + compatible = "fsl,imx8mq-dp-phy"; + reg = <0x32c00000 0x100000>; + #phy-cells = <0>; + clocks = <&hdmi_phy_27m>, <&clk
IMX8MQ_CLK_DISP_APB_ROOT>;Documentation/devicetree/bindings/phy/fsl,imx8mq-dp-hdmi-phy.yaml line 53
Quoted 2 lines
Documentation/devicetree/bindings/phy/fsl,imx8mq-dp-hdmi-phy.yaml new file +2
-0+ clock-names = "ref", "apb"; + };--
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany Amtsgericht München, HRB 105018
Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider
http://www.tq/
-group.com%2F&data=05%7C01%7CSandor.yu%40nxp.com%7Cf2d4e5ea99fa 4f5776bf08db6e4ce7ba%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C 0%7C638225048817792176%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4w LjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C %7C%7C&sdata=6uih84XByS6aX519z7l50amZl2XnPIMSggyfSD4xd4M%3D&re served=0
PATCH v6 7/8 phy: freescale: Add DisplayPort PHY driver for i.MX8MQ
In reply to Sandor YuAdd Cadence HDP-TX DisplayPort PHY driver for i.MX8MQ
Cadence HDP-TX PHY could be put in either DP mode or HDMI mode base on the configuration chosen. DisplayPort PHY mode is configurated in the driver.
--- drivers/phy/freescale/Kconfig | 9 + drivers/phy/freescale/Makefile | 1 + drivers/phy/freescale/phy-fsl-imx8mq-dp.c | 697 ++++++++++++++++++++++ 3 files changed, 707 insertions(+) create mode 100644 drivers/phy/freescale/phy-fsl-imx8mq-dp.c
drivers/phy/freescale/Kconfig +9 -0
@@ -35,6 +35,15 @@ config PHY_FSL_IMX8M_PCIE Enable this to add support for the PCIE PHY as found on i.MX8M family of SOCs. +config PHY_CADENCE_DP_PHY + tristate "Cadence HDPTX DP PHY support" + depends on OF && HAS_IOMEM + depends on COMMON_CLK + select GENERIC_PHY + help + Enable this to support the Cadence HDPTX DP PHY driver + on NXP's i.MX8MQ SOC. + endif config PHY_FSL_LYNX_28G
drivers/phy/freescale/Makefile +1 -0
@@ -4,3 +4,4 @@ obj-$(CONFIG_PHY_MIXEL_LVDS_PHY) += phy-fsl-imx8qm-lvds-phy.o obj-$(CONFIG_PHY_MIXEL_MIPI_DPHY) += phy-fsl-imx8-mipi-dphy.o obj-$(CONFIG_PHY_FSL_IMX8M_PCIE) += phy-fsl-imx8m-pcie.o obj-$(CONFIG_PHY_FSL_LYNX_28G) += phy-fsl-lynx-28g.o +obj-$(CONFIG_PHY_CADENCE_DP_PHY) += phy-fsl-imx8mq-dp.o
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +697 -0
697 lines not on this page · raw message
Signature · 1 line
2.34.1
Vinod Koul
maintainerRe: [PATCH v6 7/8] phy: freescale: Add DisplayPort PHY driver for i.MX8MQ
Quoted 56 lines · Sandor Yu
Add Cadence HDP-TX DisplayPort PHY driver for i.MX8MQ
Cadence HDP-TX PHY could be put in either DP mode or HDMI mode base on the configuration chosen. DisplayPort PHY mode is configurated in the driver.
Signed-off-by Sandor Yu <[email protected]>--- drivers/phy/freescale/Kconfig | 9 + drivers/phy/freescale/Makefile | 1 + drivers/phy/freescale/phy-fsl-imx8mq-dp.c | 697 ++++++++++++++++++++++ 3 files changed, 707 insertions(+) create mode 100644 drivers/phy/freescale/phy-fsl-imx8mq-dp.cdrivers/phy/freescale/Kconfig +9
-0@@ -35,6 +35,15 @@ config PHY_FSL_IMX8M_PCIE Enable this to add support for the PCIE PHY as found on i.MX8M family of SOCs. +config PHY_CADENCE_DP_PHY + tristate "Cadence HDPTX DP PHY support" + depends on OF && HAS_IOMEM + depends on COMMON_CLK + select GENERIC_PHY + help + Enable this to support the Cadence HDPTX DP PHY driver + on NXP's i.MX8MQ SOC. + endif config PHY_FSL_LYNX_28Gdrivers/phy/freescale/Makefile +1
-0@@ -4,3 +4,4 @@ obj-$(CONFIG_PHY_MIXEL_LVDS_PHY) += phy-fsl-imx8qm-lvds-phy.o obj-$(CONFIG_PHY_MIXEL_MIPI_DPHY) += phy-fsl-imx8-mipi-dphy.o obj-$(CONFIG_PHY_FSL_IMX8M_PCIE) += phy-fsl-imx8m-pcie.o obj-$(CONFIG_PHY_FSL_LYNX_28G) += phy-fsl-lynx-28g.o +obj-$(CONFIG_PHY_CADENCE_DP_PHY) += phy-fsl-imx8mq-dp.odrivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +7
-0@@ -0,0 +1,697 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Cadence HDP-TX Display Port Interface (DP) PHY driver +* +* Copyright (C) 2022 NXP Semiconductor, Inc. +*/ +#include <asm/unaligned.h>
drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 17
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +10
-0+#include <linux/clk.h> +#include <linux/kernel.h> +#include <linux/phy/phy.h> +#include <linux/platform_device.h> +#include <linux/io.h> +#include <linux/iopoll.h> + +#include <drm/bridge/cdns-mhdp-mailbox.h> + +#define ADDR_PHY_AFE 0x80000
Is this always fixed for every phy generation?
Quoted 70 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +70
-0+ +/* PHY registers */ +#define CMN_SSM_BIAS_TMR 0x0022 +#define CMN_PLLSM0_PLLEN_TMR 0x0029 +#define CMN_PLLSM0_PLLPRE_TMR 0x002A +#define CMN_PLLSM0_PLLVREF_TMR 0x002B +#define CMN_PLLSM0_PLLLOCK_TMR 0x002C +#define CMN_PLLSM0_USER_DEF_CTRL 0x002F +#define CMN_PSM_CLK_CTRL 0x0061 +#define CMN_PLL0_VCOCAL_START 0x0081 +#define CMN_PLL0_VCOCAL_INIT_TMR 0x0084 +#define CMN_PLL0_VCOCAL_ITER_TMR 0x0085 +#define CMN_PLL0_INTDIV 0x0094 +#define CMN_PLL0_FRACDIV 0x0095 +#define CMN_PLL0_HIGH_THR 0x0096 +#define CMN_PLL0_DSM_DIAG 0x0097 +#define CMN_PLL0_SS_CTRL2 0x0099 +#define CMN_ICAL_INIT_TMR 0x00C4 +#define CMN_ICAL_ITER_TMR 0x00C5 +#define CMN_RXCAL_INIT_TMR 0x00D4 +#define CMN_RXCAL_ITER_TMR 0x00D5 +#define CMN_TXPUCAL_INIT_TMR 0x00E4 +#define CMN_TXPUCAL_ITER_TMR 0x00E5 +#define CMN_TXPDCAL_INIT_TMR 0x00F4 +#define CMN_TXPDCAL_ITER_TMR 0x00F5 +#define CMN_ICAL_ADJ_INIT_TMR 0x0102 +#define CMN_ICAL_ADJ_ITER_TMR 0x0103 +#define CMN_RX_ADJ_INIT_TMR 0x0106 +#define CMN_RX_ADJ_ITER_TMR 0x0107 +#define CMN_TXPU_ADJ_INIT_TMR 0x010A +#define CMN_TXPU_ADJ_ITER_TMR 0x010B +#define CMN_TXPD_ADJ_INIT_TMR 0x010E +#define CMN_TXPD_ADJ_ITER_TMR 0x010F +#define CMN_DIAG_PLL0_FBH_OVRD 0x01C0 +#define CMN_DIAG_PLL0_FBL_OVRD 0x01C1 +#define CMN_DIAG_PLL0_OVRD 0x01C2 +#define CMN_DIAG_PLL0_TEST_MODE 0x01C4 +#define CMN_DIAG_PLL0_V2I_TUNE 0x01C5 +#define CMN_DIAG_PLL0_CP_TUNE 0x01C6 +#define CMN_DIAG_PLL0_LF_PROG 0x01C7 +#define CMN_DIAG_PLL0_PTATIS_TUNE1 0x01C8 +#define CMN_DIAG_PLL0_PTATIS_TUNE2 0x01C9 +#define CMN_DIAG_HSCLK_SEL 0x01E0 +#define CMN_DIAG_PER_CAL_ADJ 0x01EC +#define CMN_DIAG_CAL_CTRL 0x01ED +#define CMN_DIAG_ACYA 0x01FF +#define XCVR_PSM_RCTRL 0x4001 +#define XCVR_PSM_CAL_TMR 0x4002 +#define XCVR_PSM_A0IN_TMR 0x4003 +#define TX_TXCC_CAL_SCLR_MULT_0 0x4047 +#define TX_TXCC_CPOST_MULT_00_0 0x404C +#define XCVR_DIAG_PLLDRC_CTRL 0x40E0 +#define XCVR_DIAG_PLLDRC_CTRL 0x40E0 +#define XCVR_DIAG_HSCLK_SEL 0x40E1 +#define XCVR_DIAG_LANE_FCM_EN_MGN_TMR 0x40F2 +#define TX_PSC_A0 0x4100 +#define TX_PSC_A1 0x4101 +#define TX_PSC_A2 0x4102 +#define TX_PSC_A3 0x4103 +#define TX_RCVDET_EN_TMR 0x4122 +#define TX_RCVDET_ST_TMR 0x4123 +#define TX_DIAG_BGREF_PREDRV_DELAY 0x41E7 +#define TX_DIAG_BGREF_PREDRV_DELAY 0x41E7 +#define TX_DIAG_ACYA_0 0x41FF +#define TX_DIAG_ACYA_1 0x43FF +#define TX_DIAG_ACYA_2 0x45FF +#define TX_DIAG_ACYA_3 0x47FF +#define TX_ANA_CTRL_REG_1 0x5020 +#define TX_ANA_CTRL_REG_2 0x5021 +#define TX_DIG_CTRL_REG_1 0x5023
drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 97
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +10
-0+#define TX_DIG_CTRL_REG_2 0x5024 +#define TXDA_CYA_AUXDA_CYA 0x5025 +#define TX_ANA_CTRL_REG_3 0x5026 +#define TX_ANA_CTRL_REG_4 0x5027 +#define TX_ANA_CTRL_REG_5 0x5029 +#define RX_PSC_A0 0x8000 +#define RX_PSC_CAL 0x8006 +#define PHY_HDP_MODE_CTRL 0xC008 +#define PHY_HDP_CLK_CTL 0xC009 +#define PHY_PMA_CMN_CTRL1 0xC800
Lower case hex values please
Quoted 31 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +31
-0+ +#define REF_CLK_27MHZ 27000000 + +enum dp_link_rate { +RATE_1_6 =162000 , +RATE_2_1 =216000 , +RATE_2_4 =243000 , +RATE_2_7 =270000 , +RATE_3_2 =324000 , +RATE_4_3 =432000 , +RATE_5_4 =540000 , +RATE_8_1 =810000 , +}; + +#define MAX_LINK_RATE RATE_5_4 + +struct phy_pll_reg { +u16 val[7 ]; +u32 addr; +}; + +static const struct phy_pll_reg phy_pll_27m_cfg[] = { +/* 1.62 2.16 2.43 2.7 3.24 4.32 5.4 register address */ + {{0x010E ,0x010E ,0x010E ,0x010E ,0x010E ,0x010E ,0x010E },CMN_PLL0_VCOCAL_INIT_TMR }, + {{0x001B ,0x001B ,0x001B ,0x001B ,0x001B ,0x001B ,0x001B },CMN_PLL0_VCOCAL_ITER_TMR }, + {{0x30B9 ,0x3087 ,0x3096 ,0x30B4 ,0x30B9 ,0x3087 ,0x30B4 },CMN_PLL0_VCOCAL_START }, + {{0x0077 ,0x009F ,0x00B3 ,0x00C7 ,0x0077 ,0x009F ,0x00C7 },CMN_PLL0_INTDIV }, + {{0xF9DA ,0xF7CD ,0xF6C7 ,0xF5C1 ,0xF9DA ,0xF7CD ,0xF5C1 },CMN_PLL0_FRACDIV }, + {{0x001E ,0x0028 ,0x002D ,0x0032 ,0x001E ,0x0028 ,0x0032 },CMN_PLL0_HIGH_THR }, + {{0x0020 ,0x0020 ,0x0020 ,0x0020 ,0x0020 ,0x0020 ,0x0020 },CMN_PLL0_DSM_DIAG }, + {{0x0000 ,0x1000 ,0x1000 ,0x1000 ,0x0000 ,0x1000 ,0x1000 },CMN_PLLSM0_USER_DEF_CTRL },
drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 138
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +10
-0+ {{ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }, CMN_DIAG_PLL0_OVRD }, + {{ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }, CMN_DIAG_PLL0_FBH_OVRD }, + {{ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }, CMN_DIAG_PLL0_FBL_OVRD }, + {{ 0x0006, 0x0007, 0x0007, 0x0007, 0x0006, 0x0007, 0x0007 }, CMN_DIAG_PLL0_V2I_TUNE }, + {{ 0x0043, 0x0043, 0x0043, 0x0042, 0x0043, 0x0043, 0x0042 }, CMN_DIAG_PLL0_CP_TUNE }, + {{ 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008 }, CMN_DIAG_PLL0_LF_PROG }, + {{ 0x0100, 0x0001, 0x0001, 0x0001, 0x0100, 0x0001, 0x0001 }, CMN_DIAG_PLL0_PTATIS_TUNE1 }, + {{ 0x0007, 0x0001, 0x0001, 0x0001, 0x0007, 0x0001, 0x0001 }, CMN_DIAG_PLL0_PTATIS_TUNE2 }, + {{ 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020 }, CMN_DIAG_PLL0_TEST_MODE}, + {{ 0x0016, 0x0016, 0x0016, 0x0016, 0x0016, 0x0016, 0x0016 }, CMN_PSM_CLK_CTRL }
again, lower case please
Quoted 561 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +559
-0+}; + +struct cdns_hdptx_dp_phy { +void __iomem *regs;/* DPTX registers base */ +struct device *dev; +struct phy *phy; +struct mutex mbox_mutex;/* mutex to protect mailbox */ +struct clk *ref_clk, *apb_clk; +u32 ref_clk_rate; +u32 num_lanes; +u32 link_rate; +bool power_up; +}; + +static int cdns_phy_reg_write (struct cdns_hdptx_dp_phy *cdns_phy,u32 addr,u32 val) +{ +return cdns_mhdp_reg_write (cdns_phy,ADDR_PHY_AFE + (addr <<2 ), val); +} + +static u32 cdns_phy_reg_read (struct cdns_hdptx_dp_phy *cdns_phy,u32 addr) +{ +u32 reg32; + +cdns_mhdp_reg_read (cdns_phy,ADDR_PHY_AFE + (addr <<2 ), ®32); +return reg32; +} + +static int link_rate_index (u32 rate) +{ +switch (rate) { +case RATE_1_6 : +return 0 ; +case RATE_2_1 : +return 1 ; +case RATE_2_4 : +return 2 ; +case RATE_2_7 : +return 3 ; +case RATE_3_2 : +return 4 ; +case RATE_4_3 : +return 5 ; +case RATE_5_4 : +return 6 ; +default : +return -1 ; + } +} + +static int hdptx_dp_clk_enable (struct cdns_hdptx_dp_phy *cdns_phy) +{ +struct device *dev = cdns_phy->dev; +u32 ref_clk_rate; +int ret; + + cdns_phy->ref_clk =devm_clk_get (dev,"ref" ); +if (IS_ERR (cdns_phy->ref_clk)) { +dev_err (dev,"phy ref clock not found\n" ); +return PTR_ERR (cdns_phy->ref_clk); + } + + cdns_phy->apb_clk =devm_clk_get (dev,"apb" ); +if (IS_ERR (cdns_phy->apb_clk)) { +dev_err (dev,"phy apb clock not found\n" ); +return PTR_ERR (cdns_phy->apb_clk); + } + + ret =clk_prepare_enable (cdns_phy->ref_clk); +if (ret) { +dev_err (cdns_phy->dev,"Failed to prepare ref clock\n" ); +return ret; + } + + ref_clk_rate =clk_get_rate (cdns_phy->ref_clk); +if (!ref_clk_rate) { +dev_err (cdns_phy->dev,"Failed to get ref clock rate\n" ); + goto err_ref_clk; + } + +if (ref_clk_rate ==REF_CLK_27MHZ ) + cdns_phy->ref_clk_rate = ref_clk_rate; +else { +dev_err (cdns_phy->dev,"Not support Ref Clock Rate(%dHz)\n" , ref_clk_rate); + goto err_ref_clk; + } + + ret =clk_prepare_enable (cdns_phy->apb_clk); +if (ret) { +dev_err (cdns_phy->dev,"Failed to prepare apb clock\n" ); + goto err_ref_clk; + } + +return 0 ; + +err_ref_clk: +clk_disable_unprepare (cdns_phy->ref_clk); +return -EINVAL ; +} + +static void hdptx_dp_clk_disable (struct cdns_hdptx_dp_phy *cdns_phy) +{ +clk_disable_unprepare (cdns_phy->ref_clk); +clk_disable_unprepare (cdns_phy->apb_clk); +} + +static void hdptx_dp_aux_cfg (struct cdns_hdptx_dp_phy *cdns_phy) +{ +/* Power up Aux */ +cdns_phy_reg_write (cdns_phy,TXDA_CYA_AUXDA_CYA ,1 ); + +cdns_phy_reg_write (cdns_phy,TX_DIG_CTRL_REG_1 ,0x3 ); +ndelay (150 ); +cdns_phy_reg_write (cdns_phy,TX_DIG_CTRL_REG_2 ,36 ); +ndelay (150 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_2 ,0x0100 ); +ndelay (150 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_2 ,0x0300 ); +ndelay (150 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_3 ,0x0000 ); +ndelay (150 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_1 ,0x2008 ); +ndelay (150 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_1 ,0x2018 ); +ndelay (150 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_1 ,0xA018 ); +ndelay (150 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_2 ,0x030C ); +ndelay (150 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_5 ,0x0000 ); +ndelay (150 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_4 ,0x1001 ); +ndelay (150 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_1 ,0xA098 ); +ndelay (150 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_1 ,0xA198 ); +ndelay (150 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_2 ,0x030d ); +ndelay (150 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_2 ,0x030f ); +} + +/* PMA common configuration for 27MHz */ +static void hdptx_dp_phy_pma_cmn_cfg_27mhz (struct cdns_hdptx_dp_phy *cdns_phy) +{ +u32 num_lanes = cdns_phy->num_lanes; +u16 val; +int k; + + val =cdns_phy_reg_read (cdns_phy,PHY_PMA_CMN_CTRL1 ); + val &=0xFFF7 ; + val |=0x0008 ; +cdns_phy_reg_write (cdns_phy,PHY_PMA_CMN_CTRL1 , val); + +/* Startup state machine registers */ +cdns_phy_reg_write (cdns_phy,CMN_SSM_BIAS_TMR ,0x0087 ); +cdns_phy_reg_write (cdns_phy,CMN_PLLSM0_PLLEN_TMR ,0x001B ); +cdns_phy_reg_write (cdns_phy,CMN_PLLSM0_PLLPRE_TMR ,0x0036 ); +cdns_phy_reg_write (cdns_phy,CMN_PLLSM0_PLLVREF_TMR ,0x001B ); +cdns_phy_reg_write (cdns_phy,CMN_PLLSM0_PLLLOCK_TMR ,0x006C ); + +/* Current calibration registers */ +cdns_phy_reg_write (cdns_phy,CMN_ICAL_INIT_TMR ,0x0044 ); +cdns_phy_reg_write (cdns_phy,CMN_ICAL_ITER_TMR ,0x0006 ); +cdns_phy_reg_write (cdns_phy,CMN_ICAL_ADJ_INIT_TMR ,0x0022 ); +cdns_phy_reg_write (cdns_phy,CMN_ICAL_ADJ_ITER_TMR ,0x0006 ); + +/* Resistor calibration registers */ +cdns_phy_reg_write (cdns_phy,CMN_TXPUCAL_INIT_TMR ,0x0022 ); +cdns_phy_reg_write (cdns_phy,CMN_TXPUCAL_ITER_TMR ,0x0006 ); +cdns_phy_reg_write (cdns_phy,CMN_TXPU_ADJ_INIT_TMR ,0x0022 ); +cdns_phy_reg_write (cdns_phy,CMN_TXPU_ADJ_ITER_TMR ,0x0006 ); +cdns_phy_reg_write (cdns_phy,CMN_TXPDCAL_INIT_TMR ,0x0022 ); +cdns_phy_reg_write (cdns_phy,CMN_TXPDCAL_ITER_TMR ,0x0006 ); +cdns_phy_reg_write (cdns_phy,CMN_TXPD_ADJ_INIT_TMR ,0x0022 ); +cdns_phy_reg_write (cdns_phy,CMN_TXPD_ADJ_ITER_TMR ,0x0006 ); +cdns_phy_reg_write (cdns_phy,CMN_RXCAL_INIT_TMR ,0x0022 ); +cdns_phy_reg_write (cdns_phy,CMN_RXCAL_ITER_TMR ,0x0006 ); +cdns_phy_reg_write (cdns_phy,CMN_RX_ADJ_INIT_TMR ,0x0022 ); +cdns_phy_reg_write (cdns_phy,CMN_RX_ADJ_ITER_TMR ,0x0006 ); + +for (k =0 ; k < num_lanes; k = k +1 ) { +/* Power state machine registers */ +cdns_phy_reg_write (cdns_phy,XCVR_PSM_CAL_TMR | (k <<9 ),0x016D ); +cdns_phy_reg_write (cdns_phy,XCVR_PSM_A0IN_TMR | (k <<9 ),0x016D ); +/* Transceiver control and diagnostic registers */ +cdns_phy_reg_write (cdns_phy,XCVR_DIAG_LANE_FCM_EN_MGN_TMR | (k <<9 ),0x00A2 ); +cdns_phy_reg_write (cdns_phy,TX_DIAG_BGREF_PREDRV_DELAY | (k <<9 ),0x0097 ); +/* Transmitter receiver detect registers */ +cdns_phy_reg_write (cdns_phy,TX_RCVDET_EN_TMR | (k <<9 ),0x0A8C ); +cdns_phy_reg_write (cdns_phy,TX_RCVDET_ST_TMR | (k <<9 ),0x0036 ); + } + +cdns_phy_reg_write (cdns_phy,TX_DIAG_ACYA_0 ,1 ); +cdns_phy_reg_write (cdns_phy,TX_DIAG_ACYA_1 ,1 ); +cdns_phy_reg_write (cdns_phy,TX_DIAG_ACYA_2 ,1 ); +cdns_phy_reg_write (cdns_phy,TX_DIAG_ACYA_3 ,1 ); +} + +static void hdptx_dp_phy_pma_cmn_pll0_27mhz (struct cdns_hdptx_dp_phy *cdns_phy) +{ +u32 num_lanes = cdns_phy->num_lanes; +u32 link_rate = cdns_phy->link_rate; +u16 val; +int index, i, k; + +/* DP PLL data rate 0/1 clock divider value */ + val =cdns_phy_reg_read (cdns_phy,PHY_HDP_CLK_CTL ); + val &=0x00FF ; +if (link_rate <=RATE_2_7 ) + val |=0x2400 ; +else + val |=0x1200 ; +cdns_phy_reg_write (cdns_phy,PHY_HDP_CLK_CTL , val); + +/* High speed clock 0/1 div */ + val =cdns_phy_reg_read (cdns_phy,CMN_DIAG_HSCLK_SEL ); + val &=0xFFCC ; +if (link_rate <=RATE_2_7 ) + val |=0x0011 ; +cdns_phy_reg_write (cdns_phy,CMN_DIAG_HSCLK_SEL , val); + +for (k =0 ; k < num_lanes; k++) { + val =cdns_phy_reg_read (cdns_phy, (XCVR_DIAG_HSCLK_SEL | (k <<9 ))); + val = val &0xCFFF ; +if (link_rate <=RATE_2_7 ) + val |=0x1000 ; +cdns_phy_reg_write (cdns_phy, (XCVR_DIAG_HSCLK_SEL | (k <<9 )), val); + } + +/* DP PHY PLL 27MHz configuration */ + index =link_rate_index (link_rate); +for (i =0 ; i <ARRAY_SIZE (phy_pll_27m_cfg); i++) +cdns_phy_reg_write (cdns_phy, phy_pll_27m_cfg[i].addr, + phy_pll_27m_cfg[i].val[index]); + +/* Transceiver control and diagnostic registers */ +for (k =0 ; k < num_lanes; k++) { + val =cdns_phy_reg_read (cdns_phy, (XCVR_DIAG_PLLDRC_CTRL | (k <<9 ))); + val = val &0x8FFF ; +if (link_rate <=RATE_2_7 ) + val |=0x2000 ; +else + val |=0x1000 ; +cdns_phy_reg_write (cdns_phy, (XCVR_DIAG_PLLDRC_CTRL | (k <<9 )), val); + } + +for (k =0 ; k < num_lanes; k = k +1 ) { +/* Power state machine registers */ +cdns_phy_reg_write (cdns_phy, (XCVR_PSM_RCTRL | (k <<9 )),0xBEFC ); +cdns_phy_reg_write (cdns_phy, (TX_PSC_A0 | (k <<9 )),0x6799 ); +cdns_phy_reg_write (cdns_phy, (TX_PSC_A1 | (k <<9 )),0x6798 ); +cdns_phy_reg_write (cdns_phy, (TX_PSC_A2 | (k <<9 )),0x0098 ); +cdns_phy_reg_write (cdns_phy, (TX_PSC_A3 | (k <<9 )),0x0098 ); +/* Receiver calibration power state definition register */ + val =cdns_phy_reg_read (cdns_phy,RX_PSC_CAL | (k <<9 )); + val &=0xFFBB ; +cdns_phy_reg_write (cdns_phy, (RX_PSC_CAL | (k <<9 )), val); + val =cdns_phy_reg_read (cdns_phy,RX_PSC_A0 | (k <<9 )); + val &=0xFFBB ; +cdns_phy_reg_write (cdns_phy, (RX_PSC_A0 | (k <<9 )), val); + } +} + +static void hdptx_dp_phy_ref_clock_type (struct cdns_hdptx_dp_phy *cdns_phy) +{ +u32 val; + + val =cdns_phy_reg_read (cdns_phy,PHY_PMA_CMN_CTRL1 ); + val &=0xFF8F ; +/* +* single ended reference clock (val |= 0x0030); +* differential clock (val |= 0x0000); +* +* for differential clock on the refclk_p and +* refclk_m off chip pins: CMN_DIAG_ACYA[8]=1'b1 +* cdns_phy_reg_write(cdns_phy, CMN_DIAG_ACYA, 0x0100); +*/ + val |=0x0030 ; +cdns_phy_reg_write (cdns_phy,PHY_PMA_CMN_CTRL1 , val); +} + +static int hdptx_dp_phy_power_up (struct cdns_hdptx_dp_phy *cdns_phy) +{ +u32 val, i; + +/* Enable HDP PLL’s for high speed clocks */ + val =cdns_phy_reg_read (cdns_phy,PHY_HDP_CLK_CTL ); + val |= (1 <<0 ); +cdns_phy_reg_write (cdns_phy,PHY_HDP_CLK_CTL , val); +/* Wait for PLL ready ACK */ +for (i =0 ; i <10 ; i++) { + val =cdns_phy_reg_read (cdns_phy,PHY_HDP_CLK_CTL ); +if (val & (1 <<1 )) +break ; +msleep (20 ); + } +if (i ==10 ) { +dev_err (cdns_phy->dev,"Wait PLL Ack failed\n" ); +return -1 ; + } + +/* Enable HDP PLL’s data rate and full rate clocks out of PMA. */ + val =cdns_phy_reg_read (cdns_phy,PHY_HDP_CLK_CTL ); + val |= (1 <<2 ); +cdns_phy_reg_write (cdns_phy,PHY_HDP_CLK_CTL , val); +/* Wait for PLL clock enable ACK */ +for (i =0 ; i <10 ; i++) { + val =cdns_phy_reg_read (cdns_phy,PHY_HDP_CLK_CTL ); +if (val & (1 <<3 )) +break ; +msleep (20 ); + } +if (i ==10 ) { +dev_err (cdns_phy->dev,"Wait PLL clock enable ACk failed\n" ); +return -1 ; + } + +/* Configure PHY in A2 Mode */ +cdns_phy_reg_write (cdns_phy,PHY_HDP_MODE_CTRL ,0x0004 ); +/* Wait for Power State A2 Ack */ +for (i =0 ; i <10 ; i++) { + val =cdns_phy_reg_read (cdns_phy,PHY_HDP_MODE_CTRL ); +if (val & (1 <<6 )) +break ; +msleep (20 ); + } +if (i ==10 ) { +dev_err (cdns_phy->dev,"Wait A2 Ack failed\n" ); +return -1 ; + } + +/* Configure PHY in A0 mode (PHY must be in the A0 power +* state in order to transmit data) +*/ +cdns_phy_reg_write (cdns_phy,PHY_HDP_MODE_CTRL ,0x0101 ); + +/* Wait for Power State A0 Ack */ +for (i =0 ; i <10 ; i++) { + val =cdns_phy_reg_read (cdns_phy,PHY_HDP_MODE_CTRL ); +if (val & (1 <<4 )) +break ; +msleep (20 ); + } +if (i ==10 ) { +dev_err (cdns_phy->dev,"Wait A0 Ack failed\n" ); +return -1 ; + } + + cdns_phy->power_up = true; + +return 0 ; +} + +static void hdptx_dp_phy_power_down (struct cdns_hdptx_dp_phy *cdns_phy) +{ +u16 val; +int i; + +if (!cdns_phy->power_up) +return ; + +/* Place the PHY lanes in the A3 power state. */ +cdns_phy_reg_write (cdns_phy,PHY_HDP_MODE_CTRL ,0x8 ); +/* Wait for Power State A3 Ack */ +for (i =0 ; i <10 ; i++) { + val =cdns_phy_reg_read (cdns_phy,PHY_HDP_MODE_CTRL ); +if (val & (1 <<7 )) +break ; +msleep (20 ); + } +if (i ==10 ) { +dev_err (cdns_phy->dev,"Wait A3 Ack failed\n" ); +return ; + } + +/* Disable HDP PLL’s data rate and full rate clocks out of PMA. */ + val =cdns_phy_reg_read (cdns_phy,PHY_HDP_CLK_CTL ); + val &= ~(1 <<2 ); +cdns_phy_reg_write (cdns_phy,PHY_HDP_CLK_CTL , val); +/* Wait for PLL clock gate ACK */ +for (i =0 ; i <10 ; i++) { + val =cdns_phy_reg_read (cdns_phy,PHY_HDP_CLK_CTL ); +if (!(val & (1 <<3 ))) +break ; +msleep (20 ); + } +if (i ==10 ) { +dev_err (cdns_phy->dev,"Wait PLL clock gate Ack failed\n" ); +return ; + } + +/* Disable HDP PLL’s for high speed clocks */ + val =cdns_phy_reg_read (cdns_phy,PHY_HDP_CLK_CTL ); + val &= ~(1 <<0 ); +cdns_phy_reg_write (cdns_phy,PHY_HDP_CLK_CTL , val); +/* Wait for PLL disable ACK */ +for (i =0 ; i <10 ; i++) { + val =cdns_phy_reg_read (cdns_phy,PHY_HDP_CLK_CTL ); +if (!(val & (1 <<1 ))) +break ; +msleep (20 ); + } +if (i ==10 ) { +dev_err (cdns_phy->dev,"Wait PLL disable Ack failed\n" ); +return ; + } +} + +static int cdns_hdptx_dp_phy_on (struct phy *phy) +{ +struct cdns_hdptx_dp_phy *cdns_phy =phy_get_drvdata (phy); + +return hdptx_dp_phy_power_up (cdns_phy); +} + +static int cdns_hdptx_dp_phy_off (struct phy *phy) +{ +struct cdns_hdptx_dp_phy *cdns_phy =phy_get_drvdata (phy); + +hdptx_dp_phy_power_down (cdns_phy); + +return 0 ; +} + +static int cdns_hdptx_dp_phy_init (struct phy *phy) +{ +struct cdns_hdptx_dp_phy *cdns_phy =phy_get_drvdata (phy); +int ret; + +hdptx_dp_phy_ref_clock_type (cdns_phy); + +/* PHY power up */ + ret =hdptx_dp_phy_power_up (cdns_phy); +if (ret <0 ) +return ret; + +hdptx_dp_aux_cfg (cdns_phy); + +return ret; +} + +static int cdns_hdptx_dp_configure (struct phy *phy, +union phy_configure_opts *opts) +{ +struct cdns_hdptx_dp_phy *cdns_phy =phy_get_drvdata (phy); +int ret; + + cdns_phy->link_rate = opts->dp.link_rate; + cdns_phy->num_lanes = opts->dp.lanes; + +if (cdns_phy->link_rate >MAX_LINK_RATE ) { +dev_err (cdns_phy->dev,"Link Rate(%d) Not supported\n" , cdns_phy->link_rate); +return false; + } + +/* Disable phy clock if PHY in power up state */ +hdptx_dp_phy_power_down (cdns_phy); + +if (cdns_phy->ref_clk_rate ==REF_CLK_27MHZ ) { +hdptx_dp_phy_pma_cmn_cfg_27mhz (cdns_phy); +hdptx_dp_phy_pma_cmn_pll0_27mhz (cdns_phy); + }else +dev_err (cdns_phy->dev,"Not support ref clock rate\n" ); + +/* PHY power up */ + ret =hdptx_dp_phy_power_up (cdns_phy); + +return ret; +} + +static const struct phy_ops cdns_hdptx_dp_phy_ops = { + .init = cdns_hdptx_dp_phy_init, + .configure = cdns_hdptx_dp_configure, + .power_on = cdns_hdptx_dp_phy_on, + .power_off = cdns_hdptx_dp_phy_off, + .owner =THIS_MODULE , +}; + +static int cdns_hdptx_dp_phy_probe (struct platform_device *pdev) +{ +struct cdns_hdptx_dp_phy *cdns_phy; +struct device *dev = &pdev->dev; +struct device_node *node = dev->of_node; +struct phy_provider *phy_provider; +struct resource *res; +struct phy *phy; +int ret; + + cdns_phy =devm_kzalloc (dev,sizeof (*cdns_phy),GFP_KERNEL ); +if (!cdns_phy) +return -ENOMEM ; + +dev_set_drvdata (dev, cdns_phy); + cdns_phy->dev = dev; +mutex_init (&cdns_phy->mbox_mutex); + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!res) +return -ENODEV ; + cdns_phy->regs =devm_ioremap (dev, res->start,resource_size (res)); +if (IS_ERR (cdns_phy->regs)) +return PTR_ERR (cdns_phy->regs); + + phy =devm_phy_create (dev, node, &cdns_hdptx_dp_phy_ops); +if (IS_ERR (phy)) +return PTR_ERR (phy); + + phy->attrs.mode =PHY_MODE_DP ; + cdns_phy->phy = phy; +phy_set_drvdata (phy, cdns_phy); + + ret =hdptx_dp_clk_enable (cdns_phy); +if (ret) { +dev_err (dev,"Init clk fail\n" ); +return -EINVAL ; + } + + phy_provider =devm_of_phy_provider_register (dev, of_phy_simple_xlate); +if (IS_ERR (phy_provider)) { + ret =PTR_ERR (phy_provider); + goto clk_disable; + } + +return 0 ; + +clk_disable: +hdptx_dp_clk_disable (cdns_phy); + +return -EINVAL ; +} + +static int cdns_hdptx_dp_phy_remove (struct platform_device *pdev) +{ +struct cdns_hdptx_dp_phy *cdns_phy =platform_get_drvdata (pdev); + +hdptx_dp_clk_disable (cdns_phy); + +return 0 ; +} + +static const struct of_device_id cdns_hdptx_dp_phy_of_match[] = { + {.compatible ="fsl,imx8mq-dp-phy" }, + {/* sentinel */ } +}; +MODULE_DEVICE_TABLE (of, cdns_hdptx_dp_phy_of_match); + +static struct platform_driver cdns_hdptx_dp_phy_driver = { + .probe = cdns_hdptx_dp_phy_probe, + .remove = cdns_hdptx_dp_phy_remove, + .driver = { + .name ="cdns-hdptx-dp-phy" , + .of_match_table = cdns_hdptx_dp_phy_of_match, + } +}; +module_platform_driver (cdns_hdptx_dp_phy_driver); + +MODULE_AUTHOR ("Sandor Yu <[email protected]>" ); +MODULE_DESCRIPTION ("Cadence HDP-TX DisplayPort PHY driver" ); +MODULE_LICENSE ("GPL" );Signature · 1 line
2.34.1
Signature · 1 line
~Vinod
RE: [EXT] Re: [PATCH v6 7/8] phy: freescale: Add DisplayPort PHY driver for i.MX8MQ
Hi Vinod,
Thanks for your comments,
Quoted 89 lines
-----Original Message-----
From: Vinod Koul <[email protected]>
Sent: 2023年6月21日 19:24
To: Sandor Yu <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; dl-linux-imx <[email protected]>; Oliver Brown <[email protected]>
Subject: [EXT] Re: [PATCH v6 7/8] phy: freescale: Add DisplayPort PHY driver for i.MX8MQCaution: This is an external email. Please take care when clicking links or opening attachments. When in doubt, report the message using the 'Report this email' button
Quoted 3 lines · Sandor Yu
Add Cadence HDP-TX DisplayPort PHY driver for i.MX8MQ
Cadence HDP-TX PHY could be put in either DP mode or HDMI mode base
on
drivers/phy/freescale/Makefile obj-$(CONFIG_PHY_MIXEL_LVDS_PHY) +=
Quoted 39 lines
the configuration chosen.
DisplayPort PHY mode is configurated in the driver.Signed-off-by Sandor Yu <[email protected]>--- drivers/phy/freescale/Kconfig | 9 + drivers/phy/freescale/Makefile | 1 + drivers/phy/freescale/phy-fsl-imx8mq-dp.c | 697 ++++++++++++++++++++++ 3 files changed, 707 insertions(+) create mode 100644 drivers/phy/freescale/phy-fsl-imx8mq-dp.c(quoted diff) +0
-0b/drivers/phy/freescale/Kconfig index
853958fb2c06..a99ee370eda6100644drivers/phy/freescale/Kconfig +9
-0@@ -35,6 +35,15 @@ config PHY_FSL_IMX8M_PCIE Enable this to add support for the PCIE PHY as found on i.MX8M family of SOCs. +config PHY_CADENCE_DP_PHY + tristate "Cadence HDPTX DP PHY support" + depends on OF && HAS_IOMEM + depends on COMMON_CLK + select GENERIC_PHY + help + Enable this to support the Cadence HDPTX DP PHY driver + on NXP's i.MX8MQ SOC. + endif config PHY_FSL_LYNX_28G(quoted diff) +0
-0b/drivers/phy/freescale/Makefile index
cedb328bc4d2..c3bdf3fa2e72100644drivers/phy/freescale/Makefile +0
-0@@ -4,3 +4,4 @@ obj-$(CONFIG_PHY_MIXEL_LVDS_PHY) +=phy-fsl-imx8qm-lvds-phy.o
drivers/phy/freescale/Makefile obj-$(CONFIG_PHY_MIXEL_LVDS_PHY) += phy-fsl-imx8qm-lvds-phy.o
Quoted 3 lines
drivers/phy/freescale/Makefile +0
-0obj-$(CONFIG_PHY_MIXEL_MIPI_DPHY) += phy-fsl-imx8-mipi-dphy.o obj-$(CONFIG_PHY_FSL_IMX8M_PCIE) += phy-fsl-imx8m-pcie.o obj-$(CONFIG_PHY_FSL_LYNX_28G) +=phy-fsl-lynx-28g.o
Quoted 19 lines
drivers/phy/freescale/Makefile +1
-0+obj-$(CONFIG_PHY_CADENCE_DP_PHY) += phy-fsl-imx8mq-dp.odrivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +11
-0@@ -0,0 +1,697 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Cadence HDP-TX Display Port Interface (DP) PHY driver +* +* Copyright (C) 2022 NXP Semiconductor, Inc. +*/ +#include <asm/unaligned.h> +#include <linux/clk.h> +#include <linux/kernel.h> +#include <linux/phy/phy.h> +#include <linux/platform_device.h>
Quoted 8 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 17
Quoted 6 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +6
-0+#include <linux/io.h> +#include <linux/iopoll.h> + +#include <drm/bridge/cdns-mhdp-mailbox.h> + +#define ADDR_PHY_AFE 0x80000Is this always fixed for every phy generation?
Yes, the offset is fixed for every cdns hdmi/dp external phy.
Quoted 74 lines
Quoted 74 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +74
-0+ +/* PHY registers */ +#define CMN_SSM_BIAS_TMR 0x0022 +#define CMN_PLLSM0_PLLEN_TMR 0x0029 +#define CMN_PLLSM0_PLLPRE_TMR 0x002A +#define CMN_PLLSM0_PLLVREF_TMR 0x002B +#define CMN_PLLSM0_PLLLOCK_TMR 0x002C +#define CMN_PLLSM0_USER_DEF_CTRL 0x002F +#define CMN_PSM_CLK_CTRL 0x0061 +#define CMN_PLL0_VCOCAL_START 0x0081 +#define CMN_PLL0_VCOCAL_INIT_TMR 0x0084 +#define CMN_PLL0_VCOCAL_ITER_TMR 0x0085 +#define CMN_PLL0_INTDIV 0x0094 +#define CMN_PLL0_FRACDIV 0x0095 +#define CMN_PLL0_HIGH_THR 0x0096 +#define CMN_PLL0_DSM_DIAG 0x0097 +#define CMN_PLL0_SS_CTRL2 0x0099 +#define CMN_ICAL_INIT_TMR 0x00C4 +#define CMN_ICAL_ITER_TMR 0x00C5 +#define CMN_RXCAL_INIT_TMR 0x00D4 +#define CMN_RXCAL_ITER_TMR 0x00D5 +#define CMN_TXPUCAL_INIT_TMR 0x00E4 +#define CMN_TXPUCAL_ITER_TMR 0x00E5 +#define CMN_TXPDCAL_INIT_TMR 0x00F4 +#define CMN_TXPDCAL_ITER_TMR 0x00F5 +#define CMN_ICAL_ADJ_INIT_TMR 0x0102 +#define CMN_ICAL_ADJ_ITER_TMR 0x0103 +#define CMN_RX_ADJ_INIT_TMR 0x0106 +#define CMN_RX_ADJ_ITER_TMR 0x0107 +#define CMN_TXPU_ADJ_INIT_TMR 0x010A +#define CMN_TXPU_ADJ_ITER_TMR 0x010B +#define CMN_TXPD_ADJ_INIT_TMR 0x010E +#define CMN_TXPD_ADJ_ITER_TMR 0x010F +#define CMN_DIAG_PLL0_FBH_OVRD 0x01C0 +#define CMN_DIAG_PLL0_FBL_OVRD 0x01C1 +#define CMN_DIAG_PLL0_OVRD 0x01C2 +#define CMN_DIAG_PLL0_TEST_MODE 0x01C4 +#define CMN_DIAG_PLL0_V2I_TUNE 0x01C5 +#define CMN_DIAG_PLL0_CP_TUNE 0x01C6 +#define CMN_DIAG_PLL0_LF_PROG 0x01C7 +#define CMN_DIAG_PLL0_PTATIS_TUNE1 0x01C8 +#define CMN_DIAG_PLL0_PTATIS_TUNE2 0x01C9 +#define CMN_DIAG_HSCLK_SEL 0x01E0 +#define CMN_DIAG_PER_CAL_ADJ 0x01EC +#define CMN_DIAG_CAL_CTRL 0x01ED +#define CMN_DIAG_ACYA 0x01FF +#define XCVR_PSM_RCTRL 0x4001 +#define XCVR_PSM_CAL_TMR 0x4002 +#define XCVR_PSM_A0IN_TMR 0x4003 +#define TX_TXCC_CAL_SCLR_MULT_0 0x4047 +#define TX_TXCC_CPOST_MULT_00_0 0x404C +#define XCVR_DIAG_PLLDRC_CTRL 0x40E0 +#define XCVR_DIAG_PLLDRC_CTRL 0x40E0 +#define XCVR_DIAG_HSCLK_SEL 0x40E1 +#define XCVR_DIAG_LANE_FCM_EN_MGN_TMR 0x40F2 +#define TX_PSC_A0 0x4100 +#define TX_PSC_A1 0x4101 +#define TX_PSC_A2 0x4102 +#define TX_PSC_A3 0x4103 +#define TX_RCVDET_EN_TMR 0x4122 +#define TX_RCVDET_ST_TMR 0x4123 +#define TX_DIAG_BGREF_PREDRV_DELAY 0x41E7 +#define TX_DIAG_BGREF_PREDRV_DELAY 0x41E7 +#define TX_DIAG_ACYA_0 0x41FF +#define TX_DIAG_ACYA_1 0x43FF +#define TX_DIAG_ACYA_2 0x45FF +#define TX_DIAG_ACYA_3 0x47FF +#define TX_ANA_CTRL_REG_1 0x5020 +#define TX_ANA_CTRL_REG_2 0x5021 +#define TX_DIG_CTRL_REG_1 0x5023 +#define TX_DIG_CTRL_REG_2 0x5024 +#define TXDA_CYA_AUXDA_CYA 0x5025 +#define TX_ANA_CTRL_REG_3 0x5026 +#define TX_ANA_CTRL_REG_4 0x5027
Quoted 8 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 97
Quoted 6 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +6
-0+#define TX_ANA_CTRL_REG_5 0x5029 +#define RX_PSC_A0 0x8000 +#define RX_PSC_CAL 0x8006 +#define PHY_HDP_MODE_CTRL 0xC008 +#define PHY_HDP_CLK_CTL 0xC009 +#define PHY_PMA_CMN_CTRL1 0xC800Lower case hex values please
OK, I will correct it.
Quoted 55 lines
Quoted 14 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +13
-0+ +#define REF_CLK_27MHZ 27000000 + +enum dp_link_rate { +RATE_1_6 =162000 , +RATE_2_1 =216000 , +RATE_2_4 =243000 , +RATE_2_7 =270000 , +RATE_3_2 =324000 , +RATE_4_3 =432000 , +RATE_5_4 =540000 , +RATE_8_1 =810000 , +};drivers/phy/freescale/phy-fsl-imx8mq-dp.c
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +10
-0+ +#define MAX_LINK_RATE RATE_5_4 + +struct phy_pll_reg { +u16 val[7 ]; +u32 addr; +}; + +static const struct phy_pll_reg phy_pll_27m_cfg[] = { +/* 1.62 2.16 2.43 2.7 3.24 4.32 5.4 register address */
drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 121
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ {{ 0x010E, 0x010E, 0x010E, 0x010E, 0x010E, 0x010E, 0x010E },
CMN_PLL0_VCOCAL_INIT_TMR},drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 122
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ {{ 0x001B, 0x001B, 0x001B, 0x001B, 0x001B, 0x001B, 0x001B },
CMN_PLL0_VCOCAL_ITER_TMR},drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 123
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ {{ 0x30B9, 0x3087, 0x3096, 0x30B4, 0x30B9, 0x3087, 0x30B4 },
CMN_PLL0_VCOCAL_START},drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 124
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ {{ 0x0077, 0x009F, 0x00B3, 0x00C7, 0x0077, 0x009F, 0x00C7 },
CMN_PLL0_INTDIV},drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 125
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ {{ 0xF9DA, 0xF7CD, 0xF6C7, 0xF5C1, 0xF9DA, 0xF7CD, 0xF5C1 },
CMN_PLL0_FRACDIV},drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 126
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ {{ 0x001E, 0x0028, 0x002D, 0x0032, 0x001E, 0x0028, 0x0032 },
CMN_PLL0_HIGH_THR},drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 127
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ {{ 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020 },
CMN_PLL0_DSM_DIAG},drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 128
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ {{ 0x0000, 0x1000, 0x1000, 0x1000, 0x0000, 0x1000, 0x1000 },
CMN_PLLSM0_USER_DEF_CTRL},drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 129
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ {{ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 },
CMN_DIAG_PLL0_OVRD},drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 130
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ {{ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 },
CMN_DIAG_PLL0_FBH_OVRD},drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 131
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ {{ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 },
CMN_DIAG_PLL0_FBL_OVRD},drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 132
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ {{ 0x0006, 0x0007, 0x0007, 0x0007, 0x0006, 0x0007, 0x0007 },
CMN_DIAG_PLL0_V2I_TUNE},drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 133
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ {{ 0x0043, 0x0043, 0x0043, 0x0042, 0x0043, 0x0043, 0x0042 },
CMN_DIAG_PLL0_CP_TUNE},drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 134
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ {{ 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008 },
CMN_DIAG_PLL0_LF_PROG},drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 135
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ {{ 0x0100, 0x0001, 0x0001, 0x0001, 0x0100, 0x0001, 0x0001 },
CMN_DIAG_PLL0_PTATIS_TUNE1},
Quoted 8 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 136
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ {{ 0x0007, 0x0001, 0x0001, 0x0001, 0x0007, 0x0001, 0x0001 },
CMN_DIAG_PLL0_PTATIS_TUNE2},drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 137
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ {{ 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020 },
CMN_DIAG_PLL0_TEST_MODE},drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 139
Quoted 2 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +2
-0+ {{ 0x0016, 0x0016, 0x0016, 0x0016, 0x0016, 0x0016, 0x0016 }, +CMN_PSM_CLK_CTRL }again, lower case please
OK, will change it in the next version.
Quoted 590 lines
Quoted 8 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +7
-0+}; + +struct cdns_hdptx_dp_phy { +void __iomem *regs;/* DPTX registers base */ +struct device *dev; +struct phy *phy; +struct mutex mbox_mutex;/* mutex to protect mailbox */ drivers/phy/freescale/phy-fsl-imx8mq-dp.c
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +10
-0+struct clk *ref_clk, *apb_clk; +u32 ref_clk_rate; +u32 num_lanes; +u32 link_rate; +bool power_up; +}; + +static int cdns_phy_reg_write (struct cdns_hdptx_dp_phy *cdns_phy,u32 +addr,u32 val) { + return cdns_mhdp_reg_write(cdns_phy, ADDR_PHY_AFE + (addr <<2),
drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 163
Quoted 7 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +7
-0+val); } + +static u32 cdns_phy_reg_read (struct cdns_hdptx_dp_phy *cdns_phy,u32 +addr) { +u32 reg32; + + cdns_mhdp_reg_read(cdns_phy, ADDR_PHY_AFE + (addr << 2),®32);
Quoted 48 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +48
-0+return reg32; +} + +static int link_rate_index (u32 rate) +{ +switch (rate) { +case RATE_1_6 : +return 0 ; +case RATE_2_1 : +return 1 ; +case RATE_2_4 : +return 2 ; +case RATE_2_7 : +return 3 ; +case RATE_3_2 : +return 4 ; +case RATE_4_3 : +return 5 ; +case RATE_5_4 : +return 6 ; +default : +return -1 ; + } +} + +static int hdptx_dp_clk_enable (struct cdns_hdptx_dp_phy *cdns_phy) { +struct device *dev = cdns_phy->dev; +u32 ref_clk_rate; +int ret; + + cdns_phy->ref_clk =devm_clk_get (dev,"ref" ); +if (IS_ERR (cdns_phy->ref_clk)) { +dev_err (dev,"phy ref clock not found\n" ); +return PTR_ERR (cdns_phy->ref_clk); + } + + cdns_phy->apb_clk =devm_clk_get (dev,"apb" ); +if (IS_ERR (cdns_phy->apb_clk)) { +dev_err (dev,"phy apb clock not found\n" ); +return PTR_ERR (cdns_phy->apb_clk); + } + + ret =clk_prepare_enable (cdns_phy->ref_clk); +if (ret) { +dev_err (cdns_phy->dev,"Failed to prepare ref clock\n" ); +return ret; + } +drivers/phy/freescale/phy-fsl-imx8mq-dp.c
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +10
-0+ ref_clk_rate =clk_get_rate (cdns_phy->ref_clk); +if (!ref_clk_rate) { +dev_err (cdns_phy->dev,"Failed to get ref clock rate\n" ); + goto err_ref_clk; + } + +if (ref_clk_rate ==REF_CLK_27MHZ ) + cdns_phy->ref_clk_rate = ref_clk_rate; +else { + dev_err(cdns_phy->dev, "Not support Ref ClockRate(%dHz)\n",
ref_clk_rate);Quoted 48 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +48
-0+ goto err_ref_clk; + } + + ret =clk_prepare_enable (cdns_phy->apb_clk); +if (ret) { +dev_err (cdns_phy->dev,"Failed to prepare apb clock\n" ); + goto err_ref_clk; + } + +return 0 ; + +err_ref_clk: +clk_disable_unprepare (cdns_phy->ref_clk); +return -EINVAL ; +} + +static void hdptx_dp_clk_disable (struct cdns_hdptx_dp_phy *cdns_phy) +{ +clk_disable_unprepare (cdns_phy->ref_clk); +clk_disable_unprepare (cdns_phy->apb_clk); +} + +static void hdptx_dp_aux_cfg (struct cdns_hdptx_dp_phy *cdns_phy) { +/* Power up Aux */ +cdns_phy_reg_write (cdns_phy,TXDA_CYA_AUXDA_CYA ,1 ); + +cdns_phy_reg_write (cdns_phy,TX_DIG_CTRL_REG_1 ,0x3 ); +ndelay (150 ); +cdns_phy_reg_write (cdns_phy,TX_DIG_CTRL_REG_2 ,36 ); +ndelay (150 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_2 ,0x0100 ); +ndelay (150 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_2 ,0x0300 ); +ndelay (150 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_3 ,0x0000 ); +ndelay (150 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_1 ,0x2008 ); +ndelay (150 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_1 ,0x2018 ); +ndelay (150 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_1 ,0xA018 ); +ndelay (150 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_2 ,0x030C ); +ndelay (150 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_5 ,0x0000 ); +ndelay (150 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_4 ,0x1001 ); +ndelay (150 );drivers/phy/freescale/phy-fsl-imx8mq-dp.c
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +10
-0+cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_1 ,0xA098 ); +ndelay (150 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_1 ,0xA198 ); +ndelay (150 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_2 ,0x030d ); +ndelay (150 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_2 ,0x030f ); } + +/* PMA common configuration for 27MHz */ static void +hdptx_dp_phy_pma_cmn_cfg_27mhz(struct cdns_hdptx_dp_phy
*cdns_phy) {drivers/phy/freescale/phy-fsl-imx8mq-dp.c
Quoted 12 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +12
-0+u32 num_lanes = cdns_phy->num_lanes; +u16 val; +int k; + + val =cdns_phy_reg_read (cdns_phy,PHY_PMA_CMN_CTRL1 ); + val &=0xFFF7 ; + val |=0x0008 ; +cdns_phy_reg_write (cdns_phy,PHY_PMA_CMN_CTRL1 , val); + +/* Startup state machine registers */ +cdns_phy_reg_write (cdns_phy,CMN_SSM_BIAS_TMR ,0x0087 ); + cdns_phy_reg_write(cdns_phy, CMN_PLLSM0_PLLEN_TMR,
0x001B);drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 292
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ cdns_phy_reg_write(cdns_phy, CMN_PLLSM0_PLLPRE_TMR,
0x0036);drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 293
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ cdns_phy_reg_write(cdns_phy, CMN_PLLSM0_PLLVREF_TMR,
0x001B);drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 294
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ cdns_phy_reg_write(cdns_phy, CMN_PLLSM0_PLLLOCK_TMR,
0x006C);drivers/phy/freescale/phy-fsl-imx8mq-dp.c
Quoted 5 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +5
-0+ +/* Current calibration registers */ +cdns_phy_reg_write (cdns_phy,CMN_ICAL_INIT_TMR ,0x0044 ); +cdns_phy_reg_write (cdns_phy,CMN_ICAL_ITER_TMR ,0x0006 ); + cdns_phy_reg_write(cdns_phy, CMN_ICAL_ADJ_INIT_TMR,
0x0022);drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 300
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ cdns_phy_reg_write(cdns_phy, CMN_ICAL_ADJ_ITER_TMR,
0x0006);drivers/phy/freescale/phy-fsl-imx8mq-dp.c
Quoted 4 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +4
-0+ +/* Resistor calibration registers */ +cdns_phy_reg_write (cdns_phy,CMN_TXPUCAL_INIT_TMR ,0x0022 ); + cdns_phy_reg_write(cdns_phy, CMN_TXPUCAL_ITER_TMR,
0x0006);drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 305
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ cdns_phy_reg_write(cdns_phy, CMN_TXPU_ADJ_INIT_TMR,
0x0022);drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 306
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ cdns_phy_reg_write(cdns_phy, CMN_TXPU_ADJ_ITER_TMR,
0x0006);drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 308
Quoted 2 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +2
-0+cdns_phy_reg_write (cdns_phy,CMN_TXPDCAL_INIT_TMR ,0x0022 ); + cdns_phy_reg_write(cdns_phy, CMN_TXPDCAL_ITER_TMR,
0x0006);drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 309
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ cdns_phy_reg_write(cdns_phy, CMN_TXPD_ADJ_INIT_TMR,
0x0022);drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 310
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ cdns_phy_reg_write(cdns_phy, CMN_TXPD_ADJ_ITER_TMR,
0x0006);drivers/phy/freescale/phy-fsl-imx8mq-dp.c
Quoted 8 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +8
-0+cdns_phy_reg_write (cdns_phy,CMN_RXCAL_INIT_TMR ,0x0022 ); +cdns_phy_reg_write (cdns_phy,CMN_RXCAL_ITER_TMR ,0x0006 ); +cdns_phy_reg_write (cdns_phy,CMN_RX_ADJ_INIT_TMR ,0x0022 ); +cdns_phy_reg_write (cdns_phy,CMN_RX_ADJ_ITER_TMR ,0x0006 ); + +for (k =0 ; k < num_lanes; k = k +1 ) { +/* Power state machine registers */ + cdns_phy_reg_write(cdns_phy, XCVR_PSM_CAL_TMR |(k << 9),
0x016D);drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 319
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ cdns_phy_reg_write(cdns_phy, XCVR_PSM_A0IN_TMR |(k << 9),
0x016D);drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 321
Quoted 2 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +2
-0+/* Transceiver control and diagnostic registers */ + cdns_phy_reg_write(cdns_phy,
XCVR_DIAG_LANE_FCM_EN_MGN_TMR| (k << 9),0x00A2);drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 322
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ cdns_phy_reg_write(cdns_phy,
TX_DIAG_BGREF_PREDRV_DELAY| (k << 9),0x0097);drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 324
Quoted 2 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +2
-0+/* Transmitter receiver detect registers */ + cdns_phy_reg_write(cdns_phy, TX_RCVDET_EN_TMR | (k<< 9),
0x0A8C);drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 325
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ cdns_phy_reg_write(cdns_phy, TX_RCVDET_ST_TMR | (k<< 9),
0x0036);drivers/phy/freescale/phy-fsl-imx8mq-dp.c
Quoted 8 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +8
-0+ } + +cdns_phy_reg_write (cdns_phy,TX_DIAG_ACYA_0 ,1 ); +cdns_phy_reg_write (cdns_phy,TX_DIAG_ACYA_1 ,1 ); +cdns_phy_reg_write (cdns_phy,TX_DIAG_ACYA_2 ,1 ); +cdns_phy_reg_write (cdns_phy,TX_DIAG_ACYA_3 ,1 ); } + +static void hdptx_dp_phy_pma_cmn_pll0_27mhz(struct
cdns_hdptx_dp_phyQuoted 14 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +14
-0+*cdns_phy) { +u32 num_lanes = cdns_phy->num_lanes; +u32 link_rate = cdns_phy->link_rate; +u16 val; +int index, i, k; + +/* DP PLL data rate 0/1 clock divider value */ + val =cdns_phy_reg_read (cdns_phy,PHY_HDP_CLK_CTL ); + val &=0x00FF ; +if (link_rate <=RATE_2_7 ) + val |=0x2400 ; +else + val |=0x1200 ; +cdns_phy_reg_write (cdns_phy,PHY_HDP_CLK_CTL , val);drivers/phy/freescale/phy-fsl-imx8mq-dp.c
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +10
-0+ +/* High speed clock 0/1 div */ + val =cdns_phy_reg_read (cdns_phy,CMN_DIAG_HSCLK_SEL ); + val &=0xFFCC ; +if (link_rate <=RATE_2_7 ) + val |=0x0011 ; +cdns_phy_reg_write (cdns_phy,CMN_DIAG_HSCLK_SEL , val); + +for (k =0 ; k < num_lanes; k++) { + val = cdns_phy_reg_read(cdns_phy,(
XCVR_DIAG_HSCLK_SEL| (k << 9)));drivers/phy/freescale/phy-fsl-imx8mq-dp.c
Quoted 4 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +4
-0+ val = val &0xCFFF ; +if (link_rate <=RATE_2_7 ) + val |=0x1000 ; + cdns_phy_reg_write(cdns_phy, (XCVR_DIAG_HSCLK_SEL |(k << 9)), val);
drivers/phy/freescale/phy-fsl-imx8mq-dp.c
Quoted 11 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +11
-0+ } + +/* DP PHY PLL 27MHz configuration */ + index =link_rate_index (link_rate); +for (i =0 ; i <ARRAY_SIZE (phy_pll_27m_cfg); i++) +cdns_phy_reg_write (cdns_phy, phy_pll_27m_cfg[i].addr, + phy_pll_27m_cfg[i].val[index]); + +/* Transceiver control and diagnostic registers */ +for (k =0 ; k < num_lanes; k++) { + val = cdns_phy_reg_read(cdns_phy,(
XCVR_DIAG_PLLDRC_CTRL| (k << 9)));drivers/phy/freescale/phy-fsl-imx8mq-dp.c
Quoted 6 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +6
-0+ val = val &0x8FFF ; +if (link_rate <=RATE_2_7 ) + val |=0x2000 ; +else + val |=0x1000 ; + cdns_phy_reg_write(cdns_phy,(
XCVR_DIAG_PLLDRC_CTRL| (k << 9)), val);drivers/phy/freescale/phy-fsl-imx8mq-dp.c
Quoted 5 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +5
-0+ } + +for (k =0 ; k < num_lanes; k = k +1 ) { +/* Power state machine registers */ + cdns_phy_reg_write(cdns_phy, (XCVR_PSM_RCTRL | (k <<9)),
0xBEFC);drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 384
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ cdns_phy_reg_write(cdns_phy, (TX_PSC_A0 | (k << 9)),
0x6799);drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 385
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ cdns_phy_reg_write(cdns_phy, (TX_PSC_A1 | (k << 9)),
0x6798);drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 386
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ cdns_phy_reg_write(cdns_phy, (TX_PSC_A2 | (k << 9)),
0x0098);drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 387
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ cdns_phy_reg_write(cdns_phy, (TX_PSC_A3 | (k << 9)),
0x0098);drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 389
Quoted 2 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +2
-0+/* Receiver calibration power state definition register */ + val = cdns_phy_reg_read(cdns_phy, RX_PSC_CAL | (k <<9));
drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 391
Quoted 2 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +2
-0+ val &=0xFFBB ; + cdns_phy_reg_write(cdns_phy, (RX_PSC_CAL | (k << 9)),val);
drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 392
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +1
-0+ val = cdns_phy_reg_read(cdns_phy, RX_PSC_A0 | (k <<9));
drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 394
Quoted 2 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +2
-0+ val &=0xFFBB ; + cdns_phy_reg_write(cdns_phy, (RX_PSC_A0 | (k << 9)),val);
Quoted 43 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +43
-0+ } +} + +static void hdptx_dp_phy_ref_clock_type (struct cdns_hdptx_dp_phy +*cdns_phy) { +u32 val; + + val =cdns_phy_reg_read (cdns_phy,PHY_PMA_CMN_CTRL1 ); + val &=0xFF8F ; +/* +* single ended reference clock (val |= 0x0030); +* differential clock (val |= 0x0000); +* +* for differential clock on the refclk_p and +* refclk_m off chip pins: CMN_DIAG_ACYA[8]=1'b1 +* cdns_phy_reg_write(cdns_phy, CMN_DIAG_ACYA, 0x0100); +*/ + val |=0x0030 ; +cdns_phy_reg_write (cdns_phy,PHY_PMA_CMN_CTRL1 , val); } + +static int hdptx_dp_phy_power_up (struct cdns_hdptx_dp_phy *cdns_phy) +{ +u32 val, i; + +/* Enable HDP PLL’s for high speed clocks */ + val =cdns_phy_reg_read (cdns_phy,PHY_HDP_CLK_CTL ); + val |= (1 <<0 ); +cdns_phy_reg_write (cdns_phy,PHY_HDP_CLK_CTL , val); +/* Wait for PLL ready ACK */ +for (i =0 ; i <10 ; i++) { + val =cdns_phy_reg_read (cdns_phy,PHY_HDP_CLK_CTL ); +if (val & (1 <<1 )) +break ; +msleep (20 ); + } +if (i ==10 ) { +dev_err (cdns_phy->dev,"Wait PLL Ack failed\n" ); +return -1 ; + } + +/* Enable HDP PLL’s data rate and full rate clocks out of PMA. */ + val =cdns_phy_reg_read (cdns_phy,PHY_HDP_CLK_CTL ); + val |= (1 <<2 );drivers/phy/freescale/phy-fsl-imx8mq-dp.c
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +10
-0+cdns_phy_reg_write (cdns_phy,PHY_HDP_CLK_CTL , val); +/* Wait for PLL clock enable ACK */ +for (i =0 ; i <10 ; i++) { + val =cdns_phy_reg_read (cdns_phy,PHY_HDP_CLK_CTL ); +if (val & (1 <<3 )) +break ; +msleep (20 ); + } +if (i ==10 ) { + dev_err(cdns_phy->dev, "Wait PLL clock enable ACkfailed\n");
drivers/phy/freescale/phy-fsl-imx8mq-dp.c
Quoted 8 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +8
-0+return -1 ; + } + +/* Configure PHY in A2 Mode */ +cdns_phy_reg_write (cdns_phy,PHY_HDP_MODE_CTRL ,0x0004 ); +/* Wait for Power State A2 Ack */ +for (i =0 ; i <10 ; i++) { + val = cdns_phy_reg_read(cdns_phy,
PHY_HDP_MODE_CTRL);Quoted 7 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +7
-0+if (val & (1 <<6 )) +break ; +msleep (20 ); + } +if (i ==10 ) { +dev_err (cdns_phy->dev,"Wait A2 Ack failed\n" ); +return -1 ;drivers/phy/freescale/phy-fsl-imx8mq-dp.c
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +10
-0+ } + +/* Configure PHY in A0 mode (PHY must be in the A0 power +* state in order to transmit data) +*/ +cdns_phy_reg_write (cdns_phy,PHY_HDP_MODE_CTRL ,0x0101 ); + +/* Wait for Power State A0 Ack */ +for (i =0 ; i <10 ; i++) { + val = cdns_phy_reg_read(cdns_phy,
PHY_HDP_MODE_CTRL);Quoted 17 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +17
-0+if (val & (1 <<4 )) +break ; +msleep (20 ); + } +if (i ==10 ) { +dev_err (cdns_phy->dev,"Wait A0 Ack failed\n" ); +return -1 ; + } + + cdns_phy->power_up = true; + +return 0 ; +} + +static void hdptx_dp_phy_power_down (struct cdns_hdptx_dp_phy +*cdns_phy) { +u16 val;drivers/phy/freescale/phy-fsl-imx8mq-dp.c
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +10
-0+int i; + +if (!cdns_phy->power_up) +return ; + +/* Place the PHY lanes in the A3 power state. */ +cdns_phy_reg_write (cdns_phy,PHY_HDP_MODE_CTRL ,0x8 ); +/* Wait for Power State A3 Ack */ +for (i =0 ; i <10 ; i++) { + val = cdns_phy_reg_read(cdns_phy,
PHY_HDP_MODE_CTRL);Quoted 12 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +12
-0+if (val & (1 <<7 )) +break ; +msleep (20 ); + } +if (i ==10 ) { +dev_err (cdns_phy->dev,"Wait A3 Ack failed\n" ); +return ; + } + +/* Disable HDP PLL’s data rate and full rate clocks out of PMA. */ + val =cdns_phy_reg_read (cdns_phy,PHY_HDP_CLK_CTL ); + val &= ~(1 <<2 );drivers/phy/freescale/phy-fsl-imx8mq-dp.c
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +10
-0+cdns_phy_reg_write (cdns_phy,PHY_HDP_CLK_CTL , val); +/* Wait for PLL clock gate ACK */ +for (i =0 ; i <10 ; i++) { + val =cdns_phy_reg_read (cdns_phy,PHY_HDP_CLK_CTL ); +if (!(val & (1 <<3 ))) +break ; +msleep (20 ); + } +if (i ==10 ) { + dev_err(cdns_phy->dev, "Wait PLL clock gate Ackfailed\n");
Quoted 41 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +41
-0+return ; + } + +/* Disable HDP PLL’s for high speed clocks */ + val =cdns_phy_reg_read (cdns_phy,PHY_HDP_CLK_CTL ); + val &= ~(1 <<0 ); +cdns_phy_reg_write (cdns_phy,PHY_HDP_CLK_CTL , val); +/* Wait for PLL disable ACK */ +for (i =0 ; i <10 ; i++) { + val =cdns_phy_reg_read (cdns_phy,PHY_HDP_CLK_CTL ); +if (!(val & (1 <<1 ))) +break ; +msleep (20 ); + } +if (i ==10 ) { +dev_err (cdns_phy->dev,"Wait PLL disable Ack failed\n" ); +return ; + } +} + +static int cdns_hdptx_dp_phy_on (struct phy *phy) { +struct cdns_hdptx_dp_phy *cdns_phy =phy_get_drvdata (phy); + +return hdptx_dp_phy_power_up (cdns_phy); } + +static int cdns_hdptx_dp_phy_off (struct phy *phy) { +struct cdns_hdptx_dp_phy *cdns_phy =phy_get_drvdata (phy); + +hdptx_dp_phy_power_down (cdns_phy); + +return 0 ; +} + +static int cdns_hdptx_dp_phy_init (struct phy *phy) { +struct cdns_hdptx_dp_phy *cdns_phy =phy_get_drvdata (phy); +int ret; + +hdptx_dp_phy_ref_clock_type (cdns_phy); + +/* PHY power up */ + ret =hdptx_dp_phy_power_up (cdns_phy);drivers/phy/freescale/phy-fsl-imx8mq-dp.c line 581
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +10
-0+if (ret <0 ) +return ret; + +hdptx_dp_aux_cfg (cdns_phy); + +return ret; +} + +static int cdns_hdptx_dp_configure (struct phy *phy, +union phy_configure_opts *opts){
drivers/phy/freescale/phy-fsl-imx8mq-dp.c
Quoted 8 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +8
-0+struct cdns_hdptx_dp_phy *cdns_phy =phy_get_drvdata (phy); +int ret; + + cdns_phy->link_rate = opts->dp.link_rate; + cdns_phy->num_lanes = opts->dp.lanes; + +if (cdns_phy->link_rate >MAX_LINK_RATE ) { + dev_err(cdns_phy->dev, "Link Rate(%d) Not supported\n",
cdns_phy->link_rate);Quoted 37 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +37
-0+return false; + } + +/* Disable phy clock if PHY in power up state */ +hdptx_dp_phy_power_down (cdns_phy); + +if (cdns_phy->ref_clk_rate ==REF_CLK_27MHZ ) { +hdptx_dp_phy_pma_cmn_cfg_27mhz (cdns_phy); +hdptx_dp_phy_pma_cmn_pll0_27mhz (cdns_phy); + }else +dev_err (cdns_phy->dev,"Not support ref clock rate\n" ); + +/* PHY power up */ + ret =hdptx_dp_phy_power_up (cdns_phy); + +return ret; +} + +static const struct phy_ops cdns_hdptx_dp_phy_ops = { + .init = cdns_hdptx_dp_phy_init, + .configure = cdns_hdptx_dp_configure, + .power_on = cdns_hdptx_dp_phy_on, + .power_off = cdns_hdptx_dp_phy_off, + .owner =THIS_MODULE , +}; + +static int cdns_hdptx_dp_phy_probe (struct platform_device *pdev) { +struct cdns_hdptx_dp_phy *cdns_phy; +struct device *dev = &pdev->dev; +struct device_node *node = dev->of_node; +struct phy_provider *phy_provider; +struct resource *res; +struct phy *phy; +int ret; + + cdns_phy =devm_kzalloc (dev,sizeof (*cdns_phy),GFP_KERNEL ); +if (!cdns_phy)drivers/phy/freescale/phy-fsl-imx8mq-dp.c
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +10
-0+return -ENOMEM ; + +dev_set_drvdata (dev, cdns_phy); + cdns_phy->dev = dev; +mutex_init (&cdns_phy->mbox_mutex); + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!res) +return -ENODEV ; + cdns_phy->regs = devm_ioremap(dev, res->start,
resource_size(res));Quoted 8 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +8
-0+if (IS_ERR (cdns_phy->regs)) +return PTR_ERR (cdns_phy->regs); + + phy =devm_phy_create (dev, node, &cdns_hdptx_dp_phy_ops); +if (IS_ERR (phy)) +return PTR_ERR (phy); + + phy->attrs.mode =PHY_MODE_DP ;drivers/phy/freescale/phy-fsl-imx8mq-dp.c
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +10
-0+ cdns_phy->phy = phy; +phy_set_drvdata (phy, cdns_phy); + + ret =hdptx_dp_clk_enable (cdns_phy); +if (ret) { +dev_err (dev,"Init clk fail\n" ); +return -EINVAL ; + } + + phy_provider = devm_of_phy_provider_register(dev,
of_phy_simple_xlate);Quoted 5 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +5
-0+if (IS_ERR (phy_provider)) { + ret =PTR_ERR (phy_provider); + goto clk_disable; + } +drivers/phy/freescale/phy-fsl-imx8mq-dp.c
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +10
-0+return 0 ; + +clk_disable: +hdptx_dp_clk_disable (cdns_phy); + +return -EINVAL ; +} + +static int cdns_hdptx_dp_phy_remove (struct platform_device *pdev) { + struct cdns_hdptx_dp_phy *cdns_phy =
platform_get_drvdata(pdev);Quoted 22 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +22
-0+ +hdptx_dp_clk_disable (cdns_phy); + +return 0 ; +} + +static const struct of_device_id cdns_hdptx_dp_phy_of_match[] = { + {.compatible ="fsl,imx8mq-dp-phy" }, + {/* sentinel */ } +}; +MODULE_DEVICE_TABLE (of, cdns_hdptx_dp_phy_of_match); + +static struct platform_driver cdns_hdptx_dp_phy_driver = { + .probe = cdns_hdptx_dp_phy_probe, + .remove = cdns_hdptx_dp_phy_remove, + .driver = { + .name ="cdns-hdptx-dp-phy" , + .of_match_table = cdns_hdptx_dp_phy_of_match, + } +}; +module_platform_driver (cdns_hdptx_dp_phy_driver); +
Quoted 8 lines
Quoted 5 lines
drivers/phy/freescale/phy-fsl-imx8mq-dp.c new file +3
-1+MODULE_AUTHOR ("Sandor Yu <[email protected]>" ); +MODULE_DESCRIPTION ("Cadence HDP-TX DisplayPort PHY driver" ); +MODULE_LICENSE ("GPL" ); --2.34.1
--
~Vinod
B.R
Sandor
PATCH v6 8/8 phy: freescale: Add HDMI PHY driver for i.MX8MQ
In reply to Sandor YuAdd Cadence HDP-TX HDMI PHY driver for i.MX8MQ.
Cadence HDP-TX PHY could be put in either DP mode or HDMI mode base on the configuration chosen. HDMI PHY mode is configurated in the driver.
--- drivers/phy/freescale/Kconfig | 9 + drivers/phy/freescale/Makefile | 1 + drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c | 889 ++++++++++++++++++++ 3 files changed, 899 insertions(+) create mode 100644 drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
drivers/phy/freescale/Kconfig +9 -0
@@ -44,6 +44,15 @@ config PHY_CADENCE_DP_PHY Enable this to support the Cadence HDPTX DP PHY driver on NXP's i.MX8MQ SOC. +config PHY_CADENCE_HDMI_PHY + tristate "Cadence HDPTX HDMI PHY Driver" + depends on OF && HAS_IOMEM + depends on COMMON_CLK + select GENERIC_PHY + help + Enable this to support the Cadence HDPTX HDMI PHY driver. + on NXP's i.MX8MQ SOC. + endif config PHY_FSL_LYNX_28G
drivers/phy/freescale/Makefile +1 -0
@@ -5,3 +5,4 @@ obj-$(CONFIG_PHY_MIXEL_MIPI_DPHY) += phy-fsl-imx8-mipi-dphy.o obj-$(CONFIG_PHY_FSL_IMX8M_PCIE) += phy-fsl-imx8m-pcie.o obj-$(CONFIG_PHY_FSL_LYNX_28G) += phy-fsl-lynx-28g.o obj-$(CONFIG_PHY_CADENCE_DP_PHY) += phy-fsl-imx8mq-dp.o +obj-$(CONFIG_PHY_CADENCE_HDMI_PHY) += phy-fsl-imx8mq-hdmi.o
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +889 -0
889 lines not on this page · raw message
Signature · 1 line
2.34.1
Vinod Koul
maintainerRe: [PATCH v6 8/8] phy: freescale: Add HDMI PHY driver for i.MX8MQ
Quoted 39 lines · Sandor Yu
Add Cadence HDP-TX HDMI PHY driver for i.MX8MQ.
Cadence HDP-TX PHY could be put in either DP mode or HDMI mode base on the configuration chosen. HDMI PHY mode is configurated in the driver.
Signed-off-by Sandor Yu <[email protected]>--- drivers/phy/freescale/Kconfig | 9 + drivers/phy/freescale/Makefile | 1 + drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c | 889 ++++++++++++++++++++ 3 files changed, 899 insertions(+) create mode 100644 drivers/phy/freescale/phy-fsl-imx8mq-hdmi.cdrivers/phy/freescale/Kconfig +9
-0@@ -44,6 +44,15 @@ config PHY_CADENCE_DP_PHY Enable this to support the Cadence HDPTX DP PHY driver on NXP's i.MX8MQ SOC. +config PHY_CADENCE_HDMI_PHY + tristate "Cadence HDPTX HDMI PHY Driver" + depends on OF && HAS_IOMEM + depends on COMMON_CLK + select GENERIC_PHY + help + Enable this to support the Cadence HDPTX HDMI PHY driver. + on NXP's i.MX8MQ SOC. + endif config PHY_FSL_LYNX_28Gdrivers/phy/freescale/Makefile +0
-0
drivers/phy/freescale/Makefile obj-$(CONFIG_PHY_MIXEL_MIPI_DPHY) += phy-fsl-imx8-mipi-dphy.o · line 8
Quoted 4 lines
drivers/phy/freescale/Makefile +1
-0@@ -5,3 +5,4 @@ obj-$(CONFIG_PHY_MIXEL_MIPI_DPHY) += phy-fsl-imx8-mipi-dphy.o obj-$(CONFIG_PHY_FSL_IMX8M_PCIE) += phy-fsl-imx8m-pcie.o obj-$(CONFIG_PHY_FSL_LYNX_28G) += phy-fsl-lynx-28g.o obj-$(CONFIG_PHY_CADENCE_DP_PHY) += phy-fsl-imx8mq-dp.o +obj-$(CONFIG_PHY_CADENCE_HDMI_PHY) += phy-fsl-imx8mq-hdmi.o
Pls sort alphabetically (both Kconfig and Makefile)
Quoted 73 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +67
-0@@ -0,0 +1,889 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Cadence High-Definition Multimedia Interface (HDMI) PHY driver +* +* Copyright (C) 2022 NXP Semiconductor, Inc. +*/ +#include <asm/unaligned.h> +#include <linux/clk.h> +#include <linux/kernel.h> +#include <linux/phy/phy.h> +#include <linux/platform_device.h> +#include <linux/io.h> + +#include <drm/bridge/cdns-mhdp-mailbox.h> + +#define ADDR_PHY_AFE 0x80000 +/* PHY registers */ +#define CMN_SSM_BIAS_TMR 0x0022 +#define CMN_PLLSM0_USER_DEF_CTRL 0x002F +#define CMN_PSM_CLK_CTRL 0x0061 +#define CMN_CDIAG_REFCLK_CTRL 0x0062 +#define CMN_PLL0_VCOCAL_START 0x0081 +#define CMN_PLL0_VCOCAL_INIT_TMR 0x0084 +#define CMN_PLL0_VCOCAL_ITER_TMR 0x0085 +#define CMN_TXPUCAL_CTRL 0x00E0 +#define CMN_TXPDCAL_CTRL 0x00F0 +#define CMN_TXPU_ADJ_CTRL 0x0108 +#define CMN_TXPD_ADJ_CTRL 0x010c +#define CMN_DIAG_PLL0_FBH_OVRD 0x01C0 +#define CMN_DIAG_PLL0_FBL_OVRD 0x01C1 +#define CMN_DIAG_PLL0_OVRD 0x01C2 +#define CMN_DIAG_PLL0_TEST_MODE 0x01C4 +#define CMN_DIAG_PLL0_V2I_TUNE 0x01C5 +#define CMN_DIAG_PLL0_CP_TUNE 0x01C6 +#define CMN_DIAG_PLL0_LF_PROG 0x01C7 +#define CMN_DIAG_PLL0_PTATIS_TUNE1 0x01C8 +#define CMN_DIAG_PLL0_PTATIS_TUNE2 0x01C9 +#define CMN_DIAG_PLL0_INCLK_CTRL 0x01CA +#define CMN_DIAG_PLL0_PXL_DIVH 0x01CB +#define CMN_DIAG_PLL0_PXL_DIVL 0x01CC +#define CMN_DIAG_HSCLK_SEL 0x01E0 +#define XCVR_PSM_RCTRL 0x4001 +#define TX_TXCC_CAL_SCLR_MULT_0 0x4047 +#define TX_TXCC_CPOST_MULT_00_0 0x404C +#define XCVR_DIAG_PLLDRC_CTRL 0x40E0 +#define XCVR_DIAG_PLLDRC_CTRL 0x40E0 +#define XCVR_DIAG_HSCLK_SEL 0x40E1 +#define XCVR_DIAG_BIDI_CTRL 0x40E8 +#define TX_PSC_A0 0x4100 +#define TX_PSC_A1 0x4101 +#define TX_PSC_A2 0x4102 +#define TX_PSC_A3 0x4103 +#define TX_DIAG_TX_CTRL 0x41E0 +#define TX_DIAG_TX_DRV 0x41E1 +#define TX_DIAG_BGREF_PREDRV_DELAY 0x41E7 +#define TX_DIAG_ACYA_0 0x41FF +#define TX_DIAG_ACYA_1 0x43FF +#define TX_DIAG_ACYA_2 0x45FF +#define TX_DIAG_ACYA_3 0x47FF +#define TX_ANA_CTRL_REG_1 0x5020 +#define TX_ANA_CTRL_REG_2 0x5021 +#define TX_DIG_CTRL_REG_2 0x5024 +#define TXDA_CYA_AUXDA_CYA 0x5025 +#define TX_ANA_CTRL_REG_3 0x5026 +#define TX_ANA_CTRL_REG_4 0x5027 +#define TX_ANA_CTRL_REG_5 0x5029 +#define RX_PSC_A0 0x8000
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 77
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +10
-0+#define RX_PSC_CAL 0x8006 +#define PHY_HDP_MODE_CTRL 0xC008 +#define PHY_HDP_CLK_CTL 0xC009 +#define PHY_ISO_CMN_CTRL 0xC010 +#define PHY_PMA_CMN_CTRL1 0xC800 +#define PHY_PMA_ISO_CMN_CTRL 0xC810 +#define PHY_PMA_ISO_PLL_CTRL1 0xC812 +#define PHY_PMA_ISOLATION_CTRL 0xC81F + +#define REF_CLK_27MHZ 27000000
This looks similar to patch 7, how different are these two..?
Quoted 153 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +153
-0+ +/* HDMI TX clock control settings */ +struct hdptx_hdmi_ctrl { +u32 pixel_clk_freq_min; +u32 pixel_clk_freq_max; +u32 feedback_factor; +u32 data_range_kbps_min; +u32 data_range_kbps_max; +u32 cmnda_pll0_ip_div; +u32 cmn_ref_clk_dig_div; +u32 ref_clk_divider_scaler; +u32 pll_fb_div_total; +u32 cmnda_pll0_fb_div_low; +u32 cmnda_pll0_fb_div_high; +u32 pixel_div_total; +u32 cmnda_pll0_pxdiv_low; +u32 cmnda_pll0_pxdiv_high; +u32 vco_freq_min; +u32 vco_freq_max; +u32 vco_ring_select; +u32 cmnda_hs_clk_0_sel; +u32 cmnda_hs_clk_1_sel; +u32 hsclk_div_at_xcvr; +u32 hsclk_div_tx_sub_rate; +u32 cmnda_pll0_hs_sym_div_sel; +u32 cmnda_pll0_clk_freq_min; +u32 cmnda_pll0_clk_freq_max; +}; + +struct cdns_hdptx_hdmi_phy { +void __iomem *regs;/* DPTX registers base */ +struct mutex mbox_mutex;/* mutex to protect mailbox */ +struct device *dev; +struct phy *phy; +struct clk *ref_clk, *apb_clk; +u32 ref_clk_rate; +u32 pixel_clk_rate; +enum hdmi_phy_colorspace color_space; +u32 bpc; +}; + +/* HDMI TX clock control settings, pixel clock is output */ +static const struct hdptx_hdmi_ctrl pixel_clk_output_ctrl_table[] = { +/*Minclk Maxclk Fdbak DR_min DR_max ip_d dig DS Totl */ +{27000 ,27000 ,1000 ,270000 ,270000 ,0x03 ,0x1 ,0x1 ,240 ,0x0BC ,0x030 ,80 ,0x026 ,0x026 ,2160000 ,2160000 ,0 ,2 ,2 ,2 ,4 ,0x3 ,27000 ,27000 }, +{27000 ,27000 ,1250 ,337500 ,337500 ,0x03 ,0x1 ,0x1 ,300 ,0x0EC ,0x03C ,100 ,0x030 ,0x030 ,2700000 ,2700000 ,0 ,2 ,2 ,2 ,4 ,0x3 ,33750 ,33750 }, +{27000 ,27000 ,1500 ,405000 ,405000 ,0x03 ,0x1 ,0x1 ,360 ,0x11C ,0x048 ,120 ,0x03A ,0x03A ,3240000 ,3240000 ,0 ,2 ,2 ,2 ,4 ,0x3 ,40500 ,40500 }, +{27000 ,27000 ,2000 ,540000 ,540000 ,0x03 ,0x1 ,0x1 ,240 ,0x0BC ,0x030 ,80 ,0x026 ,0x026 ,2160000 ,2160000 ,0 ,2 ,2 ,2 ,4 ,0x2 ,54000 ,54000 }, +{54000 ,54000 ,1000 ,540000 ,540000 ,0x03 ,0x1 ,0x1 ,480 ,0x17C ,0x060 ,80 ,0x026 ,0x026 ,4320000 ,4320000 ,1 ,2 ,2 ,2 ,4 ,0x3 ,54000 ,54000 }, +{54000 ,54000 ,1250 ,675000 ,675000 ,0x04 ,0x1 ,0x1 ,400 ,0x13C ,0x050 ,50 ,0x017 ,0x017 ,2700000 ,2700000 ,0 ,1 ,1 ,2 ,4 ,0x2 ,67500 ,67500 }, +{54000 ,54000 ,1500 ,810000 ,810000 ,0x04 ,0x1 ,0x1 ,480 ,0x17C ,0x060 ,60 ,0x01C ,0x01C ,3240000 ,3240000 ,0 ,2 ,2 ,2 ,2 ,0x2 ,81000 ,81000 }, +{54000 ,54000 ,2000 ,1080000 ,1080000 ,0x03 ,0x1 ,0x1 ,240 ,0x0BC ,0x030 ,40 ,0x012 ,0x012 ,2160000 ,2160000 ,0 ,2 ,2 ,2 ,1 ,0x1 ,108000 ,108000 }, +{74250 ,74250 ,1000 ,742500 ,742500 ,0x03 ,0x1 ,0x1 ,660 ,0x20C ,0x084 ,80 ,0x026 ,0x026 ,5940000 ,5940000 ,1 ,2 ,2 ,2 ,4 ,0x3 ,74250 ,74250 }, +{74250 ,74250 ,1250 ,928125 ,928125 ,0x04 ,0x1 ,0x1 ,550 ,0x1B4 ,0x06E ,50 ,0x017 ,0x017 ,3712500 ,3712500 ,1 ,1 ,1 ,2 ,4 ,0x2 ,92812 ,92812 }, +{74250 ,74250 ,1500 ,1113750 ,1113750 ,0x04 ,0x1 ,0x1 ,660 ,0x20C ,0x084 ,60 ,0x01C ,0x01C ,4455000 ,4455000 ,1 ,2 ,2 ,2 ,2 ,0x2 ,111375 ,111375 }, +{74250 ,74250 ,2000 ,1485000 ,1485000 ,0x03 ,0x1 ,0x1 ,330 ,0x104 ,0x042 ,40 ,0x012 ,0x012 ,2970000 ,2970000 ,0 ,2 ,2 ,2 ,1 ,0x1 ,148500 ,148500 }, +{99000 ,99000 ,1000 ,990000 ,990000 ,0x03 ,0x1 ,0x1 ,440 ,0x15C ,0x058 ,40 ,0x012 ,0x012 ,3960000 ,3960000 ,1 ,2 ,2 ,2 ,2 ,0x2 ,99000 ,99000 }, +{99000 ,99000 ,1250 ,1237500 ,1237500 ,0x03 ,0x1 ,0x1 ,275 ,0x0D8 ,0x037 ,25 ,0x00B ,0x00A ,2475000 ,2475000 ,0 ,1 ,1 ,2 ,2 ,0x1 ,123750 ,123750 }, +{99000 ,99000 ,1500 ,1485000 ,1485000 ,0x03 ,0x1 ,0x1 ,330 ,0x104 ,0x042 ,30 ,0x00D ,0x00D ,2970000 ,2970000 ,0 ,2 ,2 ,2 ,1 ,0x1 ,148500 ,148500 }, +{99000 ,99000 ,2000 ,1980000 ,1980000 ,0x03 ,0x1 ,0x1 ,440 ,0x15C ,0x058 ,40 ,0x012 ,0x012 ,3960000 ,3960000 ,1 ,2 ,2 ,2 ,1 ,0x1 ,198000 ,198000 }, +{148500 ,148500 ,1000 ,1485000 ,1485000 ,0x03 ,0x1 ,0x1 ,660 ,0x20C ,0x084 ,40 ,0x012 ,0x012 ,5940000 ,5940000 ,1 ,2 ,2 ,2 ,2 ,0x2 ,148500 ,148500 }, +{148500 ,148500 ,1250 ,1856250 ,1856250 ,0x04 ,0x1 ,0x1 ,550 ,0x1B4 ,0x06E ,25 ,0x00B ,0x00A ,3712500 ,3712500 ,1 ,1 ,1 ,2 ,2 ,0x1 ,185625 ,185625 }, +{148500 ,148500 ,1500 ,2227500 ,2227500 ,0x03 ,0x1 ,0x1 ,495 ,0x188 ,0x063 ,30 ,0x00D ,0x00D ,4455000 ,4455000 ,1 ,1 ,1 ,2 ,2 ,0x1 ,222750 ,222750 }, +{148500 ,148500 ,2000 ,2970000 ,2970000 ,0x03 ,0x1 ,0x1 ,660 ,0x20C ,0x084 ,40 ,0x012 ,0x012 ,5940000 ,5940000 ,1 ,2 ,2 ,2 ,1 ,0x1 ,297000 ,297000 }, +{198000 ,198000 ,1000 ,1980000 ,1980000 ,0x03 ,0x1 ,0x1 ,220 ,0x0AC ,0x02C ,10 ,0x003 ,0x003 ,1980000 ,1980000 ,0 ,1 ,1 ,2 ,1 ,0x0 ,198000 ,198000 }, +{198000 ,198000 ,1250 ,2475000 ,2475000 ,0x03 ,0x1 ,0x1 ,550 ,0x1B4 ,0x06E ,25 ,0x00B ,0x00A ,4950000 ,4950000 ,1 ,1 ,1 ,2 ,2 ,0x1 ,247500 ,247500 }, +{198000 ,198000 ,1500 ,2970000 ,2970000 ,0x03 ,0x1 ,0x1 ,330 ,0x104 ,0x042 ,15 ,0x006 ,0x005 ,2970000 ,2970000 ,0 ,1 ,1 ,2 ,1 ,0x0 ,297000 ,297000 }, +{198000 ,198000 ,2000 ,3960000 ,3960000 ,0x03 ,0x1 ,0x1 ,440 ,0x15C ,0x058 ,20 ,0x008 ,0x008 ,3960000 ,3960000 ,1 ,1 ,1 ,2 ,1 ,0x0 ,396000 ,396000 }, +{297000 ,297000 ,1000 ,2970000 ,2970000 ,0x03 ,0x1 ,0x1 ,330 ,0x104 ,0x042 ,10 ,0x003 ,0x003 ,2970000 ,2970000 ,0 ,1 ,1 ,2 ,1 ,0x0 ,297000 ,297000 }, +{297000 ,297000 ,1500 ,4455000 ,4455000 ,0x03 ,0x1 ,0x1 ,495 ,0x188 ,0x063 ,15 ,0x006 ,0x005 ,4455000 ,4455000 ,1 ,1 ,1 ,2 ,1 ,0x0 ,445500 ,445500 }, +{297000 ,297000 ,2000 ,5940000 ,5940000 ,0x03 ,0x1 ,0x1 ,660 ,0x20C ,0x084 ,20 ,0x008 ,0x008 ,5940000 ,5940000 ,1 ,1 ,1 ,2 ,1 ,0x0 ,594000 ,594000 }, +{594000 ,594000 ,1000 ,5940000 ,5940000 ,0x03 ,0x1 ,0x1 ,660 ,0x20C ,0x084 ,10 ,0x003 ,0x003 ,5940000 ,5940000 ,1 ,1 ,1 ,2 ,1 ,0x0 ,594000 ,594000 }, +{594000 ,594000 ,750 ,4455000 ,4455000 ,0x03 ,0x1 ,0x1 ,495 ,0x188 ,0x063 ,10 ,0x003 ,0x003 ,4455000 ,4455000 ,1 ,1 ,1 ,2 ,1 ,0x0 ,445500 ,445500 }, +{594000 ,594000 ,625 ,3712500 ,3712500 ,0x04 ,0x1 ,0x1 ,550 ,0x1B4 ,0x06E ,10 ,0x003 ,0x003 ,3712500 ,3712500 ,1 ,1 ,1 ,2 ,1 ,0x0 ,371250 ,371250 }, +{594000 ,594000 ,500 ,2970000 ,2970000 ,0x03 ,0x1 ,0x1 ,660 ,0x20C ,0x084 ,10 ,0x003 ,0x003 ,5940000 ,5940000 ,1 ,1 ,1 ,2 ,2 ,0x1 ,297000 ,297000 }, +}; + +/* HDMI TX PLL tuning settings */ +struct hdptx_hdmi_pll_tuning { +u32 vco_freq_bin; +u32 vco_freq_min; +u32 vco_freq_max; +u32 volt_to_current_coarse; +u32 volt_to_current; +u32 ndac_ctrl; +u32 pmos_ctrl; +u32 ptat_ndac_ctrl; +u32 feedback_div_total; +u32 charge_pump_gain; +u32 coarse_code; +u32 v2i_code; +u32 vco_cal_code; +}; + +/* HDMI TX PLL tuning settings, pixel clock is output */ +static const struct hdptx_hdmi_pll_tuning pixel_clk_output_pll_table[] = { +/*bin VCO_freq min/max coar cod NDAC PMOS PTAT div-T P-Gain Coa V2I CAL */ +{1 ,1980000 ,1980000 ,0x4 ,0x3 ,0x0 ,0x09 ,0x09 ,220 ,0x42 ,160 ,5 ,183 }, +{2 ,2160000 ,2160000 ,0x4 ,0x3 ,0x0 ,0x09 ,0x09 ,240 ,0x42 ,166 ,6 ,208 }, +{3 ,2475000 ,2475000 ,0x5 ,0x3 ,0x1 ,0x00 ,0x07 ,275 ,0x42 ,167 ,6 ,209 }, +{4 ,2700000 ,2700000 ,0x5 ,0x3 ,0x1 ,0x00 ,0x07 ,300 ,0x42 ,188 ,6 ,230 }, +{4 ,2700000 ,2700000 ,0x5 ,0x3 ,0x1 ,0x00 ,0x07 ,400 ,0x4C ,188 ,6 ,230 }, +{5 ,2970000 ,2970000 ,0x6 ,0x3 ,0x1 ,0x00 ,0x07 ,330 ,0x42 ,183 ,6 ,225 }, +{6 ,3240000 ,3240000 ,0x6 ,0x3 ,0x1 ,0x00 ,0x07 ,360 ,0x42 ,203 ,7 ,256 }, +{6 ,3240000 ,3240000 ,0x6 ,0x3 ,0x1 ,0x00 ,0x07 ,480 ,0x4C ,203 ,7 ,256 }, +{7 ,3712500 ,3712500 ,0x4 ,0x3 ,0x0 ,0x07 ,0x0F ,550 ,0x4C ,212 ,7 ,257 }, +{8 ,3960000 ,3960000 ,0x5 ,0x3 ,0x0 ,0x07 ,0x0F ,440 ,0x42 ,184 ,6 ,226 }, +{9 ,4320000 ,4320000 ,0x5 ,0x3 ,0x1 ,0x07 ,0x0F ,480 ,0x42 ,205 ,7 ,258 }, +{10 ,4455000 ,4455000 ,0x5 ,0x3 ,0x0 ,0x07 ,0x0F ,495 ,0x42 ,219 ,7 ,272 }, +{10 ,4455000 ,4455000 ,0x5 ,0x3 ,0x0 ,0x07 ,0x0F ,660 ,0x4C ,219 ,7 ,272 }, +{11 ,4950000 ,4950000 ,0x6 ,0x3 ,0x1 ,0x00 ,0x07 ,550 ,0x42 ,213 ,7 ,258 }, +{12 ,5940000 ,5940000 ,0x7 ,0x3 ,0x1 ,0x00 ,0x07 ,660 ,0x42 ,244 ,8 ,292 }, +}; + +static int cdns_phy_reg_write (struct cdns_hdptx_hdmi_phy *cdns_phy,u32 addr,u32 val) +{ +return cdns_mhdp_reg_write (cdns_phy,ADDR_PHY_AFE + (addr <<2 ), val); +} + +static u32 cdns_phy_reg_read (struct cdns_hdptx_hdmi_phy *cdns_phy,u32 addr) +{ +u32 reg32; + +cdns_mhdp_reg_read (cdns_phy,ADDR_PHY_AFE + (addr <<2 ), ®32); + +return reg32; +} + +#define KEEP_ALIVE 0x18 +static bool hdptx_phy_check_alive (struct cdns_hdptx_hdmi_phy *cdns_phy) +{ +u32 alive, newalive; +u8 retries_left =50 ; + + alive =readl (cdns_phy->regs +KEEP_ALIVE ); + +while (retries_left--) { +udelay (2 ); + + newalive =readl (cdns_phy->regs +KEEP_ALIVE ); +if (alive == newalive) +continue ; +return true; + } +return false; +} + +static int hdptx_hdmi_clk_enable (struct cdns_hdptx_hdmi_phy *cdns_phy) +{ +struct device *dev = cdns_phy->dev; +u32 ref_clk_rate; +int ret; +
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 240
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +10
-0+ cdns_phy->ref_clk =devm_clk_get (dev,"ref" ); +if (IS_ERR (cdns_phy->ref_clk)) { +dev_err (dev,"phy ref clock not found\n" ); +return PTR_ERR (cdns_phy->ref_clk); + } + + cdns_phy->apb_clk =devm_clk_get (dev,"apb" ); +if (IS_ERR (cdns_phy->apb_clk)) { +dev_err (dev,"phy apb clock not found\n" ); +return PTR_ERR (cdns_phy->apb_clk);
not _put for ref_clk?
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 246
Quoted 6 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +6
-0+ } + + ret =clk_prepare_enable (cdns_phy->ref_clk); +if (ret) { +dev_err (cdns_phy->dev,"Failed to prepare ref clock\n" ); +return ret;
what happens to clk refs you have already taken?
Quoted 89 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +89
-0+ } + + ref_clk_rate =clk_get_rate (cdns_phy->ref_clk); +if (!ref_clk_rate) { +dev_err (cdns_phy->dev,"Failed to get ref clock rate\n" ); + goto err_ref_clk; + } + +if (ref_clk_rate ==REF_CLK_27MHZ ) + cdns_phy->ref_clk_rate = ref_clk_rate; +else { +dev_err (cdns_phy->dev,"Not support Ref Clock Rate(%dHz)\n" , ref_clk_rate); + goto err_ref_clk; + } + + ret =clk_prepare_enable (cdns_phy->apb_clk); +if (ret) { +dev_err (cdns_phy->dev,"Failed to prepare apb clock\n" ); + goto err_ref_clk; + } + +return 0 ; + +err_ref_clk: +clk_disable_unprepare (cdns_phy->ref_clk); +return -EINVAL ; +} + +static void hdptx_hdmi_clk_disable (struct cdns_hdptx_hdmi_phy *cdns_phy) +{ +clk_disable_unprepare (cdns_phy->ref_clk); +clk_disable_unprepare (cdns_phy->apb_clk); +} + +static void hdptx_hdmi_arc_config (struct cdns_hdptx_hdmi_phy *cdns_phy) +{ +u16 txpu_calib_code; +u16 txpd_calib_code; +u16 txpu_adj_calib_code; +u16 txpd_adj_calib_code; +u16 prev_calib_code; +u16 new_calib_code; +u16 rdata; + +/* Power ARC */ +cdns_phy_reg_write (cdns_phy,TXDA_CYA_AUXDA_CYA ,0x0001 ); + + prev_calib_code =cdns_phy_reg_read (cdns_phy,TX_DIG_CTRL_REG_2 ); + txpu_calib_code =cdns_phy_reg_read (cdns_phy,CMN_TXPUCAL_CTRL ); + txpd_calib_code =cdns_phy_reg_read (cdns_phy,CMN_TXPDCAL_CTRL ); + txpu_adj_calib_code =cdns_phy_reg_read (cdns_phy,CMN_TXPU_ADJ_CTRL ); + txpd_adj_calib_code =cdns_phy_reg_read (cdns_phy,CMN_TXPD_ADJ_CTRL ); + + new_calib_code = ((txpu_calib_code + txpd_calib_code) /2 ) + + txpu_adj_calib_code + txpd_adj_calib_code; + +if (new_calib_code != prev_calib_code) { + rdata =cdns_phy_reg_read (cdns_phy,TX_ANA_CTRL_REG_1 ); + rdata &=0xDFFF ; +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_1 , rdata); +cdns_phy_reg_write (cdns_phy,TX_DIG_CTRL_REG_2 , new_calib_code); +mdelay (10 ); + rdata |=0x2000 ; +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_1 , rdata); +udelay (150 ); + } + +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_2 ,0x0100 ); +udelay (100 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_2 ,0x0300 ); +udelay (100 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_3 ,0x0000 ); +udelay (100 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_1 ,0x2008 ); +udelay (100 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_1 ,0x2018 ); +udelay (100 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_1 ,0x2098 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_2 ,0x030C ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_5 ,0x0010 ); +udelay (100 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_4 ,0x4001 ); +mdelay (5 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_1 ,0x2198 ); +mdelay (5 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_2 ,0x030D ); +udelay (100 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_2 ,0x030F ); +}
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 345
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +10
-0+ +static void hdptx_hdmi_phy_set_vswing (struct cdns_hdptx_hdmi_phy *cdns_phy) +{ +u32 k; +const u32 num_lanes =4 ; + +for (k =0 ; k < num_lanes; k++) { +cdns_phy_reg_write (cdns_phy, (TX_DIAG_TX_DRV | (k <<9 )),0x7c0 ); +cdns_phy_reg_write (cdns_phy, (TX_TXCC_CPOST_MULT_00_0 | (k <<9 )),0x0 ); +cdns_phy_reg_write (cdns_phy, (TX_TXCC_CAL_SCLR_MULT_0 | (k <<9 )),0x120 );
magic numbers?
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 356
Quoted 11 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +11
-0+ } +} + +static int hdptx_hdmi_feedback_factor (struct cdns_hdptx_hdmi_phy *cdns_phy) +{ +u32 feedback_factor; + +switch (cdns_phy->color_space) { +case HDMI_PHY_COLORSPACE_YUV422 : + feedback_factor =1000 ; +break ;
empty line after each case please
Quoted 33 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +33
-0+case HDMI_PHY_COLORSPACE_YUV420 : +switch (cdns_phy->bpc) { +case 8 : + feedback_factor =500 ; +break ; +case 10 : + feedback_factor =625 ; +break ; +case 12 : + feedback_factor =750 ; +break ; +case 16 : + feedback_factor =1000 ; +break ; +default : +dev_dbg (cdns_phy->dev,"Invalid ColorDepth\n" ); +return 0 ; + } +break ; +default : +/* Assume RGB/YUV444 */ +switch (cdns_phy->bpc) { +case 10 : + feedback_factor =1250 ; +break ; +case 12 : + feedback_factor =1500 ; +break ; +case 16 : + feedback_factor =2000 ; +break ; +default : + feedback_factor =1000 ;
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 399
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +10
-0+ } + } + +return feedback_factor; +} + +static int hdptx_hdmi_phy_config (struct cdns_hdptx_hdmi_phy *cdns_phy, +const struct hdptx_hdmi_ctrl *p_ctrl_table, +const struct hdptx_hdmi_pll_tuning *p_pll_table, +char pclk_in)
this looks bad, please run checkpatch --strict to align these properly
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 409
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +10
-0+{ +const u32 num_lanes =4 ; +u32 val, i, k; + +/* enable PHY isolation mode only for CMN */ +cdns_phy_reg_write (cdns_phy,PHY_PMA_ISOLATION_CTRL ,0xD000 ); + +/* set cmn_pll0_clk_datart1_div/cmn_pll0_clk_datart0_div dividers */ + val =cdns_phy_reg_read (cdns_phy,PHY_PMA_ISO_PLL_CTRL1 ); + val &=0xFF00 ;
lowercase hex values everywhere pls
Quoted 482 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +480
-0+ val |=0x0012 ; +cdns_phy_reg_write (cdns_phy,PHY_PMA_ISO_PLL_CTRL1 , val); + +/* assert PHY reset from isolation register */ +cdns_phy_reg_write (cdns_phy,PHY_ISO_CMN_CTRL ,0x0000 ); +/* assert PMA CMN reset */ +cdns_phy_reg_write (cdns_phy,PHY_PMA_ISO_CMN_CTRL ,0x0000 ); + +/* register XCVR_DIAG_BIDI_CTRL */ +for (k =0 ; k < num_lanes; k++) +cdns_phy_reg_write (cdns_phy,XCVR_DIAG_BIDI_CTRL | (k <<9 ),0x00FF ); + +/* Describing Task phy_cfg_hdp */ + + val =cdns_phy_reg_read (cdns_phy,PHY_PMA_CMN_CTRL1 ); + val &=0xFFF7 ; + val |=0x0008 ; +cdns_phy_reg_write (cdns_phy,PHY_PMA_CMN_CTRL1 , val); + +/* PHY Registers */ + val =cdns_phy_reg_read (cdns_phy,PHY_PMA_CMN_CTRL1 ); + val &=0xCFFF ; + val |= p_ctrl_table->cmn_ref_clk_dig_div <<12 ; +cdns_phy_reg_write (cdns_phy,PHY_PMA_CMN_CTRL1 , val); + + val =cdns_phy_reg_read (cdns_phy,PHY_HDP_CLK_CTL ); + val &=0x00FF ; + val |=0x1200 ; +cdns_phy_reg_write (cdns_phy,PHY_HDP_CLK_CTL , val); + +/* Common control module control and diagnostic registers */ + val =cdns_phy_reg_read (cdns_phy,CMN_CDIAG_REFCLK_CTRL ); + val &=0x8FFF ; + val |= p_ctrl_table->ref_clk_divider_scaler <<12 ; + val |=0x00C0 ; +cdns_phy_reg_write (cdns_phy,CMN_CDIAG_REFCLK_CTRL , val); + +/* High speed clock used */ + val =cdns_phy_reg_read (cdns_phy,CMN_DIAG_HSCLK_SEL ); + val &=0xFF00 ; + val |= (p_ctrl_table->cmnda_hs_clk_0_sel >>1 ) <<0 ; + val |= (p_ctrl_table->cmnda_hs_clk_1_sel >>1 ) <<4 ; +cdns_phy_reg_write (cdns_phy,CMN_DIAG_HSCLK_SEL , val); + +for (k =0 ; k < num_lanes; k++) { + val =cdns_phy_reg_read (cdns_phy, (XCVR_DIAG_HSCLK_SEL | (k <<9 ))); + val &=0xCFFF ; + val |= (p_ctrl_table->cmnda_hs_clk_0_sel >>1 ) <<12 ; +cdns_phy_reg_write (cdns_phy, (XCVR_DIAG_HSCLK_SEL | (k <<9 )), val); + } + +/* PLL 0 control state machine registers */ + val = p_ctrl_table->vco_ring_select <<12 ; +cdns_phy_reg_write (cdns_phy,CMN_PLLSM0_USER_DEF_CTRL , val); + +if (pclk_in == true) + val =0x30A0 ; +else { + val =cdns_phy_reg_read (cdns_phy,CMN_PLL0_VCOCAL_START ); + val &=0xFE00 ; + val |= p_pll_table->vco_cal_code; + } +cdns_phy_reg_write (cdns_phy,CMN_PLL0_VCOCAL_START , val); + +cdns_phy_reg_write (cdns_phy,CMN_PLL0_VCOCAL_INIT_TMR ,0x0064 ); +cdns_phy_reg_write (cdns_phy,CMN_PLL0_VCOCAL_ITER_TMR ,0x000A ); + +/* Common functions control and diagnostics registers */ + val = p_ctrl_table->cmnda_pll0_hs_sym_div_sel <<8 ; + val |= p_ctrl_table->cmnda_pll0_ip_div; +cdns_phy_reg_write (cdns_phy,CMN_DIAG_PLL0_INCLK_CTRL , val); + +cdns_phy_reg_write (cdns_phy,CMN_DIAG_PLL0_OVRD ,0x0000 ); + + val = p_ctrl_table->cmnda_pll0_fb_div_high; + val |= (1 <<15 ); +cdns_phy_reg_write (cdns_phy,CMN_DIAG_PLL0_FBH_OVRD , val); + + val = p_ctrl_table->cmnda_pll0_fb_div_low; + val |= (1 <<15 ); +cdns_phy_reg_write (cdns_phy,CMN_DIAG_PLL0_FBL_OVRD , val); + +if (pclk_in == false) { + val = p_ctrl_table->cmnda_pll0_pxdiv_low; +cdns_phy_reg_write (cdns_phy,CMN_DIAG_PLL0_PXL_DIVL , val); + + val = p_ctrl_table->cmnda_pll0_pxdiv_high; + val |= (1 <<15 ); +cdns_phy_reg_write (cdns_phy,CMN_DIAG_PLL0_PXL_DIVH , val); + } + + val = p_pll_table->volt_to_current_coarse; + val |= (p_pll_table->volt_to_current) <<4 ; +cdns_phy_reg_write (cdns_phy,CMN_DIAG_PLL0_V2I_TUNE , val); + + val = p_pll_table->charge_pump_gain; +cdns_phy_reg_write (cdns_phy,CMN_DIAG_PLL0_CP_TUNE , val); + +cdns_phy_reg_write (cdns_phy,CMN_DIAG_PLL0_LF_PROG ,0x0008 ); + + val = p_pll_table->pmos_ctrl; + val |= (p_pll_table->ndac_ctrl) <<8 ; +cdns_phy_reg_write (cdns_phy,CMN_DIAG_PLL0_PTATIS_TUNE1 , val); + + val = p_pll_table->ptat_ndac_ctrl; +cdns_phy_reg_write (cdns_phy,CMN_DIAG_PLL0_PTATIS_TUNE2 , val); + +if (pclk_in == true) +cdns_phy_reg_write (cdns_phy,CMN_DIAG_PLL0_TEST_MODE ,0x0022 ); +else +cdns_phy_reg_write (cdns_phy,CMN_DIAG_PLL0_TEST_MODE ,0x0020 ); + +cdns_phy_reg_write (cdns_phy,CMN_PSM_CLK_CTRL ,0x0016 ); + +/* Transceiver control and diagnostic registers */ +for (k =0 ; k < num_lanes; k++) { + val =cdns_phy_reg_read (cdns_phy, (XCVR_DIAG_PLLDRC_CTRL | (k <<9 ))); + val &=0xBFFF ; +cdns_phy_reg_write (cdns_phy, (XCVR_DIAG_PLLDRC_CTRL | (k <<9 )), val); + } + +for (k =0 ; k < num_lanes; k++) { + val =cdns_phy_reg_read (cdns_phy, (TX_DIAG_TX_CTRL | (k <<9 ))); + val &=0xFF3F ; + val |= (p_ctrl_table->hsclk_div_tx_sub_rate >>1 ) <<6 ; +cdns_phy_reg_write (cdns_phy, (TX_DIAG_TX_CTRL | (k <<9 )), val); + } + + val =cdns_phy_reg_read (cdns_phy,PHY_PMA_CMN_CTRL1 ); + val &=0xFF8F ; +/* +* single ended reference clock (val |= 0x0030); +* differential clock (val |= 0x0000); +* for differential clock on the refclk_p and +* refclk_m off chip pins: CMN_DIAG_ACYA[8]=1'b1 +* cdns_phy_reg_write(cdns_phy, CMN_DIAG_ACYA, 0x0100); +*/ + val |=0x0030 ; +cdns_phy_reg_write (cdns_phy,PHY_PMA_CMN_CTRL1 , val); + +/* Deassert PHY reset */ +cdns_phy_reg_write (cdns_phy,PHY_ISO_CMN_CTRL ,0x0001 ); +cdns_phy_reg_write (cdns_phy,PHY_PMA_ISO_CMN_CTRL ,0x0003 ); + +/* Power state machine registers */ +for (k =0 ; k < num_lanes; k++) +cdns_phy_reg_write (cdns_phy,XCVR_PSM_RCTRL | (k <<9 ),0xFEFC ); + +/* Assert cmn_macro_pwr_en */ +cdns_phy_reg_write (cdns_phy,PHY_PMA_ISO_CMN_CTRL ,0x0013 ); + +/* wait for cmn_macro_pwr_en_ack */ +for (i =0 ; i <10 ; i++) { + val =cdns_phy_reg_read (cdns_phy,PHY_PMA_ISO_CMN_CTRL ); +if (val & (1 <<5 )) +break ; +msleep (20 ); + } +if (i ==10 ) { +dev_err (cdns_phy->dev,"PMA output macro power up failed\n" ); +return -1 ; + } + +/* wait for cmn_ready */ +for (i =0 ; i <10 ; i++) { + val =cdns_phy_reg_read (cdns_phy,PHY_PMA_CMN_CTRL1 ); +if (val & (1 <<0 )) +break ; +msleep (20 ); + } +if (i ==10 ) { +dev_err (cdns_phy->dev,"PMA output ready failed\n" ); +return -1 ; + } + +for (k =0 ; k < num_lanes; k++) { +cdns_phy_reg_write (cdns_phy,TX_PSC_A0 | (k <<9 ),0x6791 ); +cdns_phy_reg_write (cdns_phy,TX_PSC_A1 | (k <<9 ),0x6790 ); +cdns_phy_reg_write (cdns_phy,TX_PSC_A2 | (k <<9 ),0x0090 ); +cdns_phy_reg_write (cdns_phy,TX_PSC_A3 | (k <<9 ),0x0090 ); + + val =cdns_phy_reg_read (cdns_phy,RX_PSC_CAL | (k <<9 )); + val &=0xFFBB ; +cdns_phy_reg_write (cdns_phy,RX_PSC_CAL | (k <<9 ), val); + + val =cdns_phy_reg_read (cdns_phy,RX_PSC_A0 | (k <<9 )); + val &=0xFFBB ; +cdns_phy_reg_write (cdns_phy,RX_PSC_A0 | (k <<9 ), val); + } +return 0 ; +} + +static int hdptx_hdmi_phy_cfg (struct cdns_hdptx_hdmi_phy *cdns_phy,u32 rate) +{ +const struct hdptx_hdmi_ctrl *p_ctrl_table; +const struct hdptx_hdmi_pll_tuning *p_pll_table; +const u32 refclk_freq_khz = cdns_phy->ref_clk_rate /1000 ; +const u8 pclk_in = false; +u32 pixel_freq = rate; +u32 vco_freq, char_freq; +u32 div_total, feedback_factor; +u32 i, ret; + + feedback_factor =hdptx_hdmi_feedback_factor (cdns_phy); + + char_freq = pixel_freq * feedback_factor /1000 ; + +dev_dbg (cdns_phy->dev,"Pixel clock: (%d KHz), character clock: %d, bpc is (%0d-bit)\n" , + pixel_freq, char_freq, cdns_phy->bpc); + +/* Get right row from the ctrl_table table. +* Check if 'pixel_freq_khz' value matches the PIXEL_CLK_FREQ column. +* Consider only the rows with FEEDBACK_FACTOR column matching feedback_factor. +*/ +for (i =0 ; i <ARRAY_SIZE (pixel_clk_output_ctrl_table); i++) { +if (feedback_factor == pixel_clk_output_ctrl_table[i].feedback_factor && + pixel_freq == pixel_clk_output_ctrl_table[i].pixel_clk_freq_min) { + p_ctrl_table = &pixel_clk_output_ctrl_table[i]; +break ; + } + } +if (i ==ARRAY_SIZE (pixel_clk_output_ctrl_table)) { +dev_warn (cdns_phy->dev,"Pixel clk (%d KHz) not supported, bpc is (%0d-bit)\n" , + pixel_freq, cdns_phy->bpc); +return 0 ; + } + + div_total = p_ctrl_table->pll_fb_div_total; + vco_freq = refclk_freq_khz * div_total / p_ctrl_table->cmnda_pll0_ip_div; + +/* Get right row from the pixel_clk_output_pll_table table. +* Check if vco_freq_khz and feedback_div_total +* column matching with pixel_clk_output_pll_table. +*/ +for (i =0 ; i <ARRAY_SIZE (pixel_clk_output_pll_table); i++) { +if (vco_freq == pixel_clk_output_pll_table[i].vco_freq_min && + div_total == pixel_clk_output_pll_table[i].feedback_div_total) { + p_pll_table = &pixel_clk_output_pll_table[i]; +break ; + } + } +if (i ==ARRAY_SIZE (pixel_clk_output_pll_table)) { +dev_warn (cdns_phy->dev,"VCO (%d KHz) not supported\n" , vco_freq); +return -1 ; + } +dev_dbg (cdns_phy->dev,"VCO frequency is (%d KHz)\n" , vco_freq); + + ret =hdptx_hdmi_phy_config (cdns_phy, p_ctrl_table, p_pll_table, pclk_in); +if (ret <0 ) +return ret; + +return char_freq; +} + +static int hdptx_hdmi_phy_power_up (struct cdns_hdptx_hdmi_phy *cdns_phy) +{ +u32 val, i; + +/* set Power State to A2 */ +cdns_phy_reg_write (cdns_phy,PHY_HDP_MODE_CTRL ,0x0004 ); + +cdns_phy_reg_write (cdns_phy,TX_DIAG_ACYA_0 ,1 ); +cdns_phy_reg_write (cdns_phy,TX_DIAG_ACYA_1 ,1 ); +cdns_phy_reg_write (cdns_phy,TX_DIAG_ACYA_2 ,1 ); +cdns_phy_reg_write (cdns_phy,TX_DIAG_ACYA_3 ,1 ); + +/* Wait for Power State A2 Ack */ +for (i =0 ; i <10 ; i++) { + val =cdns_phy_reg_read (cdns_phy,PHY_HDP_MODE_CTRL ); +if (val & (1 <<6 )) +break ; +msleep (20 ); + } +if (i ==10 ) { +dev_err (cdns_phy->dev,"Wait A2 Ack failed\n" ); +return -1 ; + } + +/* Power up ARC */ +hdptx_hdmi_arc_config (cdns_phy); + +/* Configure PHY in A0 mode (PHY must be in the A0 power +* state in order to transmit data) +*/ +cdns_phy_reg_write (cdns_phy,PHY_HDP_MODE_CTRL ,0x0001 ); + +/* Wait for Power State A0 Ack */ +for (i =0 ; i <10 ; i++) { + val =cdns_phy_reg_read (cdns_phy,PHY_HDP_MODE_CTRL ); +if (val & (1 <<4 )) +break ; +msleep (20 ); + } +if (i ==10 ) { +dev_err (cdns_phy->dev,"Wait A0 Ack failed\n" ); +return -1 ; + } +return 0 ; +} + +static int hdptx_hdmi_phy_power_down (struct cdns_hdptx_hdmi_phy *cdns_phy) +{ +int timeout; +u32 reg_val; + + reg_val =cdns_phy_reg_read (cdns_phy,PHY_HDP_MODE_CTRL ); + reg_val &=0xfff0 ; +/* PHY_DP_MODE_CTL set to A3 power state*/ +cdns_phy_reg_write (cdns_phy,PHY_HDP_MODE_CTRL , reg_val |0x8 ); + +/* Wait for A3 acknowledge */ + timeout =0 ; +do { + reg_val =cdns_phy_reg_read (cdns_phy,PHY_HDP_MODE_CTRL ); +dev_dbg (cdns_phy->dev,"Reg val is 0x%04x\n" , reg_val); + timeout++; +msleep (100 ); + }while (!(reg_val & (0x8 <<4 )) && (timeout <10 )); + +return 0 ; +} + +static int cdns_hdptx_hdmi_phy_on (struct phy *phy) +{ +struct cdns_hdptx_hdmi_phy *cdns_phy =phy_get_drvdata (phy); + +return hdptx_hdmi_phy_power_up (cdns_phy); +} + +static int cdns_hdptx_hdmi_phy_off (struct phy *phy) +{ +struct cdns_hdptx_hdmi_phy *cdns_phy =phy_get_drvdata (phy); + +hdptx_hdmi_phy_power_down (cdns_phy); +return 0 ; +} + +int cdns_hdptx_hdmi_phy_valid (struct phy *phy,enum phy_mode mode,int submode, +union phy_configure_opts *opts) +{ +u32 rate = opts->hdmi.pixel_clk_rate; +int i; + +for (i =0 ; i <ARRAY_SIZE (pixel_clk_output_ctrl_table); i++) +if (rate == pixel_clk_output_ctrl_table[i].pixel_clk_freq_min) +return 0 ; + +return -EINVAL ; +} + +static int cdns_hdptx_hdmi_phy_init (struct phy *phy) +{ +return 0 ; +} + +static int cdns_hdptx_hdmi_configure (struct phy *phy, +union phy_configure_opts *opts) +{ +struct cdns_hdptx_hdmi_phy *cdns_phy =phy_get_drvdata (phy); +int ret; + + cdns_phy->pixel_clk_rate = opts->hdmi.pixel_clk_rate; + cdns_phy->color_space = opts->hdmi.color_space; + cdns_phy->bpc = opts->hdmi.bpc; + +/* Check HDMI FW alive before HDMI PHY init */ + ret =hdptx_phy_check_alive (cdns_phy); +if (ret == false) { +dev_err (cdns_phy->dev,"NO HDMI FW running\n" ); +return -ENXIO ; + } + +/* Configure PHY */ +if (hdptx_hdmi_phy_cfg (cdns_phy, cdns_phy->pixel_clk_rate) <0 ) { +dev_err (cdns_phy->dev,"failed to set phy pclock\n" ); +return -EINVAL ; + } + + ret =hdptx_hdmi_phy_power_up (cdns_phy); +if (ret <0 ) +return ret; + +hdptx_hdmi_phy_set_vswing (cdns_phy); + +return 0 ; +} + +static const struct phy_ops cdns_hdptx_hdmi_phy_ops = { + .init = cdns_hdptx_hdmi_phy_init, + .configure = cdns_hdptx_hdmi_configure, + .power_on = cdns_hdptx_hdmi_phy_on, + .power_off = cdns_hdptx_hdmi_phy_off, + .validate = cdns_hdptx_hdmi_phy_valid, + .owner =THIS_MODULE , +}; + +static int cdns_hdptx_hdmi_phy_probe (struct platform_device *pdev) +{ +struct cdns_hdptx_hdmi_phy *cdns_phy; +struct device *dev = &pdev->dev; +struct device_node *node = dev->of_node; +struct phy_provider *phy_provider; +struct resource *res; +struct phy *phy; +int ret; + + cdns_phy =devm_kzalloc (dev,sizeof (*cdns_phy),GFP_KERNEL ); +if (!cdns_phy) +return -ENOMEM ; + +dev_set_drvdata (dev, cdns_phy); + cdns_phy->dev = dev; +mutex_init (&cdns_phy->mbox_mutex); + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!res) +return -ENODEV ; + cdns_phy->regs =devm_ioremap (dev, res->start,resource_size (res)); +if (IS_ERR (cdns_phy->regs)) +return PTR_ERR (cdns_phy->regs); + + phy =devm_phy_create (dev, node, &cdns_hdptx_hdmi_phy_ops); +if (IS_ERR (phy)) +return PTR_ERR (phy); + + phy->attrs.mode =PHY_MODE_HDMI ; + + cdns_phy->phy = phy; +phy_set_drvdata (phy, cdns_phy); + + ret =hdptx_hdmi_clk_enable (cdns_phy); +if (ret) { +dev_err (dev,"Init clk fail\n" ); +return -EINVAL ; + } + + phy_provider =devm_of_phy_provider_register (dev, of_phy_simple_xlate); +if (IS_ERR (phy_provider)) { + ret =PTR_ERR (phy_provider); + goto clk_disable; + } + +dev_dbg (dev,"probe success!\n" ); + +return 0 ; + +clk_disable: +hdptx_hdmi_clk_disable (cdns_phy); + +return -EINVAL ; +} + +static int cdns_hdptx_hdmi_phy_remove (struct platform_device *pdev) +{ +struct cdns_hdptx_hdmi_phy *cdns_phy =platform_get_drvdata (pdev); + +hdptx_hdmi_clk_disable (cdns_phy); + +return 0 ; +} + +static const struct of_device_id cdns_hdptx_hdmi_phy_of_match[] = { + {.compatible ="fsl,imx8mq-hdmi-phy" }, + {/* sentinel */ } +}; +MODULE_DEVICE_TABLE (of, cdns_hdptx_hdmi_phy_of_match); + +static struct platform_driver cdns_hdptx_hdmi_phy_driver = { + .probe = cdns_hdptx_hdmi_phy_probe, + .remove = cdns_hdptx_hdmi_phy_remove, + .driver = { + .name ="cdns-hdptx-hdmi-phy" , + .of_match_table = cdns_hdptx_hdmi_phy_of_match, + } +}; +module_platform_driver (cdns_hdptx_hdmi_phy_driver); + +MODULE_AUTHOR ("Sandor Yu <[email protected]>" ); +MODULE_DESCRIPTION ("Cadence HDP-TX HDMI PHY driver" ); +MODULE_LICENSE ("GPL" );Signature · 1 line
2.34.1
Signature · 1 line
~Vinod
RE: [EXT] Re: [PATCH v6 8/8] phy: freescale: Add HDMI PHY driver for i.MX8MQ
Hi Vinod,
Thanks for your comments,
Quoted 66 lines
-----Original Message-----
From: Vinod Koul <[email protected]>
Sent: 2023年6月21日 19:58
To: Sandor Yu <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; dl-linux-imx <[email protected]>; Oliver Brown <[email protected]>
Subject: [EXT] Re: [PATCH v6 8/8] phy: freescale: Add HDMI PHY driver for i.MX8MQCaution: This is an external email. Please take care when clicking links or opening attachments. When in doubt, report the message using the 'Report this email' button
Quoted 3 lines · Sandor Yu
Add Cadence HDP-TX HDMI PHY driver for i.MX8MQ.
Cadence HDP-TX PHY could be put in either DP mode or HDMI mode base
on
drivers/phy/freescale/Makefile obj-$(CONFIG_PHY_MIXEL_MIPI_DPHY) +=
Quoted 39 lines
the configuration chosen.
HDMI PHY mode is configurated in the driver.Signed-off-by Sandor Yu <[email protected]>--- drivers/phy/freescale/Kconfig | 9 + drivers/phy/freescale/Makefile | 1 + drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c | 889 ++++++++++++++++++++ 3 files changed, 899 insertions(+) create mode 100644 drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c(quoted diff) +0
-0b/drivers/phy/freescale/Kconfig index
a99ee370eda6..e007e15e503a100644drivers/phy/freescale/Kconfig +9
-0@@ -44,6 +44,15 @@ config PHY_CADENCE_DP_PHY Enable this to support the Cadence HDPTX DP PHY driver on NXP's i.MX8MQ SOC. +config PHY_CADENCE_HDMI_PHY + tristate "Cadence HDPTX HDMI PHY Driver" + depends on OF && HAS_IOMEM + depends on COMMON_CLK + select GENERIC_PHY + help + Enable this to support the Cadence HDPTX HDMI PHY driver. + on NXP's i.MX8MQ SOC. + endif config PHY_FSL_LYNX_28G(quoted diff) +0
-0b/drivers/phy/freescale/Makefile index
c3bdf3fa2e72..d25fafd91c53100644drivers/phy/freescale/Makefile +0
-0@@ -5,3 +5,4 @@ obj-$(CONFIG_PHY_MIXEL_MIPI_DPHY) +=phy-fsl-imx8-mipi-dphy.o
Quoted 7 lines
drivers/phy/freescale/Makefile obj-$(CONFIG_PHY_MIXEL_MIPI_DPHY) += · line 6
Quoted 2 lines
drivers/phy/freescale/Makefile +0
-0obj-$(CONFIG_PHY_FSL_IMX8M_PCIE) += phy-fsl-imx8m-pcie.o obj-$(CONFIG_PHY_FSL_LYNX_28G) +=phy-fsl-lynx-28g.o
drivers/phy/freescale/Makefile obj-$(CONFIG_PHY_MIXEL_MIPI_DPHY) += phy-fsl-imx8-mipi-dphy.o · line 8
Quoted 2 lines
drivers/phy/freescale/Makefile +1
-0obj-$(CONFIG_PHY_CADENCE_DP_PHY) += phy-fsl-imx8mq-dp.o +obj-$(CONFIG_PHY_CADENCE_HDMI_PHY) += phy-fsl-imx8mq-hdmi.oPls sort alphabetically (both
KconfigandMakefile)
OK, and the name will be change to CONFIG_PHY_FSL_IMX8MQ_HDMI_PHY and CONFIG_PHY_FSL_IMX8MQ_DP_PHY. in the next version.
Quoted 80 lines
Quoted 80 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +71
-0@@ -0,0 +1,889 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Cadence High-Definition Multimedia Interface (HDMI) PHY driver +* +* Copyright (C) 2022 NXP Semiconductor, Inc. +*/ +#include <asm/unaligned.h> +#include <linux/clk.h> +#include <linux/kernel.h> +#include <linux/phy/phy.h> +#include <linux/platform_device.h> +#include <linux/io.h> + +#include <drm/bridge/cdns-mhdp-mailbox.h> + +#define ADDR_PHY_AFE 0x80000 +/* PHY registers */ +#define CMN_SSM_BIAS_TMR 0x0022 +#define CMN_PLLSM0_USER_DEF_CTRL 0x002F +#define CMN_PSM_CLK_CTRL 0x0061 +#define CMN_CDIAG_REFCLK_CTRL 0x0062 +#define CMN_PLL0_VCOCAL_START 0x0081 +#define CMN_PLL0_VCOCAL_INIT_TMR 0x0084 +#define CMN_PLL0_VCOCAL_ITER_TMR 0x0085 +#define CMN_TXPUCAL_CTRL 0x00E0 +#define CMN_TXPDCAL_CTRL 0x00F0 +#define CMN_TXPU_ADJ_CTRL 0x0108 +#define CMN_TXPD_ADJ_CTRL 0x010c +#define CMN_DIAG_PLL0_FBH_OVRD 0x01C0 +#define CMN_DIAG_PLL0_FBL_OVRD 0x01C1 +#define CMN_DIAG_PLL0_OVRD 0x01C2 +#define CMN_DIAG_PLL0_TEST_MODE 0x01C4 +#define CMN_DIAG_PLL0_V2I_TUNE 0x01C5 +#define CMN_DIAG_PLL0_CP_TUNE 0x01C6 +#define CMN_DIAG_PLL0_LF_PROG 0x01C7 +#define CMN_DIAG_PLL0_PTATIS_TUNE1 0x01C8 +#define CMN_DIAG_PLL0_PTATIS_TUNE2 0x01C9 +#define CMN_DIAG_PLL0_INCLK_CTRL 0x01CA +#define CMN_DIAG_PLL0_PXL_DIVH 0x01CB +#define CMN_DIAG_PLL0_PXL_DIVL 0x01CC +#define CMN_DIAG_HSCLK_SEL 0x01E0 +#define XCVR_PSM_RCTRL 0x4001 +#define TX_TXCC_CAL_SCLR_MULT_0 0x4047 +#define TX_TXCC_CPOST_MULT_00_0 0x404C +#define XCVR_DIAG_PLLDRC_CTRL 0x40E0 +#define XCVR_DIAG_PLLDRC_CTRL 0x40E0 +#define XCVR_DIAG_HSCLK_SEL 0x40E1 +#define XCVR_DIAG_BIDI_CTRL 0x40E8 +#define TX_PSC_A0 0x4100 +#define TX_PSC_A1 0x4101 +#define TX_PSC_A2 0x4102 +#define TX_PSC_A3 0x4103 +#define TX_DIAG_TX_CTRL 0x41E0 +#define TX_DIAG_TX_DRV 0x41E1 +#define TX_DIAG_BGREF_PREDRV_DELAY 0x41E7 +#define TX_DIAG_ACYA_0 0x41FF +#define TX_DIAG_ACYA_1 0x43FF +#define TX_DIAG_ACYA_2 0x45FF +#define TX_DIAG_ACYA_3 0x47FF +#define TX_ANA_CTRL_REG_1 0x5020 +#define TX_ANA_CTRL_REG_2 0x5021 +#define TX_DIG_CTRL_REG_2 0x5024 +#define TXDA_CYA_AUXDA_CYA 0x5025 +#define TX_ANA_CTRL_REG_3 0x5026 +#define TX_ANA_CTRL_REG_4 0x5027 +#define TX_ANA_CTRL_REG_5 0x5029 +#define RX_PSC_A0 0x8000 +#define RX_PSC_CAL 0x8006 +#define PHY_HDP_MODE_CTRL 0xC008 +#define PHY_HDP_CLK_CTL 0xC009 +#define PHY_ISO_CMN_CTRL 0xC010
Quoted 8 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 77
Quoted 6 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +6
-0+#define PHY_PMA_CMN_CTRL1 0xC800 +#define PHY_PMA_ISO_CMN_CTRL 0xC810 +#define PHY_PMA_ISO_PLL_CTRL1 0xC812 +#define PHY_PMA_ISOLATION_CTRL 0xC81F + +#define REF_CLK_27MHZ 27000000This looks similar to patch 7, how different are these two..?
In fact, patch 8 and patch 7 are the same IP, but run the different firmware. HDMI PHY and DP PHY are share less registers, and totally different PLL work mode. Use separate driver for HDMI and DP PHY is easy to maintain the source code.
Quoted 203 lines
Quoted 35 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +34
-0+ +/* HDMI TX clock control settings */ +struct hdptx_hdmi_ctrl { +u32 pixel_clk_freq_min; +u32 pixel_clk_freq_max; +u32 feedback_factor; +u32 data_range_kbps_min; +u32 data_range_kbps_max; +u32 cmnda_pll0_ip_div; +u32 cmn_ref_clk_dig_div; +u32 ref_clk_divider_scaler; +u32 pll_fb_div_total; +u32 cmnda_pll0_fb_div_low; +u32 cmnda_pll0_fb_div_high; +u32 pixel_div_total; +u32 cmnda_pll0_pxdiv_low; +u32 cmnda_pll0_pxdiv_high; +u32 vco_freq_min; +u32 vco_freq_max; +u32 vco_ring_select; +u32 cmnda_hs_clk_0_sel; +u32 cmnda_hs_clk_1_sel; +u32 hsclk_div_at_xcvr; +u32 hsclk_div_tx_sub_rate; +u32 cmnda_pll0_hs_sym_div_sel; +u32 cmnda_pll0_clk_freq_min; +u32 cmnda_pll0_clk_freq_max; +}; + +struct cdns_hdptx_hdmi_phy { +void __iomem *regs;/* DPTX registers base */ +struct mutex mbox_mutex;/* mutex to protect mailbox */ +struct device *dev; +struct phy *phy;drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +10
-0+struct clk *ref_clk, *apb_clk; +u32 ref_clk_rate; +u32 pixel_clk_rate; +enum hdmi_phy_colorspace color_space; +u32 bpc; +}; + +/* HDMI TX clock control settings, pixel clock is output */ static +const struct hdptx_hdmi_ctrl pixel_clk_output_ctrl_table[] = { +/*Minclk Maxclk Fdbak DR_min DR_max ip_d dig DS Totl */
Quoted 82 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +82
-0+{ 27000, 27000, 1000, 270000, 270000, 0x03, 0x1, 0x1, 240, 0x0BC, +0x030, 80, 0x026, 0x026, 2160000, 2160000, 0, 2, 2, 2, 4, 0x3, +27000, 27000}, { 27000, 27000, 1250, 337500, 337500, 0x03, 0x1, +0x1, 300, 0x0EC, 0x03C, 100, 0x030, 0x030, 2700000, 2700000, 0, 2, +2, 2, 4, 0x3, 33750, 33750}, { 27000, 27000, 1500, 405000, +405000, 0x03, 0x1, 0x1, 360, 0x11C, 0x048, 120, 0x03A, 0x03A, +3240000, 3240000, 0, 2, 2, 2, 4, 0x3, 40500, 40500}, { 27000, +27000, 2000, 540000, 540000, 0x03, 0x1, 0x1, 240, 0x0BC, 0x030, +80, 0x026, 0x026, 2160000, 2160000, 0, 2, 2, 2, 4, 0x2, 54000, +54000}, { 54000, 54000, 1000, 540000, 540000, 0x03, 0x1, 0x1, +480, 0x17C, 0x060, 80, 0x026, 0x026, 4320000, 4320000, 1, 2, 2, 2, +4, 0x3, 54000, 54000}, { 54000, 54000, 1250, 675000, 675000, +0x04, 0x1, 0x1, 400, 0x13C, 0x050, 50, 0x017, 0x017, 2700000, +2700000, 0, 1, 1, 2, 4, 0x2, 67500, 67500}, { 54000, 54000, 1500, +810000, 810000, 0x04, 0x1, 0x1, 480, 0x17C, 0x060, 60, 0x01C, +0x01C, 3240000, 3240000, 0, 2, 2, 2, 2, 0x2, 81000, 81000}, { +54000, 54000, 2000, 1080000, 1080000, 0x03, 0x1, 0x1, 240, 0x0BC, +0x030, 40, 0x012, 0x012, 2160000, 2160000, 0, 2, 2, 2, 1, 0x1, +108000, 108000}, { 74250, 74250, 1000, 742500, 742500, 0x03, 0x1, +0x1, 660, 0x20C, 0x084, 80, 0x026, 0x026, 5940000, 5940000, 1, 2, +2, 2, 4, 0x3, 74250, 74250}, { 74250, 74250, 1250, 928125, +928125, 0x04, 0x1, 0x1, 550, 0x1B4, 0x06E, 50, 0x017, 0x017, +3712500, 3712500, 1, 1, 1, 2, 4, 0x2, 92812, 92812}, { 74250, +74250, 1500, 1113750, 1113750, 0x04, 0x1, 0x1, 660, 0x20C, 0x084, +60, 0x01C, 0x01C, 4455000, 4455000, 1, 2, 2, 2, 2, 0x2, 111375, +111375}, { 74250, 74250, 2000, 1485000, 1485000, 0x03, 0x1, 0x1, +330, 0x104, 0x042, 40, 0x012, 0x012, 2970000, 2970000, 0, 2, 2, 2, +1, 0x1, 148500, 148500}, { 99000, 99000, 1000, 990000, 990000, +0x03, 0x1, 0x1, 440, 0x15C, 0x058, 40, 0x012, 0x012, 3960000, +3960000, 1, 2, 2, 2, 2, 0x2, 99000, 99000}, { 99000, 99000, 1250, +1237500, 1237500, 0x03, 0x1, 0x1, 275, 0x0D8, 0x037, 25, 0x00B, +0x00A, 2475000, 2475000, 0, 1, 1, 2, 2, 0x1, 123750, 123750}, { +99000, 99000, 1500, 1485000, 1485000, 0x03, 0x1, 0x1, 330, 0x104, +0x042, 30, 0x00D, 0x00D, 2970000, 2970000, 0, 2, 2, 2, 1, 0x1, +148500, 148500}, { 99000, 99000, 2000, 1980000, 1980000, 0x03, 0x1, +0x1, 440, 0x15C, 0x058, 40, 0x012, 0x012, 3960000, 3960000, 1, 2, +2, 2, 1, 0x1, 198000, 198000}, {148500, 148500, 1000, 1485000, +1485000, 0x03, 0x1, 0x1, 660, 0x20C, 0x084, 40, 0x012, 0x012, +5940000, 5940000, 1, 2, 2, 2, 2, 0x2, 148500, 148500}, {148500, +148500, 1250, 1856250, 1856250, 0x04, 0x1, 0x1, 550, 0x1B4, 0x06E, +25, 0x00B, 0x00A, 3712500, 3712500, 1, 1, 1, 2, 2, 0x1, 185625, +185625}, {148500, 148500, 1500, 2227500, 2227500, 0x03, 0x1, 0x1, +495, 0x188, 0x063, 30, 0x00D, 0x00D, 4455000, 4455000, 1, 1, 1, 2, +2, 0x1, 222750, 222750}, {148500, 148500, 2000, 2970000, 2970000, +0x03, 0x1, 0x1, 660, 0x20C, 0x084, 40, 0x012, 0x012, 5940000, +5940000, 1, 2, 2, 2, 1, 0x1, 297000, 297000}, {198000, 198000, 1000, +1980000, 1980000, 0x03, 0x1, 0x1, 220, 0x0AC, 0x02C, 10, 0x003, +0x003, 1980000, 1980000, 0, 1, 1, 2, 1, 0x0, 198000, 198000}, +{198000, 198000, 1250, 2475000, 2475000, 0x03, 0x1, 0x1, 550, 0x1B4, +0x06E, 25, 0x00B, 0x00A, 4950000, 4950000, 1, 1, 1, 2, 2, 0x1, +247500, 247500}, {198000, 198000, 1500, 2970000, 2970000, 0x03, 0x1, +0x1, 330, 0x104, 0x042, 15, 0x006, 0x005, 2970000, 2970000, 0, 1, +1, 2, 1, 0x0, 297000, 297000}, {198000, 198000, 2000, 3960000, +3960000, 0x03, 0x1, 0x1, 440, 0x15C, 0x058, 20, 0x008, 0x008, +3960000, 3960000, 1, 1, 1, 2, 1, 0x0, 396000, 396000}, {297000, +297000, 1000, 2970000, 2970000, 0x03, 0x1, 0x1, 330, 0x104, 0x042, +10, 0x003, 0x003, 2970000, 2970000, 0, 1, 1, 2, 1, 0x0, 297000, +297000}, {297000, 297000, 1500, 4455000, 4455000, 0x03, 0x1, 0x1, +495, 0x188, 0x063, 15, 0x006, 0x005, 4455000, 4455000, 1, 1, 1, 2, +1, 0x0, 445500, 445500}, {297000, 297000, 2000, 5940000, 5940000, +0x03, 0x1, 0x1, 660, 0x20C, 0x084, 20, 0x008, 0x008, 5940000, +5940000, 1, 1, 1, 2, 1, 0x0, 594000, 594000}, {594000, 594000, 1000, +5940000, 5940000, 0x03, 0x1, 0x1, 660, 0x20C, 0x084, 10, 0x003, +0x003, 5940000, 5940000, 1, 1, 1, 2, 1, 0x0, 594000, 594000}, +{594000, 594000, 750, 4455000, 4455000, 0x03, 0x1, 0x1, 495, 0x188, +0x063, 10, 0x003, 0x003, 4455000, 4455000, 1, 1, 1, 2, 1, 0x0, +445500, 445500}, {594000, 594000, 625, 3712500, 3712500, 0x04, 0x1, +0x1, 550, 0x1B4, 0x06E, 10, 0x003, 0x003, 3712500, 3712500, 1, 1, +1, 2, 1, 0x0, 371250, 371250}, {594000, 594000, 500, 2970000, +2970000, 0x03, 0x1, 0x1, 660, 0x20C, 0x084, 10, 0x003, 0x003, +5940000, 5940000, 1, 1, 1, 2, 2, 0x1, 297000, 297000}, }; + +/* HDMI TX PLL tuning settings */ +struct hdptx_hdmi_pll_tuning { + u32 vco_freq_bin; + u32 vco_freq_min; + u32 vco_freq_max; + u32 volt_to_current_coarse; + u32 volt_to_current; + u32 ndac_ctrl; + u32 pmos_ctrl; + u32 ptat_ndac_ctrl;drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 213
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +10
-0+u32 feedback_div_total; +u32 charge_pump_gain; +u32 coarse_code; +u32 v2i_code; +u32 vco_cal_code; +}; + +/* HDMI TX PLL tuning settings, pixel clock is output */ static const +struct hdptx_hdmi_pll_tuning pixel_clk_output_pll_table[] = {/*bin +VCO_freq min/max coar cod NDAC PMOS PTAT div-T P-Gain Coa V2I CAL
Quoted 12 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +12
-0+*/ {1 ,1980000 ,1980000 ,0x4 ,0x3 ,0x0 ,0x09 ,0x09 ,220 ,0x42 ,160 , +5, 183 }, { 2, 2160000, 2160000, 0x4, 0x3, 0x0, 0x09, 0x09, 240, +0x42, 166, 6, 208 }, { 3, 2475000, 2475000, 0x5, 0x3, 0x1, 0x00, +0x07, 275, 0x42, 167, 6, 209 }, { 4, 2700000, 2700000, 0x5, 0x3, +0x1, 0x00, 0x07, 300, 0x42, 188, 6, 230 }, { 4, 2700000, 2700000, +0x5, 0x3, 0x1, 0x00, 0x07, 400, 0x4C, 188, 6, 230 }, { 5, 2970000, +2970000, 0x6, 0x3, 0x1, 0x00, 0x07, 330, 0x42, 183, 6, 225 }, { 6, +3240000 ,3240000 ,0x6 ,0x3 ,0x1 ,0x00 ,0x07 ,360 ,0x42 ,203 ,7 ,256 +}, { 6, 3240000, 3240000, 0x6, 0x3, 0x1, 0x00, 0x07, 480, 0x4C, 203, +7, 256 }, { 7, 3712500, 3712500, 0x4, 0x3, 0x0, 0x07, 0x0F, 550, +0x4C, 212, 7, 257 }, { 8, 3960000, 3960000, 0x5, 0x3, 0x0, 0x07, +0x0F, 440, 0x42, 184, 6, 226 }, { 9, 4320000, 4320000, 0x5, 0x3,drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 235
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +10
-0+0x1, 0x07, 0x0F, 480, 0x42, 205, 7, 258 }, { 10, 4455000, 4455000, +0x5, 0x3, 0x0, 0x07, 0x0F, 495, 0x42, 219, 7, 272 }, { 10, 4455000, +4455000, 0x5, 0x3, 0x0, 0x07, 0x0F, 660, 0x4C, 219, 7, 272 }, { 11, +4950000 ,4950000 ,0x6 ,0x3 ,0x1 ,0x00 ,0x07 ,550 ,0x42 ,213 ,7 ,258 +}, { 12, 5940000, 5940000, 0x7, 0x3, 0x1, 0x00, 0x07, 660, 0x42, 244, +8, 292 }, }; + +static int cdns_phy_reg_write (struct cdns_hdptx_hdmi_phy *cdns_phy, +u32 addr,u32 val) { + return cdns_mhdp_reg_write(cdns_phy, ADDR_PHY_AFE + (addr <<2),
Quoted 41 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +41
-0+val); } + +static u32 cdns_phy_reg_read (struct cdns_hdptx_hdmi_phy *cdns_phy, +u32 addr) { +u32 reg32; + +cdns_mhdp_reg_read (cdns_phy,ADDR_PHY_AFE + (addr <<2 ), + ®32); + +return reg32; +} + +#define KEEP_ALIVE 0x18 +static bool hdptx_phy_check_alive (struct cdns_hdptx_hdmi_phy +*cdns_phy) { +u32 alive, newalive; +u8 retries_left =50 ; + + alive =readl (cdns_phy->regs +KEEP_ALIVE ); + +while (retries_left--) { +udelay (2 ); + + newalive =readl (cdns_phy->regs +KEEP_ALIVE ); +if (alive == newalive) +continue ; +return true; + } +return false; +} + +static int hdptx_hdmi_clk_enable (struct cdns_hdptx_hdmi_phy +*cdns_phy) { +struct device *dev = cdns_phy->dev; +u32 ref_clk_rate; +int ret; + + cdns_phy->ref_clk =devm_clk_get (dev,"ref" ); +if (IS_ERR (cdns_phy->ref_clk)) { +dev_err (dev,"phy ref clock not found\n" ); +return PTR_ERR (cdns_phy->ref_clk);
Quoted 8 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 240
Quoted 6 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +6
-0+ } + + cdns_phy->apb_clk =devm_clk_get (dev,"apb" ); +if (IS_ERR (cdns_phy->apb_clk)) { +dev_err (dev,"phy apb clock not found\n" ); +return PTR_ERR (cdns_phy->apb_clk);not
_putforref_clk?
ref clock is enabled only driver probe, so it don't need to explicitly call devm_clk_put() to release the clock.
Quoted 9 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 246
Quoted 7 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +6
-0+ } + + ret =clk_prepare_enable (cdns_phy->ref_clk); +if (ret) { +dev_err (cdns_phy->dev,"Failed to prepare ref clock\n" ); +return ret;what happens to clk refs you have already taken?
Same as above reason.
Quoted 108 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 13 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +12
-0+ } + + ref_clk_rate =clk_get_rate (cdns_phy->ref_clk); +if (!ref_clk_rate) { +dev_err (cdns_phy->dev,"Failed to get ref clock rate\n" ); + goto err_ref_clk; + } + +if (ref_clk_rate ==REF_CLK_27MHZ ) + cdns_phy->ref_clk_rate = ref_clk_rate; +else { + dev_err(cdns_phy->dev, "Not support Ref ClockRate(%dHz)\n",
ref_clk_rate);Quoted 26 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +26
-0+ goto err_ref_clk; + } + + ret =clk_prepare_enable (cdns_phy->apb_clk); +if (ret) { +dev_err (cdns_phy->dev,"Failed to prepare apb clock\n" ); + goto err_ref_clk; + } + +return 0 ; + +err_ref_clk: +clk_disable_unprepare (cdns_phy->ref_clk); +return -EINVAL ; +} + +static void hdptx_hdmi_clk_disable (struct cdns_hdptx_hdmi_phy +*cdns_phy) { +clk_disable_unprepare (cdns_phy->ref_clk); +clk_disable_unprepare (cdns_phy->apb_clk); +} + +static void hdptx_hdmi_arc_config (struct cdns_hdptx_hdmi_phy +*cdns_phy) { +u16 txpu_calib_code; +u16 txpd_calib_code;drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +10
-0+u16 txpu_adj_calib_code; +u16 txpd_adj_calib_code; +u16 prev_calib_code; +u16 new_calib_code; +u16 rdata; + +/* Power ARC */ +cdns_phy_reg_write (cdns_phy,TXDA_CYA_AUXDA_CYA ,0x0001 ); + + prev_calib_code = cdns_phy_reg_read(cdns_phy,
TX_DIG_CTRL_REG_2);drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 337
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +1
-0+ txpu_calib_code = cdns_phy_reg_read(cdns_phy,
CMN_TXPUCAL_CTRL);drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 338
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +1
-0+ txpd_calib_code = cdns_phy_reg_read(cdns_phy,
CMN_TXPDCAL_CTRL);drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 339
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +1
-0+ txpu_adj_calib_code = cdns_phy_reg_read(cdns_phy,
CMN_TXPU_ADJ_CTRL);drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 8 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +8
-0+ txpd_adj_calib_code =cdns_phy_reg_read (cdns_phy, +CMN_TXPD_ADJ_CTRL ); + + new_calib_code = ((txpu_calib_code + txpd_calib_code) /2 ) + + txpu_adj_calib_code + txpd_adj_calib_code; + +if (new_calib_code != prev_calib_code) { + rdata = cdns_phy_reg_read(cdns_phy,
TX_ANA_CTRL_REG_1);drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 349
Quoted 2 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +2
-0+ rdata &=0xDFFF ; + cdns_phy_reg_write(cdns_phy, TX_ANA_CTRL_REG_1,rdata);
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 350
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +1
-0+ cdns_phy_reg_write(cdns_phy, TX_DIG_CTRL_REG_2,
new_calib_code);drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 3 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +3
-0+mdelay (10 ); + rdata |=0x2000 ; + cdns_phy_reg_write(cdns_phy, TX_ANA_CTRL_REG_1,rdata);
Quoted 22 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +22
-0+udelay (150 ); + } + +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_2 ,0x0100 ); +udelay (100 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_2 ,0x0300 ); +udelay (100 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_3 ,0x0000 ); +udelay (100 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_1 ,0x2008 ); +udelay (100 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_1 ,0x2018 ); +udelay (100 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_1 ,0x2098 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_2 ,0x030C ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_5 ,0x0010 ); +udelay (100 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_4 ,0x4001 ); +mdelay (5 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_1 ,0x2198 ); +mdelay (5 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_2 ,0x030D );drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +10
-0+udelay (100 ); +cdns_phy_reg_write (cdns_phy,TX_ANA_CTRL_REG_2 ,0x030F ); } + +static void hdptx_hdmi_phy_set_vswing (struct cdns_hdptx_hdmi_phy +*cdns_phy) { +u32 k; +const u32 num_lanes =4 ; + +for (k =0 ; k < num_lanes; k++) { + cdns_phy_reg_write(cdns_phy, (TX_DIAG_TX_DRV | (k <<9)),
0x7c0);
Quoted 7 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 386
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +1
-0+ cdns_phy_reg_write(cdns_phy,(
TX_TXCC_CPOST_MULT_00_0| (k << 9)),0x0);drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 387
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +1
-0+ cdns_phy_reg_write(cdns_phy,(
TX_TXCC_CAL_SCLR_MULT_0|drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 388
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +1
-0+ (k << 9)), 0x120);magic numbers?
The values are the debug result for imx8mq to pass hdmi HDMI CTS. And we haven’t found the value should be modify for different imx8mq platform.
Quoted 14 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 356
Quoted 12 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +11
-0+ } +} + +static int hdptx_hdmi_feedback_factor (struct cdns_hdptx_hdmi_phy +*cdns_phy) { +u32 feedback_factor; + +switch (cdns_phy->color_space) { +case HDMI_PHY_COLORSPACE_YUV422 : + feedback_factor =1000 ; +break ;empty line after each case please
OK.
Quoted 44 lines
Quoted 7 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +6
-0+case HDMI_PHY_COLORSPACE_YUV420 : +switch (cdns_phy->bpc) { +case 8 : + feedback_factor =500 ; +break ; +case 10 :drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +10
-0+ feedback_factor =625 ; +break ; +case 12 : + feedback_factor =750 ; +break ; +case 16 : + feedback_factor =1000 ; +break ; +default : + dev_dbg(cdns_phy->dev, "InvalidColorDepth\n");
Quoted 15 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +15
-0+return 0 ; + } +break ; +default : +/* Assume RGB/YUV444 */ +switch (cdns_phy->bpc) { +case 10 : + feedback_factor =1250 ; +break ; +case 12 : + feedback_factor =1500 ; +break ; +case 16 : + feedback_factor =2000 ; +break ;drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 403
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +10
-0+default : + feedback_factor =1000 ; + } + } + +return feedback_factor; +} + +static int hdptx_hdmi_phy_config(struct cdns_hdptx_hdmi_phy *cdns_phy, +const struct
hdptx_hdmi_ctrl*p_ctrl_table,
Quoted 7 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 441
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +1
-0+const struct
hdptx_hdmi_pll_tuning*p_pll_table,drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 442
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +1
-0+char
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 443
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +1
-0+pclk_in)this looks bad, please run checkpatch --strict to align these properly
OK, I will check it with --strict.
Quoted 8 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 7 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +6
-0+{ +const u32 num_lanes =4 ; +u32 val, i, k; + +/* enable PHY isolation mode only for CMN */ + cdns_phy_reg_write(cdns_phy, PHY_PMA_ISOLATION_CTRL,
0xD000);
Quoted 7 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 451
Quoted 2 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +2
-0+ +/* set cmn_pll0_clk_datart1_div/cmn_pll0_clk_datart0_div dividers */
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 453
Quoted 2 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +2
-0+ val =cdns_phy_reg_read (cdns_phy,PHY_PMA_ISO_PLL_CTRL1 ); + val &=0xFF00 ;lowercase hex values everywhere pls
OK, will change it.
Quoted 528 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 8 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +7
-0+ val |=0x0012 ; +cdns_phy_reg_write (cdns_phy,PHY_PMA_ISO_PLL_CTRL1 , val); + +/* assert PHY reset from isolation register */ +cdns_phy_reg_write (cdns_phy,PHY_ISO_CMN_CTRL ,0x0000 ); +/* assert PMA CMN reset */ + cdns_phy_reg_write(cdns_phy, PHY_PMA_ISO_CMN_CTRL,
0x0000);drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 4 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +4
-0+ +/* register XCVR_DIAG_BIDI_CTRL */ +for (k =0 ; k < num_lanes; k++) + cdns_phy_reg_write(cdns_phy, XCVR_DIAG_BIDI_CTRL |(k <<
Quoted 26 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +26
-0+ 9), 0x00FF); + +/* Describing Task phy_cfg_hdp */ + + val =cdns_phy_reg_read (cdns_phy,PHY_PMA_CMN_CTRL1 ); + val &=0xFFF7 ; + val |=0x0008 ; +cdns_phy_reg_write (cdns_phy,PHY_PMA_CMN_CTRL1 , val); + +/* PHY Registers */ + val =cdns_phy_reg_read (cdns_phy,PHY_PMA_CMN_CTRL1 ); + val &=0xCFFF ; + val |= p_ctrl_table->cmn_ref_clk_dig_div <<12 ; +cdns_phy_reg_write (cdns_phy,PHY_PMA_CMN_CTRL1 , val); + + val =cdns_phy_reg_read (cdns_phy,PHY_HDP_CLK_CTL ); + val &=0x00FF ; + val |=0x1200 ; +cdns_phy_reg_write (cdns_phy,PHY_HDP_CLK_CTL , val); + +/* Common control module control and diagnostic registers */ + val =cdns_phy_reg_read (cdns_phy,CMN_CDIAG_REFCLK_CTRL ); + val &=0x8FFF ; + val |= p_ctrl_table->ref_clk_divider_scaler <<12 ; + val |=0x00C0 ; +cdns_phy_reg_write (cdns_phy,CMN_CDIAG_REFCLK_CTRL , val);drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +10
-0+ +/* High speed clock used */ + val =cdns_phy_reg_read (cdns_phy,CMN_DIAG_HSCLK_SEL ); + val &=0xFF00 ; + val |= (p_ctrl_table->cmnda_hs_clk_0_sel >>1 ) <<0 ; + val |= (p_ctrl_table->cmnda_hs_clk_1_sel >>1 ) <<4 ; +cdns_phy_reg_write (cdns_phy,CMN_DIAG_HSCLK_SEL , val); + +for (k =0 ; k < num_lanes; k++) { + val = cdns_phy_reg_read(cdns_phy,(
XCVR_DIAG_HSCLK_SEL| (k << 9)));drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 3 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +3
-0+ val &=0xCFFF ; + val |= (p_ctrl_table->cmnda_hs_clk_0_sel >>1 ) <<12 ; + cdns_phy_reg_write(cdns_phy, (XCVR_DIAG_HSCLK_SEL |(k << 9)), val);
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 5 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +5
-0+ } + +/* PLL 0 control state machine registers */ + val = p_ctrl_table->vco_ring_select <<12 ; + cdns_phy_reg_write(cdns_phy, CMN_PLLSM0_USER_DEF_CTRL,val);
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 5 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +5
-0+ +if (pclk_in == true) + val =0x30A0 ; +else { + val = cdns_phy_reg_read(cdns_phy,
CMN_PLL0_VCOCAL_START);drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 6 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +6
-0+ val &=0xFE00 ; + val |= p_pll_table->vco_cal_code; + } +cdns_phy_reg_write (cdns_phy,CMN_PLL0_VCOCAL_START , val); + + cdns_phy_reg_write(cdns_phy, CMN_PLL0_VCOCAL_INIT_TMR,
0x0064);drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 520
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +1
-0+ cdns_phy_reg_write(cdns_phy, CMN_PLL0_VCOCAL_ITER_TMR,
0x000A);Quoted 9 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +9
-0+ +/* Common functions control and diagnostics registers */ + val = p_ctrl_table->cmnda_pll0_hs_sym_div_sel <<8 ; + val |= p_ctrl_table->cmnda_pll0_ip_div; +cdns_phy_reg_write (cdns_phy,CMN_DIAG_PLL0_INCLK_CTRL , val); + +cdns_phy_reg_write (cdns_phy,CMN_DIAG_PLL0_OVRD ,0x0000 ); + + val = p_ctrl_table->cmnda_pll0_fb_div_high;drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +10
-0+ val |= (1 <<15 ); +cdns_phy_reg_write (cdns_phy,CMN_DIAG_PLL0_FBH_OVRD , val); + + val = p_ctrl_table->cmnda_pll0_fb_div_low; + val |= (1 <<15 ); +cdns_phy_reg_write (cdns_phy,CMN_DIAG_PLL0_FBL_OVRD , val); + +if (pclk_in == false) { + val = p_ctrl_table->cmnda_pll0_pxdiv_low; + cdns_phy_reg_write(cdns_phy,
CMN_DIAG_PLL0_PXL_DIVL,drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 5 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +5
-0+ val); + + val = p_ctrl_table->cmnda_pll0_pxdiv_high; + val |= (1 <<15 ); + cdns_phy_reg_write(cdns_phy,
CMN_DIAG_PLL0_PXL_DIVH, val);drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +10
-0+ } + + val = p_pll_table->volt_to_current_coarse; + val |= (p_pll_table->volt_to_current) <<4 ; +cdns_phy_reg_write (cdns_phy,CMN_DIAG_PLL0_V2I_TUNE , val); + + val = p_pll_table->charge_pump_gain; +cdns_phy_reg_write (cdns_phy,CMN_DIAG_PLL0_CP_TUNE , val); + + cdns_phy_reg_write(cdns_phy, CMN_DIAG_PLL0_LF_PROG,
0x0008);drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 4 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +4
-0+ + val = p_pll_table->pmos_ctrl; + val |= (p_pll_table->ndac_ctrl) <<8 ; + cdns_phy_reg_write(cdns_phy, CMN_DIAG_PLL0_PTATIS_TUNE1,val);
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 3 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +3
-0+ + val = p_pll_table->ptat_ndac_ctrl; + cdns_phy_reg_write(cdns_phy, CMN_DIAG_PLL0_PTATIS_TUNE2,val);
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 3 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +3
-0+ +if (pclk_in == true) + cdns_phy_reg_write(cdns_phy,
CMN_DIAG_PLL0_TEST_MODE,0x0022);drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 566
Quoted 2 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +2
-0+else + cdns_phy_reg_write(cdns_phy,
CMN_DIAG_PLL0_TEST_MODE,drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 7 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +7
-0+ 0x0020); + +cdns_phy_reg_write (cdns_phy,CMN_PSM_CLK_CTRL ,0x0016 ); + +/* Transceiver control and diagnostic registers */ +for (k =0 ; k < num_lanes; k++) { + val = cdns_phy_reg_read(cdns_phy,(
XCVR_DIAG_PLLDRC_CTRL| (k << 9)));drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 575
Quoted 2 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +2
-0+ val &=0xBFFF ; + cdns_phy_reg_write(cdns_phy,(
XCVR_DIAG_PLLDRC_CTRL| (k << 9)), val);drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 4 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +4
-0+ } + +for (k =0 ; k < num_lanes; k++) { + val = cdns_phy_reg_read(cdns_phy, (TX_DIAG_TX_CTRL |(k << 9)));
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 3 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +3
-0+ val &=0xFF3F ; + val |= (p_ctrl_table->hsclk_div_tx_sub_rate >>1 ) <<6 ; + cdns_phy_reg_write(cdns_phy, (TX_DIAG_TX_CTRL | (k <<9)), val);
Quoted 7 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +7
-0+ } + + val =cdns_phy_reg_read (cdns_phy,PHY_PMA_CMN_CTRL1 ); + val &=0xFF8F ; +/* +* single ended reference clock (val |= 0x0030); +* differential clock (val |= 0x0000); drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +10
-0+* for differential clock on the refclk_p and +* refclk_m off chip pins: CMN_DIAG_ACYA[8]=1'b1 +* cdns_phy_reg_write(cdns_phy, CMN_DIAG_ACYA, 0x0100); +*/ + val |=0x0030 ; +cdns_phy_reg_write (cdns_phy,PHY_PMA_CMN_CTRL1 , val); + +/* Deassert PHY reset */ +cdns_phy_reg_write (cdns_phy,PHY_ISO_CMN_CTRL ,0x0001 ); + cdns_phy_reg_write(cdns_phy, PHY_PMA_ISO_CMN_CTRL,
0x0003);drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 4 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +4
-0+ +/* Power state machine registers */ +for (k =0 ; k < num_lanes; k++) + cdns_phy_reg_write(cdns_phy, XCVR_PSM_RCTRL | (k <<9),
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 4 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +4
-0+ 0xFEFC); + +/* Assert cmn_macro_pwr_en */ + cdns_phy_reg_write(cdns_phy, PHY_PMA_ISO_CMN_CTRL,
0x0013);drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 4 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +4
-0+ +/* wait for cmn_macro_pwr_en_ack */ +for (i =0 ; i <10 ; i++) { + val = cdns_phy_reg_read(cdns_phy,
PHY_PMA_ISO_CMN_CTRL);drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 6 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +6
-0+if (val & (1 <<5 )) +break ; +msleep (20 ); + } +if (i ==10 ) { + dev_err(cdns_phy->dev, "PMA output macro power upfailed\n");
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 6 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +6
-0+return -1 ; + } + +/* wait for cmn_ready */ +for (i =0 ; i <10 ; i++) { + val = cdns_phy_reg_read(cdns_phy,
PHY_PMA_CMN_CTRL1);drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 11 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +11
-0+if (val & (1 <<0 )) +break ; +msleep (20 ); + } +if (i ==10 ) { +dev_err (cdns_phy->dev,"PMA output ready failed\n" ); +return -1 ; + } + +for (k =0 ; k < num_lanes; k++) { + cdns_phy_reg_write(cdns_phy, TX_PSC_A0 | (k << 9),
0x6791);drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 635
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +1
-0+ cdns_phy_reg_write(cdns_phy, TX_PSC_A1 | (k << 9),
0x6790);drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 636
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +1
-0+ cdns_phy_reg_write(cdns_phy, TX_PSC_A2 | (k << 9),
0x0090);drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 640
Quoted 4 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +4
-0+cdns_phy_reg_write (cdns_phy,TX_PSC_A3 | (k <<9 ), +0x0090 ); + + val = cdns_phy_reg_read(cdns_phy, RX_PSC_CAL | (k <<9));
Quoted 17 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +17
-0+ val &=0xFFBB ; +cdns_phy_reg_write (cdns_phy,RX_PSC_CAL | (k <<9 ), + val); + + val =cdns_phy_reg_read (cdns_phy,RX_PSC_A0 | (k <<9 )); + val &=0xFFBB ; +cdns_phy_reg_write (cdns_phy,RX_PSC_A0 | (k <<9 ), val); + } +return 0 ; +} + +static int hdptx_hdmi_phy_cfg (struct cdns_hdptx_hdmi_phy *cdns_phy, +u32 rate) { +const struct hdptx_hdmi_ctrl *p_ctrl_table; +const struct hdptx_hdmi_pll_tuning *p_pll_table; +const u32 refclk_freq_khz = cdns_phy->ref_clk_rate /1000 ; +const u8 pclk_in = false;drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +10
-0+u32 pixel_freq = rate; +u32 vco_freq, char_freq; +u32 div_total, feedback_factor; +u32 i, ret; + + feedback_factor =hdptx_hdmi_feedback_factor (cdns_phy); + + char_freq = pixel_freq * feedback_factor /1000 ; + + dev_dbg(cdns_phy->dev, "Pixel clock: (%d KHz), character clock: %d,bpc is (%0d-bit)\n",
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 4 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +4
-0+ pixel_freq, char_freq, cdns_phy->bpc); + +/* Get right row from the ctrl_table table. +* Check if 'pixel_freq_khz' value matches the PIXEL_CLK_FREQ column.
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 672
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +1
-0+* Consider only the rows with FEEDBACK_FACTOR column matching
feedback_factor.drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 3 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +3
-0+*/ +for (i =0 ; i <ARRAY_SIZE (pixel_clk_output_ctrl_table); i++) { + if (feedback_factor ==pixel_clk_output_ctrl_table[i].feedback_factor &&
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 676
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +1
-0+ pixel_freq ==pixel_clk_output_ctrl_table[i].pixel_clk_freq_min) {
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 6 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +6
-0+ p_ctrl_table = &pixel_clk_output_ctrl_table[i]; +break ; + } + } +if (i ==ARRAY_SIZE (pixel_clk_output_ctrl_table)) { + dev_warn(cdns_phy->dev, "Pixel clk (%d KHz) notsupported, bpc is (%0d-bit)\n",
Quoted 4 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +4
-0+ pixel_freq, cdns_phy->bpc); +return 0 ; + } +drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +10
-0+ div_total = p_ctrl_table->pll_fb_div_total; + vco_freq = refclk_freq_khz * div_total / + p_ctrl_table->cmnda_pll0_ip_div; + +/* Get right row from the pixel_clk_output_pll_table table. +* Check if vco_freq_khz and feedback_div_total +* column matching with pixel_clk_output_pll_table. +*/ +for (i =0 ; i <ARRAY_SIZE (pixel_clk_output_pll_table); i++) { + if (vco_freq == pixel_clk_output_pll_table[i].vco_freq_min&&
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 697
Quoted 1 line
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +1
-0+ div_total ==pixel_clk_output_pll_table[i].feedback_div_total) {
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 6 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +6
-0+ p_pll_table = &pixel_clk_output_pll_table[i]; +break ; + } + } +if (i ==ARRAY_SIZE (pixel_clk_output_pll_table)) { + dev_warn(cdns_phy->dev, "VCO (%d KHz) notsupported\n",
vco_freq);drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 5 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +5
-0+return -1 ; + } +dev_dbg (cdns_phy->dev,"VCO frequency is (%d KHz)\n" , vco_freq); + + ret = hdptx_hdmi_phy_config(cdns_phy, p_ctrl_table, p_pll_table,
pclk_in);Quoted 11 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +11
-0+if (ret <0 ) +return ret; + +return char_freq; +} + +static int hdptx_hdmi_phy_power_up (struct cdns_hdptx_hdmi_phy +*cdns_phy) { +u32 val, i; + +/* set Power State to A2 */ drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +10
-0+cdns_phy_reg_write (cdns_phy,PHY_HDP_MODE_CTRL ,0x0004 ); + +cdns_phy_reg_write (cdns_phy,TX_DIAG_ACYA_0 ,1 ); +cdns_phy_reg_write (cdns_phy,TX_DIAG_ACYA_1 ,1 ); +cdns_phy_reg_write (cdns_phy,TX_DIAG_ACYA_2 ,1 ); +cdns_phy_reg_write (cdns_phy,TX_DIAG_ACYA_3 ,1 ); + +/* Wait for Power State A2 Ack */ +for (i =0 ; i <10 ; i++) { + val = cdns_phy_reg_read(cdns_phy,
PHY_HDP_MODE_CTRL);Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +10
-0+if (val & (1 <<6 )) +break ; +msleep (20 ); + } +if (i ==10 ) { +dev_err (cdns_phy->dev,"Wait A2 Ack failed\n" ); +return -1 ; + } + +/* Power up ARC */ drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +10
-0+hdptx_hdmi_arc_config (cdns_phy); + +/* Configure PHY in A0 mode (PHY must be in the A0 power +* state in order to transmit data) +*/ +cdns_phy_reg_write (cdns_phy,PHY_HDP_MODE_CTRL ,0x0001 ); + +/* Wait for Power State A0 Ack */ +for (i =0 ; i <10 ; i++) { + val = cdns_phy_reg_read(cdns_phy,
PHY_HDP_MODE_CTRL);Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +10
-0+if (val & (1 <<4 )) +break ; +msleep (20 ); + } +if (i ==10 ) { +dev_err (cdns_phy->dev,"Wait A0 Ack failed\n" ); +return -1 ; + } +return 0 ; +}drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +10
-0+ +static int hdptx_hdmi_phy_power_down (struct cdns_hdptx_hdmi_phy +*cdns_phy) { +int timeout; +u32 reg_val; + + reg_val =cdns_phy_reg_read (cdns_phy,PHY_HDP_MODE_CTRL ); + reg_val &=0xfff0 ; +/* PHY_DP_MODE_CTL set to A3 power state*/ + cdns_phy_reg_write(cdns_phy, PHY_HDP_MODE_CTRL, reg_val |
0x8);drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 5 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +5
-0+ +/* Wait for A3 acknowledge */ + timeout =0 ; + do { + reg_val = cdns_phy_reg_read(cdns_phy,
PHY_HDP_MODE_CTRL);Quoted 12 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +12
-0+dev_dbg (cdns_phy->dev,"Reg val is 0x%04x\n" , reg_val); + timeout++; +msleep (100 ); + }while (!(reg_val & (0x8 <<4 )) && (timeout <10 )); + +return 0 ; +} + +static int cdns_hdptx_hdmi_phy_on (struct phy *phy) { +struct cdns_hdptx_hdmi_phy *cdns_phy =phy_get_drvdata (phy); + +return hdptx_hdmi_phy_power_up (cdns_phy);drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +10
-0+} + +static int cdns_hdptx_hdmi_phy_off (struct phy *phy) { +struct cdns_hdptx_hdmi_phy *cdns_phy =phy_get_drvdata (phy); + +hdptx_hdmi_phy_power_down (cdns_phy); +return 0 ; +} + +int cdns_hdptx_hdmi_phy_valid(struct phy *phy, enum phy_mode mode,int submode,
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 7 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +7
-0+union +phy_configure_opts *opts) { +u32 rate = opts->hdmi.pixel_clk_rate; +int i; + +for (i =0 ; i <ARRAY_SIZE (pixel_clk_output_ctrl_table); i++) + if (rate ==pixel_clk_output_ctrl_table[i].pixel_clk_freq_min)
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c line 766
Quoted 11 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +11
-0+return 0 ; + +return -EINVAL ; +} + +static int cdns_hdptx_hdmi_phy_init (struct phy *phy) { +return 0 ; +} + +static int cdns_hdptx_hdmi_configure (struct phy *phy, +union phy_configure_opts *opts){
Quoted 49 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +49
-0+struct cdns_hdptx_hdmi_phy *cdns_phy =phy_get_drvdata (phy); +int ret; + + cdns_phy->pixel_clk_rate = opts->hdmi.pixel_clk_rate; + cdns_phy->color_space = opts->hdmi.color_space; + cdns_phy->bpc = opts->hdmi.bpc; + +/* Check HDMI FW alive before HDMI PHY init */ + ret =hdptx_phy_check_alive (cdns_phy); +if (ret == false) { +dev_err (cdns_phy->dev,"NO HDMI FW running\n" ); +return -ENXIO ; + } + +/* Configure PHY */ +if (hdptx_hdmi_phy_cfg (cdns_phy, cdns_phy->pixel_clk_rate) <0 ) { +dev_err (cdns_phy->dev,"failed to set phy pclock\n" ); +return -EINVAL ; + } + + ret =hdptx_hdmi_phy_power_up (cdns_phy); +if (ret <0 ) +return ret; + +hdptx_hdmi_phy_set_vswing (cdns_phy); + +return 0 ; +} + +static const struct phy_ops cdns_hdptx_hdmi_phy_ops = { + .init = cdns_hdptx_hdmi_phy_init, + .configure = cdns_hdptx_hdmi_configure, + .power_on = cdns_hdptx_hdmi_phy_on, + .power_off = cdns_hdptx_hdmi_phy_off, + .validate = cdns_hdptx_hdmi_phy_valid, + .owner =THIS_MODULE , +}; + +static int cdns_hdptx_hdmi_phy_probe (struct platform_device *pdev) { +struct cdns_hdptx_hdmi_phy *cdns_phy; +struct device *dev = &pdev->dev; +struct device_node *node = dev->of_node; +struct phy_provider *phy_provider; +struct resource *res; +struct phy *phy; +int ret; + + cdns_phy =devm_kzalloc (dev,sizeof (*cdns_phy),GFP_KERNEL ); +if (!cdns_phy)drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +10
-0+return -ENOMEM ; + +dev_set_drvdata (dev, cdns_phy); + cdns_phy->dev = dev; +mutex_init (&cdns_phy->mbox_mutex); + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!res) +return -ENODEV ; + cdns_phy->regs = devm_ioremap(dev, res->start,
resource_size(res));Quoted 9 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +9
-0+if (IS_ERR (cdns_phy->regs)) +return PTR_ERR (cdns_phy->regs); + + phy =devm_phy_create (dev, node, &cdns_hdptx_hdmi_phy_ops); +if (IS_ERR (phy)) +return PTR_ERR (phy); + + phy->attrs.mode =PHY_MODE_HDMI ; +drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c
Quoted 10 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +10
-0+ cdns_phy->phy = phy; +phy_set_drvdata (phy, cdns_phy); + + ret =hdptx_hdmi_clk_enable (cdns_phy); +if (ret) { +dev_err (dev,"Init clk fail\n" ); +return -EINVAL ; + } + + phy_provider = devm_of_phy_provider_register(dev,
of_phy_simple_xlate);Quoted 40 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +40
-0+if (IS_ERR (phy_provider)) { + ret =PTR_ERR (phy_provider); + goto clk_disable; + } + +dev_dbg (dev,"probe success!\n" ); + +return 0 ; + +clk_disable: +hdptx_hdmi_clk_disable (cdns_phy); + +return -EINVAL ; +} + +static int cdns_hdptx_hdmi_phy_remove (struct platform_device *pdev) { +struct cdns_hdptx_hdmi_phy *cdns_phy = +platform_get_drvdata (pdev); + +hdptx_hdmi_clk_disable (cdns_phy); + +return 0 ; +} + +static const struct of_device_id cdns_hdptx_hdmi_phy_of_match[] = { + {.compatible ="fsl,imx8mq-hdmi-phy" }, + {/* sentinel */ } +}; +MODULE_DEVICE_TABLE (of, cdns_hdptx_hdmi_phy_of_match); + +static struct platform_driver cdns_hdptx_hdmi_phy_driver = { + .probe = cdns_hdptx_hdmi_phy_probe, + .remove = cdns_hdptx_hdmi_phy_remove, + .driver = { + .name ="cdns-hdptx-hdmi-phy" , + .of_match_table = cdns_hdptx_hdmi_phy_of_match, + } +}; +module_platform_driver (cdns_hdptx_hdmi_phy_driver); +
Quoted 8 lines
Quoted 5 lines
drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c new file +3
-1+MODULE_AUTHOR ("Sandor Yu <[email protected]>" ); +MODULE_DESCRIPTION ("Cadence HDP-TX HDMI PHY driver" ); +MODULE_LICENSE ("GPL" ); --2.34.1
--
~Vinod
B.R
Sandor
Hi Sandor,
thanks for sending a new version of this driver.
Am Donnerstag, 15. Juni 2023, 03:38:10 CEST schrieb Sandor Yu:
Quoted 4 lines
The patch set initial support for Cadence MHDP8501(HDMI/DP) DRM bridge drivers and Cadence HDP-TX PHY(HDMI/DP) drivers for Freescale i.MX8MQ.
The patch set compose of DRM bridge drivers and PHY drivers.
Using quick and dirty DT changes I was able to enable HDMI on imx8mq (TQMa8MQ).
Best regards,
Alexander
Quoted 118 lines
Both of them need the followed two patches to pass build.
drm: bridge: Cadence: convert mailbox functions to macro functions
phy: Add HDMI configuration optionsDRM bridges driver patches:
dt-bindings: display: bridge: Add Cadence MHDP8501 HDMI and DP
drm: bridge: Cadence: Add MHDP8501 DP driver
drm: bridge: Cadence: Add MHDP8501 HDMI driverPHY driver patches:
dt-bindings: phy: Add Freescale iMX8MQ DP and HDMI PHY
phy: freescale: Add DisplayPort PHY driver for i.MX8MQ
phy: freescale: Add HDMI PHY driver for i.MX8MQ
v5->v6:
HDMI/DP bridge driver
- 8501 is the part number of Cadence MHDP on i.MX8MQ.
Use MHDP8501 to name hdmi/dp drivers and files.
- Add compatible "fsl,imx8mq-mhdp8501-dp" for i.MX8MQ DP driver
- Add compatible "fsl,imx8mq-mhdp8501-hdmi" for i.MX8MQ HDMI driver
- Combine HDMI and DP dt-bindings into one file cdns,mhdp8501.yaml
- Fix HDMI scrambling is not enable issue when driver working in 4Kp60 mode.
- Add HDMI/DP PHY API mailbox protect.HDMI/DP PHY driver:
- Rename DP and HDMI PHY files and move to folder phy/freescale/
- Remove propertiesnum_lanesandlink_ratefrom DP PHY driver.
- Combine HDMI and DP dt-bindings into one file fsl,imx8mq-dp-hdmi-phy.yaml
- Update compatible string to "fsl,imx8mq-dp-phy".
- Update compatible string to "fsl,imx8mq-hdmi-phy".
v4->v5:
- Drop "clk" suffix in clock name.
- Add output port property in the example of hdmi/dp.
v3->v4:
dt-bindings:
- Correct dt-bindings coding style and address review comments.
- Addapb_clkdescription.
- Add output port for HDMI/DP connector
PHY:
- Alphabetically sorted inKconfigandMakefilefor DP and HDMI PHY
- Remove unused registers define from HDMI and DP PHY drivers.
- More description inphy_hdmi.h.
- Addapb_clkto HDMI and DP phy driver.
HDMI/DP:
- Useget_unaligned_le32()to replace hardcode type conversion in HDMI AVI infoframe data fill function.
- Add mailbox mutex lock in HDMI/DP driver for phy functions to reslove race conditions between HDMI/DP and PHY drivers.
- Addapb_clkto both HDMI and DP driver.
- Rename some function names and add prefix with "cdns_hdmi/cdns_dp".
- Remove bpc 12 and 16 optional that not supported.
v2->v3:
Address comments for dt-bindings files.
- Correct dts-bindings file names
Renamephy-cadence-hdptx-dp.yamlto cdns,mhdp-imx8mq-dp.yaml Renamephy-cadence-hdptx-hdmi.yamlto cdns,mhdp-imx8mq-hdmi.yaml
- Drop redundant words and descriptions.
- Correct hdmi/dp node name.v2 is a completely different version compared to v1. Previous v1 can be available here [1].
v1->v2:
- Reuse Cadence mailbox access functions from mhdp8546 instead of rockchip DP.
- Mailbox access functions be convert to marco functions that will be referenced by HDP-TX PHY(HDMI/DP) driver too.
- Plain bridge instead of component driver.
- Standalone Cadence HDP-TX PHY(HDMI/DP) driver.
- Audio driver are removed from the patch set, it will be add in another patch set later.[1]
https://patchwork.kernel.org/project/linux-rockchip/cover/cover.1590982881.
[email protected]/Sandor Yu (8):
drm: bridge: Cadence: convert mailbox functions to macro functions
dt-bindings: display: bridge: Add Cadence MHDP8501 HDMI and DP
drm: bridge: Cadence: Add MHDP8501 DP driver
phy: Add HDMI configuration options
drm: bridge: Cadence: Add MHDP8501 HDMI driver
dt-bindings: phy: Add Freescale iMX8MQ DP and HDMI PHY
phy: freescale: Add DisplayPort PHY driver for i.MX8MQ
phy: freescale: Add HDMI PHY driver for i.MX8MQ.../display/bridge/cdns,mhdp8501.yaml | 105 ++ .../bindings/phy/fsl,imx8mq-dp-hdmi-phy.yaml | 53 + drivers/gpu/drm/bridge/cadence/Kconfig | 25 + drivers/gpu/drm/bridge/cadence/Makefile | 3 + .../gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c | 1078 +++++++++++++++++ .../drm/bridge/cadence/cdns-mhdp8501-hdmi.c | 1024 ++++++++++++++++ .../gpu/drm/bridge/cadence/cdns-mhdp8501.h | 399 ++++++ .../drm/bridge/cadence/cdns-mhdp8546-core.c | 195 +-- .../drm/bridge/cadence/cdns-mhdp8546-core.h | 1 - drivers/phy/freescale/Kconfig | 18 + drivers/phy/freescale/Makefile | 2 + drivers/phy/freescale/phy-fsl-imx8mq-dp.c | 697 +++++++++++ drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c | 889 ++++++++++++++ include/drm/bridge/cdns-mhdp-mailbox.h | 240 ++++ include/linux/phy/phy-hdmi.h | 38 + include/linux/phy/phy.h | 7 +- 16 files changed, 4578 insertions(+), 196 deletions(-) create mode 100644
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yamlcreate mode 100644Documentation/devicetree/bindings/phy/fsl,imx8mq-dp-hdmi-phy.yamlcreate mode 100644drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.ccreate mode 100644drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.ccreate mode 100644drivers/gpu/drm/bridge/cadence/cdns-mhdp8501.hcreate mode 100644drivers/phy/freescale/phy-fsl-imx8mq-dp.ccreate mode 100644 drivers/phy/freescale/phy-fsl-imx8mq-hdmi.c create mode 100644 include/drm/bridge/cdns-mhdp-mailbox.h create mode 100644 include/linux/phy/phy-hdmi.h
Signature · 4 lines
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany Amtsgericht München, HRB 105018 Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider http://www.tq-group.com/
Quoted 10 lines · Sandor Yu
The patch set initial support for Cadence MHDP8501(HDMI/DP) DRM bridge drivers and Cadence HDP-TX PHY(HDMI/DP) drivers for Freescale i.MX8MQ.
The patch set compose of DRM bridge drivers and PHY drivers.
Both of them need the followed two patches to pass build.
drm: bridge: Cadence: convert mailbox functions to macro functions
phy: Add HDMI configuration options[...]
Applied, thanks!
[1/8] drm: bridge: Cadence: convert mailbox functions to macro functions
(no commit info)
[2/8] dt-bindings: display: bridge: Add Cadence MHDP8501 HDMI and DP
(no commit info)
[3/8] drm: bridge: Cadence: Add MHDP8501 DP driver
(no commit info)
[4/8] phy: Add HDMI configuration options
commit: 7f90516edb5cbfa4108b92bb83cbc8ef35a4cccd
[5/8] drm: bridge: Cadence: Add MHDP8501 HDMI driver
(no commit info)
[6/8] dt-bindings: phy: Add Freescale iMX8MQ DP and HDMI PHY
(no commit info)
[7/8] phy: freescale: Add DisplayPort PHY driver for i.MX8MQ
commit: a2717f1d7c64660679441c407b96103abb7c4a8c
[8/8] phy: freescale: Add HDMI PHY driver for i.MX8MQ
commit: 8e36091a94d2d28e8dccb9bfda081b2e42e951aeBest regards,
Signature · 1 line
~Vinod