diff mbox series

[5.4,30/60] clk: at91: usb: use proper usbs_mask

Message ID	20200420121509.331290084@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <SRS0=w1qd=6E=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Claudiu Beznea <claudiu.beznea@microchip.com>, Alexandre Belloni <alexandre.belloni@bootlin.com>, Stephen Boyd <sboyd@kernel.org> Subject: [PATCH 5.4 30/60] clk: at91: usb: use proper usbs_mask Date: Mon, 20 Apr 2020 14:39:08 +0200 Message-Id: <20200420121509.331290084@linuxfoundation.org> In-Reply-To: <20200420121500.490651540@linuxfoundation.org> References: <20200420121500.490651540@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [5.4,05/60] net: ipv4: devinet: Fix crash when add/del multicast IP with autojoin [5.4,06/60] net: ipv6: do not consider routes via gateways for anycast address check [5.4,09/60] net: revert default NAPI poll timeout to 2 jiffies [5.4,13/60] net/mlx5: Fix frequent ioread PCI access during recovery [5.4,16/60] net/mlx5e: Fix pfnum in devlink port attribute [5.4,17/60] net: stmmac: dwmac-sunxi: Provide TX and RX fifo sizes [5.4,18/60] Revert "ACPI: EC: Do not clear boot_ec_is_ecdt in acpi_ec_add()" [5.4,20/60] scsi: ufs: Fix ufshcd_hold() caused scheduling while atomic [5.4,23/60] acpi/nfit: improve bounds checking for func [5.4,25/60] pwm: pca9685: Fix PWM/GPIO inter-operation [5.4,27/60] ext4: fix incorrect group count in ext4_fill_super error message [5.4,29/60] clk: at91: sam9x60: fix usb clock parents [5.4,30/60] clk: at91: usb: use proper usbs_mask [5.4,31/60] ARM: dts: imx7-colibri: fix muxing of usbc_det pin [5.4,33/60] usb: dwc3: gadget: Dont clear flags before transfer ended [5.4,35/60] ASoC: Intel: mrfld: return error codes when an error occurs [5.4,37/60] ALSA: usb-audio: Filter error from connector kctl ops, too [5.4,39/60] ALSA: usb-audio: Dont create jack controls for PCM terminals [5.4,42/60] keys: Fix proc_keys_next to increase position index [5.4,43/60] tracing: Fix the race between registering snapshot event trigger and triggering snaps... [5.4,46/60] mac80211: fix race in ieee80211_register_hw() [5.4,48/60] net/mlx5e: Encapsulate updating netdev queues into a function [5.4,51/60] drm/amd/powerplay: force the trim of the mclk dpm_levels if OD is enabled [5.4,54/60] ext4: do not zeroout extents beyond i_disksize [5.4,55/60] irqchip/ti-sci-inta: Fix processing of masked irqs [5.4,57/60] x86/resctrl: Fix invalid attempt at removing the default resource group [5.4,60/60] x86/microcode/AMD: Increase microcode PATCH_MAX_SIZE

Commit Message

Greg KH April 20, 2020, 12:39 p.m. UTC

From: Claudiu Beznea <claudiu.beznea@microchip.com>

commit d7a83d67a1694c42cc95fc0755d823f7ca3bfcfb upstream.

Use usbs_mask passed as argument. The usbs_mask is different for
SAM9X60.

Fixes: 2423eeaead6f8 ("clk: at91: usb: Add sam9x60 support")
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Link: https://lkml.kernel.org/r/1579261009-4573-4-git-send-email-claudiu.beznea@microchip.com
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/clk/at91/clk-usb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

--- a/drivers/clk/at91/clk-usb.c
+++ b/drivers/clk/at91/clk-usb.c
@@ -211,7 +211,7 @@  _at91sam9x5_clk_register_usb(struct regm
 
 	usb->hw.init = &init;
 	usb->regmap = regmap;
-	usb->usbs_mask = SAM9X5_USBS_MASK;
+	usb->usbs_mask = usbs_mask;
 
 	hw = &usb->hw;
 	ret = clk_hw_register(NULL, &usb->hw);