From patchwork Thu Aug 30 18:10:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 145560 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp206157ljw; Thu, 30 Aug 2018 11:10:10 -0700 (PDT) X-Google-Smtp-Source: ANB0VdarElHlmEXhW0vWc8urkVbK331e0OkUNhf+sPiSXw0BGLTmzWk428xw9cauOnKGWvfnXuuA X-Received: by 2002:a17:902:708a:: with SMTP id z10-v6mr6728340plk.229.1535652610166; Thu, 30 Aug 2018 11:10:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535652610; cv=none; d=google.com; s=arc-20160816; b=K7JGGiZ/QDxi1znt05X1CrHg/bbwRGnKklqh/+X16k2D/jT3n6ps3h4lrqwQuq6OcS 0+Bfmi0LYTI8l3Kfuy2+AZG17Ihyr3iBioivJ86qS73lpIUeCNqNl73HuNFqko4m2d6z FbxSEEaNJ8CfLPEfzoaXEeDl+nquaAsw7fhelxkZ919yKiiUEJV85dAoGjoDxiEifqYD Ledz8mEuE26PNJRObjwwRkj5TOTsQpAcnmyRGeCh5YRNmCgb59bDO16Br+Nwrv3uGVmM hdtlZi380leBBwCAVLg2KHUdmOmK9at8EnLAULauflBVWTf7dosu9MYIWfZNjnVwbw/z y04g== 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=A74+aZD4TMQ2zTCNsSdLVBRnMbr2OtNpyyJz4vqZaiU=; b=Jg11MoRggyF4H+OCuiPm89oGUngE8ppbbVNPSvqLMhGekI2wZseGEZBeAYulRvqidg gOX2c5iQD2291ZTYR0o898BnxKFvNGVUmFXBY8J1jTpmQD+Tg6EIlIpKtPfO8cWBQt56 2Nl/aWA+5gZ/ZivQQIgG0HN3FoJFgxa57Ni1BdSc9a1OONpb9og7ON7dtv1NJirnLZI6 r56SRstRB9MPUrzkJ9L8WkHR3/Cj7B/QtcoEkHhBiCmcnrgf9iwRage3n31lwbqv+U3f vaq/u05+9ZXUXTEI0ehHpDdFf5bZwItLASk5dh8Q6qTE1idcCfsrXquU79ZzudXC6JXd 7QRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=Le0ZSkO4; 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 l30-v6si7251814plg.12.2018.08.30.11.10.09; Thu, 30 Aug 2018 11:10:10 -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=Le0ZSkO4; 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 S1727868AbeH3WNb (ORCPT + 13 others); Thu, 30 Aug 2018 18:13:31 -0400 Received: from mail-co1nam03on0095.outbound.protection.outlook.com ([104.47.40.95]:52320 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727387AbeH3WNa (ORCPT ); Thu, 30 Aug 2018 18:13:30 -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=A74+aZD4TMQ2zTCNsSdLVBRnMbr2OtNpyyJz4vqZaiU=; b=Le0ZSkO4hMzKGAx4J0K1e6BdsaV/hJVT9c+6ch9e/hZ1wTsT7SW+qAbrg3CDAGFKP7pxcpuCAAifpAEEtFSz8iqK81jxmZfXxxzBmSjPxhR3YyW/CvqWhOkZElu2hWRvapEK0Vo9nZu0pB4hP53hi7Cgy572qTeMHHTTXt6Lbjo= Received: from CY4PR21MB0776.namprd21.prod.outlook.com (10.173.192.22) by CY4PR21MB0693.namprd21.prod.outlook.com (10.175.121.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1122.2; Thu, 30 Aug 2018 18:10:00 +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:10:00 +0000 From: Sasha Levin To: "stable@vger.kernel.org" CC: Jerome Brunet , Thierry Reding , Sasha Levin Subject: [PATCH AUTOSEL 4.14 15/67] pwm: meson: Fix mux clock names Thread-Topic: [PATCH AUTOSEL 4.14 15/67] pwm: meson: Fix mux clock names Thread-Index: AQHUQIyq8JdOaVPGiUGooxOepYkkVg== Date: Thu, 30 Aug 2018 18:10:00 +0000 Message-ID: <20180830180918.36327-15-alexander.levin@microsoft.com> References: <20180830180918.36327-1-alexander.levin@microsoft.com> In-Reply-To: <20180830180918.36327-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; CY4PR21MB0693; 6:uzxfcWi5w2J0BR/dxap24diYPMmIZ6P14l+jRgNNsd+TMeAhXlV1Lo+acN8TW/z6lKMl2cJYcJYg4h3ewhbeH0vtUgKe2XMfAEqR5xbpsH0yM7jsBbgMZGp2Ppb0ZTXvFQtPhFSqbmtaOrDBfQMSPB4Kz5blkA7K8p/nv8h3Wsy8yXeEnbu3KR+Pt41M1hOLsIyslShowWYEgkBirH0slr5Va/p4zxlqegkIabmOjdCIupVC+h8/n+fgfYWdPPTUTMRFOa7JhTndBpKPJrY8NAjWHI3A0oNiWAHXPyx0mdU3CUXqv1t9/WLsO2JUu6J7CZl6pUdVyF3tIhagHQGpHInmYpvCAv49pRRz1PlE8uxaQXWdgNNs9gLzVwr0S6xKMmpOSuFViGnrbKFQdAyzFeREF4z45JieM/FGdrI1cIRQ1nqhcgu6kYsE+eYa7r6FwhUQ8sHviqK/6YDdgD940Q==; 5:Q7NVjPLvLrkAxEdL8T3Q80I3bxPPb3HNKermuRsGpbjFyGkE8/3B9iK17lHdIo26bTUCgrv8n+rYqxnykRhCs2Roc3keu94aT7y79aPBfwlW+1ca3MUvov9A051mFsjeaWh5FYhuao+Kt2etH3J4lzJX4Mz1NS4juMfzkPi9gGI=; 7:HyGAIIndBUdRgLlj7Azlv8NMdT5dqfjodhsnNfVBkJiy98OVEKc3coR4YJHWxtO17nnsft/DJXOs4rNZNuxlOePq08nO1ckQo+5rLcKgo0pFHiK630cnVoKBm+rp++ErMkU++YZKOz39Bf20m9m6ZtutbLoOnoLe8Yo77hFt3zcfxgFtLQf+uZutQ3A+uEkZrQqI9DH/QuII+0Xe1pmWzj0hN39QwYw1Ey5OZQyyANjLo6Swgb2cYkUgLeC5jX5e x-ms-office365-filtering-correlation-id: f69832a0-93de-4ce2-5b40-08d60ea3ccf7 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(5600074)(711020)(4618075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:CY4PR21MB0693; x-ms-traffictypediagnostic: CY4PR21MB0693: 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)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(201708071742011)(7699049)(76991033); SRVR:CY4PR21MB0693; BCL:0; PCL:0; RULEID:; SRVR:CY4PR21MB0693; x-forefront-prvs: 07807C55DC x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(396003)(39860400002)(376002)(136003)(366004)(189003)(199004)(6116002)(186003)(8676002)(26005)(102836004)(6346003)(14454004)(8936002)(478600001)(10290500003)(10090500001)(68736007)(22452003)(72206003)(66066001)(6506007)(256004)(4326008)(81166006)(316002)(107886003)(39060400002)(25786009)(1730700003)(81156014)(54906003)(3846002)(53936002)(2906002)(1076002)(6512007)(6436002)(5640700003)(86362001)(7736002)(305945005)(5660300001)(76176011)(86612001)(105586002)(217873002)(6916009)(99286004)(486006)(6486002)(476003)(36756003)(2616005)(11346002)(97736004)(2351001)(446003)(106356001)(2900100001)(2501003)(5250100002); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR21MB0693; H:CY4PR21MB0776.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: w3NVY07IoXXgmt3qOrDHOl3ybAhjb0elnf+o+0vV62oHtXKWn5M4j+bKeivWj1Ww+56Srqlx1E9pS7/W8xdh1tEUhVd90KZpCdKVZ/wrjE634raWqpqtCoNdN6vVLeE/mNtM0/URWxQD7+xWVVeC0ii52ue8NIRCCvgFpyk1/QDQ/c9RLxl+eAuIYbpQjQ4a1W1/8W883hmC1ixPfUhhXGrZrxw6dYFUrRZxSWlWQr9LlFc6bVQh80ZxlNdHF+bWyb3L7bzGHmYF6GEV6Jqgg3UZSNVCX7kZDln0Hh5NpwfxoONB6s7N+Wsj7gxVLDDpUL2s3krAmWA4ulSEFiwGSEf8Pvqr3yN5oHgOXfVxQ6g= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: f69832a0-93de-4ce2-5b40-08d60ea3ccf7 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Aug 2018 18:10:00.0434 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR21MB0693 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 d589331d1884..3540d00425d0 100644 --- a/drivers/pwm/pwm-meson.c +++ b/drivers/pwm/pwm-meson.c @@ -432,7 +432,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]; @@ -441,7 +440,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;