* [GIT PULL 0/4] mxs changes for 3.7
@ 2012-09-11 7:54 Shawn Guo
2012-09-11 7:54 ` [GIT PULL 1/4] mxs device tree " Shawn Guo
` (3 more replies)
0 siblings, 4 replies; 14+ messages in thread
From: Shawn Guo @ 2012-09-11 7:54 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd, Olof,
Here are the pull requests of mxs changes for 3.7. This is the first
time I use signed tags, and the dependencies are mentioned in tag
messages. Please have a look and take care of them. Thanks.
Regards,
Shawn
^ permalink raw reply [flat|nested] 14+ messages in thread
* [GIT PULL 1/4] mxs device tree changes for 3.7
2012-09-11 7:54 [GIT PULL 0/4] mxs changes for 3.7 Shawn Guo
@ 2012-09-11 7:54 ` Shawn Guo
2012-09-13 5:48 ` Olof Johansson
2012-09-11 7:54 ` [GIT PULL 2/4] mxs sparse-irq support Shawn Guo
` (2 subsequent siblings)
3 siblings, 1 reply; 14+ messages in thread
From: Shawn Guo @ 2012-09-11 7:54 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit d9875690d9b89a866022ff49e3fcea892345ad92:
Linux 3.6-rc2 (2012-08-16 14:51:24 -0700)
are available in the git repository at:
git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-dt-3.7
for you to fetch changes up to 13b4569bbbcf58891727138b84b8db5ea4178d32:
ARM: dts: cfa10049: Add the 74HC595 gpio expanders (2012-09-11 09:51:30 +0800)
----------------------------------------------------------------
mxs-dt-3.7
- Remove all board files and make mach-mxs a DT-only platform
- Some dts file formatting and style fixing
- DTS update for additional boards and devices
----------------------------------------------------------------
Dong Aisheng (1):
ARM: mx28evk: add missed clkmux select for saif
Fabio Estevam (8):
ARM: imx23-olinuxino.dts: Add AUART0 support
ARM: mach-mxs: Remove board entries in dt_board_compat
ARM: mxs: Rename 'hog-gpios'
ARM: mxs: Let mmc0 pin detect be generic
ARM: olinuxino: Add gpio-led support
ARM: mx28evk: Add SPI flash support
ARM: mx28evk: Add LRADC support
ARM: mx28evk: Add I2C EEPROM support
Marek Vasut (5):
ARM: dts: imx28: Add compatible and interrupt for LRADC
ARM: mx28: Add SPI 2 pinmux into imx28.dtsi
ARM: mx28: Add USB PHY overcurrent pinmux
ARM: mxs: Update DENX M28 machine and dts file
ARM: dts: m28evk: Fix MMC WP pin being inverted
Maxime Ripard (8):
ARM: dts: mxs: Add alternative I2C muxing options for imx28
ARM: dts: mxs: Add pwm4 muxing options for imx28
ARM: dts: mxs: Add I2C1 muxing options for imx28
ARM: dts: mxs: Add the second I2C adapter to the CFA10049 expansion board
ARM: dts: mxs: Enable USB1 Host on the CFA-10049 expansion board
ARM: dts: mxs: Add missing address and size cells in SSP nodes
ARM: dts: cfa10049: Add SSP3 to the 10049 board
ARM: dts: cfa10049: Add the 74HC595 gpio expanders
Shawn Guo (6):
ARM: mxs: tx28: reset fec phy for device tree boot
ARM: mxs: use auxdata to pass flexcan_switch function hook
ARM: mxs: remove board files
ARM: mxs: remove non-DT core functions
ARM: mxs: remove platform device codes
ARM: mxs: remove iomux driver
arch/arm/boot/dts/imx23-evk.dts | 3 ^[[32m+^[[m^[[31m-^[[m
arch/arm/boot/dts/imx23-olinuxino.dts | 31 ^[[32m++^[[m
arch/arm/boot/dts/imx23-stmp378x_devb.dts | 2 ^[[32m+^[[m^[[31m-^[[m
arch/arm/boot/dts/imx23.dtsi | 12 ^[[32m+^[[m^[[31m-^[[m
arch/arm/boot/dts/imx28-apx4devkit.dts | 2 ^[[32m+^[[m^[[31m-^[[m
arch/arm/boot/dts/imx28-cfa10049.dts | 99 ^[[32m++++^[[m
arch/arm/boot/dts/imx28-evk.dts | 29 ^[[32m+^[[m^[[31m-^[[m
arch/arm/boot/dts/imx28-m28evk.dts | 83 ^[[32m+++^[[m^[[31m-^[[m
arch/arm/boot/dts/imx28-tx28.dts | 23 ^[[32m+^[[m^[[31m-^[[m
arch/arm/boot/dts/imx28.dtsi | 86 ^[[32m++++^[[m
arch/arm/configs/mxs_defconfig | 6 ^[[31m-^[[m
arch/arm/mach-mxs/Kconfig | 89 ^[[31m----^[[m
arch/arm/mach-mxs/Makefile | 11 ^[[32m+^[[m^[[31m-^[[m
arch/arm/mach-mxs/Makefile.boot | 1 ^[[32m+^[[m
arch/arm/mach-mxs/devices-mx23.h | 43 ^[[31m--^[[m
arch/arm/mach-mxs/devices-mx28.h | 63 ^[[31m---^[[m
arch/arm/mach-mxs/devices.c | 87 ^[[31m----^[[m
arch/arm/mach-mxs/devices/Kconfig | 33 ^[[31m--^[[m
arch/arm/mach-mxs/devices/Makefile | 12 ^[[31m-^[[m
arch/arm/mach-mxs/devices/platform-auart.c | 65 ^[[31m---^[[m
arch/arm/mach-mxs/devices/platform-dma.c | 31 ^[[31m--^[[m
arch/arm/mach-mxs/devices/platform-fec.c | 52 ^[[31m--^[[m
arch/arm/mach-mxs/devices/platform-flexcan.c | 51 ^[[31m--^[[m
arch/arm/mach-mxs/devices/platform-gpio-mxs.c | 33 ^[[31m--^[[m
arch/arm/mach-mxs/devices/platform-gpmi-nand.c | 81 ^[[31m----^[[m
arch/arm/mach-mxs/devices/platform-mxs-i2c.c | 52 ^[[31m--^[[m
arch/arm/mach-mxs/devices/platform-mxs-mmc.c | 76 ^[[31m---^[[m
arch/arm/mach-mxs/devices/platform-mxs-pwm.c | 22 ^[[31m-^[[m
arch/arm/mach-mxs/devices/platform-mxs-saif.c | 61 ^[[31m---^[[m
arch/arm/mach-mxs/devices/platform-mxsfb.c | 47 ^[[31m--^[[m
arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c | 51 ^[[31m--^[[m
arch/arm/mach-mxs/include/mach/common.h | 9 ^[[31m-^[[m
arch/arm/mach-mxs/include/mach/devices-common.h | 114 ^[[31m-----^[[m
arch/arm/mach-mxs/include/mach/iomux-mx23.h | 355 ^[[31m--------------^[[m
arch/arm/mach-mxs/include/mach/iomux-mx28.h | 537 ^[[31m---------------------^[[m
arch/arm/mach-mxs/include/mach/iomux.h | 168 ^[[31m-------^[[m
arch/arm/mach-mxs/iomux.c | 101 ^[[31m----^[[m
arch/arm/mach-mxs/mach-apx4devkit.c | 273 ^[[31m-----------^[[m
arch/arm/mach-mxs/mach-m28evk.c | 366 ^[[31m--------------^[[m
arch/arm/mach-mxs/mach-mx23evk.c | 190 ^[[31m--------^[[m
arch/arm/mach-mxs/mach-mx28evk.c | 477 ^[[31m------------------^[[m
arch/arm/mach-mxs/mach-mxs.c | 138 ^[[32m+++++^[[m^[[31m-^[[m
arch/arm/mach-mxs/mach-stmp378x_devb.c | 123 ^[[31m-----^[[m
arch/arm/mach-mxs/mach-tx28.c | 184 ^[[31m-------^[[m
arch/arm/mach-mxs/mm.c | 39 ^[[31m--^[[m
arch/arm/mach-mxs/module-tx28.c | 160 ^[[31m------^[[m
arch/arm/mach-mxs/module-tx28.h | 10 ^[[31m-^[[m
47 files changed, 485 insertions(+), 4096 deletions(-)
create mode 100644 arch/arm/boot/dts/imx28-cfa10049.dts
delete mode 100644 arch/arm/mach-mxs/devices-mx23.h
delete mode 100644 arch/arm/mach-mxs/devices-mx28.h
delete mode 100644 arch/arm/mach-mxs/devices.c
delete mode 100644 arch/arm/mach-mxs/devices/Kconfig
delete mode 100644 arch/arm/mach-mxs/devices/Makefile
delete mode 100644 arch/arm/mach-mxs/devices/platform-auart.c
delete mode 100644 arch/arm/mach-mxs/devices/platform-dma.c
delete mode 100644 arch/arm/mach-mxs/devices/platform-fec.c
delete mode 100644 arch/arm/mach-mxs/devices/platform-flexcan.c
delete mode 100644 arch/arm/mach-mxs/devices/platform-gpio-mxs.c
delete mode 100644 arch/arm/mach-mxs/devices/platform-gpmi-nand.c
delete mode 100644 arch/arm/mach-mxs/devices/platform-mxs-i2c.c
delete mode 100644 arch/arm/mach-mxs/devices/platform-mxs-mmc.c
delete mode 100644 arch/arm/mach-mxs/devices/platform-mxs-pwm.c
delete mode 100644 arch/arm/mach-mxs/devices/platform-mxs-saif.c
delete mode 100644 arch/arm/mach-mxs/devices/platform-mxsfb.c
delete mode 100644 arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c
delete mode 100644 arch/arm/mach-mxs/include/mach/devices-common.h
delete mode 100644 arch/arm/mach-mxs/include/mach/iomux-mx23.h
delete mode 100644 arch/arm/mach-mxs/include/mach/iomux-mx28.h
delete mode 100644 arch/arm/mach-mxs/include/mach/iomux.h
delete mode 100644 arch/arm/mach-mxs/iomux.c
delete mode 100644 arch/arm/mach-mxs/mach-apx4devkit.c
delete mode 100644 arch/arm/mach-mxs/mach-m28evk.c
delete mode 100644 arch/arm/mach-mxs/mach-mx23evk.c
delete mode 100644 arch/arm/mach-mxs/mach-mx28evk.c
delete mode 100644 arch/arm/mach-mxs/mach-stmp378x_devb.c
delete mode 100644 arch/arm/mach-mxs/mach-tx28.c
delete mode 100644 arch/arm/mach-mxs/module-tx28.c
delete mode 100644 arch/arm/mach-mxs/module-tx28.h
^ permalink raw reply [flat|nested] 14+ messages in thread
* [GIT PULL 2/4] mxs sparse-irq support
2012-09-11 7:54 [GIT PULL 0/4] mxs changes for 3.7 Shawn Guo
2012-09-11 7:54 ` [GIT PULL 1/4] mxs device tree " Shawn Guo
@ 2012-09-11 7:54 ` Shawn Guo
2012-09-13 5:56 ` Olof Johansson
2012-09-11 7:54 ` [GIT PULL 3/4] mxs clk device tree lookup Shawn Guo
2012-09-11 7:54 ` [GIT PULL 4/4] mxs defconfig update for 3.7 Shawn Guo
3 siblings, 1 reply; 14+ messages in thread
From: Shawn Guo @ 2012-09-11 7:54 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit d9875690d9b89a866022ff49e3fcea892345ad92:
Linux 3.6-rc2 (2012-08-16 14:51:24 -0700)
are available in the git repository at:
git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-sparse-irq
for you to fetch changes up to 6608f13fabdb1f9ecbd502763ba33ca2646834c8:
ARM: mxs: remove mach/irqs.h (2012-09-03 09:32:17 +0800)
----------------------------------------------------------------
mxs-sparse-irq
The series adds irqdomain support for mach-mxs and then enables
sparse-irq. It dependes on pull request mxs-dt-3.7.
----------------------------------------------------------------
Shawn Guo (6):
gpio/mxs: adopt irq_domain support for mxs gpio driver
ARM: mxs: retrieve timer irq from device tree
ARM: mxs: select MULTI_IRQ_HANDLER
ARM: mxs: adopt irq_domain support for icoll driver
ARM: mxs: select SPARSE_IRQ
ARM: mxs: remove mach/irqs.h
arch/arm/Kconfig | 2 ^[[32m+^[[m
arch/arm/boot/dts/imx23.dtsi | 5 ^[[32m+^[[m^[[31m-^[[m
arch/arm/boot/dts/imx28.dtsi | 5 ^[[32m+^[[m^[[31m-^[[m
arch/arm/mach-mxs/icoll.c | 63 ^[[32m++++++++++++++++++++++^[[m^[[31m----^[[m
arch/arm/mach-mxs/include/mach/common.h | 3 ^[[32m+^[[m^[[31m-^[[m
arch/arm/mach-mxs/include/mach/entry-macro.S | 35 ^[[31m--------------^[[m
arch/arm/mach-mxs/include/mach/irqs.h | 32 ^[[31m-------------^[[m
arch/arm/mach-mxs/mach-mxs.c | 39 ^[[32m++^[[m^[[31m--------------^[[m
arch/arm/mach-mxs/timer.c | 13 ^[[32m+++++^[[m^[[31m-^[[m
drivers/clk/mxs/clk-imx23.c | 2 ^[[32m+^[[m^[[31m-^[[m
drivers/clk/mxs/clk-imx28.c | 2 ^[[32m+^[[m^[[31m-^[[m
drivers/gpio/gpio-mxs.c | 48 ^[[32m++++++++++++^[[m^[[31m--------^[[m
12 files changed, 112 insertions(+), 137 deletions(-)
delete mode 100644 arch/arm/mach-mxs/include/mach/entry-macro.S
delete mode 100644 arch/arm/mach-mxs/include/mach/irqs.h
^ permalink raw reply [flat|nested] 14+ messages in thread
* [GIT PULL 3/4] mxs clk device tree lookup
2012-09-11 7:54 [GIT PULL 0/4] mxs changes for 3.7 Shawn Guo
2012-09-11 7:54 ` [GIT PULL 1/4] mxs device tree " Shawn Guo
2012-09-11 7:54 ` [GIT PULL 2/4] mxs sparse-irq support Shawn Guo
@ 2012-09-11 7:54 ` Shawn Guo
2012-09-11 8:58 ` Shawn Guo
2012-09-13 6:08 ` Olof Johansson
2012-09-11 7:54 ` [GIT PULL 4/4] mxs defconfig update for 3.7 Shawn Guo
3 siblings, 2 replies; 14+ messages in thread
From: Shawn Guo @ 2012-09-11 7:54 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 0a77398b5a68e298f03b1c356c5100fa1decb2e1:
Merge tag 'mxs-dt-3.7' into mxs/clk-dt-lookup (2012-09-11 14:15:00 +0800)
are available in the git repository at:
git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-clk-dt-lookup
for you to fetch changes up to 53f9443da63db38212e784b0aa205881168757aa:
clk: mxs: replace imx23 clk_register_clkdev with clock DT lookup (2012-09-11 14:45:46 +0800)
----------------------------------------------------------------
mxs-clk-dt-lookup
It replaces clk_register_clkdev in mxs clock driver with DT lookup.
The series depends on pull request mxs-dt-3.7 and Mike's clk branch
below.
----------------------------------------------------------------
Shawn Guo (2):
clk: mxs: replace imx28 clk_register_clkdev with clock DT lookup
clk: mxs: replace imx23 clk_register_clkdev with clock DT lookup
.../devicetree/bindings/clock/imx23-clock.txt | 76 ^[[32m+++++++++++++^[[m
.../devicetree/bindings/clock/imx28-clock.txt | 99 ^[[32m+++++++++++++++++^[[m
arch/arm/boot/dts/imx23.dtsi | 16 ^[[32m++^[[m^[[31m-^[[m
arch/arm/boot/dts/imx28.dtsi | 35 ^[[32m+++++^[[m^[[31m-^[[m
drivers/clk/mxs/clk-imx23.c | 55 ^[[32m++^[[m^[[31m--------^[[m
drivers/clk/mxs/clk-imx28.c | 113 ^[[32m++^[[m^[[31m------------------^[[m
6 files changed, 242 insertions(+), 152 deletions(-)
create mode 100644 Documentation/devicetree/bindings/clock/imx23-clock.txt
create mode 100644 Documentation/devicetree/bindings/clock/imx28-clock.txt
^ permalink raw reply [flat|nested] 14+ messages in thread
* [GIT PULL 4/4] mxs defconfig update for 3.7
2012-09-11 7:54 [GIT PULL 0/4] mxs changes for 3.7 Shawn Guo
` (2 preceding siblings ...)
2012-09-11 7:54 ` [GIT PULL 3/4] mxs clk device tree lookup Shawn Guo
@ 2012-09-11 7:54 ` Shawn Guo
2012-09-13 6:10 ` Olof Johansson
3 siblings, 1 reply; 14+ messages in thread
From: Shawn Guo @ 2012-09-11 7:54 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee:
Linux 3.6-rc1 (2012-08-02 16:38:10 -0700)
are available in the git repository at:
git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-defconfig-3.7
for you to fetch changes up to 8f9d87a0b2ec18416a8ad1a53dd5a97ee4ef7825:
ARM: mxs_defconfig: Add SPI and LRADC support (2012-08-28 08:38:05 +0800)
----------------------------------------------------------------
mxs-defconfig-3.7
A collection of mxs_defconfig updates for 3.7.
----------------------------------------------------------------
Fabio Estevam (4):
ARM: mxs_defconfig: Enable USB host
ARM: mxs_defconfig: Add LED, PWM and MTD_CHAR support
ARM: mxs_defconfig: Add framebuffer support
ARM: mxs_defconfig: Add SPI and LRADC support
arch/arm/configs/mxs_defconfig | 36 ^[[32m+++++++++++++++++++++++++++++++++++^[[m^[[31m-^[[m
1 file changed, 35 insertions(+), 1 deletion(-)
^ permalink raw reply [flat|nested] 14+ messages in thread
* [GIT PULL 3/4] mxs clk device tree lookup
2012-09-11 7:54 ` [GIT PULL 3/4] mxs clk device tree lookup Shawn Guo
@ 2012-09-11 8:58 ` Shawn Guo
2012-09-13 6:08 ` Olof Johansson
1 sibling, 0 replies; 14+ messages in thread
From: Shawn Guo @ 2012-09-11 8:58 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Sep 11, 2012 at 03:54:58PM +0800, Shawn Guo wrote:
> The following changes since commit 0a77398b5a68e298f03b1c356c5100fa1decb2e1:
>
> Merge tag 'mxs-dt-3.7' into mxs/clk-dt-lookup (2012-09-11 14:15:00 +0800)
>
> are available in the git repository at:
>
>
> git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-clk-dt-lookup
>
> for you to fetch changes up to 53f9443da63db38212e784b0aa205881168757aa:
>
> clk: mxs: replace imx23 clk_register_clkdev with clock DT lookup (2012-09-11 14:45:46 +0800)
>
> ----------------------------------------------------------------
> mxs-clk-dt-lookup
>
> It replaces clk_register_clkdev in mxs clock driver with DT lookup.
> The series depends on pull request mxs-dt-3.7 and Mike's clk branch
> below.
>
git://git.linaro.org/people/mturquette/linux.git clk-3.7
The line got lost. I just update the tag to add it back.
Regards,
Shawn
> ----------------------------------------------------------------
> Shawn Guo (2):
> clk: mxs: replace imx28 clk_register_clkdev with clock DT lookup
> clk: mxs: replace imx23 clk_register_clkdev with clock DT lookup
>
> .../devicetree/bindings/clock/imx23-clock.txt | 76 ^[[32m+++++++++++++^[[m
> .../devicetree/bindings/clock/imx28-clock.txt | 99 ^[[32m+++++++++++++++++^[[m
> arch/arm/boot/dts/imx23.dtsi | 16 ^[[32m++^[[m^[[31m-^[[m
> arch/arm/boot/dts/imx28.dtsi | 35 ^[[32m+++++^[[m^[[31m-^[[m
> drivers/clk/mxs/clk-imx23.c | 55 ^[[32m++^[[m^[[31m--------^[[m
> drivers/clk/mxs/clk-imx28.c | 113 ^[[32m++^[[m^[[31m------------------^[[m
> 6 files changed, 242 insertions(+), 152 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/clock/imx23-clock.txt
> create mode 100644 Documentation/devicetree/bindings/clock/imx28-clock.txt
^ permalink raw reply [flat|nested] 14+ messages in thread
* [GIT PULL 1/4] mxs device tree changes for 3.7
2012-09-11 7:54 ` [GIT PULL 1/4] mxs device tree " Shawn Guo
@ 2012-09-13 5:48 ` Olof Johansson
0 siblings, 0 replies; 14+ messages in thread
From: Olof Johansson @ 2012-09-13 5:48 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Sep 11, 2012 at 03:54:56PM +0800, Shawn Guo wrote:
> The following changes since commit d9875690d9b89a866022ff49e3fcea892345ad92:
>
> Linux 3.6-rc2 (2012-08-16 14:51:24 -0700)
>
> are available in the git repository at:
>
> git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-dt-3.7
>
> for you to fetch changes up to 13b4569bbbcf58891727138b84b8db5ea4178d32:
>
> ARM: dts: cfa10049: Add the 74HC595 gpio expanders (2012-09-11 09:51:30 +0800)
>
> ----------------------------------------------------------------
> mxs-dt-3.7
>
> - Remove all board files and make mach-mxs a DT-only platform
> - Some dts file formatting and style fixing
> - DTS update for additional boards and devices
\o/ Nice work! Good to see another platform go fully DT-probed.
Pulled in as mxs/dt into next/dt.
Only nit is that you don't need to add the tag name to the tag description
in the future. I took it out when merging, and it's no big deal and easy
to do.
-Olof
^ permalink raw reply [flat|nested] 14+ messages in thread
* [GIT PULL 2/4] mxs sparse-irq support
2012-09-11 7:54 ` [GIT PULL 2/4] mxs sparse-irq support Shawn Guo
@ 2012-09-13 5:56 ` Olof Johansson
2012-09-13 6:16 ` Shawn Guo
0 siblings, 1 reply; 14+ messages in thread
From: Olof Johansson @ 2012-09-13 5:56 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Sep 11, 2012 at 03:54:57PM +0800, Shawn Guo wrote:
> The following changes since commit d9875690d9b89a866022ff49e3fcea892345ad92:
>
> Linux 3.6-rc2 (2012-08-16 14:51:24 -0700)
>
> are available in the git repository at:
>
> git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-sparse-irq
>
> for you to fetch changes up to 6608f13fabdb1f9ecbd502763ba33ca2646834c8:
>
> ARM: mxs: remove mach/irqs.h (2012-09-03 09:32:17 +0800)
>
> ----------------------------------------------------------------
> mxs-sparse-irq
>
> The series adds irqdomain support for mach-mxs and then enables
> sparse-irq. It dependes on pull request mxs-dt-3.7.
Thanks, pulled in under next/soc2 due to the dt dependency.
However, for the future: if you're truly dependent on the dt branch to
build/boot, you should use that as a base for this branch. Otherwise you
can end up in a state with git bisect where you only have this branch
applied but not the other one.
-Olof
^ permalink raw reply [flat|nested] 14+ messages in thread
* [GIT PULL 3/4] mxs clk device tree lookup
2012-09-11 7:54 ` [GIT PULL 3/4] mxs clk device tree lookup Shawn Guo
2012-09-11 8:58 ` Shawn Guo
@ 2012-09-13 6:08 ` Olof Johansson
2012-09-13 17:23 ` Turquette, Mike
1 sibling, 1 reply; 14+ messages in thread
From: Olof Johansson @ 2012-09-13 6:08 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Sep 11, 2012 at 03:54:58PM +0800, Shawn Guo wrote:
> The following changes since commit 0a77398b5a68e298f03b1c356c5100fa1decb2e1:
>
> Merge tag 'mxs-dt-3.7' into mxs/clk-dt-lookup (2012-09-11 14:15:00 +0800)
>
> are available in the git repository at:
>
>
> git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-clk-dt-lookup
>
> for you to fetch changes up to 53f9443da63db38212e784b0aa205881168757aa:
>
> clk: mxs: replace imx23 clk_register_clkdev with clock DT lookup (2012-09-11 14:45:46 +0800)
>
> ----------------------------------------------------------------
> mxs-clk-dt-lookup
>
> It replaces clk_register_clkdev in mxs clock driver with DT lookup.
> The series depends on pull request mxs-dt-3.7 and Mike's clk branch
> below.
Pulled in as mxs/clk-dt-lookup, thanks!
I also pulled in Mike's clk-3.7 branch as a dependency. Mike, this
assumes that the branch is stable (which you've already mostly promised
in the past).
Please let us know if it isn't and/or if you prefer to just give us
a shorter topic branch with the dependent commit to pull in instead.
-Olof
^ permalink raw reply [flat|nested] 14+ messages in thread
* [GIT PULL 4/4] mxs defconfig update for 3.7
2012-09-11 7:54 ` [GIT PULL 4/4] mxs defconfig update for 3.7 Shawn Guo
@ 2012-09-13 6:10 ` Olof Johansson
2012-09-13 6:17 ` Shawn Guo
0 siblings, 1 reply; 14+ messages in thread
From: Olof Johansson @ 2012-09-13 6:10 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Sep 11, 2012 at 03:54:59PM +0800, Shawn Guo wrote:
> The following changes since commit 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee:
>
> Linux 3.6-rc1 (2012-08-02 16:38:10 -0700)
>
> are available in the git repository at:
>
> git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-defconfig-3.7
>
> for you to fetch changes up to 8f9d87a0b2ec18416a8ad1a53dd5a97ee4ef7825:
>
> ARM: mxs_defconfig: Add SPI and LRADC support (2012-08-28 08:38:05 +0800)
>
> ----------------------------------------------------------------
> mxs-defconfig-3.7
>
> A collection of mxs_defconfig updates for 3.7.
Pulled, thanks. In the future feel free to either include this with other
changes needed to enable the options, or squash them down to one or two
commits. But this is OK too.
-Olof
^ permalink raw reply [flat|nested] 14+ messages in thread
* [GIT PULL 2/4] mxs sparse-irq support
2012-09-13 5:56 ` Olof Johansson
@ 2012-09-13 6:16 ` Shawn Guo
2012-09-13 7:42 ` Olof Johansson
0 siblings, 1 reply; 14+ messages in thread
From: Shawn Guo @ 2012-09-13 6:16 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Sep 12, 2012 at 10:56:47PM -0700, Olof Johansson wrote:
> On Tue, Sep 11, 2012 at 03:54:57PM +0800, Shawn Guo wrote:
> > The following changes since commit d9875690d9b89a866022ff49e3fcea892345ad92:
> >
> > Linux 3.6-rc2 (2012-08-16 14:51:24 -0700)
> >
> > are available in the git repository at:
> >
> > git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-sparse-irq
> >
> > for you to fetch changes up to 6608f13fabdb1f9ecbd502763ba33ca2646834c8:
> >
> > ARM: mxs: remove mach/irqs.h (2012-09-03 09:32:17 +0800)
> >
> > ----------------------------------------------------------------
> > mxs-sparse-irq
> >
> > The series adds irqdomain support for mach-mxs and then enables
> > sparse-irq. It dependes on pull request mxs-dt-3.7.
>
> Thanks, pulled in under next/soc2 due to the dt dependency.
>
> However, for the future: if you're truly dependent on the dt branch to
> build/boot, you should use that as a base for this branch. Otherwise you
> can end up in a state with git bisect where you only have this branch
> applied but not the other one.
>
Ok. That's actually a little bit easier for me, since I only need to
send you the branch that I tested with.
I got an impression that we should try hard to base pull-requests on
-rc. That said, we should only base one branch/pull-request on another
when there is a dependency at file content level. The build/boot level
dependency can just be sorted out in arm-soc tree when the branch gets
built into for-next or sent to Linus.
--
Regards,
Shawn
^ permalink raw reply [flat|nested] 14+ messages in thread
* [GIT PULL 4/4] mxs defconfig update for 3.7
2012-09-13 6:10 ` Olof Johansson
@ 2012-09-13 6:17 ` Shawn Guo
0 siblings, 0 replies; 14+ messages in thread
From: Shawn Guo @ 2012-09-13 6:17 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Sep 12, 2012 at 11:10:47PM -0700, Olof Johansson wrote:
> On Tue, Sep 11, 2012 at 03:54:59PM +0800, Shawn Guo wrote:
> > The following changes since commit 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee:
> >
> > Linux 3.6-rc1 (2012-08-02 16:38:10 -0700)
> >
> > are available in the git repository at:
> >
> > git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-defconfig-3.7
> >
> > for you to fetch changes up to 8f9d87a0b2ec18416a8ad1a53dd5a97ee4ef7825:
> >
> > ARM: mxs_defconfig: Add SPI and LRADC support (2012-08-28 08:38:05 +0800)
> >
> > ----------------------------------------------------------------
> > mxs-defconfig-3.7
> >
> > A collection of mxs_defconfig updates for 3.7.
>
> Pulled, thanks. In the future feel free to either include this with other
> changes needed to enable the options, or squash them down to one or two
> commits. But this is OK too.
>
Ok, got it.
--
Regards,
Shawn
^ permalink raw reply [flat|nested] 14+ messages in thread
* [GIT PULL 2/4] mxs sparse-irq support
2012-09-13 6:16 ` Shawn Guo
@ 2012-09-13 7:42 ` Olof Johansson
0 siblings, 0 replies; 14+ messages in thread
From: Olof Johansson @ 2012-09-13 7:42 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Sep 12, 2012 at 11:16 PM, Shawn Guo <shawn.guo@linaro.org> wrote:
> On Wed, Sep 12, 2012 at 10:56:47PM -0700, Olof Johansson wrote:
>> On Tue, Sep 11, 2012 at 03:54:57PM +0800, Shawn Guo wrote:
>> > The following changes since commit d9875690d9b89a866022ff49e3fcea892345ad92:
>> >
>> > Linux 3.6-rc2 (2012-08-16 14:51:24 -0700)
>> >
>> > are available in the git repository at:
>> >
>> > git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-sparse-irq
>> >
>> > for you to fetch changes up to 6608f13fabdb1f9ecbd502763ba33ca2646834c8:
>> >
>> > ARM: mxs: remove mach/irqs.h (2012-09-03 09:32:17 +0800)
>> >
>> > ----------------------------------------------------------------
>> > mxs-sparse-irq
>> >
>> > The series adds irqdomain support for mach-mxs and then enables
>> > sparse-irq. It dependes on pull request mxs-dt-3.7.
>>
>> Thanks, pulled in under next/soc2 due to the dt dependency.
>>
>> However, for the future: if you're truly dependent on the dt branch to
>> build/boot, you should use that as a base for this branch. Otherwise you
>> can end up in a state with git bisect where you only have this branch
>> applied but not the other one.
>>
> Ok. That's actually a little bit easier for me, since I only need to
> send you the branch that I tested with.
>
> I got an impression that we should try hard to base pull-requests on
> -rc. That said, we should only base one branch/pull-request on another
> when there is a dependency at file content level. The build/boot level
> dependency can just be sorted out in arm-soc tree when the branch gets
> built into for-next or sent to Linus.
That was my stance in the past as well but once I got shown how git
bisect can end up in a state where only the later branch is included,
and not the prerequisite, it became obvious that for a bisectable
contents the branches indeed need to be based on each other. See
http://marc.info/?l=linux-kernel&m=133739202430250&w=2 for more info.
And that's fine, since if you base (in this case) the dt branch on an
-rc, and then the sparse-irq branch on top of the dt branch, the total
pull request is still based on an -rc. What we don't want is when
someone starts a new branch on a random mainline commit between two
-rcs.
-Olof
^ permalink raw reply [flat|nested] 14+ messages in thread
* [GIT PULL 3/4] mxs clk device tree lookup
2012-09-13 6:08 ` Olof Johansson
@ 2012-09-13 17:23 ` Turquette, Mike
0 siblings, 0 replies; 14+ messages in thread
From: Turquette, Mike @ 2012-09-13 17:23 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Sep 12, 2012 at 11:08 PM, Olof Johansson <olof@lixom.net> wrote:
> On Tue, Sep 11, 2012 at 03:54:58PM +0800, Shawn Guo wrote:
>> The following changes since commit 0a77398b5a68e298f03b1c356c5100fa1decb2e1:
>>
>> Merge tag 'mxs-dt-3.7' into mxs/clk-dt-lookup (2012-09-11 14:15:00 +0800)
>>
>> are available in the git repository at:
>>
>>
>> git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-clk-dt-lookup
>>
>> for you to fetch changes up to 53f9443da63db38212e784b0aa205881168757aa:
>>
>> clk: mxs: replace imx23 clk_register_clkdev with clock DT lookup (2012-09-11 14:45:46 +0800)
>>
>> ----------------------------------------------------------------
>> mxs-clk-dt-lookup
>>
>> It replaces clk_register_clkdev in mxs clock driver with DT lookup.
>> The series depends on pull request mxs-dt-3.7 and Mike's clk branch
>> below.
>
> Pulled in as mxs/clk-dt-lookup, thanks!
>
> I also pulled in Mike's clk-3.7 branch as a dependency. Mike, this
> assumes that the branch is stable (which you've already mostly promised
> in the past).
>
> Please let us know if it isn't and/or if you prefer to just give us
> a shorter topic branch with the dependent commit to pull in instead.
>
clk-3.7 is stable. I might merge the current clk-next into it soon,
but that's just a fast-forward.
Regards,
Mike
>
> -Olof
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2012-09-13 17:23 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-11 7:54 [GIT PULL 0/4] mxs changes for 3.7 Shawn Guo
2012-09-11 7:54 ` [GIT PULL 1/4] mxs device tree " Shawn Guo
2012-09-13 5:48 ` Olof Johansson
2012-09-11 7:54 ` [GIT PULL 2/4] mxs sparse-irq support Shawn Guo
2012-09-13 5:56 ` Olof Johansson
2012-09-13 6:16 ` Shawn Guo
2012-09-13 7:42 ` Olof Johansson
2012-09-11 7:54 ` [GIT PULL 3/4] mxs clk device tree lookup Shawn Guo
2012-09-11 8:58 ` Shawn Guo
2012-09-13 6:08 ` Olof Johansson
2012-09-13 17:23 ` Turquette, Mike
2012-09-11 7:54 ` [GIT PULL 4/4] mxs defconfig update for 3.7 Shawn Guo
2012-09-13 6:10 ` Olof Johansson
2012-09-13 6:17 ` 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).