From patchwork Fri Jun 30 05:46:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 106666 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp1904656qge; Thu, 29 Jun 2017 22:47:11 -0700 (PDT) X-Received: by 10.99.172.67 with SMTP id z3mr18877183pgn.246.1498801631725; Thu, 29 Jun 2017 22:47:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498801631; cv=none; d=google.com; s=arc-20160816; b=U17znsDiDav3pfkgRakv8VnB+YHJfO7UfwVXf1I/KKvaPTE0ZOpSD1PTJ0fXb4hlpx Zd69ICwtNiCalGCWF6D+5kzc6Y0Bc5xGw/6a6d8ZC1BEq4NDs2CgXn2OD6FccE3quwUa v6xXHDnPTrQbGQR7ITcFLfnEltdosD/xVko0wnr7xse1lpl1hmL4Qm1JSlBad4/r3c8+ xWkeAq+H4lkA8LjyjQqEPeRRQKfIhPAS/g5L4fP0ROY4aACc0VE/ABXfb5pE64EmRByh BET5/2ELlFOpe4vvJclm3u6V/+cE6lEdCanbKrH0NTOzbJ4iWrEhhKrwjX18v6nx9zOC vl5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=qsQw8YfTN4V/2RxuF5rUjMkS3vhgniLUlofFz0Ul2P4=; b=qEB+GDLY9GK7LhuE6UaRTZBU7rPQ6EEBnHUPW8B9rGdbXXgU3hckMjOTCZ152c4gbY 2fEomtSF0XtY5DAg31+2n5C6HktWmTKqpX+exB/fBl8SufOzLJLT3qj8FGltmiBCRx91 yJ5eUKvXjUVqHZ/RvdPf2NE5n0O1CAt7/Tfpu5vv7qgr8CcWD0w/7B8J1gHhp9CSj4cF JyC9YFMcJF8gUCON7q6+g/6oLS2I+cAwQTw+hcZRZA7oletsH99Cy6WFQNCCHXbFeoYD zpt/n2M8hfY1wm9fb23UkXYPJmnOw6qOFBeJHeCtAzL7m/EfmNQh8nDlsFWnBCUcs3b4 fMtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=POl0Ew+L; 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=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b12si1658852plk.568.2017.06.29.22.47.11; Thu, 29 Jun 2017 22:47:11 -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=@linaro.org header.b=POl0Ew+L; 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=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751947AbdF3FrK (ORCPT + 6 others); Fri, 30 Jun 2017 01:47:10 -0400 Received: from mail-pg0-f46.google.com ([74.125.83.46]:35626 "EHLO mail-pg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751715AbdF3FrK (ORCPT ); Fri, 30 Jun 2017 01:47:10 -0400 Received: by mail-pg0-f46.google.com with SMTP id j186so58458405pge.2 for ; Thu, 29 Jun 2017 22:47:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qsQw8YfTN4V/2RxuF5rUjMkS3vhgniLUlofFz0Ul2P4=; b=POl0Ew+LBNego56svIblaXg+OIKC2zQafP+IvAPJE+1bidbGDgLxXsgBD2ra1zaa3I TOEqpacTX5HRqVee2fV4uz/BQYQXa2+pWPiVOVPiOzmJudL2S1zW7HwvXV9FfbEAgJyT KqvYQ0ir8PH580YUul8MSv0py78f9WrSzqoH8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qsQw8YfTN4V/2RxuF5rUjMkS3vhgniLUlofFz0Ul2P4=; b=D5XLmByfCjBR+QM5FKlerNSCUOU5MQh7quub+ViLBjo3HSwMlSoURWcWhS3Fmk/jT9 FvZohn9Uv9Nya/FcPUoKg2wR1dtl8BgdkYLsbVMH9G8QMuDJZxlTDOMcEQqK1FihsPuY GvqwAzOwoY1X5QqDrzc9iOXeuBkQ5iJoBgeYVatwacH4YpPm5IGKdsji9nH+w/qeFWW8 55ADzugeoYcHgu1a89QThUEOYZYN76onInPSDDTQvUfIhZqWMgn6P78bsc3Du2tQhi0H 1dH57aM38RJteBeO2Oo39+oX0W9EotbyyiIcEiFwBicZvQXmE67mb7jCvkghMfvaFbMn zguA== X-Gm-Message-State: AKS2vOwG8kTDBKYwwFaxNiYBXbq+I/b6i1Zlq9NRekugxEJOzB/mvZf3 RI0OOfp1Fex7Wa4B X-Received: by 10.99.4.6 with SMTP id 6mr19792491pge.126.1498801624614; Thu, 29 Jun 2017 22:47:04 -0700 (PDT) Received: from localhost.localdomain ([106.51.129.233]) by smtp.gmail.com with ESMTPSA id a187sm11405550pgc.37.2017.06.29.22.47.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 29 Jun 2017 22:47:03 -0700 (PDT) From: Amit Pundir To: Greg KH Cc: Stable , John Crispin , linux-mips@linux-mips.org, Ralf Baechle Subject: [PATCH for-4.4 06/16] MIPS: ralink: fix USB frequency scaling Date: Fri, 30 Jun 2017 11:16:30 +0530 Message-Id: <1498801600-20896-7-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1498801600-20896-1-git-send-email-amit.pundir@linaro.org> References: <1498801600-20896-1-git-send-email-amit.pundir@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: John Crispin commit fad2522272ed5ed451d2d7b1dc547ddf3781cc7e upstream. Commit 418d29c87061 ("MIPS: ralink: Unify SoC id handling") was not fully correct. The logic for the SoC check got inverted. We need to check if it is not a MT76x8. Signed-off-by: John Crispin Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/11992/ Signed-off-by: Ralf Baechle Signed-off-by: Amit Pundir --- arch/mips/ralink/mt7620.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c index 733768e9877c..4c17dc6e8ae9 100644 --- a/arch/mips/ralink/mt7620.c +++ b/arch/mips/ralink/mt7620.c @@ -459,7 +459,7 @@ void __init ralink_clk_init(void) ralink_clk_add("10000c00.uartlite", periph_rate); ralink_clk_add("10180000.wmac", xtal_rate); - if (IS_ENABLED(CONFIG_USB) && is_mt76x8()) { + if (IS_ENABLED(CONFIG_USB) && !is_mt76x8()) { /* * When the CPU goes into sleep mode, the BUS clock will be * too low for USB to function properly. Adjust the busses