linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [GIT PULL] ARM: EXYNOS: dts for 4.6, 2nd pull
@ 2016-03-01  9:37 Krzysztof Kozlowski
  2016-03-01  9:37 ` [GIT PULL] ARM64: EXYNOS: defconfig for 4.6 Krzysztof Kozlowski
                   ` (2 more replies)
  0 siblings, 3 replies; 8+ messages in thread
From: Krzysztof Kozlowski @ 2016-03-01  9:37 UTC (permalink / raw)
  To: linux-arm-kernel

Hi,

Second pull request with DT changes for v4.6.
This is on top of previous DT changes.

Best regards,
Krzysztof


The following changes since commit 36a0282a41493400428d7df8c99701fb4ee344c2:

  ARM: dts: Replace legacy *,wakeup property with wakeup-source for exynos boards (2016-01-29 09:09:49 +0900)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-dt-4.6-2

for you to fetch changes up to 52e8e5927050055f2b26ce5f0eaa6f66377145f3:

  ARM: dts: exynos: Don't overheat the Odroid XU3-Lite on high load (2016-03-01 18:04:00 +0900)

----------------------------------------------------------------
Samsung DeviceTree updates and improvements for v4.6, second round:
1. Split common reboot/poweroff node to separate DTSI.
2. Don't overheat Odroid XU3 by cooling CPU with cpufreq.

----------------------------------------------------------------
Javier Martinez Canillas (1):
      ARM: dts: exynos: Move syscon reboot/poweroff to common dtsi

Krzysztof Kozlowski (3):
      ARM: dts: exynos: Add cooling levels for Exynos5420 CPUs
      ARM: dts: exynos: Add cooling levels for Exynos5422/5800 CPUs
      ARM: dts: exynos: Don't overheat the Odroid XU3-Lite on high load

 arch/arm/boot/dts/exynos-syscon-restart.dtsi  | 27 ++++++++++++++++
 arch/arm/boot/dts/exynos3250.dtsi             | 15 +--------
 arch/arm/boot/dts/exynos4.dtsi                | 15 +--------
 arch/arm/boot/dts/exynos5.dtsi                | 15 +--------
 arch/arm/boot/dts/exynos5410.dtsi             | 15 +--------
 arch/arm/boot/dts/exynos5420-cpus.dtsi        | 24 ++++++++++++++
 arch/arm/boot/dts/exynos5422-cpu-thermal.dtsi | 46 ++++++++++++++++++++++++++-
 arch/arm/boot/dts/exynos5422-cpus.dtsi        | 24 ++++++++++++++
 8 files changed, 124 insertions(+), 57 deletions(-)
 create mode 100644 arch/arm/boot/dts/exynos-syscon-restart.dtsi

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [GIT PULL] ARM64: EXYNOS: defconfig for 4.6
  2016-03-01  9:37 [GIT PULL] ARM: EXYNOS: dts for 4.6, 2nd pull Krzysztof Kozlowski
@ 2016-03-01  9:37 ` Krzysztof Kozlowski
  2016-03-02 22:16   ` Arnd Bergmann
  2016-03-01  9:37 ` [GIT PULL] ARM: EXYNOS: SROM driver for v4.6, 2nd try Krzysztof Kozlowski
  2016-03-02 20:17 ` [GIT PULL] ARM: EXYNOS: dts for 4.6, 2nd pull Arnd Bergmann
  2 siblings, 1 reply; 8+ messages in thread
From: Krzysztof Kozlowski @ 2016-03-01  9:37 UTC (permalink / raw)
  To: linux-arm-kernel

Hi,

Defconfig changes for v4.6, for ARM64 (second pull request for defconfig).
This is on top of previous defconfig changes.

This may conflict with other changes to arch/arm64/configs/defconfig.
Just add everything.

Best regards,
Krzysztof


The following changes since commit 5d51f1dde207f2d5d43158da75c6608f7bfcec03:

  ARM: multi_v7_defconfig: Remove MAX77802 RTC Kconfig symbol (2016-02-05 09:11:32 +0900)

are available in the git repository at:

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

for you to fetch changes up to 6bb8371893889ba877652107ae59eecb8d86edc4:

  arm64: defconfig: Enable Samsung MFD and related configs (2016-03-01 17:55:03 +0900)

----------------------------------------------------------------
ARM64 defconfig changes for Exynos based boards for v4.6:
1. We want thermal for Exynos7 TMU unit to monitor the temperature.
2. Enable the drivers for PMIC used on Exynos7-based Espresso board.

