| Message ID | 20171230210203.24115-7-jernej.skrabec@siol.net |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | drm/sun4i: Add A83T HDMI support | expand |
On Sat, Dec 30, 2017 at 10:01:58PM +0100, Jernej Skrabec wrote: > This commit adds all necessary compatibles and descriptions needed to > implement A83T HDMI pipeline. > > Mixer is already properly described, so only compatible is added. > > However, A83T TCON1, which is connected to HDMI, doesn't have channel 0, > contrary to all TCONs currently described. Because of that, TCON > documentation is extended. > > A83T features Synopsys DW HDMI controller with a custom PHY which looks > like Synopsys Gen2 PHY with few additions. Since there is no > documentation, needed properties were found out through experimentation > and reading BSP code. > > At the end, example is added for newer SoCs, which features DE2 and DW > HDMI. > > Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> > --- > .../bindings/display/sunxi/sun4i-drm.txt | 188 ++++++++++++++++++++- > 1 file changed, 181 insertions(+), 7 deletions(-) > > diff --git a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt > index 9f073af4c711..3eca258096a5 100644 > --- a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt > +++ b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt > @@ -64,6 +64,40 @@ Required properties: > first port should be the input endpoint. The second should be the > output, usually to an HDMI connector. > > +DWC HDMI TX Encoder > +----------------------------- > + > +The HDMI transmitter is a Synopsys DesignWare HDMI 1.4 TX controller IP > +with Allwinner's own PHY IP. It supports audio and video outputs and CEC. > + > +These DT bindings follow the Synopsys DWC HDMI TX bindings defined in > +Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt with the > +following device-specific properties. > + > +Required properties: > + > + - compatible: value must be one of: > + * "allwinner,sun8i-a83t-dw-hdmi" > + - reg: two pairs of base address and size of memory-mapped region, first > + for controller and second for PHY > + registers. Seems like the phy should be a separate node and use the phy binding. You can use the phy binding even if you don't use the kernel phy framework... > + - reg-io-width: See dw_hdmi.txt. Shall be 1. > + - interrupts: HDMI interrupt number > + - clocks: phandles to the clocks feeding the HDMI encoder > + * iahb: the HDMI bus clock > + * isfr: the HDMI register clock > + * tmds: the HDMI tmds clock > + - clock-names: the clock names mentioned above > + - resets: phandles to the reset controllers driving the encoder > + * ctrl: the reset line for the controller > + * phy: the reset line for the PHY > + - reset-names: the reset names mentioned above > + > + - ports: A ports node with endpoint definitions as defined in > + Documentation/devicetree/bindings/media/video-interfaces.txt. The > + first port should be the input endpoint. The second should be the > + output, usually to an HDMI connector. > + > TV Encoder > ---------- > > @@ -94,18 +128,17 @@ Required properties: > * allwinner,sun7i-a20-tcon > * allwinner,sun8i-a33-tcon > * allwinner,sun8i-a83t-tcon-lcd > + * allwinner,sun8i-a83t-tcon-tv > * allwinner,sun8i-v3s-tcon > - reg: base address and size of memory-mapped region > - interrupts: interrupt associated to this IP > - - clocks: phandles to the clocks feeding the TCON. Three are needed: > + - clocks: phandles to the clocks feeding the TCON. One is needed: > - 'ahb': the interface clocks > - - 'tcon-ch0': The clock driving the TCON channel 0 > - resets: phandles to the reset controllers driving the encoder > - "lcd": the reset line for the TCON channel 0 > > - clock-names: the clock names mentioned above > - reset-names: the reset names mentioned above > - - clock-output-names: Name of the pixel clock created > > - ports: A ports node with endpoint definitions as defined in > Documentation/devicetree/bindings/media/video-interfaces.txt. The > @@ -119,11 +152,31 @@ Required properties: > channel the endpoint is associated to. If that property is not > present, the endpoint number will be used as the channel number. > > -On SoCs other than the A33 and V3s, there is one more clock required: > +Following compatibles: > + * allwinner,sun4i-a10-tcon > + * allwinner,sun5i-a13-tcon > + * allwinner,sun6i-a31-tcon > + * allwinner,sun6i-a31s-tcon > + * allwinner,sun7i-a20-tcon > + * allwinner,sun8i-a33-tcon > + * allwinner,sun8i-a83t-tcon-lcd > + * allwinner,sun8i-v3s-tcon > +have additional required properties: > + - 'tcon-ch0': The clock driving the TCON channel 0 tcon-ch0 is a clock name, not a property. > + - clock-output-names: Name of the pixel clock created > + > +For following compatibles: > + * allwinner,sun4i-a10-tcon > + * allwinner,sun5i-a13-tcon > + * allwinner,sun6i-a31-tcon > + * allwinner,sun6i-a31s-tcon > + * allwinner,sun7i-a20-tcon > + * allwinner,sun8i-a83t-tcon-tv > +there is one more clock required: > - 'tcon-ch1': The clock driving the TCON channel 1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Rob, Dne sreda, 03. januar 2018 ob 21:21:54 CET je Rob Herring napisal(a): > On Sat, Dec 30, 2017 at 10:01:58PM +0100, Jernej Skrabec wrote: > > This commit adds all necessary compatibles and descriptions needed to > > implement A83T HDMI pipeline. > > > > Mixer is already properly described, so only compatible is added. > > > > However, A83T TCON1, which is connected to HDMI, doesn't have channel 0, > > contrary to all TCONs currently described. Because of that, TCON > > documentation is extended. > > > > A83T features Synopsys DW HDMI controller with a custom PHY which looks > > like Synopsys Gen2 PHY with few additions. Since there is no > > documentation, needed properties were found out through experimentation > > and reading BSP code. > > > > At the end, example is added for newer SoCs, which features DE2 and DW > > HDMI. > > > > Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> > > --- > > > > .../bindings/display/sunxi/sun4i-drm.txt | 188 > > ++++++++++++++++++++- 1 file changed, 181 insertions(+), 7 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt > > b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt index > > 9f073af4c711..3eca258096a5 100644 > > --- a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt > > +++ b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt > > > > @@ -64,6 +64,40 @@ Required properties: > > first port should be the input endpoint. The second should be the > > output, usually to an HDMI connector. > > > > +DWC HDMI TX Encoder > > +----------------------------- > > + > > +The HDMI transmitter is a Synopsys DesignWare HDMI 1.4 TX controller IP > > +with Allwinner's own PHY IP. It supports audio and video outputs and CEC. > > + > > +These DT bindings follow the Synopsys DWC HDMI TX bindings defined in > > +Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt with the > > +following device-specific properties. > > + > > +Required properties: > > + > > + - compatible: value must be one of: > > + * "allwinner,sun8i-a83t-dw-hdmi" > > + - reg: two pairs of base address and size of memory-mapped region, > > first > > + for controller and second for PHY > > + registers. > > Seems like the phy should be a separate node and use the phy binding. > You can use the phy binding even if you don't use the kernel phy > framework... Unfortunately, it's not so straighforward. Phy is actually accessed through I2C implemented in HDMI controller. Second memory region in this case has small influence on phy. However, it has big influence on controller. For example, magic number has to be written in one register in second memory region in order to unlock read access to any register from first memory region (controller). However, they shouldn't be merged to one region, because first memory region requires byte access while second memory region can be accessed per byte or word. To complicate things more, later I want to add support for another SoC which has same glue layer (unlocking read access, etc.) and uses memory mapped phy registers in second memory region. I think current binding is the least complicated way to represent this. > > > + - reg-io-width: See dw_hdmi.txt. Shall be 1. > > + - interrupts: HDMI interrupt number > > + - clocks: phandles to the clocks feeding the HDMI encoder > > + * iahb: the HDMI bus clock > > + * isfr: the HDMI register clock > > + * tmds: the HDMI tmds clock > > + - clock-names: the clock names mentioned above > > + - resets: phandles to the reset controllers driving the encoder > > + * ctrl: the reset line for the controller > > + * phy: the reset line for the PHY > > + - reset-names: the reset names mentioned above > > + > > + - ports: A ports node with endpoint definitions as defined in > > + Documentation/devicetree/bindings/media/video-interfaces.txt. The > > + first port should be the input endpoint. The second should be the > > + output, usually to an HDMI connector. > > + > > > > TV Encoder > > ---------- > > > > @@ -94,18 +128,17 @@ Required properties: > > * allwinner,sun7i-a20-tcon > > * allwinner,sun8i-a33-tcon > > * allwinner,sun8i-a83t-tcon-lcd > > > > + * allwinner,sun8i-a83t-tcon-tv > > > > * allwinner,sun8i-v3s-tcon > > > > - reg: base address and size of memory-mapped region > > - interrupts: interrupt associated to this IP > > > > - - clocks: phandles to the clocks feeding the TCON. Three are needed: > > > > + - clocks: phandles to the clocks feeding the TCON. One is needed: > > - 'ahb': the interface clocks > > > > - - 'tcon-ch0': The clock driving the TCON channel 0 > > > > - resets: phandles to the reset controllers driving the encoder > > > > - "lcd": the reset line for the TCON channel 0 > > > > - clock-names: the clock names mentioned above > > - reset-names: the reset names mentioned above > > > > - - clock-output-names: Name of the pixel clock created > > > > - ports: A ports node with endpoint definitions as defined in > > > > Documentation/devicetree/bindings/media/video-interfaces.txt. The > > > > @@ -119,11 +152,31 @@ Required properties: > > channel the endpoint is associated to. If that property is not > > present, the endpoint number will be used as the channel number. > > > > -On SoCs other than the A33 and V3s, there is one more clock required: > > +Following compatibles: > > + * allwinner,sun4i-a10-tcon > > + * allwinner,sun5i-a13-tcon > > + * allwinner,sun6i-a31-tcon > > + * allwinner,sun6i-a31s-tcon > > + * allwinner,sun7i-a20-tcon > > + * allwinner,sun8i-a33-tcon > > + * allwinner,sun8i-a83t-tcon-lcd > > + * allwinner,sun8i-v3s-tcon > > +have additional required properties: > > + - 'tcon-ch0': The clock driving the TCON channel 0 > > tcon-ch0 is a clock name, not a property. right. Best regards, Jernej -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Jan 03, 2018 at 10:32:26PM +0100, Jernej Škrabec wrote: > Hi Rob, > > Dne sreda, 03. januar 2018 ob 21:21:54 CET je Rob Herring napisal(a): > > On Sat, Dec 30, 2017 at 10:01:58PM +0100, Jernej Skrabec wrote: > > > This commit adds all necessary compatibles and descriptions needed to > > > implement A83T HDMI pipeline. > > > > > > Mixer is already properly described, so only compatible is added. > > > > > > However, A83T TCON1, which is connected to HDMI, doesn't have channel 0, > > > contrary to all TCONs currently described. Because of that, TCON > > > documentation is extended. > > > > > > A83T features Synopsys DW HDMI controller with a custom PHY which looks > > > like Synopsys Gen2 PHY with few additions. Since there is no > > > documentation, needed properties were found out through experimentation > > > and reading BSP code. > > > > > > At the end, example is added for newer SoCs, which features DE2 and DW > > > HDMI. > > > > > > Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> > > > --- > > > > > > .../bindings/display/sunxi/sun4i-drm.txt | 188 > > > ++++++++++++++++++++- 1 file changed, 181 insertions(+), 7 deletions(-) > > > > > > diff --git a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt > > > b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt index > > > 9f073af4c711..3eca258096a5 100644 > > > --- a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt > > > +++ b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt > > > > > > @@ -64,6 +64,40 @@ Required properties: > > > first port should be the input endpoint. The second should be the > > > output, usually to an HDMI connector. > > > > > > +DWC HDMI TX Encoder > > > +----------------------------- > > > + > > > +The HDMI transmitter is a Synopsys DesignWare HDMI 1.4 TX controller IP > > > +with Allwinner's own PHY IP. It supports audio and video outputs and CEC. > > > + > > > +These DT bindings follow the Synopsys DWC HDMI TX bindings defined in > > > +Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt with the > > > +following device-specific properties. > > > + > > > +Required properties: > > > + > > > + - compatible: value must be one of: > > > + * "allwinner,sun8i-a83t-dw-hdmi" > > > + - reg: two pairs of base address and size of memory-mapped region, > > > first > > > + for controller and second for PHY > > > + registers. > > > > Seems like the phy should be a separate node and use the phy binding. > > You can use the phy binding even if you don't use the kernel phy > > framework... > > Unfortunately, it's not so straighforward. Phy is actually accessed through > I2C implemented in HDMI controller. Second memory region in this case has > small influence on phy. However, it has big influence on controller. For > example, magic number has to be written in one register in second memory > region in order to unlock read access to any register from first memory region > (controller). However, they shouldn't be merged to one region, because first > memory region requires byte access while second memory region can be accessed > per byte or word. > > To complicate things more, later I want to add support for another SoC which > has same glue layer (unlocking read access, etc.) and uses memory mapped phy > registers in second memory region. > > I think current binding is the least complicated way to represent this. I agree with Rob here. I did a similar thing for the DSI patches I've sent a few monthes ago and it turned out to not be that difficult, so I'm sure you can come up with something :) Maxime
于 2018年1月5日 GMT+08:00 上午2:52:10, Maxime Ripard <maxime.ripard@free-electrons.com> 写到: >On Wed, Jan 03, 2018 at 10:32:26PM +0100, Jernej Škrabec wrote: >> Hi Rob, >> >> Dne sreda, 03. januar 2018 ob 21:21:54 CET je Rob Herring napisal(a): >> > On Sat, Dec 30, 2017 at 10:01:58PM +0100, Jernej Skrabec wrote: >> > > This commit adds all necessary compatibles and descriptions >needed to >> > > implement A83T HDMI pipeline. >> > > >> > > Mixer is already properly described, so only compatible is added. >> > > >> > > However, A83T TCON1, which is connected to HDMI, doesn't have >channel 0, >> > > contrary to all TCONs currently described. Because of that, TCON >> > > documentation is extended. >> > > >> > > A83T features Synopsys DW HDMI controller with a custom PHY which >looks >> > > like Synopsys Gen2 PHY with few additions. Since there is no >> > > documentation, needed properties were found out through >experimentation >> > > and reading BSP code. >> > > >> > > At the end, example is added for newer SoCs, which features DE2 >and DW >> > > HDMI. >> > > >> > > Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> >> > > --- >> > > >> > > .../bindings/display/sunxi/sun4i-drm.txt | 188 >> > > ++++++++++++++++++++- 1 file changed, 181 insertions(+), 7 >deletions(-) >> > > >> > > diff --git >a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt >> > > b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt >index >> > > 9f073af4c711..3eca258096a5 100644 >> > > --- >a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt >> > > +++ >b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt >> > > >> > > @@ -64,6 +64,40 @@ Required properties: >> > > first port should be the input endpoint. The second should >be the >> > > output, usually to an HDMI connector. >> > > >> > > +DWC HDMI TX Encoder >> > > +----------------------------- >> > > + >> > > +The HDMI transmitter is a Synopsys DesignWare HDMI 1.4 TX >controller IP >> > > +with Allwinner's own PHY IP. It supports audio and video outputs >and CEC. >> > > + >> > > +These DT bindings follow the Synopsys DWC HDMI TX bindings >defined in >> > > +Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt >with the >> > > +following device-specific properties. >> > > + >> > > +Required properties: >> > > + >> > > + - compatible: value must be one of: >> > > + * "allwinner,sun8i-a83t-dw-hdmi" >> > > + - reg: two pairs of base address and size of memory-mapped >region, >> > > first >> > > + for controller and second for PHY >> > > + registers. >> > >> > Seems like the phy should be a separate node and use the phy >binding. >> > You can use the phy binding even if you don't use the kernel phy >> > framework... >> >> Unfortunately, it's not so straighforward. Phy is actually accessed >through >> I2C implemented in HDMI controller. Second memory region in this case >has >> small influence on phy. However, it has big influence on controller. >For >> example, magic number has to be written in one register in second >memory >> region in order to unlock read access to any register from first >memory region >> (controller). However, they shouldn't be merged to one region, >because first >> memory region requires byte access while second memory region can be >accessed >> per byte or word. >> >> To complicate things more, later I want to add support for another >SoC which >> has same glue layer (unlocking read access, etc.) and uses memory >mapped phy >> registers in second memory region. >> >> I think current binding is the least complicated way to represent >this. > >I agree with Rob here. I did a similar thing for the DSI patches I've >sent a few monthes ago and it turned out to not be that difficult, so >I'm sure you can come up with something :) In A83T/H3/A64/H5/R40 this part is not purely a PHY. It controls the access of main controller's register (e.g. read/write lock and register obfuscation). So it should be called a "glue" with PHY part (and on A83T seems a pure glue) but not a simple PHY. > >Maxime > >-- >Maxime Ripard, Free Electrons >Embedded Linux and Kernel engineering >http://free-electrons.com > >_______________________________________________ >linux-arm-kernel mailing list >linux-arm-kernel@lists.infradead.org >http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
于 2018年1月4日 GMT+08:00 上午5:32:26, "Jernej Škrabec" <jernej.skrabec@siol.net> 写到: >Hi Rob, > >Dne sreda, 03. januar 2018 ob 21:21:54 CET je Rob Herring napisal(a): >> On Sat, Dec 30, 2017 at 10:01:58PM +0100, Jernej Skrabec wrote: >> > This commit adds all necessary compatibles and descriptions needed >to >> > implement A83T HDMI pipeline. >> > >> > Mixer is already properly described, so only compatible is added. >> > >> > However, A83T TCON1, which is connected to HDMI, doesn't have >channel 0, >> > contrary to all TCONs currently described. Because of that, TCON >> > documentation is extended. >> > >> > A83T features Synopsys DW HDMI controller with a custom PHY which >looks >> > like Synopsys Gen2 PHY with few additions. Since there is no >> > documentation, needed properties were found out through >experimentation >> > and reading BSP code. >> > >> > At the end, example is added for newer SoCs, which features DE2 and >DW >> > HDMI. >> > >> > Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> >> > --- >> > >> > .../bindings/display/sunxi/sun4i-drm.txt | 188 >> > ++++++++++++++++++++- 1 file changed, 181 insertions(+), 7 >deletions(-) >> > >> > diff --git >a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt >> > b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt >index >> > 9f073af4c711..3eca258096a5 100644 >> > --- a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt >> > +++ b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt >> > >> > @@ -64,6 +64,40 @@ Required properties: >> > first port should be the input endpoint. The second should be >the >> > output, usually to an HDMI connector. >> > >> > +DWC HDMI TX Encoder >> > +----------------------------- >> > + >> > +The HDMI transmitter is a Synopsys DesignWare HDMI 1.4 TX >controller IP >> > +with Allwinner's own PHY IP. It supports audio and video outputs >and CEC. >> > + >> > +These DT bindings follow the Synopsys DWC HDMI TX bindings defined >in >> > +Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt with >the >> > +following device-specific properties. >> > + >> > +Required properties: >> > + >> > + - compatible: value must be one of: >> > + * "allwinner,sun8i-a83t-dw-hdmi" >> > + - reg: two pairs of base address and size of memory-mapped >region, >> > first >> > + for controller and second for PHY >> > + registers. >> >> Seems like the phy should be a separate node and use the phy binding. >> You can use the phy binding even if you don't use the kernel phy >> framework... > >Unfortunately, it's not so straighforward. Phy is actually accessed >through >I2C implemented in HDMI controller. Second memory region in this case >has >small influence on phy. However, it has big influence on controller. To be honest you used inaccurate word. Use "glue" directly here may be more accurate. >For >example, magic number has to be written in one register in second >memory >region in order to unlock read access to any register from first memory >region >(controller). However, they shouldn't be merged to one region, because >first >memory region requires byte access while second memory region can be >accessed >per byte or word. > >To complicate things more, later I want to add support for another SoC >which >has same glue layer (unlocking read access, etc.) and uses memory >mapped phy >registers in second memory region. > >I think current binding is the least complicated way to represent this. > >> >> > + - reg-io-width: See dw_hdmi.txt. Shall be 1. >> > + - interrupts: HDMI interrupt number >> > + - clocks: phandles to the clocks feeding the HDMI encoder >> > + * iahb: the HDMI bus clock >> > + * isfr: the HDMI register clock >> > + * tmds: the HDMI tmds clock >> > + - clock-names: the clock names mentioned above >> > + - resets: phandles to the reset controllers driving the encoder >> > + * ctrl: the reset line for the controller >> > + * phy: the reset line for the PHY >> > + - reset-names: the reset names mentioned above >> > + >> > + - ports: A ports node with endpoint definitions as defined in >> > + Documentation/devicetree/bindings/media/video-interfaces.txt. >The >> > + first port should be the input endpoint. The second should be >the >> > + output, usually to an HDMI connector. >> > + >> > >> > TV Encoder >> > ---------- >> > >> > @@ -94,18 +128,17 @@ Required properties: >> > * allwinner,sun7i-a20-tcon >> > * allwinner,sun8i-a33-tcon >> > * allwinner,sun8i-a83t-tcon-lcd >> > >> > + * allwinner,sun8i-a83t-tcon-tv >> > >> > * allwinner,sun8i-v3s-tcon >> > >> > - reg: base address and size of memory-mapped region >> > - interrupts: interrupt associated to this IP >> > >> > - - clocks: phandles to the clocks feeding the TCON. Three are >needed: >> > >> > + - clocks: phandles to the clocks feeding the TCON. One is needed: >> > - 'ahb': the interface clocks >> > >> > - - 'tcon-ch0': The clock driving the TCON channel 0 >> > >> > - resets: phandles to the reset controllers driving the encoder >> > >> > - "lcd": the reset line for the TCON channel 0 >> > >> > - clock-names: the clock names mentioned above >> > - reset-names: the reset names mentioned above >> > >> > - - clock-output-names: Name of the pixel clock created >> > >> > - ports: A ports node with endpoint definitions as defined in >> > >> > Documentation/devicetree/bindings/media/video-interfaces.txt. >The >> > >> > @@ -119,11 +152,31 @@ Required properties: >> > channel the endpoint is associated to. If that property is not >> > present, the endpoint number will be used as the channel number. >> > >> > -On SoCs other than the A33 and V3s, there is one more clock >required: >> > +Following compatibles: >> > + * allwinner,sun4i-a10-tcon >> > + * allwinner,sun5i-a13-tcon >> > + * allwinner,sun6i-a31-tcon >> > + * allwinner,sun6i-a31s-tcon >> > + * allwinner,sun7i-a20-tcon >> > + * allwinner,sun8i-a33-tcon >> > + * allwinner,sun8i-a83t-tcon-lcd >> > + * allwinner,sun8i-v3s-tcon >> > +have additional required properties: >> > + - 'tcon-ch0': The clock driving the TCON channel 0 >> >> tcon-ch0 is a clock name, not a property. > >right. > >Best regards, >Jernej > > > >_______________________________________________ >linux-arm-kernel mailing list >linux-arm-kernel@lists.infradead.org >http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, Dne petek, 05. januar 2018 ob 03:49:09 CET je Icenowy Zheng napisal(a): > 于 2018年1月5日 GMT+08:00 上午2:52:10, Maxime Ripard <maxime.ripard@free- electrons.com> 写到: > >On Wed, Jan 03, 2018 at 10:32:26PM +0100, Jernej Škrabec wrote: > >> Hi Rob, > >> > >> Dne sreda, 03. januar 2018 ob 21:21:54 CET je Rob Herring napisal(a): > >> > On Sat, Dec 30, 2017 at 10:01:58PM +0100, Jernej Skrabec wrote: > >> > > This commit adds all necessary compatibles and descriptions > > > >needed to > > > >> > > implement A83T HDMI pipeline. > >> > > > >> > > Mixer is already properly described, so only compatible is added. > >> > > > >> > > However, A83T TCON1, which is connected to HDMI, doesn't have > > > >channel 0, > > > >> > > contrary to all TCONs currently described. Because of that, TCON > >> > > documentation is extended. > >> > > > >> > > A83T features Synopsys DW HDMI controller with a custom PHY which > > > >looks > > > >> > > like Synopsys Gen2 PHY with few additions. Since there is no > >> > > documentation, needed properties were found out through > > > >experimentation > > > >> > > and reading BSP code. > >> > > > >> > > At the end, example is added for newer SoCs, which features DE2 > > > >and DW > > > >> > > HDMI. > >> > > > >> > > Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> > >> > > --- > >> > > > >> > > .../bindings/display/sunxi/sun4i-drm.txt | 188 > >> > > ++++++++++++++++++++- 1 file changed, 181 insertions(+), 7 > > > >deletions(-) > > > >> > > diff --git > > > >a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt > > > >> > > b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt > > > >index > > > >> > > 9f073af4c711..3eca258096a5 100644 > >> > > --- > > > >a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt > > > >> > > +++ > > > >b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt > > > >> > > @@ -64,6 +64,40 @@ Required properties: > >> > > first port should be the input endpoint. The second should > > > >be the > > > >> > > output, usually to an HDMI connector. > >> > > > >> > > +DWC HDMI TX Encoder > >> > > +----------------------------- > >> > > + > >> > > +The HDMI transmitter is a Synopsys DesignWare HDMI 1.4 TX > > > >controller IP > > > >> > > +with Allwinner's own PHY IP. It supports audio and video outputs > > > >and CEC. > > > >> > > + > >> > > +These DT bindings follow the Synopsys DWC HDMI TX bindings > > > >defined in > > > >> > > +Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt > > > >with the > > > >> > > +following device-specific properties. > >> > > + > >> > > +Required properties: > >> > > + > >> > > + - compatible: value must be one of: > >> > > + * "allwinner,sun8i-a83t-dw-hdmi" > >> > > + - reg: two pairs of base address and size of memory-mapped > > > >region, > > > >> > > first > >> > > + for controller and second for PHY > >> > > + registers. > >> > > >> > Seems like the phy should be a separate node and use the phy > > > >binding. > > > >> > You can use the phy binding even if you don't use the kernel phy > >> > framework... > >> > >> Unfortunately, it's not so straighforward. Phy is actually accessed > > > >through > > > >> I2C implemented in HDMI controller. Second memory region in this case > > > >has > > > >> small influence on phy. However, it has big influence on controller. > > > >For > > > >> example, magic number has to be written in one register in second > > > >memory > > > >> region in order to unlock read access to any register from first > > > >memory region > > > >> (controller). However, they shouldn't be merged to one region, > > > >because first > > > >> memory region requires byte access while second memory region can be > > > >accessed > > > >> per byte or word. > >> > >> To complicate things more, later I want to add support for another > > > >SoC which > > > >> has same glue layer (unlocking read access, etc.) and uses memory > > > >mapped phy > > > >> registers in second memory region. > >> > >> I think current binding is the least complicated way to represent > > > >this. > > > >I agree with Rob here. I did a similar thing for the DSI patches I've > >sent a few monthes ago and it turned out to not be that difficult, so > >I'm sure you can come up with something :) > > In A83T/H3/A64/H5/R40 this part is not purely a PHY. > It controls the access of main controller's register (e.g. read/write > lock and register obfuscation). So it should be called a "glue" > with PHY part (and on A83T seems a pure glue) but not a simple > PHY. It's not so simple. Actually it has PHY settings also on A83T. For example, value at 0x01EF0001 depends on polarity. Value at 0x01EF0002 sets PHY I2C address. Bit 7 at 0x01EF0007 enables/disables external resistor. That is info I discovered/received after I sent patches, so it's not cleary marked. Proper memory map (starts at 0x01EE0000): 0x00000 - 0x10000 -> DW HDMI controller 0x10000 - 0x10010 -> (almost?) Common PHY settings 0x10010 - 0x10020 -> Allwinner proprietary glue layer 0x10020 - 0x10040 -> Allwinner proprietary PHY (not present on A83T) In preliminary PHY doc AW released, there are additional regs at 0x01EF0FF8 and 0x01EF0FFC for controller ID and phy ID, but it was always 0 at A83T and H3. So splitting memory in so many regions just to satisfy clean division it doesn't seem sane to me. Now that I checked how Maxime did it with MIPI DSI driver, I'm good with dividing it into two parts. Best regards, Jernej > > >Maxime > > > >-- > >Maxime Ripard, Free Electrons > >Embedded Linux and Kernel engineering > >http://free-electrons.com > > > >_______________________________________________ > >linux-arm-kernel mailing list > >linux-arm-kernel@lists.infradead.org > >http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > > -- > You received this message because you are subscribed to the Google Groups > "linux-sunxi" group. To unsubscribe from this group and stop receiving > emails from it, send an email to linux-sunxi+unsubscribe@googlegroups.com. > For more options, visit https://groups.google.com/d/optout. -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt index 9f073af4c711..3eca258096a5 100644 --- a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt +++ b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt @@ -64,6 +64,40 @@ Required properties: first port should be the input endpoint. The second should be the output, usually to an HDMI connector. +DWC HDMI TX Encoder +----------------------------- + +The HDMI transmitter is a Synopsys DesignWare HDMI 1.4 TX controller IP +with Allwinner's own PHY IP. It supports audio and video outputs and CEC. + +These DT bindings follow the Synopsys DWC HDMI TX bindings defined in +Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt with the +following device-specific properties. + +Required properties: + + - compatible: value must be one of: + * "allwinner,sun8i-a83t-dw-hdmi" + - reg: two pairs of base address and size of memory-mapped region, first + for controller and second for PHY + registers. + - reg-io-width: See dw_hdmi.txt. Shall be 1. + - interrupts: HDMI interrupt number + - clocks: phandles to the clocks feeding the HDMI encoder + * iahb: the HDMI bus clock + * isfr: the HDMI register clock + * tmds: the HDMI tmds clock + - clock-names: the clock names mentioned above + - resets: phandles to the reset controllers driving the encoder + * ctrl: the reset line for the controller + * phy: the reset line for the PHY + - reset-names: the reset names mentioned above + + - ports: A ports node with endpoint definitions as defined in + Documentation/devicetree/bindings/media/video-interfaces.txt. The + first port should be the input endpoint. The second should be the + output, usually to an HDMI connector. + TV Encoder ---------- @@ -94,18 +128,17 @@ Required properties: * allwinner,sun7i-a20-tcon * allwinner,sun8i-a33-tcon * allwinner,sun8i-a83t-tcon-lcd + * allwinner,sun8i-a83t-tcon-tv * allwinner,sun8i-v3s-tcon - reg: base address and size of memory-mapped region - interrupts: interrupt associated to this IP - - clocks: phandles to the clocks feeding the TCON. Three are needed: + - clocks: phandles to the clocks feeding the TCON. One is needed: - 'ahb': the interface clocks - - 'tcon-ch0': The clock driving the TCON channel 0 - resets: phandles to the reset controllers driving the encoder - "lcd": the reset line for the TCON channel 0 - clock-names: the clock names mentioned above - reset-names: the reset names mentioned above - - clock-output-names: Name of the pixel clock created - ports: A ports node with endpoint definitions as defined in Documentation/devicetree/bindings/media/video-interfaces.txt. The @@ -119,11 +152,31 @@ Required properties: channel the endpoint is associated to. If that property is not present, the endpoint number will be used as the channel number. -On SoCs other than the A33 and V3s, there is one more clock required: +Following compatibles: + * allwinner,sun4i-a10-tcon + * allwinner,sun5i-a13-tcon + * allwinner,sun6i-a31-tcon + * allwinner,sun6i-a31s-tcon + * allwinner,sun7i-a20-tcon + * allwinner,sun8i-a33-tcon + * allwinner,sun8i-a83t-tcon-lcd + * allwinner,sun8i-v3s-tcon +have additional required properties: + - 'tcon-ch0': The clock driving the TCON channel 0 + - clock-output-names: Name of the pixel clock created + +For following compatibles: + * allwinner,sun4i-a10-tcon + * allwinner,sun5i-a13-tcon + * allwinner,sun6i-a31-tcon + * allwinner,sun6i-a31s-tcon + * allwinner,sun7i-a20-tcon + * allwinner,sun8i-a83t-tcon-tv +there is one more clock required: - 'tcon-ch1': The clock driving the TCON channel 1 -On SoCs that support LVDS (all SoCs but the A13, H3, H5 and V3s), you -need one more reset line: +On TCONs that support LVDS (all TCONs except the ones found on A13, H3, H5, V3s +and TCON1 on A83T), you need one more reset line: - 'lvds': The reset line driving the LVDS logic And on the SoCs newer than the A31 (sun6i and sun8i families), you @@ -227,6 +280,7 @@ supported. Required properties: - compatible: value must be one of: * allwinner,sun8i-a83t-de2-mixer-0 + * allwinner,sun8i-a83t-de2-mixer-1 * allwinner,sun8i-v3s-de2-mixer - reg: base address and size of the memory-mapped region. - clocks: phandles to the clocks feeding the mixer @@ -262,7 +316,7 @@ Required properties: - allwinner,pipelines: list of phandle to the display engine frontends (DE 1.0) or mixers (DE 2.0) available. -Example: +Example 1: panel: panel { compatible = "olimex,lcd-olinuxino-43-ts"; @@ -461,3 +515,123 @@ display-engine { compatible = "allwinner,sun5i-a13-display-engine"; allwinner,pipelines = <&fe0>; }; + +Example 2: + +connector { + compatible = "hdmi-connector"; + type = "a"; + + port { + hdmi_con_in: endpoint { + remote-endpoint = <&hdmi_out_con>; + }; + }; +}; + +de: display-engine { + compatible = "allwinner,sun8i-a83t-display-engine"; + allwinner,pipelines = <&mixer1>; +}; + +mixer1: mixer@1200000 { + compatible = "allwinner,sun8i-a83t-de2-mixer-1"; + reg = <0x01200000 0x100000>; + clocks = <&display_clocks CLK_BUS_MIXER1>, + <&display_clocks CLK_MIXER1>; + clock-names = "bus", + "mod"; + resets = <&display_clocks RST_WB>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + mixer1_out: port@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + + mixer1_out_tcon1: endpoint@0 { + reg = <0>; + remote-endpoint = <&tcon1_in_mixer1>; + }; + }; + }; +}; + +tcon1: lcd-controller@1c0d000 { + compatible = "allwinner,sun8i-a83t-tcon-tv"; + reg = <0x01c0d000 0x1000>; + interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_TCON1>, <&ccu CLK_TCON1>; + clock-names = "ahb", "tcon-ch1"; + resets = <&ccu RST_BUS_TCON1>; + reset-names = "lcd"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + tcon1_in: port@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + + tcon1_in_mixer1: endpoint@0 { + reg = <0>; + remote-endpoint = <&mixer1_out_tcon1>; + }; + }; + + tcon1_out: port@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + + tcon1_out_hdmi: endpoint@1 { + reg = <1>; + remote-endpoint = <&hdmi_in_tcon1>; + }; + }; + }; +}; + +hdmi: hdmi@1ee0000 { + compatible = "allwinner,sun8i-a83t-dw-hdmi"; + reg = <0x01ee0000 0x10000>, + <0x01ef0000 0x10000>; + reg-io-width = <1>; + interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_HDMI>, <&ccu CLK_HDMI_SLOW>, + <&ccu CLK_HDMI>; + clock-names = "iahb", "isfr", "tmds"; + resets = <&ccu RST_BUS_HDMI0>, <&ccu RST_BUS_HDMI1>; + reset-names = "phy", "ctrl"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + hdmi_in: port@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + + hdmi_in_tcon1: endpoint@0 { + reg = <0>; + remote-endpoint = <&tcon1_out_hdmi>; + }; + }; + + hdmi_out: port@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + + hdmi_out_con: endpoint { + remote-endpoint = <&hdmi_con_in>; + }; + }; + }; +};
This commit adds all necessary compatibles and descriptions needed to implement A83T HDMI pipeline. Mixer is already properly described, so only compatible is added. However, A83T TCON1, which is connected to HDMI, doesn't have channel 0, contrary to all TCONs currently described. Because of that, TCON documentation is extended. A83T features Synopsys DW HDMI controller with a custom PHY which looks like Synopsys Gen2 PHY with few additions. Since there is no documentation, needed properties were found out through experimentation and reading BSP code. At the end, example is added for newer SoCs, which features DE2 and DW HDMI. Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> --- .../bindings/display/sunxi/sun4i-drm.txt | 188 ++++++++++++++++++++- 1 file changed, 181 insertions(+), 7 deletions(-)