* Hans Verkuil <hverkuil-cisco@xxxxxxxxx> [210211 12:37]:
> Add cec clock to the dra7 and omap5 device trees.
>
> Signed-off-by: Hans Verkuil <hverkuil-cisco@xxxxxxxxx>
This should merge just fine with what I'm planning to merge for v5.13,
probably best to apply this together with the driver changes:
Acked-by: Tony Lindgren <tony@xxxxxxxxxxx>
> ---
> arch/arm/boot/dts/dra7.dtsi | 5 +++--
> arch/arm/boot/dts/omap5.dtsi | 5 +++--
> 2 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
> index ce1194744f84..efe579ddb324 100644
> --- a/arch/arm/boot/dts/dra7.dtsi
> +++ b/arch/arm/boot/dts/dra7.dtsi
> @@ -879,8 +879,9 @@ hdmi: encoder@0 {
> interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
> status = "disabled";
> clocks = <&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 9>,
> - <&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 10>;
> - clock-names = "fck", "sys_clk";
> + <&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 10>,
> + <&dss_clkctrl DRA7_DSS_DSS_CORE_CLKCTRL 11>;
> + clock-names = "fck", "sys_clk", "cec";
> dmas = <&sdma_xbar 76>;
> dma-names = "audio_tx";
> };
> diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
> index 5f1a8bd13880..2bb1000aeae9 100644
> --- a/arch/arm/boot/dts/omap5.dtsi
> +++ b/arch/arm/boot/dts/omap5.dtsi
> @@ -580,8 +580,9 @@ hdmi: encoder@0 {
> interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
> status = "disabled";
> clocks = <&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 9>,
> - <&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 10>;
> - clock-names = "fck", "sys_clk";
> + <&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 10>,
> + <&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 11>;
> + clock-names = "fck", "sys_clk", "cec";
> dmas = <&sdma 76>;
> dma-names = "audio_tx";
> };
> --
> 2.30.0
>
