[GIT,PULL] ARM: mediatek: soc driver updates for v4.18

Message ID bd033549-4998-e376-eb92-16111ec71a07@gmail.com
State New
Headers show
Series
  • [GIT,PULL] ARM: mediatek: soc driver updates for v4.18
Related show

Pull-request

https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git/

Message

Matthias Brugger May 14, 2018, 11:32 a.m.
Hi Arnd and Olof,

Below the commits for mediatek soc drivers.
Please beware that we need the regmap-ktime-fix [1] from Mark Browns static tag.
I merged that into my branch, but I wanted to let you know, so that you don't
hit any breakage when pulling in my branch.

Regards,
Matthias

[1] https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
tags/regmap-ktime-fix

---

The following changes since commit 60cc43fc888428bb2f18f08997432d426a243338:

  Linux 4.17-rc1 (2018-04-15 18:24:20 -0700)

are available in the Git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git/
tags/v4.17-next-soc

for you to fetch changes up to 0afd32c6bb59e41b6692dec4473efaffffcad67b:

  Merge commit 'f15cd6d99198e9c15229aefec639a34a6e8174c6' into
v.4.17-next/soc-test (2018-05-14 12:22:03 +0200)

----------------------------------------------------------------
- use timeout helpers for scpsys and infracfg drivers
- use of_device_get_match_data in pmic wrapper and scpsys

----------------------------------------------------------------
Matthias Brugger (1):
      Merge commit 'f15cd6d99198e9c15229aefec639a34a6e8174c6' into
v.4.17-next/soc-test

Ryder Lee (1):
      soc: mediatek: use of_device_get_match_data()

Sean Wang (6):
      soc: mediatek: reuse read[l,x]_poll_timeout helpers
      regmap: include <linux/ktime.h> from include/linux/regmap.h
      soc: mediatek: reuse regmap_read_poll_timeout helpers
      soc: mediatek: introduce a CAPS flag for scp_domain_data
      soc: mediatek: add a fixed wait for SRAM stable
      soc: mediatek: remove unneeded semicolon

 drivers/soc/mediatek/mtk-infracfg.c  |  46 +++-------
 drivers/soc/mediatek/mtk-pmic-wrap.c |  13 +--
 drivers/soc/mediatek/mtk-scpsys.c    | 167 ++++++++++++++---------------------
 include/linux/regmap.h               |   1 +
 4 files changed, 83 insertions(+), 144 deletions(-)

Comments

Olof Johansson May 15, 2018, 8:43 p.m. | #1
On Mon, May 14, 2018 at 01:32:49PM +0200, Matthias Brugger wrote:
> Hi Arnd and Olof,
> 
> Below the commits for mediatek soc drivers.
> Please beware that we need the regmap-ktime-fix [1] from Mark Browns static tag.
> I merged that into my branch, but I wanted to let you know, so that you don't
> hit any breakage when pulling in my branch.

Great, and thanks for mentioning it.

> 
> Regards,
> Matthias
> 
> [1] https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
> tags/regmap-ktime-fix
> 
> ---
> 
> The following changes since commit 60cc43fc888428bb2f18f08997432d426a243338:
> 
>   Linux 4.17-rc1 (2018-04-15 18:24:20 -0700)
> 
> are available in the Git repository at:
> 
>   https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git/
> tags/v4.17-next-soc
> 
> for you to fetch changes up to 0afd32c6bb59e41b6692dec4473efaffffcad67b:
> 
>   Merge commit 'f15cd6d99198e9c15229aefec639a34a6e8174c6' into
> v.4.17-next/soc-test (2018-05-14 12:22:03 +0200)

Merged into next/drivers. Thanks!


-Olof
Mark Brown May 17, 2018, 4:46 a.m. | #2
On Mon, May 14, 2018 at 01:32:49PM +0200, Matthias Brugger wrote:

> ----------------------------------------------------------------
> Matthias Brugger (1):
>       Merge commit 'f15cd6d99198e9c15229aefec639a34a6e8174c6' into
> v.4.17-next/soc-test

There is a signed tag for this - please don't ever pull anything from me
without a signed tag, while I try to avoid rewriting history it does
sometimes happen but if I've made a signed tag part of that is me saying
I know other people might've merged the commit.
Matthias Brugger May 18, 2018, 3:11 p.m. | #3
On 17/05/18 06:46, Mark Brown wrote:
> On Mon, May 14, 2018 at 01:32:49PM +0200, Matthias Brugger wrote:
> 
>> ----------------------------------------------------------------
>> Matthias Brugger (1):
>>        Merge commit 'f15cd6d99198e9c15229aefec639a34a6e8174c6' into
>> v.4.17-next/soc-test
> 
> There is a signed tag for this - please don't ever pull anything from me
> without a signed tag, while I try to avoid rewriting history it does
> sometimes happen but if I've made a signed tag part of that is me saying
> I know other people might've merged the commit.
> 

You are right I got confused about this.
Anrd, Olof do you want me to resubmit?

Regards,
Matthias
Mark Brown May 18, 2018, 3:13 p.m. | #4
On Fri, May 18, 2018 at 05:11:32PM +0200, Matthias Brugger wrote:
> On 17/05/18 06:46, Mark Brown wrote:
> > On Mon, May 14, 2018 at 01:32:49PM +0200, Matthias Brugger wrote:

> > > ----------------------------------------------------------------
> > > Matthias Brugger (1):
> > >        Merge commit 'f15cd6d99198e9c15229aefec639a34a6e8174c6' into
> > > v.4.17-next/soc-test

> > There is a signed tag for this - please don't ever pull anything from me
> > without a signed tag, while I try to avoid rewriting history it does
> > sometimes happen but if I've made a signed tag part of that is me saying
> > I know other people might've merged the commit.

> You are right I got confused about this.
> Anrd, Olof do you want me to resubmit?

I'm OK with leaving things as is - that was more a request for the
future than a request to rewrite history (if it's already been merged).