mirror of https://github.com/torvalds/linux.git
Devicetree binding fixes for v6.4
Few fixes for Devicetree bindings and related docs, all for issues
introduced in v6.4-rc1 commits:
1. media/ov2685: fix number of possible data lanes, as old binding
explicitly mentioned one data lane. This fixes dt_binding_check
warnings like:
Documentation/devicetree/bindings/media/rockchip-isp1.example.dtb: camera@3c: port:endpoint:data-lanes: [[1]] is too short
From schema: Documentation/devicetree/bindings/media/i2c/ovti,ov2685.yaml
2. Maintainers: correct path of Apple PWM binding. This fixes
refcheckdocs warning.
3. PCI/fsl,imx6q: correct parsing of assigned-clocks and related
properties and make the clocks more specific per PCI device (host or
endpoint). This fixes dtschema limitation and dt_binding_check
warnings like:
Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.example.dtb: pcie-ep@33800000: Unevaluated properties are not allowed
From schema: Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.yaml
-----BEGIN PGP SIGNATURE-----
iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAmRcxQIQHGtyemtAa2Vy
bmVsLm9yZwAKCRDBN2bmhouD158qD/0bBKNr0Ydj9HsobdAsGnkIUIpGgl2TktxB
tvOgbb4ppD3I4HAbh+AobXsB3zILnC1nv9Vky7jRxty9CquDotzRsedBhfih00fK
2lU5eClF1tX2dFNU+yHeLmdQxgocxfGvpvO8GZWpL5f/sZWYsFkuBiOedrFeqbLZ
6Sj231lW71rJj884HoeA/vLEQJXf4peHTGIfw5xQuSGninaForendT7fsZh9Ij4d
MdNEnA3irxypDWbuHiEVKwv/Fbgp9RTomgi9+MfaecmcH1Z0zTbRn/AzGYiehIgw
IeJA25HkOaiHNARyczQI2PzSPuFslFVT8vc7CtAgaX13NcJ01gbQDWm00W8tP5GX
hih3ky50GImarwhSFizmv5pxsGXc9FaPAC5WMgXMADqFP2equzYngKlDcXBnKkiw
hOByMJs9aGe2/fksExeV4OS3oBDLo3KTzvJ5biWNkcCaHxvNQT2fNPOMYuDxew1S
qvFgcxc4b/DkH73yO7Jp0wOAbUwAfSxD6CX06AyKl64OOZ852mtS8R51G0+xHQcn
bJ1uWgf9+TSlSZAUhdmcbkLRNTk+zM6T11hWoNB+hIr5FN4/KxteEsE5l0YvLMzo
T7cTrrXBee1MuU33x6GbLybsewBZMOAnXm64sqpua6DyfuBY1kBUjzL9mTc6PaB/
C4C6fY1Bew==
=iuNU
-----END PGP SIGNATURE-----
Merge tag 'dt-fixes-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt
Pull devicetree binding fixes from Krzysztof Kozlowski:
"A few fixes for Devicetree bindings and related docs, all for issues
introduced in v6.4-rc1 commits:
- media/ov2685: fix number of possible data lanes, as old binding
explicitly mentioned one data lane. This fixes dt_binding_check
warnings like:
Documentation/devicetree/bindings/media/rockchip-isp1.example.dtb: camera@3c: port:endpoint:data-lanes: [[1]] is too short
From schema: Documentation/devicetree/bindings/media/i2c/ovti,ov2685.yaml
- PCI/fsl,imx6q: correct parsing of assigned-clocks and related
properties and make the clocks more specific per PCI device (host
or endpoint). This fixes dtschema limitation and dt_binding_check
warnings like:
Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.example.dtb: pcie-ep@33800000: Unevaluated properties are not allowed
From schema: Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.yaml
- Maintainers: correct path of Apple PWM binding. This fixes
refcheckdocs warning"
* tag 'dt-fixes-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt:
dt-bindings: PCI: fsl,imx6q: fix assigned-clocks warning
MAINTAINERS: adjust file entry for ARM/APPLE MACHINE SUPPORT
media: dt-bindings: ov2685: Correct data-lanes attribute
This commit is contained in:
commit
105131df9c
|
|
@ -49,6 +49,7 @@ properties:
|
||||||
|
|
||||||
properties:
|
properties:
|
||||||
data-lanes:
|
data-lanes:
|
||||||
|
minItems: 1
|
||||||
maxItems: 2
|
maxItems: 2
|
||||||
|
|
||||||
required:
|
required:
|
||||||
|
|
|
||||||
|
|
@ -17,20 +17,11 @@ description:
|
||||||
properties:
|
properties:
|
||||||
clocks:
|
clocks:
|
||||||
minItems: 3
|
minItems: 3
|
||||||
items:
|
maxItems: 4
|
||||||
- description: PCIe bridge clock.
|
|
||||||
- description: PCIe bus clock.
|
|
||||||
- description: PCIe PHY clock.
|
|
||||||
- description: Additional required clock entry for imx6sx-pcie,
|
|
||||||
imx6sx-pcie-ep, imx8mq-pcie, imx8mq-pcie-ep.
|
|
||||||
|
|
||||||
clock-names:
|
clock-names:
|
||||||
minItems: 3
|
minItems: 3
|
||||||
items:
|
maxItems: 4
|
||||||
- const: pcie
|
|
||||||
- const: pcie_bus
|
|
||||||
- enum: [ pcie_phy, pcie_aux ]
|
|
||||||
- enum: [ pcie_inbound_axi, pcie_aux ]
|
|
||||||
|
|
||||||
num-lanes:
|
num-lanes:
|
||||||
const: 1
|
const: 1
|
||||||
|
|
|
||||||
|
|
@ -31,6 +31,19 @@ properties:
|
||||||
- const: dbi
|
- const: dbi
|
||||||
- const: addr_space
|
- const: addr_space
|
||||||
|
|
||||||
|
clocks:
|
||||||
|
minItems: 3
|
||||||
|
items:
|
||||||
|
- description: PCIe bridge clock.
|
||||||
|
- description: PCIe bus clock.
|
||||||
|
- description: PCIe PHY clock.
|
||||||
|
- description: Additional required clock entry for imx6sx-pcie,
|
||||||
|
imx6sx-pcie-ep, imx8mq-pcie, imx8mq-pcie-ep.
|
||||||
|
|
||||||
|
clock-names:
|
||||||
|
minItems: 3
|
||||||
|
maxItems: 4
|
||||||
|
|
||||||
interrupts:
|
interrupts:
|
||||||
items:
|
items:
|
||||||
- description: builtin eDMA interrupter.
|
- description: builtin eDMA interrupter.
|
||||||
|
|
@ -49,6 +62,31 @@ required:
|
||||||
allOf:
|
allOf:
|
||||||
- $ref: /schemas/pci/snps,dw-pcie-ep.yaml#
|
- $ref: /schemas/pci/snps,dw-pcie-ep.yaml#
|
||||||
- $ref: /schemas/pci/fsl,imx6q-pcie-common.yaml#
|
- $ref: /schemas/pci/fsl,imx6q-pcie-common.yaml#
|
||||||
|
- if:
|
||||||
|
properties:
|
||||||
|
compatible:
|
||||||
|
enum:
|
||||||
|
- fsl,imx8mq-pcie-ep
|
||||||
|
then:
|
||||||
|
properties:
|
||||||
|
clocks:
|
||||||
|
minItems: 4
|
||||||
|
clock-names:
|
||||||
|
items:
|
||||||
|
- const: pcie
|
||||||
|
- const: pcie_bus
|
||||||
|
- const: pcie_phy
|
||||||
|
- const: pcie_aux
|
||||||
|
else:
|
||||||
|
properties:
|
||||||
|
clocks:
|
||||||
|
maxItems: 3
|
||||||
|
clock-names:
|
||||||
|
items:
|
||||||
|
- const: pcie
|
||||||
|
- const: pcie_bus
|
||||||
|
- const: pcie_aux
|
||||||
|
|
||||||
|
|
||||||
unevaluatedProperties: false
|
unevaluatedProperties: false
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -40,6 +40,19 @@ properties:
|
||||||
- const: dbi
|
- const: dbi
|
||||||
- const: config
|
- const: config
|
||||||
|
|
||||||
|
clocks:
|
||||||
|
minItems: 3
|
||||||
|
items:
|
||||||
|
- description: PCIe bridge clock.
|
||||||
|
- description: PCIe bus clock.
|
||||||
|
- description: PCIe PHY clock.
|
||||||
|
- description: Additional required clock entry for imx6sx-pcie,
|
||||||
|
imx6sx-pcie-ep, imx8mq-pcie, imx8mq-pcie-ep.
|
||||||
|
|
||||||
|
clock-names:
|
||||||
|
minItems: 3
|
||||||
|
maxItems: 4
|
||||||
|
|
||||||
interrupts:
|
interrupts:
|
||||||
items:
|
items:
|
||||||
- description: builtin MSI controller.
|
- description: builtin MSI controller.
|
||||||
|
|
@ -77,6 +90,70 @@ required:
|
||||||
allOf:
|
allOf:
|
||||||
- $ref: /schemas/pci/snps,dw-pcie.yaml#
|
- $ref: /schemas/pci/snps,dw-pcie.yaml#
|
||||||
- $ref: /schemas/pci/fsl,imx6q-pcie-common.yaml#
|
- $ref: /schemas/pci/fsl,imx6q-pcie-common.yaml#
|
||||||
|
- if:
|
||||||
|
properties:
|
||||||
|
compatible:
|
||||||
|
enum:
|
||||||
|
- fsl,imx6sx-pcie
|
||||||
|
then:
|
||||||
|
properties:
|
||||||
|
clocks:
|
||||||
|
minItems: 4
|
||||||
|
clock-names:
|
||||||
|
items:
|
||||||
|
- const: pcie
|
||||||
|
- const: pcie_bus
|
||||||
|
- const: pcie_phy
|
||||||
|
- const: pcie_inbound_axi
|
||||||
|
|
||||||
|
- if:
|
||||||
|
properties:
|
||||||
|
compatible:
|
||||||
|
enum:
|
||||||
|
- fsl,imx8mq-pcie
|
||||||
|
then:
|
||||||
|
properties:
|
||||||
|
clocks:
|
||||||
|
minItems: 4
|
||||||
|
clock-names:
|
||||||
|
items:
|
||||||
|
- const: pcie
|
||||||
|
- const: pcie_bus
|
||||||
|
- const: pcie_phy
|
||||||
|
- const: pcie_aux
|
||||||
|
|
||||||
|
- if:
|
||||||
|
properties:
|
||||||
|
compatible:
|
||||||
|
enum:
|
||||||
|
- fsl,imx6q-pcie
|
||||||
|
- fsl,imx6qp-pcie
|
||||||
|
- fsl,imx7d-pcie
|
||||||
|
then:
|
||||||
|
properties:
|
||||||
|
clocks:
|
||||||
|
maxItems: 3
|
||||||
|
clock-names:
|
||||||
|
items:
|
||||||
|
- const: pcie
|
||||||
|
- const: pcie_bus
|
||||||
|
- const: pcie_phy
|
||||||
|
|
||||||
|
- if:
|
||||||
|
properties:
|
||||||
|
compatible:
|
||||||
|
enum:
|
||||||
|
- fsl,imx8mm-pcie
|
||||||
|
- fsl,imx8mp-pcie
|
||||||
|
then:
|
||||||
|
properties:
|
||||||
|
clocks:
|
||||||
|
maxItems: 3
|
||||||
|
clock-names:
|
||||||
|
items:
|
||||||
|
- const: pcie
|
||||||
|
- const: pcie_bus
|
||||||
|
- const: pcie_aux
|
||||||
|
|
||||||
unevaluatedProperties: false
|
unevaluatedProperties: false
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1970,7 +1970,7 @@ F: Documentation/devicetree/bindings/nvmem/apple,efuses.yaml
|
||||||
F: Documentation/devicetree/bindings/pci/apple,pcie.yaml
|
F: Documentation/devicetree/bindings/pci/apple,pcie.yaml
|
||||||
F: Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
|
F: Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
|
||||||
F: Documentation/devicetree/bindings/power/apple*
|
F: Documentation/devicetree/bindings/power/apple*
|
||||||
F: Documentation/devicetree/bindings/pwm/pwm-apple.yaml
|
F: Documentation/devicetree/bindings/pwm/apple,s5l-fpwm.yaml
|
||||||
F: Documentation/devicetree/bindings/watchdog/apple,wdt.yaml
|
F: Documentation/devicetree/bindings/watchdog/apple,wdt.yaml
|
||||||
F: arch/arm64/boot/dts/apple/
|
F: arch/arm64/boot/dts/apple/
|
||||||
F: drivers/bluetooth/hci_bcm4377.c
|
F: drivers/bluetooth/hci_bcm4377.c
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue