2016-04-27 09:11:19

by Krzysztof Kozlowski

[permalink] [raw]
Subject: [GIT PULL 0/3] ARM: EXYNOS: Second round for v4.7

Hi,

Last round with stuff for v4.7. No external dependencies. Organized as:

1. tags/samsung-dt-4.7-2
2. tags/samsung-dt-exynos-srom-fixup-4.7
DT changes, this is also an internal dependency for SROM driver.
3. tags/samsung-drivers-exynos-srom-4.7
(includes branch #2 above)

Best regards,
Krzysztof


2016-04-27 09:11:24

by Krzysztof Kozlowski

[permalink] [raw]
Subject: [GIT PULL 2/3] ARM: dts: exynos: Fixup for SROM controller (v4.7)

Hi,

The DTS changes for SROM controller (pull 3/3 here) was pulled during
previous cycle. The SROM controller itself was delayed due to
late comments. These late comments introduced changes in the bindings
which now have to be fixed before merging drivers/memory commits.

Best regards,
Krzysztof


The following changes since commit f55532a0c0b8bb6148f4e07853b876ef73bc69ca:

Linux 4.6-rc1 (2016-03-26 16:03:24 -0700)

are available in the git repository at:

kernel.org:/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-dt-exynos-srom-fixup-4.7

for you to fetch changes up to 4d7820b0465a78e6c85a74474b89fb4ab84768ba:

ARM: dts: change SROM node compatible from generic to model specific (2016-04-18 14:18:31 +0200)

----------------------------------------------------------------
DeviceTree changes for new SROM controller driver reached mainline
some time ago, before the driver was accepted (due to very late
comments). However, after these late comments, the driver expects
different bindings so we need to fix the DTS.

----------------------------------------------------------------
Pankaj Dubey (1):
ARM: dts: change SROM node compatible from generic to model specific

arch/arm/boot/dts/exynos4.dtsi | 4 ++--
arch/arm/boot/dts/exynos5.dtsi | 4 ++--
arch/arm/boot/dts/exynos5410-smdk5410.dts | 2 +-
arch/arm/boot/dts/exynos5410.dtsi | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)

2016-04-27 09:12:14

by Krzysztof Kozlowski

[permalink] [raw]
Subject: [GIT PULL 1/3] ARM: dts: exynos: Secound round of DTS for v4.7

Hi,

Few DTS changes, nothing special.

Best regards,
Krzysztof


The following changes since commit 06e520c4f067e7284fded10656acca924123c58e:

ARM: dts: s5p: Fix DTC unit name warnings in SMDKv210 board (2016-04-13 11:14:52 +0200)

are available in the git repository at:

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

for you to fetch changes up to 8691f91b5f5b8687515654b065ebca447ba8b13a:

ARM: dts: exynos: Enable PRNG and SSS for all Exynos4 devices (2016-04-27 10:14:12 +0200)

----------------------------------------------------------------
Secound round of Samsung Device Tree updates and improvements for v4.7:
1. Cleanup regulator bindings on Exynos5420 boards.
2. Support MIC bypass in display path for Exynos5420.
3. Enable PRNG and SSS for all Exynos4 devices.

----------------------------------------------------------------
Chanho Park (1):
ARM: dts: exynos: Add exynos5420-fimd compatible

Krzysztof Kozlowski (2):
ARM: dts: exynos: Remove unsupported s2mps11 regulator bindings from Exynos5420 boards
ARM: dts: exynos: Enable PRNG and SSS for all Exynos4 devices

arch/arm/boot/dts/exynos4.dtsi | 2 --
arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 4 ----
arch/arm/boot/dts/exynos4412-trats2.dts | 8 --------
arch/arm/boot/dts/exynos5420-arndale-octa.dts | 7 -------
arch/arm/boot/dts/exynos5420-smdk5420.dts | 7 -------
arch/arm/boot/dts/exynos5420.dtsi | 1 +
arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 7 -------
7 files changed, 1 insertion(+), 35 deletions(-)