----------------------------------------------------------------
Alim Akhtar (2):
      arm64: defconfig: Enable exynos thermal config
      arm64: defconfig: Enable Samsung MFD and related configs

 arch/arm64/configs/defconfig | 6 ++++++
 1 file changed, 6 insertions(+)

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [GIT PULL] ARM: EXYNOS: SROM driver for v4.6, 2nd try
  2016-03-01  9:37 [GIT PULL] ARM: EXYNOS: dts for 4.6, 2nd pull Krzysztof Kozlowski
  2016-03-01  9:37 ` [GIT PULL] ARM64: EXYNOS: defconfig for 4.6 Krzysztof Kozlowski
@ 2016-03-01  9:37 ` Krzysztof Kozlowski
  2016-03-03  0:04   ` Krzysztof Kozlowski
  2016-03-02 20:17 ` [GIT PULL] ARM: EXYNOS: dts for 4.6, 2nd pull Arnd Bergmann
  2 siblings, 1 reply; 8+ messages in thread
From: Krzysztof Kozlowski @ 2016-03-01  9:37 UTC (permalink / raw)
  To: linux-arm-kernel

Hi,


After Olof comments, second pull request with movement of SROM code
to separate driver - under drivers/memory/samsung (more are planned for
that directory).

This depends on (included here):
1. tag samsung-dt-srom-4.6: SROM-DT changes, merged already to arm-soc,
2. tag samsung-soc-4.6-2: next/soc changes, sent few days ago, not merged yet.

This may conflict in the future (in linux-next or Linus) around
drivers/memory/Kconfig with iommu tree. Just add all the changes.


The diff at the end contains both samsung-soc-4.6-2 and this stuff.
To make finding changes easier, below you will find difference between
this tag and samsung-soc-4.6-2:

----------------------------------------------------------------
Pankaj Dubey (4):
      dt-bindings: EXYNOS: Add exynos-srom device tree binding
      memory: Add support for Exynos SROM driver
      MAINTAINERS: Add maintainers entry for drivers/memory/samsung
      ARM: EXYNOS: Remove SROM related register settings from mach-exynos

Pavel Fedin (2):
      dt-bindings: EXYNOS: Describe SROMc configuration
      memory: samsung: exynos-srom: Add support for bank configuration
----------------------------------------------------------------


Best regards,
Krzysztof


The following changes since commit d2deef6c61e65d1e0cee40c1d74fa99007da8c84:

  ARM: dts: Add SROM to exynos5410 (2016-01-25 10:32:07 +0900)

are available in the git repository at:

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

for you to fetch changes up to dbdc0c61333e1b0c42c9ea7e97faaaed3ded14a8:

  memory: samsung: exynos-srom: Add support for bank configuration (2016-02-29 13:12:48 +0900)

----------------------------------------------------------------
Topic branch for Samsung soc/drivers update for 4.6.

This moves Samsung SROM controller code from arm/mach-exynos into to
separate driver under drivers/memory/samsung. In the future this driver
will be re-used on ARM64 Exynos platform.

More drivers are planned for drivers/memory/samsung.

----------------------------------------------------------------
Arnd Bergmann (1):
      ARM: s3c24xx: Avoid warning for inb/outb

Bartlomiej Zolnierkiewicz (2):
      ARM: EXYNOS: Use generic cpufreq driver for Exynos5420
      ARM: EXYNOS: Use generic cpufreq driver for Exynos5422/5800

Geliang Tang (1):
      ARM: plat-samsung: use to_platform_device()

Krzysztof Kozlowski (3):
      drivers: soc: samsung: Enable COMPILE_TEST
      Merge tag 'samsung-dt-srom-4.6' into for-v4.6/drivers-soc-exynos-srom-2
      Merge tag 'samsung-soc-4.6-2' into for-v4.6/drivers-soc-exynos-srom-2

Masahiro Yamada (1):
      ARM: s3c64xx: use "depends on" instead of "if" after prompt

