Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <53bf7d2c-baed-75fc-41e9-63166beec414@wolfvision.net>
Date:   Fri, 25 Feb 2022 16:43:27 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.6.0
Subject: Re: [PATCH v2 1/4] arm64: dts: rockchip: move power domain PD_PIPE to
 rk356x
Content-Language: en-US
To:     Robin Murphy <robin.murphy@arm.com>, devicetree@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org,
        linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org
Cc:     Rob Herring <robh+dt@kernel.org>, Heiko Stuebner <heiko@sntech.de>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Frank Wunderlich <frank-w@public-files.de>,
        Sascha Hauer <s.hauer@pengutronix.de>,
        Liang Chen <cl@rock-chips.com>,
        Peter Geis <pgwipeout@gmail.com>,
        Johan Jonker <jbx6244@gmail.com>,
        Simon Xue <xxm@rock-chips.com>,
        Yifeng Zhao <yifeng.zhao@rock-chips.com>,
        Nicolas Frattaroli <frattaroli.nicolas@gmail.com>
References: <20220225131602.2283499-1-michael.riesch@wolfvision.net>
 <20220225131602.2283499-2-michael.riesch@wolfvision.net>
 <2939d801-586d-85fd-97ef-d42925ddecce@arm.com>
From:   Michael Riesch <michael.riesch@wolfvision.net>
In-Reply-To: <2939d801-586d-85fd-97ef-d42925ddecce@arm.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UFU4aGhvVmZlUVo1MlMwSUM0NE1Eckk5SmwxdSs0b2VoM0dON3JuZFdodG1j?=
 =?utf-8?B?ZWc1aVdaOWFnakh4MHpIeEsyVUVDVHhhNCt6TWltVkZ0Zk5EdUg1SXRQZUQ3?=
 =?utf-8?B?M0xJQ2xLTTdiWnc0dTA3SzM4SE52NUhVVkxEUzYwWjZlSkhPb1BHbHU4bDNq?=
 =?utf-8?B?c3RRR2tiblU3SUswNFZaWklzVGp4b1ZBZG93RWJqeVBhVjRrdGZNdkprcUkr?=
 =?utf-8?B?bTBuRS9WbFFKUitMVXp3QlJNSnJIamFuNlhHazFyVTRMZTVSOHpSZ0kxYmtD?=
 =?utf-8?B?ajZoMTNzK1NsV1hBTnkzc2xkazBldFZNYkVjdXdkTm13eCs3ZUplOGIyYXRP?=
 =?utf-8?B?T3VSL3V1dmoraWRleXdjOWduSnJONHB2bGdwYUZTRDJwYVpnWmlwcHRkditK?=
 =?utf-8?B?Mzk5YVZ6cHZicVBYTzZQTWJQMTNaWHNUR2YxS3l1YjFIbVZLQ1NXYm1PbG1V?=
 =?utf-8?B?TDBYVWlWdGZ0Y0Z4MGZLTFBIcVRPZTJkeTlFV1VFZUo2bUJaam1BU2FJRFZH?=
 =?utf-8?B?QUNHMkFSUWhsaTU5Z1MwNU5IN2NWdmhjVUdqRDd5VFMzRkhSVEZsQmdQdG83?=
 =?utf-8?B?T0MxWndWNURUV1dldnpEZ1FqWjdZcVNmZGk5cmpReHI5NkNGeElZbnkzQ1dQ?=
 =?utf-8?B?UGs3bHFCNmNqOEJaUzkwZ0UxdmpyNEExeGF1dGE5TFg4U2g4amdJVm9hN1FS?=
 =?utf-8?B?aTA3d2IzWmg5RW1KUnI5Ky9tWDBHZ1J1RnJISDQ5UjlsWUFvVUxnVDlDbW1l?=
 =?utf-8?B?NmkwWElDZkN3QlQvL2QzQS9jdGNYbk9wbnprTEZZa1FMcGtERDJmbGR2bVF5?=
 =?utf-8?B?ekhnVEFQSjd2WDVXa3FsNjNmRzd4VDNjK0xsU1hBOHowOFpxMWhsdG5Id29H?=
 =?utf-8?B?bDMwLzZ2aFJMbHhVbXVESEtDYWU3OTV6VHkzaW8zOWl4a2ZGZ2J6U3lLMHoz?=
 =?utf-8?B?dnJ1ZjREKzhXUEt0Rkg5WUV2Q1ZOV0ZOMnQ4SVEzaXZtUVo3RDZYRFhHdWRM?=
 =?utf-8?B?bGdyZXdJbzZxeHV3cEMzUVIxNlhqOEZ0SmVDR0JJN3dSU09Ic1FKNTZGTDdZ?=
 =?utf-8?B?Qm1vYVNxRHhDUXJGZW5CYW5ZVUovdUM1TTBBWnZWVVJmZWxkZndLZUtQK2cz?=
 =?utf-8?B?MGVhVGNxc0RSQXNMckQ2WFljcUE0b1g3WFdNUHl1WDJ1L2szM0NGV1lTdjhC?=
 =?utf-8?B?UzhHM2hEdW5JQlgzNVZ1dmpQRis3TkdWcTl5ME9hSEZWUjVWUnNhVnNKK05M?=
 =?utf-8?B?U2s5aCt5UlBvUDJNeC8xTWM0dEdrNDlLaXY0c3J4d2xzZWlVbVZ5ZXlBSlU2?=
 =?utf-8?B?SEMxQWQ2VVdGTHA3SWNqZ08vWFVkQXBFUG1FMTBhUHgram80K2lycDlLczc3?=
 =?utf-8?B?bldMQy9Fd0ZmR05PZGJiYVN2Y1pHN3VXZEhaczBhWW41NnFWMWhSR0kreUQx?=
 =?utf-8?B?UW5Gd2hpTVhvYkdqZng1L2J0UXhMaHNLWE40WEZqd0Y1eUlCeUd2Vk03NFNi?=
 =?utf-8?B?YWR1cHpTbUw5eG5NRDFUMUJhRGNxbW5GSFNwSzlCNXVsbktFUGpFQ1BtT083?=
 =?utf-8?B?bWVHcHF1RGZreXgzQ0JpZ2p5RlRBOGpJNGg2aTJwS2VLYVY2cjgrK0xRaG1q?=
 =?utf-8?B?NGhHK0V2OVZPekZUbDV3SVNqTVpTT2RvOTduYUtFTUpqMDRwUks2VnRhcTQv?=
 =?utf-8?B?SmhjS3hJU2taN21DOGNicFMrbXNEYVZCN21VSlZJRHgrSlEwWnlOejExOVRQ?=
 =?utf-8?B?TDBEak1mc3ZZbHFpc2ZJWG1rZkpUSTRmb1FPblJUNVM1b2RtNm5PR1dmc3Jm?=
 =?utf-8?B?ZHBxMnJkb1cxOVpOQTRIUjJKWUg5ZUVhWk03c3poOW1KVk9QVG9sR0JDSGhi?=
 =?utf-8?B?SkFvKzcwd25ISERFZUdhN0RXbG9CaXlTdkg5NFZVbGMrOERrQUZjOE1FYVg0?=
 =?utf-8?B?WCtjSnlRckFubHV2WmVYaHUxc3FnWWJBbStLWXZwWXRMMlYyY1VWMlpHakFi?=
 =?utf-8?B?THc3c0wxc0M3c3NlampBc3ovYnE3Z05wQ21JSHZVUy9mdTZQeVdtV1ZQZTA3?=
 =?utf-8?B?Q2tGTjZNNXZ6U3h5elE2R1hQOFEzeUJVLzA3L1djQTROODlwY1FYQU03QmF3?=
 =?utf-8?B?SjlQQWtVK2ZZY09BcitFRXgyUzE1T1BVbXAzRHpBOFBaUGNuSVdIbVRkOTl0?=
 =?utf-8?B?UG1VUnh4UnA5MzNLZ2srU2xMYXNRWGhGS1B6NDVKK1J6QmhHNi80RzFGVnNo?=
 =?utf-8?B?Z1hZSEwzN21WRjRsQXVHUWtCMmV3eTIvZG9vV01VUTdtRjJjUkRyajloWDhU?=
 =?utf-8?B?UzdORWZBRXhpLzA5ZkYwT1pud1hxQXBsWEFIY1NsOUYxcXpZeXU5S2RvVGMr?=
 =?utf-8?Q?b2Xv1MVAMel+6t/4=3D?=