2016-04-27 09:12:41

by Krzysztof Kozlowski

[permalink] [raw]
Subject: [GIT PULL 3/3] ARM: drivers: memory: SROM controller for v4.7

Hi,

Finally, I hope the SROM controller can be split from mach-exynos into
drivers/memory. This is a very long standing patchset. The delay was
caused (twice) by very late comments, including comments for already
acked patch by the acker. Endless work... but I think entire feedback
was addressed (not ignored!).

This includes internal dependency: samsung-dt-exynos-srom-fixup-4.7.

Please, be so kind and pick it up.

Best regards,
Krzysztof


The following changes since commit f55532a0c0b8bb6148f4e07853b876ef73bc69ca:

Linux 4.6-rc1 (2016-03-26 16:03:24 -0700)

are available in the git repository at:

kernel.org:/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-drivers-exynos-srom-4.7

for you to fetch changes up to 8ac2266d88318d348fa5f1dad5b525e0d2c665ef:

memory: samsung: exynos-srom: Add support for bank configuration (2016-04-18 14:25:29 +0200)

----------------------------------------------------------------
Topic branch for Samsung soc/drivers update for v4.7:

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.

----------------------------------------------------------------
Krzysztof Kozlowski (1):
Merge tag 'samsung-dt-exynos-srom-fixup-4.7' into for-v4.7/drivers-memory-exynos-srom

Pankaj Dubey (5):
ARM: dts: change SROM node compatible from generic to model specific
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 (1):
memory: samsung: exynos-srom: Add support for bank configuration

.../bindings/memory-controllers/exynos-srom.txt | 79 +++++++
MAINTAINERS | 1 +
arch/arm/boot/dts/exynos4.dtsi | 4 +-
arch/arm/boot/dts/exynos5.dtsi | 4 +-
arch/arm/boot/dts/exynos5410-smdk5410.dts | 2 +-
arch/arm/boot/dts/exynos5410.dtsi | 4 +-
arch/arm/mach-exynos/Kconfig | 3 +
arch/arm/mach-exynos/exynos.c | 17 --
arch/arm/mach-exynos/include/mach/map.h | 3 -
arch/arm/mach-exynos/regs-srom.h | 53 -----
arch/arm/mach-exynos/suspend.c | 20 +-
arch/arm/plat-samsung/include/plat/map-s5p.h | 1 -
drivers/memory/Kconfig | 1 +
drivers/memory/Makefile | 1 +
drivers/memory/samsung/Kconfig | 13 ++
drivers/memory/samsung/Makefile | 1 +
drivers/memory/samsung/exynos-srom.c | 231 +++++++++++++++++++++
drivers/memory/samsung/exynos-srom.h | 51 +++++
18 files changed, 390 insertions(+), 99 deletions(-)
create mode 100644 Documentation/devicetree/bindings/memory-controllers/exynos-srom.txt
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

2016-04-28 14:07:36

by Arnd Bergmann

[permalink] [raw]
Subject: Re: [GIT PULL 1/3] ARM: dts: exynos: Secound round of DTS for v4.7

On Wednesday 27 April 2016 11:10:54 Krzysztof Kozlowski wrote:
> kernel.org:/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-dt-4.7-2
>

Pulled into next/dt after I figured out that the URL was wrong.

Please check your git configuration to make sure you send an address
I can pull from.

Thanks,

Arnd

2016-04-28 15:41:46

by Arnd Bergmann

[permalink] [raw]
Subject: Re: [GIT PULL 2/3] ARM: dts: exynos: Fixup for SROM controller (v4.7)

On Wednesday 27 April 2016 11:10:55 Krzysztof Kozlowski wrote:
> DeviceTree changes for new SROM controller driver reached mainline
> some time ago, before the driver was accepted (due to very late
> comments). However, after these late comments, the driver expects
> different bindings so we need to fix the DTS.

Pulled into next/dt, thanks!

Arnd

2016-04-28 16:08:10

by Arnd Bergmann

