Hi, On Friday, September 12, 2014 12:26:43 PM Lorenzo Pieralisi wrote: > On Fri, Sep 12, 2014 at 11:32:57AM +0100, Catalin Marinas wrote: > > Daniel, Lorenzo, > > > > On Thu, Sep 11, 2014 at 10:32:48AM +0100, Daniel Lezcano wrote: > > > On 09/11/2014 10:57 AM, Lorenzo Pieralisi wrote: > > > > There is no ARM code in my series. So to sum it up: > > > > > > > > a) I send a pull request to Catalin for arm64 patches on top of the branch > > > > you are creating with my patches > > > > > > > > b) You take care of merging the CPUidle related patches through your > > > > tree > > > > > > > > Is the above what you meant ? > > > > > > Right, that allows to share a branch across the trees and resolve the > > > dependencies when a patchset is touching different subsystems. > > > > > > I realize the dependency is inverted regarding what I proposed > > > initially, so it is up to Catalin to create the branch and I will share > > > it with him. > > > > I created the branch below with the arm64 specific patches for cpuidle. > > I won't rebase it and it should appear in -next tomorrow. > > > > Lorenzo, please send a pull request to Daniel with the additional > > patches on top of the arm64 branch. Thanks. > > Thank you very much, done. Pull request attached for information. > > As Daniel knows, last two patches are still pending, waiting for Samsung > acks, and will be dropped if we do not get them in time. > > Lorenzo > > The following changes since commit 18910ab0d916b1a87016d69efd027714a80521dd: > > arm64: add PSCI CPU_SUSPEND based cpu_suspend support (2014-09-12 10:48:56 +0100) > > are available in the git repository at: > > git://linux-arm.org/linux-2.6-lp.git for-upstream/arm-generic-cpuidle > > for you to fetch changes up to dda773655f9b97570884c4396ad4d63daf177107: > > drivers: cpuidle: initialize Exynos driver through DT (2014-09-12 11:37:43 +0100) > > ---------------------------------------------------------------- > Bartlomiej Zolnierkiewicz (1): > ARM: dts: add CPU nodes for Exynos4 SoCs This patch got broken during merge. It differs from the version I posted on the list by not having the closing "};" which causes a dtb build failure: Error: arch/arm/boot/dts/exynos4210-origen.dts:21.1-2 syntax error FATAL ERROR: Unable to parse input tree make[1]: *** [arch/arm/boot/dts/exynos4210-origen.dtb] Error 1 make: *** [dtbs] Error 2 make: *** Waiting for unfinished jobs.... Please regenarate your branch with the fixed version of the patch (you can squash the fix below to the broken patch). --- arch/arm/boot/dts/exynos4210.dtsi | 1 + 1 file changed, 1 insertion(+) Index: b/arch/arm/boot/dts/exynos4210.dtsi =================================================================== --- a/arch/arm/boot/dts/exynos4210.dtsi 2014-09-23 14:14:29.793571708 +0200 +++ b/arch/arm/boot/dts/exynos4210.dtsi 2014-09-23 14:17:22.029565827 +0200 @@ -39,6 +39,7 @@ <&clock CLK_OUT_CPU>, <&clock CLK_XXTI>, <&clock CLK_XUSBXTI>; #clock-cells = <1>; + }; cpus { #address-cells = <1>; > Lorenzo Pieralisi (4): > drivers: cpuidle: implement DT based idle states infrastructure > drivers: cpuidle: CPU idle ARM64 driver > drivers: cpuidle: initialize big.LITTLE driver through DT > drivers: cpuidle: initialize Exynos driver through DT > > arch/arm/boot/dts/exynos4210.dtsi | 27 ++++ > arch/arm/boot/dts/exynos4212.dtsi | 17 +++ > arch/arm/boot/dts/exynos4412.dtsi | 29 ++++ > arch/arm/boot/dts/exynos5250.dtsi | 11 ++ > arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 23 ++++ > drivers/cpuidle/Kconfig | 8 ++ > drivers/cpuidle/Kconfig.arm | 2 + > drivers/cpuidle/Kconfig.arm64 | 14 ++ > drivers/cpuidle/Makefile | 5 + > drivers/cpuidle/cpuidle-arm64.c | 133 ++++++++++++++++++ > drivers/cpuidle/cpuidle-big_little.c | 19 +++ > drivers/cpuidle/cpuidle-exynos.c | 18 ++- > drivers/cpuidle/dt_idle_states.c | 213 +++++++++++++++++++++++++++++ > drivers/cpuidle/dt_idle_states.h | 7 + > 14 files changed, 525 insertions(+), 1 deletion(-) > create mode 100644 drivers/cpuidle/Kconfig.arm64 > create mode 100644 drivers/cpuidle/cpuidle-arm64.c > create mode 100644 drivers/cpuidle/dt_idle_states.c > create mode 100644 drivers/cpuidle/dt_idle_states.h Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html