From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MIME_BASE64_TEXT,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5DA9CC43603 for ; Wed, 18 Dec 2019 08:31:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 062FA24676 for ; Wed, 18 Dec 2019 08:31:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="pJUj35WI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726933AbfLRIbZ (ORCPT ); Wed, 18 Dec 2019 03:31:25 -0500 Received: from mailgw01.mediatek.com ([210.61.82.183]:9891 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726856AbfLRIbQ (ORCPT ); Wed, 18 Dec 2019 03:31:16 -0500 X-UUID: 934583a78b06420eb36fe97a13f98328-20191218 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=LlqNfu8Jj/aGUxTJ03631SHV6I0sitPKzQp9PdmWbfY=; b=pJUj35WIDwsWTnZUVyhTsNkqj9mOqvGcxAVeVsaseoToZaKUj1oV9hQeseIelD1ybYlwUDqq2NYuYIUKWLnZQs2jsy2fwWhqFrjmDgb0I92nY7L85uRM3Sz3RCStJnbPnxgZWZH+AfvPafYE11lFeJDSezNuQPNbcEKHEwvnxVw=; X-UUID: 934583a78b06420eb36fe97a13f98328-20191218 Received: from mtkexhb02.mediatek.inc [(172.21.101.103)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 1791612373; Wed, 18 Dec 2019 16:30:58 +0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 18 Dec 2019 16:30:41 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Wed, 18 Dec 2019 16:30:29 +0800 From: Weiyi Lu To: Nicolas Boichat , Matthias Brugger , Rob Herring , Sascha Hauer CC: James Liao , Fan Chen , , , , , Weiyi Lu Subject: [PATCH v10 04/12] soc: mediatek: Use basic_clk_name for all compatibles Date: Wed, 18 Dec 2019 16:30:40 +0800 Message-ID: <1576657848-14711-5-git-send-email-weiyi.lu@mediatek.com> X-Mailer: git-send-email 1.8.1.1.dirty In-Reply-To: <1576657848-14711-1-git-send-email-weiyi.lu@mediatek.com> References: <1576657848-14711-1-git-send-email-weiyi.lu@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Content-Transfer-Encoding: base64 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org VXNlIGJhc2ljX2Nsa19uYW1lIHN0cmluZ3MgZm9yIGFsbCBjb21wYXRpYmxlcywgaW5zdGVhZCBv Zg0KbWl4aW5nIGNsa19pZCBhbmQgY2xrX25hbWUuDQoNClNpZ25lZC1vZmYtYnk6IFdlaXlpIEx1 IDx3ZWl5aS5sdUBtZWRpYXRlay5jb20+DQotLS0NCiBkcml2ZXJzL3NvYy9tZWRpYXRlay9tdGst c2Nwc3lzLmMgfCAxNDkgKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0NCiAx IGZpbGUgY2hhbmdlZCwgNDQgaW5zZXJ0aW9ucygrKSwgMTA1IGRlbGV0aW9ucygtKQ0KDQpkaWZm IC0tZ2l0IGEvZHJpdmVycy9zb2MvbWVkaWF0ZWsvbXRrLXNjcHN5cy5jIGIvZHJpdmVycy9zb2Mv bWVkaWF0ZWsvbXRrLXNjcHN5cy5jDQppbmRleCA5MzQzMjc3Li5kYjM1YTI4IDEwMDY0NA0KLS0t IGEvZHJpdmVycy9zb2MvbWVkaWF0ZWsvbXRrLXNjcHN5cy5jDQorKysgYi9kcml2ZXJzL3NvYy9t ZWRpYXRlay9tdGstc2Nwc3lzLmMNCkBAIC03OCwzNCArNzgsNiBAQA0KICNkZWZpbmUgUFdSX1NU QVRVU19ISUYxCQkJQklUKDI2KQkvKiBNVDc2MjIgKi8NCiAjZGVmaW5lIFBXUl9TVEFUVVNfV0IJ CQlCSVQoMjcpCS8qIE1UNzYyMiAqLw0KIA0KLWVudW0gY2xrX2lkIHsNCi0JQ0xLX05PTkUsDQot CUNMS19NTSwNCi0JQ0xLX01GRywNCi0JQ0xLX1ZFTkMsDQotCUNMS19WRU5DX0xULA0KLQlDTEtf RVRISUYsDQotCUNMS19WREVDLA0KLQlDTEtfSElGU0VMLA0KLQlDTEtfSlBHREVDLA0KLQlDTEtf QVVESU8sDQotCUNMS19NQVgsDQotfTsNCi0NCi1zdGF0aWMgY29uc3QgY2hhciAqIGNvbnN0IGNs a19uYW1lc1tdID0gew0KLQlOVUxMLA0KLQkibW0iLA0KLQkibWZnIiwNCi0JInZlbmMiLA0KLQki dmVuY19sdCIsDQotCSJldGhpZiIsDQotCSJ2ZGVjIiwNCi0JImhpZl9zZWwiLA0KLQkianBnZGVj IiwNCi0JImF1ZGlvIiwNCi0JTlVMTCwNCi19Ow0KLQ0KICNkZWZpbmUgTUFYX0NMS1MJMw0KIA0K IC8qKg0KQEAgLTExNiw5ICs4OCw3IEBAIGVudW0gY2xrX2lkIHsNCiAgKiBAc3JhbV9wZG5fYml0 czogVGhlIG1hc2sgZm9yIHNyYW0gcG93ZXIgY29udHJvbCBiaXRzLg0KICAqIEBzcmFtX3Bkbl9h Y2tfYml0czogVGhlIG1hc2sgZm9yIHNyYW0gcG93ZXIgY29udHJvbCBhY2tlZCBiaXRzLg0KICAq IEBidXNfcHJvdF9tYXNrOiBUaGUgbWFzayBmb3Igc2luZ2xlIHN0ZXAgYnVzIHByb3RlY3Rpb24u DQotICogQGNsa19pZDogVGhlIGJhc2ljIGNsb2NrcyByZXF1aXJlZCBieSB0aGlzIHBvd2VyIGRv bWFpbi4NCi0gKiBAYmFzaWNfY2xrX25hbWU6IHByb3ZpZGUgdGhlIHNhbWUgcHVycG9zZSB3aXRo IGZpZWxkICJjbGtfaWQiDQotICogICAgICAgICAgICAgICAgYnkgZGVjbGFyaW5nIGJhc2ljIGNs b2NrIHByZWZpeCBuYW1lIHJhdGhlciB0aGFuIGNsa19pZC4NCisgKiBAYmFzaWNfY2xrX25hbWU6 IFRoZSBiYXNpYyBjbG9ja3MgcmVxdWlyZWQgYnkgdGhpcyBwb3dlciBkb21haW4uDQogICogQGNh cHM6IFRoZSBmbGFnIGZvciBhY3RpdmUgd2FrZS11cCBhY3Rpb24uDQogICovDQogc3RydWN0IHNj cF9kb21haW5fZGF0YSB7DQpAQCAtMTI4LDcgKzk4LDYgQEAgc3RydWN0IHNjcF9kb21haW5fZGF0 YSB7DQogCXUzMiBzcmFtX3Bkbl9iaXRzOw0KIAl1MzIgc3JhbV9wZG5fYWNrX2JpdHM7DQogCXUz MiBidXNfcHJvdF9tYXNrOw0KLQllbnVtIGNsa19pZCBjbGtfaWRbTUFYX0NMS1NdOw0KIAljb25z dCBjaGFyICpiYXNpY19jbGtfbmFtZVtNQVhfQ0xLU107DQogCXU4IGNhcHM7DQogfTsNCkBAIC00 MTQsMTIgKzM4MywyMyBAQCBzdGF0aWMgaW50IHNjcHN5c19wb3dlcl9vZmYoc3RydWN0IGdlbmVy aWNfcG1fZG9tYWluICpnZW5wZCkNCiAJcmV0dXJuIHJldDsNCiB9DQogDQotc3RhdGljIHZvaWQg aW5pdF9jbGtzKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYsIHN0cnVjdCBjbGsgKipjbGsp DQorc3RhdGljIGludCBpbml0X2Jhc2ljX2Nsa3Moc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRl diwgc3RydWN0IGNsayAqKmNsaywNCisJCQljb25zdCBjaGFyICogY29uc3QgKm5hbWUpDQogew0K IAlpbnQgaTsNCiANCi0JZm9yIChpID0gQ0xLX05PTkUgKyAxOyBpIDwgQ0xLX01BWDsgaSsrKQ0K LQkJY2xrW2ldID0gZGV2bV9jbGtfZ2V0KCZwZGV2LT5kZXYsIGNsa19uYW1lc1tpXSk7DQorCWZv ciAoaSA9IDA7IGkgPCBNQVhfQ0xLUyAmJiBuYW1lW2ldOyBpKyspIHsNCisJCWNsa1tpXSA9IGRl dm1fY2xrX2dldCgmcGRldi0+ZGV2LCBuYW1lW2ldKTsNCisNCisJCWlmIChJU19FUlIoY2xrW2ld KSkgew0KKwkJCWRldl9lcnIoJnBkZXYtPmRldiwNCisJCQkJImdldCBiYXNpYyBjbGsgJXMgZmFp bCAlbGRcbiIsDQorCQkJCW5hbWVbaV0sIFBUUl9FUlIoY2xrW2ldKSk7DQorCQkJcmV0dXJuIFBU Ul9FUlIoY2xrW2ldKTsNCisJCX0NCisJfQ0KKw0KKwlyZXR1cm4gMDsNCiB9DQogDQogc3RhdGlj IHN0cnVjdCBzY3AgKmluaXRfc2NwKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYsDQpAQCAt NDI5LDkgKzQwOSw4IEBAIHN0YXRpYyBzdHJ1Y3Qgc2NwICppbml0X3NjcChzdHJ1Y3QgcGxhdGZv cm1fZGV2aWNlICpwZGV2LA0KIHsNCiAJc3RydWN0IGdlbnBkX29uZWNlbGxfZGF0YSAqcGRfZGF0 YTsNCiAJc3RydWN0IHJlc291cmNlICpyZXM7DQotCWludCBpLCBqOw0KKwlpbnQgaSwgcmV0Ow0K IAlzdHJ1Y3Qgc2NwICpzY3A7DQotCXN0cnVjdCBjbGsgKmNsa1tDTEtfTUFYXTsNCiANCiAJc2Nw ID0gZGV2bV9remFsbG9jKCZwZGV2LT5kZXYsIHNpemVvZigqc2NwKSwgR0ZQX0tFUk5FTCk7DQog CWlmICghc2NwKQ0KQEAgLTQ4NCw4ICs0NjMsNiBAQCBzdGF0aWMgc3RydWN0IHNjcCAqaW5pdF9z Y3Aoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldiwNCiANCiAJcGRfZGF0YS0+bnVtX2RvbWFp bnMgPSBudW07DQogDQotCWluaXRfY2xrcyhwZGV2LCBjbGspOw0KLQ0KIAlmb3IgKGkgPSAwOyBp IDwgbnVtOyBpKyspIHsNCiAJCXN0cnVjdCBzY3BfZG9tYWluICpzY3BkID0gJnNjcC0+ZG9tYWlu c1tpXTsNCiAJCXN0cnVjdCBnZW5lcmljX3BtX2RvbWFpbiAqZ2VucGQgPSAmc2NwZC0+Z2VucGQ7 DQpAQCAtNDk2LDI3ICs0NzMsOSBAQCBzdGF0aWMgc3RydWN0IHNjcCAqaW5pdF9zY3Aoc3RydWN0 IHBsYXRmb3JtX2RldmljZSAqcGRldiwNCiANCiAJCXNjcGQtPmRhdGEgPSBkYXRhOw0KIA0KLQkJ aWYgKGRhdGEtPmNsa19pZFswXSkgew0KLQkJCVdBUk5fT04oZGF0YS0+YmFzaWNfY2xrX25hbWVb MF0pOw0KLQ0KLQkJCWZvciAoaiA9IDA7IGogPCBNQVhfQ0xLUyAmJiBkYXRhLT5jbGtfaWRbal07 IGorKykgew0KLQkJCQlzdHJ1Y3QgY2xrICpjID0gY2xrW2RhdGEtPmNsa19pZFtqXV07DQotDQot CQkJCWlmIChJU19FUlIoYykpIHsNCi0JCQkJCWRldl9lcnIoJnBkZXYtPmRldiwNCi0JCQkJCQki JXM6IGNsayB1bmF2YWlsYWJsZVxuIiwNCi0JCQkJCQlkYXRhLT5uYW1lKTsNCi0JCQkJCXJldHVy biBFUlJfQ0FTVChjKTsNCi0JCQkJfQ0KLQ0KLQkJCQlzY3BkLT5jbGtbal0gPSBjOw0KLQkJCX0N Ci0JCX0gZWxzZSBpZiAoZGF0YS0+YmFzaWNfY2xrX25hbWVbMF0pIHsNCi0JCQlmb3IgKGogPSAw OyBqIDwgTUFYX0NMS1MgJiYNCi0JCQkJCWRhdGEtPmJhc2ljX2Nsa19uYW1lW2pdOyBqKyspDQot CQkJCXNjcGQtPmNsa1tqXSA9IGRldm1fY2xrX2dldCgmcGRldi0+ZGV2LA0KLQkJCQkJCWRhdGEt PmJhc2ljX2Nsa19uYW1lW2pdKTsNCi0JCX0NCisJCXJldCA9IGluaXRfYmFzaWNfY2xrcyhwZGV2 LCBzY3BkLT5jbGssIGRhdGEtPmJhc2ljX2Nsa19uYW1lKTsNCisJCWlmIChyZXQpDQorCQkJcmV0 dXJuIEVSUl9QVFIocmV0KTsNCiANCiAJCWdlbnBkLT5uYW1lID0gZGF0YS0+bmFtZTsNCiAJCWdl bnBkLT5wb3dlcl9vZmYgPSBzY3BzeXNfcG93ZXJfb2ZmOw0KQEAgLTU3Myw3ICs1MzIsNiBAQCBz dGF0aWMgdm9pZCBtdGtfcmVnaXN0ZXJfcG93ZXJfZG9tYWlucyhzdHJ1Y3QgcGxhdGZvcm1fZGV2 aWNlICpwZGV2LA0KIAkJLmN0bF9vZmZzID0gU1BNX0NPTk5fUFdSX0NPTiwNCiAJCS5idXNfcHJv dF9tYXNrID0gTVQyNzAxX1RPUF9BWElfUFJPVF9FTl9DT05OX00gfA0KIAkJCQkgTVQyNzAxX1RP UF9BWElfUFJPVF9FTl9DT05OX1MsDQotCQkuY2xrX2lkID0ge0NMS19OT05FfSwNCiAJCS5jYXBz ID0gTVRLX1NDUERfQUNUSVZFX1dBS0VVUCwNCiAJfSwNCiAJW01UMjcwMV9QT1dFUl9ET01BSU5f RElTUF0gPSB7DQpAQCAtNTgxLDcgKzUzOSw3IEBAIHN0YXRpYyB2b2lkIG10a19yZWdpc3Rlcl9w b3dlcl9kb21haW5zKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYsDQogCQkuc3RhX21hc2sg PSBQV1JfU1RBVFVTX0RJU1AsDQogCQkuY3RsX29mZnMgPSBTUE1fRElTX1BXUl9DT04sDQogCQku c3JhbV9wZG5fYml0cyA9IEdFTk1BU0soMTEsIDgpLA0KLQkJLmNsa19pZCA9IHtDTEtfTU19LA0K KwkJLmJhc2ljX2Nsa19uYW1lID0geyJtbSJ9LA0KIAkJLmJ1c19wcm90X21hc2sgPSBNVDI3MDFf VE9QX0FYSV9QUk9UX0VOX01NX00wLA0KIAkJLmNhcHMgPSBNVEtfU0NQRF9BQ1RJVkVfV0FLRVVQ LA0KIAl9LA0KQEAgLTU5MSw3ICs1NDksNyBAQCBzdGF0aWMgdm9pZCBtdGtfcmVnaXN0ZXJfcG93 ZXJfZG9tYWlucyhzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2LA0KIAkJLmN0bF9vZmZzID0g U1BNX01GR19QV1JfQ09OLA0KIAkJLnNyYW1fcGRuX2JpdHMgPSBHRU5NQVNLKDExLCA4KSwNCiAJ CS5zcmFtX3Bkbl9hY2tfYml0cyA9IEdFTk1BU0soMTIsIDEyKSwNCi0JCS5jbGtfaWQgPSB7Q0xL X01GR30sDQorCQkuYmFzaWNfY2xrX25hbWUgPSB7Im1mZyJ9LA0KIAkJLmNhcHMgPSBNVEtfU0NQ RF9BQ1RJVkVfV0FLRVVQLA0KIAl9LA0KIAlbTVQyNzAxX1BPV0VSX0RPTUFJTl9WREVDXSA9IHsN CkBAIC02MDAsNyArNTU4LDcgQEAgc3RhdGljIHZvaWQgbXRrX3JlZ2lzdGVyX3Bvd2VyX2RvbWFp bnMoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldiwNCiAJCS5jdGxfb2ZmcyA9IFNQTV9WREVf UFdSX0NPTiwNCiAJCS5zcmFtX3Bkbl9iaXRzID0gR0VOTUFTSygxMSwgOCksDQogCQkuc3JhbV9w ZG5fYWNrX2JpdHMgPSBHRU5NQVNLKDEyLCAxMiksDQotCQkuY2xrX2lkID0ge0NMS19NTX0sDQor CQkuYmFzaWNfY2xrX25hbWUgPSB7Im1tIn0sDQogCQkuY2FwcyA9IE1US19TQ1BEX0FDVElWRV9X QUtFVVAsDQogCX0sDQogCVtNVDI3MDFfUE9XRVJfRE9NQUlOX0lTUF0gPSB7DQpAQCAtNjA5LDcg KzU2Nyw3IEBAIHN0YXRpYyB2b2lkIG10a19yZWdpc3Rlcl9wb3dlcl9kb21haW5zKHN0cnVjdCBw bGF0Zm9ybV9kZXZpY2UgKnBkZXYsDQogCQkuY3RsX29mZnMgPSBTUE1fSVNQX1BXUl9DT04sDQog CQkuc3JhbV9wZG5fYml0cyA9IEdFTk1BU0soMTEsIDgpLA0KIAkJLnNyYW1fcGRuX2Fja19iaXRz ID0gR0VOTUFTSygxMywgMTIpLA0KLQkJLmNsa19pZCA9IHtDTEtfTU19LA0KKwkJLmJhc2ljX2Ns a19uYW1lID0geyJtbSJ9LA0KIAkJLmNhcHMgPSBNVEtfU0NQRF9BQ1RJVkVfV0FLRVVQLA0KIAl9 LA0KIAlbTVQyNzAxX1BPV0VSX0RPTUFJTl9CRFBdID0gew0KQEAgLTYxNyw3ICs1NzUsNiBAQCBz dGF0aWMgdm9pZCBtdGtfcmVnaXN0ZXJfcG93ZXJfZG9tYWlucyhzdHJ1Y3QgcGxhdGZvcm1fZGV2 aWNlICpwZGV2LA0KIAkJLnN0YV9tYXNrID0gUFdSX1NUQVRVU19CRFAsDQogCQkuY3RsX29mZnMg PSBTUE1fQkRQX1BXUl9DT04sDQogCQkuc3JhbV9wZG5fYml0cyA9IEdFTk1BU0soMTEsIDgpLA0K LQkJLmNsa19pZCA9IHtDTEtfTk9ORX0sDQogCQkuY2FwcyA9IE1US19TQ1BEX0FDVElWRV9XQUtF VVAsDQogCX0sDQogCVtNVDI3MDFfUE9XRVJfRE9NQUlOX0VUSF0gPSB7DQpAQCAtNjI2LDcgKzU4 Myw3IEBAIHN0YXRpYyB2b2lkIG10a19yZWdpc3Rlcl9wb3dlcl9kb21haW5zKHN0cnVjdCBwbGF0 Zm9ybV9kZXZpY2UgKnBkZXYsDQogCQkuY3RsX29mZnMgPSBTUE1fRVRIX1BXUl9DT04sDQogCQku c3JhbV9wZG5fYml0cyA9IEdFTk1BU0soMTEsIDgpLA0KIAkJLnNyYW1fcGRuX2Fja19iaXRzID0g R0VOTUFTSygxNSwgMTIpLA0KLQkJLmNsa19pZCA9IHtDTEtfRVRISUZ9LA0KKwkJLmJhc2ljX2Ns a19uYW1lID0geyJldGhpZiJ9LA0KIAkJLmNhcHMgPSBNVEtfU0NQRF9BQ1RJVkVfV0FLRVVQLA0K IAl9LA0KIAlbTVQyNzAxX1BPV0VSX0RPTUFJTl9ISUZdID0gew0KQEAgLTYzNSwxNCArNTkyLDEz IEBAIHN0YXRpYyB2b2lkIG10a19yZWdpc3Rlcl9wb3dlcl9kb21haW5zKHN0cnVjdCBwbGF0Zm9y bV9kZXZpY2UgKnBkZXYsDQogCQkuY3RsX29mZnMgPSBTUE1fSElGX1BXUl9DT04sDQogCQkuc3Jh bV9wZG5fYml0cyA9IEdFTk1BU0soMTEsIDgpLA0KIAkJLnNyYW1fcGRuX2Fja19iaXRzID0gR0VO TUFTSygxNSwgMTIpLA0KLQkJLmNsa19pZCA9IHtDTEtfRVRISUZ9LA0KKwkJLmJhc2ljX2Nsa19u YW1lID0geyJldGhpZiJ9LA0KIAkJLmNhcHMgPSBNVEtfU0NQRF9BQ1RJVkVfV0FLRVVQLA0KIAl9 LA0KIAlbTVQyNzAxX1BPV0VSX0RPTUFJTl9JRlJfTVNDXSA9IHsNCiAJCS5uYW1lID0gImlmcl9t c2MiLA0KIAkJLnN0YV9tYXNrID0gUFdSX1NUQVRVU19JRlJfTVNDLA0KIAkJLmN0bF9vZmZzID0g U1BNX0lGUl9NU0NfUFdSX0NPTiwNCi0JCS5jbGtfaWQgPSB7Q0xLX05PTkV9LA0KIAkJLmNhcHMg PSBNVEtfU0NQRF9BQ1RJVkVfV0FLRVVQLA0KIAl9LA0KIH07DQpAQCAtNjU3LDcgKzYxMyw3IEBA IHN0YXRpYyB2b2lkIG10a19yZWdpc3Rlcl9wb3dlcl9kb21haW5zKHN0cnVjdCBwbGF0Zm9ybV9k ZXZpY2UgKnBkZXYsDQogCQkuY3RsX29mZnMgPSBTUE1fRElTX1BXUl9DT04sDQogCQkuc3JhbV9w ZG5fYml0cyA9IEdFTk1BU0soOCwgOCksDQogCQkuc3JhbV9wZG5fYWNrX2JpdHMgPSBHRU5NQVNL KDEyLCAxMiksDQotCQkuY2xrX2lkID0ge0NMS19NTX0sDQorCQkuYmFzaWNfY2xrX25hbWUgPSB7 Im1tIn0sDQogCQkuY2FwcyA9IE1US19TQ1BEX0FDVElWRV9XQUtFVVAsDQogCX0sDQogCVtNVDI3 MTJfUE9XRVJfRE9NQUlOX1ZERUNdID0gew0KQEAgLTY2Niw3ICs2MjIsNyBAQCBzdGF0aWMgdm9p ZCBtdGtfcmVnaXN0ZXJfcG93ZXJfZG9tYWlucyhzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2 LA0KIAkJLmN0bF9vZmZzID0gU1BNX1ZERV9QV1JfQ09OLA0KIAkJLnNyYW1fcGRuX2JpdHMgPSBH RU5NQVNLKDgsIDgpLA0KIAkJLnNyYW1fcGRuX2Fja19iaXRzID0gR0VOTUFTSygxMiwgMTIpLA0K LQkJLmNsa19pZCA9IHtDTEtfTU0sIENMS19WREVDfSwNCisJCS5iYXNpY19jbGtfbmFtZSA9IHsi bW0iLCAidmRlYyJ9LA0KIAkJLmNhcHMgPSBNVEtfU0NQRF9BQ1RJVkVfV0FLRVVQLA0KIAl9LA0K IAlbTVQyNzEyX1BPV0VSX0RPTUFJTl9WRU5DXSA9IHsNCkBAIC02NzUsNyArNjMxLDcgQEAgc3Rh dGljIHZvaWQgbXRrX3JlZ2lzdGVyX3Bvd2VyX2RvbWFpbnMoc3RydWN0IHBsYXRmb3JtX2Rldmlj ZSAqcGRldiwNCiAJCS5jdGxfb2ZmcyA9IFNQTV9WRU5fUFdSX0NPTiwNCiAJCS5zcmFtX3Bkbl9i aXRzID0gR0VOTUFTSygxMSwgOCksDQogCQkuc3JhbV9wZG5fYWNrX2JpdHMgPSBHRU5NQVNLKDE1 LCAxMiksDQotCQkuY2xrX2lkID0ge0NMS19NTSwgQ0xLX1ZFTkMsIENMS19KUEdERUN9LA0KKwkJ LmJhc2ljX2Nsa19uYW1lID0geyJtbSIsICJ2ZW5jIiwgImpwZ2RlYyJ9LA0KIAkJLmNhcHMgPSBN VEtfU0NQRF9BQ1RJVkVfV0FLRVVQLA0KIAl9LA0KIAlbTVQyNzEyX1BPV0VSX0RPTUFJTl9JU1Bd ID0gew0KQEAgLTY4NCw3ICs2NDAsNyBAQCBzdGF0aWMgdm9pZCBtdGtfcmVnaXN0ZXJfcG93ZXJf ZG9tYWlucyhzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2LA0KIAkJLmN0bF9vZmZzID0gU1BN X0lTUF9QV1JfQ09OLA0KIAkJLnNyYW1fcGRuX2JpdHMgPSBHRU5NQVNLKDExLCA4KSwNCiAJCS5z cmFtX3Bkbl9hY2tfYml0cyA9IEdFTk1BU0soMTMsIDEyKSwNCi0JCS5jbGtfaWQgPSB7Q0xLX01N fSwNCisJCS5iYXNpY19jbGtfbmFtZSA9IHsibW0ifSwNCiAJCS5jYXBzID0gTVRLX1NDUERfQUNU SVZFX1dBS0VVUCwNCiAJfSwNCiAJW01UMjcxMl9QT1dFUl9ET01BSU5fQVVESU9dID0gew0KQEAg LTY5Myw3ICs2NDksNyBAQCBzdGF0aWMgdm9pZCBtdGtfcmVnaXN0ZXJfcG93ZXJfZG9tYWlucyhz dHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2LA0KIAkJLmN0bF9vZmZzID0gU1BNX0FVRElPX1BX Ul9DT04sDQogCQkuc3JhbV9wZG5fYml0cyA9IEdFTk1BU0soMTEsIDgpLA0KIAkJLnNyYW1fcGRu X2Fja19iaXRzID0gR0VOTUFTSygxNSwgMTIpLA0KLQkJLmNsa19pZCA9IHtDTEtfQVVESU99LA0K KwkJLmJhc2ljX2Nsa19uYW1lID0geyJhdWRpbyJ9LA0KIAkJLmNhcHMgPSBNVEtfU0NQRF9BQ1RJ VkVfV0FLRVVQLA0KIAl9LA0KIAlbTVQyNzEyX1BPV0VSX0RPTUFJTl9VU0JdID0gew0KQEAgLTcw Miw3ICs2NTgsNiBAQCBzdGF0aWMgdm9pZCBtdGtfcmVnaXN0ZXJfcG93ZXJfZG9tYWlucyhzdHJ1 Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2LA0KIAkJLmN0bF9vZmZzID0gU1BNX1VTQl9QV1JfQ09O LA0KIAkJLnNyYW1fcGRuX2JpdHMgPSBHRU5NQVNLKDEwLCA4KSwNCiAJCS5zcmFtX3Bkbl9hY2tf Yml0cyA9IEdFTk1BU0soMTQsIDEyKSwNCi0JCS5jbGtfaWQgPSB7Q0xLX05PTkV9LA0KIAkJLmNh cHMgPSBNVEtfU0NQRF9BQ1RJVkVfV0FLRVVQLA0KIAl9LA0KIAlbTVQyNzEyX1BPV0VSX0RPTUFJ Tl9VU0IyXSA9IHsNCkBAIC03MTEsNyArNjY2LDYgQEAgc3RhdGljIHZvaWQgbXRrX3JlZ2lzdGVy X3Bvd2VyX2RvbWFpbnMoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldiwNCiAJCS5jdGxfb2Zm cyA9IFNQTV9VU0IyX1BXUl9DT04sDQogCQkuc3JhbV9wZG5fYml0cyA9IEdFTk1BU0soMTAsIDgp LA0KIAkJLnNyYW1fcGRuX2Fja19iaXRzID0gR0VOTUFTSygxNCwgMTIpLA0KLQkJLmNsa19pZCA9 IHtDTEtfTk9ORX0sDQogCQkuY2FwcyA9IE1US19TQ1BEX0FDVElWRV9XQUtFVVAsDQogCX0sDQog CVtNVDI3MTJfUE9XRVJfRE9NQUlOX01GR10gPSB7DQpAQCAtNzIwLDcgKzY3NCw3IEBAIHN0YXRp YyB2b2lkIG10a19yZWdpc3Rlcl9wb3dlcl9kb21haW5zKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2Ug KnBkZXYsDQogCQkuY3RsX29mZnMgPSBTUE1fTUZHX1BXUl9DT04sDQogCQkuc3JhbV9wZG5fYml0 cyA9IEdFTk1BU0soOCwgOCksDQogCQkuc3JhbV9wZG5fYWNrX2JpdHMgPSBHRU5NQVNLKDE2LCAx NiksDQotCQkuY2xrX2lkID0ge0NMS19NRkd9LA0KKwkJLmJhc2ljX2Nsa19uYW1lID0geyJtZmci fSwNCiAJCS5idXNfcHJvdF9tYXNrID0gQklUKDE0KSB8IEJJVCgyMSkgfCBCSVQoMjMpLA0KIAkJ LmNhcHMgPSBNVEtfU0NQRF9BQ1RJVkVfV0FLRVVQLA0KIAl9LA0KQEAgLTczMCw3ICs2ODQsNiBA QCBzdGF0aWMgdm9pZCBtdGtfcmVnaXN0ZXJfcG93ZXJfZG9tYWlucyhzdHJ1Y3QgcGxhdGZvcm1f ZGV2aWNlICpwZGV2LA0KIAkJLmN0bF9vZmZzID0gMHgwMmMwLA0KIAkJLnNyYW1fcGRuX2JpdHMg PSBHRU5NQVNLKDgsIDgpLA0KIAkJLnNyYW1fcGRuX2Fja19iaXRzID0gR0VOTUFTSygxNiwgMTYp LA0KLQkJLmNsa19pZCA9IHtDTEtfTk9ORX0sDQogCQkuY2FwcyA9IE1US19TQ1BEX0FDVElWRV9X QUtFVVAsDQogCX0sDQogCVtNVDI3MTJfUE9XRVJfRE9NQUlOX01GR19TQzJdID0gew0KQEAgLTcz OSw3ICs2OTIsNiBAQCBzdGF0aWMgdm9pZCBtdGtfcmVnaXN0ZXJfcG93ZXJfZG9tYWlucyhzdHJ1 Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2LA0KIAkJLmN0bF9vZmZzID0gMHgwMmM0LA0KIAkJLnNy YW1fcGRuX2JpdHMgPSBHRU5NQVNLKDgsIDgpLA0KIAkJLnNyYW1fcGRuX2Fja19iaXRzID0gR0VO TUFTSygxNiwgMTYpLA0KLQkJLmNsa19pZCA9IHtDTEtfTk9ORX0sDQogCQkuY2FwcyA9IE1US19T Q1BEX0FDVElWRV9XQUtFVVAsDQogCX0sDQogCVtNVDI3MTJfUE9XRVJfRE9NQUlOX01GR19TQzNd ID0gew0KQEAgLTc0OCw3ICs3MDAsNiBAQCBzdGF0aWMgdm9pZCBtdGtfcmVnaXN0ZXJfcG93ZXJf ZG9tYWlucyhzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2LA0KIAkJLmN0bF9vZmZzID0gMHgw MWY4LA0KIAkJLnNyYW1fcGRuX2JpdHMgPSBHRU5NQVNLKDgsIDgpLA0KIAkJLnNyYW1fcGRuX2Fj a19iaXRzID0gR0VOTUFTSygxNiwgMTYpLA0KLQkJLmNsa19pZCA9IHtDTEtfTk9ORX0sDQogCQku Y2FwcyA9IE1US19TQ1BEX0FDVElWRV9XQUtFVVAsDQogCX0sDQogfTsNCkBAIC03NzMsNyArNzI0 LDcgQEAgc3RhdGljIHZvaWQgbXRrX3JlZ2lzdGVyX3Bvd2VyX2RvbWFpbnMoc3RydWN0IHBsYXRm b3JtX2RldmljZSAqcGRldiwNCiAJCS5jdGxfb2ZmcyA9IDB4MzAwLA0KIAkJLnNyYW1fcGRuX2Jp dHMgPSBHRU5NQVNLKDgsIDgpLA0KIAkJLnNyYW1fcGRuX2Fja19iaXRzID0gR0VOTUFTSygxMiwg MTIpLA0KLQkJLmNsa19pZCA9IHtDTEtfVkRFQ30sDQorCQkuYmFzaWNfY2xrX25hbWUgPSB7InZk ZWMifSwNCiAJfSwNCiAJW01UNjc5N19QT1dFUl9ET01BSU5fVkVOQ10gPSB7DQogCQkubmFtZSA9 ICJ2ZW5jIiwNCkBAIC03ODEsNyArNzMyLDYgQEAgc3RhdGljIHZvaWQgbXRrX3JlZ2lzdGVyX3Bv d2VyX2RvbWFpbnMoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldiwNCiAJCS5jdGxfb2ZmcyA9 IDB4MzA0LA0KIAkJLnNyYW1fcGRuX2JpdHMgPSBHRU5NQVNLKDExLCA4KSwNCiAJCS5zcmFtX3Bk bl9hY2tfYml0cyA9IEdFTk1BU0soMTUsIDEyKSwNCi0JCS5jbGtfaWQgPSB7Q0xLX05PTkV9LA0K IAl9LA0KIAlbTVQ2Nzk3X1BPV0VSX0RPTUFJTl9JU1BdID0gew0KIAkJLm5hbWUgPSAiaXNwIiwN CkBAIC03ODksNyArNzM5LDYgQEAgc3RhdGljIHZvaWQgbXRrX3JlZ2lzdGVyX3Bvd2VyX2RvbWFp bnMoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldiwNCiAJCS5jdGxfb2ZmcyA9IDB4MzA4LA0K IAkJLnNyYW1fcGRuX2JpdHMgPSBHRU5NQVNLKDksIDgpLA0KIAkJLnNyYW1fcGRuX2Fja19iaXRz ID0gR0VOTUFTSygxMywgMTIpLA0KLQkJLmNsa19pZCA9IHtDTEtfTk9ORX0sDQogCX0sDQogCVtN VDY3OTdfUE9XRVJfRE9NQUlOX01NXSA9IHsNCiAJCS5uYW1lID0gIm1tIiwNCkBAIC03OTcsNyAr NzQ2LDcgQEAgc3RhdGljIHZvaWQgbXRrX3JlZ2lzdGVyX3Bvd2VyX2RvbWFpbnMoc3RydWN0IHBs YXRmb3JtX2RldmljZSAqcGRldiwNCiAJCS5jdGxfb2ZmcyA9IDB4MzBDLA0KIAkJLnNyYW1fcGRu X2JpdHMgPSBHRU5NQVNLKDgsIDgpLA0KIAkJLnNyYW1fcGRuX2Fja19iaXRzID0gR0VOTUFTSygx MiwgMTIpLA0KLQkJLmNsa19pZCA9IHtDTEtfTU19LA0KKwkJLmJhc2ljX2Nsa19uYW1lID0geyJt bSJ9LA0KIAkJLmJ1c19wcm90X21hc2sgPSAoQklUKDEpIHwgQklUKDIpKSwNCiAJfSwNCiAJW01U Njc5N19QT1dFUl9ET01BSU5fQVVESU9dID0gew0KQEAgLTgwNiw3ICs3NTUsNiBAQCBzdGF0aWMg dm9pZCBtdGtfcmVnaXN0ZXJfcG93ZXJfZG9tYWlucyhzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpw ZGV2LA0KIAkJLmN0bF9vZmZzID0gMHgzMTQsDQogCQkuc3JhbV9wZG5fYml0cyA9IEdFTk1BU0so MTEsIDgpLA0KIAkJLnNyYW1fcGRuX2Fja19iaXRzID0gR0VOTUFTSygxNSwgMTIpLA0KLQkJLmNs a19pZCA9IHtDTEtfTk9ORX0sDQogCX0sDQogCVtNVDY3OTdfUE9XRVJfRE9NQUlOX01GR19BU1lO Q10gPSB7DQogCQkubmFtZSA9ICJtZmdfYXN5bmMiLA0KQEAgLTgxNCw3ICs3NjIsNyBAQCBzdGF0 aWMgdm9pZCBtdGtfcmVnaXN0ZXJfcG93ZXJfZG9tYWlucyhzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNl ICpwZGV2LA0KIAkJLmN0bF9vZmZzID0gMHgzMzQsDQogCQkuc3JhbV9wZG5fYml0cyA9IDAsDQog CQkuc3JhbV9wZG5fYWNrX2JpdHMgPSAwLA0KLQkJLmNsa19pZCA9IHtDTEtfTUZHfSwNCisJCS5i YXNpY19jbGtfbmFtZSA9IHsibWZnIn0sDQogCX0sDQogCVtNVDY3OTdfUE9XRVJfRE9NQUlOX01K Q10gPSB7DQogCQkubmFtZSA9ICJtamMiLA0KQEAgLTgyMiw3ICs3NzAsNiBAQCBzdGF0aWMgdm9p ZCBtdGtfcmVnaXN0ZXJfcG93ZXJfZG9tYWlucyhzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2 LA0KIAkJLmN0bF9vZmZzID0gMHgzMTAsDQogCQkuc3JhbV9wZG5fYml0cyA9IEdFTk1BU0soOCwg OCksDQogCQkuc3JhbV9wZG5fYWNrX2JpdHMgPSBHRU5NQVNLKDEyLCAxMiksDQotCQkuY2xrX2lk ID0ge0NMS19OT05FfSwNCiAJfSwNCiB9Ow0KIA0KQEAgLTg0Nyw3ICs3OTQsNiBAQCBzdGF0aWMg dm9pZCBtdGtfcmVnaXN0ZXJfcG93ZXJfZG9tYWlucyhzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpw ZGV2LA0KIAkJLmN0bF9vZmZzID0gU1BNX0VUSFNZU19QV1JfQ09OLA0KIAkJLnNyYW1fcGRuX2Jp dHMgPSBHRU5NQVNLKDExLCA4KSwNCiAJCS5zcmFtX3Bkbl9hY2tfYml0cyA9IEdFTk1BU0soMTUs IDEyKSwNCi0JCS5jbGtfaWQgPSB7Q0xLX05PTkV9LA0KIAkJLmJ1c19wcm90X21hc2sgPSBNVDc2 MjJfVE9QX0FYSV9QUk9UX0VOX0VUSFNZUywNCiAJCS5jYXBzID0gTVRLX1NDUERfQUNUSVZFX1dB S0VVUCwNCiAJfSwNCkBAIC04NTcsNyArODAzLDcgQEAgc3RhdGljIHZvaWQgbXRrX3JlZ2lzdGVy X3Bvd2VyX2RvbWFpbnMoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldiwNCiAJCS5jdGxfb2Zm cyA9IFNQTV9ISUYwX1BXUl9DT04sDQogCQkuc3JhbV9wZG5fYml0cyA9IEdFTk1BU0soMTEsIDgp LA0KIAkJLnNyYW1fcGRuX2Fja19iaXRzID0gR0VOTUFTSygxNSwgMTIpLA0KLQkJLmNsa19pZCA9 IHtDTEtfSElGU0VMfSwNCisJCS5iYXNpY19jbGtfbmFtZSA9IHsiaGlmX3NlbCJ9LA0KIAkJLmJ1 c19wcm90X21hc2sgPSBNVDc2MjJfVE9QX0FYSV9QUk9UX0VOX0hJRjAsDQogCQkuY2FwcyA9IE1U S19TQ1BEX0FDVElWRV9XQUtFVVAsDQogCX0sDQpAQCAtODY3LDcgKzgxMyw3IEBAIHN0YXRpYyB2 b2lkIG10a19yZWdpc3Rlcl9wb3dlcl9kb21haW5zKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBk ZXYsDQogCQkuY3RsX29mZnMgPSBTUE1fSElGMV9QV1JfQ09OLA0KIAkJLnNyYW1fcGRuX2JpdHMg PSBHRU5NQVNLKDExLCA4KSwNCiAJCS5zcmFtX3Bkbl9hY2tfYml0cyA9IEdFTk1BU0soMTUsIDEy KSwNCi0JCS5jbGtfaWQgPSB7Q0xLX0hJRlNFTH0sDQorCQkuYmFzaWNfY2xrX25hbWUgPSB7Imhp Zl9zZWwifSwNCiAJCS5idXNfcHJvdF9tYXNrID0gTVQ3NjIyX1RPUF9BWElfUFJPVF9FTl9ISUYx LA0KIAkJLmNhcHMgPSBNVEtfU0NQRF9BQ1RJVkVfV0FLRVVQLA0KIAl9LA0KQEAgLTg3Nyw3ICs4 MjMsNiBAQCBzdGF0aWMgdm9pZCBtdGtfcmVnaXN0ZXJfcG93ZXJfZG9tYWlucyhzdHJ1Y3QgcGxh dGZvcm1fZGV2aWNlICpwZGV2LA0KIAkJLmN0bF9vZmZzID0gU1BNX1dCX1BXUl9DT04sDQogCQku c3JhbV9wZG5fYml0cyA9IDAsDQogCQkuc3JhbV9wZG5fYWNrX2JpdHMgPSAwLA0KLQkJLmNsa19p ZCA9IHtDTEtfTk9ORX0sDQogCQkuYnVzX3Byb3RfbWFzayA9IE1UNzYyMl9UT1BfQVhJX1BST1Rf RU5fV0IsDQogCQkuY2FwcyA9IE1US19TQ1BEX0FDVElWRV9XQUtFVVAgfCBNVEtfU0NQRF9GV0FJ VF9TUkFNLA0KIAl9LA0KQEAgLTg5NCw3ICs4MzksNiBAQCBzdGF0aWMgdm9pZCBtdGtfcmVnaXN0 ZXJfcG93ZXJfZG9tYWlucyhzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2LA0KIAkJLmN0bF9v ZmZzID0gU1BNX0NPTk5fUFdSX0NPTiwNCiAJCS5idXNfcHJvdF9tYXNrID0gTVQyNzAxX1RPUF9B WElfUFJPVF9FTl9DT05OX00gfA0KIAkJCQkgTVQyNzAxX1RPUF9BWElfUFJPVF9FTl9DT05OX1Ms DQotCQkuY2xrX2lkID0ge0NMS19OT05FfSwNCiAJCS5jYXBzID0gTVRLX1NDUERfQUNUSVZFX1dB S0VVUCwNCiAJfSwNCiAJW01UNzYyM0FfUE9XRVJfRE9NQUlOX0VUSF0gPSB7DQpAQCAtOTAzLDcg Kzg0Nyw3IEBAIHN0YXRpYyB2b2lkIG10a19yZWdpc3Rlcl9wb3dlcl9kb21haW5zKHN0cnVjdCBw bGF0Zm9ybV9kZXZpY2UgKnBkZXYsDQogCQkuY3RsX29mZnMgPSBTUE1fRVRIX1BXUl9DT04sDQog CQkuc3JhbV9wZG5fYml0cyA9IEdFTk1BU0soMTEsIDgpLA0KIAkJLnNyYW1fcGRuX2Fja19iaXRz ID0gR0VOTUFTSygxNSwgMTIpLA0KLQkJLmNsa19pZCA9IHtDTEtfRVRISUZ9LA0KKwkJLmJhc2lj X2Nsa19uYW1lID0geyJldGhpZiJ9LA0KIAkJLmNhcHMgPSBNVEtfU0NQRF9BQ1RJVkVfV0FLRVVQ LA0KIAl9LA0KIAlbTVQ3NjIzQV9QT1dFUl9ET01BSU5fSElGXSA9IHsNCkBAIC05MTIsMTQgKzg1 NiwxMyBAQCBzdGF0aWMgdm9pZCBtdGtfcmVnaXN0ZXJfcG93ZXJfZG9tYWlucyhzdHJ1Y3QgcGxh dGZvcm1fZGV2aWNlICpwZGV2LA0KIAkJLmN0bF9vZmZzID0gU1BNX0hJRl9QV1JfQ09OLA0KIAkJ LnNyYW1fcGRuX2JpdHMgPSBHRU5NQVNLKDExLCA4KSwNCiAJCS5zcmFtX3Bkbl9hY2tfYml0cyA9 IEdFTk1BU0soMTUsIDEyKSwNCi0JCS5jbGtfaWQgPSB7Q0xLX0VUSElGfSwNCisJCS5iYXNpY19j bGtfbmFtZSA9IHsiZXRoaWYifSwNCiAJCS5jYXBzID0gTVRLX1NDUERfQUNUSVZFX1dBS0VVUCwN CiAJfSwNCiAJW01UNzYyM0FfUE9XRVJfRE9NQUlOX0lGUl9NU0NdID0gew0KIAkJLm5hbWUgPSAi aWZyX21zYyIsDQogCQkuc3RhX21hc2sgPSBQV1JfU1RBVFVTX0lGUl9NU0MsDQogCQkuY3RsX29m ZnMgPSBTUE1fSUZSX01TQ19QV1JfQ09OLA0KLQkJLmNsa19pZCA9IHtDTEtfTk9ORX0sDQogCQku Y2FwcyA9IE1US19TQ1BEX0FDVElWRV9XQUtFVVAsDQogCX0sDQogfTsNCkBAIC05MzUsNyArODc4 LDcgQEAgc3RhdGljIHZvaWQgbXRrX3JlZ2lzdGVyX3Bvd2VyX2RvbWFpbnMoc3RydWN0IHBsYXRm b3JtX2RldmljZSAqcGRldiwNCiAJCS5jdGxfb2ZmcyA9IFNQTV9WREVfUFdSX0NPTiwNCiAJCS5z cmFtX3Bkbl9iaXRzID0gR0VOTUFTSygxMSwgOCksDQogCQkuc3JhbV9wZG5fYWNrX2JpdHMgPSBH RU5NQVNLKDEyLCAxMiksDQotCQkuY2xrX2lkID0ge0NMS19NTX0sDQorCQkuYmFzaWNfY2xrX25h bWUgPSB7Im1tIn0sDQogCX0sDQogCVtNVDgxNzNfUE9XRVJfRE9NQUlOX1ZFTkNdID0gew0KIAkJ Lm5hbWUgPSAidmVuYyIsDQpAQCAtOTQzLDcgKzg4Niw3IEBAIHN0YXRpYyB2b2lkIG10a19yZWdp c3Rlcl9wb3dlcl9kb21haW5zKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYsDQogCQkuY3Rs X29mZnMgPSBTUE1fVkVOX1BXUl9DT04sDQogCQkuc3JhbV9wZG5fYml0cyA9IEdFTk1BU0soMTEs IDgpLA0KIAkJLnNyYW1fcGRuX2Fja19iaXRzID0gR0VOTUFTSygxNSwgMTIpLA0KLQkJLmNsa19p ZCA9IHtDTEtfTU0sIENMS19WRU5DfSwNCisJCS5iYXNpY19jbGtfbmFtZSA9IHsibW0iLCAidmVu YyJ9LA0KIAl9LA0KIAlbTVQ4MTczX1BPV0VSX0RPTUFJTl9JU1BdID0gew0KIAkJLm5hbWUgPSAi aXNwIiwNCkBAIC05NTEsNyArODk0LDcgQEAgc3RhdGljIHZvaWQgbXRrX3JlZ2lzdGVyX3Bvd2Vy X2RvbWFpbnMoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldiwNCiAJCS5jdGxfb2ZmcyA9IFNQ TV9JU1BfUFdSX0NPTiwNCiAJCS5zcmFtX3Bkbl9iaXRzID0gR0VOTUFTSygxMSwgOCksDQogCQku c3JhbV9wZG5fYWNrX2JpdHMgPSBHRU5NQVNLKDEzLCAxMiksDQotCQkuY2xrX2lkID0ge0NMS19N TX0sDQorCQkuYmFzaWNfY2xrX25hbWUgPSB7Im1tIn0sDQogCX0sDQogCVtNVDgxNzNfUE9XRVJf RE9NQUlOX01NXSA9IHsNCiAJCS5uYW1lID0gIm1tIiwNCkBAIC05NTksNyArOTAyLDcgQEAgc3Rh dGljIHZvaWQgbXRrX3JlZ2lzdGVyX3Bvd2VyX2RvbWFpbnMoc3RydWN0IHBsYXRmb3JtX2Rldmlj ZSAqcGRldiwNCiAJCS5jdGxfb2ZmcyA9IFNQTV9ESVNfUFdSX0NPTiwNCiAJCS5zcmFtX3Bkbl9i aXRzID0gR0VOTUFTSygxMSwgOCksDQogCQkuc3JhbV9wZG5fYWNrX2JpdHMgPSBHRU5NQVNLKDEy LCAxMiksDQotCQkuY2xrX2lkID0ge0NMS19NTX0sDQorCQkuYmFzaWNfY2xrX25hbWUgPSB7Im1t In0sDQogCQkuYnVzX3Byb3RfbWFzayA9IE1UODE3M19UT1BfQVhJX1BST1RfRU5fTU1fTTAgfA0K IAkJCU1UODE3M19UT1BfQVhJX1BST1RfRU5fTU1fTTEsDQogCX0sDQpAQCAtOTY5LDcgKzkxMiw3 IEBAIHN0YXRpYyB2b2lkIG10a19yZWdpc3Rlcl9wb3dlcl9kb21haW5zKHN0cnVjdCBwbGF0Zm9y bV9kZXZpY2UgKnBkZXYsDQogCQkuY3RsX29mZnMgPSBTUE1fVkVOMl9QV1JfQ09OLA0KIAkJLnNy YW1fcGRuX2JpdHMgPSBHRU5NQVNLKDExLCA4KSwNCiAJCS5zcmFtX3Bkbl9hY2tfYml0cyA9IEdF Tk1BU0soMTUsIDEyKSwNCi0JCS5jbGtfaWQgPSB7Q0xLX01NLCBDTEtfVkVOQ19MVH0sDQorCQku YmFzaWNfY2xrX25hbWUgPSB7Im1tIiwgInZlbmNfbHQifSwNCiAJfSwNCiAJW01UODE3M19QT1dF Ul9ET01BSU5fQVVESU9dID0gew0KIAkJLm5hbWUgPSAiYXVkaW8iLA0KQEAgLTk3Nyw3ICs5MjAs NiBAQCBzdGF0aWMgdm9pZCBtdGtfcmVnaXN0ZXJfcG93ZXJfZG9tYWlucyhzdHJ1Y3QgcGxhdGZv cm1fZGV2aWNlICpwZGV2LA0KIAkJLmN0bF9vZmZzID0gU1BNX0FVRElPX1BXUl9DT04sDQogCQku c3JhbV9wZG5fYml0cyA9IEdFTk1BU0soMTEsIDgpLA0KIAkJLnNyYW1fcGRuX2Fja19iaXRzID0g R0VOTUFTSygxNSwgMTIpLA0KLQkJLmNsa19pZCA9IHtDTEtfTk9ORX0sDQogCX0sDQogCVtNVDgx NzNfUE9XRVJfRE9NQUlOX1VTQl0gPSB7DQogCQkubmFtZSA9ICJ1c2IiLA0KQEAgLTk4NSw3ICs5 MjcsNiBAQCBzdGF0aWMgdm9pZCBtdGtfcmVnaXN0ZXJfcG93ZXJfZG9tYWlucyhzdHJ1Y3QgcGxh dGZvcm1fZGV2aWNlICpwZGV2LA0KIAkJLmN0bF9vZmZzID0gU1BNX1VTQl9QV1JfQ09OLA0KIAkJ LnNyYW1fcGRuX2JpdHMgPSBHRU5NQVNLKDExLCA4KSwNCiAJCS5zcmFtX3Bkbl9hY2tfYml0cyA9 IEdFTk1BU0soMTUsIDEyKSwNCi0JCS5jbGtfaWQgPSB7Q0xLX05PTkV9LA0KIAkJLmNhcHMgPSBN VEtfU0NQRF9BQ1RJVkVfV0FLRVVQLA0KIAl9LA0KIAlbTVQ4MTczX1BPV0VSX0RPTUFJTl9NRkdf QVNZTkNdID0gew0KQEAgLTk5NCw3ICs5MzUsNyBAQCBzdGF0aWMgdm9pZCBtdGtfcmVnaXN0ZXJf cG93ZXJfZG9tYWlucyhzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2LA0KIAkJLmN0bF9vZmZz ID0gU1BNX01GR19BU1lOQ19QV1JfQ09OLA0KIAkJLnNyYW1fcGRuX2JpdHMgPSBHRU5NQVNLKDEx LCA4KSwNCiAJCS5zcmFtX3Bkbl9hY2tfYml0cyA9IDAsDQotCQkuY2xrX2lkID0ge0NMS19NRkd9 LA0KKwkJLmJhc2ljX2Nsa19uYW1lID0geyJtZmcifSwNCiAJfSwNCiAJW01UODE3M19QT1dFUl9E T01BSU5fTUZHXzJEXSA9IHsNCiAJCS5uYW1lID0gIm1mZ18yZCIsDQpAQCAtMTAwMiw3ICs5NDMs NiBAQCBzdGF0aWMgdm9pZCBtdGtfcmVnaXN0ZXJfcG93ZXJfZG9tYWlucyhzdHJ1Y3QgcGxhdGZv cm1fZGV2aWNlICpwZGV2LA0KIAkJLmN0bF9vZmZzID0gU1BNX01GR18yRF9QV1JfQ09OLA0KIAkJ LnNyYW1fcGRuX2JpdHMgPSBHRU5NQVNLKDExLCA4KSwNCiAJCS5zcmFtX3Bkbl9hY2tfYml0cyA9 IEdFTk1BU0soMTMsIDEyKSwNCi0JCS5jbGtfaWQgPSB7Q0xLX05PTkV9LA0KIAl9LA0KIAlbTVQ4 MTczX1BPV0VSX0RPTUFJTl9NRkddID0gew0KIAkJLm5hbWUgPSAibWZnIiwNCkBAIC0xMDEwLDcg Kzk1MCw2IEBAIHN0YXRpYyB2b2lkIG10a19yZWdpc3Rlcl9wb3dlcl9kb21haW5zKHN0cnVjdCBw bGF0Zm9ybV9kZXZpY2UgKnBkZXYsDQogCQkuY3RsX29mZnMgPSBTUE1fTUZHX1BXUl9DT04sDQog CQkuc3JhbV9wZG5fYml0cyA9IEdFTk1BU0soMTMsIDgpLA0KIAkJLnNyYW1fcGRuX2Fja19iaXRz ID0gR0VOTUFTSygyMSwgMTYpLA0KLQkJLmNsa19pZCA9IHtDTEtfTk9ORX0sDQogCQkuYnVzX3By b3RfbWFzayA9IE1UODE3M19UT1BfQVhJX1BST1RfRU5fTUZHX1MgfA0KIAkJCU1UODE3M19UT1Bf QVhJX1BST1RfRU5fTUZHX00wIHwNCiAJCQlNVDgxNzNfVE9QX0FYSV9QUk9UX0VOX01GR19NMSB8 DQotLSANCjEuOC4xLjEuZGlydHkNCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0AE8FC43603 for ; Wed, 18 Dec 2019 08:44:12 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CD05221D7D for ; Wed, 18 Dec 2019 08:44:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="YNfe+jyW"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="pJUj35WI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CD05221D7D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=spsE+b3h5OILL/x6+s9aHlRelJ2eEYlgtCs5nf81j+o=; b=YNfe+jyWJ13OUV gwm/N03t9BZM9zcceSjy8TWzoYIyUg2w9TfWC88gVI+wkWUaEebL4hXvfEF/slHSELASfmTiLdc+Y H6IVYk17TmHebsaFOcTAyJbWvZx25BXqUIvpDyCnnNqPgAxd0KTNkRxbOXqplKDhdAK/5yy/HMA6i aysxj09TD04gUHif+755qSEzHwAKIHfFvKPVFOOpGC+t+OKFjwiTJul2zl1ziGqspmSNOmHp2dc8t dVjbm8BXv0ru3H3Atq5R8GLq/ISyYubsZYOvLd8i7yIuwElV/aCLhsKUlUhFOdjGtOSV9I1ANu62N cmJwRQAxpuEPCiLcIO3Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ihUwF-00075t-Du; Wed, 18 Dec 2019 08:44:11 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ihUtM-0004Dh-AU; Wed, 18 Dec 2019 08:41:15 +0000 X-UUID: f4b46dfba6154bc4b4c0dc9a28930499-20191218 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=LlqNfu8Jj/aGUxTJ03631SHV6I0sitPKzQp9PdmWbfY=; b=pJUj35WIDwsWTnZUVyhTsNkqj9mOqvGcxAVeVsaseoToZaKUj1oV9hQeseIelD1ybYlwUDqq2NYuYIUKWLnZQs2jsy2fwWhqFrjmDgb0I92nY7L85uRM3Sz3RCStJnbPnxgZWZH+AfvPafYE11lFeJDSezNuQPNbcEKHEwvnxVw=; X-UUID: f4b46dfba6154bc4b4c0dc9a28930499-20191218 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 555098521; Wed, 18 Dec 2019 00:41:00 -0800 Received: from mtkmbs07n1.mediatek.inc (172.21.101.16) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 18 Dec 2019 00:31:20 -0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 18 Dec 2019 16:30:41 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Wed, 18 Dec 2019 16:30:29 +0800 From: Weiyi Lu To: Nicolas Boichat , Matthias Brugger , Rob Herring , Sascha Hauer Subject: [PATCH v10 04/12] soc: mediatek: Use basic_clk_name for all compatibles Date: Wed, 18 Dec 2019 16:30:40 +0800 Message-ID: <1576657848-14711-5-git-send-email-weiyi.lu@mediatek.com> X-Mailer: git-send-email 1.8.1.1.dirty In-Reply-To: <1576657848-14711-1-git-send-email-weiyi.lu@mediatek.com> References: <1576657848-14711-1-git-send-email-weiyi.lu@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191218_004112_474581_440512AF X-CRM114-Status: GOOD ( 13.28 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: James Liao , Weiyi Lu , srv_heupstream@mediatek.com, linux-kernel@vger.kernel.org, Fan Chen , linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Use basic_clk_name strings for all compatibles, instead of mixing clk_id and clk_name. Signed-off-by: Weiyi Lu --- drivers/soc/mediatek/mtk-scpsys.c | 149 +++++++++++--------------------------- 1 file changed, 44 insertions(+), 105 deletions(-) diff --git a/drivers/soc/mediatek/mtk-scpsys.c b/drivers/soc/mediatek/mtk-scpsys.c index 9343277..db35a28 100644 --- a/drivers/soc/mediatek/mtk-scpsys.c +++ b/drivers/soc/mediatek/mtk-scpsys.c @@ -78,34 +78,6 @@ #define PWR_STATUS_HIF1 BIT(26) /* MT7622 */ #define PWR_STATUS_WB BIT(27) /* MT7622 */ -enum clk_id { - CLK_NONE, - CLK_MM, - CLK_MFG, - CLK_VENC, - CLK_VENC_LT, - CLK_ETHIF, - CLK_VDEC, - CLK_HIFSEL, - CLK_JPGDEC, - CLK_AUDIO, - CLK_MAX, -}; - -static const char * const clk_names[] = { - NULL, - "mm", - "mfg", - "venc", - "venc_lt", - "ethif", - "vdec", - "hif_sel", - "jpgdec", - "audio", - NULL, -}; - #define MAX_CLKS 3 /** @@ -116,9 +88,7 @@ enum clk_id { * @sram_pdn_bits: The mask for sram power control bits. * @sram_pdn_ack_bits: The mask for sram power control acked bits. * @bus_prot_mask: The mask for single step bus protection. - * @clk_id: The basic clocks required by this power domain. - * @basic_clk_name: provide the same purpose with field "clk_id" - * by declaring basic clock prefix name rather than clk_id. + * @basic_clk_name: The basic clocks required by this power domain. * @caps: The flag for active wake-up action. */ struct scp_domain_data { @@ -128,7 +98,6 @@ struct scp_domain_data { u32 sram_pdn_bits; u32 sram_pdn_ack_bits; u32 bus_prot_mask; - enum clk_id clk_id[MAX_CLKS]; const char *basic_clk_name[MAX_CLKS]; u8 caps; }; @@ -414,12 +383,23 @@ static int scpsys_power_off(struct generic_pm_domain *genpd) return ret; } -static void init_clks(struct platform_device *pdev, struct clk **clk) +static int init_basic_clks(struct platform_device *pdev, struct clk **clk, + const char * const *name) { int i; - for (i = CLK_NONE + 1; i < CLK_MAX; i++) - clk[i] = devm_clk_get(&pdev->dev, clk_names[i]); + for (i = 0; i < MAX_CLKS && name[i]; i++) { + clk[i] = devm_clk_get(&pdev->dev, name[i]); + + if (IS_ERR(clk[i])) { + dev_err(&pdev->dev, + "get basic clk %s fail %ld\n", + name[i], PTR_ERR(clk[i])); + return PTR_ERR(clk[i]); + } + } + + return 0; } static struct scp *init_scp(struct platform_device *pdev, @@ -429,9 +409,8 @@ static struct scp *init_scp(struct platform_device *pdev, { struct genpd_onecell_data *pd_data; struct resource *res; - int i, j; + int i, ret; struct scp *scp; - struct clk *clk[CLK_MAX]; scp = devm_kzalloc(&pdev->dev, sizeof(*scp), GFP_KERNEL); if (!scp) @@ -484,8 +463,6 @@ static struct scp *init_scp(struct platform_device *pdev, pd_data->num_domains = num; - init_clks(pdev, clk); - for (i = 0; i < num; i++) { struct scp_domain *scpd = &scp->domains[i]; struct generic_pm_domain *genpd = &scpd->genpd; @@ -496,27 +473,9 @@ static struct scp *init_scp(struct platform_device *pdev, scpd->data = data; - if (data->clk_id[0]) { - WARN_ON(data->basic_clk_name[0]); - - for (j = 0; j < MAX_CLKS && data->clk_id[j]; j++) { - struct clk *c = clk[data->clk_id[j]]; - - if (IS_ERR(c)) { - dev_err(&pdev->dev, - "%s: clk unavailable\n", - data->name); - return ERR_CAST(c); - } - - scpd->clk[j] = c; - } - } else if (data->basic_clk_name[0]) { - for (j = 0; j < MAX_CLKS && - data->basic_clk_name[j]; j++) - scpd->clk[j] = devm_clk_get(&pdev->dev, - data->basic_clk_name[j]); - } + ret = init_basic_clks(pdev, scpd->clk, data->basic_clk_name); + if (ret) + return ERR_PTR(ret); genpd->name = data->name; genpd->power_off = scpsys_power_off; @@ -573,7 +532,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_CONN_PWR_CON, .bus_prot_mask = MT2701_TOP_AXI_PROT_EN_CONN_M | MT2701_TOP_AXI_PROT_EN_CONN_S, - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_DISP] = { @@ -581,7 +539,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .sta_mask = PWR_STATUS_DISP, .ctl_offs = SPM_DIS_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .bus_prot_mask = MT2701_TOP_AXI_PROT_EN_MM_M0, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, @@ -591,7 +549,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_MFG_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MFG}, + .basic_clk_name = {"mfg"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_VDEC] = { @@ -600,7 +558,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_VDE_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_ISP] = { @@ -609,7 +567,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ISP_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(13, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_BDP] = { @@ -617,7 +575,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .sta_mask = PWR_STATUS_BDP, .ctl_offs = SPM_BDP_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_ETH] = { @@ -626,7 +583,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ETH_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_ETHIF}, + .basic_clk_name = {"ethif"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_HIF] = { @@ -635,14 +592,13 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_HIF_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_ETHIF}, + .basic_clk_name = {"ethif"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_IFR_MSC] = { .name = "ifr_msc", .sta_mask = PWR_STATUS_IFR_MSC, .ctl_offs = SPM_IFR_MSC_PWR_CON, - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, }; @@ -657,7 +613,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_DIS_PWR_CON, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_VDEC] = { @@ -666,7 +622,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_VDE_PWR_CON, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MM, CLK_VDEC}, + .basic_clk_name = {"mm", "vdec"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_VENC] = { @@ -675,7 +631,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_VEN_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_MM, CLK_VENC, CLK_JPGDEC}, + .basic_clk_name = {"mm", "venc", "jpgdec"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_ISP] = { @@ -684,7 +640,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ISP_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(13, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_AUDIO] = { @@ -693,7 +649,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_AUDIO_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_AUDIO}, + .basic_clk_name = {"audio"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_USB] = { @@ -702,7 +658,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_USB_PWR_CON, .sram_pdn_bits = GENMASK(10, 8), .sram_pdn_ack_bits = GENMASK(14, 12), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_USB2] = { @@ -711,7 +666,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_USB2_PWR_CON, .sram_pdn_bits = GENMASK(10, 8), .sram_pdn_ack_bits = GENMASK(14, 12), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_MFG] = { @@ -720,7 +674,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_MFG_PWR_CON, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(16, 16), - .clk_id = {CLK_MFG}, + .basic_clk_name = {"mfg"}, .bus_prot_mask = BIT(14) | BIT(21) | BIT(23), .caps = MTK_SCPD_ACTIVE_WAKEUP, }, @@ -730,7 +684,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x02c0, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(16, 16), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_MFG_SC2] = { @@ -739,7 +692,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x02c4, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(16, 16), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_MFG_SC3] = { @@ -748,7 +700,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x01f8, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(16, 16), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, }; @@ -773,7 +724,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x300, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_VDEC}, + .basic_clk_name = {"vdec"}, }, [MT6797_POWER_DOMAIN_VENC] = { .name = "venc", @@ -781,7 +732,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x304, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_NONE}, }, [MT6797_POWER_DOMAIN_ISP] = { .name = "isp", @@ -789,7 +739,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x308, .sram_pdn_bits = GENMASK(9, 8), .sram_pdn_ack_bits = GENMASK(13, 12), - .clk_id = {CLK_NONE}, }, [MT6797_POWER_DOMAIN_MM] = { .name = "mm", @@ -797,7 +746,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x30C, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .bus_prot_mask = (BIT(1) | BIT(2)), }, [MT6797_POWER_DOMAIN_AUDIO] = { @@ -806,7 +755,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x314, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_NONE}, }, [MT6797_POWER_DOMAIN_MFG_ASYNC] = { .name = "mfg_async", @@ -814,7 +762,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x334, .sram_pdn_bits = 0, .sram_pdn_ack_bits = 0, - .clk_id = {CLK_MFG}, + .basic_clk_name = {"mfg"}, }, [MT6797_POWER_DOMAIN_MJC] = { .name = "mjc", @@ -822,7 +770,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x310, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_NONE}, }, }; @@ -847,7 +794,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ETHSYS_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_NONE}, .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_ETHSYS, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, @@ -857,7 +803,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_HIF0_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_HIFSEL}, + .basic_clk_name = {"hif_sel"}, .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_HIF0, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, @@ -867,7 +813,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_HIF1_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_HIFSEL}, + .basic_clk_name = {"hif_sel"}, .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_HIF1, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, @@ -877,7 +823,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_WB_PWR_CON, .sram_pdn_bits = 0, .sram_pdn_ack_bits = 0, - .clk_id = {CLK_NONE}, .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_WB, .caps = MTK_SCPD_ACTIVE_WAKEUP | MTK_SCPD_FWAIT_SRAM, }, @@ -894,7 +839,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_CONN_PWR_CON, .bus_prot_mask = MT2701_TOP_AXI_PROT_EN_CONN_M | MT2701_TOP_AXI_PROT_EN_CONN_S, - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT7623A_POWER_DOMAIN_ETH] = { @@ -903,7 +847,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ETH_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_ETHIF}, + .basic_clk_name = {"ethif"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT7623A_POWER_DOMAIN_HIF] = { @@ -912,14 +856,13 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_HIF_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_ETHIF}, + .basic_clk_name = {"ethif"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT7623A_POWER_DOMAIN_IFR_MSC] = { .name = "ifr_msc", .sta_mask = PWR_STATUS_IFR_MSC, .ctl_offs = SPM_IFR_MSC_PWR_CON, - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, }; @@ -935,7 +878,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_VDE_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, }, [MT8173_POWER_DOMAIN_VENC] = { .name = "venc", @@ -943,7 +886,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_VEN_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_MM, CLK_VENC}, + .basic_clk_name = {"mm", "venc"}, }, [MT8173_POWER_DOMAIN_ISP] = { .name = "isp", @@ -951,7 +894,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ISP_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(13, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, }, [MT8173_POWER_DOMAIN_MM] = { .name = "mm", @@ -959,7 +902,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_DIS_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .bus_prot_mask = MT8173_TOP_AXI_PROT_EN_MM_M0 | MT8173_TOP_AXI_PROT_EN_MM_M1, }, @@ -969,7 +912,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_VEN2_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_MM, CLK_VENC_LT}, + .basic_clk_name = {"mm", "venc_lt"}, }, [MT8173_POWER_DOMAIN_AUDIO] = { .name = "audio", @@ -977,7 +920,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_AUDIO_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_NONE}, }, [MT8173_POWER_DOMAIN_USB] = { .name = "usb", @@ -985,7 +927,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_USB_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT8173_POWER_DOMAIN_MFG_ASYNC] = { @@ -994,7 +935,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_MFG_ASYNC_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = 0, - .clk_id = {CLK_MFG}, + .basic_clk_name = {"mfg"}, }, [MT8173_POWER_DOMAIN_MFG_2D] = { .name = "mfg_2d", @@ -1002,7 +943,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_MFG_2D_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(13, 12), - .clk_id = {CLK_NONE}, }, [MT8173_POWER_DOMAIN_MFG] = { .name = "mfg", @@ -1010,7 +950,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_MFG_PWR_CON, .sram_pdn_bits = GENMASK(13, 8), .sram_pdn_ack_bits = GENMASK(21, 16), - .clk_id = {CLK_NONE}, .bus_prot_mask = MT8173_TOP_AXI_PROT_EN_MFG_S | MT8173_TOP_AXI_PROT_EN_MFG_M0 | MT8173_TOP_AXI_PROT_EN_MFG_M1 | -- 1.8.1.1.dirty _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 69A79C43603 for ; Wed, 18 Dec 2019 08:44:49 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0134421D7D for ; Wed, 18 Dec 2019 08:44:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="qos7ePIO"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="pJUj35WI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0134421D7D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=vgkbMU3llrr+aEGP+j8rFq/eJGyt3SuS3m83ibcnURc=; b=qos7ePIO7WRpaQ FdWcsf8Osmy1F9Bsf4Yc71m0by3B4XOTkv6Lg8nmX3l+b3nZQxrq+vs11gDMoz7UtKpnHM2t85n4b nbaA2/keqB+OrGWTKMDZIutUKDIBlMT+Pnht33yXkVQCXiTD41sdipbNyMeHAjpNdIyZoWM9oXjfG yKXP4ei9peJdX6ztty1FkDF335IgCKEzzV9Di4sEtMzkl99ILYu7HaS/yZFqt/+vULv/lC9A2FPmT 73oJTVbbj+8QPNvs2pPGguzN9j3FwYkwx09QinnWPQ91jMpdmATXW3W9GjrZqu0arHqC+lNaqV3FM Z9OGvlsKSNdGROQ5E8+g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ihUwo-0007wM-CG; Wed, 18 Dec 2019 08:44:46 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ihUtM-0004Dh-AU; Wed, 18 Dec 2019 08:41:15 +0000 X-UUID: f4b46dfba6154bc4b4c0dc9a28930499-20191218 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=LlqNfu8Jj/aGUxTJ03631SHV6I0sitPKzQp9PdmWbfY=; b=pJUj35WIDwsWTnZUVyhTsNkqj9mOqvGcxAVeVsaseoToZaKUj1oV9hQeseIelD1ybYlwUDqq2NYuYIUKWLnZQs2jsy2fwWhqFrjmDgb0I92nY7L85uRM3Sz3RCStJnbPnxgZWZH+AfvPafYE11lFeJDSezNuQPNbcEKHEwvnxVw=; X-UUID: f4b46dfba6154bc4b4c0dc9a28930499-20191218 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 555098521; Wed, 18 Dec 2019 00:41:00 -0800 Received: from mtkmbs07n1.mediatek.inc (172.21.101.16) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 18 Dec 2019 00:31:20 -0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 18 Dec 2019 16:30:41 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Wed, 18 Dec 2019 16:30:29 +0800 From: Weiyi Lu To: Nicolas Boichat , Matthias Brugger , Rob Herring , Sascha Hauer Subject: [PATCH v10 04/12] soc: mediatek: Use basic_clk_name for all compatibles Date: Wed, 18 Dec 2019 16:30:40 +0800 Message-ID: <1576657848-14711-5-git-send-email-weiyi.lu@mediatek.com> X-Mailer: git-send-email 1.8.1.1.dirty In-Reply-To: <1576657848-14711-1-git-send-email-weiyi.lu@mediatek.com> References: <1576657848-14711-1-git-send-email-weiyi.lu@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191218_004112_474581_440512AF X-CRM114-Status: GOOD ( 13.28 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: James Liao , Weiyi Lu , srv_heupstream@mediatek.com, linux-kernel@vger.kernel.org, Fan Chen , linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Use basic_clk_name strings for all compatibles, instead of mixing clk_id and clk_name. Signed-off-by: Weiyi Lu --- drivers/soc/mediatek/mtk-scpsys.c | 149 +++++++++++--------------------------- 1 file changed, 44 insertions(+), 105 deletions(-) diff --git a/drivers/soc/mediatek/mtk-scpsys.c b/drivers/soc/mediatek/mtk-scpsys.c index 9343277..db35a28 100644 --- a/drivers/soc/mediatek/mtk-scpsys.c +++ b/drivers/soc/mediatek/mtk-scpsys.c @@ -78,34 +78,6 @@ #define PWR_STATUS_HIF1 BIT(26) /* MT7622 */ #define PWR_STATUS_WB BIT(27) /* MT7622 */ -enum clk_id { - CLK_NONE, - CLK_MM, - CLK_MFG, - CLK_VENC, - CLK_VENC_LT, - CLK_ETHIF, - CLK_VDEC, - CLK_HIFSEL, - CLK_JPGDEC, - CLK_AUDIO, - CLK_MAX, -}; - -static const char * const clk_names[] = { - NULL, - "mm", - "mfg", - "venc", - "venc_lt", - "ethif", - "vdec", - "hif_sel", - "jpgdec", - "audio", - NULL, -}; - #define MAX_CLKS 3 /** @@ -116,9 +88,7 @@ enum clk_id { * @sram_pdn_bits: The mask for sram power control bits. * @sram_pdn_ack_bits: The mask for sram power control acked bits. * @bus_prot_mask: The mask for single step bus protection. - * @clk_id: The basic clocks required by this power domain. - * @basic_clk_name: provide the same purpose with field "clk_id" - * by declaring basic clock prefix name rather than clk_id. + * @basic_clk_name: The basic clocks required by this power domain. * @caps: The flag for active wake-up action. */ struct scp_domain_data { @@ -128,7 +98,6 @@ struct scp_domain_data { u32 sram_pdn_bits; u32 sram_pdn_ack_bits; u32 bus_prot_mask; - enum clk_id clk_id[MAX_CLKS]; const char *basic_clk_name[MAX_CLKS]; u8 caps; }; @@ -414,12 +383,23 @@ static int scpsys_power_off(struct generic_pm_domain *genpd) return ret; } -static void init_clks(struct platform_device *pdev, struct clk **clk) +static int init_basic_clks(struct platform_device *pdev, struct clk **clk, + const char * const *name) { int i; - for (i = CLK_NONE + 1; i < CLK_MAX; i++) - clk[i] = devm_clk_get(&pdev->dev, clk_names[i]); + for (i = 0; i < MAX_CLKS && name[i]; i++) { + clk[i] = devm_clk_get(&pdev->dev, name[i]); + + if (IS_ERR(clk[i])) { + dev_err(&pdev->dev, + "get basic clk %s fail %ld\n", + name[i], PTR_ERR(clk[i])); + return PTR_ERR(clk[i]); + } + } + + return 0; } static struct scp *init_scp(struct platform_device *pdev, @@ -429,9 +409,8 @@ static struct scp *init_scp(struct platform_device *pdev, { struct genpd_onecell_data *pd_data; struct resource *res; - int i, j; + int i, ret; struct scp *scp; - struct clk *clk[CLK_MAX]; scp = devm_kzalloc(&pdev->dev, sizeof(*scp), GFP_KERNEL); if (!scp) @@ -484,8 +463,6 @@ static struct scp *init_scp(struct platform_device *pdev, pd_data->num_domains = num; - init_clks(pdev, clk); - for (i = 0; i < num; i++) { struct scp_domain *scpd = &scp->domains[i]; struct generic_pm_domain *genpd = &scpd->genpd; @@ -496,27 +473,9 @@ static struct scp *init_scp(struct platform_device *pdev, scpd->data = data; - if (data->clk_id[0]) { - WARN_ON(data->basic_clk_name[0]); - - for (j = 0; j < MAX_CLKS && data->clk_id[j]; j++) { - struct clk *c = clk[data->clk_id[j]]; - - if (IS_ERR(c)) { - dev_err(&pdev->dev, - "%s: clk unavailable\n", - data->name); - return ERR_CAST(c); - } - - scpd->clk[j] = c; - } - } else if (data->basic_clk_name[0]) { - for (j = 0; j < MAX_CLKS && - data->basic_clk_name[j]; j++) - scpd->clk[j] = devm_clk_get(&pdev->dev, - data->basic_clk_name[j]); - } + ret = init_basic_clks(pdev, scpd->clk, data->basic_clk_name); + if (ret) + return ERR_PTR(ret); genpd->name = data->name; genpd->power_off = scpsys_power_off; @@ -573,7 +532,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_CONN_PWR_CON, .bus_prot_mask = MT2701_TOP_AXI_PROT_EN_CONN_M | MT2701_TOP_AXI_PROT_EN_CONN_S, - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_DISP] = { @@ -581,7 +539,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .sta_mask = PWR_STATUS_DISP, .ctl_offs = SPM_DIS_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .bus_prot_mask = MT2701_TOP_AXI_PROT_EN_MM_M0, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, @@ -591,7 +549,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_MFG_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MFG}, + .basic_clk_name = {"mfg"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_VDEC] = { @@ -600,7 +558,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_VDE_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_ISP] = { @@ -609,7 +567,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ISP_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(13, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_BDP] = { @@ -617,7 +575,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .sta_mask = PWR_STATUS_BDP, .ctl_offs = SPM_BDP_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_ETH] = { @@ -626,7 +583,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ETH_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_ETHIF}, + .basic_clk_name = {"ethif"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_HIF] = { @@ -635,14 +592,13 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_HIF_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_ETHIF}, + .basic_clk_name = {"ethif"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2701_POWER_DOMAIN_IFR_MSC] = { .name = "ifr_msc", .sta_mask = PWR_STATUS_IFR_MSC, .ctl_offs = SPM_IFR_MSC_PWR_CON, - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, }; @@ -657,7 +613,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_DIS_PWR_CON, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_VDEC] = { @@ -666,7 +622,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_VDE_PWR_CON, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MM, CLK_VDEC}, + .basic_clk_name = {"mm", "vdec"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_VENC] = { @@ -675,7 +631,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_VEN_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_MM, CLK_VENC, CLK_JPGDEC}, + .basic_clk_name = {"mm", "venc", "jpgdec"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_ISP] = { @@ -684,7 +640,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ISP_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(13, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_AUDIO] = { @@ -693,7 +649,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_AUDIO_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_AUDIO}, + .basic_clk_name = {"audio"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_USB] = { @@ -702,7 +658,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_USB_PWR_CON, .sram_pdn_bits = GENMASK(10, 8), .sram_pdn_ack_bits = GENMASK(14, 12), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_USB2] = { @@ -711,7 +666,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_USB2_PWR_CON, .sram_pdn_bits = GENMASK(10, 8), .sram_pdn_ack_bits = GENMASK(14, 12), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_MFG] = { @@ -720,7 +674,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_MFG_PWR_CON, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(16, 16), - .clk_id = {CLK_MFG}, + .basic_clk_name = {"mfg"}, .bus_prot_mask = BIT(14) | BIT(21) | BIT(23), .caps = MTK_SCPD_ACTIVE_WAKEUP, }, @@ -730,7 +684,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x02c0, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(16, 16), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_MFG_SC2] = { @@ -739,7 +692,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x02c4, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(16, 16), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT2712_POWER_DOMAIN_MFG_SC3] = { @@ -748,7 +700,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x01f8, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(16, 16), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, }; @@ -773,7 +724,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x300, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_VDEC}, + .basic_clk_name = {"vdec"}, }, [MT6797_POWER_DOMAIN_VENC] = { .name = "venc", @@ -781,7 +732,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x304, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_NONE}, }, [MT6797_POWER_DOMAIN_ISP] = { .name = "isp", @@ -789,7 +739,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x308, .sram_pdn_bits = GENMASK(9, 8), .sram_pdn_ack_bits = GENMASK(13, 12), - .clk_id = {CLK_NONE}, }, [MT6797_POWER_DOMAIN_MM] = { .name = "mm", @@ -797,7 +746,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x30C, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .bus_prot_mask = (BIT(1) | BIT(2)), }, [MT6797_POWER_DOMAIN_AUDIO] = { @@ -806,7 +755,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x314, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_NONE}, }, [MT6797_POWER_DOMAIN_MFG_ASYNC] = { .name = "mfg_async", @@ -814,7 +762,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x334, .sram_pdn_bits = 0, .sram_pdn_ack_bits = 0, - .clk_id = {CLK_MFG}, + .basic_clk_name = {"mfg"}, }, [MT6797_POWER_DOMAIN_MJC] = { .name = "mjc", @@ -822,7 +770,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = 0x310, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_NONE}, }, }; @@ -847,7 +794,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ETHSYS_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_NONE}, .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_ETHSYS, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, @@ -857,7 +803,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_HIF0_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_HIFSEL}, + .basic_clk_name = {"hif_sel"}, .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_HIF0, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, @@ -867,7 +813,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_HIF1_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_HIFSEL}, + .basic_clk_name = {"hif_sel"}, .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_HIF1, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, @@ -877,7 +823,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_WB_PWR_CON, .sram_pdn_bits = 0, .sram_pdn_ack_bits = 0, - .clk_id = {CLK_NONE}, .bus_prot_mask = MT7622_TOP_AXI_PROT_EN_WB, .caps = MTK_SCPD_ACTIVE_WAKEUP | MTK_SCPD_FWAIT_SRAM, }, @@ -894,7 +839,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_CONN_PWR_CON, .bus_prot_mask = MT2701_TOP_AXI_PROT_EN_CONN_M | MT2701_TOP_AXI_PROT_EN_CONN_S, - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT7623A_POWER_DOMAIN_ETH] = { @@ -903,7 +847,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ETH_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_ETHIF}, + .basic_clk_name = {"ethif"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT7623A_POWER_DOMAIN_HIF] = { @@ -912,14 +856,13 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_HIF_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_ETHIF}, + .basic_clk_name = {"ethif"}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT7623A_POWER_DOMAIN_IFR_MSC] = { .name = "ifr_msc", .sta_mask = PWR_STATUS_IFR_MSC, .ctl_offs = SPM_IFR_MSC_PWR_CON, - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, }; @@ -935,7 +878,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_VDE_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, }, [MT8173_POWER_DOMAIN_VENC] = { .name = "venc", @@ -943,7 +886,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_VEN_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_MM, CLK_VENC}, + .basic_clk_name = {"mm", "venc"}, }, [MT8173_POWER_DOMAIN_ISP] = { .name = "isp", @@ -951,7 +894,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_ISP_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(13, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, }, [MT8173_POWER_DOMAIN_MM] = { .name = "mm", @@ -959,7 +902,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_DIS_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(12, 12), - .clk_id = {CLK_MM}, + .basic_clk_name = {"mm"}, .bus_prot_mask = MT8173_TOP_AXI_PROT_EN_MM_M0 | MT8173_TOP_AXI_PROT_EN_MM_M1, }, @@ -969,7 +912,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_VEN2_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_MM, CLK_VENC_LT}, + .basic_clk_name = {"mm", "venc_lt"}, }, [MT8173_POWER_DOMAIN_AUDIO] = { .name = "audio", @@ -977,7 +920,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_AUDIO_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_NONE}, }, [MT8173_POWER_DOMAIN_USB] = { .name = "usb", @@ -985,7 +927,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_USB_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), - .clk_id = {CLK_NONE}, .caps = MTK_SCPD_ACTIVE_WAKEUP, }, [MT8173_POWER_DOMAIN_MFG_ASYNC] = { @@ -994,7 +935,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_MFG_ASYNC_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = 0, - .clk_id = {CLK_MFG}, + .basic_clk_name = {"mfg"}, }, [MT8173_POWER_DOMAIN_MFG_2D] = { .name = "mfg_2d", @@ -1002,7 +943,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_MFG_2D_PWR_CON, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(13, 12), - .clk_id = {CLK_NONE}, }, [MT8173_POWER_DOMAIN_MFG] = { .name = "mfg", @@ -1010,7 +950,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, .ctl_offs = SPM_MFG_PWR_CON, .sram_pdn_bits = GENMASK(13, 8), .sram_pdn_ack_bits = GENMASK(21, 16), - .clk_id = {CLK_NONE}, .bus_prot_mask = MT8173_TOP_AXI_PROT_EN_MFG_S | MT8173_TOP_AXI_PROT_EN_MFG_M0 | MT8173_TOP_AXI_PROT_EN_MFG_M1 | -- 1.8.1.1.dirty _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel