From patchwork Thu Aug 30 18:01:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 145556 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp196749ljw; Thu, 30 Aug 2018 11:01:56 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZfIGn+y8i8iV4cb6BHHvIKPfqlFU2b8iGQRwMLYF1swsw9l5P5el5JZ7ZW5/GKruT6bT87 X-Received: by 2002:a62:959a:: with SMTP id c26-v6mr11640844pfk.234.1535652116044; Thu, 30 Aug 2018 11:01:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535652116; cv=none; d=google.com; s=arc-20160816; b=mv0xqj6I/X6Mrr61jVRw0SZIvJajZfisHJrVJwpVgXWf6Fz2/1wNW08JpvhvhQ/UiL bGKmVFv4wicPxRUmPcUYmncbvRNBzLMeKl97hYGrJXd8u3LIcLBcBw/n/LrZi1VJg0AG hn/JJybcTmoMibLzY7uRgPade13GQBg2pGFOnwBkSV4x3GZyrGCREkZUAJ3NUMzErvRO ax9JG8Kauvig0eTzqv4IkMr1bskjrm0s40P9cF8+RUpEaEeAjo/iunz8EWX/hqkxMk/J Mv5oYGefwaecMfwcBpoAnbE0VP+aubXKkWepYV8Xg9sSsbiLaBZi197PHp+0+UCZ9ylF s7Rw== 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=YP5Dxk17xnVTW+Q1iNbFLQFBh5qUjifSzo9LtuCBfjQ=; b=BuYzy2I48Bps5pZsRwPKPlw6QMtGDVnQed3Le0oedbkHrSUr+zH+IvUW4TW8aQ99al Z+R6e+3/npeSXhUn58pnGw6cXHcxIwmdP0D/nmfa8epx0EJifI+pXJAQEEyeuSKdDQo/ 8Qtvrys1IACrj+l3xksHPrRLLtuE7YiAukkES8NoKLNJqoET9/AF9tlHIUWRR0c7boLD 8SJBl5/spjbXZIYqDm0daqvKsCZzLgXT6n3tL0UzZAXH6kDMRUCvEkiqfEFk1X2MJHt8 XmI03Ojf8xFUionTHgFCGUqwjoGJu+HAzOGZTTKeyUWhjXQ5FDgdxb4DNlNyt4ipIdjL kfYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b="TGLn/kOl"; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 a64-v6si7831055pfb.224.2018.08.30.11.01.55; Thu, 30 Aug 2018 11:01:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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="TGLn/kOl"; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 S1727338AbeH3WFO (ORCPT + 13 others); Thu, 30 Aug 2018 18:05:14 -0400 Received: from mail-by2nam03on0134.outbound.protection.outlook.com ([104.47.42.134]:34736 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727270AbeH3WFO (ORCPT ); Thu, 30 Aug 2018 18:05:14 -0400 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:X-MS-Exchange-SenderADCheck; bh=YP5Dxk17xnVTW+Q1iNbFLQFBh5qUjifSzo9LtuCBfjQ=; b=TGLn/kOlvkIe8g7UCk3byrHrphXISVGSs3OdCLF5DZcIYseRRr+V3p44VxFi5sxj6vjezn4WosqZB5WSsJangZnEOM4Mhn0J/S0sGXbh/83tnyP0oxbK/IKs0B8rpDCIcROVuRTFuAJla+DexpQ1LDCQe2YwfiowrWiMOgl14Tc= Received: from CY4PR21MB0776.namprd21.prod.outlook.com (10.173.192.22) by CY4PR21MB0856.namprd21.prod.outlook.com (10.173.192.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1122.1; Thu, 30 Aug 2018 18:01:52 +0000 Received: from CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::7c3a:eea8:1391:1611]) by CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::7c3a:eea8:1391:1611%7]) with mapi id 15.20.1122.009; Thu, 30 Aug 2018 18:01:52 +0000 From: Sasha Levin To: "stable@vger.kernel.org" CC: Jerome Brunet , Thierry Reding , Sasha Levin Subject: [PATCH AUTOSEL 4.18 022/113] pwm: meson: Fix mux clock names Thread-Topic: [PATCH AUTOSEL 4.18 022/113] pwm: meson: Fix mux clock names Thread-Index: AQHUQIuHv71lRxwPgkC2RmgyMuacqQ== Date: Thu, 30 Aug 2018 18:01:52 +0000 Message-ID: <20180830180050.35735-22-alexander.levin@microsoft.com> References: <20180830180050.35735-1-alexander.levin@microsoft.com> In-Reply-To: <20180830180050.35735-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; CY4PR21MB0856; 6:e3vu/0pKBxsOzNohBFe+zMmS3ZBffmhEjdijsFwLodDKJji/3Xz59T3PXrkuR8gl/cPixKpodvcRDsvI43cyW3ED/7tcTMP71LGrhBUEV6Zmmfqdh6AEtnzIEkbqcqYTxy1Xn+oyVb1kqoOmDXJHxmzV+3nvwYDkINmB36ISre+quRQeFUZAUykRe2CY8E0XnqtCUDWy6lXnWNQJpwS6anIeeMpaJUtK55JjnqXHm7cHTSIb47sFxsa1p7MtCv0ivmK9vSy/3kvmlB96JvBxTahkPxcuSisit0gD4JSu/0qhlAnYlE5kXW1QU/eaXtYJ1gf+ZZss6n3c3r/vvAvf2tWPttW1A1rMW0fX1Yq7/dSpxyeTOK7khGzTmlReQ9Wq3PmnDmz7ZG9kzu+nViqgukduhe5q9H0E94nHNZpJAaJu88lJwBZ4njhYszptouO5enTIUxMRHEJt3q/A0e0PLA==; 5:O2zg9WMmcUAq85LYVqpByjzQtUOjnpC2/qywivNezh5alBrqE2FRTxJrb3/SCvNAdfFTxwOxAErPIfCOnm99PGaXEmkV4QWVF1WE8H/rZC+bIdA+QZXj9sB7QFbr9smfywpPZ/G2UMdyYx1emJ0G5C4BgqmaRQUHMhQvZ+6Ty90=; 7:gjef4BpC7pmFW+ogURWv3qhO9Og9p1NaOZdJpIqUk1btXj86ZXPXBLcZuZOAiE+lVR6ouKoPvBt6JX6dLFLBreV/ctNInPtzOkyf2xjGdirFr/hmPMcSLxSuEr3RRdaLXOMPOHUak8F+iYLiYUU0pJTMugQeIjsYDgIIXABI4JGqf30+wGs3BEgYVqAQYK0l3wEGyj8bbDwpFo994Cv9DKH/4tVFtWwUd+b1pUtF68RVSxLdEoCHInt/9eVwQwI6 x-ms-office365-filtering-correlation-id: c19adff8-4bf7-4c6a-f294-08d60ea2aa1c x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(4534165)(4627221)(201703031133081)(201702281549075)(5600074)(711020)(4618075)(2017052603328)(7193020); SRVR:CY4PR21MB0856; x-ms-traffictypediagnostic: CY4PR21MB0856: 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-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(3002001)(3231340)(944501410)(52105095)(2018427008)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(201708071742011)(7699049)(76991033); SRVR:CY4PR21MB0856; BCL:0; PCL:0; RULEID:; SRVR:CY4PR21MB0856; x-forefront-prvs: 07807C55DC x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(136003)(376002)(346002)(39860400002)(396003)(366004)(199004)(189003)(10290500003)(14454004)(86612001)(7736002)(305945005)(4326008)(478600001)(39060400002)(107886003)(86362001)(72206003)(25786009)(2900100001)(76176011)(99286004)(22452003)(316002)(54906003)(2906002)(106356001)(3846002)(5660300001)(8676002)(105586002)(2351001)(81166006)(81156014)(1730700003)(6916009)(68736007)(256004)(217873002)(8936002)(6116002)(1076002)(6506007)(102836004)(36756003)(5250100002)(2501003)(186003)(6512007)(26005)(53936002)(486006)(476003)(2616005)(11346002)(446003)(97736004)(5640700003)(6436002)(10090500001)(6486002)(66066001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR21MB0856; H:CY4PR21MB0776.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: 73gFeKtIRp7RrL0n4hZuS5g983E+nokWPtklzl/2uBdJtlotWhrj6z/qRrdCm4V1hjaZnpTXjFeQKEygGg0VDtfg4cjLH+7WoIkWMAPPwoh92o1mPzxdm+P4oYeOTmr1vYuoB6uTCgoNF9p5xmvMHbHWhQzM+aGbPlnyhIT9G2tt6rqEZ7b3/rZ3VfOlFTnFyTOjvqnbb4pXZEY63xh5Cw0zlZAvFJafsbNTGWEvISsYdtrswLGI59su5k4qCG0DlSgOxZyA7FJ9RkdcAU3gwNub618lXbDcEjIn2oIRUWWJKqxP4iLguo/6g4sRMMnPx9ynlZ44USC9mSQdOZV0GZVwxVvOF5/yRdKn2Tq7mzE= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: c19adff8-4bf7-4c6a-f294-08d60ea2aa1c X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Aug 2018 18:01:52.0778 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR21MB0856 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jerome Brunet [ Upstream commit b96e9eb62841c519ba1db32d036628be3cdef91f ] Current clock name looks like this: /soc/bus@ffd00000/pwm@1b000#mux0 This is bad because CCF uses the clock to create a directory in clk debugfs. With such name, the directory creation (silently) fails and the debugfs entry end up being created at the debugfs root. With this change, the clock name will now be: ffd1b000.pwm#mux0 This matches the clock naming scheme used in the ethernet and mmc driver. It also fixes the problem with debugfs. Fixes: 36af66a79056 ("pwm: Convert to using %pOF instead of full_name") Signed-off-by: Jerome Brunet Acked-by: Neil Armstrong Signed-off-by: Thierry Reding Signed-off-by: Sasha Levin --- drivers/pwm/pwm-meson.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.17.1 diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c index 822860b4801a..c1ed641b3e26 100644 --- a/drivers/pwm/pwm-meson.c +++ b/drivers/pwm/pwm-meson.c @@ -458,7 +458,6 @@ static int meson_pwm_init_channels(struct meson_pwm *meson, struct meson_pwm_channel *channels) { struct device *dev = meson->chip.dev; - struct device_node *np = dev->of_node; struct clk_init_data init; unsigned int i; char name[255]; @@ -467,7 +466,7 @@ static int meson_pwm_init_channels(struct meson_pwm *meson, for (i = 0; i < meson->chip.npwm; i++) { struct meson_pwm_channel *channel = &channels[i]; - snprintf(name, sizeof(name), "%pOF#mux%u", np, i); + snprintf(name, sizeof(name), "%s#mux%u", dev_name(dev), i); init.name = name; init.ops = &clk_mux_ops;