From ec120ba36d0431f1ca254b887b64f4228b12840d Mon Sep 17 00:00:00 2001 From: Saravana Kannan Date: Mon, 11 Nov 2019 17:24:44 -0800 Subject: [PATCH] Revert "ANDROID: of/property: Add device link support for iommus" This reverts commit 87337fb791b2fad85f6316ea6a31f5a9c0b2f50d. The patch I sent upstream to add iommu support is nicer than this and also adds mboxes and io-channels support. So just revert this and pull in the upstream patches to avoid conflicts and pull in support for mboxes and io-channels. Change-Id: I98ef50eb5cff310a5717d0fb78eceb04ff2510ec Signed-off-by: Saravana Kannan --- drivers/of/property.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/of/property.c b/drivers/of/property.c index 7a0346c26acc..42c79b2ea837 100644 --- a/drivers/of/property.c +++ b/drivers/of/property.c @@ -1108,13 +1108,6 @@ static struct device_node *parse_interconnects(struct device_node *np, "#interconnect-cells"); } -static struct device_node *parse_iommus(struct device_node *np, - const char *prop_name, int index) -{ - return parse_prop_cells(np, prop_name, index, "iommus", - "#iommu-cells"); -} - static int strcmp_suffix(const char *str, const char *suffix) { unsigned int len, suffix_len; @@ -1160,7 +1153,6 @@ static const struct supplier_bindings of_supplier_bindings[] = { { .parse_prop = parse_clocks, }, { .parse_prop = parse_interconnects, }, { .parse_prop = parse_regulators, }, - { .parse_prop = parse_iommus, }, {} };