MIPS: JZ4780 and CI20 HDMI
Subsystems (6)
v8 cover MIPS: JZ4780 and CI20 HDMI
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 | 76 +++++++++++ .../display/bridge/synopsys,dw-hdmi.yaml | 3 + arch/mips/boot/dts/ingenic/ci20.dts | 83 ++++++++++- 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 | 129 ++++++++++++++++++ 13 files changed, 444 insertions(+), 9 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 v8 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 v8 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 v8 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 | 76 +++++++++++++++++++ .../display/bridge/synopsys,dw-hdmi.yaml | 3 + 2 files changed, 79 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml
Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml new file +76 -0
@@ -0,0 +1,76 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/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: bridge/synopsys,dw-hdmi.yaml# + +properties: + compatible: + const: ingenic,jz4780-dw-hdmi + + reg-io-width: + const: 4 + + clocks: + maxItems: 2 + + hdmi-5v-supply: + description: Optional regulator to provide +5V at the connector + + ports: + $ref: /schemas/graph.yaml#/properties/ports + +required: + - compatible + - clocks + - clock-names + - ports + - reg-io-width + +unevaluatedPropertes: false + +examples: + - | + #include <dt-bindings/clock/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"; + + 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 v8 3/8] dt-bindings: display: Add ingenic,jz4780-dw-hdmi DT Schema
Quoted 11 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]>
Quoted 6 lines
--- .../display/bridge/ingenic,jz4780-hdmi.yaml | 76 +++++++++++++++++++ .../display/bridge/synopsys,dw-hdmi.yaml | 3 + 2 files changed, 79 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml
My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13):
yamllint warnings/errors:./Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml:36:5: [warning] wrong indentation: expected 2 but found 4 (indentation)
dtschema/dtc warnings/errors:
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml: 'unevaluatedPropertes' is not one of ['$id', '$schema', 'title', 'description', 'examples', 'required', 'allOf', 'anyOf', 'oneOf', 'definitions', '$defs', 'additionalProperties', 'dependencies', 'dependentRequired', 'dependentSchemas', 'patternProperties', 'properties', 'if', 'then', 'else', 'unevaluatedProperties', 'deprecated', 'maintainers', 'select']
from schema $id: http://devicetree.org/meta-schemas/base.yaml#
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml: 'oneOf' conditional failed, one must be fixed:
'unevaluatedProperties' is a required property
'additionalProperties' is a required property
hint: A schema with a "$ref" to another schema either can define all properties used and use "additionalProperties" or can use "unevaluatedProperties"
from schema $id: http://devicetree.org/meta-schemas/base.yaml#
Unknown file referenced: [Errno 2] No such file or directory: '/usr/local/lib/python3.8/dist-packages/dtschema/schemas/bridge/bridge/synopsys,dw-hdmi.yaml'
xargs: dt-doc-validate: exited with status 255; aborting
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml: ignoring, error in schema:
warning: no schema found in file: ./Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yamlDocumentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.example.dts:19:18: fatal error: dt-bindings/clock/jz4780-cgu.h: No such file or directory
19 | #include <dt-bindings/clock/jz4780-cgu.h>
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
make[1]: *** [scripts/Makefile.lib:373: Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.example.dt.yaml] Error 1 make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:1413: dt_binding_check] Error 2
doc reference errors (make refcheckdocs):
See https://patchwork.ozlabs.org/patch/1558736
This check can fail if there are any dependencies. The base for a patch series is generally the most recent rc1.
If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date:
pip3 install dtschema --upgrade
Please check and re-submit.
Re: [PATCH v8 3/8] dt-bindings: display: Add ingenic,jz4780-dw-hdmi DT Schema
Quoted 23 lines
Am 24.11.2021 um 03:59 schrieb Rob Herring <[email protected]>:
Quoted 11 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]>Quoted 6 lines
---
.../display/bridge/ingenic,jz4780-hdmi.yaml| 76 +++++++++++++++++++.../display/bridge/synopsys,dw-hdmi.yaml| 3 +2 files changed, 79 insertions(+)create mode 100644
Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml
Quoted 5 lines
My bot found errors running 'make DT_CHECKER_FLAGS=-m
dt_binding_check' on your patch (DT_CHECKER_FLAGSis new in v5.13):yamllint warnings/errors:
./Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml:36:5: [warning] wrong indentation: expected 2 but found 4 (indentation)
ok, fixed.
Quoted 3 lines
dtschema/dtc warnings/errors:
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml: 'unevaluatedPropertes' is not one of ['$id', '$schema', 'title', 'description', 'examples',
ah, that is a typo (missing i in ...ties).
Quoted 34 lines
'required', 'allOf', 'anyOf', 'oneOf', 'definitions', '$defs', 'additionalProperties', 'dependencies', 'dependentRequired', 'dependentSchemas', 'patternProperties', 'properties', 'if', 'then', 'else', 'unevaluatedProperties', 'deprecated', 'maintainers', 'select']
from schema $id: http://devicetree.org/meta-schemas/base.yaml#
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml: 'oneOf' conditional failed, one must be fixed:
'unevaluatedProperties' is a required property
'additionalProperties' is a required property
hint: A schema with a "$ref" to another schema either can define all properties used and use "additionalProperties" or can use "unevaluatedProperties"
from schema $id: http://devicetree.org/meta-schemas/base.yaml#
Unknown file referenced: [Errno 2] No such file or directory: '/usr/local/lib/python3.8/dist-packages/dtschema/schemas/bridge/bridge/synopsys,dw-hdmi.yaml'
xargs: dt-doc-validate: exited with status 255; aborting
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml: ignoring, error in schema:
warning: no schema found in file:./Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yamlDocumentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.example.dts:19:18: fatal error:dt-bindings/clock/jz4780-cgu.h: No such file or directory
19 | #include <dt-bindings/clock/jz4780-cgu.h>| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~compilation terminated.
make[1]: *** [scripts/Makefile.lib:373:Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.example.dt.yaml] Error 1 make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:1413:dt_binding_check] Error 2doc reference errors (make refcheckdocs):
See https://patchwork.ozlabs.org/patch/1558736
This check can fail if there are any dependencies. The base for a patch series is generally the most recent rc1.
If you already ran 'make
dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date:pip3 install dtschema --upgrade
Please check and re-submit.
Paul Cercueil
maintainerRe: [PATCH v8 3/8] dt-bindings: display: Add ingenic,jz4780-dw-hdmi DT Schema
In reply to H. Nikolaus SchallerHi Nikolaus,
Quoted 63 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 | 76 +++++++++++++++++++ .../display/bridge/synopsys,dw-hdmi.yaml | 3 + 2 files changed, 79 insertions(+) create mode 100644
Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml(quoted diff) +0
-0
b/Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yamlDocumentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml new file +13
-0@@ -0,0 +1,76 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/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 SynopsysDesignWare HDMI 1.4
Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml new file +23
-0+ TX controller IP with accompanying PHY IP. + +allOf: + - $ref: bridge/synopsys,dw-hdmi.yaml# + +properties: + compatible: + const: ingenic,jz4780-dw-hdmi + + reg-io-width: + const: 4 + + clocks: + maxItems: 2 + + hdmi-5v-supply: + description: Optional regulator to provide +5V at the connector + + ports: + $ref: /schemas/graph.yaml#/properties/ports + +required: + - compatible
Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml line 46
Quoted 10 lines
Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml new file +10
-0+ - clocks + - clock-names + - ports + - reg-io-width + +unevaluatedPropertes: false + +examples: + - | + #include <dt-bindings/clock/jz4780-cgu.h>
This include was moved in 5.16-rc1 to <dt-bindings/clock/ingenic,jz4780-cgu.h>.
Cheers,
-Paul
Quoted 50 lines
Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml new file +30
-0+ + 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"; + + 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
-1---
a/Documentation/devicetree/bindings/display/bridge/synopsys,dw-hdmi.yaml
+++b/Documentation/devicetree/bindings/display/bridge/synopsys,dw-hdmi.yamlDocumentation/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 isnot to be used
+
additionalProperties: true...
--
2.33.0
Re: [PATCH v8 3/8] dt-bindings: display: Add ingenic,jz4780-dw-hdmi DT Schema
Hi Rob and Paul,
Quoted 64 lines
Am 24.11.2021 um 10:17 schrieb Paul Cercueil <[email protected]>:
Hi Nikolaus,
Quoted 59 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.yamlSigned-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| 76 +++++++++++++++++++.../display/bridge/synopsys,dw-hdmi.yaml| 3 +2 files changed, 79 insertions(+)create mode 100644
Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yamlDocumentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml new file +40
-0@@ -0,0 +1,76 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/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: bridge/synopsys,dw-hdmi.yaml# + +properties: + compatible: + const: ingenic,jz4780-dw-hdmi + + reg-io-width: + const: 4 + + clocks: + maxItems: 2 + + hdmi-5v-supply: + description: Optional regulator to provide +5V at the connector + + ports: + $ref: /schemas/graph.yaml#/properties/ports + +required: + - compatible + - clocks + - clock-names + - ports + - reg-io-width
Quoted 8 lines
Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml line 46
Quoted 6 lines
Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml new file +6
-0+ +unevaluatedPropertes: false + +examples: + - | + #include <dt-bindings/clock/jz4780-cgu.h>This include was moved in 5.16-rc1 to <
dt-bindings/clock/ingenic,jz4780-cgu.h>.
I see!
Quoted 50 lines
Cheers,
-PaulQuoted 44 lines
Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml new file +30
-0+ + 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"; + + 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
...
--
2.33.0
PATCH v8 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 | 129 ++++++++++++++++++++++ 3 files changed, 139 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 +129 -0
129 lines not on this page · raw message
Signature · 1 line
2.33.0
Paul Cercueil
maintainerRe: [PATCH v8 4/8] drm/ingenic: Add dw-hdmi driver for jz4780
Hi Nikolaus,
I keep seeing a few things, sorry.
Quoted 138 lines · H. Nikolaus Schaller
From: 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
KconfigDRM_INGENIC_DW_HDMI,Makefileand driver code.Signed-off-by Paul Boddie <[email protected]>Signed-off-by Ezequiel Garcia <[email protected]>Signed-off-by H. Nikolaus Schaller <[email protected]>--- drivers/gpu/drm/ingenic/Kconfig | 9 ++ drivers/gpu/drm/ingenic/Makefile | 1 + drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c | 129 ++++++++++++++++++++++ 3 files changed, 139 insertions(+) create mode 100644 drivers/gpu/drm/ingenic/ingenic-dw-hdmi.cdrivers/gpu/drm/ingenic/Kconfig +0
-0@@ -25,4 +25,13 @@ config DRM_INGENIC_IPU The Image Processing Unit (IPU) will appear as a second primaryplane.
drivers/gpu/drm/ingenic/Kconfig +6
-0+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 baseddriver.
drivers/gpu/drm/ingenic/Kconfig +3
-0+ If you want to enable HDMI on Ingenic JZ4780 based SoC, you should + select this option.. + endifdrivers/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.odrivers/gpu/drm/ingenic/ingenic-dw-hdmi.c new file +18
-0@@ -0,0 +1,129 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2011-2013 Freescale Semiconductor, Inc. +* Copyright (C) 2019, 2020 Paul Boddie <[email protected]> +* +* Derived from dw_hdmi-imx.c with i.MX portions removed. +* Probe and remove operations derived from rcar_dw_hdmi.c. +*/ + +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> + +#include <drm/bridge/dw_hdmi.h> +#include <drm/drm_of.h> +#include <drm/drm_print.h> + +static const struct dw_hdmi_mpll_config ingenic_mpll_cfg[] = { + {45250000 , { {0x01e0 ,0x0000 }, {0x21e1 ,0x0000 }, {0x41e2 ,
0x0000} } },drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c new file +1
-0+ { 92500000, { { 0x0140, 0x0005 }, { 0x2141, 0x0005 }, { 0x4142,
0x0005} } },drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c new file +1
-0+ { 148500000, { { 0x00a0, 0x000a }, { 0x20a1, 0x000a }, { 0x40a2,
0x000a} } },drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c new file +1
-0+ { 216000000, { { 0x00a0, 0x000a }, { 0x2001, 0x000f }, { 0x4002,
0x000f} } },drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c new file +1
-0+ { ~0UL, { { 0x0000, 0x0000 }, { 0x0000, 0x0000 }, { 0x0000,
0x0000} } }drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c new file +32
-0+}; + +static const struct dw_hdmi_curr_ctrl ingenic_cur_ctr[] = { +/*pixelclk bpp8 bpp10 bpp12 */ + {54000000 , {0x091c ,0x091c ,0x06dc } }, + {58400000 , {0x091c ,0x06dc ,0x06dc } }, + {72000000 , {0x06dc ,0x06dc ,0x091c } }, + {74250000 , {0x06dc ,0x0b5c ,0x091c } }, + {118800000 , {0x091c ,0x091c ,0x06dc } }, + {216000000 , {0x06dc ,0x0b5c ,0x091c } }, + { ~0UL , {0x0000 ,0x0000 ,0x0000 } }, +}; + +/* +* Resistance term 133Ohm Cfg +* PREEMP config 0.00 +* TX/CK level 10 +*/ +static const struct dw_hdmi_phy_config ingenic_phy_config[] = { +/*pixelclk symbol term vlev */ + {216000000 ,0x800d ,0x0005 ,0x01ad }, + { ~0UL ,0x0000 ,0x0000 ,0x0000 } +}; + +static enum drm_mode_status +ingenic_dw_hdmi_mode_valid (struct dw_hdmi *hdmi,void *data, +const struct drm_display_info *info, +const struct drm_display_mode *mode) +{ +if (mode->clock <13500 ) +return MODE_CLOCK_LOW ; +/* FIXME: Hardware is capable of 270MHz, but setup data is missing. */
drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c new file +24
-0+if (mode->clock >216000 ) +return MODE_CLOCK_HIGH ; + +return MODE_OK ; +} + +static struct dw_hdmi_plat_data ingenic_dw_hdmi_plat_data = { + .mpll_cfg = ingenic_mpll_cfg, + .cur_ctr = ingenic_cur_ctr, + .phy_config = ingenic_phy_config, + .mode_valid = ingenic_dw_hdmi_mode_valid, + .output_port =1 , +}; + +static const struct of_device_id ingenic_dw_hdmi_dt_ids[] = { + { .compatible ="ingenic,jz4780-dw-hdmi" }, + {/* Sentinel */ }, +}; +MODULE_DEVICE_TABLE (of, ingenic_dw_hdmi_dt_ids); + +static int ingenic_dw_hdmi_probe (struct platform_device *pdev) +{ +struct dw_hdmi *hdmi; +struct regulator *regulator;
drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c line 88
Quoted 10 lines
drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c new file +10
-0+int ret; + + hdmi =dw_hdmi_probe (pdev, &ingenic_dw_hdmi_plat_data); +if (IS_ERR (hdmi)) +return PTR_ERR (hdmi); + +platform_set_drvdata (pdev, hdmi); + + regulator =devm_regulator_get_optional (&pdev->dev,"hdmi-5v" ); +
Nit - you can remove this blank line.
drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c line 97
Quoted 9 lines
drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c new file +9
-0+if (IS_ERR (regulator)) { + ret =PTR_ERR (regulator); + +DRM_DEV_ERROR (&pdev->dev,"failed to get hpd regulator: %s (%d)\n" , +"hdmi-5v" , ret); +return ret; + } + + ret =regulator_enable (regulator);
You used devm_regulator_get_optional(), so you are not guaranteed to obtain anything; your "regulator" variable might be a NULL pointer, so you can't just call regulator_enable() without checking it first.
Quoted 4 lines
drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c new file +4
-0+if (ret) { +DRM_DEV_ERROR (&pdev->dev,"Failed to enable hpd regulator: %d\n" , + ret); +return ret;
drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c line 111
Quoted 10 lines
drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c new file +10
-0+ } + +return 0 ; +} + +static int ingenic_dw_hdmi_remove (struct platform_device *pdev) +{ +struct dw_hdmi *hdmi =platform_get_drvdata (pdev); + +dw_hdmi_remove (hdmi);
You probably should disable the regulator (if not NULL) here.
drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c line 124
Quoted 13 lines
drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c new file +13
-0+ +return 0 ; +} + +static struct platform_driver ingenic_dw_hdmi_driver = { + .probe = ingenic_dw_hdmi_probe, + .remove = ingenic_dw_hdmi_remove, + .driver = { + .name ="dw-hdmi-ingenic" , + .of_match_table = ingenic_dw_hdmi_dt_ids, + }, +}; +
Nit - remove this blank line too.
Cheers,
-Paul
Quoted 8 lines
drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c new file +5
-1+module_platform_driver (ingenic_dw_hdmi_driver); + +MODULE_DESCRIPTION ("JZ4780 Specific DW-HDMI Driver Extension" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_ALIAS ("platform:dwhdmi-ingenic" ); --2.33.0
Re: [PATCH v8 4/8] drm/ingenic: Add dw-hdmi driver for jz4780
Quoted 7 lines
Am 23.11.2021 um 21:05 schrieb Paul Cercueil <[email protected]>:
Hi Nikolaus,
I keep seeing a few things, sorry.
no problem.
Quoted 130 lines · H. Nikolaus Schaller
Quoted 127 lines
From: 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 addKconfigDRM_INGENIC_DW_HDMI,Makefileand driver code.Signed-off-by Paul Boddie <[email protected]>Signed-off-by Ezequiel Garcia <[email protected]>Signed-off-by H. Nikolaus Schaller <[email protected]>---
drivers/gpu/drm/ingenic/Kconfig | 9 ++ drivers/gpu/drm/ingenic/Makefile | 1 + drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c | 129 ++++++++++++++++++++++ 3 files changed, 139 insertions(+)create mode 100644
drivers/gpu/drm/ingenic/ingenic-dw-hdmi.cdrivers/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 +0
-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
drivers/gpu/drm/ingenic/Makefile +1
-0+obj-$(CONFIG_DRM_INGENIC_DW_HDMI) += ingenic-dw-hdmi.odrivers/gpu/drm/ingenic/ingenic-dw-hdmi.c new file +82
-0@@ -0,0 +1,129 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2011-2013 Freescale Semiconductor, Inc. +* Copyright (C) 2019, 2020 Paul Boddie <[email protected]> +* +* Derived from dw_hdmi-imx.c with i.MX portions removed. +* Probe and remove operations derived from rcar_dw_hdmi.c. +*/ + +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> + +#include <drm/bridge/dw_hdmi.h> +#include <drm/drm_of.h> +#include <drm/drm_print.h> + +static const struct dw_hdmi_mpll_config ingenic_mpll_cfg[] = { + {45250000 , { {0x01e0 ,0x0000 }, {0x21e1 ,0x0000 }, {0x41e2 ,0x0000 } } }, + {92500000 , { {0x0140 ,0x0005 }, {0x2141 ,0x0005 }, {0x4142 ,0x0005 } } }, + {148500000 , { {0x00a0 ,0x000a }, {0x20a1 ,0x000a }, {0x40a2 ,0x000a } } }, + {216000000 , { {0x00a0 ,0x000a }, {0x2001 ,0x000f }, {0x4002 ,0x000f } } }, + { ~0UL , { {0x0000 ,0x0000 }, {0x0000 ,0x0000 }, {0x0000 ,0x0000 } } } +}; + +static const struct dw_hdmi_curr_ctrl ingenic_cur_ctr[] = { +/*pixelclk bpp8 bpp10 bpp12 */ + {54000000 , {0x091c ,0x091c ,0x06dc } }, + {58400000 , {0x091c ,0x06dc ,0x06dc } }, + {72000000 , {0x06dc ,0x06dc ,0x091c } }, + {74250000 , {0x06dc ,0x0b5c ,0x091c } }, + {118800000 , {0x091c ,0x091c ,0x06dc } }, + {216000000 , {0x06dc ,0x0b5c ,0x091c } }, + { ~0UL , {0x0000 ,0x0000 ,0x0000 } }, +}; + +/* +* Resistance term 133Ohm Cfg +* PREEMP config 0.00 +* TX/CK level 10 +*/ +static const struct dw_hdmi_phy_config ingenic_phy_config[] = { +/*pixelclk symbol term vlev */ + {216000000 ,0x800d ,0x0005 ,0x01ad }, + { ~0UL ,0x0000 ,0x0000 ,0x0000 } +}; + +static enum drm_mode_status +ingenic_dw_hdmi_mode_valid (struct dw_hdmi *hdmi,void *data, +const struct drm_display_info *info, +const struct drm_display_mode *mode) +{ +if (mode->clock <13500 ) +return MODE_CLOCK_LOW ; +/* FIXME: Hardware is capable of 270MHz, but setup data is missing. */ +if (mode->clock >216000 ) +return MODE_CLOCK_HIGH ; + +return MODE_OK ; +} + +static struct dw_hdmi_plat_data ingenic_dw_hdmi_plat_data = { + .mpll_cfg = ingenic_mpll_cfg, + .cur_ctr = ingenic_cur_ctr, + .phy_config = ingenic_phy_config, + .mode_valid = ingenic_dw_hdmi_mode_valid, + .output_port =1 , +}; + +static const struct of_device_id ingenic_dw_hdmi_dt_ids[] = { + { .compatible ="ingenic,jz4780-dw-hdmi" }, + {/* Sentinel */ }, +}; +MODULE_DEVICE_TABLE (of, ingenic_dw_hdmi_dt_ids); + +static int ingenic_dw_hdmi_probe (struct platform_device *pdev) +{ +struct dw_hdmi *hdmi; +struct regulator *regulator; +int ret; + + hdmi =dw_hdmi_probe (pdev, &ingenic_dw_hdmi_plat_data); +if (IS_ERR (hdmi))
Quoted 8 lines
drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c line 88
Quoted 6 lines
drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c new file +6
-0+return PTR_ERR (hdmi); + +platform_set_drvdata (pdev, hdmi); + + regulator =devm_regulator_get_optional (&pdev->dev,"hdmi-5v" ); +Nit - you can remove this blank line.
ok.
Quoted 12 lines
drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c line 97
Quoted 10 lines
drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c new file +9
-0+if (IS_ERR (regulator)) { + ret =PTR_ERR (regulator); + +DRM_DEV_ERROR (&pdev->dev,"failed to get hpd regulator: %s (%d)\n" , +"hdmi-5v" , ret); +return ret; + } + + ret =regulator_enable (regulator);You used
devm_regulator_get_optional(), so you are not guaranteed to obtain anything; your "regulator" variable might be a NULL pointer, so you can't just callregulator_enable()without checking it first.
right. I forgot about that.
Quoted 17 lines
Quoted 5 lines
drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c new file +4
-0+if (ret) { +DRM_DEV_ERROR (&pdev->dev,"Failed to enable hpd regulator: %d\n" , + ret); +return ret;drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c line 111
Quoted 10 lines
drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c new file +10
-0+ } + +return 0 ; +} + +static int ingenic_dw_hdmi_remove (struct platform_device *pdev) +{ +struct dw_hdmi *hdmi =platform_get_drvdata (pdev); + +dw_hdmi_remove (hdmi);You probably should disable the regulator (if not NULL) here.
Indeed. Would it be ok to make struct regulator *regulator static or do we need dynamically allocated memory?
Quoted 16 lines
Quoted 4 lines
drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c new file +3
-0+ +return 0 ; +}drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c line 124
Quoted 10 lines
drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c new file +10
-0+ +static struct platform_driver ingenic_dw_hdmi_driver = { + .probe = ingenic_dw_hdmi_probe, + .remove = ingenic_dw_hdmi_remove, + .driver = { + .name ="dw-hdmi-ingenic" , + .of_match_table = ingenic_dw_hdmi_dt_ids, + }, +}; +Nit - remove this blank line too.
ok.
Quoted 13 lines
Cheers,
-PaulQuoted 7 lines
drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c new file +5
-1+module_platform_driver (ingenic_dw_hdmi_driver); + +MODULE_DESCRIPTION ("JZ4780 Specific DW-HDMI Driver Extension" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_ALIAS ("platform:dwhdmi-ingenic" ); --2.33.0
Paul Cercueil
maintainerRe: [PATCH v8 4/8] drm/ingenic: Add dw-hdmi driver for jz4780
Hi Nikolaus,
Quoted 201 lines · H. Nikolaus Schaller
Quoted 7 lines
Am 23.11.2021 um 21:05 schrieb Paul Cercueil <[email protected]>:
Hi Nikolaus,
I keep seeing a few things, sorry.
no problem.
Quoted 153 lines
Quoted 140 lines · H. Nikolaus Schaller
From: 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 addKconfigDRM_INGENIC_DW_HDMI,Makefileand driver code.Signed-off-by Paul Boddie <[email protected]>Signed-off-by Ezequiel Garcia <[email protected]>Signed-off-by H. Nikolaus Schaller <[email protected]>---
drivers/gpu/drm/ingenic/Kconfig | 9 ++ drivers/gpu/drm/ingenic/Makefile | 1 + drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c | 129 ++++++++++++++++++++++ 3 files changed, 139 insertions(+) create mode 100644 drivers/gpu/drm/ingenic/ingenic-dw-hdmi.cdiff --git a/drivers/gpu/drm/ingenic/Kconfig
b/drivers/gpu/drm/ingenic/Kconfig
index3b57f8be007c4..4efc709d77b0a100644
--- a/drivers/gpu/drm/ingenic/Kconfig
+++ b/drivers/gpu/drm/ingenic/Kconfig
@@ -25,4 +25,13 @@ configDRM_INGENIC_IPU
The Image Processing Unit (IPU) will appear as a second primary
plane.
+configDRM_INGENIC_DW_HDMI
+ tristate "Ingenic specific support for Synopsys DW HDMI"
+ depends onMACH_JZ4780
+ selectDRM_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
diff --git a/drivers/gpu/drm/ingenic/Makefile
b/drivers/gpu/drm/ingenic/Makefile
indexd313326bdddbb..f10cc1c5a5f22100644
--- a/drivers/gpu/drm/ingenic/Makefile
+++ b/drivers/gpu/drm/ingenic/Makefile
@@ -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
diff --gita/drivers/gpu/drm/ingenic/ingenic-dw-hdmi.cb/drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c
new file mode 100644
index 0000000000000..c14890d6b9826
---/dev/null
+++b/drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c
@@ -0,0 +1,129 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (C) 2011-2013 Freescale Semiconductor, Inc.
+ * Copyright (C) 2019, 2020 Paul Boddie <[email protected]>
+ *
+ * Derived fromdw_hdmi-imx.cwith i.MX portions removed.
+ * Probe and remove operations derived fromrcar_dw_hdmi.c.
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+
+#include <drm/bridge/dw_hdmi.h>
+#include <drm/drm_of.h>
+#include <drm/drm_print.h>
+
+static const structdw_hdmi_mpll_configingenic_mpll_cfg[] = {
+ { 45250000, { {0x01e0,0x0000}, {0x21e1,0x0000}, {0x41e2,0x0000} } },
+ { 92500000, { {0x0140,0x0005}, {0x2141,0x0005}, {0x4142,0x0005} } },
+ { 148500000, { {0x00a0,0x000a}, {0x20a1,0x000a}, {0x40a2,0x000a} } },
+ { 216000000, { {0x00a0,0x000a}, {0x2001,0x000f}, {0x4002,0x000f} } },
+ { ~0UL, { {0x0000,0x0000}, {0x0000,0x0000}, {0x0000,0x0000} } }
+};
+
+static const structdw_hdmi_curr_ctrlingenic_cur_ctr[] = {
+ /*pixelclk bpp8 bpp10 bpp12 */+ { 54000000, { 0x091c, 0x091c, 0x06dc } }, + { 58400000, { 0x091c, 0x06dc, 0x06dc } }, + { 72000000, { 0x06dc, 0x06dc, 0x091c } }, + { 74250000, { 0x06dc, 0x0b5c, 0x091c } },+ { 118800000, {
0x091c,0x091c,0x06dc} },
+ { 216000000, {0x06dc,0x0b5c,0x091c} },
+ { ~0UL, {0x0000,0x0000,0x0000} },
+};
+
+/*
+ * Resistance term 133Ohm Cfg
+ * PREEMP config 0.00
+ * TX/CK level 10
+ */
+static const structdw_hdmi_phy_configingenic_phy_config[] = {
+ /*pixelclk symbol term vlev */
+ { 216000000,0x800d,0x0005,0x01ad},
+ { ~0UL,0x0000,0x0000,0x0000}
+};
+
+static enumdrm_mode_status+ingenic_dw_hdmi_mode_valid(structdw_hdmi*hdmi, void *data,
+ const structdrm_display_info*info,
+ const structdrm_display_mode*mode)
+{
+ if (mode->clock< 13500)
+ returnMODE_CLOCK_LOW;
+ /* FIXME: Hardware is capable of 270MHz, but setup data is
missing. */
+ if (mode->clock> 216000)
+ returnMODE_CLOCK_HIGH;
+
+ returnMODE_OK;
+}
+
+static structdw_hdmi_plat_dataingenic_dw_hdmi_plat_data= {
+ .mpll_cfg =ingenic_mpll_cfg,
+ .cur_ctr =ingenic_cur_ctr,
+ .phy_config =ingenic_phy_config,
+ .mode_valid =ingenic_dw_hdmi_mode_valid,
+ .output_port = 1,
+};
+
+static const structof_device_idingenic_dw_hdmi_dt_ids[] = {
+ { .compatible = "ingenic,jz4780-dw-hdmi" },
+ { /* Sentinel */ },
+};
+MODULE_DEVICE_TABLE(of,ingenic_dw_hdmi_dt_ids);
+
+static intingenic_dw_hdmi_probe(struct platform_device *pdev)+{
+ structdw_hdmi*hdmi;
+ struct regulator *regulator;
+ int ret;
+Quoted 8 lines
+ hdmi =
dw_hdmi_probe(pdev, &ingenic_dw_hdmi_plat_data);
+ if (IS_ERR(hdmi))
+ returnPTR_ERR(hdmi);
+
+platform_set_drvdata(pdev, hdmi);
+
+ regulator =devm_regulator_get_optional(&pdev->dev, "hdmi-5v");
+Quoted 1 line
Nit - you can remove this blank line.
ok.
Quoted 12 lines
Quoted 11 lines
+ if (
IS_ERR(regulator)) {
+ ret =PTR_ERR(regulator);
+
+ DRM_DEV_ERROR(&pdev->dev, "failed to get hpd regulator: %s
(%d)\n",
+ "hdmi-5v", ret);
+ return ret;
+ }
+
+ ret =regulator_enable(regulator);Quoted 2 lines
You used
devm_regulator_get_optional(), so you are not guaranteed
to obtain anything; your "regulator" variable might be a NULL pointer, so you can't just callregulator_enable()without checking it first.right. I forgot about that.
Quoted 17 lines
Quoted 16 lines
+ if (ret) {
+ DRM_DEV_ERROR(&pdev->dev, "Failed to enable hpd regulator:
%d\n",
+ ret);
+ return ret;
+ }
+
+ return 0;
+}
+
+static intingenic_dw_hdmi_remove(struct platform_device *pdev)+{
+ structdw_hdmi*hdmi =platform_get_drvdata(pdev);
+
+dw_hdmi_remove(hdmi);
Quoted 4 lines
Quoted 1 line
You probably should disable the regulator (if not NULL) here.
Indeed. Would it be ok to make struct regulator *regulator static or do we need dynamically allocated memory?
static non-const is almost always a bad idea, so avoid it.
You can either:
- create a "ingenic_dw_hdmi" struct that will contain a pointer to dw_hdmi and a pointer to the regulator. Instanciate it in the probe with devm_kzalloc() and set the pointers, then set it as the driver data (platform_set_drvdata). In the remove function you can then obtain the pointer to your ingenic_dw_hdmi struct with platform_get_drvdata(), and you can remove the dw_hdmi and unregister the regulator.
- register cleanup functions, using devm_add_action_or_reset(dev, f, priv). When it's time to cleanup, the kernel core will call f(priv) automatically. So you can add a small wrapper around dw_hdmi_remove() and another one around regulator_disable(), and those will be called automatically if your probe function fails, or when the driver is removed. Then you can completely remove the ".remove" callback. There are a few examples of these in the ingenic-drm-drv.c if you want to take a look.
Cheers,
-Paul
Quoted 33 lines
Quoted 15 lines
Quoted 14 lines
+
+ return 0;
+}
+
+static structplatform_driveringenic_dw_hdmi_driver= {
+ .probe =ingenic_dw_hdmi_probe,
+ .remove =ingenic_dw_hdmi_remove,
+ .driver = {
+ .name = "dw-hdmi-ingenic",
+ .of_match_table =ingenic_dw_hdmi_dt_ids,
+ },
+};
+Quoted 1 line
Nit - remove this blank line too.
ok.
Quoted 13 lines
Cheers,
-PaulQuoted 7 lines
+module_platform_driver(ingenic_dw_hdmi_driver);
+
+MODULE_DESCRIPTION("JZ4780 Specific DW-HDMI Driver Extension"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:dwhdmi-ingenic");
--
2.33.0
Re: [PATCH v8 4/8] drm/ingenic: Add dw-hdmi driver for jz4780
Hi Paul,
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
You probably should disable the regulator (if not NULL) here.
Indeed. Would it be ok to make struct regulator *regulator static or do we need dynamically allocated memory?
static non-const is almost always a bad idea, so avoid it.
Well some years ago it was a perfectly simple solution that still works... But I asked because I had a lot of doubt.
Quoted 6 lines
You can either:
- create a "
ingenic_dw_hdmi" struct that will contain a pointer todw_hdmiand a pointer to the regulator. Instanciate it in the probe withdevm_kzalloc()and set the pointers, then set it as the driver data (platform_set_drvdata). In the remove function you can then obtain the pointer to youringenic_dw_hdmistruct withplatform_get_drvdata(), and you can remove thedw_hdmiand unregister the regulator.- register cleanup functions, using
devm_add_action_or_reset(dev, f, priv). When it's time to cleanup, the kernel core will call f(priv) automatically. So you can add a small wrapper arounddw_hdmi_remove()and another one aroundregulator_disable(), and those will be called automatically if your probe function fails, or when the driver is removed. Then you can completely remove the ".remove" callback. There are a few examples of these in theingenic-drm-drv.cif you want to take a look.
The second one turned out to be cleaner to handle special cases like if there is no regulator. We just register the disabler only if there is a regulator and enable succeeds.
So v9 is coming now.
BR and thanks,
Nikolaus
PATCH v8 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 v8 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 | 83 +++++++++++++++++++++++++++-- 1 file changed, 80 insertions(+), 3 deletions(-)
arch/mips/boot/dts/ingenic/ci20.dts +80 -3
@@ -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,13 @@ &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>; + <&cgu JZ4780_CLK_SSIPLL>, + <0>; + assigned-clock-rates = <48000000>, <0>, <54000000>, <0>, <27000000>; }; &tcu {
@@ -509,6 +534,19 @@ pins_i2c4: i2c4 { bias-disable; }; + pins_hdmi_ddc: hdmi_ddc { + function = "hdmi-ddc"; + groups = "hdmi-ddc"; + bias-disable; + }; + + /* switch to PF25 as gpio driving DDC_SDA low */ + pins_hdmi_ddc_unwedge: 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 +577,42 @@ pins_mmc1: mmc1 { bias-disable; }; }; + +&hdmi { + status = "okay"; + + pinctrl-names = "default", "unwedge"; + pinctrl-0 = <&pins_hdmi_ddc>; + pinctrl-1 = <&pins_hdmi_ddc_unwedge>; + + 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
Paul Cercueil
maintainerRe: [PATCH v8 6/8] MIPS: DTS: CI20: Add DT nodes for HDMI setup
Hi Nikolaus,
Quoted 60 lines · H. Nikolaus Schaller
From: 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 connectionsSigned-off-by Paul Boddie <[email protected]>Signed-off-by H. Nikolaus Schaller <[email protected]>--- arch/mips/boot/dts/ingenic/ci20.dts | 83 +++++++++++++++++++++++++++-- 1 file changed, 80 insertions(+), 3 deletions(-)arch/mips/boot/dts/ingenic/ci20.dts +23
-0@@ -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,13 @@ &cgu { * precision. */
arch/mips/boot/dts/ingenic/ci20.dts &cgu { · line 145
Quoted 10 lines
arch/mips/boot/dts/ingenic/ci20.dts +4
-3assigned-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>; + <&cgu JZ4780_CLK_SSIPLL>, + <0>;
Nit - you can remove the last <0>, it will be the default.
Quoted 10 lines
arch/mips/boot/dts/ingenic/ci20.dts +3
-0+ assigned-clock-rates = <48000000>, <0>, <54000000>, <0>, <27000000>; }; &tcu {@@ -509,6 +534,19 @@ pins_i2c4: i2c4 { bias-disable; }; + pins_hdmi_ddc: hdmi_ddc { + function = "hdmi-ddc";
arch/mips/boot/dts/ingenic/ci20.dts pins_i2c4: i2c4 { · line 548
Quoted 10 lines
arch/mips/boot/dts/ingenic/ci20.dts +10
-0+ groups = "hdmi-ddc"; + bias-disable; + }; + + /* switch to PF25 as gpio driving DDC_SDA low */ + pins_hdmi_ddc_unwedge: hdmi_ddc { + function = "hdmi-ddc"; + groups = "hdmi-ddc"; + bias-disable; + };
Your pins_hdmi_ddc and pins_hdmi_ddc_unwedge are the exact same? You could just use the former and pass it to both pinctrl-0 and pinctrl-1.
Cheers,
-Paul
Quoted 50 lines
arch/mips/boot/dts/ingenic/ci20.dts +40
-1+ pins_nemc: nemc { function = "nemc"; groups = "nemc-data", "nemc-cle-ale", "nemc-rd-we", "nemc-frd-fwe";@@ -539,3 +577,42 @@ pins_mmc1: mmc1 { bias-disable; }; }; + +&hdmi { + status = "okay"; + + pinctrl-names = "default", "unwedge"; + pinctrl-0 = <&pins_hdmi_ddc>; + pinctrl-1 = <&pins_hdmi_ddc_unwedge>; + + 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>; + }; + }; +}; --2.33.0
Re: [PATCH v8 6/8] MIPS: DTS: CI20: Add DT nodes for HDMI setup
Quoted 65 lines
Am 23.11.2021 um 21:10 schrieb Paul Cercueil <[email protected]>:
Hi Nikolaus,
Quoted 58 lines · H. Nikolaus Schaller
From: 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 connectionsSigned-off-by Paul Boddie <[email protected]>Signed-off-by H. Nikolaus Schaller <[email protected]>---
arch/mips/boot/dts/ingenic/ci20.dts| 83 +++++++++++++++++++++++++++--1 file changed, 80 insertions(+), 3 deletions(-)arch/mips/boot/dts/ingenic/ci20.dts +25
-1@@ -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,13 @@ &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>;
Quoted 8 lines
arch/mips/boot/dts/ingenic/ci20.dts &cgu { · line 145
Quoted 6 lines
arch/mips/boot/dts/ingenic/ci20.dts +2
-2assigned-clock-parents = <0>, <&cgu JZ4780_CLK_RTCLK>, <&cgu JZ4780_CLK_MPLL>, - <&cgu JZ4780_CLK_SSIPLL>; - assigned-clock-rates = <48000000>, <0>, <54000000>; + <&cgu JZ4780_CLK_SSIPLL>, + <0>;Nit - you can remove the last <0>, it will be the default.
Well, it might make life easier for the next addition but I've removed it.
Quoted 13 lines
Quoted 13 lines
arch/mips/boot/dts/ingenic/ci20.dts +7
-0+ assigned-clock-rates = <48000000>, <0>, <54000000>, <0>, <27000000>; }; &tcu {@@ -509,6 +534,19 @@ pins_i2c4: i2c4 { bias-disable; }; + pins_hdmi_ddc: hdmi_ddc { + function = "hdmi-ddc"; + groups = "hdmi-ddc"; + bias-disable; + }; +
Quoted 8 lines
arch/mips/boot/dts/ingenic/ci20.dts pins_i2c4: i2c4 { · line 548
Quoted 6 lines
arch/mips/boot/dts/ingenic/ci20.dts +6
-0+ /* switch to PF25 as gpio driving DDC_SDA low */ + pins_hdmi_ddc_unwedge: hdmi_ddc { + function = "hdmi-ddc"; + groups = "hdmi-ddc"; + bias-disable; + };Your
pins_hdmi_ddcandpins_hdmi_ddc_unwedgeare the exact same? You could just use the former and pass it to both pinctrl-0 and pinctrl-1.
This was forgotten to remove. We do not make use of the unwedge feature because I could not find out how to use pinctrl to switch this to gpio25 and drive it low. And I always had a revert for this in my test tree and we haven't seen a stuck DDC so far. Therefore I remove it (and leave it as maybe-to-to in my tree).
Quoted 53 lines
Cheers,
-PaulQuoted 49 lines
arch/mips/boot/dts/ingenic/ci20.dts +40
-1+ pins_nemc: nemc { function = "nemc"; groups = "nemc-data", "nemc-cle-ale", "nemc-rd-we", "nemc-frd-fwe";@@ -539,3 +577,42 @@ pins_mmc1: mmc1 { bias-disable; }; }; + +&hdmi { + status = "okay"; + + pinctrl-names = "default", "unwedge"; + pinctrl-0 = <&pins_hdmi_ddc>; + pinctrl-1 = <&pins_hdmi_ddc_unwedge>; + + 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>; + }; + }; +}; --2.33.0
Re: [PATCH v8 6/8] MIPS: DTS: CI20: Add DT nodes for HDMI setup
Hi Nikolaus,
Quoted 23 lines · H. Nikolaus Schaller
Quoted 14 lines
Am 23.11.2021 um 21:10 schrieb Paul Cercueil <[email protected]>:
Quoted 12 lines · H. Nikolaus Schaller
+ assigned-clock-rates = <48000000>, <0>, <54000000>, <0>, <27000000>;
};
&tcu {arch/mips/boot/dts/ingenic/ci20.dts +6
-0@@ -509,6 +534,19 @@ pins_i2c4: i2c4 { bias-disable; }; + pins_hdmi_ddc: hdmi_ddc { + function = "hdmi-ddc"; + groups = "hdmi-ddc"; + bias-disable; + }; +Quoted 8 lines
arch/mips/boot/dts/ingenic/ci20.dts pins_i2c4: i2c4 { · line 548
Quoted 6 lines
arch/mips/boot/dts/ingenic/ci20.dts +6
-0+ /* switch to PF25 as gpio driving DDC_SDA low */ + pins_hdmi_ddc_unwedge: hdmi_ddc { + function = "hdmi-ddc"; + groups = "hdmi-ddc"; + bias-disable; + };Your
pins_hdmi_ddcandpins_hdmi_ddc_unwedgeare the exact same? You could just use the former and pass it to both pinctrl-0 and pinctrl-1.
Quoted 1 line
This was forgotten to remove. We do not make use of the unwedge feature because I could not find out how to use pinctrl to switch this to gpio25 and drive it low.
Using gpio-hog?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Re: [PATCH v8 6/8] MIPS: DTS: CI20: Add DT nodes for HDMI setup
Hi Geert,
Quoted 28 lines
Am 24.11.2021 um 17:21 schrieb Geert Uytterhoeven <[email protected]>:
Hi Nikolaus,
Quoted 23 lines · H. Nikolaus Schaller
Quoted 22 lines
Am 23.11.2021 um 21:10 schrieb Paul Cercueil <[email protected]>:
Quoted 8 lines · H. Nikolaus Schaller
+ assigned-clock-rates = <48000000>, <0>, <54000000>, <0>, <27000000>;
};
&tcu {arch/mips/boot/dts/ingenic/ci20.dts +2
-0@@ -509,6 +534,19 @@ pins_i2c4: i2c4 { bias-disable; }; + pins_hdmi_ddc: hdmi_ddc { + function = "hdmi-ddc";arch/mips/boot/dts/ingenic/ci20.dts pins_i2c4: i2c4 { · line 547
Quoted 10 lines
arch/mips/boot/dts/ingenic/ci20.dts +10
-0+ groups = "hdmi-ddc"; + bias-disable; + }; + + /* switch to PF25 as gpio driving DDC_SDA low */ + pins_hdmi_ddc_unwedge: hdmi_ddc { + function = "hdmi-ddc"; + groups = "hdmi-ddc"; + bias-disable; + };Your
pins_hdmi_ddcandpins_hdmi_ddc_unwedgeare the exact same? You could just use the former and pass it to both pinctrl-0 and pinctrl-1.
Quoted 3 lines
Quoted 1 line
This was forgotten to remove. We do not make use of the unwedge feature because I could not find out how to use pinctrl to switch this to gpio25 and drive it low.
Using gpio-hog?
well, AFAIR it activates the gpio permanently and is a propery of the gpio controller and not of pinmux. The driver assumes it can use pinmux state switching to drive the DDC_SDA line low on demand.
Since it is unlikely that we need it at all (and we have no test case that it works) I think we simply can leave this driver feature unused unless we get a test case.
BR and thanks,
Nikolaus
Re: [PATCH v8 6/8] MIPS: DTS: CI20: Add DT nodes for HDMI setup
Hi Nikolaus,
Quoted 25 lines · H. Nikolaus Schaller
Quoted 25 lines
Am 24.11.2021 um 17:21 schrieb Geert Uytterhoeven <[email protected]>:
Quoted 23 lines · H. Nikolaus Schaller
Quoted 22 lines
Am 23.11.2021 um 21:10 schrieb Paul Cercueil <[email protected]>:
Quoted 8 lines · H. Nikolaus Schaller
+ assigned-clock-rates = <48000000>, <0>, <54000000>, <0>, <27000000>;
};
&tcu {arch/mips/boot/dts/ingenic/ci20.dts +2
-0@@ -509,6 +534,19 @@ pins_i2c4: i2c4 { bias-disable; }; + pins_hdmi_ddc: hdmi_ddc { + function = "hdmi-ddc";arch/mips/boot/dts/ingenic/ci20.dts pins_i2c4: i2c4 { · line 547
Quoted 10 lines
arch/mips/boot/dts/ingenic/ci20.dts +10
-0+ groups = "hdmi-ddc"; + bias-disable; + }; + + /* switch to PF25 as gpio driving DDC_SDA low */ + pins_hdmi_ddc_unwedge: hdmi_ddc { + function = "hdmi-ddc"; + groups = "hdmi-ddc"; + bias-disable; + };Your
pins_hdmi_ddcandpins_hdmi_ddc_unwedgeare the exact same? You could just use the former and pass it to both pinctrl-0 and pinctrl-1.
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
This was forgotten to remove. We do not make use of the unwedge feature because I could not find out how to use pinctrl to switch this to gpio25 and drive it low.
Using gpio-hog?
well, AFAIR it activates the gpio permanently and is a propery of the gpio controller and not of pinmux.
Yes, hogs are permanently (ignoring DT overlay tricks).
Quoted 1 line
The driver assumes it can use pinmux state switching to drive the
DDC_SDAline low on demand.
Add an optional wedge-gpios property for switching?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Re: [PATCH v8 6/8] MIPS: DTS: CI20: Add DT nodes for HDMI setup
Hi Gert,
Quoted 34 lines
Am 25.11.2021 um 08:58 schrieb Geert Uytterhoeven <[email protected]>:
Hi Nikolaus,
Quoted 29 lines · H. Nikolaus Schaller
Quoted 28 lines
Am 24.11.2021 um 17:21 schrieb Geert Uytterhoeven <[email protected]>:
Quoted 23 lines · H. Nikolaus Schaller
Quoted 14 lines
Am 23.11.2021 um 21:10 schrieb Paul Cercueil <[email protected]>:
Quoted 12 lines · H. Nikolaus Schaller
+ assigned-clock-rates = <48000000>, <0>, <54000000>, <0>, <27000000>;
};
&tcu {arch/mips/boot/dts/ingenic/ci20.dts +6
-0@@ -509,6 +534,19 @@ pins_i2c4: i2c4 { bias-disable; }; + pins_hdmi_ddc: hdmi_ddc { + function = "hdmi-ddc"; + groups = "hdmi-ddc"; + bias-disable; + }; +Quoted 8 lines
arch/mips/boot/dts/ingenic/ci20.dts pins_i2c4: i2c4 { · line 548
Quoted 6 lines
arch/mips/boot/dts/ingenic/ci20.dts +6
-0+ /* switch to PF25 as gpio driving DDC_SDA low */ + pins_hdmi_ddc_unwedge: hdmi_ddc { + function = "hdmi-ddc"; + groups = "hdmi-ddc"; + bias-disable; + };Your
pins_hdmi_ddcandpins_hdmi_ddc_unwedgeare the exact same? You could just use the former and pass it to both pinctrl-0 and pinctrl-1.Quoted 1 line
This was forgotten to remove. We do not make use of the unwedge feature because I could not find out how to use pinctrl to switch this to gpio25 and drive it low.
Using gpio-hog?
Quoted 7 lines
Quoted 1 line
well, AFAIR it activates the gpio permanently and is a propery of the gpio controller and not of pinmux.
Yes, hogs are permanently (ignoring DT overlay tricks).
Quoted 1 line
The driver assumes it can use pinmux state switching to drive the
DDC_SDAline low on demand.Add an optional wedge-gpios property for switching?
That would touch the synopsys driver core and does not appear to be required for jz4780 operation. We just add a separate driver specialisation for some parameters and set up the device tree.
So it is beyond the scope of our work (neither needed, nor can we test it). If you want to add that, please go ahead.
BR and thanks,
Nikolaus
Paul Cercueil
maintainerRe: [PATCH v8 6/8] MIPS: DTS: CI20: Add DT nodes for HDMI setup
In reply to Geert UytterhoevenHi Geert,
Quoted 42 lines · Geert Uytterhoeven
Hi Nikolaus,
Quoted 31 lines · H. Nikolaus Schaller
Quoted 1 line
Am 24.11.2021 um 17:21 schrieb Geert Uytterhoeven
Quoted 1 line
On Wed, Nov 24, 2021 at 5:19 PM H. Nikolaus Schaller
Quoted 1 line · <[email protected]> wrote:
Quoted 1 line
Quoted 1 line
Am 23.11.2021 um 21:10 schrieb Paul Cercueil
Quoted 1 line
Quoted 1 line
Quoted 1 line
Le mar., nov. 23 2021 at 19:13:59 +0100, H. Nikolaus Schaller
Quoted 1 line · <[email protected]> a écrit :
Quoted 1 line
Quoted 1 line
Quoted 1 line
+ assigned-clock-rates = <48000000>, <0>, <54000000>, <0>,
<27000000>;
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
};
&tcu {arch/mips/boot/dts/ingenic/ci20.dts +6
-0@@ -509,6 +534,19 @@ pins_i2c4: i2c4 { bias-disable; }; + pins_hdmi_ddc: hdmi_ddc { + function = "hdmi-ddc"; + groups = "hdmi-ddc"; + bias-disable; + }; +Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
arch/mips/boot/dts/ingenic/ci20.dts pins_i2c4: i2c4 { · line 548
Quoted 6 lines
arch/mips/boot/dts/ingenic/ci20.dts +6
-0+ /* switch to PF25 as gpio driving DDC_SDA low */ + pins_hdmi_ddc_unwedge: hdmi_ddc { + function = "hdmi-ddc"; + groups = "hdmi-ddc"; + bias-disable; + };Your
pins_hdmi_ddcandpins_hdmi_ddc_unwedgeare the exactsame? You could just use the former and pass it to both pinctrl-0 and pinctrl-1.
Quoted 1 line
Quoted 1 line
Quoted 7 lines
Quoted 1 line
Quoted 1 line
This was forgotten to remove. We do not make use of the unwedge
feature because I could not find out how to use pinctrl to switch this to gpio25 and drive it low.
Quoted 2 lines
Using gpio-hog?
well, AFAIR it activates the gpio permanently and is a propery of
the gpio controller and not of pinmux.
Quoted 6 lines
Yes, hogs are permanently (ignoring DT overlay tricks).
Quoted 2 lines
The driver assumes it can use pinmux state switching to drive the
DDC_SDAline low on demand.Add an optional wedge-gpios property for switching?
I think you can use a pinctrl state as well, specifying the pin and the 'output-low' property.
-Paul
Re: [PATCH v8 6/8] MIPS: DTS: CI20: Add DT nodes for HDMI setup
Hi Paul,
Quoted 47 lines · Paul Cercueil
Quoted 45 lines · Geert Uytterhoeven
Quoted 32 lines · H. Nikolaus Schaller
Quoted 1 line
Am 24.11.2021 um 17:21 schrieb Geert Uytterhoeven
Quoted 1 line
On Wed, Nov 24, 2021 at 5:19 PM H. Nikolaus Schaller
Quoted 1 line · <[email protected]> wrote:
Quoted 1 line
Quoted 1 line
Am 23.11.2021 um 21:10 schrieb Paul Cercueil
Quoted 1 line
Quoted 1 line
Quoted 1 line
Le mar., nov. 23 2021 at 19:13:59 +0100, H. Nikolaus Schaller
Quoted 1 line · <[email protected]> a écrit :
Quoted 1 line
Quoted 1 line
Quoted 1 line
+ assigned-clock-rates = <48000000>, <0>, <54000000>, <0>,
<27000000>;
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
};
&tcu {(quoted diff) +6
-0@@ -509,6 +534,19 @@ pins_i2c4: i2c4 { bias-disable; }; + pins_hdmi_ddc: hdmi_ddc { + function = "hdmi-ddc"; + groups = "hdmi-ddc"; + bias-disable; + }; +Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Review pins_i2c4: i2c4 { · line 547
Quoted 6 lines
(quoted diff) +6
-0+ /* switch to PF25 as gpio driving DDC_SDA low */ + pins_hdmi_ddc_unwedge: hdmi_ddc { + function = "hdmi-ddc"; + groups = "hdmi-ddc"; + bias-disable; + };Your
pins_hdmi_ddcandpins_hdmi_ddc_unwedgeare the exactsame? You could just use the former and pass it to both pinctrl-0 and pinctrl-1.
Quoted 1 line
Quoted 1 line
Quoted 8 lines
Quoted 1 line
Quoted 1 line
This was forgotten to remove. We do not make use of the unwedge
feature because I could not find out how to use pinctrl to switch this to gpio25 and drive it low.
Quoted 2 lines
Using gpio-hog?
well, AFAIR it activates the gpio permanently and is a propery of
the gpio controller and not of pinmux.Yes, hogs are permanently (ignoring DT overlay tricks).
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
The driver assumes it can use pinmux state switching to drive the
DDC_SDAline low on demand.Add an optional wedge-gpios property for switching?
I think you can use a pinctrl state as well, specifying the pin and the 'output-low' property.
Yes, if the pin controller supports that. From Niklaus' emails, I was under the impression it doesn't.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Re: [PATCH v8 6/8] MIPS: DTS: CI20: Add DT nodes for HDMI setup
Hi Geert,
Quoted 8 lines
Am 25.11.2021 um 10:13 schrieb Geert Uytterhoeven <[email protected]>:
Quoted 3 lines
I think you can use a pinctrl state as well, specifying the pin and the 'output-low' property.
Yes, if the pin controller supports that. From Niklaus' emails, I was under the impression it doesn't.
Well, it look as as if ingenic,pinctrl.yaml does support output-low but I wasn't aware of that. Haven't seen before...
So it might be possible to add it, but IMHO this can be left for future study (by someone with spare time to find and build a test scenario - it might involve adding hardware to tap the DDC signals between CI20 board and monitor with an oscilloscope).
BR and thanks,
Nikolaus
PATCH v8 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 v8 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
Paul Cercueil
maintainerHi Nikolaus,
I think if you can fix the last few things I commented on, and I get an ACK from Rob for the Device Tree related patches, then it will be ready to merge.
Cheers,
-Paul
Quoted 138 lines · H. Nikolaus Schaller
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 | 76 +++++++++++ .../display/bridge/synopsys,dw-hdmi.yaml | 3 + arch/mips/boot/dts/ingenic/ci20.dts | 83 ++++++++++- 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 | 129 ++++++++++++++++++ 13 files changed, 444 insertions(+), 9 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,
Quoted 5 lines
Am 23.11.2021 um 21:12 schrieb Paul Cercueil <[email protected]>:
Hi Nikolaus,
I think if you can fix the last few things I commented on, and I get an ACK from Rob for the Device Tree related patches, then it will be ready to merge.
Fine! Especially for finding the NULL regulator risk.
Will do in the next days.
For the unwedge pinmux I have to check if we need it at all.
BR and thanks,
Nikolaus
Quoted 96 lines
Cheers,
-PaulQuoted 88 lines · H. Nikolaus Schaller
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.yamland 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-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 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 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 | 76 +++++++++++ .../display/bridge/synopsys,dw-hdmi.yaml | 3 + arch/mips/boot/dts/ingenic/ci20.dts | 83 ++++++++++- 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 | 129 ++++++++++++++++++ 13 files changed, 444 insertions(+), 9 deletions(-)create mode 100644
Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yamlcreate mode 100644drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c
--
2.33.0
Hi Paul,
Quoted 6 lines
Am 23.11.2021 um 21:44 schrieb H. Nikolaus Schaller <[email protected]>:
Hi Paul,
Quoted 2 lines
Am 23.11.2021 um 21:12 schrieb Paul Cercueil <[email protected]>:
Quoted 8 lines
Quoted 3 lines
Hi Nikolaus,
I think if you can fix the last few things I commented on, and I get an ACK from Rob for the Device Tree related patches, then it will be ready to merge.
Fine! Especially for finding the NULL regulator risk.
Will do in the next days.
For the unwedge pinmux I have to check if we need it at all.
No. It is only needed by the driver to take care of for a special potential hardware hickup. The current code does nothing and I have removed it and everything still works as before.
There remains only one question for a v9: can we store the (single) regulator reference in a static variable or should we define a struct and allocate memory in patch 4/8?
BR and thanks,
Nikolaus