mirror of
https://github.com/torvalds/linux
synced 2024-09-06 09:51:23 +00:00
Devicetree fixes for v5.15, take 2:
- Revert fw_devlink tracking 'phy-handle' links. This broke at least a few platforms. A better solution is being worked on. - Add Samsung UFS binding which fell thru the cracks - Doc reference fixes from Mauro - Fix for restricted DMA error handling -----BEGIN PGP SIGNATURE----- iQJEBAABCgAuFiEEktVUI4SxYhzZyEuo+vtdtY28YcMFAmFFBVQQHHJvYmhAa2Vy bmVsLm9yZwAKCRD6+121jbxhw2GED/9FQ8Y/CZOQ1le7ZpF3mRZRk2L2m6f2SCSd Y2cHH9ZznmejEGqf4PI5dt7OkHvWir+GCoEID3Py9lStfxaTQYV2KVillb/jl2YX B9wkyDvfQ/qzzPJSXWSpr6DDlC31Zh8LlkCKKkGkJv+A5FUItBDgxXAxfHHZ6upH qJPARawCNYVoPuaKlKz7lFmp5U65RDrRhXdMzoRy9Ut248nGlJoFL2IiO8CQmS8R ERArVdTOCdu3LQ1Q7C+ULIfB5QckBiIBkX1itosO2jjXN4ImdxnvOQWRybZ6qaC8 xm8tTUdPd6tXRUu2Ibj4rR1lo75EFwqPAcUSg+SCgAfJ7wkYJKOtX/pgpz8vxC7G AHzhcQf3zpxHKv2xC/yt/2UgebLn78jQVYq8XDWtxITL5z9Y6n1QL+A0/IARB2Jw +YZIfL+pb9doAK1HFwcPAMZqXuRCRGF46iTtzavDinmyfklYve1n2QAEMxqdMM98 oM+7UcxdLSr0TZpC7g89dRbYyX1/5+569qrEnWsipMFVnLS6FsXT2Hdl3A9HHF68 sXFQy9fEg7CqKRLFz0dnOXk7cRUadTvbvkzrLI/cameBTqvenC5vQBS9hD1zAv4n O3z8xn7OHkjghtN7fomVDiKacD4pRqlFsGl+UhyWTwdLem9L6eqg4B5d36mmhCs3 TI+fdX9j3Q== =oM3e -----END PGP SIGNATURE----- Merge tag 'devicetree-fixes-for-5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux Pull devicetree fixes from Rob Herring: - Revert fw_devlink tracking 'phy-handle' links. This broke at least a few platforms. A better solution is being worked on. - Add Samsung UFS binding which fell thru the cracks - Doc reference fixes from Mauro - Fix for restricted DMA error handling * tag 'devicetree-fixes-for-5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: dt-bindings: arm: Fix Toradex compatible typo of: restricted dma: Fix condition for rmem init dt-bindings: arm: mediatek: mmsys: update mediatek,mmsys.yaml reference dt-bindings: net: dsa: sja1105: update nxp,sja1105.yaml reference dt-bindings: ufs: Add bindings for Samsung ufs host Revert "of: property: fw_devlink: Add support for "phy-handle" property"
This commit is contained in:
Linus Torvalds
commit
d1a88690ce
|
|
@ -54,7 +54,7 @@ properties:
|
|||
- const: toradex,apalis_t30
|
||||
- const: nvidia,tegra30
|
||||
- items:
|
||||
- const: toradex,apalis_t30-eval-v1.1
|
||||
- const: toradex,apalis_t30-v1.1-eval
|
||||
- const: toradex,apalis_t30-eval
|
||||
- const: toradex,apalis_t30-v1.1
|
||||
- const: toradex,apalis_t30
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ function block.
|
|||
|
||||
All DISP device tree nodes must be siblings to the central MMSYS_CONFIG node.
|
||||
For a description of the MMSYS_CONFIG binding, see
|
||||
Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt.
|
||||
Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml.
|
||||
|
||||
DISP function blocks
|
||||
====================
|
||||
|
|
|
|||
|
|
@ -0,0 +1,89 @@
|
|||
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
|
||||
%YAML 1.2
|
||||
---
|
||||
$id: http://devicetree.org/schemas/ufs/samsung,exynos-ufs.yaml#
|
||||
$schema: http://devicetree.org/meta-schemas/core.yaml#
|
||||
|
||||
title: Samsung SoC series UFS host controller Device Tree Bindings
|
||||
|
||||
maintainers:
|
||||
- Alim Akhtar <alim.akhtar@samsung.com>
|
||||
|
||||
description: |
|
||||
Each Samsung UFS host controller instance should have its own node.
|
||||
This binding define Samsung specific binding other then what is used
|
||||
in the common ufshcd bindings
|
||||
[1] Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt
|
||||
|
||||
properties:
|
||||
|
||||
compatible:
|
||||
enum:
|
||||
- samsung,exynos7-ufs
|
||||
|
||||
reg:
|
||||
items:
|
||||
- description: HCI register
|
||||
- description: vendor specific register
|
||||
- description: unipro register
|
||||
- description: UFS protector register
|
||||
|
||||
reg-names:
|
||||
items:
|
||||
- const: hci
|
||||
- const: vs_hci
|
||||
- const: unipro
|
||||
- const: ufsp
|
||||
|
||||
clocks:
|
||||
items:
|
||||
- description: ufs link core clock
|
||||
- description: unipro main clock
|
||||
|
||||
clock-names:
|
||||
items:
|
||||
- const: core_clk
|
||||
- const: sclk_unipro_main
|
||||
|
||||
interrupts:
|
||||
maxItems: 1
|
||||
|
||||
phys:
|
||||
maxItems: 1
|
||||
|
||||
phy-names:
|
||||
const: ufs-phy
|
||||
|
||||
required:
|
||||
- compatible
|
||||
- reg
|
||||
- interrupts
|
||||
- phys
|
||||
- phy-names
|
||||
- clocks
|
||||
- clock-names
|
||||
|
||||
additionalProperties: false
|
||||
|
||||
examples:
|
||||
- |
|
||||
#include <dt-bindings/interrupt-controller/arm-gic.h>
|
||||
#include <dt-bindings/clock/exynos7-clk.h>
|
||||
|
||||
ufs: ufs@15570000 {
|
||||
compatible = "samsung,exynos7-ufs";
|
||||
reg = <0x15570000 0x100>,
|
||||
<0x15570100 0x100>,
|
||||
<0x15571000 0x200>,
|
||||
<0x15572000 0x300>;
|
||||
reg-names = "hci", "vs_hci", "unipro", "ufsp";
|
||||
interrupts = <GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&clock_fsys1 ACLK_UFS20_LINK>,
|
||||
<&clock_fsys1 SCLK_UFSUNIPRO20_USER>;
|
||||
clock-names = "core_clk", "sclk_unipro_main";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&ufs_rst_n &ufs_refclk_out>;
|
||||
phys = <&ufs_phy>;
|
||||
phy-names = "ufs-phy";
|
||||
};
|
||||
...
|
||||
|
|
@ -296,7 +296,7 @@ not available.
|
|||
Device Tree bindings and board design
|
||||
=====================================
|
||||
|
||||
This section references ``Documentation/devicetree/bindings/net/dsa/sja1105.txt``
|
||||
This section references ``Documentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml``
|
||||
and aims to showcase some potential switch caveats.
|
||||
|
||||
RMII PHY role and out-of-band signaling
|
||||
|
|
|
|||
|
|
@ -85,7 +85,11 @@ of_dma_set_restricted_buffer(struct device *dev, struct device_node *np)
|
|||
break;
|
||||
}
|
||||
|
||||
if (i != count && of_reserved_mem_device_init_by_idx(dev, of_node, i))
|
||||
/*
|
||||
* Attempt to initialize a restricted-dma-pool region if one was found.
|
||||
* Note that count can hold a negative error code.
|
||||
*/
|
||||
if (i < count && of_reserved_mem_device_init_by_idx(dev, of_node, i))
|
||||
dev_warn(dev, "failed to initialise \"restricted-dma-pool\" memory node\n");
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1291,7 +1291,6 @@ DEFINE_SIMPLE_PROP(pwms, "pwms", "#pwm-cells")
|
|||
DEFINE_SIMPLE_PROP(resets, "resets", "#reset-cells")
|
||||
DEFINE_SIMPLE_PROP(leds, "leds", NULL)
|
||||
DEFINE_SIMPLE_PROP(backlight, "backlight", NULL)
|
||||
DEFINE_SIMPLE_PROP(phy_handle, "phy-handle", NULL)
|
||||
DEFINE_SUFFIX_PROP(regulators, "-supply", NULL)
|
||||
DEFINE_SUFFIX_PROP(gpio, "-gpio", "#gpio-cells")
|
||||
|
||||
|
|
@ -1380,7 +1379,6 @@ static const struct supplier_bindings of_supplier_bindings[] = {
|
|||
{ .parse_prop = parse_resets, },
|
||||
{ .parse_prop = parse_leds, },
|
||||
{ .parse_prop = parse_backlight, },
|
||||
{ .parse_prop = parse_phy_handle, },
|
||||
{ .parse_prop = parse_gpio_compat, },
|
||||
{ .parse_prop = parse_interrupts, },
|
||||
{ .parse_prop = parse_regulators, },
|
||||
|
|
|
|||
Loading…
Reference in a new issue