From patchwork Mon Feb 25 16:44:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 10828899 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 529BB17EF for ; Mon, 25 Feb 2019 16:45:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D4B829014 for ; Mon, 25 Feb 2019 16:45:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 316462B2F3; Mon, 25 Feb 2019 16:45:49 +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=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,DKIM_VALID,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 C65B329014 for ; Mon, 25 Feb 2019 16:45:48 +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:In-Reply-To:References: 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=Tv8Cidh4UZu/hE0174XFr6klx2Ar6uVWV3m0gnFycdI=; b=sKfaokrc/yhjDL Lmy073txAj8rNC6dwwfMYZFU2Nly9ME1/7zNBRj0UOIQMqGlUpMS3lma6NbKiK3b6GUakZ5nA7stV pca3Rxzz1WFQ8MfwGwv2TyuwzxeHTUu4aPIdyGPyQFSELj6yqv+ZdZM5nJGhtE37wXas2wG6hHc2s cJ9aXw+EvwHPOtDrO5S0XifLZSZIZjw6bZKkDSOlyV7Wr4q3YCCnl4GmF5RMxF/MjRwPps1mHIZhz 6CXyjt4zLSzD4fyeFPoYOoZu6oWAnTJJaiXkjnb7clLXJhnHlO/XqKxs9uAiXuGUGYG/P1y83SAaR SAlZOkz50zRMvNyPOQYA==; 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 1gyJO0-0000i7-4i; Mon, 25 Feb 2019 16:45:48 +0000 Received: from esa3.microchip.iphmx.com ([68.232.153.233]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gyJNi-0000P0-Qu for linux-arm-kernel@lists.infradead.org; Mon, 25 Feb 2019 16:45:32 +0000 X-IronPort-AV: E=Sophos;i="5.58,411,1544511600"; d="scan'208";a="27247354" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa3.microchip.iphmx.com with ESMTP/TLS/AES128-SHA; 25 Feb 2019 09:45:26 -0700 Received: from NAM03-BY2-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.37) with Microsoft SMTP Server (TLS) id 14.3.352.0; Mon, 25 Feb 2019 09:45:05 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ifQhvYlJwALm5N7iER3df56m1Y7kvJFc11ATFdZyB1c=; b=bobDLCnTx3Xt5HLKKfgv/d3KiOa7mqvcMmrVPxAEKf4PLep9kTMWw/MtFFdCm+ONH5oLwei50nvXTQiQ2n6S6en2lbg+uugn29uZRI5loUKh4wx6iBCKBoZWa44TOdYdpHiU1ap3hmATebLuCQR6nmAtp0C/RsuYavSgVmMzvb4= Received: from MWHPR11MB1920.namprd11.prod.outlook.com (10.175.54.19) by MWHPR11MB1662.namprd11.prod.outlook.com (10.172.55.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1643.18; Mon, 25 Feb 2019 16:44:37 +0000 Received: from MWHPR11MB1920.namprd11.prod.outlook.com ([fe80::dcd3:5ebd:191c:549e]) by MWHPR11MB1920.namprd11.prod.outlook.com ([fe80::dcd3:5ebd:191c:549e%6]) with mapi id 15.20.1643.019; Mon, 25 Feb 2019 16:44:37 +0000 From: To: , , , , , Subject: [PATCH v3 2/5] pwm: atmel: add support for controllers with 32 bit counters Thread-Topic: [PATCH v3 2/5] pwm: atmel: add support for controllers with 32 bit counters Thread-Index: AQHUzSllAwNYFtAu+UGkRudfrRv/ow== Date: Mon, 25 Feb 2019 16:44:37 +0000 Message-ID: <1551113039-937-3-git-send-email-claudiu.beznea@microchip.com> References: <1551113039-937-1-git-send-email-claudiu.beznea@microchip.com> In-Reply-To: <1551113039-937-1-git-send-email-claudiu.beznea@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR0102CA0053.eurprd01.prod.exchangelabs.com (2603:10a6:803::30) To MWHPR11MB1920.namprd11.prod.outlook.com (2603:10b6:300:110::19) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Claudiu.Beznea@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [94.177.32.154] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 29e75572-b42b-414d-c660-08d69b408752 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020); SRVR:MWHPR11MB1662; x-ms-traffictypediagnostic: MWHPR11MB1662: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; MWHPR11MB1662; 23:UIrqzMNh2DO0hnajxSUfQtG0mMq+LOPF2wpqXIx?= =?iso-8859-1?q?KWplVj75Mw8ZL3M?= =?iso-8859-1?q?s+92iZTSfLLqMcaLQZmRRQ8MTAoTLNWOsjk1r5m1j6emzV9yreHiDB+qQb+P?= =?iso-8859-1?q?/PRtuwnTY1Z5tOqC/MStHusBhB0TCIoVIAS0Zh8aEyWC8RfUNp1pWh8TzQlB?= =?iso-8859-1?q?DETMUBPZF813HQIA+Vx0VrHgn/QW/q37js5Jn76L6l4s3rZVHKsz9dceu/rH?= =?iso-8859-1?q?q37nB/h6wVnhSvXdZWYFjMZvE1Bt5XnmyG4iKKwAe1ow0mXJcfm7zzmTXyuA?= =?iso-8859-1?q?NrsZMrojv3+5bAOQnHTP9yRyX8LH1V4JIGIHj4ru7pHPRQohaOGcdckqt1Ci?= =?iso-8859-1?q?fqs8nq+1S4/ELZq6BZv7UAYNyBkPKALzs+TcmqSKwbfS4rw3dgtSwAcnEwoG?= =?iso-8859-1?q?a0ylst5Z8i7QavCRTx/PpYn4CQ+2ytpEJXAh0OEes3D2oGHNICEwXoXEuJN4?= =?iso-8859-1?q?MoasJrsktdzZWa6i8kDMV0PxV5NNh0jgt1v3pdmxzjU4NIzcSmNLpHS9feBi?= =?iso-8859-1?q?hihjhcgSTJa60QiiiH1D3HlGV7DFv0Dy9DkH1oL7UppkcpJ1FVlFWV/UcC4e?= =?iso-8859-1?q?LyUZCwkFWS3iCw2S0n+Kg4EaAYB4gfgVhj1BmpKkEHPNPSkncQvApxvZ4htF?= =?iso-8859-1?q?ztcxwylM5WY+FN6f4NjJBbn1pTscFkMo4fHBZzckPB8/XIDJbtNquCGD4piH?= =?iso-8859-1?q?XhhVxepqU+y8YB1Q671xMUBp/iW6vzyAU4fd9UnKf6HVy1cgyjEjDkaq7thB?= =?iso-8859-1?q?9tHiWWKDFO2kZbqCFb9GFspN1K4nzHs7L0ib4j8+LYqtay2riO7ve7jdy2qx?= =?iso-8859-1?q?iOXkZn/fX6eb4IC02GcFhkJinIgh8I4aostHHBqwZdlujom/5fH9n5XwdmUP?= =?iso-8859-1?q?gz+MJ8VjF1Avs6xMNA3fS3rhWkeQQeRyZjBlA3zzzDn7Sd+rKn+XoY8uTgoP?= =?iso-8859-1?q?hRiK2/Akvs276c5pLvm8aIACYvTrg6wViYPhj6M8IVPt6K42wcH+civmXsaA?= =?iso-8859-1?q?nPXV1NkZTaDRk9f7LDqM1RwuGeUMnddK0DnLFZHnOjzLvjSlM/ARVnJisWTM?= =?iso-8859-1?q?ymWGfd/W7ls3rCCI509vHVwZ/FwknJui5QshRfnVuupRnYXPMCHLd1ZKRf2T?= =?iso-8859-1?q?DhI+76XgCEceeXx+iYQfMbn/4UL+/BuQqtcDx6JNOLEw7NhCdqpbQaaLSMet?= =?iso-8859-1?q?1CygdsqIuIPfja/sX+bPmbZ/N+dizZeFYbdesVPHTjvYq9CRVrl04WejRZhM?= =?iso-8859-1?q?zzq8/jb+oTmx5uXxApP1Qv9bTQ?= x-microsoft-antispam-prvs: x-forefront-prvs: 095972DF2F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(346002)(376002)(136003)(39860400002)(366004)(199004)(189003)(68736007)(2501003)(97736004)(5660300002)(105586002)(106356001)(36756003)(256004)(110136005)(54906003)(316002)(86362001)(99286004)(6636002)(52116002)(76176011)(66066001)(446003)(2616005)(476003)(72206003)(6512007)(6506007)(11346002)(386003)(6116002)(3846002)(50226002)(14454004)(478600001)(8676002)(81166006)(81156014)(486006)(8936002)(53936002)(6486002)(107886003)(305945005)(71190400001)(71200400001)(6436002)(102836004)(186003)(4326008)(25786009)(26005)(7736002)(2906002); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR11MB1662; H:MWHPR11MB1920.namprd11.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: NOb35ewSRRvX8vFBnAzc4w1PQjEj/iOqwaR335Jb2jw77P/CTX2LnNheEJnJr+wUSP/ldXnZblvXf12DgMAXWJNt4HML+CPogEr9cNQWQFTypomRS3Xk7gPB76Kbk7h22JjonDuCokCfxyS3d1fi6eJwvc3GuGpHolsMYsQrD72BVECj7kefGbDYZZ8aekqF+6/qxwpeAHeHTV6uzwnSXtPgNOTVAd24Vws3hZxiCqitJOovhQWzoy1vChT4nQ3Qix/gf98JlesZLuoNuBE4x9TK8pRjFuHtCLaEY5mRy2ccUBzQdbUGgjLZsHmqHV/KXzz1i6KGGBym7Gu65FUcMJk4o3HzOkC+yvP2ryR1+rwjCosv/qqqS532wJz9omDBR9ZUAtzzgCpFU04DMjOPyPwVbXAr9Cwr6/GeaVzl2fU= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 29e75572-b42b-414d-c660-08d69b408752 X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Feb 2019 16:44:34.3023 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1662 X-OriginatorOrg: microchip.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190225_084530_994725_1D8256FB X-CRM114-Status: GOOD ( 13.49 ) 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: linux-pwm@vger.kernel.org, Claudiu.Beznea@microchip.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.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: Claudiu Beznea SAM9X60's PWM controller use 32 bits counters thus it could generate signals with higher period and duty cycles than the old ones. Prepare the current driver to be able to work with old controllers (that uses 16 bits counters) and with the new SAM9X60's controller, by providing counters information based on compatible string. Signed-off-by: Claudiu Beznea --- drivers/pwm/pwm-atmel.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/drivers/pwm/pwm-atmel.c b/drivers/pwm/pwm-atmel.c index 7e86a5266eb6..647d063562db 100644 --- a/drivers/pwm/pwm-atmel.c +++ b/drivers/pwm/pwm-atmel.c @@ -48,15 +48,11 @@ #define PWMV2_CPRD 0x0C #define PWMV2_CPRDUPD 0x10 -/* - * Max value for duty and period - * - * Although the duty and period register is 32 bit, - * however only the LSB 16 bits are significant. - */ -#define PWM_MAX_DTY 0xFFFF -#define PWM_MAX_PRD 0xFFFF -#define PRD_MAX_PRES 10 +/* Max values for period and prescaler */ + +/* Only the LSB 16 bits are significant. */ +#define PWM_MAXV1_PRD 0xFFFF +#define PRD_MAXV1_PRES 10 struct atmel_pwm_registers { u8 period; @@ -65,8 +61,14 @@ struct atmel_pwm_registers { u8 duty_upd; }; +struct atmel_pwm_config { + u32 max_period; + u32 max_pres; +}; + struct atmel_pwm_data { struct atmel_pwm_registers regs; + struct atmel_pwm_config cfg; }; struct atmel_pwm_chip { @@ -125,10 +127,10 @@ static int atmel_pwm_calculate_cprd_and_pres(struct pwm_chip *chip, cycles *= clk_get_rate(atmel_pwm->clk); do_div(cycles, NSEC_PER_SEC); - for (*pres = 0; cycles > PWM_MAX_PRD; cycles >>= 1) + for (*pres = 0; cycles > atmel_pwm->data->cfg.max_period; cycles >>= 1) (*pres)++; - if (*pres > PRD_MAX_PRES) { + if (*pres > atmel_pwm->data->cfg.max_pres) { dev_err(chip->dev, "pres exceeds the maximum value\n"); return -EINVAL; } @@ -288,6 +290,11 @@ static const struct atmel_pwm_data atmel_pwm_data_v1 = { .duty = PWMV1_CDTY, .duty_upd = PWMV1_CUPD, }, + .cfg = { + /* 16 bits to keep period and duty. */ + .max_period = PWM_MAXV1_PRD, + .max_pres = PRD_MAXV1_PRES, + }, }; static const struct atmel_pwm_data atmel_pwm_data_v2 = { @@ -297,6 +304,11 @@ static const struct atmel_pwm_data atmel_pwm_data_v2 = { .duty = PWMV2_CDTY, .duty_upd = PWMV2_CDTYUPD, }, + .cfg = { + /* 16 bits to keep period and duty. */ + .max_period = PWM_MAXV1_PRD, + .max_pres = PRD_MAXV1_PRES, + }, }; static const struct platform_device_id atmel_pwm_devtypes[] = {