Merge "ipq5018: update bt_debug fixup"

This commit is contained in:
Linux Build Service Account 2020-09-11 12:36:13 -07:00 committed by Gerrit - the friendly Code Review server
commit 26f0f2b652

View file

@ -1628,7 +1628,7 @@ void fdt_fixup_bt_debug(void *blob)
if ((gd->bd->bi_arch_number == MACH_TYPE_IPQ5018_AP_MP02_1) ||
(gd->bd->bi_arch_number == MACH_TYPE_IPQ5018_DB_MP02_1)) {
node = fdt_path_offset(blob, "/soc/pinctrl@1000000/btss_pins");
if (node) {
if (node >= 0) {
phandle = fdtdec_get_int(blob, node, "phandle", 0);
snprintf(node_name,
sizeof(node_name),
@ -1638,6 +1638,8 @@ void fdt_fixup_bt_debug(void *blob)
parse_fdt_fixup("/soc/bt@7000000%pinctrl-names%?btss_pins", blob);
parse_fdt_fixup(node_name, blob);
}
parse_fdt_fixup("/soc/mdio@90000/%delete%status", blob);
parse_fdt_fixup("/soc/mdio@90000/%status%?disabled", blob);
}
parse_fdt_fixup("/soc/serial@78b0000/%status%?ok", blob);