From patchwork Thu May 29 14:06:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 31125 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f197.google.com (mail-ve0-f197.google.com [209.85.128.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 03CAE203E6 for ; Thu, 29 May 2014 14:06:49 +0000 (UTC) Received: by mail-ve0-f197.google.com with SMTP id db11sf1677894veb.4 for ; Thu, 29 May 2014 07:06:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=PQEivl22Z7drNKBFJWAuxrcKlaVl6KqWmQNPs974oxw=; b=G+NsyZ+SK9dPuZHICyAymto4cUm1Rc69JS+0euU2qhc40e9WY/uz+5sl7Gx1UFLENo oxakkI6q9CsG8ak3B9H+hvvwvoTWATgDmqOVXX6HFmmu8e/bhUsZ0d49rmHqVlMeBOJw sk6rSMGpCKTspyxlT7LxLo8cPVoHgvjbaNURYBvUjJu2ed+cT38vZAHMC+GH64uVjc0s UzmotU2url3lqSzC8DKEkCQ/7BzV0xC4IH8A3Jev+HCkL5rhQZPNSi80Jt/mQlnR9uXv PVg0sqNyFdVWKRrq18qnjBp5a5YUkDidoNncaP07nSqcmwxUtnVS2sWWfDh2cP+SEjpn NtTw== X-Gm-Message-State: ALoCoQluiJAOtBS8GtiDkHWuWdn7CkEpDYduWmbYDNz4LJWjNe5wwgBr4q8/YTQ5fTBJpt/90cBx X-Received: by 10.224.61.203 with SMTP id u11mr2792822qah.6.1401372409487; Thu, 29 May 2014 07:06:49 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.83.240 with SMTP id j103ls562300qgd.47.gmail; Thu, 29 May 2014 07:06:49 -0700 (PDT) X-Received: by 10.220.48.8 with SMTP id p8mr863394vcf.75.1401372409332; Thu, 29 May 2014 07:06:49 -0700 (PDT) Received: from mail-ve0-f182.google.com (mail-ve0-f182.google.com [209.85.128.182]) by mx.google.com with ESMTPS id ru2si549655vcb.19.2014.05.29.07.06.49 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 29 May 2014 07:06:49 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.182 as permitted sender) client-ip=209.85.128.182; Received: by mail-ve0-f182.google.com with SMTP id sa20so431005veb.13 for ; Thu, 29 May 2014 07:06:49 -0700 (PDT) X-Received: by 10.53.13.133 with SMTP id ey5mr5747375vdd.8.1401372409253; Thu, 29 May 2014 07:06:49 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp31230vcb; Thu, 29 May 2014 07:06:44 -0700 (PDT) X-Received: by 10.68.166.36 with SMTP id zd4mr9397331pbb.54.1401372396085; Thu, 29 May 2014 07:06:36 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gw10si1107437pbd.55.2014.05.29.07.06.35 for ; Thu, 29 May 2014 07:06:35 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757414AbaE2OGb (ORCPT + 27 others); Thu, 29 May 2014 10:06:31 -0400 Received: from mail-ie0-f180.google.com ([209.85.223.180]:46768 "EHLO mail-ie0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965140AbaE2OGI (ORCPT ); Thu, 29 May 2014 10:06:08 -0400 Received: by mail-ie0-f180.google.com with SMTP id tp5so325401ieb.11 for ; Thu, 29 May 2014 07:06:07 -0700 (PDT) X-Received: by 10.50.253.195 with SMTP id ac3mr52086106igd.1.1401372367694; Thu, 29 May 2014 07:06:07 -0700 (PDT) Received: from localhost.localdomain (c-71-195-31-37.hsd1.mn.comcast.net. [71.195.31.37]) by mx.google.com with ESMTPSA id ng17sm2510130igb.13.2014.05.29.07.06.06 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 29 May 2014 07:06:07 -0700 (PDT) From: Alex Elder To: mturquette@linaro.org, mporter@linaro.org, bcm@fixthebug.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 4/5] clk: bcm281xx: define a bus clock Date: Thu, 29 May 2014 09:06:00 -0500 Message-Id: <1401372361-18842-5-git-send-email-elder@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1401372361-18842-1-git-send-email-elder@linaro.org> References: <1401372361-18842-1-git-send-email-elder@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: elder@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.182 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Define the bus clock "bsc3_apb". This bus clock has to be managed using the CCU policy mechanism, so add the definitions required for that to the clock and its CCU. This one bus clock in particular is defined because it is needed by peripheral clock "bsc3". Our boot loader does not properly activate "bsc3_apb", and as a result, "bsc3" isn't able to function properly. With "bsc3_apb" specified as a prerequisite clock for "bsc3", the latter works correctly. For now only this one bus clock is defined, because it allows correct operation of "bsc3". Others can be added later as needed (and this patch serves to show how that's done). Signed-off-by: Alex Elder --- drivers/clk/bcm/clk-bcm281xx.c | 13 ++++++++++++- include/dt-bindings/clock/bcm281xx.h | 3 ++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/clk/bcm/clk-bcm281xx.c b/drivers/clk/bcm/clk-bcm281xx.c index 502a487..b937fc9 100644 --- a/drivers/clk/bcm/clk-bcm281xx.c +++ b/drivers/clk/bcm/clk-bcm281xx.c @@ -309,8 +309,17 @@ static struct peri_clk_data pwm_data = { .trig = TRIGGER(0x0afc, 15), }; +static struct bus_clk_data bsc3_apb_data = { + .policy = POLICY(0x0048, 4), + .gate = HW_SW_GATE(0x0484, 16, 0, 1), +}; + static struct ccu_data slave_ccu_data = { BCM281XX_CCU_COMMON(slave, SLAVE), + .policy = { + .enable = CCU_LVM_EN(0x0034, 0), + .control = CCU_POLICY_CTL(0x000c, 0, 1, 2), + }, .kona_clks = { [BCM281XX_SLAVE_CCU_UARTB] = KONA_CLK(slave, uartb, peri), @@ -329,9 +338,11 @@ static struct ccu_data slave_ccu_data = { [BCM281XX_SLAVE_CCU_BSC2] = KONA_CLK(slave, bsc2, peri), [BCM281XX_SLAVE_CCU_BSC3] = - KONA_CLK(slave, bsc3, peri), + KONA_CLK_PREREQ(slave, bsc3, peri, bsc3_apb), [BCM281XX_SLAVE_CCU_PWM] = KONA_CLK(slave, pwm, peri), + [BCM281XX_SLAVE_CCU_BSC3_APB] = + KONA_CLK(slave, bsc3_apb, bus), [BCM281XX_SLAVE_CCU_CLOCK_COUNT] = LAST_KONA_CLK, }, }; diff --git a/include/dt-bindings/clock/bcm281xx.h b/include/dt-bindings/clock/bcm281xx.h index a763460..99f4aad 100644 --- a/include/dt-bindings/clock/bcm281xx.h +++ b/include/dt-bindings/clock/bcm281xx.h @@ -72,6 +72,7 @@ #define BCM281XX_SLAVE_CCU_BSC2 7 #define BCM281XX_SLAVE_CCU_BSC3 8 #define BCM281XX_SLAVE_CCU_PWM 9 -#define BCM281XX_SLAVE_CCU_CLOCK_COUNT 10 +#define BCM281XX_SLAVE_CCU_BSC3_APB 10 +#define BCM281XX_SLAVE_CCU_CLOCK_COUNT 11 #endif /* _CLOCK_BCM281XX_H */