diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-11 10:12:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-11 10:12:46 -0700 |
| commit | a1406e424253ba2121614377aaab274d403b08e0 (patch) | |
| tree | 7040174f2bb98e54f1575f8ef6c38641c2c251ff /drivers | |
| parent | 2aae0a937ad169752b5710d4f210c1ae7a49d3cf (diff) | |
| parent | 094b147c766289baa0f370d124609c3ac2b5a420 (diff) | |
Merge tag 'devicetree-fixes-for-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree fixes from Rob Herring:
- Disable fw_devlinks on x86 DT platforms to fix OLPC
- More replacing oneOf+const with enum on a few new schemas
- Drop unnecessary type references on Xilinx SPI binding schema
* tag 'devicetree-fixes-for-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
spi: dt-bindings: xilinx: Drop type reference on *-bits properties
dt-bindings: More use 'enum' instead of 'oneOf' plus 'const' entries
of: property: Disable fw_devlink DT support for X86
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/of/property.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/of/property.c b/drivers/of/property.c index 0c0dc2e369c0..3fd74bb34819 100644 --- a/drivers/of/property.c +++ b/drivers/of/property.c @@ -1444,6 +1444,9 @@ static int of_fwnode_add_links(struct fwnode_handle *fwnode) struct property *p; struct device_node *con_np = to_of_node(fwnode); + if (IS_ENABLED(CONFIG_X86)) + return 0; + if (!con_np) return -EINVAL; |