[permalink] [raw]
Subject: Re: [GIT PULL 3/3] ARM: drivers: memory: SROM controller for v4.7

On Wednesday 27 April 2016 11:10:56 Krzysztof Kozlowski wrote:
> Finally, I hope the SROM controller can be split from mach-exynos into
> drivers/memory. This is a very long standing patchset. The delay was
> caused (twice) by very late comments, including comments for already
> acked patch by the acker. Endless work... but I think entire feedback
> was addressed (not ignored!).
>
> This includes internal dependency: samsung-dt-exynos-srom-fixup-4.7.
>
> Please, be so kind and pick it up.
>

Pulled into next/drivers, thanks!

Arnd

2016-04-28 19:04:36

by Krzysztof Kozlowski

[permalink] [raw]
Subject: Re: [GIT PULL 1/3] ARM: dts: exynos: Secound round of DTS for v4.7

On Thu, Apr 28, 2016 at 04:06:54PM +0200, Arnd Bergmann wrote:
> On Wednesday 27 April 2016 11:10:54 Krzysztof Kozlowski wrote:
> > kernel.org:/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-dt-4.7-2
> >
>
> Pulled into next/dt after I figured out that the URL was wrong.
>
> Please check your git configuration to make sure you send an address
> I can pull from.

Ah, indeed, sorry for that. I still did not automate entirely this process
so apparently I am doing simple mistakes. I'll be more carefull next
time.

Best regards,
Krzysztof

2016-04-28 20:38:38

by Arnd Bergmann

[permalink] [raw]
Subject: Re: [GIT PULL 1/3] ARM: dts: exynos: Secound round of DTS for v4.7

On Thursday 28 April 2016 21:04:28 Krzysztof Kozlowski wrote:
> On Thu, Apr 28, 2016 at 04:06:54PM +0200, Arnd Bergmann wrote:
> > On Wednesday 27 April 2016 11:10:54 Krzysztof Kozlowski wrote:
> > > kernel.org:/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-dt-4.7-2
> > >
> >
> > Pulled into next/dt after I figured out that the URL was wrong.
> >
> > Please check your git configuration to make sure you send an address
> > I can pull from.
>
> Ah, indeed, sorry for that. I still did not automate entirely this process
> so apparently I am doing simple mistakes. I'll be more carefull next
> time.

Ok. The trick is to have a separate 'url' and 'pushurl' entry in your
git config, like

[remote "origin"]
url = git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
pushurl = git+ssh://[email protected]/pub/scm/linux/kernel/git/arm/arm-soc.git

That way, 'git request-pull' will pick the first one, but 'git push' will
use the second.

Arnd

2016-04-29 12:01:12

by Krzysztof Kozlowski

[permalink] [raw]
Subject: Re: [GIT PULL 1/3] ARM: dts: exynos: Secound round of DTS for v4.7

On 04/28/2016 10:37 PM, Arnd Bergmann wrote:
> On Thursday 28 April 2016 21:04:28 Krzysztof Kozlowski wrote:
>> On Thu, Apr 28, 2016 at 04:06:54PM +0200, Arnd Bergmann wrote:
>>> On Wednesday 27 April 2016 11:10:54 Krzysztof Kozlowski wrote:
>>>> kernel.org:/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-dt-4.7-2
>>>>
>>>
>>> Pulled into next/dt after I figured out that the URL was wrong.
>>>
>>> Please check your git configuration to make sure you send an address
>>> I can pull from.
>>
>> Ah, indeed, sorry for that. I still did not automate entirely this process
>> so apparently I am doing simple mistakes. I'll be more carefull next
>> time.
>
> Ok. The trick is to have a separate 'url' and 'pushurl' entry in your
> git config, like
>
> [remote "origin"]
> url = git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
> pushurl = git+ssh://[email protected]/pub/scm/linux/kernel/git/arm/arm-soc.git
>
> That way, 'git request-pull' will pick the first one, but 'git push' will
> use the second.

I was using two remotes but your config is easier.

Thanks for hint,
Krzysztof