From patchwork Wed Sep 23 14:48:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Dooks X-Patchwork-Id: 7250471 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CAF97BEEC1 for ; Wed, 23 Sep 2015 14:48:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E87CE20AE8 for ; Wed, 23 Sep 2015 14:48:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1C5BA20AD7 for ; Wed, 23 Sep 2015 14:48:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755537AbbIWOsr (ORCPT ); Wed, 23 Sep 2015 10:48:47 -0400 Received: from ducie-dc1.codethink.co.uk ([185.25.241.215]:44718 "EHLO ducie-dc1.codethink.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755437AbbIWOsq (ORCPT ); Wed, 23 Sep 2015 10:48:46 -0400 Received: from localhost (localhost [127.0.0.1]) by ducie-dc1.codethink.co.uk (Postfix) with ESMTP id BDF8C460D03; Wed, 23 Sep 2015 15:48:44 +0100 (BST) X-Virus-Scanned: Debian amavisd-new at ducie-dc1.codethink.co.uk Received: from ducie-dc1.codethink.co.uk ([127.0.0.1]) by localhost (ducie-dc1.codethink.co.uk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zzoqDrEdQLdW; Wed, 23 Sep 2015 15:48:43 +0100 (BST) Received: from rainbowdash.ducie.codethink.co.uk (unknown [10.24.1.119]) by ducie-dc1.codethink.co.uk (Postfix) with ESMTPS id 5EE49461C95; Wed, 23 Sep 2015 15:48:43 +0100 (BST) Received: from ben by rainbowdash.ducie.codethink.co.uk with local (Exim 4.86) (envelope-from ) id 1ZelLf-0003N8-3r; Wed, 23 Sep 2015 15:48:43 +0100 From: Ben Dooks To: t-kristo@ti.com, mturquette@baylibre.com, sboyd@codeaurora.org, linux-omap@vger.kernel.org, linux-clk@vger.kernel.org Cc: linux-kernel@lists.codethink.co.uk, stable@vger.kernel.org, Ben Dooks Subject: [PATCH] clk: ti: fix dual-registration of uart4_ick Date: Wed, 23 Sep 2015 15:48:34 +0100 Message-Id: <1443019714-12926-1-git-send-email-ben.dooks@codethink.co.uk> X-Mailer: git-send-email 2.5.1 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On the OMAP AM3517 platform the uart4_ick gets registered twice, causing any power managment to /dev/ttyO3 to fail when trying to wake the device up. This solves the following oops: [] Unhandled fault: external abort on non-linefetch (0x1028) at 0xfa09e008 [] PC is at serial_omap_pm+0x48/0x15c [] LR is at _raw_spin_unlock_irqrestore+0x30/0x5c Signed-off-by: Ben Dooks Acked-by: Tony Lindgren --- drivers/clk/ti/clk-3xxx.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/clk/ti/clk-3xxx.c b/drivers/clk/ti/clk-3xxx.c index 5e12f32..2e7ef1f 100644 --- a/drivers/clk/ti/clk-3xxx.c +++ b/drivers/clk/ti/clk-3xxx.c @@ -374,7 +374,6 @@ static struct ti_dt_clk omap3xxx_clks[] = { DT_CLK(NULL, "gpio2_ick", "gpio2_ick"), DT_CLK(NULL, "wdt3_ick", "wdt3_ick"), DT_CLK(NULL, "uart3_ick", "uart3_ick"), - DT_CLK(NULL, "uart4_ick", "uart4_ick"), DT_CLK(NULL, "gpt9_ick", "gpt9_ick"), DT_CLK(NULL, "gpt8_ick", "gpt8_ick"), DT_CLK(NULL, "gpt7_ick", "gpt7_ick"),