* [GIT PULL 0/2] imx device tree changes for 3.7
@ 2012-09-11 12:02 Shawn Guo
2012-09-11 12:02 ` [GIT PULL 1/2] imx device tree changes Shawn Guo
2012-09-11 12:02 ` [GIT PULL 2/2] imx6q clk device tree lookup Shawn Guo
0 siblings, 2 replies; 7+ messages in thread
From: Shawn Guo @ 2012-09-11 12:02 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd, Olof,
Here are two requests for pulling imx device tree changes for 3.7.
Same as mxs clk DT lookup support, the second pull-request depends
on Mike's clk-3.7 branch.
Regards,
Shawn
^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL 1/2] imx device tree changes
2012-09-11 12:02 [GIT PULL 0/2] imx device tree changes for 3.7 Shawn Guo
@ 2012-09-11 12:02 ` Shawn Guo
2012-09-13 6:22 ` Olof Johansson
2012-09-11 12:02 ` [GIT PULL 2/2] imx6q clk device tree lookup Shawn Guo
1 sibling, 1 reply; 7+ messages in thread
From: Shawn Guo @ 2012-09-11 12:02 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit fea7a08acb13524b47711625eebea40a0ede69a0:
Linux 3.6-rc3 (2012-08-22 13:29:06 -0700)
are available in the git repository at:
git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-dt-3.7
for you to fetch changes up to f8135a74df53ba7010a162dddd112b73ee5652e3:
ARM: imx6q-sabrelite: Rename 'pinctrl_gpio_hog' (2012-09-11 16:27:00 +0800)
----------------------------------------------------------------
imx-dt-3.7
- All imx53 board files are removed by the equal device tree support
- The efikamx board files are removed to ease device tree migration
- Remove dummy pinctrl state by setting up pinctrl in device tree
----------------------------------------------------------------
Fabio Estevam (4):
ARM: dts: imx: Always enable the watchdog
ARM: dts: imx: Move SDMA firmware to SoC dtsi file
ARM: mach-imx: Remove board entries in dt_board_compat
ARM: imx6q-sabrelite: Rename 'pinctrl_gpio_hog'
Matt Sealey (3):
ARM: efikamx: remove support for Genesi Efika MX from the build
ARM: efikamx: remove Genesi Efika MX from the i.MX v6/v7 defconfig
ARM: efikamx: remove Genesi Efika MX platform files from the tree
Michael Grzeschik (1):
ARM: dts: imx: add imx5x usb entries
Shawn Guo (18):
ARM: dts: imx6q: improve indentation for fsl,pins
ARM: dts: imx6q: name iomuxc sub-nodes following pin function
ARM: dts: imx6q: sort iomuxc sub-nodes in name
ARM: dts: imx6q-sabrelite: add pinctrl for usdhc and enet
ARM: dts: imx6q-arm2: add pinctrl for uart and enet
ARM: dts: imx6q-sabresd: add pinctrl settings
ARM: imx6q: remove dummy pinctrl state
ARM: dts: imx53-qsb: add pinctrl settings
ARM: dts: imx53-ard: add pinctrl settings
ARM: dts: imx53-evk: add pinctrl settings
ARM: dts: imx53-smd: add pinctrl settings
ARM: imx53: build in pinctrl support
ARM: imx53: decouple device tree boot from board files
ARM: imx53: support device tree boot only
ARM: imx53: remove unneeded files and functions
ARM: dts: imx51-babbage: add pinctrl settings
ARM: imx51: build in pinctrl support
ARM: imx51: decouple device tree boot from board files
Steffen Trumtrar (1):
ARM i.MX53: dts: add flexcan to imx53
Uwe Kleine-K?nig (1):
ARM: imx/imx31-dt: drop selecting USE_OF
arch/arm/boot/dts/imx27-phytec-phycore.dts | 4 -
arch/arm/boot/dts/imx27.dtsi | 1 -
arch/arm/boot/dts/imx51-babbage.dts | 44 +-
arch/arm/boot/dts/imx51.dtsi | 146 ++-
arch/arm/boot/dts/imx53-ard.dts | 59 +-
arch/arm/boot/dts/imx53-evk.dts | 39 +-
arch/arm/boot/dts/imx53-qsb.dts | 42 +-
arch/arm/boot/dts/imx53-smd.dts | 46 +-
arch/arm/boot/dts/imx53.dtsi | 199 +++-
arch/arm/boot/dts/imx6q-arm2.dts | 21 +
arch/arm/boot/dts/imx6q-sabrelite.dts | 27 +-
arch/arm/boot/dts/imx6q-sabresd.dts | 25 +-
arch/arm/boot/dts/imx6q.dtsi | 224 +++--
arch/arm/configs/imx_v6_v7_defconfig | 4 +-
arch/arm/mach-imx/Kconfig | 106 +--
arch/arm/mach-imx/Makefile | 9 +-
arch/arm/mach-imx/Makefile.boot | 8 +-
arch/arm/mach-imx/devices-imx53.h | 48 -
arch/arm/mach-imx/efika.h | 10 -
arch/arm/mach-imx/imx51-dt.c | 21 -
arch/arm/mach-imx/{imx53-dt.c => mach-imx53.c} | 27 -
arch/arm/mach-imx/mach-imx6q.c | 10 -
arch/arm/mach-imx/mach-mx51_efikamx.c | 300 ------
arch/arm/mach-imx/mach-mx51_efikasb.c | 296 ------
arch/arm/mach-imx/mach-mx53_ard.c | 272 ------
arch/arm/mach-imx/mach-mx53_evk.c | 179 ----
arch/arm/mach-imx/mach-mx53_loco.c | 321 -------
arch/arm/mach-imx/mach-mx53_smd.c | 168 ----
arch/arm/mach-imx/mm-imx5.c | 47 -
arch/arm/mach-imx/mx51_efika.c | 633 ------------
arch/arm/plat-mxc/include/mach/common.h | 6 -
arch/arm/plat-mxc/include/mach/iomux-mx53.h | 1219 ------------------------
32 files changed, 773 insertions(+), 3788 deletions(-)
delete mode 100644 arch/arm/mach-imx/devices-imx53.h
delete mode 100644 arch/arm/mach-imx/efika.h
rename arch/arm/mach-imx/{imx53-dt.c => mach-imx53.c} (81%)
delete mode 100644 arch/arm/mach-imx/mach-mx51_efikamx.c
delete mode 100644 arch/arm/mach-imx/mach-mx51_efikasb.c
delete mode 100644 arch/arm/mach-imx/mach-mx53_ard.c
delete mode 100644 arch/arm/mach-imx/mach-mx53_evk.c
delete mode 100644 arch/arm/mach-imx/mach-mx53_loco.c
delete mode 100644 arch/arm/mach-imx/mach-mx53_smd.c
delete mode 100644 arch/arm/mach-imx/mx51_efika.c
delete mode 100644 arch/arm/plat-mxc/include/mach/iomux-mx53.h
^ permalink raw reply [flat|nested] 7+ messages in thread* [GIT PULL 1/2] imx device tree changes
2012-09-11 12:02 ` [GIT PULL 1/2] imx device tree changes Shawn Guo
@ 2012-09-13 6:22 ` Olof Johansson
2012-09-13 6:37 ` Shawn Guo
0 siblings, 1 reply; 7+ messages in thread
From: Olof Johansson @ 2012-09-13 6:22 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Sep 11, 2012 at 08:02:47PM +0800, Shawn Guo wrote:
> The following changes since commit fea7a08acb13524b47711625eebea40a0ede69a0:
>
> Linux 3.6-rc3 (2012-08-22 13:29:06 -0700)
>
> are available in the git repository at:
>
> git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-dt-3.7
>
> for you to fetch changes up to f8135a74df53ba7010a162dddd112b73ee5652e3:
>
> ARM: imx6q-sabrelite: Rename 'pinctrl_gpio_hog' (2012-09-11 16:27:00 +0800)
>
> ----------------------------------------------------------------
> imx-dt-3.7
>
> - All imx53 board files are removed by the equal device tree support
> - The efikamx board files are removed to ease device tree migration
> - Remove dummy pinctrl state by setting up pinctrl in device tree
Hooray for more board file removals!
I had to do a trivial conflict resolve, please double-check my merge
into next/dt.
Thanks,
-Olof
^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL 1/2] imx device tree changes
2012-09-13 6:22 ` Olof Johansson
@ 2012-09-13 6:37 ` Shawn Guo
0 siblings, 0 replies; 7+ messages in thread
From: Shawn Guo @ 2012-09-13 6:37 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Sep 12, 2012 at 11:22:32PM -0700, Olof Johansson wrote:
> On Tue, Sep 11, 2012 at 08:02:47PM +0800, Shawn Guo wrote:
> > The following changes since commit fea7a08acb13524b47711625eebea40a0ede69a0:
> >
> > Linux 3.6-rc3 (2012-08-22 13:29:06 -0700)
> >
> > are available in the git repository at:
> >
> > git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-dt-3.7
> >
> > for you to fetch changes up to f8135a74df53ba7010a162dddd112b73ee5652e3:
> >
> > ARM: imx6q-sabrelite: Rename 'pinctrl_gpio_hog' (2012-09-11 16:27:00 +0800)
> >
> > ----------------------------------------------------------------
> > imx-dt-3.7
> >
> > - All imx53 board files are removed by the equal device tree support
> > - The efikamx board files are removed to ease device tree migration
> > - Remove dummy pinctrl state by setting up pinctrl in device tree
>
> Hooray for more board file removals!
>
> I had to do a trivial conflict resolve, please double-check my merge
> into next/dt.
>
It's correct.
--
Regards,
Shawn
^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL 2/2] imx6q clk device tree lookup
2012-09-11 12:02 [GIT PULL 0/2] imx device tree changes for 3.7 Shawn Guo
2012-09-11 12:02 ` [GIT PULL 1/2] imx device tree changes Shawn Guo
@ 2012-09-11 12:02 ` Shawn Guo
2012-09-13 6:23 ` Olof Johansson
1 sibling, 1 reply; 7+ messages in thread
From: Shawn Guo @ 2012-09-11 12:02 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit fea7a08acb13524b47711625eebea40a0ede69a0:
Linux 3.6-rc3 (2012-08-22 13:29:06 -0700)
are available in the git repository at:
git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-clk-dt-lookup
for you to fetch changes up to 0e87e0436c0cc3954eb62181a96d7217ca955a4f:
ARM: imx6q: replace clk_register_clkdev with clock DT lookup (2012-09-11 19:16:14 +0800)
----------------------------------------------------------------
imx-clk-dt-lookup
It replaces the clk_register_clkdev in imx6q clock driver with DT
lookup. It depends on Mike's clk-3.7 branch.
When it gets merged together with imx-dt-3.7, there is a trivial
conflict on arch/arm/boot/dts/imx6q.dtsi.
----------------------------------------------------------------
Shawn Guo (1):
ARM: imx6q: replace clk_register_clkdev with clock DT lookup
.../devicetree/bindings/clock/imx6q-clock.txt | 222 ++++++++++++++++++++
arch/arm/boot/dts/imx6q-sabrelite.dts | 1 +
arch/arm/boot/dts/imx6q.dtsi | 73 ++++++-
arch/arm/mach-imx/clk-imx6q.c | 44 +---
arch/arm/mach-imx/mach-imx6q.c | 1 -
5 files changed, 291 insertions(+), 50 deletions(-)
create mode 100644 Documentation/devicetree/bindings/clock/imx6q-clock.txt
^ permalink raw reply [flat|nested] 7+ messages in thread* [GIT PULL 2/2] imx6q clk device tree lookup
2012-09-11 12:02 ` [GIT PULL 2/2] imx6q clk device tree lookup Shawn Guo
@ 2012-09-13 6:23 ` Olof Johansson
2012-09-13 6:38 ` Shawn Guo
0 siblings, 1 reply; 7+ messages in thread
From: Olof Johansson @ 2012-09-13 6:23 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Sep 11, 2012 at 08:02:48PM +0800, Shawn Guo wrote:
> The following changes since commit fea7a08acb13524b47711625eebea40a0ede69a0:
>
> Linux 3.6-rc3 (2012-08-22 13:29:06 -0700)
>
> are available in the git repository at:
>
> git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-clk-dt-lookup
>
> for you to fetch changes up to 0e87e0436c0cc3954eb62181a96d7217ca955a4f:
>
> ARM: imx6q: replace clk_register_clkdev with clock DT lookup (2012-09-11 19:16:14 +0800)
>
> ----------------------------------------------------------------
> imx-clk-dt-lookup
>
> It replaces the clk_register_clkdev in imx6q clock driver with DT
> lookup. It depends on Mike's clk-3.7 branch.
>
> When it gets merged together with imx-dt-3.7, there is a trivial
> conflict on arch/arm/boot/dts/imx6q.dtsi.
Pulled into next/dt. Same here, double-check my conflict resolution please.
Thanks!
-Olof
^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL 2/2] imx6q clk device tree lookup
2012-09-13 6:23 ` Olof Johansson
@ 2012-09-13 6:38 ` Shawn Guo
0 siblings, 0 replies; 7+ messages in thread
From: Shawn Guo @ 2012-09-13 6:38 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Sep 12, 2012 at 11:23:05PM -0700, Olof Johansson wrote:
> On Tue, Sep 11, 2012 at 08:02:48PM +0800, Shawn Guo wrote:
> > The following changes since commit fea7a08acb13524b47711625eebea40a0ede69a0:
> >
> > Linux 3.6-rc3 (2012-08-22 13:29:06 -0700)
> >
> > are available in the git repository at:
> >
> > git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-clk-dt-lookup
> >
> > for you to fetch changes up to 0e87e0436c0cc3954eb62181a96d7217ca955a4f:
> >
> > ARM: imx6q: replace clk_register_clkdev with clock DT lookup (2012-09-11 19:16:14 +0800)
> >
> > ----------------------------------------------------------------
> > imx-clk-dt-lookup
> >
> > It replaces the clk_register_clkdev in imx6q clock driver with DT
> > lookup. It depends on Mike's clk-3.7 branch.
> >
> > When it gets merged together with imx-dt-3.7, there is a trivial
> > conflict on arch/arm/boot/dts/imx6q.dtsi.
>
> Pulled into next/dt. Same here, double-check my conflict resolution please.
>
It's all right.
--
Regards,
Shawn
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-09-13 6:38 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-11 12:02 [GIT PULL 0/2] imx device tree changes for 3.7 Shawn Guo
2012-09-11 12:02 ` [GIT PULL 1/2] imx device tree changes Shawn Guo
2012-09-13 6:22 ` Olof Johansson
2012-09-13 6:37 ` Shawn Guo
2012-09-11 12:02 ` [GIT PULL 2/2] imx6q clk device tree lookup Shawn Guo
2012-09-13 6:23 ` Olof Johansson
2012-09-13 6:38 ` Shawn Guo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).