Skip to contentSkip to conversation

chrome-platform updates for v5.1

GIT PULL Merged Benson Leung 3 participants 4 messages Mar 12, 2019

lore
Share & tools
lore
#0 lore raw

Hi Linus,

The following changes since commit 49a57857aeea06ca831043acbb0fa5e0f50602fd:

Linux 5.0-rc3 (2019-01-21 13:14:44 +1300)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git tags/tag-chrome-platform-for-v5.1

for you to fetch changes up to 2794449576a6024e203eca5cc2c1a3ae33102b8e:

platform/chrome: fix wilco-ec dependencies (2019-03-05 11:35:46 +0100)

----------------------------------------------------------------
chrome platform changes for v5.1

1. SPDX identifier cleanup for platform/chrome
2. Cleanup series between mfd and chrome/platform, moving
cros-ec attributes from mfd/cros_ec_dev to sub-drivers in platform/chrome.
3. Wilco EC driver
4. Maintainership change to new group repository.

----------------------------------------------------------------
Arnd Bergmann (1):
platform/chrome: fix wilco-ec dependencies

Enric Balletbo i Serra (20):
mfd / platform: cros_ec: Use devm_mfd_add_devices
mfd / platform: cros_ec: Move lightbar attributes to its own driver mfd / platform: cros_ec: Move vbc attributes to its own driver
mfd / platform: cros_ec: Move debugfs attributes to its own driver
mfd / platform: cros_ec: Move device sysfs attributes to its own driver mfd / platform: cros_ec_vbc: Instantiate only if the EC has a VBC NVRAM platform/chrome: cros_ec_lightbar: Instantiate only if the EC has a lightbar platform/chrome: cromeos_pstore: switch to SPDX identifier platform/chrome: cros_ec_debugfs: switch to SPDX identifier platform/chrome: cros_ec_lightbar: switch to SPDX identifier platform/chrome: cros_ec_sysfs: switch to SPDX identifier platform/chrome: cros_ec_vbc: switch to SPDX identifier platform/chrome: cros_ec_i2c: switch to SPDX identifier platform/chrome: cros_ec_lpc: switch to SPDX identifier platform/chrome: cros_ec_proto: switch to SPDX identifier platform/chrome: cros_ec_spi: switch to SPDX identifier platform/chrome: cros_kbd_led_backlight: switch to SPDX identifier platform/chrome: cros_ec_lightbar: remove pr_fmt() define platform/chrome: cros_ec_sysfs: remove pr_fmt() define
MAINTAINERS: chrome-platform: change the git tree to a chrome-platform group git tree

Nick Crews (4):
platform/chrome: cros_ec: Remove cros_ec dependency in lpc_mec platform/chrome: Add new driver for Wilco EC

Thank you,
Benson

Signature · 7 lines
Benson Leung
Staff Software Engineer
Chrome OS Kernel
Google Inc.
[email protected]
Chromium OS Project
[email protected]
#1 lore raw
Quoted 2 lines · Benson Leung

git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git tags/tag-chrome-platform-for-v5.1

No diffstat in the pull request? And the shortlog looks truncated too, with Nick Crews being reported as having four commits, but only two visible.

(And yes, there are four commits in the pull itself).

Finally, you say:

Quoted 2 lines

2. Cleanup series between mfd and chrome/platform, moving
cros-ec attributes from mfd/cros_ec_dev to sub-drivers in platform/chrome.

which I don't see at all in that pull. But that turns out to be because it already came through the mfd tree.

Things look otherwise sane and I did the pull, but please fix your script and/or workflow. The "it already came through the mfd tree" issue is fine, but diffstat and truncated shortlog is bad.

Linus

#2 lore raw

Hi Linus,

Quoted 15 lines · Linus Torvalds
Quoted 2 lines · Benson Leung

git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git tags/tag-chrome-platform-for-v5.1

No diffstat in the pull request? And the shortlog looks truncated too, with Nick Crews being reported as having four commits, but only two visible.

(And yes, there are four commits in the pull itself).

Finally, you say:

Quoted 2 lines

2. Cleanup series between mfd and chrome/platform, moving
cros-ec attributes from mfd/cros_ec_dev to sub-drivers in platform/chrome.

Quoted 7 lines

which I don't see at all in that pull. But that turns out to be because it already came through the mfd tree.

Things look otherwise sane and I did the pull, but please fix your script and/or workflow. The "it already came through the mfd tree" issue is fine, but diffstat and truncated shortlog is bad.

Sorry about that. There was definitely a workflow issue this time around. I'll nail down what happened. Here is the full pull-request sans-truncation for posterity.

The following changes since commit 49a57857aeea06ca831043acbb0fa5e0f50602fd:

Linux 5.0-rc3 (2019-01-21 13:14:44 +1300)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git tags/tag-chrome-platform-for-v5.1

for you to fetch changes up to 2794449576a6024e203eca5cc2c1a3ae33102b8e:

platform/chrome: fix wilco-ec dependencies (2019-03-05 11:35:46 +0100)

----------------------------------------------------------------
chrome platform changes for v5.1

1. SPDX identifier cleanup for platform/chrome
2. Cleanup series between mfd and chrome/platform, moving
cros-ec attributes from mfd/cros_ec_dev to sub-drivers in platform/chrome.
3. Wilco EC driver
4. Maintainership change to new group repository.

----------------------------------------------------------------
Arnd Bergmann (1):
platform/chrome: fix wilco-ec dependencies

