tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 105131df 6e27831b

+119 -12
+1
Documentation/devicetree/bindings/media/i2c/ovti,ov2685.yaml
··· 49 49 50 50 properties: 51 51 data-lanes: 52 + minItems: 1 52 53 maxItems: 2 53 54 54 55 required:
+2 -11
Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-common.yaml
··· 17 17 properties: 18 18 clocks: 19 19 minItems: 3 20 - items: 21 - - description: PCIe bridge clock. 22 - - description: PCIe bus clock. 23 - - description: PCIe PHY clock. 24 - - description: Additional required clock entry for imx6sx-pcie, 25 - imx6sx-pcie-ep, imx8mq-pcie, imx8mq-pcie-ep. 20 + maxItems: 4 26 21 27 22 clock-names: 28 23 minItems: 3 29 - items: 30 - - const: pcie 31 - - const: pcie_bus 32 - - enum: [ pcie_phy, pcie_aux ] 33 - - enum: [ pcie_inbound_axi, pcie_aux ] 24 + maxItems: 4 34 25 35 26 num-lanes: 36 27 const: 1
+38
Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.yaml
··· 31 31 - const: dbi 32 32 - const: addr_space 33 33 34 + clocks: 35 + minItems: 3 36 + items: 37 + - description: PCIe bridge clock. 38 + - description: PCIe bus clock. 39 + - description: PCIe PHY clock. 40 + - description: Additional required clock entry for imx6sx-pcie, 41 + imx6sx-pcie-ep, imx8mq-pcie, imx8mq-pcie-ep. 42 + 43 + clock-names: 44 + minItems: 3 45 + maxItems: 4 46 + 34 47 interrupts: 35 48 items: 36 49 - description: builtin eDMA interrupter. ··· 62 49 allOf: 63 50 - $ref: /schemas/pci/snps,dw-pcie-ep.yaml# 64 51 - $ref: /schemas/pci/fsl,imx6q-pcie-common.yaml# 52 + - if: 53 + properties: 54 + compatible: 55 + enum: 56 + - fsl,imx8mq-pcie-ep 57 + then: 58 + properties: 59 + clocks: 60 + minItems: 4 61 + clock-names: 62 + items: 63 + - const: pcie 64 + - const: pcie_bus 65 + - const: pcie_phy 66 + - const: pcie_aux 67 + else: 68 + properties: 69 + clocks: 70 + maxItems: 3 71 + clock-names: 72 + items: 73 + - const: pcie 74 + - const: pcie_bus 75 + - const: pcie_aux 76 + 65 77 66 78 unevaluatedProperties: false 67 79
+77
Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.yaml
··· 40 40 - const: dbi 41 41 - const: config 42 42 43 + clocks: 44 + minItems: 3 45 + items: 46 + - description: PCIe bridge clock. 47 + - description: PCIe bus clock. 48 + - description: PCIe PHY clock. 49 + - description: Additional required clock entry for imx6sx-pcie, 50 + imx6sx-pcie-ep, imx8mq-pcie, imx8mq-pcie-ep. 51 + 52 + clock-names: 53 + minItems: 3 54 + maxItems: 4 55 + 43 56 interrupts: 44 57 items: 45 58 - description: builtin MSI controller. ··· 90 77 allOf: 91 78 - $ref: /schemas/pci/snps,dw-pcie.yaml# 92 79 - $ref: /schemas/pci/fsl,imx6q-pcie-common.yaml# 80 + - if: 81 + properties: 82 + compatible: 83 + enum: 84 + - fsl,imx6sx-pcie 85 + then: 86 + properties: 87 + clocks: 88 + minItems: 4 89 + clock-names: 90 + items: 91 + - const: pcie 92 + - const: pcie_bus 93 + - const: pcie_phy 94 + - const: pcie_inbound_axi 95 + 96 + - if: 97 + properties: 98 + compatible: 99 + enum: 100 + - fsl,imx8mq-pcie 101 + then: 102 + properties: 103 + clocks: 104 + minItems: 4 105 + clock-names: 106 + items: 107 + - const: pcie 108 + - const: pcie_bus 109 + - const: pcie_phy 110 + - const: pcie_aux 111 + 112 + - if: 113 + properties: 114 + compatible: 115 + enum: 116 + - fsl,imx6q-pcie 117 + - fsl,imx6qp-pcie 118 + - fsl,imx7d-pcie 119 + then: 120 + properties: 121 + clocks: 122 + maxItems: 3 123 + clock-names: 124 + items: 125 + - const: pcie 126 + - const: pcie_bus 127 + - const: pcie_phy 128 + 129 + - if: 130 + properties: 131 + compatible: 132 + enum: 133 + - fsl,imx8mm-pcie 134 + - fsl,imx8mp-pcie 135 + then: 136 + properties: 137 + clocks: 138 + maxItems: 3 139 + clock-names: 140 + items: 141 + - const: pcie 142 + - const: pcie_bus 143 + - const: pcie_aux 93 144 94 145 unevaluatedProperties: false 95 146
+1 -1
MAINTAINERS
··· 1970 1970 F: Documentation/devicetree/bindings/pci/apple,pcie.yaml 1971 1971 F: Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml 1972 1972 F: Documentation/devicetree/bindings/power/apple* 1973 - F: Documentation/devicetree/bindings/pwm/pwm-apple.yaml 1973 + F: Documentation/devicetree/bindings/pwm/apple,s5l-fpwm.yaml 1974 1974 F: Documentation/devicetree/bindings/watchdog/apple,wdt.yaml 1975 1975 F: arch/arm64/boot/dts/apple/ 1976 1976 F: drivers/bluetooth/hci_bcm4377.c