MIPS: JZ4780 and CI20 HDMI
Subsystems (6)
v11 cover MIPS: JZ4780 and CI20 HDMI
PATCH V11 2021-12-02 19:39:52:
- patch 4/8: change devm_regulator_get_optional to devm_regulator_get and remove NULL check (requested by [email protected])
- patch 3/8: make hdmi-5v-supply required (requested by [email protected])
PATCH V10 2021-11-30 22:26:41:
- patch 3/8: fix $id and $ref paths (found by [email protected])
PATCH V9 2021-11-24 22:29:14:
- patch 6/8: remove optional <0> for assigned-clocks and unintentionally included "unwedge" setup (found by [email protected])
- patch 4/8: some cosmetics
make regulator enable/disable only if not NULL (found by [email protected])
simplify/fix error handling and driver cleanup on remove (proposed by [email protected])
- patch 3/8: fix #include path in example (found by [email protected])
fix missing "i" in unevaluatedProperties (found by [email protected])
fix 4 spaces indentation for required: property (found by [email protected])
PATCH V8 2021-11-23 19:14:00:
- fix a bad editing result from patch 2/8 (found by [email protected])
PATCH V7 2021-11-23 18:46:23:
- changed gpio polarity of hdmi_power to 0 (suggested by [email protected])
- fixed LCD1 irq number (bug found by [email protected])
- removed "- 4" for calculating max_register (suggested by [email protected])
- use unevaluatedPropertes instead of additionalProperties (suggested by [email protected])
- moved and renamed ingenic,jz4780-hdmi.yaml (suggested by [email protected])
- adjusted assigned-clocks changes to upstream which added some for SSI (by [email protected])
- rebased and tested with v5.16-rc2 + patch set drm/ingenic by [email protected] (by [email protected])
PATCH V6 2021-11-10 20:43:33:
- changed CONFIG_DRM_INGENIC_DW_HDMI to "m" (by [email protected])
- made ingenic-dw-hdmi an independent platform driver which can be compiled as module and removed error patch fixes for IPU (suggested by [email protected])
- moved assigned-clocks from jz4780.dtsi to ci20.dts (suggested by [email protected])
- fixed reg property in jz4780.dtsi to cover all registers incl. gamma and vee (by [email protected])
- added a base patch to calculate regmap size from DTS reg property (requested by [email protected])
- restored resetting all bits except one in LCDOSDC (requested by [email protected])
- clarified setting of cpos (suggested by [email protected])
- moved bindings definition for ddc-i2c-bus (suggested by [email protected])
- simplified mask definitions for JZ_LCD_DESSIZE (requested by [email protected])
- removed setting alpha premultiplication (suggested by [email protected])
- removed some comments (suggested by [email protected])
PATCH V5 2021-10-05 14:28:44:
- dropped mode_fixup and timings support in dw-hdmi as it is no longer needed in this V5 (by [email protected])
- dropped "drm/ingenic: add some jz4780 specific features" (stimulated by [email protected])
- fixed typo in commit subject: "synopsis" -> "synopsys" (by [email protected])
- swapped clocks in jz4780.dtsi to match synopsys,dw-hdmi.yaml (by [email protected])
- improved, simplified, fixed, dtbschecked ingenic-jz4780-hdmi.yaml and made dependent of bridge/synopsys,dw-hdmi.yaml (based on suggestions by [email protected])
- fixed binding vs. driver&DTS use of hdmi-5v regulator (suggested by [email protected])
- dropped "drm/bridge: synopsis: Fix to properly handle HPD" - was a no longer needed workaround for a previous version
(suggested by [email protected])
PATCH V4 2021-09-27 18:44:38:
- fix setting output_port = 1 (issue found by [email protected])
- ci20.dts: convert to use hdmi-connector (by [email protected])
- add a hdmi-regulator to control +5V power (by [email protected])
- added a fix to dw-hdmi to call drm_kms_helper_hotplug_event on plugin event detection (by [email protected])
- always allocate extended descriptor but initialize only for jz4780 (by [email protected])
- updated to work on top of "[PATCH v3 0/6] drm/ingenic: Various improvements v3" (by [email protected])
- rebased to v5.13-rc3
PATCH V3 2021-08-08 07:10:50:
This series adds HDMI support for JZ4780 and CI20 board (and fixes one IPU related issue in registration error path)
- [patch 1/8] switched from mode_fixup to atomic_check (suggested by [email protected])
- the call to the dw-hdmi specialization is still called mode_fixup
- [patch 3/8] diverse fixes for ingenic-drm-drv (suggested by [email protected])
- factor out some non-HDMI features of the jz4780 into a separate patch
- multiple fixes around max height
- do not change regmap config but a copy on stack
- define some constants
- factor out fixing of drm_init error path for IPU into separate patch
- use FIELD_PREP()
- [patch 8/8] conversion to component framework dropped (suggested by [email protected] and [email protected])
PATCH V2 2021-08-05 16:08:05:
- code and commit messages revisited for checkpatch warnings
- rebased on v5.14-rc4
- include (failed, hence RFC 8/8) attempt to convert to component framework (was suggested by Paul Cercueil <[email protected]> a while ago)
This series adds HDMI support for JZ4780 and CI20 board
H. Nikolaus Schaller (3):
drm/ingenic: prepare ingenic drm for later addition of JZ4780
MIPS: defconfig: CI20: configure for DRM_DW_HDMI_JZ4780 [RFC] MIPS: DTS: Ingenic: adjust register size to available registers
Paul Boddie (4):
drm/ingenic: Add support for JZ4780 and HDMI output drm/ingenic: Add dw-hdmi driver for jz4780
MIPS: DTS: jz4780: Account for Synopsys HDMI driver and LCD
controllers
MIPS: DTS: CI20: Add DT nodes for HDMI setup
Sam Ravnborg (1):
dt-bindings: display: Add ingenic,jz4780-dw-hdmi DT Schema
.../display/bridge/ingenic,jz4780-hdmi.yaml | 78 ++++++++++ .../display/bridge/synopsys,dw-hdmi.yaml | 3 + arch/mips/boot/dts/ingenic/ci20.dts | 72 +++++++++- arch/mips/boot/dts/ingenic/jz4725b.dtsi | 2 +- arch/mips/boot/dts/ingenic/jz4740.dtsi | 2 +- arch/mips/boot/dts/ingenic/jz4770.dtsi | 2 +- arch/mips/boot/dts/ingenic/jz4780.dtsi | 40 ++++++ arch/mips/configs/ci20_defconfig | 6 + drivers/gpu/drm/ingenic/Kconfig | 9 ++ drivers/gpu/drm/ingenic/Makefile | 1 + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 62 +++++++- drivers/gpu/drm/ingenic/ingenic-drm.h | 38 +++++ drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c | 136 ++++++++++++++++++ 13 files changed, 443 insertions(+), 8 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml create mode 100644 drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c
Signature · 1 line
2.33.0
PATCH v11 1/8 drm/ingenic: prepare ingenic drm for later addition of JZ4780
This changes the way the regmap is allocated to prepare for the later addition of the JZ4780 which has more registers and bits than the others.
Therefore we make the regmap as big as the reg property in the device tree tells.
--- drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/ingenic/ingenic-drm-drv.c +6 -3
@@ -173,7 +173,6 @@ static const struct regmap_config ingenic_drm_regmap_config = { .val_bits = 32, .reg_stride = 4, - .max_register = JZ_REG_LCD_SIZE1, .writeable_reg = ingenic_drm_writeable_reg, };
@@ -1011,6 +1010,8 @@ static int ingenic_drm_bind(struct device *dev, bool has_components)struct ingenic_drm_bridge *ib;struct drm_device *drm;void __iomem *base; +struct resource *res; +struct regmap_config regmap_config;long parent_rate;unsigned int i, clone_mask =0 ;int ret, irq;
@@ -1056,14 +1057,16 @@ static int ingenic_drm_bind(struct device *dev, bool has_components) drm->mode_config.funcs = &ingenic_drm_mode_config_funcs; drm->mode_config.helper_private = &ingenic_drm_mode_config_helpers; - base =devm_platform_ioremap_resource (pdev,0 ); + base =devm_platform_get_and_ioremap_resource (pdev,0 , &res);if (IS_ERR (base)) {dev_err (dev,"Failed to get memory resource\n" );return PTR_ERR (base); } + regmap_config = ingenic_drm_regmap_config; + regmap_config.max_register = res->end - res->start; priv->map =devm_regmap_init_mmio (dev, base, - &ingenic_drm_regmap_config); + ®map_config);if (IS_ERR (priv->map)) {dev_err (dev,"Failed to create regmap\n" );return PTR_ERR (priv->map);
Signature · 1 line
2.33.0
PATCH v11 2/8 drm/ingenic: Add support for JZ4780 and HDMI output
In reply to H. Nikolaus SchallerFrom: Paul Boddie <[email protected]>
Add support for the LCD controller present on JZ4780 SoCs. This SoC uses 8-byte descriptors which extend the current 4-byte descriptors used for other Ingenic SoCs.
Tested on MIPS Creator CI20 board.
--- drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 53 +++++++++++++++++++++++ drivers/gpu/drm/ingenic/ingenic-drm.h | 38 ++++++++++++++++ 2 files changed, 91 insertions(+)
drivers/gpu/drm/ingenic/ingenic-drm-drv.c +53 -0
@@ -6,6 +6,7 @@#include "ingenic-drm.h" +#include <linux/bitfield.h> #include <linux/component.h> #include <linux/clk.h> #include <linux/dma-mapping.h>
@@ -49,6 +50,11 @@ struct ingenic_dma_hwdesc {u32 addr;u32 id;u32 cmd; +/* extended hw descriptor for jz4780 */ +u32 offsize; +u32 pagewidth; +u32 cpos; +u32 dessize; }__aligned(16) ;struct ingenic_dma_hwdescs {
@@ -60,6 +66,7 @@ struct jz_soc_info {bool needs_dev_clk;bool has_osd;bool map_noncoherent; +bool use_extended_hwdesc;unsigned int max_width, max_height;const u32 *formats_f0, *formats_f1;unsigned int num_formats_f0, num_formats_f1;
@@ -446,6 +453,9 @@ static int ingenic_drm_plane_atomic_check(struct drm_plane *plane,if (!crtc)return 0 ; +if (plane == &priv->f0) +return -EINVAL ; + crtc_state =drm_atomic_get_existing_crtc_state (state, crtc);if (WARN_ON (!crtc_state))
@@ -662,6 +672,33 @@ static void ingenic_drm_plane_atomic_update(struct drm_plane *plane, hwdesc->cmd =JZ_LCD_CMD_EOF_IRQ | (width * height * cpp /4 ); hwdesc->next =dma_hwdesc_addr (priv, next_id); +if (priv->soc_info->use_extended_hwdesc) { + hwdesc->cmd |=JZ_LCD_CMD_FRM_ENABLE ; + +/* Extended 8-byte descriptor */ + hwdesc->cpos =0 ; + hwdesc->offsize =0 ; + hwdesc->pagewidth =0 ; + +switch (newstate->fb->format->format) { +case DRM_FORMAT_XRGB1555 : + hwdesc->cpos |=JZ_LCD_CPOS_RGB555 ; + fallthrough; +case DRM_FORMAT_RGB565 : + hwdesc->cpos |=JZ_LCD_CPOS_BPP_15_16 ; +break ; +case DRM_FORMAT_XRGB8888 : + hwdesc->cpos |=JZ_LCD_CPOS_BPP_18_24 ; +break ; + } + hwdesc->cpos |= (JZ_LCD_CPOS_COEFFICIENT_1 << +JZ_LCD_CPOS_COEFFICIENT_OFFSET ); + hwdesc->dessize = + (0xff <<JZ_LCD_DESSIZE_ALPHA_OFFSET ) | +FIELD_PREP (JZ_LCD_DESSIZE_HEIGHT_MASK , height -1 ) | +FIELD_PREP (JZ_LCD_DESSIZE_WIDTH_MASK , width -1 ); + } +if (drm_atomic_crtc_needs_modeset (crtc_state)) { fourcc = newstate->fb->format->format;
@@ -693,6 +730,9 @@ static void ingenic_drm_encoder_atomic_mode_set(struct drm_encoder *encoder, | JZ_LCD_CFG_SPL_DISABLE | JZ_LCD_CFG_REV_DISABLE; } +if (priv->soc_info->use_extended_hwdesc) + cfg |=JZ_LCD_CFG_DESCRIPTOR_8 ; +if (mode->flags &DRM_MODE_FLAG_NHSYNC ) cfg |=JZ_LCD_CFG_HSYNC_ACTIVE_LOW ;if (mode->flags &DRM_MODE_FLAG_NVSYNC )
@@ -1468,10 +1508,23 @@ static const struct jz_soc_info jz4770_soc_info = { .num_formats_f0 = ARRAY_SIZE(jz4770_formats_f0), }; +static const struct jz_soc_info jz4780_soc_info = { + .needs_dev_clk = true, + .has_osd = true, + .use_extended_hwdesc = true, + .max_width =4096 , + .max_height =2048 , + .formats_f1 = jz4770_formats_f1, + .num_formats_f1 =ARRAY_SIZE (jz4770_formats_f1), + .formats_f0 = jz4770_formats_f0, + .num_formats_f0 =ARRAY_SIZE (jz4770_formats_f0), +}; +static const struct of_device_id ingenic_drm_of_match[] = { { .compatible ="ingenic,jz4740-lcd" , .data = &jz4740_soc_info }, { .compatible ="ingenic,jz4725b-lcd" , .data = &jz4725b_soc_info }, { .compatible ="ingenic,jz4770-lcd" , .data = &jz4770_soc_info }, + { .compatible ="ingenic,jz4780-lcd" , .data = &jz4780_soc_info }, {/* sentinel */ }, };MODULE_DEVICE_TABLE (of, ingenic_drm_of_match);
drivers/gpu/drm/ingenic/ingenic-drm.h +38 -0
@@ -44,8 +44,11 @@#define JZ_REG_LCD_XYP1 0x124#define JZ_REG_LCD_SIZE0 0x128#define JZ_REG_LCD_SIZE1 0x12c +#define JZ_REG_LCD_PCFG 0x2c0#define JZ_LCD_CFG_SLCD BIT(31) +#define JZ_LCD_CFG_DESCRIPTOR_8 BIT(28) +#define JZ_LCD_CFG_RECOVER_FIFO_UNDERRUN BIT(25)#define JZ_LCD_CFG_PS_DISABLE BIT(23)#define JZ_LCD_CFG_CLS_DISABLE BIT(22)#define JZ_LCD_CFG_SPL_DISABLE BIT(21)
@@ -63,6 +66,7 @@#define JZ_LCD_CFG_DE_ACTIVE_LOW BIT(9)#define JZ_LCD_CFG_VSYNC_ACTIVE_LOW BIT(8)#define JZ_LCD_CFG_18_BIT BIT(7) +#define JZ_LCD_CFG_24_BIT BIT(6)#define JZ_LCD_CFG_PDW (BIT(5) | BIT(4))#define JZ_LCD_CFG_MODE_GENERIC_16BIT 0
@@ -132,6 +136,7 @@#define JZ_LCD_CMD_SOF_IRQ BIT(31)#define JZ_LCD_CMD_EOF_IRQ BIT(30)#define JZ_LCD_CMD_ENABLE_PAL BIT(28) +#define JZ_LCD_CMD_FRM_ENABLE BIT(26)#define JZ_LCD_SYNC_MASK 0x3ff
@@ -153,6 +158,7 @@#define JZ_LCD_RGBC_EVEN_BGR (0x5 << 0)#define JZ_LCD_OSDC_OSDEN BIT(0) +#define JZ_LCD_OSDC_ALPHAEN BIT(2)#define JZ_LCD_OSDC_F0EN BIT(3)#define JZ_LCD_OSDC_F1EN BIT(4)
@@ -176,6 +182,38 @@#define JZ_LCD_SIZE01_WIDTH_LSB 0#define JZ_LCD_SIZE01_HEIGHT_LSB 16 +#define JZ_LCD_DESSIZE_ALPHA_OFFSET 24 +#define JZ_LCD_DESSIZE_HEIGHT_MASK GENMASK(23, 12) +#define JZ_LCD_DESSIZE_WIDTH_MASK GENMASK(11, 0) + +#define JZ_LCD_CPOS_BPP_15_16 (4 << 27) +#define JZ_LCD_CPOS_BPP_18_24 (5 << 27) +#define JZ_LCD_CPOS_BPP_30 (7 << 27) +#define JZ_LCD_CPOS_RGB555 BIT(30) +#define JZ_LCD_CPOS_PREMULTIPLY_LCD BIT(26) +#define JZ_LCD_CPOS_COEFFICIENT_OFFSET 24 +#define JZ_LCD_CPOS_COEFFICIENT_0 0 +#define JZ_LCD_CPOS_COEFFICIENT_1 1 +#define JZ_LCD_CPOS_COEFFICIENT_ALPHA1 2 +#define JZ_LCD_CPOS_COEFFICIENT_1_ALPHA1 3 + +#define JZ_LCD_RGBC_RGB_PADDING BIT(15) +#define JZ_LCD_RGBC_RGB_PADDING_FIRST BIT(14) +#define JZ_LCD_RGBC_422 BIT(8) +#define JZ_LCD_RGBC_RGB_FORMAT_ENABLE BIT(7) + +#define JZ_LCD_PCFG_PRI_MODE BIT(31) +#define JZ_LCD_PCFG_HP_BST_4 (0 << 28) +#define JZ_LCD_PCFG_HP_BST_8 (1 << 28) +#define JZ_LCD_PCFG_HP_BST_16 (2 << 28) +#define JZ_LCD_PCFG_HP_BST_32 (3 << 28) +#define JZ_LCD_PCFG_HP_BST_64 (4 << 28) +#define JZ_LCD_PCFG_HP_BST_16_CONT (5 << 28) +#define JZ_LCD_PCFG_HP_BST_DISABLE (7 << 28) +#define JZ_LCD_PCFG_THRESHOLD2_OFFSET 18 +#define JZ_LCD_PCFG_THRESHOLD1_OFFSET 9 +#define JZ_LCD_PCFG_THRESHOLD0_OFFSET 0 +struct device ;struct drm_plane ;struct drm_plane_state ;
Signature · 1 line
2.33.0
PATCH v11 3/8 dt-bindings: display: Add ingenic,jz4780-dw-hdmi DT Schema
In reply to H. Nikolaus SchallerFrom: Sam Ravnborg <[email protected]>
Add DT bindings for the hdmi driver for the Ingenic JZ4780 SoC. Based on .txt binding from Zubair Lutfullah Kakakhel
We also add generic ddc-i2c-bus to synopsys,dw-hdmi.yaml
--- .../display/bridge/ingenic,jz4780-hdmi.yaml | 78 +++++++++++++++++++ .../display/bridge/synopsys,dw-hdmi.yaml | 3 + 2 files changed, 81 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml
Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml new file +78 -0
@@ -0,0 +1,78 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/bridge/ingenic,jz4780-hdmi.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Bindings for Ingenic JZ4780 HDMI Transmitter + +maintainers: + - H. Nikolaus Schaller <[email protected]> + +description: | + The HDMI Transmitter in the Ingenic JZ4780 is a Synopsys DesignWare HDMI 1.4 + TX controller IP with accompanying PHY IP. + +allOf: + - $ref: synopsys,dw-hdmi.yaml# + +properties: + compatible: + const: ingenic,jz4780-dw-hdmi + + reg-io-width: + const: 4 + + clocks: + maxItems: 2 + + hdmi-5v-supply: + description: regulator to provide +5V at the connector + + ports: + $ref: /schemas/graph.yaml#/properties/ports + +required: + - compatible + - clocks + - clock-names + - hdmi-5v-supply + - ports + - reg-io-width + +unevaluatedProperties: false + +examples: + - | + #include <dt-bindings/clock/ingenic,jz4780-cgu.h> + + hdmi: hdmi@10180000 { + compatible = "ingenic,jz4780-dw-hdmi"; + reg = <0x10180000 0x8000>; + reg-io-width = <4>; + ddc-i2c-bus = <&i2c4>; + interrupt-parent = <&intc>; + interrupts = <3>; + clocks = <&cgu JZ4780_CLK_AHB0>, <&cgu JZ4780_CLK_HDMI>; + clock-names = "iahb", "isfr"; + hdmi-5v-supply = <&hdmi_power>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + hdmi_in: port@0 { + reg = <0>; + dw_hdmi_in: endpoint { + remote-endpoint = <&jz4780_lcd_out>; + }; + }; + hdmi_out: port@1 { + reg = <1>; + dw_hdmi_out: endpoint { + remote-endpoint = <&hdmi_con>; + }; + }; + }; + }; + +...
Documentation/devicetree/bindings/display/bridge/synopsys,dw-hdmi.yaml +3 -0
@@ -50,6 +50,9 @@ properties: interrupts: maxItems: 1 + ddc-i2c-bus: + description: An I2C interface if the internal DDC I2C driver is not to be used + additionalProperties: true ...
Signature · 1 line
2.33.0
Rob Herring
maintainerRe: [PATCH v11 3/8] dt-bindings: display: Add ingenic,jz4780-dw-hdmi DT Schema
Quoted 43 lines · H. Nikolaus Schaller
From: Sam Ravnborg <[email protected]>
Add DT bindings for the hdmi driver for the Ingenic JZ4780 SoC. Based on .txt binding from Zubair Lutfullah Kakakhel
We also add generic ddc-i2c-bus to synopsys,dw-hdmi.yaml
Signed-off-by Sam Ravnborg <[email protected]>Signed-off-by H. Nikolaus Schaller <[email protected]>Cc Rob Herring <[email protected]>--- .../display/bridge/ingenic,jz4780-hdmi.yaml | 78 +++++++++++++++++++ .../display/bridge/synopsys,dw-hdmi.yaml | 3 + 2 files changed, 81 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yamlDocumentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml new file +20
-0@@ -0,0 +1,78 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/bridge/ingenic,jz4780-hdmi.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Bindings for Ingenic JZ4780 HDMI Transmitter + +maintainers: + - H. Nikolaus Schaller <[email protected]> + +description: | + The HDMI Transmitter in the Ingenic JZ4780 is a Synopsys DesignWare HDMI 1.4 + TX controller IP with accompanying PHY IP. + +allOf: + - $ref: synopsys,dw-hdmi.yaml# + +properties: + compatible:
Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml line 30
Quoted 10 lines
Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml new file +10
-0+ const: ingenic,jz4780-dw-hdmi + + reg-io-width: + const: 4 + + clocks: + maxItems: 2 + + hdmi-5v-supply: + description: regulator to provide +5V at the connector
Being part of the connector, that belongs in a connector node.
Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml line 33
Quoted 3 lines
Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml new file +3
-0+ + ports: + $ref: /schemas/graph.yaml#/properties/ports
You need to define what each 'port' node is.
Quoted 50 lines
Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml new file +45
-0+ +required: + - compatible + - clocks + - clock-names + - hdmi-5v-supply + - ports + - reg-io-width + +unevaluatedProperties: false + +examples: + - | + #include <dt-bindings/clock/ingenic,jz4780-cgu.h> + + hdmi: hdmi@10180000 { + compatible = "ingenic,jz4780-dw-hdmi"; + reg = <0x10180000 0x8000>; + reg-io-width = <4>; + ddc-i2c-bus = <&i2c4>; + interrupt-parent = <&intc>; + interrupts = <3>; + clocks = <&cgu JZ4780_CLK_AHB0>, <&cgu JZ4780_CLK_HDMI>; + clock-names = "iahb", "isfr"; + hdmi-5v-supply = <&hdmi_power>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + hdmi_in: port@0 { + reg = <0>; + dw_hdmi_in: endpoint { + remote-endpoint = <&jz4780_lcd_out>; + }; + }; + hdmi_out: port@1 { + reg = <1>; + dw_hdmi_out: endpoint { + remote-endpoint = <&hdmi_con>; + }; + }; + }; + }; + +...Documentation/devicetree/bindings/display/bridge/synopsys,dw-hdmi.yaml +0
-0
Documentation/devicetree/bindings/display/bridge/synopsys,dw-hdmi.yaml properties: · line 54
Quoted 5 lines
Documentation/devicetree/bindings/display/bridge/synopsys,dw-hdmi.yaml +2
-0@@ -50,6 +50,9 @@ properties: interrupts: maxItems: 1 + ddc-i2c-bus: + description: An I2C interface if the internal DDC I2C driver is not to be used
That too is already defined to be part of the connector node.
Quoted 8 lines
Documentation/devicetree/bindings/display/bridge/synopsys,dw-hdmi.yaml +1
-0+ additionalProperties: trueSignature · 1 line
2.33.0
Paul Cercueil
maintainerRe: [PATCH v11 3/8] dt-bindings: display: Add ingenic,jz4780-dw-hdmi DT Schema
Hi Nikolaus,
Quoted 61 lines · Rob Herring
Quoted 51 lines · H. Nikolaus Schaller
From: Sam Ravnborg <[email protected]>
Add DT bindings for the hdmi driver for the Ingenic JZ4780 SoC. Based on .txt binding from Zubair Lutfullah Kakakhel
We also add generic ddc-i2c-bus to synopsys,dw-hdmi.yaml
Signed-off-by Sam Ravnborg <[email protected]>Signed-off-by H. Nikolaus Schaller <[email protected]>Cc Rob Herring <[email protected]>---
.../display/bridge/ingenic,jz4780-hdmi.yaml | 78 +++++++++++++++++++ .../display/bridge/synopsys,dw-hdmi.yaml | 3 + 2 files changed, 81 insertions(+)create mode 100644
Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yamldiff --git
a/Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yamlb/Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml
new file mode 100644
index 0000000000000..49ae1130efded
---/dev/null
+++b/Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml
@@ -0,0 +1,78 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+%YAML 1.2
+---
+$id:
http://devicetree.org/schemas/display/bridge/ingenic,jz4780-hdmi.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Bindings for Ingenic JZ4780 HDMI Transmitter
+
+maintainers:
+ - H. Nikolaus Schaller <[email protected]>
+
+description: |
+ The HDMI Transmitter in the Ingenic JZ4780 is a Synopsys
DesignWare HDMI 1.4
+ TX controller IP with accompanying PHY IP.
+
+allOf:
+ - $ref: synopsys,dw-hdmi.yaml#
+
+properties:
+ compatible:
+ const: ingenic,jz4780-dw-hdmi
+Quoted 8 lines
+ reg-io-width:
+ const: 4
+
+ clocks:
+ maxItems: 2
+
+ hdmi-5v-supply:
+ description: regulator to provide +5V at the connector
Quoted 1 line
Being part of the connector, that belongs in a connector node.
I believe that means adding .atomic_{enable,disable} callbacks to the display-connector bridge (drivers/gpu/drm/bridge/display-connector.c) which would enable/disable the regulator.
Unless it messes up with e.g. cable detection (which I believe requires the regulator to be enabled), in that case unconditionally enable it in the connector's probe function.
Quoted 5 lines
Quoted 3 lines
+
+ ports:
+ $ref: /schemas/graph.yaml#/properties/portsYou need to define what each 'port' node is.
Have a look at Documentation/devicetree/bindings/display/ingenic,lcd.yaml for an example on how to do this.
Quoted 56 lines
Quoted 56 lines
+
+required:+ - compatible + - clocks + - clock-names + - hdmi-5v-supply + - ports + - reg-io-width + +unevaluatedProperties: false + +examples: + - | + #include <dt-bindings/clock/ingenic,jz4780-cgu.h> + + hdmi: hdmi@10180000 { + compatible = "ingenic,jz4780-dw-hdmi"; + reg = <0x10180000 0x8000>; + reg-io-width = <4>; + ddc-i2c-bus = <&i2c4>; + interrupt-parent = <&intc>; + interrupts = <3>; + clocks = <&cgu JZ4780_CLK_AHB0>, <&cgu JZ4780_CLK_HDMI>; + clock-names = "iahb", "isfr"; + hdmi-5v-supply = <&hdmi_power>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + hdmi_in: port@0 {+ reg = <0>;
+dw_hdmi_in: endpoint {
+ remote-endpoint = <&jz4780_lcd_out>;
+ };
+ };
+hdmi_out: port@1 {
+ reg = <1>;
+dw_hdmi_out: endpoint {
+ remote-endpoint = <&hdmi_con>;
+ };
+ };
+ };
+ };
+
+...
diff --gita/Documentation/devicetree/bindings/display/bridge/synopsys,dw-hdmi.yamlb/Documentation/devicetree/bindings/display/bridge/synopsys,dw-hdmi.yaml
index9be44a682e67a..9cbeabaee0968100644
---a/Documentation/devicetree/bindings/display/bridge/synopsys,dw-hdmi.yaml
+++b/Documentation/devicetree/bindings/display/bridge/synopsys,dw-hdmi.yaml
@@ -50,6 +50,9 @@ properties:
interrupts:
maxItems: 1
Quoted 5 lines
Quoted 3 lines
+ ddc-i2c-bus:
+ description: An I2C interface if the internal DDC I2C driver
is not to be usedThat too is already defined to be part of the connector node.
Just remove the property then, since you don't use it in the ci20 bindings.
Cheers,
-Paul
Quoted 8 lines
Quoted 8 lines
+
additionalProperties: true...
--
2.33.0
PATCH v11 4/8 drm/ingenic: Add dw-hdmi driver for jz4780
In reply to H. Nikolaus SchallerFrom: Paul Boddie <[email protected]>
A specialisation of the generic Synopsys HDMI driver is employed for JZ4780 HDMI support. This requires a new driver, plus device tree and configuration modifications.
Here we add Kconfig DRM_INGENIC_DW_HDMI, Makefile and driver code.
--- drivers/gpu/drm/ingenic/Kconfig | 9 ++ drivers/gpu/drm/ingenic/Makefile | 1 + drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c | 136 ++++++++++++++++++++++ 3 files changed, 146 insertions(+) create mode 100644 drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c
drivers/gpu/drm/ingenic/Kconfig +9 -0
@@ -25,4 +25,13 @@ config DRM_INGENIC_IPU The Image Processing Unit (IPU) will appear as a second primary plane. +config DRM_INGENIC_DW_HDMI + tristate "Ingenic specific support for Synopsys DW HDMI" + depends on MACH_JZ4780 + select DRM_DW_HDMI + help + Choose this option to enable Synopsys DesignWare HDMI based driver. + If you want to enable HDMI on Ingenic JZ4780 based SoC, you should + select this option.. + endif
drivers/gpu/drm/ingenic/Makefile +1 -0
@@ -1,3 +1,4 @@ obj-$(CONFIG_DRM_INGENIC) += ingenic-drm.o ingenic-drm-y = ingenic-drm-drv.o ingenic-drm-$(CONFIG_DRM_INGENIC_IPU) += ingenic-ipu.o +obj-$(CONFIG_DRM_INGENIC_DW_HDMI) += ingenic-dw-hdmi.o
drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c new file +136 -0
136 lines not on this page · raw message
Signature · 1 line
2.33.0
PATCH v11 5/8 MIPS: DTS: jz4780: Account for Synopsys HDMI driver and LCD controllers
In reply to H. Nikolaus SchallerFrom: Paul Boddie <[email protected]>
A specialisation of the generic Synopsys HDMI driver is employed for JZ4780 HDMI support. This requires a new driver, plus device tree and configuration modifications.
Here we add jz4780 device tree setup.
--- arch/mips/boot/dts/ingenic/jz4780.dtsi | 40 ++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)
arch/mips/boot/dts/ingenic/jz4780.dtsi +40 -0
@@ -444,6 +444,46 @@ i2c4: i2c@10054000 { status = "disabled"; }; + hdmi: hdmi@10180000 { + compatible = "ingenic,jz4780-dw-hdmi"; + reg = <0x10180000 0x8000>; + reg-io-width = <4>; + + clocks = <&cgu JZ4780_CLK_AHB0>, <&cgu JZ4780_CLK_HDMI>; + clock-names = "iahb", "isfr"; + + interrupt-parent = <&intc>; + interrupts = <3>; + + status = "disabled"; + }; + + lcdc0: lcdc0@13050000 { + compatible = "ingenic,jz4780-lcd"; + reg = <0x13050000 0x1800>; + + clocks = <&cgu JZ4780_CLK_TVE>, <&cgu JZ4780_CLK_LCD0PIXCLK>; + clock-names = "lcd", "lcd_pclk"; + + interrupt-parent = <&intc>; + interrupts = <31>; + + status = "disabled"; + }; + + lcdc1: lcdc1@130a0000 { + compatible = "ingenic,jz4780-lcd"; + reg = <0x130a0000 0x1800>; + + clocks = <&cgu JZ4780_CLK_TVE>, <&cgu JZ4780_CLK_LCD1PIXCLK>; + clock-names = "lcd", "lcd_pclk"; + + interrupt-parent = <&intc>; + interrupts = <23>; + + status = "disabled"; + }; + nemc: nemc@13410000 { compatible = "ingenic,jz4780-nemc", "simple-mfd"; reg = <0x13410000 0x10000>;
Signature · 1 line
2.33.0
PATCH v11 6/8 MIPS: DTS: CI20: Add DT nodes for HDMI setup
In reply to H. Nikolaus SchallerFrom: Paul Boddie <[email protected]>
We need to hook up
* HDMI connector
* HDMI power regulator
* JZ4780_CLK_HDMI @ 27 MHz
* DDC pinmux
* HDMI and LCDC endpoint connections
--- arch/mips/boot/dts/ingenic/ci20.dts | 72 ++++++++++++++++++++++++++++- 1 file changed, 70 insertions(+), 2 deletions(-)
arch/mips/boot/dts/ingenic/ci20.dts +70 -2
@@ -78,6 +78,18 @@ eth0_power: fixedregulator@0 { enable-active-high; }; + hdmi_out: connector { + compatible = "hdmi-connector"; + label = "HDMI OUT"; + type = "a"; + + port { + hdmi_con: endpoint { + remote-endpoint = <&dw_hdmi_out>; + }; + }; + }; + ir: ir { compatible = "gpio-ir-receiver"; gpios = <&gpe 3 GPIO_ACTIVE_LOW>;
@@ -102,6 +114,17 @@ otg_power: fixedregulator@2 { gpio = <&gpf 14 GPIO_ACTIVE_LOW>; enable-active-high; }; + + hdmi_power: fixedregulator@3 { + compatible = "regulator-fixed"; + + regulator-name = "hdmi_power"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + + gpio = <&gpa 25 0>; + enable-active-high; + }; }; &ext {
@@ -114,11 +137,12 @@ &cgu { * precision. */ assigned-clocks = <&cgu JZ4780_CLK_OTGPHY>, <&cgu JZ4780_CLK_RTC>, - <&cgu JZ4780_CLK_SSIPLL>, <&cgu JZ4780_CLK_SSI>; + <&cgu JZ4780_CLK_SSIPLL>, <&cgu JZ4780_CLK_SSI>, + <&cgu JZ4780_CLK_HDMI>; assigned-clock-parents = <0>, <&cgu JZ4780_CLK_RTCLK>, <&cgu JZ4780_CLK_MPLL>, <&cgu JZ4780_CLK_SSIPLL>; - assigned-clock-rates = <48000000>, <0>, <54000000>; + assigned-clock-rates = <48000000>, <0>, <54000000>, <0>, <27000000>; }; &tcu {
@@ -509,6 +533,12 @@ pins_i2c4: i2c4 { bias-disable; }; + pins_hdmi_ddc: hdmi_ddc { + function = "hdmi-ddc"; + groups = "hdmi-ddc"; + bias-disable; + }; + pins_nemc: nemc { function = "nemc"; groups = "nemc-data", "nemc-cle-ale", "nemc-rd-we", "nemc-frd-fwe";
@@ -539,3 +569,41 @@ pins_mmc1: mmc1 { bias-disable; }; }; + +&hdmi { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pins_hdmi_ddc>; + + hdmi-5v-supply = <&hdmi_power>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + dw_hdmi_in: endpoint { + remote-endpoint = <&lcd_out>; + }; + }; + + port@1 { + reg = <1>; + dw_hdmi_out: endpoint { + remote-endpoint = <&hdmi_con>; + }; + }; + }; +}; + +&lcdc0 { + status = "okay"; + + port { + lcd_out: endpoint { + remote-endpoint = <&dw_hdmi_in>; + }; + }; +};
Signature · 1 line
2.33.0
PATCH v11 7/8 MIPS: defconfig: CI20: configure for DRM_DW_HDMI_JZ4780
In reply to H. Nikolaus SchallerEnable CONFIG options as modules.
--- arch/mips/configs/ci20_defconfig | 6 ++++++ 1 file changed, 6 insertions(+)
arch/mips/configs/ci20_defconfig +6 -0
@@ -98,7 +98,13 @@ CONFIG_RC_DEVICES=y CONFIG_IR_GPIO_CIR=m CONFIG_IR_GPIO_TX=m CONFIG_MEDIA_SUPPORT=m +CONFIG_DRM=m +CONFIG_DRM_INGENIC=m +CONFIG_DRM_INGENIC_DW_HDMI=m +CONFIG_DRM_DISPLAY_CONNECTOR=m # CONFIG_VGA_CONSOLE is not set +CONFIG_FB=y +CONFIG_FRAMEBUFFER_CONSOLE=y # CONFIG_HID is not set CONFIG_USB=y CONFIG_USB_STORAGE=y
Signature · 1 line
2.33.0
RFC PATCH v11 8/8 MIPS: DTS: Ingenic: adjust register size to available registers
In reply to H. Nikolaus SchallerAfter getting the regmap size from the device tree we should reduce the ranges to the really available registers. This allows to read only existing registers from the debug fs and makes the regmap check out-of-bounds access.
For the jz4780 we have done this already.
Suggested-for: Paul Cercueil <[email protected]>
--- arch/mips/boot/dts/ingenic/jz4725b.dtsi | 2 +- arch/mips/boot/dts/ingenic/jz4740.dtsi | 2 +- arch/mips/boot/dts/ingenic/jz4770.dtsi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/mips/boot/dts/ingenic/jz4725b.dtsi +1 -1
@@ -321,7 +321,7 @@ udc: usb@13040000 { lcd: lcd-controller@13050000 { compatible = "ingenic,jz4725b-lcd"; - reg = <0x13050000 0x1000>; + reg = <0x13050000 0x130>; /* tbc */ interrupt-parent = <&intc>; interrupts = <31>;
arch/mips/boot/dts/ingenic/jz4740.dtsi +1 -1
@@ -323,7 +323,7 @@ udc: usb@13040000 { lcd: lcd-controller@13050000 { compatible = "ingenic,jz4740-lcd"; - reg = <0x13050000 0x1000>; + reg = <0x13050000 0x60>; /* LCDCMD1+4 */ interrupt-parent = <&intc>; interrupts = <30>;
arch/mips/boot/dts/ingenic/jz4770.dtsi +1 -1
@@ -399,7 +399,7 @@ gpu: gpu@13040000 { lcd: lcd-controller@13050000 { compatible = "ingenic,jz4770-lcd"; - reg = <0x13050000 0x300>; + reg = <0x13050000 0x130>; /* tbc */ interrupt-parent = <&intc>; interrupts = <31>;
Signature · 1 line
2.33.0
Quoted 20 lines · H. Nikolaus Schaller
[..]
This series adds HDMI support for JZ4780 and CI20 boardH. Nikolaus Schaller (3):
drm/ingenic: prepare ingenic drm for later addition of JZ4780
MIPS: defconfig: CI20: configure forDRM_DW_HDMI_JZ4780[RFC] MIPS: DTS: Ingenic: adjust register size to available registersPaul Boddie (4):
drm/ingenic: Add support for JZ4780 and HDMI output drm/ingenic: Add dw-hdmi driver for jz4780
MIPS: DTS: jz4780: Account for Synopsys HDMI driver and LCD
controllers
MIPS: DTS: CI20: Add DT nodes for HDMI setupSam Ravnborg (1):
dt-bindings: display: Add ingenic,jz4780-dw-hdmi DT Schema
Quoted 16 lines
.../display/bridge/ingenic,jz4780-hdmi.yaml | 78 ++++++++++ .../display/bridge/synopsys,dw-hdmi.yaml | 3 + arch/mips/boot/dts/ingenic/ci20.dts | 72 +++++++++- arch/mips/boot/dts/ingenic/jz4725b.dtsi | 2 +- arch/mips/boot/dts/ingenic/jz4740.dtsi | 2 +- arch/mips/boot/dts/ingenic/jz4770.dtsi | 2 +- arch/mips/boot/dts/ingenic/jz4780.dtsi | 40 ++++++ arch/mips/configs/ci20_defconfig | 6 + drivers/gpu/drm/ingenic/Kconfig | 9 ++ drivers/gpu/drm/ingenic/Makefile | 1 + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 62 +++++++- drivers/gpu/drm/ingenic/ingenic-drm.h | 38 +++++ drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c | 136 ++++++++++++++++++ 13 files changed, 443 insertions(+), 8 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml create mode 100644 drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c
applied patches 5-8 to mips-next.
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]
Paul Cercueil
maintainerHi,
Patches 1 and 2 added to drm-misc-next.
I'll pick the rest when the regulator situation is sorted out.
Cheers,
-Paul
Quoted 163 lines · H. Nikolaus Schaller
PATCH V11 2021-12-02 19:39:52:
- patch 4/8: changedevm_regulator_get_optionaltodevm_regulator_getand
remove NULL check (requested by [email protected])
- patch 3/8: make hdmi-5v-supply required (requested by [email protected])PATCH V10 2021-11-30 22:26:41:
- patch 3/8: fix $id and $ref paths (found by [email protected])PATCH V9 2021-11-24 22:29:14:
- patch 6/8: remove optional <0> for assigned-clocks and unintentionally included "unwedge" setup (found by [email protected])
- patch 4/8: some cosmetics
make regulator enable/disable only if not NULL (found by
[email protected])
simplify/fix error handling and driver cleanup on remove
(proposed by [email protected])
- patch 3/8: fix #include path in example (found by [email protected])
fix missing "i" in unevaluatedProperties (found by
[email protected])
fix 4 spaces indentation for required: property (found
by [email protected])PATCH V8 2021-11-23 19:14:00:
- fix a bad editing result from patch 2/8 (found by [email protected])PATCH V7 2021-11-23 18:46:23:
- changed gpio polarity ofhdmi_powerto 0 (suggested by [email protected])
- fixed LCD1 irq number (bug found by [email protected])
- removed "- 4" for calculatingmax_register(suggested by [email protected])
- use unevaluatedPropertes instead of additionalProperties (suggested by [email protected])
- moved and renamed ingenic,jz4780-hdmi.yaml (suggested by [email protected])
- adjusted assigned-clocks changes to upstream which added some for SSI (by [email protected])
- rebased and tested with v5.16-rc2 + patch set drm/ingenic by [email protected] (by [email protected])PATCH V6 2021-11-10 20:43:33:
- changedCONFIG_DRM_INGENIC_DW_HDMIto "m" (by [email protected])
- made ingenic-dw-hdmi an independent platform driver which can be compiled as module
and removed error patch fixes for IPU (suggested by
[email protected])
- moved assigned-clocks fromjz4780.dtsitoci20.dts(suggested by [email protected])
- fixed reg property injz4780.dtsito cover all registers incl. gamma and vee (by [email protected])
- added a base patch to calculate regmap size from DTS reg property (requested by [email protected])
- restored resetting all bits except one in LCDOSDC (requested by [email protected])
- clarified setting of cpos (suggested by [email protected])
- moved bindings definition for ddc-i2c-bus (suggested by [email protected])
- simplified mask definitions forJZ_LCD_DESSIZE(requested by [email protected])
- removed setting alpha premultiplication (suggested by [email protected])
- removed some comments (suggested by [email protected])PATCH V5 2021-10-05 14:28:44:
- droppedmode_fixupand timings support in dw-hdmi as it is no
longer needed in this V5 (by [email protected])
- dropped "drm/ingenic: add some jz4780 specific features"
(stimulated by [email protected])
- fixed typo in commit subject: "synopsis" -> "synopsys" (by
[email protected])
- swapped clocks injz4780.dtsito match synopsys,dw-hdmi.yaml (by [email protected])
- improved, simplified, fixed, dtbscheckedingenic-jz4780-hdmi.yaml
and made dependent ofbridge/synopsys,dw-hdmi.yaml(based on suggestions by [email protected])
- fixed binding vs. driver&DTS use of hdmi-5v regulator (suggested by [email protected])
- dropped "drm/bridge: synopsis: Fix to properly handle HPD" - was a
no longer needed workaround for a previous version
(suggested by [email protected])PATCH V4 2021-09-27 18:44:38:
- fix settingoutput_port= 1 (issue found by [email protected])
-ci20.dts: convert to use hdmi-connector (by [email protected])
- add a hdmi-regulator to control +5V power (by [email protected])
- added a fix to dw-hdmi to calldrm_kms_helper_hotplug_eventon plugin event detection (by [email protected])
- always allocate extended descriptor but initialize only for jz4780 (by [email protected])
- updated to work on top of "[PATCH v3 0/6] drm/ingenic: Various improvements v3" (by [email protected])
- rebased to v5.13-rc3PATCH V3 2021-08-08 07:10:50:
This series adds HDMI support for JZ4780 and CI20 board (and fixes one IPU related issue in registration error path)
- [patch 1/8] switched frommode_fixuptoatomic_check(suggested by
[email protected])
- the call to the dw-hdmi specialization is still calledmode_fixup
- [patch 3/8] diverse fixes for ingenic-drm-drv (suggested by
[email protected])
- factor out some non-HDMI features of the jz4780 into a separate
patch
- multiple fixes around max height
- do not change regmap config but a copy on stack
- define some constants
- factor out fixing ofdrm_initerror path for IPU into separate
patch
- useFIELD_PREP()
- [patch 8/8] conversion to component framework dropped (suggested by [email protected] and [email protected])PATCH V2 2021-08-05 16:08:05:
- code and commit messages revisited for checkpatch warnings
- rebased on v5.14-rc4
- include (failed, hence RFC 8/8) attempt to convert to component framework
(was suggested by Paul Cercueil <[email protected]> a while ago)This series adds HDMI support for JZ4780 and CI20 board
H. Nikolaus Schaller (3):
drm/ingenic: prepare ingenic drm for later addition of JZ4780
MIPS: defconfig: CI20: configure forDRM_DW_HDMI_JZ4780[RFC] MIPS: DTS: Ingenic: adjust register size to available
registersPaul Boddie (4):
drm/ingenic: Add support for JZ4780 and HDMI output drm/ingenic: Add dw-hdmi driver for jz4780
MIPS: DTS: jz4780: Account for Synopsys HDMI driver and LCD
controllers
MIPS: DTS: CI20: Add DT nodes for HDMI setupSam Ravnborg (1):
dt-bindings: display: Add ingenic,jz4780-dw-hdmi DT Schema.../display/bridge/ingenic,jz4780-hdmi.yaml | 78 ++++++++++ .../display/bridge/synopsys,dw-hdmi.yaml | 3 + arch/mips/boot/dts/ingenic/ci20.dts | 72 +++++++++- arch/mips/boot/dts/ingenic/jz4725b.dtsi | 2 +- arch/mips/boot/dts/ingenic/jz4740.dtsi | 2 +- arch/mips/boot/dts/ingenic/jz4770.dtsi | 2 +- arch/mips/boot/dts/ingenic/jz4780.dtsi | 40 ++++++ arch/mips/configs/ci20_defconfig | 6 + drivers/gpu/drm/ingenic/Kconfig | 9 ++ drivers/gpu/drm/ingenic/Makefile | 1 + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 62 +++++++- drivers/gpu/drm/ingenic/ingenic-drm.h | 38 +++++ drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c | 136 ++++++++++++++++++ 13 files changed, 443 insertions(+), 8 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml create mode 100644 drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c--
2.33.0
Hi Paul and Thomas,
thanks for already applying some of the patches of this series!
Quoted 8 lines
Am 16.12.2021 um 16:24 schrieb Paul Cercueil <[email protected]>:
Hi,
Patches 1 and 2 added to drm-misc-next.
I'll pick the rest when the regulator situation is sorted out.
I had started working on the regulator and while testing and trying to read the EDID something has damaged my monitor so that it does no longer report proper EDID information (for the second time, so that I can't pledge for another warrany repair). Maybe controlling +5V for this specific monitor must be done very carefully and in a specific sequence...
So I will need some more days for building a more robust test setup and doing verification of the driver. Well I have other monitors, but this was the cheapest one and available for such experiments :)
Generally the idea is to replace the regulator with a ddc-en-gpios property of the connector.
Unfortunately it does not work to control it by atomic enable/disable in the connector driver (it is not called at all). So I have been working on an approach following the concept how drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c does it.
Sorry for the delay, but a V12 will come.
BR and thanks,
Nikolaus