This reverts commit 17197dd460 which
is part of a series of patches that causes cuttlefish to crash.
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id09ab4af153c29fcb6373acb96463dea6ffda9ee
Drop CONFIG_LEDS_CLASS_MULTICOLOR=m as its built into the gki kernel
and causes booting trouble if we try to load it.
Fixes: 0526d8b334 ("ANDROID: GKI: fix up gki_defconfig to keep CONFIG_HID_PLAYSTATION")
Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: I260a052f97314c4ac41a44452bbb6dcdc3b41552
Peter Collingbourne noticed that the recently added
CONFIG_QCOM_SPMI_ADC5_TM5=m option wasn't actually a valid
config in the kernel.
This was due to it being typo'ed by me for the config
CONFIG_QCOM_SPMI_ADC_TM5 which is already enabled.
Reported-by: Peter Collingbourne <pcc@google.com>
Fixes: 02dbd8a73f ("ANDROID: db845c_gki.fragment: Enable QCOM_SPMI_ADC5_TM5, QCOM_CPR and QCOM_SPM")
Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: Ib3371015435618dcf2d662a7c7dfdc8767c30c4c
There is something odd about the new switch driver upstream that is
failing CTS tests. Revert the new version and go back to the old one
for now so that we can continue on with the merge to 5.16-rc1. We will
revisit this after the merge is complete.
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I874b4f5e10ca565341ab696f0bbb761302df806c
Steps on the way to 5.16-rc1
Resolves conflicts in:
drivers/hid/Kconfig
drivers/hid/hid-ids.h
drivers/hid/hid-nintendo.c
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ibd5bf7260b97bd31de561d8be8d1296ff48b9580
This reverts commit 77dfeaa02d.
Throttling can now be done using hist triggers and synthetic events
Bug: 145972256
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
Change-Id: I39c284040e2fdb815cda980f3a40ef188e59287c
This reverts commit e81694723a.
Reason for revert: Per submitter, the patch is not longer required (b143356419#comment9)
Bug: 143356419
Change-Id: I51a9ce7c58df66e11482bcd58309cd56e0e6ac56
Signed-off-by: Todd Kjos <tkjos@google.com>
GKI required the KMI_GENERATION to be added to the kernel version
string, but this only makes sense for GKI kernels, for non-GKI kernels
we don't need it. Leave all the other stuff we added, though, as it
seems useful.
Bug: 205897686
Change-Id: I2e7b3cb7ed5529f1e5e7c9d79a1f7ce4a1b6ee1f
Signed-off-by: Alistair Delva <adelva@google.com>
Commit d7f1f9fec0 ("HID: playstation: require multicolor LED
functionality") added a build dependancy for CONFIG_HID_PLAYSTATION, so
add CONFIG_LEDS_CLASS_MULTICOLOR=y to the gki_defconfig files to ensure
that the playstation drivers remain building as part of the gki builds.
Bug: 135136477
Cc: Siarhei Vishniakou <svv@google.com>
Fixes: d7f1f9fec0 ("HID: playstation: require multicolor LED functionality")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I8e27b0f153ffd4b8d8f1c803a015b4a5103605e1
This reverts commit 5c3bd130ea.
It causes lots of merge conflicts with 5.16-rc1 so revert it to allow
the merges to happen. If this is still needed, please submit it
usptream first and get it merged there properly.
Bug: 161128971
Cc: Chris Lew <clew@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I4481250521cd7219a6e072d8a8f9bc15580e84a0
Steps on the way to 5.16-rc1
Resolves conflicts in:
Documentation/ABI/stable/sysfs-module
drivers/base/arch_topology.c
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I58e1037220b270da3d7860d1c110f2cc7442f508
Commit 16b0314aa7 ("dma-buf: move dma-buf symbols into the DMA_BUF
module namespace") moved the dma-buf exports into the DMA_BUF namespace.
To keep the system_heap.c and cma_heap modules building, add them to the
DMA_BUF namespace as well.
Fixes: 16b0314aa7 ("dma-buf: move dma-buf symbols into the DMA_BUF module namespace")
Cc: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ib69062d41c426844f82667a51d75f0c35bad2bdf
This reverts commit 187c494456.
This commit conflicts with other virtio_blk changes that are coming in
5.16-rc1 so needs to be reverted. Also, if this really has been an
issue since the 4.20 kernel release (i.e. Feb 2017), and not resolved
yet, upstream should be told about it to resolve it as this has been a
long time.
Bug: 144592287
Cc: Satya Tangirala <satyat@google.com>
Cc: Alistair Delva <adelva@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I43339aad3704073d005d2fba91f159c68e099e97
This reverts commit 53182e81f4.
Right now it breaks the Android kernel build as libyaml needs to be
added to it, and an updated version of DTC also needs to be added to the
build system.
Until then, revert this change as we don't "need" to validate the yaml
at this point in time as we "trust" the files are good for now.
Cc: Rob Herring <robh@kernel.org>
Fixes: 53182e81f4 ("kbuild: Enable DT schema checks for %.dtb targets")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I72acd7d9a2475137c53d910d997e0c9b8f4fe905
This reverts commit b68d0924ad as it
breaks the build on clang-based systems with the errors:
FATAL ERROR: Unrecognized check name "interrupt_map"
FATAL ERROR: Unrecognized check name "node_name_vs_property_name"
Cc: Rob Herring <robh@kernel.org>
Fixes: b68d0924ad ("of/unittest: Disable new dtc node_name_vs_property_name and interrupt_map warnings")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia90d9a1d73604f7f1cace2397fc97e3e35ce5b1c
