A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 03:01:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'android11-5.4' into 'android11-5.4-lts'

Browse source 
Sync up with android11-5.4 for the following commits:

09b63a9447 ANDROID: GKI: add allowed list for Exynosauto SoC
83e8d7513c ANDROID: GKI: update allowed list for Exynosauto SoC
4e20d65b72 UPSTREAM: mfd: sprd: Add wakeup capability for PMIC IRQ
5eaa11cf0d UPSTREAM: tick/common: Touch watchdog in tick_unfreeze() on all CPUs
70145df882 FROMLIST: thermal: Fix NULL pointer dereference issue
7982ae0c2c ANDROID: ABI: Update allowed list for QCOM
42e0a0e97f UPSTREAM: spi: Fix regression to return zero on success instead of positive value
f49688970b UPSTREAM: thermal: power_allocator: Fix Kconfig warning
e13d39a31f UPSTREAM: of/platform: Unconditionally pause/resume sync state during kernel init
26d0b8dd3a UPSTREAM: selinux: ensure the policy has been loaded before reading the sidtab stats
b1ab580076 UPSTREAM: MIPS: vdso: Define BUILD_VDSO32 when building a 32bit kernel
3ab3de2667 UPSTREAM: mfd: syscon: Fix syscon_regmap_lookup_by_phandle_args() dummy
fecd3edb95 UPSTREAM: ARM: bcm2835_defconfig: Explicitly restore CONFIG_DEBUG_FS
a268f056b7 UPSTREAM: ARM: socfpga_defconfig: Add back DEBUG_FS
9008abe0e4 UPSTREAM: um: Fix header inclusion
df1cc4066f UPSTREAM: net: fix fraglist segmentation reference count leak
223c666145 UPSTREAM: ipv6: ndisc: RFC-ietf-6man-ra-pref64-09 is now published as RFC8781
b01c286473 UPSTREAM: of: property: Fix create device links for all child-supplier dependencies
6ac5a61989 UPSTREAM: of: property: Do not link to disabled devices
2bef330246 UPSTREAM: mmc: sdhci: Fix SDHCI_QUIRK_BROKEN_CQE
1bd9ca0eb9 UPSTREAM: usb: renesas-xhci: include correct header for get_unaligned_le16()
cd63b9b3ef UPSTREAM: wil6210: account for napi_gro_receive never returning GRO_DROP
f1ed2a97d3 UPSTREAM: nl80211: fix memory leak when parsing NL80211_ATTR_HE_BSS_COLOR
8aff1e0e2a UPSTREAM: thermal/drivers/sprd: Fix return value of sprd_thm_probe()
23b53e4b2a UPSTREAM: fscrypt: restrict IV_INO_LBLK_* to AES-256-XTS
5eb84aafc7 UPSTREAM: fscrypt: use smp_load_acquire() for fscrypt_prepared_key
3fcaa86a3d UPSTREAM: nvmem: sprd: Fix return value of sprd_efuse_probe()
05f0c99de8 UPSTREAM: mac80211: fix warning in 6 GHz IE addition in mesh mode
67d571fe31 UPSTREAM: scsi: ufs: Fix interrupt error message for shared interrupts
91c21bea59 UPSTREAM: sched/fair: Fix wrong negative conversion in find_energy_efficient_cpu()
5eee799bec UPSTREAM: driver core: Fix device_pm_lock() locking for device links
8502859d46 UPSTREAM: fscrypt: restrict IV_INO_LBLK_32 to ino_bits <= 32
4a5e996245 UPSTREAM: scsi: ufs: ufs-mediatek: Eliminate error message for unbound mphy
c8f9209864 UPSTREAM: scsi: ufs: ufs-mediatek: Fix HOST_PA_TACTIVATE quirk
174953dd82 UPSTREAM: cfg80211: fix 6 GHz channel conversion

Change-Id: I94eb6c54684cfba1899e7d81caa5986d83212120
Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
Greg Kroah-Hartman 2020-11-18 09:08:50 +01:00
commit d0bd13a1b2
35 changed files with 950 additions and 684 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/of/platform.c
View file

@ -518,10 +518,11 @@ static int __init of_platform_default_populate_init(void)
{
struct device_node *node;
device_links_supplier_sync_state_pause();
if (!of_have_populated_dt())
return -ENODEV;
device_links_supplier_sync_state_pause();
/*
* Handle certain compatibles explicitly, since we don't want to create
* platform_devices for every node in /reserved-memory with a
@ -547,8 +548,7 @@ arch_initcall_sync(of_platform_default_populate_init);
static int __init of_platform_sync_state_init(void)
{
if (of_have_populated_dt())
device_links_supplier_sync_state_resume();
device_links_supplier_sync_state_resume();
return 0;
}
late_initcall_sync(of_platform_sync_state_init);

16
drivers/of/property.c
View file

@ -1031,8 +1031,20 @@ static int of_link_to_phandle(struct device *dev, struct device_node *sup_np,
* Find the device node that contains the supplier phandle. It may be
* @sup_np or it may be an ancestor of @sup_np.
*/
while (sup_np && !of_find_property(sup_np, "compatible", NULL))
while (sup_np) {
/* Don't allow linking to a disabled supplier */
if (!of_device_is_available(sup_np)) {
of_node_put(sup_np);
sup_np = NULL;
}
if (of_find_property(sup_np, "compatible", NULL))
break;
sup_np = of_get_next_parent(sup_np);
}
if (!sup_np) {
dev_dbg(dev, "Not linking to %pOFP - No device\n", tmp_np);
return -ENODEV;
@ -1311,7 +1323,7 @@ static int of_link_to_suppliers(struct device *dev,
if (of_link_property(dev, con_np, p->name))
ret = -ENODEV;
for_each_child_of_node(con_np, child)
for_each_available_child_of_node(con_np, child)
if (of_link_to_suppliers(dev, child) && !ret)
ret = -EAGAIN;