From patchwork Tue Feb 20 08:43:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kochetkov X-Patchwork-Id: 875433 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MitmcbTz"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zlvST1bl1z9s01 for ; Tue, 20 Feb 2018 19:49:45 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id D7D1BC21E8A; Tue, 20 Feb 2018 08:49:39 +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=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 F24E6C21DD9; Tue, 20 Feb 2018 08:49:36 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 28B08C21DD9; Tue, 20 Feb 2018 08:49:35 +0000 (UTC) Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by lists.denx.de (Postfix) with ESMTPS id F2E2BC21C4A for ; Tue, 20 Feb 2018 08:49:33 +0000 (UTC) Received: by mail-lf0-f67.google.com with SMTP id g72so3056944lfg.5 for ; Tue, 20 Feb 2018 00:49:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=nHlbB0ARuYFbzy5fIN0ZPxYt0YfkVkIelPSR/MeDU58=; b=MitmcbTz0+jTVGAy7zg56N+XddwUXaKlPkCu/5MY/sd87v7X5s+rIVen4MhQCzhS4l XCy8Of1AyH24E8j1pYD5mpbUWFE1fWH56xG7ZjK7dzrCUI18LRWVJXHhvVY9fJKCm4xq vgJf8gVH7uB+gM7UOECw/h0MV7fVFUkzKqbNJBQ1J5j6ALQbaemJkWB3ezx9e1ohlaV6 iGe9Sou/RPhn0h7W2uEkFSAvPVZzPOxp0IvZBWxY5KsEo6aRDegtmUGI5dsEIW3Y+weX AAkR5dozEIlhZMH/5JnGVNdSz4fLjekpK8NOqInPWVX4ekA+wIU4HZ3EaI40FQDnYz+o XpjA== 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=nHlbB0ARuYFbzy5fIN0ZPxYt0YfkVkIelPSR/MeDU58=; b=Ost5tM4Qd5kZAv30PxqBXmf+MXhXux16nCmkL7R8NvF+c/rwgc5OALglmH+sQAuBg7 u9Kskq0Zsjk0FBkqzxyahCHHu7IiR0YvQwpHi6709HOJooPHqxgR40pFnrbzMEtTJPbw pFM5po7+JXRikHsN2g1ot7brIz/MF3lnKvHRm1TrLK0QhS45tMHq7lOe+blD1G6IzOI/ g6XiWtnsyhhIVu8Ur+VFXubw2a4LRe01VpejL/D1dWEHkQsNagTS7UYlJu/LIGwtU+2E vl8xEUgmnRQbK1UP3Slcw7LkhHtcnwKwJ5dYVJ9EDSdqowYiR3iuyCeTZ4KXSLINJ0k0 3yoQ== X-Gm-Message-State: APf1xPB1y4w3JbTxqHlQi9Q+RT6W+4unnJ4s8JymznbqD2Z6jJYyKT/Z 5FL3P+EaCdX//lW72o2l69LHNw== X-Google-Smtp-Source: AH8x22536x50kA3684rPA1+kaWK1keITSm4PpRkG5glGot001v1if4P+gQIrhJ4WAgaVUY/1CEvq+w== X-Received: by 10.46.19.17 with SMTP id 17mr11919765ljt.102.1519116573020; Tue, 20 Feb 2018 00:49:33 -0800 (PST) Received: from localhost.localdomain (broadband-46-242-8-235.moscow.rt.ru. [46.242.8.235]) by smtp.gmail.com with ESMTPSA id g17sm4707185ljf.22.2018.02.20.00.49.32 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Feb 2018 00:49:32 -0800 (PST) From: Alexander Kochetkov To: u-boot@lists.denx.de Date: Tue, 20 Feb 2018 11:43:23 +0300 Message-Id: <1519116203-21824-1-git-send-email-al.kochet@gmail.com> X-Mailer: git-send-email 1.7.9.5 Subject: [U-Boot] [PATCH] rockchip: i2c: enable I2C inside GRF for rk3066 and rk3188 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" In order to make I2C work on rk3066 and rk3188 boards GFR must be updated. Signed-off-by: Alexander Kochetkov Acked-by: Philipp Tomsich --- drivers/i2c/rk_i2c.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 80 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/rk_i2c.c b/drivers/i2c/rk_i2c.c index 332280c..3ec5474 100644 --- a/drivers/i2c/rk_i2c.c +++ b/drivers/i2c/rk_i2c.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -34,6 +35,13 @@ struct rk_i2c { unsigned int speed; }; +/** + * @grf_offset: offset inside the grf regmap for setting the i2c type + */ +struct rk_i2c_soc_data { + int grf_offset; +}; + static inline void rk_i2c_get_div(int div, int *divh, int *divl) { *divl = div / 2; @@ -381,9 +389,37 @@ static int rockchip_i2c_ofdata_to_platdata(struct udevice *bus) static int rockchip_i2c_probe(struct udevice *bus) { struct rk_i2c *priv = dev_get_priv(bus); + struct rk_i2c_soc_data *soc_data; + uint32_t value; + int bus_nr; + void *grf; + int ret; priv->regs = dev_read_addr_ptr(bus); + soc_data = (struct rk_i2c_soc_data*)dev_get_driver_data(bus); + + if (soc_data->grf_offset >= 0) { + grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF); + if (IS_ERR(grf)) { + ret = PTR_ERR(grf); + debug("%s: Could not get syscon for %s: %d\n", + __func__, bus->name, ret); + return ret; + } + + ret = dev_read_alias_seq(bus, &bus_nr); + if (ret < 0) { + debug("%s: Could not get alias for %s: %d\n", + __func__, bus->name, ret); + return ret; + } + + /* 27+i: write mask, 11+i: value */ + value = BIT(27 + bus_nr) | BIT(11 + bus_nr); + writel(value, grf + soc_data->grf_offset); + } + return 0; } @@ -392,12 +428,51 @@ static const struct dm_i2c_ops rockchip_i2c_ops = { .set_bus_speed = rockchip_i2c_set_bus_speed, }; +static const struct rk_i2c_soc_data rk3066_soc_data = { + .grf_offset = 0x154, +}; + +static const struct rk_i2c_soc_data rk3188_soc_data = { + .grf_offset = 0x0a4, +}; + +static const struct rk_i2c_soc_data rk3228_soc_data = { + .grf_offset = -1, +}; + +static const struct rk_i2c_soc_data rk3288_soc_data = { + .grf_offset = -1, +}; + +static const struct rk_i2c_soc_data rk3328_soc_data = { + .grf_offset = -1, +}; + +static const struct rk_i2c_soc_data rk3399_soc_data = { + .grf_offset = -1, +}; + static const struct udevice_id rockchip_i2c_ids[] = { - { .compatible = "rockchip,rk3066-i2c" }, - { .compatible = "rockchip,rk3188-i2c" }, - { .compatible = "rockchip,rk3288-i2c" }, - { .compatible = "rockchip,rk3328-i2c" }, - { .compatible = "rockchip,rk3399-i2c" }, + { + .compatible = "rockchip,rk3066-i2c", + .data = (ulong)&rk3066_soc_data, + }, + { + .compatible = "rockchip,rk3188-i2c", + .data = (ulong)&rk3188_soc_data, + }, + { + .compatible = "rockchip,rk3288-i2c", + .data = (ulong)&rk3288_soc_data, + }, + { + .compatible = "rockchip,rk3328-i2c", + .data = (ulong)&rk3328_soc_data, + }, + { + .compatible = "rockchip,rk3399-i2c", + .data = (ulong)&rk3399_soc_data, + }, { } };