[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CAGb2v65QpcukxAyQuxbhgqCk4RNj8PgMF1dic1=9FexTa2zcvw@mail.gmail.com>
Date: Tue, 16 Sep 2014 23:15:43 +0800
From: Chen-Yu Tsai <wens@...e.org>
To: Alexandre Belloni <alexandre.belloni@...e-electrons.com>
Cc: Thierry Reding <thierry.reding@...il.com>,
linux-pwm@...r.kernel.org,
linux-kernel <linux-kernel@...r.kernel.org>,
Jon Smirl <jonsmirl@...il.com>, Simon <longsleep@...il.com>,
Maxime Ripard <maxime.ripard@...e-electrons.com>,
linux-arm-kernel <linux-arm-kernel@...ts.infradead.org>
Subject: Re: [PATCHv6 1/2] pwm: Add Allwinner SoC support
Hi,
On Tue, Sep 16, 2014 at 3:13 AM, Alexandre Belloni
<alexandre.belloni@...e-electrons.com> wrote:
> This adds a generic PWM framework driver for the PWM controller
> found on Allwinner SoCs.
>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@...e-electrons.com>
> Acked-by: Maxime Ripard <maxime.ripard@...e-electrons.com>
> ---
> drivers/pwm/Kconfig | 9 ++
> drivers/pwm/Makefile | 1 +
This patch doesn't apply on either linux-pwm/for-next or sunxi-next.
The above files conflict with "pwm: sti: Add new driver for ST's PWM IP".
Respinning on either tree should work, as both trees have that commit.
> drivers/pwm/pwm-sunxi.c | 371 ++++++++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 381 insertions(+)
> create mode 100644 drivers/pwm/pwm-sunxi.c
[...]
Thanks
ChenYu
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists