Received: by 10.223.185.116 with SMTP id b49csp5954270wrg; Wed, 7 Mar 2018 22:33:48 -0800 (PST) X-Google-Smtp-Source: AG47ELvpPc26yKkRSPGteQZqFGCRJs/gThBaRnlXh9IfqdZ8+bWddRQ4qRXIPuACvxpmQg3FfMBl X-Received: by 10.101.101.10 with SMTP id x10mr20594599pgv.223.1520490828816; Wed, 07 Mar 2018 22:33:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520490828; cv=none; d=google.com; s=arc-20160816; b=APGpSy1gvRzyh0CXBG3YxtF2XBeEbHiWp1A4ADUUl6Ewh9xDANodsSVrzxdh8ck3Sy pLV+5p6ouFkgujJ2BiP5f0lI9xQb+O6uIvHIQWCFld3ZC7XctuUnpG9IDp1EJsW0FZ+t wX5FbIcJZ9b/allY8YzUseyVOzNvhfqFWXXgnwH+ZrrZQ4TA4d2AVMSGtb8gb0Zuz7Q8 LeiWU5FaRf8nquYtqk76LspJRsocOnDkiwXD3ZBvjlnjXcAxhYSCJ0fE7Mrs+p9CPDiD OSbANHrf+dz00wp/aY6AcpM1xGpXhi1Qyhp+yy6PHpjDIa7zlGBZJB/u1E0H74pMUFaV cfoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=J7F5GP6frzALeVQ7fdvNbBEO/UsIh1GvQvU4hu+wxpM=; b=D+5XXKLE7hjUgWZV4o9z/uoEpaIetjL0AJGEdGXTzoTG6KQNPhR6QwJWuKL3ftH5tY smuPUI19QdKPV8K5+vsSh4mPJLKq6SOGP9OazK+r6pGTAajurei9f31U0tzKtsE87u5m CEVmJqfipEly/7GWJJBDKlWizg/OTdZ60ag49KP68gdN7yf7J5V4kR/pxvuaqCX/2HT4 0UNp0iB3AAvR1nHe/J6pT6YyhP9ywqZmOaW1AuIBalN3HLez9tLELqpfRro31Qh9rLKg zQ8JkyMfEtsp5khXMLpBlnytj0DrGru6sE98AjEbzIBrf5HOXreFEeRAUU9RJWjilW9A ko7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=fVWV6cDm; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y3-v6si11253922plk.707.2018.03.07.22.33.34; Wed, 07 Mar 2018 22:33:48 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=fVWV6cDm; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965574AbeCHFAE (ORCPT + 99 others); Thu, 8 Mar 2018 00:00:04 -0500 Received: from mail-bl2nam02on0092.outbound.protection.outlook.com ([104.47.38.92]:59552 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965473AbeCHE7w (ORCPT ); Wed, 7 Mar 2018 23:59:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=J7F5GP6frzALeVQ7fdvNbBEO/UsIh1GvQvU4hu+wxpM=; b=fVWV6cDmI6rHj2g3LB9YYT5IiIbJZaDMOGSnbadj3yoVi/GnWVXa99uI5lYI0FXNs7TdmZ/c71sUnzyj1CdNGXilX7OTfedInHOg5356TQES39/G9tykgQ2QjLcB6hd9MOiDRVnAyo2u/uHQ/TYPQyadNN07E3Kf9FgAVcNXUQ8= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0920.namprd21.prod.outlook.com (52.132.132.165) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.588.3; Thu, 8 Mar 2018 04:59:49 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0588.008; Thu, 8 Mar 2018 04:59:49 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Sergej Sawazki , Sebastian Hesselbarth , Rabeeh Khoury , Stephen Boyd , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 65/67] clk: si5351: Rename internal plls to avoid name collisions Thread-Topic: [PATCH AUTOSEL for 4.14 65/67] clk: si5351: Rename internal plls to avoid name collisions Thread-Index: AQHTtpoIdJRo5HR2WUSIvp7GGToj7g== Date: Thu, 8 Mar 2018 04:58:01 +0000 Message-ID: <20180308045641.7814-65-alexander.levin@microsoft.com> References: <20180308045641.7814-1-alexander.levin@microsoft.com> In-Reply-To: <20180308045641.7814-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB0920;7:QtUCIRCKRwFE23n5GWQgy4+6guE9Zr0SXLBvItirHJeNb0nLawNPqud/hFNpdpCQXtIQ+n8PPQBfUsWT4Tm2JgdhvA3EI+88U8DmZobiqqwKvxLuAbNPuF1ZRuN0CvJmLcvioVLH+CIxIvGXpAFipI5kQM6J5PC8Nq8Gr+qRYQjhXlsgOnaJMDJkjdtQJTDVll1MRfYah1P1lVpRMJHihWnya+Ur7aj+YT0oc6VlFO169u6trxMXw/KTrFVtJBRN;20:Q+JQ7F9ON6Gc/vnJHVHYwYAT7cDdmt0lcLxKtDJp3vVbhFxBqJ5wPdhTM2i3FPbzXF7rD0PJdhqFCuQF7+wCGLGXh5pgfeCJAzyd3MyV8FSrSgttgVhTvidvNZwUqWwAYtSTf+DyVYf3xMAV5BjW2Mi1yykr4HOaijV5N5amwZQ= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: b9f4a839-d87b-4c30-1b04-08d584b16b90 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020);SRVR:DM5PR2101MB0920; x-ms-traffictypediagnostic: DM5PR2101MB0920: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(85827821059158); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040501)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93001095)(3231220)(944501244)(52105095)(6055026)(61426038)(61427038)(6041288)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(6072148)(201708071742011);SRVR:DM5PR2101MB0920;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB0920; x-forefront-prvs: 060503E79B x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(979002)(39860400002)(396003)(39380400002)(346002)(366004)(376002)(189003)(199004)(81156014)(81166006)(5250100002)(8936002)(54906003)(2501003)(305945005)(8676002)(107886003)(110136005)(97736004)(99286004)(6436002)(36756003)(316002)(72206003)(76176011)(14454004)(6486002)(7736002)(478600001)(10290500003)(186003)(22452003)(59450400001)(68736007)(105586002)(2950100002)(106356001)(102836004)(575784001)(26005)(6506007)(86362001)(3660700001)(5660300001)(2906002)(10090500001)(1076002)(25786009)(2900100001)(53936002)(39060400002)(4326008)(66066001)(6512007)(6666003)(6116002)(3280700002)(3846002)(86612001)(22906009)(217873001)(969003)(989001)(999001)(1009001)(1019001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB0920;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: sTNeNU119XaGxTt5/83vKJL9NjWTQit1Wnzx5kKj9gkBmC6MYBOKojMEZuDBbPh5+csl4SIcEwBccZLznicomog+5sz0rEYGqiBAN1A6zpv1/w3iehQJwBzoi0MyOsJAL8Dxc3N7oyL4obU5KY9alJCYFE17EY1zK+1V1nvSbo6ac9ra6PIyKKi3jGaJshDqxiM/Qw9pWUVLfu5S6HhHUPF0JwnArqGeQkWaX33fLcVIVmKVkZB0elMZ8q2ImsUxgjT229zZoIBzZvQjr3/ek9OWyNq/rPfpmEZj39GRDyh/8Rja+1G4UcLwwjlfvKBccrWMn+dz6kQFhsuoOX6W4Q== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: b9f4a839-d87b-4c30-1b04-08d584b16b90 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Mar 2018 04:58:01.5788 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0920 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sergej Sawazki [ Upstream commit cdba9a4fb0b53703959ac861e415816cb61aded4 ] This drivers probe fails due to a clock name collision if a clock named 'plla' or 'pllb' is already registered when registering this drivers internal plls. Fix it by renaming internal plls to avoid name collisions. Cc: Sebastian Hesselbarth Cc: Rabeeh Khoury Signed-off-by: Sergej Sawazki Signed-off-by: Stephen Boyd Signed-off-by: Sasha Levin --- drivers/clk/clk-si5351.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/clk-si5351.c b/drivers/clk/clk-si5351.c index 20d90769cced..653b0f38d475 100644 --- a/drivers/clk/clk-si5351.c +++ b/drivers/clk/clk-si5351.c @@ -72,7 +72,7 @@ static const char * const si5351_input_names[] =3D { "xtal", "clkin" }; static const char * const si5351_pll_names[] =3D { - "plla", "pllb", "vxco" + "si5351_plla", "si5351_pllb", "si5351_vxco" }; static const char * const si5351_msynth_names[] =3D { "ms0", "ms1", "ms2", "ms3", "ms4", "ms5", "ms6", "ms7" --=20 2.14.1