From patchwork Wed May 24 08:20:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 9745315 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 6E95A601C2 for ; Wed, 24 May 2017 08:22:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5D17428919 for ; Wed, 24 May 2017 08:22:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 51B7D28928; Wed, 24 May 2017 08:22:03 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A71CE28919 for ; Wed, 24 May 2017 08:22:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=qlyDaT0aBO5Rl8vsXJjIdl2z+X7dboZvblw0YgSBJ2Q=; b=ox2 i6g5/jw45C1Fo2JAF9YKc7HroVgZYSh7OJ7jJ8af4ViWdVcs5KyIxtiaAcR0Z1FMILPWAMm0hTAus TWzaFQWsfsc5xlDXcK3Z92rMY0Tq++bE95uruTbPGuz7hwoVBIxvTuZiEEIkoIjrrNJv5xMiZ9Lv5 blaHkXaiE6a7+MOvhkf1H/86utxYoWqWNTZ9RbeqPoVvLdP5sSvK2Zt/wzlO8INC290FMoKFZCabo XeclMod48HQ1Qd+yZcr/7ZOZqPR3AS0k9fr7zhVWUppiTFUPUT/LS/6g8wdoq/w8IzXgTU/Cs1bxd TqF0HGCa9FYv4TA5Yjlazu2QbBl9y1A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dDRYM-0003q2-Ve; Wed, 24 May 2017 08:21:58 +0000 Received: from mail-lf0-x230.google.com ([2a00:1450:4010:c07::230]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dDRXZ-00030g-Oe for linux-arm-kernel@lists.infradead.org; Wed, 24 May 2017 08:21:25 +0000 Received: by mail-lf0-x230.google.com with SMTP id a5so49415643lfh.2 for ; Wed, 24 May 2017 01:20:49 -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=mvSTR0qtWvar6ES6PcGYtgovPeLI226I2auyi+J0zZI=; b=Uty/JRM7vtHd+puLhSt9xGB3OrALk7o86eoXn/zNXkDBE6i9YwKJp9qVpfSfK9HZJv FTHN1zNH1ocVnoJ/9Pp916xKI6sbwuO76Dhvopgs8PHoMTLlMN1VpL8d7xaxQ6hCDSof cn4mnJrle5PCCexZSPtmYgEcN++PKLOqqLjAA= 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; bh=mvSTR0qtWvar6ES6PcGYtgovPeLI226I2auyi+J0zZI=; b=Q0Hv+XmCzkN2yjkOtfTH8tfG9aiV73lZZMV9mnXOcHaCycfX71ypwNr1afVRUueZTE YE2gEvgTSralcD0lQI3K1GEhYHuS0LqoWPy5IpVPSgNosqAeAFAZNoU8Y+udHgAAIjxw LAz3N1S9lc/kwd5ev0zZPmsOP3rVu018PvhfBbRTaXvDMrzrBCFJrYERkh0kIq0MZMd9 eHM+C47+ajY3CrmPsqv04yK90xKWE0d19aWTzqJjFToWsXFfleV4O4BYxNY2aCaOi5DS ikoxd+yCHBLocXBTwrcVxAbuKMckA8fJZOxZdgHvdjyyzLSjQO80kerfM9VDbSW4q/Rh 9/mQ== X-Gm-Message-State: AODbwcA97SlK5hFdtO8S6MAxhv29gJdyiG9XIebLAirmd1QD+xZyGEk9 zO7j2dTS27vwzmYt X-Received: by 10.25.195.82 with SMTP id t79mr10138713lff.109.1495614047935; Wed, 24 May 2017 01:20:47 -0700 (PDT) Received: from fabina.bredbandsbolaget.se (c-787571d5.014-348-6c756e10.cust.bredbandsbolaget.se. [213.113.117.120]) by smtp.gmail.com with ESMTPSA id f25sm632962ljb.65.2017.05.24.01.20.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 May 2017 01:20:46 -0700 (PDT) From: Linus Walleij To: Michael Turquette , Stephen Boyd , linux-clk@vger.kernel.org Subject: [PATCH 2/2 v4] clk: Add Gemini SoC clock controller Date: Wed, 24 May 2017 10:20:44 +0200 Message-Id: <20170524082044.8473-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.9.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170524_012110_228982_FBD1CC2E X-CRM114-Status: GOOD ( 28.17 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Florian Fainelli , Paulius Zaleckas , Hans Ulli Kroll , Janos Laube , Linus Walleij , linux-arm-kernel@lists.infradead.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 The Cortina Systems Gemini (SL3516/CS3516) has an on-chip clock controller that derive all clocks from a single crystal, using some documented and some undocumented PLLs, half dividers, counters and gates. This is a best attempt to construct a clock driver for the clocks so at least we can gate off unused hardware and driver the PCI bus clock. Signed-off-by: Linus Walleij --- Mike/Stephen: please merge this into the clk subsystem once you're happy with it. Sorry for the back-and-forth. I will deal with the ARM SoC DTS landing orthogonally. ChangeLog v3->v4: - No changes, just resending with separate DT header file. ChangeLog v2->v3: - Augment driver to probe directly from the system controller. - Mike/Stephen: when you're happy with this please ACK it so I can merge it through ARM SoC. This is needed because of the mess of #include from the DT bindings that is then used all over the DTS files. ChangeLog v1->v2: - Move the clock controller to be part of the syscon node. No need for a separate child node for this. --- drivers/clk/Kconfig | 7 + drivers/clk/Makefile | 1 + drivers/clk/clk-gemini.c | 357 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 365 insertions(+) create mode 100644 drivers/clk/clk-gemini.c diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index 36cfea38135f..69178fd58ac8 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -126,6 +126,13 @@ config COMMON_CLK_CS2000_CP help If you say yes here you get support for the CS2000 clock multiplier. +config COMMON_CLK_GEMINI + bool "Clock driver for Cortina Systems Gemini SoC" + select MFD_SYSCON + ---help--- + This driver supports the SoC clocks on the Cortina Systems Gemini + platform, also known as SL3516 or CS3516. + config COMMON_CLK_S2MPS11 tristate "Clock driver for S2MPS1X/S5M8767 MFD" depends on MFD_SEC_CORE || COMPILE_TEST diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index c19983afcb81..a625c002a810 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -25,6 +25,7 @@ obj-$(CONFIG_COMMON_CLK_CDCE925) += clk-cdce925.o obj-$(CONFIG_ARCH_CLPS711X) += clk-clps711x.o obj-$(CONFIG_COMMON_CLK_CS2000_CP) += clk-cs2000-cp.o obj-$(CONFIG_ARCH_EFM32) += clk-efm32gg.o +obj-$(CONFIG_COMMON_CLK_GEMINI) += clk-gemini.o obj-$(CONFIG_ARCH_HIGHBANK) += clk-highbank.o obj-$(CONFIG_COMMON_CLK_MAX77686) += clk-max77686.o obj-$(CONFIG_ARCH_MB86S7X) += clk-mb86s7x.o diff --git a/drivers/clk/clk-gemini.c b/drivers/clk/clk-gemini.c new file mode 100644 index 000000000000..5a0de8415f91 --- /dev/null +++ b/drivers/clk/clk-gemini.c @@ -0,0 +1,357 @@ +/* + * Cortina Gemini Clock Controller driver + * Copyright (c) 2017 Linus Walleij + */ + +#define pr_fmt(fmt) "clk-gemini: " fmt + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* Globally visible clocks */ +static DEFINE_SPINLOCK(gemini_clk_lock); +static struct clk *gemini_clks[GEMINI_NUM_CLKS]; +static struct clk_onecell_data gemini_clk_data; + +#define GEMINI_GLOBAL_STATUS 0x04 +#define PLL_OSC_SEL BIT(30) +#define AHBSPEED_SHIFT (15) +#define AHBSPEED_MASK 0x07 +#define CPU_AHB_RATIO_SHIFT (18) +#define CPU_AHB_RATIO_MASK 0x03 + +#define GEMINI_GLOBAL_PLL_CONTROL 0x08 + +#define GEMINI_GLOBAL_MISC_CONTROL 0x30 +#define PCI_CLK_66MHZ BIT(18) +#define PCI_CLK_OE BIT(17) + +#define GEMINI_GLOBAL_CLOCK_CONTROL 0x34 +#define PCI_CLKRUN_EN BIT(16) +#define TVC_HALFDIV_SHIFT (24) +#define TVC_HALFDIV_MASK 0x1f +#define SECURITY_CLK_SEL BIT(29) + +#define GEMINI_GLOBAL_PCI_DLL_CONTROL 0x44 +#define PCI_DLL_BYPASS BIT(31) +#define PCI_DLL_TAP_SEL_MASK 0x1f + +struct gemini_gate_data { + u8 bit_idx; + const char *name; + const char *parent_name; + unsigned long flags; +}; + +/** + * struct clk_gemini_pci - Gemini PCI clock + * @hw: corresponding clock hardware entry + * @map: regmap to access the registers + * @rate: current rate + */ +struct clk_gemini_pci { + struct clk_hw hw; + struct regmap *map; + unsigned long rate; +}; + +/* + * FIXME: some clocks are marked as CLK_IGNORE_UNUSED: this is + * because their kernel drivers lack proper clock handling so we + * need to avoid them being gated off by default. Remove this as + * the drivers get fixed to handle clocks properly. + * + * The DDR controller may never have a driver, but certainly must + * not be gated off. + */ +static const struct gemini_gate_data gemini_gates[] __initconst = { + { 1, "security-gate", "secdiv", 0 }, + { 2, "gmac0-gate", "ahb", 0 }, + { 3, "gmac1-gate", "ahb", 0 }, + { 4, "sata0-gate", "ahb", 0 }, + { 5, "sata1-gate", "ahb", 0 }, + { 6, "usb0-gate", "ahb", 0 }, + { 7, "usb1-gate", "ahb", 0 }, + { 8, "ide-gate", "ahb", 0 }, + { 9, "pci-gate", "ahb", 0 }, + { 10, "ddr-gate", "ahb", CLK_IGNORE_UNUSED }, + { 11, "flash-gate", "ahb", CLK_IGNORE_UNUSED }, + { 12, "tvc-gate", "ahb", 0 }, + { 13, "boot-gate", "apb", 0 }, +}; + +#define to_pciclk(_hw) container_of(_hw, struct clk_gemini_pci, hw) + +static unsigned long gemini_pci_recalc_rate(struct clk_hw *hw, + unsigned long parent_rate) +{ + struct clk_gemini_pci *pciclk = to_pciclk(hw); + u32 val; + int ret; + + ret = regmap_read(pciclk->map, GEMINI_GLOBAL_MISC_CONTROL, &val); + if (ret) + return ret; + if (val & PCI_CLK_66MHZ) + return 66000000; + return 33000000; +} + +static long gemini_pci_round_rate(struct clk_hw *hw, unsigned long rate, + unsigned long *prate) +{ + /* We support 33 and 66 MHz */ + if (rate < 48000000) + return 33000000; + return 66000000; +} + +static int gemini_pci_set_rate(struct clk_hw *hw, unsigned long rate, + unsigned long parent_rate) +{ + struct clk_gemini_pci *pciclk = to_pciclk(hw); + + if (rate == 33000000) + return regmap_update_bits(pciclk->map, + GEMINI_GLOBAL_MISC_CONTROL, + PCI_CLK_66MHZ, 0); + if (rate == 66000000) + return regmap_update_bits(pciclk->map, + GEMINI_GLOBAL_MISC_CONTROL, + 0, PCI_CLK_66MHZ); + return -EINVAL; +} + +static int gemini_pci_enable(struct clk_hw *hw) +{ + struct clk_gemini_pci *pciclk = to_pciclk(hw); + + regmap_update_bits(pciclk->map, GEMINI_GLOBAL_CLOCK_CONTROL, + 0, PCI_CLKRUN_EN); + regmap_update_bits(pciclk->map, + GEMINI_GLOBAL_MISC_CONTROL, + 0, PCI_CLK_OE); + return 0; +} + +static void gemini_pci_disable(struct clk_hw *hw) +{ + struct clk_gemini_pci *pciclk = to_pciclk(hw); + + regmap_update_bits(pciclk->map, + GEMINI_GLOBAL_MISC_CONTROL, + PCI_CLK_OE, 0); + regmap_update_bits(pciclk->map, GEMINI_GLOBAL_CLOCK_CONTROL, + PCI_CLKRUN_EN, 0); +} + +static int gemini_pci_is_enabled(struct clk_hw *hw) +{ + struct clk_gemini_pci *pciclk = to_pciclk(hw); + int ret; + unsigned int val; + + ret = regmap_read(pciclk->map, GEMINI_GLOBAL_CLOCK_CONTROL, &val); + if (ret) + return ret; + + return !!(val & PCI_CLKRUN_EN); +} + +static const struct clk_ops gemini_pci_clk_ops = { + .recalc_rate = gemini_pci_recalc_rate, + .round_rate = gemini_pci_round_rate, + .set_rate = gemini_pci_set_rate, + .enable = gemini_pci_enable, + .disable = gemini_pci_disable, + .is_enabled = gemini_pci_is_enabled, +}; + +static struct clk *gemini_pci_clk_setup(const char *name, + const char *parent_name, + struct regmap *map) +{ + struct clk_gemini_pci *pciclk; + struct clk_init_data init; + struct clk *clk; + + pciclk = kzalloc(sizeof(*pciclk), GFP_KERNEL); + if (!pciclk) + return ERR_PTR(-ENOMEM); + + init.name = name; + init.ops = &gemini_pci_clk_ops; + init.flags = 0; + init.parent_names = (parent_name ? &parent_name : NULL); + init.num_parents = (parent_name ? 1 : 0); + pciclk->map = map; + pciclk->hw.init = &init; + + clk = clk_register(NULL, &pciclk->hw); + if (IS_ERR(clk)) + kfree(pciclk); + + return clk; +} + +static void __init gemini_cc_init(struct device_node *np) +{ + void __iomem *base; + struct regmap *map; + struct clk *clk; + unsigned int mult, div; + unsigned long freq; + u32 val; + int ret; + int i; + + /* Remap the system controller for the exclusive register */ + base = of_iomap(np, 0); + if (!base) { + pr_err("no memory base\n"); + return; + } + map = syscon_node_to_regmap(np); + if (IS_ERR(map)) { + pr_err("no syscon regmap\n"); + return; + } + + /* RTC clock 32768 Hz */ + clk = clk_register_fixed_rate(NULL, "rtc", NULL, CLK_IGNORE_UNUSED, + 32768); + gemini_clks[GEMINI_CLK_RTC] = clk; + + ret = regmap_read(map, GEMINI_GLOBAL_STATUS, &val); + if (ret) { + pr_err("failed to read global status register\n"); + return; + } + + /* + * XTAL is the crystal oscillator, 60 or 30 MHz selected from + * strap pin E6 + */ + if (val & PLL_OSC_SEL) + freq = 30000000; + else + freq = 60000000; + clk = clk_register_fixed_rate(NULL, "xtal", NULL, CLK_IGNORE_UNUSED, + freq); + pr_info("main crystal @%lu MHz\n", (freq/1000000)); + + /* VCO clock derived from the crystal */ + mult = 13 + ((val >> AHBSPEED_SHIFT) & AHBSPEED_MASK); + div = 2; + /* If we run on 30 Mhz crystal we have to multiply with two */ + if (val & PLL_OSC_SEL) + mult *= 2; + clk = clk_register_fixed_factor(NULL, "vco", "xtal", CLK_IGNORE_UNUSED, + mult, div); + + /* The AHB clock is always 1/3 of the VCO */ + clk = clk_register_fixed_factor(NULL, "ahb", "vco", + CLK_IGNORE_UNUSED, 1, 3); + gemini_clks[GEMINI_CLK_AHB] = clk; + + /* The APB clock is always 1/6 of the AHB */ + clk = clk_register_fixed_factor(NULL, "apb", "ahb", + CLK_IGNORE_UNUSED, 1, 6); + gemini_clks[GEMINI_CLK_APB] = clk; + + /* CPU clock derived as a fixed ratio from the AHB clock */ + switch ((val >> CPU_AHB_RATIO_SHIFT) & CPU_AHB_RATIO_MASK) { + case 0x0: + /* 1x */ + mult = 1; + div = 1; + break; + case 0x1: + /* 1.5x */ + mult = 3; + div = 2; + break; + case 0x2: + /* 1.85x */ + mult = 24; + div = 13; + break; + case 0x3: + /* 2x */ + mult = 2; + div = 1; + break; + } + clk = clk_register_fixed_factor(NULL, "cpu", "ahb", + CLK_IGNORE_UNUSED, mult, div); + gemini_clks[GEMINI_CLK_CPU] = clk; + + /* Security clock is 1:1 or 0.75 of APB */ + ret = regmap_read(map, GEMINI_GLOBAL_CLOCK_CONTROL, &val); + if (ret) { + pr_err("failed to read global clock control register\n"); + return; + } + if (val & SECURITY_CLK_SEL) { + mult = 1; + div = 1; + } else { + mult = 3; + div = 4; + } + clk = clk_register_fixed_factor(NULL, "secdiv", "ahb", + 0, mult, div); + + /* + * These are the leaf gates, at boot no clocks are gated. + */ + for (i = 0; i < ARRAY_SIZE(gemini_gates); i++) { + const struct gemini_gate_data *gd; + + gd = &gemini_gates[i]; + gemini_clks[GEMINI_CLK_GATES + i] = + clk_register_gate(NULL, gd->name, + gd->parent_name, + gd->flags, + base + GEMINI_GLOBAL_CLOCK_CONTROL, + gd->bit_idx, + CLK_GATE_SET_TO_DISABLE, + &gemini_clk_lock); + } + + /* + * The TV Interface Controller has a 5-bit half divider register. + * This clock is supposed to be 27MHz as this is an exact multiple + * of PAL and NTSC frequencies. The register is undocumented :( + * FIXME: figure out the parent and how the divider works. + */ + mult = 1; + div = ((val >> TVC_HALFDIV_SHIFT) & TVC_HALFDIV_MASK); + pr_debug("TVC half divider value = %d\n", div); + div += 1; + clk = clk_register_fixed_rate(NULL, "tvcdiv", "xtal", 0, 27000000); + gemini_clks[GEMINI_CLK_TVC] = clk; + + /* FIXME: very unclear what the parent is */ + clk = gemini_pci_clk_setup("PCI", "xtal", map); + gemini_clks[GEMINI_CLK_PCI] = clk; + + /* FIXME: very unclear what the parent is */ + clk = clk_register_fixed_rate(NULL, "uart", "xtal", CLK_IGNORE_UNUSED, + 48000000); + gemini_clks[GEMINI_CLK_UART] = clk; + + /* Register the clocks to be accessed by the device tree */ + gemini_clk_data.clks = gemini_clks; + gemini_clk_data.clk_num = ARRAY_SIZE(gemini_clks); + of_clk_add_provider(np, of_clk_src_onecell_get, &gemini_clk_data); +} +CLK_OF_DECLARE_DRIVER(gemini_cc, "cortina,gemini-syscon", gemini_cc_init);