From patchwork Mon Sep 9 18:30:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Dunn X-Patchwork-Id: 2862681 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0454FBF43F for ; Mon, 9 Sep 2013 18:31:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 94E232039D for ; Mon, 9 Sep 2013 18:31:11 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2373E20379 for ; Mon, 9 Sep 2013 18:31:10 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VJ6Et-0003az-Ak; Mon, 09 Sep 2013 18:31:07 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VJ6Er-0006Vl-58; Mon, 09 Sep 2013 18:31:05 +0000 Received: from smtp.newsguy.com ([74.209.136.69]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VJ6En-0006VF-Mz for linux-arm-kernel@lists.infradead.org; Mon, 09 Sep 2013 18:31:02 +0000 Received: from localhost.localdomain (243.sub-70-199-128.myvzw.com [70.199.128.243]) by smtp.newsguy.com (8.14.3/8.14.3) with ESMTP id r89IUMjB045081 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 9 Sep 2013 11:30:23 -0700 (PDT) (envelope-from mikedunn@newsguy.com) From: Mike Dunn To: linux-pwm@vger.kernel.org Subject: [RESEND PATCH v2] pwm: pxa: add device tree support to pwm driver Date: Mon, 9 Sep 2013 11:30:20 -0700 Message-Id: <1378751420-19227-1-git-send-email-mikedunn@newsguy.com> X-Mailer: git-send-email 1.8.1.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130909_143101_874282_4694558D X-CRM114-Status: GOOD ( 23.96 ) X-Spam-Score: -2.8 (--) Cc: Marek Vasut , devicetree@vger.kernel.org, Mike Dunn , Pawel Moll , Sergei Shtylyov , Stephen Warren , Dmitry Torokhov , Rob Herring , Chao Xie , Thierry Reding , Haojian Zhuang , Grant Likely , Mark Rutland , Robert Jarzmik , linux-arm-kernel@lists.infradead.org, Ian Campbell X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds device tree support to the pxa's pwm driver. Only an OF match table is added; nothing needs to be extracted from the device tree node. The existing platform_device id table is reused for the match table data. Support for inverted polarity is also added. Tested on a Palm Treo 680 (both platform data and DT cases). Signed-off-by: Mike Dunn --- Changle log: Resent with expanded Cc list v2: - of_match_table contains only the "pxa250-pwm" compatible string; require one device instance per pwm - add Documentation/devicetree/bindings/pwm/pxa-pwm.txt - add support for polarity flag in DT and implement set_polarity() method (the treo 680 inverts the signal between pwm out and backlight) - return -EINVAL instead of -ENODEV if platform data or DT node not found - output dev_info string if platform data missing - expanded CC list of patch Documentation/devicetree/bindings/pwm/pxa-pwm.txt | 33 +++++++++++++ arch/arm/boot/dts/pxa27x.dtsi | 24 ++++++++++ drivers/pwm/pwm-pxa.c | 57 +++++++++++++++++++++++ 3 files changed, 114 insertions(+) create mode 100644 Documentation/devicetree/bindings/pwm/pxa-pwm.txt diff --git a/Documentation/devicetree/bindings/pwm/pxa-pwm.txt b/Documentation/devicetree/bindings/pwm/pxa-pwm.txt new file mode 100644 index 0000000..7b09bfa --- /dev/null +++ b/Documentation/devicetree/bindings/pwm/pxa-pwm.txt @@ -0,0 +1,33 @@ +Marvell pwm controller + +Required properties: +- compatible: + for pxa25x, pxa27x, pxa168, pxa910: must be compatible = "marvell,pxa250-pwm"; +- reg: physical base address and length of the registers used by the pwm channel + NB: One device instance must be created for each pwm that is used, so the + length covers only the register window for one pwm output, not that of the + entire pwm controller. Currently length is 0x10 for all supported devices. +- #pwm-cells: should be 3. + cell 1: the per-chip index of the PWM to use, + cell 2: the period in nanoseconds, + cell 3: flags; set bit 0 to specify inverse polarity. The pwm controller + does not implement reverse polarity, but some boards may pass the pwm output + through an external inverter, which can cause problems if a client device + assumes that an increase in the duty cycle results in an increase in output + power. The pwm-backlight is an example of such a client. + +Example pwm device node: + +pwm0: pwm@40b00000 { + compatible = "marvell,pxa250-pwm"; + reg = <0x40b00000 0x10>; + #pwm-cells = <3>; +}; + +Example pwm client node: + +backlight { + compatible = "pwm-backlight"; + pwms = <&pwm0 0 5000000 1>; /* pwm output is inverted */ + ... +} diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi index d7c5d72..a12fe8e 100644 --- a/arch/arm/boot/dts/pxa27x.dtsi +++ b/arch/arm/boot/dts/pxa27x.dtsi @@ -10,5 +10,29 @@ marvell,intc-priority; marvell,intc-nr-irqs = <34>; }; + + pwm0: pwm@40b00000 { + compatible = "marvell,pxa250-pwm"; + reg = <0x40b00000 0x10>; + #pwm-cells = <3>; + }; + + pwm1: pwm@40b00010 { + compatible = "marvell,pxa250-pwm"; + reg = <0x40b00010 0x10>; + #pwm-cells = <3>; + }; + + pwm2: pwm@40c00000 { + compatible = "marvell,pxa250-pwm"; + reg = <0x40c00000 0x10>; + #pwm-cells = <3>; + }; + + pwm3: pwm@40c00010 { + compatible = "marvell,pxa250-pwm"; + reg = <0x40c00010 0x10>; + #pwm-cells = <3>; + }; }; }; diff --git a/drivers/pwm/pwm-pxa.c b/drivers/pwm/pwm-pxa.c index a4d2164..33e6a7d 100644 --- a/drivers/pwm/pwm-pxa.c +++ b/drivers/pwm/pwm-pxa.c @@ -19,6 +19,7 @@ #include #include #include +#include #include @@ -48,6 +49,7 @@ struct pxa_pwm_chip { struct clk *clk; void __iomem *mmio_base; + enum pwm_polarity polarity; }; static inline struct pxa_pwm_chip *to_pxa_pwm_chip(struct pwm_chip *chip) @@ -88,6 +90,15 @@ static int pxa_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, else dc = (pv + 1) * duty_ns / period_ns; + if (pc->polarity == PWM_POLARITY_INVERSED) { + if (dc & PWMDCR_FD) + dc = 0; /* continuously low */ + else if (dc == 0) + dc = PWMDCR_FD; /* continuously high */ + else + dc = 1023 - dc; /* complement duty cycle */ + } + /* NOTE: the clock to PWM has to be enabled first * before writing to the registers */ @@ -117,13 +128,51 @@ static void pxa_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm) clk_disable_unprepare(pc->clk); } +static int pxa_pwm_set_polarity(struct pwm_chip *chip, struct pwm_device *pwm, + enum pwm_polarity polarity) +{ + struct pxa_pwm_chip *pc = to_pxa_pwm_chip(chip); + pc->polarity = polarity; + return 0; +} + static struct pwm_ops pxa_pwm_ops = { .config = pxa_pwm_config, .enable = pxa_pwm_enable, .disable = pxa_pwm_disable, + .set_polarity = pxa_pwm_set_polarity, .owner = THIS_MODULE, }; +#ifdef CONFIG_OF +/* + * Device tree users should create one device instance for each pwm channel. + * Hence we dispense with the HAS_SECONDARY_PWM and "tell" the original driver + * code that this is a single channel pxa25x-pwm. + */ +static struct of_device_id pwm_of_match[] = { + { .compatible = "marvell,pxa250-pwm", .data = &pwm_id_table[0]}, + { } +}; +MODULE_DEVICE_TABLE(of, pwm_of_match); + +static const struct platform_device_id *pxa_pwm_get_id_dt(struct device *dev) +{ + const struct of_device_id *pwm_pxa_devid = + of_match_device(pwm_of_match, dev); + if (pwm_pxa_devid) + return (const struct platform_device_id *)pwm_pxa_devid->data; + else + return NULL; +} +#else /* !CONFIG_OF */ +static const struct platform_device_id *pxa_pwm_get_id_dt(struct device *dev) +{ + dev_info(dev, "missing platform data\n"); + return NULL; +} +#endif + static int pwm_probe(struct platform_device *pdev) { const struct platform_device_id *id = platform_get_device_id(pdev); @@ -131,6 +180,11 @@ static int pwm_probe(struct platform_device *pdev) struct resource *r; int ret = 0; + if (id == NULL) /* using device tree */ + id = pxa_pwm_get_id_dt(&pdev->dev); + if (id == NULL) + return -EINVAL; + pwm = devm_kzalloc(&pdev->dev, sizeof(*pwm), GFP_KERNEL); if (pwm == NULL) { dev_err(&pdev->dev, "failed to allocate memory\n"); @@ -145,6 +199,8 @@ static int pwm_probe(struct platform_device *pdev) pwm->chip.ops = &pxa_pwm_ops; pwm->chip.base = -1; pwm->chip.npwm = (id->driver_data & HAS_SECONDARY_PWM) ? 2 : 1; + pwm->chip.of_xlate = of_pwm_xlate_with_flags; + pwm->chip.of_pwm_n_cells = 3; r = platform_get_resource(pdev, IORESOURCE_MEM, 0); pwm->mmio_base = devm_ioremap_resource(&pdev->dev, r); @@ -176,6 +232,7 @@ static struct platform_driver pwm_driver = { .driver = { .name = "pxa25x-pwm", .owner = THIS_MODULE, + .of_match_table = of_match_ptr(pwm_of_match), }, .probe = pwm_probe, .remove = pwm_remove,