From: Rafael J. Wysocki Date: Sun, 3 Sep 2017 21:54:29 +0000 (+0200) Subject: Merge branches 'acpi-video', 'acpi-battery', 'acpi-spcr' and 'acpi-misc' X-Git-Tag: v4.14-rc1~138^2~1 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=940c8df63a534e004a5828182712ecf0036c26f7;p=linux-2.6-block.git Merge branches 'acpi-video', 'acpi-battery', 'acpi-spcr' and 'acpi-misc' * acpi-video: ACPI / video: Add force_none quirk for Dell OptiPlex 9020M * acpi-battery: ACPI: make device_attribute const * acpi-spcr: ACPI: SPCR: work around clock issue on xgene UART ACPI: SPCR: extend XGENE 8250 workaround to m400 * acpi-misc: ACPI / dock: constify attribute_group structure MAINTAINERS: Add Tony and Boris as ACPI/APEI reviewers ACPI / lpat: Fix typos in comments and kerneldoc style MAINTAINERS: device property: ACPI: add fwnode.h --- 940c8df63a534e004a5828182712ecf0036c26f7 diff --cc MAINTAINERS index 1c3feffb1c1c,205d3977ac46,1c3feffb1c1c,6f7721d1634c,24fdab285e18..7326317b65fc --- a/MAINTAINERS +++ b/MAINTAINERS @@@@@@ -5088,22 -5136,14 -5088,22 -5088,22 -5097,14 +5097,22 @@@@@@ F: net/bridge ETHERNET PHY LIBRARY M: Andrew Lunn M: Florian Fainelli - L: netdev@vger.kernel.org - S: Maintained - F: include/linux/phy.h - F: include/linux/phy_fixed.h - F: drivers/net/phy/ + L: netdev@vger.kernel.org + S: Maintained -F: include/linux/phy.h -F: include/linux/phy_fixed.h -F: drivers/net/phy/ + +F: Documentation/ABI/testing/sysfs-bus-mdio + +F: Documentation/devicetree/bindings/net/mdio* F: Documentation/networking/phy.txt + +F: drivers/net/phy/ F: drivers/of/of_mdio.c F: drivers/of/of_net.c + +F: include/linux/*mdio*.h + +F: include/linux/of_net.h + +F: include/linux/phy.h + +F: include/linux/phy_fixed.h + +F: include/linux/platform_data/mdio-gpio.h + +F: include/trace/events/mdio.h + +F: include/uapi/linux/mdio.h + +F: include/uapi/linux/mii.h EXT2 FILE SYSTEM M: Jan Kara @@@@@@ -5834,12 -5883,11 -5834,12 -5834,12 -5835,12 +5843,12 @@@@@@ F: drivers/staging/greybus/spi. F: drivers/staging/greybus/spilib.c F: drivers/staging/greybus/spilib.h - GREYBUS PROTOCOLS DRIVERS - M: David Lin -GREYBUS LOOBACK/TIME PROTOCOLS DRIVERS + +GREYBUS LOOPBACK/TIME PROTOCOLS DRIVERS + M: Bryan O'Donoghue S: Maintained - F: drivers/staging/greybus/uart.c - F: drivers/staging/greybus/log.c + F: drivers/staging/greybus/loopback.c + F: drivers/staging/greybus/timesync.c + F: drivers/staging/greybus/timesync_platform.c GREYBUS PLATFORM DRIVERS M: Vaibhav Hiremath @@@@@@ -14003,15 -13970,6 -14003,15 -14004,15 -14005,14 +14012,15 @@@@@@ F: drivers/block/virtio_blk. F: include/linux/virtio*.h F: include/uapi/linux/virtio_*.h F: drivers/crypto/virtio/ + +F: mm/balloon_compaction.c + + VIRTIO CRYPTO DRIVER + M: Gonglei + L: virtualization@lists.linux-foundation.org + L: linux-crypto@vger.kernel.org + S: Maintained + F: drivers/crypto/virtio/ + F: include/uapi/linux/virtio_crypto.h VIRTIO DRIVERS FOR S390 M: Cornelia Huck diff --cc drivers/acpi/spcr.c index e94b2023eed5,4ac3e06b41d8,98aa8c808a33,40a56b538b9f,4ac3e06b41d8..324b35bfe781 --- a/drivers/acpi/spcr.c +++ b/drivers/acpi/spcr.c @@@@@@ -158,35 -147,13 -157,35 -164,43 -147,13 +165,43 @@@@@@ int __init parse_spcr(bool earlycon goto done; } - - if (qdf2400_erratum_44_present(&table->header)) - - uart = "qdf2400_e44"; - - if (xgene_8250_erratum_present(table)) + + /* + + * If the E44 erratum is required, then we need to tell the pl011 + + * driver to implement the work-around. + + * + + * The global variable is used by the probe function when it + + * creates the UARTs, whether or not they're used as a console. + + * + + * If the user specifies "traditional" earlycon, the qdf2400_e44 + + * console name matches the EARLYCON_DECLARE() statement, and + + * SPCR is not used. Parameter "earlycon" is false. + + * + + * If the user specifies "SPCR" earlycon, then we need to update + + * the console name so that it also says "qdf2400_e44". Parameter + + * "earlycon" is true. + + * + + * For consistency, if we change the console name, then we do it + + * for everyone, not just earlycon. + + */ + + if (qdf2400_erratum_44_present(&table->header)) { + + qdf2400_e44_present = true; + + if (earlycon) + + uart = "qdf2400_e44"; + + } + + - - if (xgene_8250_erratum_present(table)) +++ + if (xgene_8250_erratum_present(table)) { iotype = "mmio32"; --- - snprintf(opts, sizeof(opts), "%s,%s,0x%llx,%d", uart, iotype, --- - table->serial_port.address, baud_rate); +++ + /* for xgene v1 and v2 we don't know the clock rate of the +++ + * UART so don't attempt to change to the baud rate state +++ + * in the table because driver cannot calculate the dividers +++ + */ +++ + snprintf(opts, sizeof(opts), "%s,%s,0x%llx", uart, iotype, +++ + table->serial_port.address); +++ + } else { +++ + snprintf(opts, sizeof(opts), "%s,%s,0x%llx,%d", uart, iotype, +++ + table->serial_port.address, baud_rate); +++ + } pr_info("console: %s\n", opts);