* [GIT PULL] mxs device tree support for v3.5
@ 2012-05-12 8:20 Shawn Guo
2012-05-12 11:27 ` Shawn Guo
0 siblings, 1 reply; 10+ messages in thread
From: Shawn Guo @ 2012-05-12 8:20 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd, Olof,
Please pull the following mxs device tree support for v3.5. I chose
to base the branch on top of the merge of clk/mxs and
imx/pinctrl/for-3.5 (both are pulled into arm-soc now) to save
conflicts a lot. It additionally depends on arm-soc/next/stmp-dev
to build and function.
Regards,
Shawn
The following changes since commit 844d0b5a0b42d6c73114a1dc229db751120d226f:
Merge branches 'clk/mxs' and 'imx/pinctrl/for-3.5' into mxs/dt/for-3.5 (2012-05-12 13:32:09 +0800)
are available in the git repository at:
git://git.linaro.org/people/shawnguo/linux-2.6.git mxs/dt/for-3.5
Dong Aisheng (5):
ARM: mxs: add initial device tree support for imx28-evk board
dma: mxs-dma: use global stmp_device functionality
dma: mxs-dma: add device tree probe support
ARM: mxs: do not add dma device by default
ARM: mxs: add mxs-dma dt support
Shawn Guo (21):
ARM: mxs: add initial device tree support for imx23-evk board
ARM: mxs: always build in device tree support
dma: mxs-dma: let dma_is_apbh and apbh_is_old take parameter
dma: mxs-dma: make platform_device_id more generic
gpio/mxs: use devm_* helpers to make error handling simple
gpio/mxs: get rid of the use of cpu_is_xxx
gpio/mxs: add device tree probe
ARM: mxs: add gpio support for device tree boot
mmc: mxs-mmc: use global stmp_device functionality
mmc: mxs-mmc: let ssp_is_old take host as parameter
mmc: mxs-mmc: get rid of the use of cpu_is_xxx
mmc: mxs-mmc: move header from mach into linux folder
mmc: mxs-mmc: use devm_* helper to make cleanup simpler
mmc: mxs-mmc: have dma_channel than dma_res in mxs_mmc_host
mmc: mxs-mmc: copy wp_gpio in struct mxs_mmc_host
mmc: mxs-mmc: add device tree support
ARM: dts: enable mmc for imx23-evk
ARM: dts: enable mmc for imx28-evk
i2c: mxs: add device tree probe support
ARM: dts: enable i2c device for imx28-evk
ARM: dts: enable audio support for imx28-evk
Documentation/devicetree/bindings/arm/fsl.txt | 8 +
.../devicetree/bindings/dma/fsl-mxs-dma.txt | 19 +
.../devicetree/bindings/gpio/gpio-mxs.txt | 87 ++++
Documentation/devicetree/bindings/i2c/i2c-mxs.txt | 16 +
Documentation/devicetree/bindings/mmc/mxs-mmc.txt | 26 +
arch/arm/Kconfig | 1 +
arch/arm/boot/dts/imx23-evk.dts | 43 ++
arch/arm/boot/dts/imx23.dtsi | 295 ++++++++++++
arch/arm/boot/dts/imx28-evk.dts | 114 +++++
arch/arm/boot/dts/imx28.dtsi | 497 ++++++++++++++++++++
arch/arm/configs/mxs_defconfig | 1 +
arch/arm/mach-mxs/Kconfig | 10 +
arch/arm/mach-mxs/Makefile | 1 +
arch/arm/mach-mxs/devices/Kconfig | 1 -
arch/arm/mach-mxs/devices/platform-dma.c | 21 +-
arch/arm/mach-mxs/devices/platform-gpio-mxs.c | 24 +-
arch/arm/mach-mxs/devices/platform-mxs-mmc.c | 21 +-
arch/arm/mach-mxs/include/mach/common.h | 7 +-
arch/arm/mach-mxs/include/mach/devices-common.h | 3 +-
arch/arm/mach-mxs/mach-mxs.c | 121 +++++
arch/arm/mach-mxs/mm.c | 16 +
drivers/clk/mxs/clk-imx23.c | 9 +-
drivers/clk/mxs/clk-imx28.c | 13 +-
drivers/dma/Kconfig | 1 +
drivers/dma/mxs-dma.c | 188 +++++---
drivers/gpio/gpio-mxs.c | 156 ++++---
drivers/i2c/busses/i2c-mxs.c | 13 +
drivers/mmc/host/mxs-mmc.c | 197 +++++----
include/linux/fsl/mxs-dma.h | 12 +-
.../mach/mmc.h => include/linux/mmc/mxs-mmc.h | 7 +-
30 files changed, 1640 insertions(+), 288 deletions(-)
create mode 100644 Documentation/devicetree/bindings/dma/fsl-mxs-dma.txt
create mode 100644 Documentation/devicetree/bindings/gpio/gpio-mxs.txt
create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mxs.txt
create mode 100644 Documentation/devicetree/bindings/mmc/mxs-mmc.txt
create mode 100644 arch/arm/boot/dts/imx23-evk.dts
create mode 100644 arch/arm/boot/dts/imx23.dtsi
create mode 100644 arch/arm/boot/dts/imx28-evk.dts
create mode 100644 arch/arm/boot/dts/imx28.dtsi
create mode 100644 arch/arm/mach-mxs/mach-mxs.c
rename arch/arm/mach-mxs/include/mach/mmc.h => include/linux/mmc/mxs-mmc.h (81%)
^ permalink raw reply [flat|nested] 10+ messages in thread* [GIT PULL] mxs device tree support for v3.5
2012-05-12 8:20 [GIT PULL] mxs device tree support for v3.5 Shawn Guo
@ 2012-05-12 11:27 ` Shawn Guo
2012-05-12 14:55 ` Chris Ball
0 siblings, 1 reply; 10+ messages in thread
From: Shawn Guo @ 2012-05-12 11:27 UTC (permalink / raw)
To: linux-arm-kernel
Copy Chris in case he has problem with having mxs-mmc DT series go
through arm-soc tree.
Regards,
Shawn
On Sat, May 12, 2012 at 04:20:53PM +0800, Shawn Guo wrote:
> Hi Arnd, Olof,
>
> Please pull the following mxs device tree support for v3.5. I chose
> to base the branch on top of the merge of clk/mxs and
> imx/pinctrl/for-3.5 (both are pulled into arm-soc now) to save
> conflicts a lot. It additionally depends on arm-soc/next/stmp-dev
> to build and function.
>
> Regards,
> Shawn
>
> The following changes since commit 844d0b5a0b42d6c73114a1dc229db751120d226f:
>
> Merge branches 'clk/mxs' and 'imx/pinctrl/for-3.5' into mxs/dt/for-3.5 (2012-05-12 13:32:09 +0800)
>
> are available in the git repository at:
>
> git://git.linaro.org/people/shawnguo/linux-2.6.git mxs/dt/for-3.5
>
> Dong Aisheng (5):
> ARM: mxs: add initial device tree support for imx28-evk board
> dma: mxs-dma: use global stmp_device functionality
> dma: mxs-dma: add device tree probe support
> ARM: mxs: do not add dma device by default
> ARM: mxs: add mxs-dma dt support
>
> Shawn Guo (21):
> ARM: mxs: add initial device tree support for imx23-evk board
> ARM: mxs: always build in device tree support
> dma: mxs-dma: let dma_is_apbh and apbh_is_old take parameter
> dma: mxs-dma: make platform_device_id more generic
> gpio/mxs: use devm_* helpers to make error handling simple
> gpio/mxs: get rid of the use of cpu_is_xxx
> gpio/mxs: add device tree probe
> ARM: mxs: add gpio support for device tree boot
> mmc: mxs-mmc: use global stmp_device functionality
> mmc: mxs-mmc: let ssp_is_old take host as parameter
> mmc: mxs-mmc: get rid of the use of cpu_is_xxx
> mmc: mxs-mmc: move header from mach into linux folder
> mmc: mxs-mmc: use devm_* helper to make cleanup simpler
> mmc: mxs-mmc: have dma_channel than dma_res in mxs_mmc_host
> mmc: mxs-mmc: copy wp_gpio in struct mxs_mmc_host
> mmc: mxs-mmc: add device tree support
> ARM: dts: enable mmc for imx23-evk
> ARM: dts: enable mmc for imx28-evk
> i2c: mxs: add device tree probe support
> ARM: dts: enable i2c device for imx28-evk
> ARM: dts: enable audio support for imx28-evk
>
> Documentation/devicetree/bindings/arm/fsl.txt | 8 +
> .../devicetree/bindings/dma/fsl-mxs-dma.txt | 19 +
> .../devicetree/bindings/gpio/gpio-mxs.txt | 87 ++++
> Documentation/devicetree/bindings/i2c/i2c-mxs.txt | 16 +
> Documentation/devicetree/bindings/mmc/mxs-mmc.txt | 26 +
> arch/arm/Kconfig | 1 +
> arch/arm/boot/dts/imx23-evk.dts | 43 ++
> arch/arm/boot/dts/imx23.dtsi | 295 ++++++++++++
> arch/arm/boot/dts/imx28-evk.dts | 114 +++++
> arch/arm/boot/dts/imx28.dtsi | 497 ++++++++++++++++++++
> arch/arm/configs/mxs_defconfig | 1 +
> arch/arm/mach-mxs/Kconfig | 10 +
> arch/arm/mach-mxs/Makefile | 1 +
> arch/arm/mach-mxs/devices/Kconfig | 1 -
> arch/arm/mach-mxs/devices/platform-dma.c | 21 +-
> arch/arm/mach-mxs/devices/platform-gpio-mxs.c | 24 +-
> arch/arm/mach-mxs/devices/platform-mxs-mmc.c | 21 +-
> arch/arm/mach-mxs/include/mach/common.h | 7 +-
> arch/arm/mach-mxs/include/mach/devices-common.h | 3 +-
> arch/arm/mach-mxs/mach-mxs.c | 121 +++++
> arch/arm/mach-mxs/mm.c | 16 +
> drivers/clk/mxs/clk-imx23.c | 9 +-
> drivers/clk/mxs/clk-imx28.c | 13 +-
> drivers/dma/Kconfig | 1 +
> drivers/dma/mxs-dma.c | 188 +++++---
> drivers/gpio/gpio-mxs.c | 156 ++++---
> drivers/i2c/busses/i2c-mxs.c | 13 +
> drivers/mmc/host/mxs-mmc.c | 197 +++++----
> include/linux/fsl/mxs-dma.h | 12 +-
> .../mach/mmc.h => include/linux/mmc/mxs-mmc.h | 7 +-
> 30 files changed, 1640 insertions(+), 288 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/dma/fsl-mxs-dma.txt
> create mode 100644 Documentation/devicetree/bindings/gpio/gpio-mxs.txt
> create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mxs.txt
> create mode 100644 Documentation/devicetree/bindings/mmc/mxs-mmc.txt
> create mode 100644 arch/arm/boot/dts/imx23-evk.dts
> create mode 100644 arch/arm/boot/dts/imx23.dtsi
> create mode 100644 arch/arm/boot/dts/imx28-evk.dts
> create mode 100644 arch/arm/boot/dts/imx28.dtsi
> create mode 100644 arch/arm/mach-mxs/mach-mxs.c
> rename arch/arm/mach-mxs/include/mach/mmc.h => include/linux/mmc/mxs-mmc.h (81%)
^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL] mxs device tree support for v3.5
2012-05-12 11:27 ` Shawn Guo
@ 2012-05-12 14:55 ` Chris Ball
2012-05-13 0:15 ` Shawn Guo
0 siblings, 1 reply; 10+ messages in thread
From: Chris Ball @ 2012-05-12 14:55 UTC (permalink / raw)
To: linux-arm-kernel
Hi Shawn,
On Sat, May 12 2012, Shawn Guo wrote:
> Copy Chris in case he has problem with having mxs-mmc DT series go
> through arm-soc tree.
Thanks, that's okay with me.
I just sent out a small review comment on one of the MMC patches; once
that's changed, feel free to add for the series:
Acked-by: Chris Ball <cjb@laptop.org>
I notice that Marek Vasut also gave you an Acked-by for the series,
but the version of the patches in your git tree doesn't show it.
Please make sure to credit people who review your patches by adding
their tags into patches before the patches are merged, it's important.
Thanks!
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL] mxs device tree support for v3.5
2012-05-12 14:55 ` Chris Ball
@ 2012-05-13 0:15 ` Shawn Guo
2012-05-13 0:41 ` Chris Ball
0 siblings, 1 reply; 10+ messages in thread
From: Shawn Guo @ 2012-05-13 0:15 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, May 12, 2012 at 10:55:49AM -0400, Chris Ball wrote:
> Hi Shawn,
>
> On Sat, May 12 2012, Shawn Guo wrote:
> > Copy Chris in case he has problem with having mxs-mmc DT series go
> > through arm-soc tree.
>
> Thanks, that's okay with me.
>
> I just sent out a small review comment on one of the MMC patches; once
> that's changed, feel free to add for the series:
>
> Acked-by: Chris Ball <cjb@laptop.org>
>
Typo fixed, tag collected, branch updated. Thanks, Chris.
> I notice that Marek Vasut also gave you an Acked-by for the series,
> but the version of the patches in your git tree doesn't show it.
> Please make sure to credit people who review your patches by adding
> their tags into patches before the patches are merged, it's important.
>
Hmm, I collected Marek's tag he put on patch #1, #4, #5, #6 #7.
--
Regards,
Shawn
^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL] mxs device tree support for v3.5
2012-05-13 0:15 ` Shawn Guo
@ 2012-05-13 0:41 ` Chris Ball
0 siblings, 0 replies; 10+ messages in thread
From: Chris Ball @ 2012-05-13 0:41 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Sat, May 12 2012, Shawn Guo wrote:
> On Sat, May 12, 2012 at 10:55:49AM -0400, Chris Ball wrote:
>> Hi Shawn,
>>
>> On Sat, May 12 2012, Shawn Guo wrote:
>> > Copy Chris in case he has problem with having mxs-mmc DT series go
>> > through arm-soc tree.
>>
>> Thanks, that's okay with me.
>>
>> I just sent out a small review comment on one of the MMC patches; once
>> that's changed, feel free to add for the series:
>>
>> Acked-by: Chris Ball <cjb@laptop.org>
>>
> Typo fixed, tag collected, branch updated. Thanks, Chris.
Thanks, branch looks good to me now.
>> I notice that Marek Vasut also gave you an Acked-by for the series,
>> but the version of the patches in your git tree doesn't show it.
>> Please make sure to credit people who review your patches by adding
>> their tags into patches before the patches are merged, it's important.
>>
> Hmm, I collected Marek's tag he put on patch #1, #4, #5, #6 #7.
Oops, I'm sorry for the false criticism -- I must have been looking at
one of the patches that Marek didn't ACK.
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL] mxs: device tree support for v3.5
@ 2012-04-05 1:36 Shawn Guo
2012-04-15 18:29 ` Olof Johansson
0 siblings, 1 reply; 10+ messages in thread
From: Shawn Guo @ 2012-04-05 1:36 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd, Olof,
Please pull the mxs basic device tree support for -next, so that people
can start playing and contributing mxs device tree conversion. Thanks.
Regards,
Shawn
---
The following changes since commit dd775ae2549217d3ae09363e3edb305d0fa19928:
Linux 3.4-rc1 (2012-03-31 16:24:09 -0700)
are available in the git repository at:
git://git.linaro.org/people/shawnguo/linux-2.6.git mxs/dt
Dong Aisheng (1):
ARM: imx28: add basic dt support
Documentation/devicetree/bindings/arm/fsl.txt | 4 +
arch/arm/boot/dts/imx28-evk.dts | 34 +++
arch/arm/boot/dts/imx28.dtsi | 352 +++++++++++++++++++++++++
arch/arm/mach-mxs/Kconfig | 10 +
arch/arm/mach-mxs/Makefile | 1 +
arch/arm/mach-mxs/clock-mx28.c | 4 +
arch/arm/mach-mxs/devices/Kconfig | 1 -
arch/arm/mach-mxs/mach-mxs.c | 68 +++++
8 files changed, 473 insertions(+), 1 deletions(-)
create mode 100644 arch/arm/boot/dts/imx28-evk.dts
create mode 100644 arch/arm/boot/dts/imx28.dtsi
create mode 100644 arch/arm/mach-mxs/mach-mxs.c
^ permalink raw reply [flat|nested] 10+ messages in thread* [GIT PULL] mxs: device tree support for v3.5
2012-04-05 1:36 [GIT PULL] mxs: " Shawn Guo
@ 2012-04-15 18:29 ` Olof Johansson
2012-05-07 13:54 ` Shawn Guo
0 siblings, 1 reply; 10+ messages in thread
From: Olof Johansson @ 2012-04-15 18:29 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Apr 4, 2012 at 6:36 PM, Shawn Guo <shawn.guo@linaro.org> wrote:
> Hi Arnd, Olof,
>
> Please pull the mxs basic device tree support for -next, so that people
> can start playing and contributing mxs device tree conversion. ?Thanks.
>
> Regards,
> Shawn
>
> ---
> The following changes since commit dd775ae2549217d3ae09363e3edb305d0fa19928:
>
> ?Linux 3.4-rc1 (2012-03-31 16:24:09 -0700)
>
> are available in the git repository at:
> ?git://git.linaro.org/people/shawnguo/linux-2.6.git mxs/dt
Thanks, pulled.
Sorry for the delay, we've been late at starting up the branches for 3.5.
-Olof
^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL] mxs: device tree support for v3.5
2012-04-15 18:29 ` Olof Johansson
@ 2012-05-07 13:54 ` Shawn Guo
2012-05-10 7:17 ` Olof Johansson
0 siblings, 1 reply; 10+ messages in thread
From: Shawn Guo @ 2012-05-07 13:54 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Apr 15, 2012 at 11:29:54AM -0700, Olof Johansson wrote:
> On Wed, Apr 4, 2012 at 6:36 PM, Shawn Guo <shawn.guo@linaro.org> wrote:
> > Hi Arnd, Olof,
> >
> > Please pull the mxs basic device tree support for -next, so that people
> > can start playing and contributing mxs device tree conversion. ?Thanks.
> >
> > Regards,
> > Shawn
> >
> > ---
> > The following changes since commit dd775ae2549217d3ae09363e3edb305d0fa19928:
> >
> > ?Linux 3.4-rc1 (2012-03-31 16:24:09 -0700)
> >
> > are available in the git repository at:
> > ?git://git.linaro.org/people/shawnguo/linux-2.6.git mxs/dt
>
> Thanks, pulled.
>
> Sorry for the delay, we've been late at starting up the branches for 3.5.
>
Hi Arnd, Olof,
Please abandon this branch. It will be broken due to the mxs common
clk and pinctrl series. I'm going to send an updated mxs device tree
branch based on common-clk and pinctrl support after I send those two
prerequisites to you.
--
Regards,
Shawn
^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL] mxs: device tree support for v3.5
2012-05-07 13:54 ` Shawn Guo
@ 2012-05-10 7:17 ` Olof Johansson
2012-05-10 7:55 ` Shawn Guo
0 siblings, 1 reply; 10+ messages in thread
From: Olof Johansson @ 2012-05-10 7:17 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, May 7, 2012 at 6:54 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
> On Sun, Apr 15, 2012 at 11:29:54AM -0700, Olof Johansson wrote:
>> On Wed, Apr 4, 2012 at 6:36 PM, Shawn Guo <shawn.guo@linaro.org> wrote:
>> > Hi Arnd, Olof,
>> >
>> > Please pull the mxs basic device tree support for -next, so that people
>> > can start playing and contributing mxs device tree conversion. ?Thanks.
>> >
>> > Regards,
>> > Shawn
>> >
>> > ---
>> > The following changes since commit dd775ae2549217d3ae09363e3edb305d0fa19928:
>> >
>> > ?Linux 3.4-rc1 (2012-03-31 16:24:09 -0700)
>> >
>> > are available in the git repository at:
>> > ?git://git.linaro.org/people/shawnguo/linux-2.6.git mxs/dt
>>
>> Thanks, pulled.
>>
>> Sorry for the delay, we've been late at starting up the branches for 3.5.
>>
> Hi Arnd, Olof,
>
> Please abandon this branch. ?It will be broken due to the mxs common
> clk and pinctrl series. ?I'm going to send an updated mxs device tree
> branch based on common-clk and pinctrl support after I send those two
> prerequisites to you.
Hrm. It would have probably been better to base the pinctrl and clk
work on top of this, since we tend to order the dt work before much of
the other topic branches.
Anyway, I've rebuilt next/dt without this branch now. I will temporary
just revert the merge in for-next until it's rebuilt next time.
-Olof
^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL] mxs: device tree support for v3.5
2012-05-10 7:17 ` Olof Johansson
@ 2012-05-10 7:55 ` Shawn Guo
0 siblings, 0 replies; 10+ messages in thread
From: Shawn Guo @ 2012-05-10 7:55 UTC (permalink / raw)
To: linux-arm-kernel
On 10 May 2012 15:17, Olof Johansson <olof@lixom.net> wrote:
> Hrm. It would have probably been better to base the pinctrl and clk
> work on top of this, since we tend to order the dt work before much of
> the other topic branches.
>
It will be hard to do. Device tree support naturally depends on
pinctrl support. Pinctrl is actually a blocker for many platforms to
be converted over to DT. I'm supporting pinctrl for mach-mxs from the
beginning we move to DT, and those mxs drivers have to be based on
pinctrl to have their pins defined in DT to work.
>From my experience on DT migration, the clock file will constantly be
touched to change/add clk lookup. It's hard to tell that there will
no further DT support touching clock when we convert clock to common
clk at some point. I think it will be easier to have DT based on
common clk series.
> Anyway, I've rebuilt next/dt without this branch now. I will temporary
> just revert the merge in for-next until it's rebuilt next time.
>
Thanks, Olof.
Regards,
Shawn
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2012-05-13 0:41 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-12 8:20 [GIT PULL] mxs device tree support for v3.5 Shawn Guo
2012-05-12 11:27 ` Shawn Guo
2012-05-12 14:55 ` Chris Ball
2012-05-13 0:15 ` Shawn Guo
2012-05-13 0:41 ` Chris Ball
-- strict thread matches above, loose matches on Subject: below --
2012-04-05 1:36 [GIT PULL] mxs: " Shawn Guo
2012-04-15 18:29 ` Olof Johansson
2012-05-07 13:54 ` Shawn Guo
2012-05-10 7:17 ` Olof Johansson
2012-05-10 7:55 ` Shawn Guo
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.