From: Linus Torvalds Date: Wed, 15 Nov 2017 18:14:11 +0000 (-0800) Subject: Merge branch 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos... X-Git-Tag: v4.19~2197 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9682b3dea22190a6fd449d157e3175b0e748684d;p=platform%2Fkernel%2Flinux-rpi.git Merge branch 'for-linus' of ssh://gitolite./linux/kernel/git/jikos/trivial Pull trivial tree updates from Jiri Kosina: "The usual rocket-science from trivial tree for 4.15" * 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: MAINTAINERS: relinquish kconfig MAINTAINERS: Update my email address treewide: Fix typos in Kconfig kfifo: Fix comments init/Kconfig: Fix module signing document location misc: ibmasm: Return error on error path HID: logitech-hidpp: fix mistake in printk, "feeback" -> "feedback" MAINTAINERS: Correct path to uDraw PS3 driver tracing: Fix doc mistakes in trace sample tracing: Kconfig text fixes for CONFIG_HWLAT_TRACER MIPS: Alchemy: Remove reverted CONFIG_NETLINK_MMAP from db1xxx_defconfig mm/huge_memory.c: fixup grammar in comment lib/xz: Add fall-through comments to a switch statement --- 9682b3dea22190a6fd449d157e3175b0e748684d diff --cc drivers/power/supply/Kconfig index fbca0ba7,382669b..428b426 --- a/drivers/power/supply/Kconfig +++ b/drivers/power/supply/Kconfig @@@ -182,22 -182,8 +182,22 @@@ config CHARGER_SB tristate "SBS Compliant charger" depends on I2C help - Say Y to include support for SBS compilant battery chargers. + Say Y to include support for SBS compliant battery chargers. +config MANAGER_SBS + tristate "Smart Battery System Manager" + depends on I2C && I2C_MUX && GPIOLIB + select I2C_SMBUS + help + Say Y here to include support for Smart Battery System Manager + ICs. The driver reports online and charging status via sysfs. + It presents itself also as I2C mux which allows to bind + smart battery driver to its ports. + Supported is for example LTC1760. + + This driver can also be built as a module. If so, the module will be + called sbs-manager. + config BATTERY_BQ27XXX tristate "BQ27xxx battery driver" help