Pankaj Dubey (16):
      ARM: EXYNOS: Remove unused static mapping of CMU for exynos5
      ARM: EXYNOS: Code cleanup in map.h
      ARM: EXYNOS: Correct header comment in Kconfig file
      ARM: EXYNOS: Move pmu specific headers under "linux/soc/samsung"
      ARM: EXYNOS: Split up exynos3250 SoC specific PMU data
      ARM: EXYNOS: Split up exynos4 SoC specific PMU data
      ARM: EXYNOS: Split up exynos5250 SoC specific PMU data
      ARM: EXYNOS: Split up exynos5420 SoC specific PMU data
      drivers: soc: Add support for Exynos PMU driver
      MAINTAINERS: Add maintainers entry for drivers/soc/samsung
      ARM: EXYNOS: Cleanup header files inclusion
      ARM: SAMSUNG: Remove unused register offset definition
      dt-bindings: EXYNOS: Add exynos-srom device tree binding
      memory: Add support for Exynos SROM driver
      MAINTAINERS: Add maintainers entry for drivers/memory/samsung
      ARM: EXYNOS: Remove SROM related register settings from mach-exynos

Pavel Fedin (2):
      dt-bindings: EXYNOS: Describe SROMc configuration
      memory: samsung: exynos-srom: Add support for bank configuration

 .../bindings/memory-controllers/exynos-srom.txt    |  81 ++
 MAINTAINERS                                        |   2 +
 arch/arm/mach-exynos/Kconfig                       |   7 +-
 arch/arm/mach-exynos/Makefile                      |   2 +-
 arch/arm/mach-exynos/common.h                      |   1 -
 arch/arm/mach-exynos/exynos.c                      |  34 +-
 arch/arm/mach-exynos/firmware.c                    |   2 -
 arch/arm/mach-exynos/include/mach/map.h            |  17 +-
 arch/arm/mach-exynos/mcpm-exynos.c                 |   2 +-
 arch/arm/mach-exynos/platsmp.c                     |   3 +-
 arch/arm/mach-exynos/pm.c                          |   8 +-
 arch/arm/mach-exynos/pmu.c                         | 967 ---------------------
 arch/arm/mach-exynos/regs-srom.h                   |  53 --
 arch/arm/mach-exynos/s5p-dev-mfc.c                 |   1 -
 arch/arm/mach-exynos/suspend.c                     |  24 +-
 arch/arm/mach-s3c24xx/include/mach/io.h            |   2 +-
 arch/arm/mach-s3c24xx/include/mach/map.h           |  11 -
 arch/arm/mach-s3c64xx/Kconfig                      |   3 +-
 arch/arm/plat-samsung/adc.c                        |   6 +-
 arch/arm/plat-samsung/include/plat/map-s3c.h       |   4 -
 arch/arm/plat-samsung/include/plat/map-s5p.h       |   6 -
 drivers/memory/Kconfig                             |   1 +
 drivers/memory/Makefile                            |   1 +
 drivers/memory/samsung/Kconfig                     |  13 +
 drivers/memory/samsung/Makefile                    |   1 +
 drivers/memory/samsung/exynos-srom.c               | 232 +++++
 drivers/memory/samsung/exynos-srom.h               |  51 ++
 drivers/soc/Kconfig                                |   1 +
 drivers/soc/Makefile                               |   1 +
 drivers/soc/samsung/Kconfig                        |  13 +
 drivers/soc/samsung/Makefile                       |   2 +
 drivers/soc/samsung/exynos-pmu.c                   | 141 +++
 drivers/soc/samsung/exynos-pmu.h                   |  44 +
 drivers/soc/samsung/exynos3250-pmu.c               | 175 ++++
 drivers/soc/samsung/exynos4-pmu.c                  | 222 +++++
 drivers/soc/samsung/exynos5250-pmu.c               | 195 +++++
 drivers/soc/samsung/exynos5420-pmu.c               | 280 ++++++
 .../linux/soc/samsung}/exynos-pmu.h                |   6 +-
 .../linux/soc/samsung/exynos-regs-pmu.h            |   6 +-
 39 files changed, 1489 insertions(+), 1132 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/memory-controllers/exynos-srom.txt
 delete mode 100644 arch/arm/mach-exynos/pmu.c
 delete mode 100644 arch/arm/mach-exynos/regs-srom.h
 create mode 100644 drivers/memory/samsung/Kconfig
 create mode 100644 drivers/memory/samsung/Makefile
 create mode 100644 drivers/memory/samsung/exynos-srom.c
 create mode 100644 drivers/memory/samsung/exynos-srom.h
 create mode 100644 drivers/soc/samsung/Kconfig
 create mode 100644 drivers/soc/samsung/Makefile
 create mode 100644 drivers/soc/samsung/exynos-pmu.c
 create mode 100644 drivers/soc/samsung/exynos-pmu.h
 create mode 100644 drivers/soc/samsung/exynos3250-pmu.c
 create mode 100644 drivers/soc/samsung/exynos4-pmu.c
 create mode 100644 drivers/soc/samsung/exynos5250-pmu.c
 create mode 100644 drivers/soc/samsung/exynos5420-pmu.c
 rename {arch/arm/mach-exynos => include/linux/soc/samsung}/exynos-pmu.h (81%)
 rename arch/arm/mach-exynos/regs-pmu.h => include/linux/soc/samsung/exynos-regs-pmu.h (99%)

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [GIT PULL] ARM: EXYNOS: dts for 4.6, 2nd pull
  2016-03-01  9:37 [GIT PULL] ARM: EXYNOS: dts for 4.6, 2nd pull Krzysztof Kozlowski
  2016-03-01  9:37 ` [GIT PULL] ARM64: EXYNOS: defconfig for 4.6 Krzysztof Kozlowski
  2016-03-01  9:37 ` [GIT PULL] ARM: EXYNOS: SROM driver for v4.6, 2nd try Krzysztof Kozlowski
