| Message ID | 20140508225209.GA13610@lukather |
|---|---|
| State | New |
| Headers | show |
On Fri, May 9, 2014 at 12:52 AM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > The following changes since commit fd67f884782a281eb033e40b0f8eae623416035e: > > pinctrl: mvebu: new driver for Orion platforms (2014-04-24 15:09:35 +0200) > > are available in the git repository at: > > https://github.com/mripard/linux.git tags/sunxi-pinctrl-for-3.16 Thanks a lot Maxime, pulled into the pinctrl devel branch for v3.16. Yours, Linus Walleij
On Fri, May 09, 2014 at 08:48:15AM +0200, Linus Walleij wrote: > On Fri, May 9, 2014 at 12:52 AM, Maxime Ripard > <maxime.ripard@free-electrons.com> wrote: > > > The following changes since commit fd67f884782a281eb033e40b0f8eae623416035e: > > > > pinctrl: mvebu: new driver for Orion platforms (2014-04-24 15:09:35 +0200) > > > > are available in the git repository at: > > > > https://github.com/mripard/linux.git tags/sunxi-pinctrl-for-3.16 > > Thanks a lot Maxime, pulled into the pinctrl devel branch for v3.16. Yeah, I don't know what happened for the first one. Sorry for that :S Only pinctrl/next is not going to be rebased, right? Thanks, Maxime
On Fri, May 9, 2014 at 7:31 PM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> Only pinctrl/next is not going to be rebased, right?
pinctrl/devel actually.
for-next is a mixdown branch that is rebased all the time
so don't use that.
But notify me first if you're going to be pulling in that branch!
(Handshake.)
Also: why do you need it? Just as a dependence to dts files
does *not* count as a reason to cross merge these trees,
as the device tree files are meant to even be moved out of
the kernel at some point... but you may have better reasons?
Yours,
Linus Walleij
On Mon, May 12, 2014 at 11:22:27AM +0200, Linus Walleij wrote: > On Fri, May 9, 2014 at 7:31 PM, Maxime Ripard > <maxime.ripard@free-electrons.com> wrote: > > > Only pinctrl/next is not going to be rebased, right? > > pinctrl/devel actually. > > for-next is a mixdown branch that is rebased all the time > so don't use that. Ok. > But notify me first if you're going to be pulling in that branch! > (Handshake.) Yes, this is exactly what I'm doing :) > Also: why do you need it? Just as a dependence to dts files > does *not* count as a reason to cross merge these trees, > as the device tree files are meant to even be moved out of > the kernel at some point... but you may have better reasons? It's not about DT, it's about the patch to select the pinctrl drivers in the machine's Kconfig options. Thanks, Maxime
On Mon, May 12, 2014 at 5:25 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > On Mon, May 12, 2014 at 11:22:27AM +0200, Linus Walleij wrote: >> Also: why do you need it? Just as a dependence to dts files >> does *not* count as a reason to cross merge these trees, >> as the device tree files are meant to even be moved out of >> the kernel at some point... but you may have better reasons? > > It's not about DT, it's about the patch to select the pinctrl drivers > in the machine's Kconfig options. But ... surely you can select a non-existant symbol and wait for it to appear during the merge window? Or is there some problem with this? Yours, Linus Walleij
On Tue, May 13, 2014 at 11:37:15AM +0200, Linus Walleij wrote: > On Mon, May 12, 2014 at 5:25 PM, Maxime Ripard > <maxime.ripard@free-electrons.com> wrote: > > On Mon, May 12, 2014 at 11:22:27AM +0200, Linus Walleij wrote: > > >> Also: why do you need it? Just as a dependence to dts files > >> does *not* count as a reason to cross merge these trees, > >> as the device tree files are meant to even be moved out of > >> the kernel at some point... but you may have better reasons? > > > > It's not about DT, it's about the patch to select the pinctrl drivers > > in the machine's Kconfig options. > > But ... surely you can select a non-existant symbol and wait > for it to appear during the merge window? > > Or is there some problem with this? Because it wouldn't be very easily bisectable. After discussing this a bit more with Arnd on IRC, I'll send you an additional patch for you to merge, that should solve the issue, without requiring any merge on my side. Thanks, Maxime
The following changes since commit fd67f884782a281eb033e40b0f8eae623416035e: pinctrl: mvebu: new driver for Orion platforms (2014-04-24 15:09:35 +0200) are available in the git repository at: https://github.com/mripard/linux.git tags/sunxi-pinctrl-for-3.16 for you to fetch changes up to dc9691066fa7de51178de5ac3e06b3681557a7b4: pinctrl: sunxi: Move the reset handling functions out of the core (2014-05-04 19:57:18 -0500) ---------------------------------------------------------------- Pinctrl cleanup and reworks for 3.16 This serie of patch: - Moves the Allwinner pinctrl driver to a folder of its own - removes the sunxi-pinctrl-pins header, and split the driver into a core one, with all the logic, and smaller drivers, one for each SoC, that declare the pins, and will provide to the core the set of pins. - And does a few cleanups here and there. ---------------------------------------------------------------- Maxime Ripard (14): pinctrl: sunxi: Add const qualifier to the pin descriptor pinctrl: sunxi: Drop unused structure members pinctrl: sunxi: Move the Allwinner pinctrl driver to its own directory pinctrl: sunxi: Replace hardcoded pin defines by a macro pinctrl: sunxi: Switch to devm_ioremap_resource pinctrl: sunxi: Libraryse the driver pinctrl: sunxi: Move Allwinner A10 pinctrl driver to a driver of its own pinctrl: sunxi: Move Allwinner A10s pinctrl driver to a driver of its own pinctrl: sunxi: Move Allwinner A13 pinctrl driver to a driver of its own pinctrl: sunxi: Move Allwinner A31 pinctrl driver to a driver of its own pinctrl: sunxi: Move Allwinner A31 special pins driver to a driver of its own pinctrl: sunxi: Move Allwinner A20 pinctrl driver to a driver of its own pinctrl: sunxi: Introduce per-driver Kconfig options pinctrl: sunxi: Move the reset handling functions out of the core drivers/pinctrl/Kconfig | 6 +- drivers/pinctrl/Makefile | 2 +- drivers/pinctrl/pinctrl-sunxi-pins.h | 3937 --------------------------- drivers/pinctrl/pinctrl-sunxi.h | 617 ----- drivers/pinctrl/sunxi/Kconfig | 32 + drivers/pinctrl/sunxi/Makefile | 10 + drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | 1039 +++++++ drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c | 690 +++++ drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c | 411 +++ drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c | 141 + drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c | 865 ++++++ drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c | 1065 ++++++++ drivers/pinctrl/{ => sunxi}/pinctrl-sunxi.c | 62 +- drivers/pinctrl/sunxi/pinctrl-sunxi.h | 258 ++ 14 files changed, 4524 insertions(+), 4611 deletions(-) delete mode 100644 drivers/pinctrl/pinctrl-sunxi-pins.h delete mode 100644 drivers/pinctrl/pinctrl-sunxi.h create mode 100644 drivers/pinctrl/sunxi/Kconfig create mode 100644 drivers/pinctrl/sunxi/Makefile create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c rename drivers/pinctrl/{ => sunxi}/pinctrl-sunxi.c (92%) create mode 100644 drivers/pinctrl/sunxi/pinctrl-sunxi.h