[PATCH linux v4 00/20] FSI device driver introduction

[Christopher Bostic]

On Mon, Oct 17, 2016 at 8:56 PM, Jeremy Kerr <jk at ozlabs.org> wrote:
> Hi Chris,
>
>>> Sounds like a plan -Thanks
>>
>> Excellent! I'll get that done today, and let you know when my branch is
>> ready to re-pull.
>
> OK, done. The branch at:
>
>   https://github.com/jk-ozlabs/linux/tree/openbmc/fsi
>
> Now has an updated base set of commits for you to rebase onto. To do
> that:
>
>    git rebase -i --onto 2b5b3ae2 <SHA>
>
> Where <SHA> is the start of your local changes in your tree (ie,
> corresponding to 16/20). In that rebase, you'll probably want to pick
> 111f387 (my skeleton GPIO driver), which should still be an object in
> your tree, and squash 18/20 into that.
>
> Something like this for the rebase plan:
>
>   pick cfa927f fsi: Add empty fsi bus definitions
>   pick fd18ef2 fsi: Add device & driver definitions
>   pick 05d2f6d fsi: add driver to device matches
>   pick 918007d fsi: Add fsi master definition
>   pick 1493896 fsi: Add fake master driver
>   pick cd8c30f fsi: enable debug
>   pick 287b519 fsi: Add slave definition
>   pick db6d868 fsi: Add empty master scan
>   pick 60e3513 fsi: Add crc4 helpers

Hi Jeremy,

Not sure what may have happened but looks like the crc4 helper
commit 60e3513 has a build issue.

Changes made to correct:
* Added a semi colon for function prototype in fsi-master.h
* Removed the open bracket in for loop of fsi_crc4
* Renamed two instances of check_crc4 to check_crc4_u32

I had made these updates in the last patch round (v4) but I figured
you may want to have those updates in place prior to me applying 16-20.

Thanks,
Chris

>   pick 57314b2 fsi: Implement slave initialisation
>   pick 47a25ff fsi: scan slaves & register devices
>   pick 2b5b3ae fsi: Add device read/write/peek functions
>   pick <16/20> drivers/fsi: Set up links for slave communication
>   pick <17/20> drivers/fsi: Set slave SMODE to init communications
>   pick 111f387 fsi: Add GPIO master driver
>   squash <18/20> drivers/fsi: Add GPIO FSI master functionality
>   pick <19/20> drivers/fsi: Add client driver register utilities
>   pick <20/20> drivers/fsi: Add SCOM client driver
>
> Where <xx/20> is the actual SHA of the commit, of course. These will
> automatically be provided by the rebase.
>
> Then, when squashing the GPIO patch, set the author to you, keep my
> signed-off-by, and reword the commit message to the entire change.
>
> Cheers,
>
>
> Jeremy