From patchwork Fri Mar 17 09:58:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M'boumba Cedric Madianga X-Patchwork-Id: 9630167 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 DE2EB60249 for ; Fri, 17 Mar 2017 10:00:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B326C286A1 for ; Fri, 17 Mar 2017 10:00:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A79A3286A3; Fri, 17 Mar 2017 10:00:21 +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_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM autolearn=unavailable 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 2C524286A1 for ; Fri, 17 Mar 2017 10:00:21 +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:References: In-Reply-To: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:List-Owner; bh=eyK7l9nnBmo1CYe5j/WGM6LUJQcVrJ3gorzPgEPuRDw=; b=GyZUOcrYrgmIXWtaWiNMdrPrUX SNqEjtRl2xEImbmcVsdhCV9//fNZOxrQQfwTUkyvZxH+rIZxONN0nLXssHxW3QKGTvxSjNbJbUtbo 3C64soxq3NfjTB+AA2HpAFPSoEIhhQCBKLQ/vEo9nevg1SB32BYboUItV544dE9HOHURKx8iyiLrU i+MYFCdechn534l+TZdWnFwmT9kQPwSYh9orXLezb3xbd/wAzXWK3rPPskB39Imn38jCePALEbdQs l7axm4qQwVhrRuua/ih6cJ/QwKvZJFZ0Ft8QqaaGBKyIiNi60150nAPdh321Cq95korw63oK/KTmW Mnvq2pQw==; 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 1coogD-0005m2-DP; Fri, 17 Mar 2017 10:00:17 +0000 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1coofW-0003s6-Iy for linux-arm-kernel@lists.infradead.org; Fri, 17 Mar 2017 09:59:36 +0000 Received: by mail-wm0-x241.google.com with SMTP id u132so2368127wmg.1 for ; Fri, 17 Mar 2017 02:59:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=84DwKRqJKIc9dXaRpSyHwwD5CW1a7Owz1ljZisDMLXM=; b=Hz9ynF0qDchGan/tVTc9Om9/6FgNHOLXpuV8f5lasf2iHU1OQFZvRx1rsW11JWd0e6 Dl+5sPPhBJkw2Xc9lbrhViVGETNqZT9emX5L67MKPBHJTxs6fDfi//FMieOmhhNIAIYC 1/O1eo0KUOzrhVRzWRseE2BJogtzKeNlDehmNHTPVMC5RKTfhAmRMUCKY/HCD1nte8xm RDQgtTlil7FEzZtx0HWBuZkKez26oaBewiUK7hXPTppTC/9JENKtL9TQUY6bC9ig4fwh Lb6rFVPUo1wTNlQBLdeq9NY9kBmQNr1CcJGPPVyVWdio2zsa6ivxy+jloblOtIEHzX2P ZboA== 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=84DwKRqJKIc9dXaRpSyHwwD5CW1a7Owz1ljZisDMLXM=; b=sf+CVf0P+RgLpCwxdCricXshDIm+Wi1VQNLMflo8i66ybK8x085J4KJvqPY3qcwUmo rECO/dBm9Ji1H1ayvycMMCj7MZkeirPE9d6xORtsWpulNXgWS9vZeGhPWLZ9jUqIa7vW 6jdpoYegq+8C9sQQB+X05h3MvCY+G6lVTRCyEV2jl9egChkpvTrTfzHZT6a7lr+LVUYj wrClVA79ULhBMo/fv4aDmGgPN+ktqhQSZYRvj80woSNKPUGuCgOg9VR6yU366OOdt0r2 f2ZtKlbtrLbiv65rsrUZtbZUZDBX5cJCW7ElIXW1ioVnVVd6OeB2NNexje3f3pjIHQmZ OJzw== X-Gm-Message-State: AFeK/H26rldfLiqR4TGjG4b4sjanfYRzGk90G7FkgCDEmgnlV35NFvT0SYYDsG/ueKDUlw== X-Received: by 10.28.69.202 with SMTP id l71mr2053957wmi.68.1489744752773; Fri, 17 Mar 2017 02:59:12 -0700 (PDT) Received: from lmenx29w.st.com. ([37.165.103.73]) by smtp.gmail.com with ESMTPSA id o52sm9356959wrb.51.2017.03.17.02.59.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 17 Mar 2017 02:59:11 -0700 (PDT) From: M'boumba Cedric Madianga To: wsa@the-dreams.de, robh+dt@kernel.org, mcoquelin.stm32@gmail.com, alexandre.torgue@st.com, linus.walleij@linaro.org, pierre-yves.mordret@st.com, linux@armlinux.org.uk, linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/5] i2c: i2c-stm32f4: use generic definition of speed enum Date: Fri, 17 Mar 2017 10:58:55 +0100 Message-Id: <1489744738-21632-3-git-send-email-cedric.madianga@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1489744738-21632-1-git-send-email-cedric.madianga@gmail.com> References: <1489744738-21632-1-git-send-email-cedric.madianga@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170317_025934_792718_3AD47237 X-CRM114-Status: GOOD ( 15.93 ) 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: M'boumba Cedric Madianga 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 This patch uses a more generic definition of speed enum for i2c-stm32f4 driver. Signed-off-by: M'boumba Cedric Madianga Reviewed-by: Ludovic BARRE --- drivers/i2c/busses/i2c-stm32.h | 20 ++++++++++++++++++++ drivers/i2c/busses/i2c-stm32f4.c | 18 +++++++----------- 2 files changed, 27 insertions(+), 11 deletions(-) create mode 100644 drivers/i2c/busses/i2c-stm32.h diff --git a/drivers/i2c/busses/i2c-stm32.h b/drivers/i2c/busses/i2c-stm32.h new file mode 100644 index 0000000..dab5176 --- /dev/null +++ b/drivers/i2c/busses/i2c-stm32.h @@ -0,0 +1,20 @@ +/* + * i2c-stm32.h + * + * Copyright (C) M'boumba Cedric Madianga 2017 + * Author: M'boumba Cedric Madianga + * + * License terms: GNU General Public License (GPL), version 2 + */ + +#ifndef _I2C_STM32_H +#define _I2C_STM32_H + +enum stm32_i2c_speed { + STM32_I2C_SPEED_STANDARD, /* 100 kHz */ + STM32_I2C_SPEED_FAST, /* 400 kHz */ + STM32_I2C_SPEED_FAST_PLUS, /* 1 MHz */ + STM32_I2C_SPEED_END, +}; + +#endif /* _I2C_STM32_H */ diff --git a/drivers/i2c/busses/i2c-stm32f4.c b/drivers/i2c/busses/i2c-stm32f4.c index f9dd7e8..b81557d 100644 --- a/drivers/i2c/busses/i2c-stm32f4.c +++ b/drivers/i2c/busses/i2c-stm32f4.c @@ -27,6 +27,8 @@ #include #include +#include "i2c-stm32.h" + /* STM32F4 I2C offset registers */ #define STM32F4_I2C_CR1 0x00 #define STM32F4_I2C_CR2 0x04 @@ -90,12 +92,6 @@ #define STM32F4_I2C_MAX_FREQ 46U #define HZ_TO_MHZ 1000000 -enum stm32f4_i2c_speed { - STM32F4_I2C_SPEED_STANDARD, /* 100 kHz */ - STM32F4_I2C_SPEED_FAST, /* 400 kHz */ - STM32F4_I2C_SPEED_END, -}; - /** * struct stm32f4_i2c_msg - client specific data * @addr: 8-bit slave addr, including r/w bit @@ -159,7 +155,7 @@ static int stm32f4_i2c_set_periph_clk_freq(struct stm32f4_i2c_dev *i2c_dev) i2c_dev->parent_rate = clk_get_rate(i2c_dev->clk); freq = DIV_ROUND_UP(i2c_dev->parent_rate, HZ_TO_MHZ); - if (i2c_dev->speed == STM32F4_I2C_SPEED_STANDARD) { + if (i2c_dev->speed == STM32_I2C_SPEED_STANDARD) { /* * To reach 100 kHz, the parent clk frequency should be between * a minimum value of 2 MHz and a maximum value of 46 MHz due @@ -216,7 +212,7 @@ static void stm32f4_i2c_set_rise_time(struct stm32f4_i2c_dev *i2c_dev) * is not higher than 46 MHz . As a result trise is at most 4 bits wide * and so fits into the TRISE bits [5:0]. */ - if (i2c_dev->speed == STM32F4_I2C_SPEED_STANDARD) + if (i2c_dev->speed == STM32_I2C_SPEED_STANDARD) trise = freq + 1; else trise = freq * 3 / 10 + 1; @@ -230,7 +226,7 @@ static void stm32f4_i2c_set_speed_mode(struct stm32f4_i2c_dev *i2c_dev) u32 val; u32 ccr = 0; - if (i2c_dev->speed == STM32F4_I2C_SPEED_STANDARD) { + if (i2c_dev->speed == STM32_I2C_SPEED_STANDARD) { /* * In standard mode: * t_scl_high = t_scl_low = CCR * I2C parent clk period @@ -808,10 +804,10 @@ static int stm32f4_i2c_probe(struct platform_device *pdev) udelay(2); reset_control_deassert(rst); - i2c_dev->speed = STM32F4_I2C_SPEED_STANDARD; + i2c_dev->speed = STM32_I2C_SPEED_STANDARD; ret = of_property_read_u32(np, "clock-frequency", &clk_rate); if (!ret && clk_rate >= 400000) - i2c_dev->speed = STM32F4_I2C_SPEED_FAST; + i2c_dev->speed = STM32_I2C_SPEED_FAST; i2c_dev->dev = &pdev->dev;