[GIT PULL 0/4] ARM: exynos: Second round for v4.8

[GIT PULL 0/4] ARM: exynos: Second round for v4.8

[Krzysztof Kozlowski]

Hi,


Secound round for v4.8. No specific order of pulls.
No external dependencies. Everything is based on previous work.

Expected one conflict, described in email with the conflict itself.


Best regards,
Krzysztof

[GIT PULL 1/4] ARM: exynos: Mach updates for v4.8, part 2

[Krzysztof Kozlowski]

Hi,

Mostly endian-related cleanup/fixes, on top of previous pull.
Expected conflicts:

diff --cc arch/arm/mach-exynos/exynos.c
index a8620c6eb723,bdaf81c46d74..9c51b6dcb551
--- a/arch/arm/mach-exynos/exynos.c
+++ b/arch/arm/mach-exynos/exynos.c
@@@ -25,8 -25,10 +25,9 @@@
  #include <asm/mach/map.h>
  
  #include <mach/map.h>
+ #include <plat/cpu.h>
  
  #include "common.h"
 -#include "mfc.h"
  
  static struct map_desc exynos4_iodesc[] __initdata = {
        {
diff --cc drivers/soc/samsung/pm_domains.c
index f60515eefb66,0e075d96ccd4..4822346aadc6
--- a/drivers/soc/samsung/pm_domains.c
+++ b/drivers/soc/samsung/pm_domains.c
@@@ -74,13 -69,13 +74,13 @@@ static int exynos_pd_power(struct gener
                }
        }
  
 -      pwr = power_on ? INT_LOCAL_PWR_EN : 0;
 +      pwr = power_on ? pd->local_pwr_cfg : 0;
-       __raw_writel(pwr, base);
+       writel_relaxed(pwr, base);
  
        /* Wait max 1ms */
        timeout = 10;
  
-       while ((__raw_readl(base + 0x4) & pd->local_pwr_cfg) != pwr) {
 -      while ((readl_relaxed(base + 0x4) & INT_LOCAL_PWR_EN) != pwr) {
++      while ((readl_relaxed(base + 0x4) & pd->local_pwr_cfg) != pwr) {
                if (!timeout) {
                        op = (power_on) ? "enable" : "disable";
                        pr_err("Power domain %s %s failed\n", domain->name, op);
@@@ -207,7 -185,7 +207,7 @@@ static __init int exynos4_pm_init_power
                        clk_put(pd->oscclk);
  
  no_clk:
-               on = __raw_readl(pd->base + 0x4) & pd->local_pwr_cfg;
 -              on = readl_relaxed(pd->base + 0x4) & INT_LOCAL_PWR_EN;
++              on = readl_relaxed(pd->base + 0x4) & pd->local_pwr_cfg;
  
                pm_genpd_init(&pd->pd, NULL, !on);
                of_genpd_add_provider_simple(np, &pd->pd);



Best regards,
Krzysztof


The following changes since commit da81593a5a0d93fcca45baa15d0628ba8405695b:

  ARM: s3c24xx: Sort cpufreq tables (2016-06-03 13:54:36 +0200)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-soc-4.8-2

for you to fetch changes up to 1c03274d68f4744afe582fcff1c2e5b1c5c34b5b:

  MAINTAINERS: Extend Samsung SoC entry with S3C/S5P drivers (2016-06-23 08:12:08 +0200)

----------------------------------------------------------------
Samsung mach/soc update for v4.8, part 2:
1. Endian-friendly fixes.
2. Maintainers update.

----------------------------------------------------------------
Ben Dooks (7):
      ARM: EXYNOS: Fixup debug macros for big-endian
      ARM: SAMSUNG: Fixup endian issues in CPU detection
      ARM: EXYNOS: Fixups for big-endian operation
      ARM: EXYNOS: Fixup endian in pm/pmu
      ARM: SAMSUNG: Fixup usage of __raw IO in PM
      ARM: EXYNOS: Fixup for __raw operations in suspend.c
      ARM: SAMSUNG: Fix missing s5p_init_cpu() declaration

Joonyoung Shim (1):
      ARM: EXYNOS: Fix UART address selection for DEBUG_LL

Krzysztof Kozlowski (1):
      MAINTAINERS: Extend Samsung SoC entry with S3C/S5P drivers

 MAINTAINERS                              |  6 ++++--
 arch/arm/include/debug/exynos.S          |  6 +++++-
 arch/arm/include/debug/samsung.S         |  8 ++++++++
 arch/arm/mach-exynos/common.h            |  5 ++---
 arch/arm/mach-exynos/exynos.c            |  1 +
 arch/arm/mach-exynos/firmware.c          | 18 +++++++++---------
 arch/arm/mach-exynos/headsmp.S           |  3 +++
 arch/arm/mach-exynos/platsmp.c           |  4 ++--
 arch/arm/mach-exynos/pm.c                |  6 +++---
 arch/arm/mach-exynos/pm_domains.c        |  6 +++---
 arch/arm/mach-exynos/suspend.c           | 12 ++++++------
 arch/arm/plat-samsung/cpu.c              |  8 ++++----
 arch/arm/plat-samsung/include/plat/cpu.h |  1 +
 arch/arm/plat-samsung/pm-common.c        |  8 ++++----
 14 files changed, 55 insertions(+), 37 deletions(-)

[GIT PULL 1/4] ARM: exynos: Mach updates for v4.8, part 2

[Arnd Bergmann]

On Thursday, June 30, 2016 9:51:12 AM CEST Krzysztof Kozlowski wrote:
> Samsung mach/soc update for v4.8, part 2:
> 1. Endian-friendly fixes.
> 2. Maintainers update.

I noticed that Olof had not sent out an email about this branch,
but I verified that it's actually merged into next/soc.

	Arnd

[GIT PULL 1/4] ARM: exynos: Mach updates for v4.8, part 2

[Krzysztof Kozlowski]

On 07/07/2016 02:31 PM, Arnd Bergmann wrote:
> On Thursday, June 30, 2016 9:51:12 AM CEST Krzysztof Kozlowski wrote:
>> Samsung mach/soc update for v4.8, part 2:
>> 1. Endian-friendly fixes.
>> 2. Maintainers update.
> 
> I noticed that Olof had not sent out an email about this branch,
> but I verified that it's actually merged into next/soc.

Yes, I checked it as well. Thanks for confirmation.

Best regards,
Krzysztof

[GIT PULL 2/4] ARM: exynos: Drivers for v4.8, part 2

[Krzysztof Kozlowski]

Hi,

On top of previous pull.

Best regards,
Krzysztof


The following changes since commit 9479f7cc91879c6ba75e70da41c4c9fe7842b342:

  soc: samsung: pm_domains: Enable COMPILE_TEST for build coverage (2016-05-30 09:12:57 +0200)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-drivers-4.8-2

for you to fetch changes up to 187364b6fcabb9f4bfefcb62fab4fcda019b5810:

  cpufreq: s5pv210: use relaxed IO accesors (2016-06-22 14:00:21 +0200)

----------------------------------------------------------------
Samsung drivers/soc update for v4.8, part 2:
1. Endian-friendly fixes.
2. Make SROMC driver explicitly non-module.

----------------------------------------------------------------
Ben Dooks (2):
      memory: samsung: endian fixes for IO
      cpufreq: s5pv210: use relaxed IO accesors

Paul Gortmaker (1):
      memory: samsung: exynos-srom: make it explicitly non-modular

 drivers/cpufreq/s5pv210-cpufreq.c    | 68 ++++++++++++++++++------------------
 drivers/memory/samsung/exynos-srom.c | 39 +++++++--------------
 2 files changed, 46 insertions(+), 61 deletions(-)

[GIT PULL 2/4] ARM: exynos: Drivers for v4.8, part 2

[Olof Johansson]

On Thu, Jun 30, 2016 at 09:51:13AM +0200, Krzysztof Kozlowski wrote:
> Hi,
> 
> On top of previous pull.
> 
> Best regards,
> Krzysztof
> 
> 
> The following changes since commit 9479f7cc91879c6ba75e70da41c4c9fe7842b342:
> 
>   soc: samsung: pm_domains: Enable COMPILE_TEST for build coverage (2016-05-30 09:12:57 +0200)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-drivers-4.8-2
> 
> for you to fetch changes up to 187364b6fcabb9f4bfefcb62fab4fcda019b5810:
> 
>   cpufreq: s5pv210: use relaxed IO accesors (2016-06-22 14:00:21 +0200)

Merged, thanks.


-Olof

[GIT PULL 3/4] ARM: dts: exynos: MFC driver topic branch for v4.8, part 2

[Krzysztof Kozlowski]

Hi,

Continuation of previous topic branch (tag tags/samsung-drivers-exynos-mfc-4.8).
DTS changes only but this depends on previous work.

Best regards,
Krzysztof


The following changes since commit 96167bd37dd604cbba0aed341765dda8556405b2:

  ARM: dts: exynos: Enable MFC device on Exynos4412 Odroid boards (2016-06-06 09:30:43 +0200)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-drivers-exynos-mfc-4.8-2

for you to fetch changes up to 9f7d27fa1b0b3685471a1a34223a3475943f53e4:

  ARM: dts: exynos: enable MFC device for all boards (2016-06-08 09:46:00 +0200)

----------------------------------------------------------------
Topic branch for Exynos MFC changes for v4.8, part 2:

Replace hardcoded reserved memory ranges with auto-allocated ones
and enable MFC for all boards.

----------------------------------------------------------------
Marek Szyprowski (3):
      ARM: dts: exynos: replace hardcoded reserved memory ranges with auto-allocated ones
      ARM: dts: exynos: move MFC reserved memory regions from boards to .dtsi
      ARM: dts: exynos: enable MFC device for all boards

 arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi  | 14 ++++++++++----
 arch/arm/boot/dts/exynos3250-rinato.dts            |  4 ----
 arch/arm/boot/dts/exynos3250.dtsi                  |  1 -
 arch/arm/boot/dts/exynos4.dtsi                     |  1 -
 arch/arm/boot/dts/exynos4210-origen.dts            |  5 -----
 arch/arm/boot/dts/exynos4210-smdkv310.dts          |  5 -----
 arch/arm/boot/dts/exynos4412-odroid-common.dtsi    |  5 -----
 arch/arm/boot/dts/exynos4412-origen.dts            |  5 -----
 arch/arm/boot/dts/exynos4412-smdk4412.dts          |  5 -----
 arch/arm/boot/dts/exynos5250-arndale.dts           |  4 ----
 arch/arm/boot/dts/exynos5250-smdk5250.dts          |  4 ----
 arch/arm/boot/dts/exynos5250-spring.dts            |  4 ----
 arch/arm/boot/dts/exynos5420-arndale-octa.dts      |  4 ----
 arch/arm/boot/dts/exynos5420-peach-pit.dts         |  4 ----
 arch/arm/boot/dts/exynos5420-smdk5420.dts          |  4 ----
 arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi |  4 ----
 arch/arm/boot/dts/exynos5800-peach-pi.dts          |  4 ----
 17 files changed, 10 insertions(+), 67 deletions(-)

[GIT PULL 3/4] ARM: dts: exynos: MFC driver topic branch for v4.8, part 2

[Olof Johansson]

On Thu, Jun 30, 2016 at 09:51:14AM +0200, Krzysztof Kozlowski wrote:
> Hi,
> 
> Continuation of previous topic branch (tag tags/samsung-drivers-exynos-mfc-4.8).
> DTS changes only but this depends on previous work.
> 
> Best regards,
> Krzysztof
> 
> 
> The following changes since commit 96167bd37dd604cbba0aed341765dda8556405b2:
> 
>   ARM: dts: exynos: Enable MFC device on Exynos4412 Odroid boards (2016-06-06 09:30:43 +0200)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-drivers-exynos-mfc-4.8-2
> 
> for you to fetch changes up to 9f7d27fa1b0b3685471a1a34223a3475943f53e4:
> 
>   ARM: dts: exynos: enable MFC device for all boards (2016-06-08 09:46:00 +0200)
> 
> ----------------------------------------------------------------
> Topic branch for Exynos MFC changes for v4.8, part 2:
> 
> Replace hardcoded reserved memory ranges with auto-allocated ones
> and enable MFC for all boards.

Merged, thanks. Had a minor context conflict with previous DT contents.


-Olof

[GIT PULL 4/4] ARM: defconfig: exynos: Stuff for v4.8, part 2

[Krzysztof Kozlowski]

Hi,

On top of previous pull.

Best regards,
Krzysztof


The following changes since commit 4b388071a2235ed8f05d05d069f5a5a29782a8c5:

  ARM: exynos_defconfig: Save defconfig on current linux-next (2016-06-06 08:36:55 +0200)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-defconfig-4.8-2

for you to fetch changes up to 065069248736926d2a89ff99372270fbf38537f6:

  ARM: multi_v7_defconfig: Enable vivid driver as a module (2016-06-27 08:19:09 +0200)

----------------------------------------------------------------
Samsung defconfig update for v4.8, part 2:
1. Enable Virtual Video Test Driver on nulti_v7 and exynos defconfigs.
   Useful for testing.

----------------------------------------------------------------
Javier Martinez Canillas (2):
      ARM: exynos_defconfig: Enable vivid driver as a module
      ARM: multi_v7_defconfig: Enable vivid driver as a module

 arch/arm/configs/exynos_defconfig   | 2 ++
 arch/arm/configs/multi_v7_defconfig | 2 ++
 2 files changed, 4 insertions(+)

[GIT PULL 4/4] ARM: defconfig: exynos: Stuff for v4.8, part 2

[Olof Johansson]

On Thu, Jun 30, 2016 at 09:51:15AM +0200, Krzysztof Kozlowski wrote:
> Hi,
> 
> On top of previous pull.
> 
> Best regards,
> Krzysztof
> 
> 
> The following changes since commit 4b388071a2235ed8f05d05d069f5a5a29782a8c5:
> 
>   ARM: exynos_defconfig: Save defconfig on current linux-next (2016-06-06 08:36:55 +0200)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-defconfig-4.8-2
> 
> for you to fetch changes up to 065069248736926d2a89ff99372270fbf38537f6:
> 
>   ARM: multi_v7_defconfig: Enable vivid driver as a module (2016-06-27 08:19:09 +0200)
> 
> ----------------------------------------------------------------
> Samsung defconfig update for v4.8, part 2:
> 1. Enable Virtual Video Test Driver on nulti_v7 and exynos defconfigs.
>    Useful for testing.

Merged, thanks.


-Olof