From: Rob Herring <robh@kernel.org>
To: Maxime Ripard <maxime@cerno.tech>
Cc: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>,
Eric Anholt <eric@anholt.net>,
dri-devel@lists.freedesktop.org,
linux-rpi-kernel@lists.infradead.org,
bcm-kernel-feedback-list@broadcom.com,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Dave Stevenson <dave.stevenson@raspberrypi.com>,
Tim Gover <tim.gover@raspberrypi.com>,
Phil Elwell <phil@raspberrypi.com>,
devicetree@vger.kernel.org
Subject: Re: [PATCH 88/89] dt-bindings: display: vc4: hdmi: Add BCM2711 HDMI controllers bindings
Date: Tue, 25 Feb 2020 12:24:10 -0600 [thread overview]
Message-ID: <20200225182410.GA7661@bogus> (raw)
In-Reply-To: <4c21dda4f0b73977de1e54d408d7bf6bf3b6d238.1582533919.git-series.maxime@cerno.tech>
On Mon, Feb 24, 2020 at 10:07:30AM +0100, Maxime Ripard wrote:
> The HDMI controllers found in the BCM2711 SoC need some adjustments to the
> bindings, especially since the registers have been shuffled around in more
> register ranges.
>
> Cc: Rob Herring <robh+dt@kernel.org>
> Cc: devicetree@vger.kernel.org
> Signed-off-by: Maxime Ripard <maxime@cerno.tech>
> ---
> Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
> 1 file changed, 109 insertions(+), 9 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml
> index 52b3cdac0bdf..a9d24e1cf684 100644
> --- a/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml
> +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml
> @@ -11,24 +11,58 @@ maintainers:
>
> properties:
> compatible:
> - const: brcm,bcm2835-hdmi
> + enum:
> + - brcm,bcm2835-hdmi
> + - brcm,bcm2711-hdmi0
> + - brcm,bcm2711-hdmi1
>
> reg:
> + oneOf:
> + - items:
> + - description: HDMI register range
> + - description: HD register range
> +
> + - items:
> + - description: HDMI controller register range
> + - description: DVP register range
> + - description: HDMI PHY register range
> + - description: Rate Manager register range
> + - description: Packet RAM register range
> + - description: Metadata RAM register range
> + - description: CSC register range
> + - description: CEC register range
> + - description: HD register range
> +
> + reg-names:
> items:
> - - description: HDMI register range
> - - description: HD register range
> + - const: hdmi
> + - const: dvp
> + - const: phy
> + - const: rm
> + - const: packet
> + - const: metadata
> + - const: csc
> + - const: cec
> + - const: hd
Don't you want 'hd' 2nd or need to define the 2 entry case separately?
Really, I think this should be 2 files. All but interrupts and ddc have
a difference.
>
> interrupts:
> minItems: 2
>
> clocks:
> - items:
> - - description: The pixel clock
> - - description: The HDMI state machine clock
> + oneOf:
> + - items:
> + - description: The pixel clock
> + - description: The HDMI state machine clock
> +
> + - items:
> + - description: The HDMI state machine clock
>
> clock-names:
> - items:
> - - const: pixel
> + oneOf:
> + - items:
> + - const: pixel
> + - const: hdmi
> +
> - const: hdmi
>
> ddc:
> @@ -51,15 +85,54 @@ properties:
> dma-names:
> const: audio-rx
>
> + resets:
> + maxItems: 1
> +
> required:
> - compatible
> - reg
> - - interrupts
> - clocks
> - ddc
>
> additionalProperties: false
>
> +if:
> + properties:
> + compatible:
> + contains:
> + enum:
> + - brcm,bcm2711-hdmi0
> + - brcm,bcm2711-hdmi1
> +
> +then:
> + properties:
> + reg:
> + minItems: 9
> +
> + clocks:
> + maxItems: 1
> +
> + clock-names:
> + maxItems: 1
> +
> + required:
> + - reg-names
> + - resets
> +
> +else:
> + properties:
> + reg:
> + maxItems: 2
> +
> + clocks:
> + minItems: 2
> +
> + clock-names:
> + minItems: 2
> +
> + required:
> + - interrupts
> +
> examples:
> - |
> #include <dt-bindings/clock/bcm2835.h>
> @@ -77,4 +150,31 @@ examples:
> clock-names = "pixel", "hdmi";
> };
>
> + - |
> + hdmi0: hdmi@7ef00700 {
> + compatible = "brcm,bcm2711-hdmi0";
> + reg = <0x7ef00700 0x300>,
> + <0x7ef00300 0x200>,
> + <0x7ef00f00 0x80>,
> + <0x7ef00f80 0x80>,
> + <0x7ef01b00 0x200>,
> + <0x7ef01f00 0x400>,
> + <0x7ef00200 0x80>,
> + <0x7ef04300 0x100>,
> + <0x7ef20000 0x100>;
> + reg-names = "hdmi",
> + "dvp",
> + "phy",
> + "rm",
> + "packet",
> + "metadata",
> + "csc",
> + "cec",
> + "hd";
> + clocks = <&firmware_clocks 13>;
> + clock-names = "hdmi";
> + resets = <&dvp 0>;
> + ddc = <&ddc0>;
> + };
> +
> ...
> --
> git-series 0.9.1
prev parent reply other threads:[~2020-02-25 18:24 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.6c896ace9a5a7840e9cec008b553cbb004ca1f91.1582533919.git-series.maxime@cerno.tech>
2020-02-24 9:06 ` [PATCH 01/89] dt-bindings: i2c: brcmstb: Convert the BRCMSTB binding to a schema Maxime Ripard
2020-02-24 17:40 ` Florian Fainelli
2020-02-25 18:14 ` Rob Herring
2020-03-10 10:07 ` Wolfram Sang
2020-03-10 10:07 ` Wolfram Sang
2020-02-24 9:06 ` [PATCH 02/89] dt-bindings: i2c: brcmstb: Add BCM2711 BSC/AUTO-I2C binding Maxime Ripard
2020-02-24 17:48 ` Florian Fainelli
2020-02-25 18:15 ` Rob Herring
2020-03-10 10:07 ` Wolfram Sang
2020-02-24 9:06 ` [PATCH 06/89] dt-bindings: clock: Add a binding for the RPi Firmware clocks Maxime Ripard
2020-02-25 18:16 ` Rob Herring
2020-03-12 23:14 ` Stephen Boyd
2020-02-24 9:06 ` [PATCH 26/89] dt-bindings: clock: Add BCM2711 DVP binding Maxime Ripard
2020-02-25 18:17 ` Rob Herring
2020-02-24 9:06 ` [PATCH 27/89] clk: bcm: Add BCM2711 DVP driver Maxime Ripard
2020-03-13 1:00 ` Stephen Boyd
2020-03-23 10:56 ` Maxime Ripard
2020-03-25 2:20 ` Stephen Boyd
2020-02-24 9:06 ` [PATCH 29/89] dt-bindings: display: Convert VC4 bindings to schemas Maxime Ripard
2020-02-24 18:41 ` Rob Herring
2020-02-25 11:54 ` Maxime Ripard
2020-02-25 14:02 ` Rob Herring
2020-02-24 9:06 ` [PATCH 30/89] dt-bindings: display: vc4: dpi: Add missing clock-names property Maxime Ripard
2020-02-25 18:17 ` Rob Herring
2020-02-24 9:06 ` [PATCH 31/89] dt-bindings: display: vc4: dsi: Add missing clock properties Maxime Ripard
2020-02-25 18:18 ` Rob Herring
2020-02-24 9:06 ` [PATCH 32/89] dt-bindings: display: vc4: hdmi: Add missing clock-names property Maxime Ripard
2020-02-25 18:18 ` Rob Herring
2020-02-24 9:06 ` [PATCH 33/89] dt-bindings: display: vc4: Document BCM2711 VC5 Maxime Ripard
2020-02-25 18:18 ` Rob Herring
2020-02-24 9:07 ` [PATCH 59/89] dt-bindings: display: vc4: pv: Add BCM2711 pixel valves Maxime Ripard
2020-02-25 18:19 ` Rob Herring
2020-02-24 9:07 ` [PATCH 88/89] dt-bindings: display: vc4: hdmi: Add BCM2711 HDMI controllers bindings Maxime Ripard
2020-02-25 18:24 ` Rob Herring [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200225182410.GA7661@bogus \
--to=robh@kernel.org \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=dave.stevenson@raspberrypi.com \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=eric@anholt.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=maxime@cerno.tech \
--cc=nsaenzjulienne@suse.de \
--cc=phil@raspberrypi.com \
--cc=tim.gover@raspberrypi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).