Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1723715ybz; Sat, 18 Apr 2020 07:12:08 -0700 (PDT) X-Google-Smtp-Source: APiQypLhFINBwL7AHBl4/CXxAEEoUgd9G971sG8wJ2Abdy5Z5MYCBuggwU9z7FsEDvPy0q3Cu+2x X-Received: by 2002:a50:cfc6:: with SMTP id i6mr7244224edk.314.1587219128444; Sat, 18 Apr 2020 07:12:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587219128; cv=none; d=google.com; s=arc-20160816; b=0jyyaWXeez5moaqnIik1LoeiNTsVg7WCanCDSCmio4FtHQelCTKQGvlggqkavQI2Ui lgorX3ZR5U8NKG4ydbuBRGTta4Weu/wC0kowHHtHVXol+9YuGFdyUae4UaX3lua76fq8 jg9ZfLdlrxAuX/9ayAE+f7Z1AxxplHJkykM9/yyVFQzoMbtPsQj1VIS4i39EZ1QC8eqT rXYlpjTpjLE3+bstUGxPBnfuIsN0ZfZqMxksdN4aDCFYpAiza9RgfSUXeKWehkgfXA1V /iftV4v07iI9kDUrvGFj8/hBo/3CKxywGj5BBCJWfphIN8+Aoib1rS6ntgGIAe77blIt 7HmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=G8yiJb8YIpTnr3yD8HCmeSeBVI8VCyPm0Q+hpTlj4BM=; b=DNfkuVONz3kx+Zbg+cppJpPUN/+V6in2XtDimPEMeO85Ds3hWk1yo6CHt1Q7Z/61KI Pyl00zUGCvJkF2nL1wThaIJbgeU5kYHnV5X87qC9WhS/7D18Mt0gzR+a0MIBIevRTyZg sMIFd09fBX0ethegVhLXRd/xM5SsdIGLUIg0+KUcOS/ye6taSMkkFBuugnsFUVu13+Hx QGqzAbka3nmez11+uwUTthX9+tTh/izeZLmHd/WaNiPooIVOV82+L1wMnPgXjPS7vwhM r6ntJqmab6NNJ+oeyxdFQY0U/NsNacHxTgnhVFIq3HURCnbAvsaAWc7mIzx8cjLP+5K7 LD6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="rw/o7oph"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ck5si15906342ejb.12.2020.04.18.07.11.45; Sat, 18 Apr 2020 07:12:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="rw/o7oph"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726859AbgDROKN (ORCPT + 99 others); Sat, 18 Apr 2020 10:10:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:37912 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726798AbgDROKE (ORCPT ); Sat, 18 Apr 2020 10:10:04 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A845322276; Sat, 18 Apr 2020 14:10:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587219003; bh=uRKGWEHffTzz+HeEoRdC6kD4Fwtd9WIkFuzd8NRpf9I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rw/o7oph/BqzpL/MokrZLniO+CMYr5bQIhy0iE7ly1jdAnQffBbDAwT/oXP29/kD1 yO4+rfB7reMJcfVELjB2xnxTv3Vt6Ci5eu+ksh9stjknkXA8iFGca8wttdC0bfNC4B 97GGbDMVQA7vMuPluPeqRNUjDYSpsUjs5gZcsP9c= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Florian Fainelli , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Nicolas Saenz Julienne , Thierry Reding , Sasha Levin , linux-pwm@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.5 42/75] pwm: bcm2835: Dynamically allocate base Date: Sat, 18 Apr 2020 10:08:37 -0400 Message-Id: <20200418140910.8280-42-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200418140910.8280-1-sashal@kernel.org> References: <20200418140910.8280-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Florian Fainelli [ Upstream commit 2c25b07e5ec119cab609e41407a1fb3fa61442f5 ] The newer 2711 and 7211 chips have two PWM controllers and failure to dynamically allocate the PWM base would prevent the second PWM controller instance being probed for succeeding with an -EEXIST error from alloc_pwms(). Fixes: e5a06dc5ac1f ("pwm: Add BCM2835 PWM driver") Signed-off-by: Florian Fainelli Acked-by: Uwe Kleine-König Reviewed-by: Nicolas Saenz Julienne Signed-off-by: Thierry Reding Signed-off-by: Sasha Levin --- drivers/pwm/pwm-bcm2835.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/pwm/pwm-bcm2835.c b/drivers/pwm/pwm-bcm2835.c index 91e24f01b54ed..d78f86f8e4621 100644 --- a/drivers/pwm/pwm-bcm2835.c +++ b/drivers/pwm/pwm-bcm2835.c @@ -166,6 +166,7 @@ static int bcm2835_pwm_probe(struct platform_device *pdev) pc->chip.dev = &pdev->dev; pc->chip.ops = &bcm2835_pwm_ops; + pc->chip.base = -1; pc->chip.npwm = 2; pc->chip.of_xlate = of_pwm_xlate_with_flags; pc->chip.of_pwm_n_cells = 3; -- 2.20.1