X-OriginatorOrg: wolfvision.net
X-MS-Exchange-CrossTenant-Network-Message-Id: 719b27e6-8ea6-4ffc-4f13-08d9f8759225
X-MS-Exchange-CrossTenant-AuthSource: HE1PR0802MB2426.eurprd08.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Feb 2022 15:43:29.8135
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: e94ec9da-9183-471e-83b3-51baa8eb804f
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: xnx+RMDsw+u3aN1Qgm4BKICHHsGeS7iEeqkkg2YiCIx7P/b8U9NDvOCG/V7mHFDt2x3tfFKHWbbzkQWkya3Vz4vu6L/RwMSbuEEwzTZjGP0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB7004
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Robin,

On 2/25/22 15:14, Robin Murphy wrote:
> On 2022-02-25 13:15, Michael Riesch wrote:
>> The power domain PD_PIPE was moved to the RK3568 specific dtsi but
>> is available on the RK3566 as well. Move it back to the shared dtsi.
> 
> Note that a corresponding definition does already exist in rk3568.dtsi.
> That one *could* inherit the base definition and only override the
> "pm_qos" property, but looking back to the original patch series it
> seems like not doing that was a deliberate choice.

OK, my bad. I overlooked that both rk3566 and rk3568 have their
definition in their dtsi files, so there is no need for this patch.
Sorry for the confusion!

