From patchwork Fri Oct 21 08:55:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 9388271 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6C6CF607F0 for ; Fri, 21 Oct 2016 08:55:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5E6CA28C92 for ; Fri, 21 Oct 2016 08:55:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5321629F46; Fri, 21 Oct 2016 08:55:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5A67028C92 for ; Fri, 21 Oct 2016 08:55:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754100AbcJUIzr (ORCPT ); Fri, 21 Oct 2016 04:55:47 -0400 Received: from mail-qk0-f176.google.com ([209.85.220.176]:33199 "EHLO mail-qk0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752106AbcJUIzq (ORCPT ); Fri, 21 Oct 2016 04:55:46 -0400 Received: by mail-qk0-f176.google.com with SMTP id n189so139029468qke.0 for ; Fri, 21 Oct 2016 01:55:46 -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; bh=9CREVgmOyoGdNWL49Qr4EBpMRaumbrM/EDtZWQ0r/TU=; b=Sm6g8w/WgkiEh4y6WNECgGvOFm9eQxfYGhkd1gu84CmqqeBhRnQH24jS1cHNQT0t8Z 3ckGJexKc75nIYdeW+M6hcPz7E39iVxlGf5IzumL3eS+DStzAIqlkTZG9bbmC+ukDMi5 dbSD5v1oL6oTBkUGWx2mW9YaZaFsVxU4GfAPM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=9CREVgmOyoGdNWL49Qr4EBpMRaumbrM/EDtZWQ0r/TU=; b=SCH3aCV+fyZ9TY1Zo03e8QIyOCuoAKDdxg1hmaKtORyIiVWQDCmNmqP+W3K23KuNXX 5tw2n7ZhhoyHaA2/qHmHvsW23bduLDn9xmaVmbV9DauffRP3lfzx+A73tmQaiP1dyBVR BKXCkw7eXc0rTrgnjNwi4wStXFbFlKwd77thMH+zAWNPmq3C3P4XFK3RszoICQsXO745 BZz31SYqAuQ5gWexGqgS7OSHy254sXwyFAHOe/Bl+HbynjNwrUb2rR/24FxH485X1LJT 3D8kTwhdGig3mqo8JVDWyXIUebfD1Z4/946CW3cw5JSCzv8EugbfpSryMnu4nacVQkbh ooYA== X-Gm-Message-State: ABUngvfKCQcS2XFqldscXiNCmek3EX0aoNaosH4NAQAMmV8GVZoMihlA7+QcgX2A01iwFy0b X-Received: by 10.194.155.35 with SMTP id vt3mr3027841wjb.223.1477040145617; Fri, 21 Oct 2016 01:55:45 -0700 (PDT) Received: from localhost.localdomain (cpc89244-aztw30-2-0-cust4998.18-1.cable.virginm.net. [86.31.179.135]) by smtp.gmail.com with ESMTPSA id ff4sm1712357wjd.39.2016.10.21.01.55.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 21 Oct 2016 01:55:44 -0700 (PDT) From: Peter Griffin To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@stlinux.com, mchehab@kernel.org, patrice.chotard@st.com Cc: peter.griffin@linaro.org, lee.jones@linaro.org, linux-media@vger.kernel.org Subject: [PATCH] [media] c8sectpfe: Remove clk_disable_unprepare hacks Date: Fri, 21 Oct 2016 09:55:32 +0100 Message-Id: <1477040132-31442-1-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Now that CLK_PROC_STFE is defined as a critical clock in DT, we can remove the commented clk_disable_unprepare from the c8sectpfe driver. This means we now have balanced clk*enable/disable calls in the driver, but on STiH407 family the clock in reality will never actually be disabled. This is due to a HW bug where once the IP has been configured and the SLIM core is running, disabling the clock causes a unrecoverable bus lockup. Signed-off-by: Peter Griffin Acked-by: Patrice Chotard --- drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c index 30c148b..79d793b 100644 --- a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c +++ b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c @@ -888,8 +888,7 @@ static int c8sectpfe_probe(struct platform_device *pdev) return 0; err_clk_disable: - /* TODO uncomment when upstream has taken a reference on this clk */ - /*clk_disable_unprepare(fei->c8sectpfeclk);*/ + clk_disable_unprepare(fei->c8sectpfeclk); return ret; } @@ -924,11 +923,8 @@ static int c8sectpfe_remove(struct platform_device *pdev) if (readl(fei->io + SYS_OTHER_CLKEN)) writel(0, fei->io + SYS_OTHER_CLKEN); - /* TODO uncomment when upstream has taken a reference on this clk */ - /* if (fei->c8sectpfeclk) clk_disable_unprepare(fei->c8sectpfeclk); - */ return 0; }