From patchwork Tue Apr 2 06:30:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Breathitt Gray X-Patchwork-Id: 10881113 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EEAEC1669 for ; Tue, 2 Apr 2019 06:33:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D462B28770 for ; Tue, 2 Apr 2019 06:33:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C880A28843; Tue, 2 Apr 2019 06:33:08 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 6D89D28770 for ; Tue, 2 Apr 2019 06:33:08 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=eUTIq6uxQTZXDAZa7Xjh5n5VP8a2vJBJMKsNulLG+4s=; b=MFinmGZLsUU/84 faPSRJ98Q3mcCn60pQablNn+JcFk4dyWzdF+7LYKHT/1AJWg4EexpoUv+JSWXXg1huJe5hCl7yoEH eKyyRHD+6zW9tSRZZikAwtvphMAb4s4aS2daDwIElIxoGuw6RtRH/F7xFMbZ+6mUuRpmyYOsyUqNe TNcc4MYy+EkEpy42efKW5DK2Tpjt444btZtvMXlR4C2p1oqBt9Xy8R+3pTev7d2dV7gL1quN7GDqT sbg609nm/cawrTRt6nx32RULJv4WGt1vV84NvuDLY6sdtIW12vZPCjP6OCHKWByML44YWeWYQy0sE 3h/DFBIbjiTr2CHqVC+Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hBCyj-0002HT-W9; Tue, 02 Apr 2019 06:33:02 +0000 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hBCy9-0001W5-BE for linux-arm-kernel@lists.infradead.org; Tue, 02 Apr 2019 06:33:00 +0000 Received: by mail-pg1-x541.google.com with SMTP id q1so6006914pgv.13 for ; Mon, 01 Apr 2019 23:32:25 -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 :mime-version:content-transfer-encoding; bh=i/73y8EqAZm2cFjbN4yCx0AeoLF3+nbdcxL9URDqVac=; b=aNhFccOka/xlrRuJPftLIHqXOitZh0phQC2lQ3PkGChkwRIjRosI0XyI9gyfBpmmDh mwD6q5eympVCFtuDYDS7MZ5+otFqk/2UhXdKnzDl6faevAwP5SVPK/3Sjhi0Vjd/lV2/ cJ0M/d7f3FT2nMwwijOhjjdcJwdn14ucBPY1QHIF89s1WyzkVZk+FtQqOko9OPOqCBjd JqsLv2KcecLh1gf/BfB7YNn/CntblZz0K6djow3ad6zxsfC8QRjRfEoDJ/HHbqb4028K s2T+ut/jh56EHMr77XeLDv6Ebu78ODs5nSYZY65J961NBoghSEgxQiyiZoEaWpfktwAC xRqA== 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:mime-version:content-transfer-encoding; bh=i/73y8EqAZm2cFjbN4yCx0AeoLF3+nbdcxL9URDqVac=; b=gBE+RgW+xPjYb6pHynVkFjtMK4Ie7C5+xicCT9Ps4ZB/J4nsJ38AbrA8RKEFXbF3NO ECwubl59DQEZWqCEtSE9AMOnNNRlBxU1CF1accerxxGJWk6JEmOgKzZF5cXgXgmr2Fzj OTtBqs9VkIM6JtV9XlsJRtMPFNDSplLpyBiKL1ow6G+Chr/Qs0cFDBFM6QcOqHFbskgR o+eUY65X3niVReO4eounf0/X6w8P0LXraP0xMNwVlHaVuJYFNAeCoK5V+fb5NtznwB/v vANMCzIyt/O7WxyzWymmmx2oXyKKUYyPtTee/pFKwtz94h2gMkF8aDGsKalOy/WLD+02 /2iA== X-Gm-Message-State: APjAAAX4f5Uv5meL0I+Fhj0kG0s+bmWHp8Qaw4DWdbOROYnQ2/uajJ9l cI2r5Ijnp+jSUH3v2Jz1Zh0= X-Google-Smtp-Source: APXvYqyKElm9IyjJOGKMpNBKoxDRtGiq9ucGRXcS1J+WRSWaSRJaHfqwX/9e/qiQu+gpOBtq8j+Zbg== X-Received: by 2002:a63:e653:: with SMTP id p19mr3469003pgj.284.1554186744528; Mon, 01 Apr 2019 23:32:24 -0700 (PDT) Received: from localhost.localdomain ([2001:268:c0a5:4ce0:c70:4af9:86e2:2]) by smtp.gmail.com with ESMTPSA id a17sm19327289pfj.123.2019.04.01.23.32.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 23:32:24 -0700 (PDT) From: William Breathitt Gray To: gregkh@linuxfoundation.org Subject: [PATCH v10 13/18] drivers/pwm: pwm-fsl-ftm: use common header for FlexTimer #defines Date: Tue, 2 Apr 2019 15:30:48 +0900 Message-Id: X-Mailer: git-send-email 2.21.0 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190401_233226_062896_DC85C13F X-CRM114-Status: GOOD ( 11.48 ) 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: mark.rutland@arm.com, benjamin.gaignard@st.com, linux-pwm@vger.kernel.org, linux-iio@vger.kernel.org, patrick.havelange@essensium.com, thierry.reding@gmail.com, pmeerw@pmeerw.net, lars@metafoo.de, daniel.lezcano@linaro.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, david@lechnology.com, William Breathitt Gray , robh+dt@kernel.org, tglx@linutronix.de, fabrice.gasnier@st.com, esben@haabendal.dk, shawnguo@kernel.org, linux-kernel@vger.kernel.org, leoyang.li@nxp.com, knaack.h@gmx.de, akpm@linux-foundation.org, linuxppc-dev@lists.ozlabs.org, jic23@kernel.org 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 From: Patrick Havelange This also fixes the wrong value for the previously defined FTM_MODE_INIT macro (it was not used). Reviewed-by: Esben Haabendal Signed-off-by: Patrick Havelange Signed-off-by: William Breathitt Gray --- drivers/pwm/pwm-fsl-ftm.c | 44 +-------------------------------------- 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/drivers/pwm/pwm-fsl-ftm.c b/drivers/pwm/pwm-fsl-ftm.c index 883378d055c6..f21ea1b97116 100644 --- a/drivers/pwm/pwm-fsl-ftm.c +++ b/drivers/pwm/pwm-fsl-ftm.c @@ -22,51 +22,9 @@ #include #include #include +#include -#define FTM_SC 0x00 -#define FTM_SC_CLK_MASK_SHIFT 3 -#define FTM_SC_CLK_MASK (3 << FTM_SC_CLK_MASK_SHIFT) #define FTM_SC_CLK(c) (((c) + 1) << FTM_SC_CLK_MASK_SHIFT) -#define FTM_SC_PS_MASK 0x7 - -#define FTM_CNT 0x04 -#define FTM_MOD 0x08 - -#define FTM_CSC_BASE 0x0C -#define FTM_CSC_MSB BIT(5) -#define FTM_CSC_MSA BIT(4) -#define FTM_CSC_ELSB BIT(3) -#define FTM_CSC_ELSA BIT(2) -#define FTM_CSC(_channel) (FTM_CSC_BASE + ((_channel) * 8)) - -#define FTM_CV_BASE 0x10 -#define FTM_CV(_channel) (FTM_CV_BASE + ((_channel) * 8)) - -#define FTM_CNTIN 0x4C -#define FTM_STATUS 0x50 - -#define FTM_MODE 0x54 -#define FTM_MODE_FTMEN BIT(0) -#define FTM_MODE_INIT BIT(2) -#define FTM_MODE_PWMSYNC BIT(3) - -#define FTM_SYNC 0x58 -#define FTM_OUTINIT 0x5C -#define FTM_OUTMASK 0x60 -#define FTM_COMBINE 0x64 -#define FTM_DEADTIME 0x68 -#define FTM_EXTTRIG 0x6C -#define FTM_POL 0x70 -#define FTM_FMS 0x74 -#define FTM_FILTER 0x78 -#define FTM_FLTCTRL 0x7C -#define FTM_QDCTRL 0x80 -#define FTM_CONF 0x84 -#define FTM_FLTPOL 0x88 -#define FTM_SYNCONF 0x8C -#define FTM_INVCTRL 0x90 -#define FTM_SWOCTRL 0x94 -#define FTM_PWMLOAD 0x98 enum fsl_pwm_clk { FSL_PWM_CLK_SYS,