Enric Balletbo i Serra (20):
mfd / platform: cros_ec: Use devm_mfd_add_devices
mfd / platform: cros_ec: Move lightbar attributes to its own driver mfd / platform: cros_ec: Move vbc attributes to its own driver
mfd / platform: cros_ec: Move debugfs attributes to its own driver
mfd / platform: cros_ec: Move device sysfs attributes to its own driver mfd / platform: cros_ec_vbc: Instantiate only if the EC has a VBC NVRAM platform/chrome: cros_ec_lightbar: Instantiate only if the EC has a lightbar platform/chrome: cromeos_pstore: switch to SPDX identifier platform/chrome: cros_ec_debugfs: switch to SPDX identifier platform/chrome: cros_ec_lightbar: switch to SPDX identifier platform/chrome: cros_ec_sysfs: switch to SPDX identifier platform/chrome: cros_ec_vbc: switch to SPDX identifier platform/chrome: cros_ec_i2c: switch to SPDX identifier platform/chrome: cros_ec_lpc: switch to SPDX identifier platform/chrome: cros_ec_proto: switch to SPDX identifier platform/chrome: cros_ec_spi: switch to SPDX identifier platform/chrome: cros_kbd_led_backlight: switch to SPDX identifier platform/chrome: cros_ec_lightbar: remove pr_fmt() define platform/chrome: cros_ec_sysfs: remove pr_fmt() define
MAINTAINERS: chrome-platform: change the git tree to a chrome-platform group git tree

Nick Crews (4):
platform/chrome: cros_ec: Remove cros_ec dependency in lpc_mec platform/chrome: Add new driver for Wilco EC platform/chrome: wilco_ec: Add support for raw commands in debugfs platform/chrome: wilco_ec: Add RTC driver

 Documentation/ABI/testing/debugfs-wilco-ec         |  23 ++
 Documentation/ABI/testing/sysfs-class-chromeos     |  32 +++
 .../sysfs-class-chromeos-driver-cros-ec-lightbar   |  74 +++++++
 .../sysfs-class-chromeos-driver-cros-ec-vbc        |   6 +
 MAINTAINERS                                        |   2 +-
 drivers/mfd/Kconfig                                |   1 -
 drivers/mfd/cros_ec.c                              |  14 +-
 drivers/mfd/cros_ec_dev.c                          |  89 +++-----
 drivers/mfd/cros_ec_dev.h                          |   6 -
 drivers/platform/chrome/Kconfig                    |  49 ++++-
 drivers/platform/chrome/Makefile                   |   9 +-
 drivers/platform/chrome/chromeos_pstore.c          |  17 +-
 drivers/platform/chrome/cros_ec_debugfs.c          |  84 ++++----
 drivers/platform/chrome/cros_ec_i2c.c              |  32 +--
 drivers/platform/chrome/cros_ec_lightbar.c         | 150 +++++++------
 drivers/platform/chrome/cros_ec_lpc.c              |  38 ++--
 drivers/platform/chrome/cros_ec_lpc_mec.c          |  78 ++++---
 drivers/platform/chrome/cros_ec_lpc_mec.h          |  63 +++---
 drivers/platform/chrome/cros_ec_lpc_reg.c          |  73 ++-----
 drivers/platform/chrome/cros_ec_lpc_reg.h          |  20 +-
 drivers/platform/chrome/cros_ec_proto.c            |  19 +-
 drivers/platform/chrome/cros_ec_spi.c              |  31 +--
 drivers/platform/chrome/cros_ec_sysfs.c            |  62 ++++--
 drivers/platform/chrome/cros_ec_vbc.c              |  83 +++----
 drivers/platform/chrome/cros_kbd_led_backlight.c   |  19 +-
 drivers/platform/chrome/wilco_ec/Kconfig           |  20 ++
 drivers/platform/chrome/wilco_ec/Makefile          |   6 +
 drivers/platform/chrome/wilco_ec/core.c            | 136 ++++++++++++
 drivers/platform/chrome/wilco_ec/debugfs.c         | 238 +++++++++++++++++++++
 drivers/platform/chrome/wilco_ec/mailbox.c         | 237 ++++++++++++++++++++
 drivers/rtc/Kconfig                                |  11 +
 drivers/rtc/Makefile                               |   1 +
 drivers/rtc/rtc-wilco-ec.c                         | 177 +++++++++++++++
 include/linux/mfd/cros_ec.h                        |  21 --
 include/linux/platform_data/wilco-ec.h             | 144 +++++++++++++
 35 files changed, 1542 insertions(+), 523 deletions(-)
 create mode 100644 Documentation/ABI/testing/debugfs-wilco-ec
 create mode 100644 Documentation/ABI/testing/sysfs-class-chromeos
 create mode 100644 Documentation/ABI/testing/sysfs-class-chromeos-driver-cros-ec-lightbar
 create mode 100644 Documentation/ABI/testing/sysfs-class-chromeos-driver-cros-ec-vbc
 create mode 100644 drivers/platform/chrome/wilco_ec/Kconfig
 create mode 100644 drivers/platform/chrome/wilco_ec/Makefile
 create mode 100644 drivers/platform/chrome/wilco_ec/core.c
 create mode 100644 drivers/platform/chrome/wilco_ec/debugfs.c
 create mode 100644 drivers/platform/chrome/wilco_ec/mailbox.c
 create mode 100644 drivers/rtc/rtc-wilco-ec.c
 create mode 100644 include/linux/platform_data/wilco-ec.h

Benson

Signature · 7 lines
Benson Leung
Staff Software Engineer
Chrome OS Kernel
Google Inc.
[email protected]
Chromium OS Project
[email protected]
merge bot Merged
#3 lore raw
In reply to Benson Leung
The pull request you sent on Mon, 11 Mar 2019 21:39:08 -0700:

The pull request you sent on Mon, 11 Mar 2019 21:39:08 -0700:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git tags/tag-chrome-platform-for-v5.1

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/f47d633134f7033e3d0c667419d9f8afd69e308d

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker