[GIT PULL LTSI-4.9] Second Round of Renesas SoCs and Drivers to v4.12

[GIT PULL LTSI-4.9] Second Round of Renesas SoCs and Drivers to v4.12

[Simon Horman]

Hi,

This is a submission to LTSI-v4.9.

This series is comprised of a backport v4.9 of the rcar-gen3-thermal driver
to its as of v4.12. This was unintentionally omitted from earlier work
submitted for inclusion in LTSI-4.9.

There are 9 patches.

This is based on a merge of:
* Earlier work posted as
  "[GIT PULL LTSI-4.9] Renesas SoCs and Drivers to v4.12"
  and is tagged as tags/backport/v4.9.36/snapshot-to-v4.12-flattened
* v4.9.45

It appears to apply cleanly to an ltsi-4.9 tree generated using
scripts/generate_git


The following changes since commit 89dcb9ecf2d34cba6cba23376651476b0273db5d:

  Merge tag 'v4.9.45' into backport/v4.9.45/snapshot-flattened (2017-08-29 20:34:36 +0200)

are available in the git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas-backport.git tags/backport/v4.9.45/snapshot2-to-v4.12-flattened

for you to fetch changes up to 0d29576c55e2a72e64f36f66ab8dcd279c345942:

  thermal: rcar_gen3_thermal: add suspend and resume support (2017-08-29 20:35:05 +0200)

----------------------------------------------------------------
Second Round of LTSI-v4.9 Preparation for Renesas SoCs to v4.12

Base:
* v4.9.45
* Backport of various components for Renesas SoCs to v4.12

Component backported in this snapshot:
* rcar-gen3-thermal driver

----------------------------------------------------------------
Niklas Söderlund (7):
      thermal: rcar_gen3_thermal: add delay in .thermal_init on r8a7796
      thermal: rcar_gen3_thermal: remove unneeded mutex
      thermal: rcar_gen3_thermal: check that TSC exists before memory allocation
      thermal: rcar_gen3_thermal: record and check number of TSCs found
      thermal: rcar_gen3_thermal: enable hardware interrupts for trip points
      thermal: rcar_gen3_thermal: store device match data in private structure
      thermal: rcar_gen3_thermal: add suspend and resume support

Wolfram Sang (2):
      thermal: rcar_gen3_thermal: Document the R-Car Gen3
      thermal: rcar_gen3_thermal: Add R-Car Gen3 thermal driver

 .../bindings/thermal/rcar-gen3-thermal.txt         |  56 +++
 drivers/thermal/Kconfig                            |   9 +
 drivers/thermal/Makefile                           |   1 +
 drivers/thermal/rcar_gen3_thermal.c                | 504 +++++++++++++++++++++
 4 files changed, 570 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.txt
 create mode 100644 drivers/thermal/rcar_gen3_thermal.c

Re: [LTSI-dev] [GIT PULL LTSI-4.9] Second Round of Renesas SoCs and Drivers to v4.12

[Greg KH]

On Tue, Aug 29, 2017 at 09:08:53PM +0200, Simon Horman wrote:
> Hi,
> 
> This is a submission to LTSI-v4.9.
> 
> This series is comprised of a backport v4.9 of the rcar-gen3-thermal driver
> to its as of v4.12. This was unintentionally omitted from earlier work
> submitted for inclusion in LTSI-4.9.
> 
> There are 9 patches.
> 
> This is based on a merge of:
> * Earlier work posted as
>   "[GIT PULL LTSI-4.9] Renesas SoCs and Drivers to v4.12"
>   and is tagged as tags/backport/v4.9.36/snapshot-to-v4.12-flattened
> * v4.9.45
> 
> It appears to apply cleanly to an ltsi-4.9 tree generated using
> scripts/generate_git
> 
> 
> The following changes since commit 89dcb9ecf2d34cba6cba23376651476b0273db5d:
> 
>   Merge tag 'v4.9.45' into backport/v4.9.45/snapshot-flattened (2017-08-29 20:34:36 +0200)
> 
> are available in the git repository at:
> 
>   https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas-backport.git tags/backport/v4.9.45/snapshot2-to-v4.12-flattened

Hm, I tried to pull this, based on your previous patch, but I get a
merge error:

$ git branch -v
  linux-4.9.y efcfbfb1d8bf Linux 4.9.40
  n1          e3eea6cb6b2f Merge tag 'socfpga_updates_for_v4.9-ltsi' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into n1
  s1          410f9f76e434 Merge tag 'backport/v4.9.36/snapshot-to-v4.10-flattened' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas-backport into s1
  s2          456eeea5eefc Merge tag 'backport/v4.9.36/snapshot-to-v4.11-flattened' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas-backport into s2
  s3          a896e47351b4 Merge tag 'backport/v4.9.36/snapshot-to-v4.12-flattened' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas-backport into s3
* s4          a896e47351b4 Merge tag 'backport/v4.9.36/snapshot-to-v4.12-flattened' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas-backport into s3
$ git pull   https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas-backport.git tags/backport/v4.9.45/snapshot2-to-v4.12-flattened
>From https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas-backport
 * tag                         backport/v4.9.45/snapshot2-to-v4.12-flattened -> FETCH_HEAD
Auto-merging drivers/pinctrl/sh-pfc/pfc-r8a7795.c
CONFLICT (content): Merge conflict in drivers/pinctrl/sh-pfc/pfc-r8a7795.c
Auto-merging arch/x86/platform/intel-mid/device_libs/platform_mrfld_spidev.c
Automatic merge failed; fix conflicts and then commit the result.
$

What am I doing wrong here?

confused,

greg k-h

Re: [LTSI-dev] [GIT PULL LTSI-4.9] Second Round of Renesas SoCs and Drivers to v4.12

[Simon Horman]

On Tue, Sep 05, 2017 at 09:34:31AM +0200, Greg KH wrote:
> On Tue, Aug 29, 2017 at 09:08:53PM +0200, Simon Horman wrote:
> > Hi,
> > 
> > This is a submission to LTSI-v4.9.
> > 
> > This series is comprised of a backport v4.9 of the rcar-gen3-thermal driver
> > to its as of v4.12. This was unintentionally omitted from earlier work
> > submitted for inclusion in LTSI-4.9.
> > 
> > There are 9 patches.
> > 
> > This is based on a merge of:
> > * Earlier work posted as
> >   "[GIT PULL LTSI-4.9] Renesas SoCs and Drivers to v4.12"
> >   and is tagged as tags/backport/v4.9.36/snapshot-to-v4.12-flattened
> > * v4.9.45
> > 
> > It appears to apply cleanly to an ltsi-4.9 tree generated using
> > scripts/generate_git
> > 
> > 
> > The following changes since commit 89dcb9ecf2d34cba6cba23376651476b0273db5d:
> > 
> >   Merge tag 'v4.9.45' into backport/v4.9.45/snapshot-flattened (2017-08-29 20:34:36 +0200)
> > 
> > are available in the git repository at:
> > 
> >   https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas-backport.git tags/backport/v4.9.45/snapshot2-to-v4.12-flattened
> 
> Hm, I tried to pull this, based on your previous patch, but I get a
> merge error:
> 
> $ git branch -v
>   linux-4.9.y efcfbfb1d8bf Linux 4.9.40
>   n1          e3eea6cb6b2f Merge tag 'socfpga_updates_for_v4.9-ltsi' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into n1
>   s1          410f9f76e434 Merge tag 'backport/v4.9.36/snapshot-to-v4.10-flattened' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas-backport into s1
>   s2          456eeea5eefc Merge tag 'backport/v4.9.36/snapshot-to-v4.11-flattened' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas-backport into s2
>   s3          a896e47351b4 Merge tag 'backport/v4.9.36/snapshot-to-v4.12-flattened' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas-backport into s3
> * s4          a896e47351b4 Merge tag 'backport/v4.9.36/snapshot-to-v4.12-flattened' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas-backport into s3
> $ git pull   https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas-backport.git tags/backport/v4.9.45/snapshot2-to-v4.12-flattened
> >From https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas-backport
>  * tag                         backport/v4.9.45/snapshot2-to-v4.12-flattened -> FETCH_HEAD
> Auto-merging drivers/pinctrl/sh-pfc/pfc-r8a7795.c
> CONFLICT (content): Merge conflict in drivers/pinctrl/sh-pfc/pfc-r8a7795.c
> Auto-merging arch/x86/platform/intel-mid/device_libs/platform_mrfld_spidev.c
> Automatic merge failed; fix conflicts and then commit the result.
> $
> 
> What am I doing wrong here?
> 
> confused,

Sorry for the confusion.

I will see about sending patches directly to the ML.