@ 2016-03-02 20:17 ` Arnd Bergmann
  2 siblings, 0 replies; 8+ messages in thread
From: Arnd Bergmann @ 2016-03-02 20:17 UTC (permalink / raw)
  To: linux-arm-kernel

On Tuesday 01 March 2016 18:37:20 Krzysztof Kozlowski wrote:
> 
> Second pull request with DT changes for v4.6.
> This is on top of previous DT changes

Pulled into next/dt, thanks!

	Arnd

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [GIT PULL] ARM64: EXYNOS: defconfig for 4.6
  2016-03-01  9:37 ` [GIT PULL] ARM64: EXYNOS: defconfig for 4.6 Krzysztof Kozlowski
@ 2016-03-02 22:16   ` Arnd Bergmann
  0 siblings, 0 replies; 8+ messages in thread
From: Arnd Bergmann @ 2016-03-02 22:16 UTC (permalink / raw)
  To: linux-arm-kernel

On Tuesday 01 March 2016 18:37:21 Krzysztof Kozlowski wrote:
> ARM64 defconfig changes for Exynos based boards for v4.6:
> 1. We want thermal for Exynos7 TMU unit to monitor the temperature.
> 2. Enable the drivers for PMIC used on Exynos7-based Espresso board.
> 

Pulled into next/arm64, thanks!

	Arnd

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [GIT PULL] ARM: EXYNOS: SROM driver for v4.6, 2nd try
  2016-03-01  9:37 ` [GIT PULL] ARM: EXYNOS: SROM driver for v4.6, 2nd try Krzysztof Kozlowski
@ 2016-03-03  0:04   ` Krzysztof Kozlowski
  2016-03-03 13:11     ` Arnd Bergmann
  0 siblings, 1 reply; 8+ messages in thread
From: Krzysztof Kozlowski @ 2016-03-03  0:04 UTC (permalink / raw)
  To: linux-arm-kernel

On 01.03.2016 18:37, Krzysztof Kozlowski wrote:
> Hi,
> 
> 
> After Olof comments, second pull request with movement of SROM code
> to separate driver - under drivers/memory/samsung (more are planned for
> that directory).
> 
> This depends on (included here):
> 1. tag samsung-dt-srom-4.6: SROM-DT changes, merged already to arm-soc,
> 2. tag samsung-soc-4.6-2: next/soc changes, sent few days ago, not merged yet.
> 
> This may conflict in the future (in linux-next or Linus) around
> drivers/memory/Kconfig with iommu tree. Just add all the changes.
> 
> 
> The diff at the end contains both samsung-soc-4.6-2 and this stuff.
> To make finding changes easier, below you will find difference between
> this tag and samsung-soc-4.6-2:

I see you did not pull this yet so can you wait a little bit? Rob
Herring posted some comments on bindings so this might be revisited...

This is an unlucky patchset...

