Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1749750ybz; Sat, 18 Apr 2020 07:43:45 -0700 (PDT) X-Google-Smtp-Source: APiQypI0ysOSF0/wssi5wMO7iiRF492Pq0RbcJSTajg60ilJVKqv5X8QZpevviJh6b95Pu0KlkS6 X-Received: by 2002:aa7:d48a:: with SMTP id b10mr4721621edr.284.1587221025566; Sat, 18 Apr 2020 07:43:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587221025; cv=none; d=google.com; s=arc-20160816; b=OKoyZz5TxWdxWwM7fUvhHeUqSbVVVofhfzNX+3dviLH163L2CNjbAvqTA9jEhgZE/f 7UHdS2xLRgUYsxjrnHNyl2j5SqGo2GPrWWvNRpmQNgzSUSAl55sCl1s5rRxQ7Gp2fO57 Ym9CwgWGBeyItGtUUzAoqPANMePAEMDLePO0uYMKaiOLzWjp8M8O67wpfwyfUP4ABQPV 7+ui5qsTZRhSMuX0DPBudhAYHNSVs4ObXulXZOQHBkQYk4qPAGmoSvBc1VJtN+jitqUX 7dN6WKpoZLmFGAm76eUcZutL8f0/iYdBcYpbKNbUcOOaGAat7oD4gpwFdza4ZtXJ/ocj QsbQ== 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=0eOCoOm8RqpsnvCMu+GvIP5cqFNuYo7/XyCU/fKrLqsaSk4HlLH4BVbvJey3HRCYAv H58Hoj5d8QnVyxW7KmMBbn6WHlVQjDzuuutC05N0EDrj1r7fUrVqusoqX1X2GCrl51dU MMCoJxAqUvKIDFZfo7FdlURAaKhojc7wLF4DGXZPk0QgZEPujK1Tt//Sa4QmxsngnlSH gEXq6hbZQKM/ynxrh1I7TRYBqDq1vXsyT4RdrH+BAqgVSfkT9Gbq+nBsVCKaW8e48gA2 XmfczbILjje5ubBLA/7gW4Kfx2xyXdvGIeh1HCaM0yx1b5Y1WCrjO+fyM1PUzvMvVJs7 FX2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=f6M+wunH; 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 p12si9959220ejo.516.2020.04.18.07.43.22; Sat, 18 Apr 2020 07:43:45 -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=f6M+wunH; 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 S1726381AbgDROln (ORCPT + 99 others); Sat, 18 Apr 2020 10:41:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:50978 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726335AbgDROlj (ORCPT ); Sat, 18 Apr 2020 10:41:39 -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 D3EB02224F; Sat, 18 Apr 2020 14:41:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587220899; bh=uRKGWEHffTzz+HeEoRdC6kD4Fwtd9WIkFuzd8NRpf9I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f6M+wunHZ7LCC6+yNeYgLs/lwzMVMwBvRZbl8iq4TbYXcrOQX9l5SJ9beWH8EUO4P Wqzmk2CHRrAxkoCHarK3HKrFkGMLEieLQMUYTvWknZxfC3wqZVLpkU64DBaWaddUgM 4Mcokfdqf1ZlpxdiNFvqNKTmyjcS1pBqzX7gyc68= 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.4 40/78] pwm: bcm2835: Dynamically allocate base Date: Sat, 18 Apr 2020 10:40:09 -0400 Message-Id: <20200418144047.9013-40-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200418144047.9013-1-sashal@kernel.org> References: <20200418144047.9013-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