From patchwork Thu Jun 14 11:43:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 929383 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="gAImQPeW"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 4161zB4q7xz9s19 for ; Thu, 14 Jun 2018 21:45:58 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 69447C21D8A; Thu, 14 Jun 2018 11:44:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D0832C21DA1; Thu, 14 Jun 2018 11:44:03 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 35325C21DF8; Thu, 14 Jun 2018 11:43:53 +0000 (UTC) Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by lists.denx.de (Postfix) with ESMTPS id 3B11EC21DC1 for ; Thu, 14 Jun 2018 11:43:50 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id v13-v6so6058839wrp.13 for ; Thu, 14 Jun 2018 04:43:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4p2E/CoQREbwKU01lkm6LccAYBLaGIrBkOtesHKV0VI=; b=gAImQPeW3Pl1akCLpdO7mmMVyptWB/VlYkYdlvG/LSmW4fci+OxenOSMKidRDlgtS4 pahpn8bV9agKAxqjPdr8zK6MbEn8tkjlbl+1EFSnad8RsFIk0ZG+jFIh80jDu1sHejPg 9wI8dLtutWHUtN4ZZzq/SSbI2+WKAi/lDC9y1aOVsTEPT8Fuya61lB+8iNkPiDLzEstA V2ORf8+LCaGFVNNYbQ43EWVzLEG1kMgCb4bX4rEcTFWJnPsrr90tJzvnBbV3fj6ypvtU RY/sOKJHNIxX6YXqQhDHO1/pUm9Pz+3OvApew2FuSr5Kv322ee5Yy+A0dkodMovd8lbO ELFg== 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:in-reply-to :references; bh=4p2E/CoQREbwKU01lkm6LccAYBLaGIrBkOtesHKV0VI=; b=pCfnQqZg9f8DBq2oDP/Z+x+YuJ7+Q/WwsO/Zwa7W61yJrkyggxflNIKQeXT/lWYd8w 2FqKM5eA6NIv8z0kMxamwUcMNZRcVUxzqZn1j64JGxkKTK2BNpX3A6kwIqTUAlCRT/vW WKNRz9NCmCOIAWViv409uWkR4r26gSPNlB/3m7NP8Og9agxbPUdZtMxOceOAtb4pABnQ mjBmqw0sUoUtFCUrufTC0rkm5MSjdL9mv6nD9bX9iPbBqMg3b42OlmgbaoXhzzjJCQTA 37bMseUMs8j/evWg8S53mdzcHIbqyyQfEsnWDm+sI7X9yvH96Uns/AbR1fFFVgh+0C+2 U2mA== X-Gm-Message-State: APt69E35OgEiHkmzoKVTGFg0M86RAaNwf8zZyZjxAdKpzMtNJKfFt5Ke F+Na1zhETmbxemquhbEp2s/v3Q== X-Google-Smtp-Source: ADUXVKIF08al2AlCMs49Fpu9nNo+a+6sFf5itA9dDesS5XfuFTnvw65nS1+y0AB0eCTTrmqeB0AiyA== X-Received: by 2002:adf:84c2:: with SMTP id 60-v6mr2004876wrg.167.1528976629754; Thu, 14 Jun 2018 04:43:49 -0700 (PDT) Received: from bender.baylibre.local ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id b80-v6sm7850426wmf.2.2018.06.14.04.43.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 14 Jun 2018 04:43:48 -0700 (PDT) From: Neil Armstrong To: trini@konsulko.com, sjg@chromium.org Date: Thu, 14 Jun 2018 13:43:40 +0200 Message-Id: <1528976621-8397-5-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1528976621-8397-1-git-send-email-narmstrong@baylibre.com> References: <1528976621-8397-1-git-send-email-narmstrong@baylibre.com> Cc: u-boot@lists.denx.de, linux-amlogic@lists.infradead.org Subject: [U-Boot] [PATCH u-boot 4/5] meson: use the clock driver X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Beniamino Galvani Use the clk framework to initialize clocks from drivers that need them instead of having hardcoded frequencies and initializations from board code. Signed-off-by: Beniamino Galvani Signed-off-by: Neil Armstrong --- arch/arm/include/asm/arch-meson/gx.h | 10 ---------- arch/arm/mach-meson/eth.c | 3 +-- board/amlogic/libretech-cc/libretech-cc.c | 4 ---- board/amlogic/odroid-c2/odroid-c2.c | 3 --- drivers/i2c/meson_i2c.c | 20 +++++++++++++++++--- 5 files changed, 18 insertions(+), 22 deletions(-) diff --git a/arch/arm/include/asm/arch-meson/gx.h b/arch/arm/include/asm/arch-meson/gx.h index 03fb6b0..4bc9475 100644 --- a/arch/arm/include/asm/arch-meson/gx.h +++ b/arch/arm/include/asm/arch-meson/gx.h @@ -56,14 +56,4 @@ /* Ethernet memory power domain */ #define GX_MEM_PD_REG_0_ETH_MASK (BIT(2) | BIT(3)) -/* Clock gates */ -#define GX_GCLK_MPEG_0 GX_HIU_ADDR(0x50) -#define GX_GCLK_MPEG_1 GX_HIU_ADDR(0x51) -#define GX_GCLK_MPEG_2 GX_HIU_ADDR(0x52) -#define GX_GCLK_MPEG_OTHER GX_HIU_ADDR(0x53) -#define GX_GCLK_MPEG_AO GX_HIU_ADDR(0x54) - -#define GX_GCLK_MPEG_0_I2C BIT(9) -#define GX_GCLK_MPEG_1_ETH BIT(3) - #endif /* __GX_H__ */ diff --git a/arch/arm/mach-meson/eth.c b/arch/arm/mach-meson/eth.c index 061f19a..8b28bc8 100644 --- a/arch/arm/mach-meson/eth.c +++ b/arch/arm/mach-meson/eth.c @@ -48,7 +48,6 @@ void meson_gx_eth_init(phy_interface_t mode, unsigned int flags) return; } - /* Enable power and clock gate */ - setbits_le32(GX_GCLK_MPEG_1, GX_GCLK_MPEG_1_ETH); + /* Enable power gate */ clrbits_le32(GX_MEM_PD_REG_0, GX_MEM_PD_REG_0_ETH_MASK); } diff --git a/board/amlogic/libretech-cc/libretech-cc.c b/board/amlogic/libretech-cc/libretech-cc.c index e89bf77..ccab127 100644 --- a/board/amlogic/libretech-cc/libretech-cc.c +++ b/board/amlogic/libretech-cc/libretech-cc.c @@ -32,10 +32,6 @@ int misc_init_r(void) meson_gx_eth_init(PHY_INTERFACE_MODE_RMII, MESON_GXL_USE_INTERNAL_RMII_PHY); - /* Enable power and clock gate */ - setbits_le32(GX_GCLK_MPEG_1, GX_GCLK_MPEG_1_ETH); - clrbits_le32(GX_MEM_PD_REG_0, GX_MEM_PD_REG_0_ETH_MASK); - if (!eth_env_get_enetaddr("ethaddr", mac_addr)) { len = meson_sm_read_efuse(EFUSE_MAC_OFFSET, mac_addr, EFUSE_MAC_SIZE); diff --git a/board/amlogic/odroid-c2/odroid-c2.c b/board/amlogic/odroid-c2/odroid-c2.c index 1b7fd81..c47b9ce 100644 --- a/board/amlogic/odroid-c2/odroid-c2.c +++ b/board/amlogic/odroid-c2/odroid-c2.c @@ -30,9 +30,6 @@ int misc_init_r(void) meson_gx_eth_init(PHY_INTERFACE_MODE_RGMII, 0); - /* Enable power and clock gate */ - setbits_le32(GX_GCLK_MPEG_0, GX_GCLK_MPEG_0_I2C); - /* Reset PHY on GPIOZ_14 */ clrbits_le32(GX_GPIO_EN(3), BIT(14)); clrbits_le32(GX_GPIO_OUT(3), BIT(14)); diff --git a/drivers/i2c/meson_i2c.c b/drivers/i2c/meson_i2c.c index 8c9318d..7d06d95 100644 --- a/drivers/i2c/meson_i2c.c +++ b/drivers/i2c/meson_i2c.c @@ -3,8 +3,8 @@ * (C) Copyright 2017 - Beniamino Galvani */ #include -#include #include +#include #include #include @@ -42,6 +42,7 @@ struct i2c_regs { }; struct meson_i2c { + struct clk clk; struct i2c_regs *regs; struct i2c_msg *msg; /* Current I2C message */ bool last; /* Whether the message is the last */ @@ -221,9 +222,13 @@ static int meson_i2c_xfer(struct udevice *bus, struct i2c_msg *msg, static int meson_i2c_set_bus_speed(struct udevice *bus, unsigned int speed) { struct meson_i2c *i2c = dev_get_priv(bus); - unsigned int clk_rate = MESON_I2C_CLK_RATE; + ulong clk_rate; unsigned int div; + clk_rate = clk_get_rate(&i2c->clk); + if (IS_ERR_VALUE(clk_rate)) + return -EINVAL; + div = DIV_ROUND_UP(clk_rate, speed * 4); /* clock divider has 12 bits */ @@ -238,7 +243,7 @@ static int meson_i2c_set_bus_speed(struct udevice *bus, unsigned int speed) clrsetbits_le32(&i2c->regs->ctrl, REG_CTRL_CLKDIVEXT_MASK, (div >> 10) << REG_CTRL_CLKDIVEXT_SHIFT); - debug("meson i2c: set clk %u, src %u, div %u\n", speed, clk_rate, div); + debug("meson i2c: set clk %u, src %lu, div %u\n", speed, clk_rate, div); return 0; } @@ -246,6 +251,15 @@ static int meson_i2c_set_bus_speed(struct udevice *bus, unsigned int speed) static int meson_i2c_probe(struct udevice *bus) { struct meson_i2c *i2c = dev_get_priv(bus); + int ret; + + ret = clk_get_by_index(bus, 0, &i2c->clk); + if (ret < 0) + return ret; + + ret = clk_enable(&i2c->clk); + if (ret) + return ret; i2c->regs = dev_read_addr_ptr(bus); clrbits_le32(&i2c->regs->ctrl, REG_CTRL_START);