From: Krzysztof Kozlowski <k.kozlowski@samsung.com>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
Kevin Hilman <khilman@kernel.org>,
arm@kernel.org
Cc: Javier Martinez Canillas <javier@osg.samsung.com>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Sylwester Nawrocki <s.nawrocki@samsung.com>,
Krzysztof Kozlowski <k.kozlowski@samsung.com>,
Kukjin Kim <kgene@kernel.org>,
linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
Krzysztof Kozlowski <krzk@kernel.org>
Subject: [GIT PULL 0/8] ARM: exynos: Early stuff for v4.8
Date: Mon, 06 Jun 2016 14:25:25 +0200 [thread overview]
Message-ID: <1465215933-22709-1-git-send-email-k.kozlowski@samsung.com> (raw)
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 <dt-bindings/sound/samsung-i2s.h>
#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
next reply other threads:[~2016-06-06 12:25 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-06 12:25 Krzysztof Kozlowski [this message]
2016-06-06 12:25 ` [GIT PULL 1/8] ARM: exynos: Mach/soc changes " Krzysztof Kozlowski
2016-06-13 21:24 ` Olof Johansson
2016-06-06 12:25 ` [GIT PULL 2/8] arm64: " Krzysztof Kozlowski
2016-06-06 12:25 ` [GIT PULL 3/8] ARM: exynos: Drivers " Krzysztof Kozlowski
2016-06-06 12:25 ` [GIT PULL 4/8] ARM: exynos: Topic branch with driver changes " Krzysztof Kozlowski
2016-06-13 21:47 ` Olof Johansson
2016-06-16 12:16 ` Krzysztof Kozlowski
2016-06-16 13:00 ` Sylwester Nawrocki
2016-06-20 5:40 ` Olof Johansson
2016-06-06 12:25 ` [GIT PULL 5/8] ARM: dts: exynos: DTS " Krzysztof Kozlowski
2016-06-13 21:48 ` Olof Johansson
2016-06-06 12:25 ` [GIT PULL 6/8] arm64: " Krzysztof Kozlowski
2016-06-07 6:32 ` Krzysztof Kozlowski
2016-06-13 21:48 ` Olof Johansson
2016-06-06 12:25 ` [GIT PULL 7/8] ARM: dts: exynos: Topic branch with Odroid XU " Krzysztof Kozlowski
2016-06-13 21:53 ` Olof Johansson
2016-06-14 19:44 ` Krzysztof Kozlowski
2016-06-06 12:25 ` [GIT PULL 8/8] ARM: defconfig: exynos: Defconfig " Krzysztof Kozlowski
2016-06-13 22:24 ` Olof Johansson
2016-06-14 18:03 ` Javier Martinez Canillas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1465215933-22709-1-git-send-email-k.kozlowski@samsung.com \
--to=k.kozlowski@samsung.com \
--cc=arm@kernel.org \
--cc=arnd@arndb.de \
--cc=b.zolnierkie@samsung.com \
--cc=javier@osg.samsung.com \
--cc=kgene@kernel.org \
--cc=khilman@kernel.org \
--cc=krzk@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=olof@lixom.net \
--cc=s.nawrocki@samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®