Best regards,
Krzysztof

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [GIT PULL] ARM: EXYNOS: SROM driver for v4.6, 2nd try
  2016-03-03  0:04   ` Krzysztof Kozlowski
@ 2016-03-03 13:11     ` Arnd Bergmann
  2016-03-13  1:16       ` Olof Johansson
  0 siblings, 1 reply; 8+ messages in thread
From: Arnd Bergmann @ 2016-03-03 13:11 UTC (permalink / raw)
  To: linux-arm-kernel

On Thursday 03 March 2016 09:04:54 Krzysztof Kozlowski wrote:
> On 01.03.2016 18:37, Krzysztof Kozlowski wrote:
> > Hi,
> > 
> > 
> > After Olof comments, second pull request with movement of SROM code
> > to separate driver - under drivers/memory/samsung (more are planned for
> > that directory).
> > 
> > This depends on (included here):
> > 1. tag samsung-dt-srom-4.6: SROM-DT changes, merged already to arm-soc,
> > 2. tag samsung-soc-4.6-2: next/soc changes, sent few days ago, not merged yet.
> > 
> > This may conflict in the future (in linux-next or Linus) around
> > drivers/memory/Kconfig with iommu tree. Just add all the changes.
> > 
> > 
> > The diff at the end contains both samsung-soc-4.6-2 and this stuff.
> > To make finding changes easier, below you will find difference between
> > this tag and samsung-soc-4.6-2:
> 
> I see you did not pull this yet so can you wait a little bit? Rob
> Herring posted some comments on bindings so this might be revisited...
> 
> This is an unlucky patchset...

It was a bit late last night, and I didn't want to check that the
dependencies were correct. I also saw that you had discussed these
contents with Olof before, but didn't follow the thread there, so
I was hoping that Olof could get back to it and check that his
concerns are all addressed before picking it up.

	Arnd

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [GIT PULL] ARM: EXYNOS: SROM driver for v4.6, 2nd try
  2016-03-03 13:11     ` Arnd Bergmann
@ 2016-03-13  1:16       ` Olof Johansson
  0 siblings, 0 replies; 8+ messages in thread
From: Olof Johansson @ 2016-03-13  1:16 UTC (permalink / raw)
  To: linux-arm-kernel

On Thu, Mar 03, 2016 at 02:11:32PM +0100, Arnd Bergmann wrote:
> On Thursday 03 March 2016 09:04:54 Krzysztof Kozlowski wrote:
> > On 01.03.2016 18:37, Krzysztof Kozlowski wrote:
> > > Hi,
> > > 
> > > 
> > > After Olof comments, second pull request with movement of SROM code
> > > to separate driver - under drivers/memory/samsung (more are planned for
> > > that directory).
> > > 
> > > This depends on (included here):
> > > 1. tag samsung-dt-srom-4.6: SROM-DT changes, merged already to arm-soc,
> > > 2. tag samsung-soc-4.6-2: next/soc changes, sent few days ago, not merged yet.
> > > 
> > > This may conflict in the future (in linux-next or Linus) around
> > > drivers/memory/Kconfig with iommu tree. Just add all the changes.
> > > 
> > > 
> > > The diff at the end contains both samsung-soc-4.6-2 and this stuff.
> > > To make finding changes easier, below you will find difference between
> > > this tag and samsung-soc-4.6-2:
> > 
> > I see you did not pull this yet so can you wait a little bit? Rob
> > Herring posted some comments on bindings so this might be revisited...
> > 
> > This is an unlucky patchset...
> 
> It was a bit late last night, and I didn't want to check that the
> dependencies were correct. I also saw that you had discussed these
> contents with Olof before, but didn't follow the thread there, so
> I was hoping that Olof could get back to it and check that his
> concerns are all addressed before picking it up.

Hi,

I've merged the other SoC branches now (that were respun without this SROM
contents). I think it's safe given the feedback from Rob to wait with this
driver for the next cycle. That way the dependencies are gone too since they
will have been merged.


-Olof

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2016-03-13  1:16 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-01  9:37 [GIT PULL] ARM: EXYNOS: dts for 4.6, 2nd pull Krzysztof Kozlowski
2016-03-01  9:37 ` [GIT PULL] ARM64: EXYNOS: defconfig for 4.6 Krzysztof Kozlowski
2016-03-02 22:16   ` Arnd Bergmann
2016-03-01  9:37 ` [GIT PULL] ARM: EXYNOS: SROM driver for v4.6, 2nd try Krzysztof Kozlowski
2016-03-03  0:04   ` Krzysztof Kozlowski
2016-03-03 13:11     ` Arnd Bergmann
2016-03-13  1:16       ` Olof Johansson
2016-03-02 20:17 ` [GIT PULL] ARM: EXYNOS: dts for 4.6, 2nd pull Arnd Bergmann

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).