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: 9388273 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 49F5D607F0 for ; Fri, 21 Oct 2016 08:58:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3A0ED29F47 for ; Fri, 21 Oct 2016 08:58:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2EC8629F49; Fri, 21 Oct 2016 08:58:20 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B5CE829F47 for ; Fri, 21 Oct 2016 08:58:19 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bxVcm-0000TV-Ai; Fri, 21 Oct 2016 08:56:24 +0000 Received: from mail-qk0-x22b.google.com ([2607:f8b0:400d:c09::22b]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bxVcV-0008Uf-4l for linux-arm-kernel@lists.infradead.org; Fri, 21 Oct 2016 08:56:13 +0000 Received: by mail-qk0-x22b.google.com with SMTP id z190so138583612qkc.2 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=SCQ4QLaifz61BNrS0XsBmJ1TWQSWXoPa2xeRNlbxf40gxxfZzJ+b3+2/3F9JBRbtt3 Y7EDonDZBp6nrf40/cZvk6lUpSiXheMNXP5lfVsomzHfZwr1qpmTFQBNK1vv17QAs0wt 0XzdAQu55aya8a5PPg2GB3DrXC99g2+gU80xCQA+UuGnPt2NpeAmaKXMqo8Ap4TIjiGY JgG+lwmVWIT5CiCJ5wldUfKmxCIZFeidiliWY8kETXGYWLxVdLcDclzWqXaOfbeMaRD1 SmOluzsUCCklmafTY6mvgdySi555q74FjHWgUe6jddH8bFfcM5E2SzVXn6PIU4x2yvsi 52ag== X-Gm-Message-State: ABUngvfrfKeN/lgQj+70rGYK2dYXGkrVhb1OeDVGAVWzD03n8v50KySByys4T5wWuJKKEibo 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161021_015607_747764_588EBD0A X-CRM114-Status: GOOD ( 11.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.griffin@linaro.org, lee.jones@linaro.org, linux-media@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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; }