From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751638AbcFFMZu (ORCPT ); Mon, 6 Jun 2016 08:25:50 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:38342 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751039AbcFFMZs (ORCPT ); Mon, 6 Jun 2016 08:25:48 -0400 X-AuditID: cbfec7f5-f792a6d000001302-82-57556bc8f081 From: Krzysztof Kozlowski To: Olof Johansson , Arnd Bergmann , Kevin Hilman , arm@kernel.org Cc: Javier Martinez Canillas , Marek Szyprowski , Sylwester Nawrocki , Krzysztof Kozlowski , Kukjin Kim , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Bartlomiej Zolnierkiewicz , Krzysztof Kozlowski Subject: [GIT PULL 0/8] ARM: exynos: Early stuff for v4.8 Date: Mon, 06 Jun 2016 14:25:25 +0200 Message-id: <1465215933-22709-1-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrGLMWRmVeSWpSXmKPExsVy+t/xq7onskPDDX5uV7Q49mULm8XfScfY LTbOWM9q8ebtGiaL1y8MLfofv2a2eLr5MZPF+fMb2C02Pb7GanF51xw2ixnn9zFZrD1yl93i 1PXPbBaH37SzOvB5/P41idFj06pONo/NS+o9rpxoYvXY0n+X3aNvyypGj8+b5ALYo7hsUlJz MstSi/TtErgyFrXuYi24IV7x4uUTlgbGLqEuRk4OCQETiYcbFrNB2GISF+6tB7K5OIQEljJK NP+9xwKSEBJoZJL4+r8KxGYTMJbYvHwJWIOIQLnEgpmnGUEamAXWM0v8+3IArEFYwFLi8KKN zF2MHBwsAqoST+/wgIR5BdwlDszbzw6xTE7i5LHJrBMYuRcwMqxiFE0tTS4oTkrPNdIrTswt Ls1L10vOz93ECAm9rzsYlx6zOsQowMGoxMPLUBQSLsSaWFZcmXuIUYKDWUmEVzIlNFyINyWx siq1KD++qDQntfgQozQHi5I478xd70OEBNITS1KzU1MLUotgskwcnFINjM3WLEfEvs319H8v M/n6ryPxflsObmZLr16h6ynwZ7HQ7eqEF5W/eva0LCpdvb8lwlGw/d30sLln7BZMqNarOuhQ bup979nrCo98a4e00FXfkxPSzjKXZArmXntns7XyZaE+7/pAqeKXE8PrS7ZtlV3Qduvrmv1n Dn7dneRrlpf4/2Kj7N9YLyWW4oxEQy3mouJEAClGVtM5AgAA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Dear all, This time I am sending a very early pull request because: 1. I already have a lot of stuff. 2. There are some conflicts, including annoying re-indent one (see below). 3. I am going for holidays soon. After this weekend, my availability will be reduced. There is no specific order of branches to pull (no inter-dependencies). External dependencies (from Samsung clk and media) are pulled in. Expected conflicts: 1. arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi samsung-drivers-exynos-mfc-4.8 with samsung-dt-4.8 Just include both changes: --- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi +++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi @@@ -18,6 -16,8 +18,7 @@@ #include #include "exynos5800.dtsi" #include "exynos5422-cpus.dtsi" -#include "exynos5422-cpu-thermal.dtsi" + #include "exynos-mfc-reserved-memory.dtsi" / { memory { 2. arch/arm/configs/exynos_defconfig samsung-defconfig-4.8 with current fixes Just include both changes: --- a/arch/arm/configs/exynos_defconfig +++ b/arch/arm/configs/exynos_defconfig @@@ -80,11 -79,10 +79,11 @@@ CONFIG_TOUCHSCREEN_MMS114= CONFIG_INPUT_MISC=y CONFIG_INPUT_MAX77693_HAPTIC=y CONFIG_INPUT_MAX8997_HAPTIC=y +CONFIG_KEYBOARD_SAMSUNG=y CONFIG_SERIAL_8250=y + CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_SAMSUNG=y CONFIG_SERIAL_SAMSUNG_CONSOLE=y - CONFIG_SERIAL_OF_PLATFORM=y CONFIG_HW_RANDOM=y CONFIG_TCG_TPM=y CONFIG_TCG_TIS_I2C_INFINEON=y 3. arch/arm/boot/dts/exynos5420.dtsi samsung-dt-4.8 with samsung-dt-odroid-xu-4.8 This is non-trivial. One branch added clocks and second changed the indentation. Manual fix-up is needed by re-indenting the change with three clocks, like this: --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi + mfc_pd: power-domain@10044060 { + compatible = "samsung,exynos4210-pd"; + reg = <0x10044060 0x20>; - clocks = <&clock CLK_FIN_PLL>, <&clock CLK_MOUT_USER_ACLK333>; - clock-names = "oscclk", "clk0"; ++ clocks = <&clock CLK_FIN_PLL>, <&clock CLK_MOUT_USER_ACLK333>, ++ <&clock CLK_ACLK333>; ++ clock-names = "oscclk", "clk0","asb0"; + #power-domain-cells = <0>; + }; 4. arch/arm/mach-exynos/Kconfig arm-soc with tags/samsung-drivers Trivial: --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@@ -18,7 -19,7 +18,8 @@@ menuconfig ARCH_EXYNO select EXYNOS_THERMAL select EXYNOS_PMU select EXYNOS_SROM + select EXYNOS_PM_DOMAINS if PM_GENERIC_DOMAINS + select GPIOLIB select HAVE_ARM_SCU if SMP select HAVE_S3C2410_I2C if I2C select HAVE_S3C2410_WATCHDOG if WATCHDOG Best regards, Krzysztof