Best regards,
Michael

> 
> Robin.
> 
>> Signed-off-by: Michael Riesch <michael.riesch@wolfvision.net>
>> ---
>>   arch/arm64/boot/dts/rockchip/rk3568.dtsi | 16 ----------------
>>   arch/arm64/boot/dts/rockchip/rk356x.dtsi | 14 ++++++++++++++
>>   2 files changed, 14 insertions(+), 16 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi
>> b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
>> index 91a0b798b857..ecc0f3015915 100644
>> --- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi
>> +++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
>> @@ -100,19 +100,3 @@ opp-1992000000 {
>>           opp-microvolt = <1150000 1150000 1150000>;
>>       };
>>   };
>> -
>> -&power {
>> -    power-domain@RK3568_PD_PIPE {
>> -        reg = <RK3568_PD_PIPE>;
>> -        clocks = <&cru PCLK_PIPE>;
>> -        pm_qos = <&qos_pcie2x1>,
>> -             <&qos_pcie3x1>,
>> -             <&qos_pcie3x2>,
>> -             <&qos_sata0>,
>> -             <&qos_sata1>,
>> -             <&qos_sata2>,
>> -             <&qos_usb3_0>,
>> -             <&qos_usb3_1>;
>> -        #power-domain-cells = <0>;
>> -    };
>> -};
>> diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
>> b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
>> index 8b9fae3d348a..742f5adcdf2b 100644
>> --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
>> +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
>> @@ -490,6 +490,20 @@ power-domain@RK3568_PD_RKVENC {
>>                        <&qos_rkvenc_wr_m0>;
>>                   #power-domain-cells = <0>;
>>               };
>> +
>> +            power-domain@RK3568_PD_PIPE {
>> +                reg = <RK3568_PD_PIPE>;
>> +                clocks = <&cru PCLK_PIPE>;
>> +                pm_qos = <&qos_pcie2x1>,
>> +                     <&qos_pcie3x1>,
>> +                     <&qos_pcie3x2>,
>> +                     <&qos_sata0>,
>> +                     <&qos_sata1>,
>> +                     <&qos_sata2>,
>> +                     <&qos_usb3_0>,
>> +                     <&qos_usb3_1>;
>> +                #power-domain-cells = <0>;
>> +            };
>>           };
>>       };
>>