Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: [PATCH v6 13/13] arm64: dts: imx8mq: Add node to G2 hardware
To:     Philipp Zabel <pza@pengutronix.de>
Cc:     ezequiel@collabora.com, mchehab@kernel.org, robh+dt@kernel.org,
        shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com,
        lee.jones@linaro.org, gregkh@linuxfoundation.org,
        mripard@kernel.org, paul.kocialkowski@bootlin.com, wens@csie.org,
        jernej.skrabec@siol.net, hverkuil-cisco@xs4all.nl,
        emil.l.velikov@gmail.com, kernel@pengutronix.de, linux-imx@nxp.com,
        linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org,
        devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org,
        kernel@collabora.com
References: <20210318082046.51546-1-benjamin.gaignard@collabora.com>
 <20210318082046.51546-14-benjamin.gaignard@collabora.com>
 <20210326142440.GD8441@pengutronix.de>
From:   Benjamin Gaignard <benjamin.gaignard@collabora.com>
Message-ID: <4df3c9e4-0983-6007-f3b3-323882f903cf@collabora.com>
Date:   Fri, 26 Mar 2021 15:33:22 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.7.1
MIME-Version: 1.0
In-Reply-To: <20210326142440.GD8441@pengutronix.de>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 8bit
Content-Language: en-US
Precedence: bulk


Le 26/03/2021 à 15:24, Philipp Zabel a écrit :
> On Thu, Mar 18, 2021 at 09:20:46AM +0100, Benjamin Gaignard wrote:
>> Split VPU node in two: one for G1 and one for G2 since they are
>> different hardware blocks.
>> Add syscon for hardware control block.
>> Remove reg-names property that is useless.
>> Each VPU node only need one interrupt.
>>
>> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
>> ---
>> version 5:
>>   - use syscon instead of VPU reset
>>
>>   arch/arm64/boot/dts/freescale/imx8mq.dtsi | 43 ++++++++++++++++++-----
>>   1 file changed, 34 insertions(+), 9 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/freescale/imx8mq.dtsi b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
>> index 17c449e12c2e..b537d153ebbd 100644
>> --- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi
>> +++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
>> @@ -1329,15 +1329,16 @@ usb3_phy1: usb-phy@382f0040 {
>>   			status = "disabled";
>>   		};
>>   
>> -		vpu: video-codec@38300000 {
>> +		vpu_ctrl: syscon@38320000 {
>> +			compatible = "nxp,imx8mq-vpu-ctrl", "syscon";
>> +			reg = <0x38320000 0x10000>;
>> +		};
>> +
>> +		vpu_g1: video-codec@38300000 {
>>   			compatible = "nxp,imx8mq-vpu";
>> -			reg = <0x38300000 0x10000>,
>> -			      <0x38310000 0x10000>,
>> -			      <0x38320000 0x10000>;
>> -			reg-names = "g1", "g2", "ctrl";
>> -			interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
>> -				     <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
>> -			interrupt-names = "g1", "g2";
>> +			reg = <0x38300000 0x10000>;
>> +			interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
>> +			interrupt-names = "g1";
>>   			clocks = <&clk IMX8MQ_CLK_VPU_G1_ROOT>,
>>   				 <&clk IMX8MQ_CLK_VPU_G2_ROOT>,
>>   				 <&clk IMX8MQ_CLK_VPU_DEC_ROOT>;
>> @@ -1350,9 +1351,33 @@ vpu: video-codec@38300000 {
>>   						 <&clk IMX8MQ_VPU_PLL_OUT>,
>>   						 <&clk IMX8MQ_SYS1_PLL_800M>,
>>   						 <&clk IMX8MQ_VPU_PLL>;
>> -			assigned-clock-rates = <600000000>, <600000000>,
>> +			assigned-clock-rates = <600000000>, <300000000>,
> I'd like to see this mentioned in the commit message.

Yes I would do that.
The value comes from the datasheet.

>
>> +					       <800000000>, <0>;
>> +			power-domains = <&pgc_vpu>;
>> +			nxp,imx8mq-vpu-ctrl = <&vpu_ctrl>;
>> +		};
>> +
>> +		vpu_g2: video-codec@38310000 {
>> +			compatible = "nxp,imx8mq-vpu-g2";
>> +			reg = <0x38310000 0x10000>;
>> +			interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
>> +			interrupt-names = "g2";
>> +			clocks = <&clk IMX8MQ_CLK_VPU_G1_ROOT>,
>> +				 <&clk IMX8MQ_CLK_VPU_G2_ROOT>,
>> +				 <&clk IMX8MQ_CLK_VPU_DEC_ROOT>;
>> +			clock-names = "g1", "g2",  "bus";
>> +			assigned-clocks = <&clk IMX8MQ_CLK_VPU_G1>,
> Can the G1 clock configuration be dropped from the G2 device node and
> the G2 clock configuration from the G1 device node? It looks weird that
> these devices configure each other's clocks.

No because if only one device node is enabled we need to configure the both
clocks anyway.

Benjamin

>
> regards
> Philipp
>