hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dt/linus' into dt/next

This commit is contained in:
Rob Herring 2019-10-07 10:04:11 -05:00
parent 7971f4be9f f437ade329
commit a36a383dc3
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/devicetree/bindings/dsp/fsl,dsp.yaml
View File

@ -85,4 +85,5 @@ examples:
<&pd IMX_SC_R_DSP_RAM>; <&pd IMX_SC_R_DSP_RAM>;
mbox-names = "txdb0", "txdb1", "rxdb0", "rxdb1"; mbox-names = "txdb0", "txdb1", "rxdb0", "rxdb1";
mboxes = <&lsio_mu13 2 0>, <&lsio_mu13 2 1>, <&lsio_mu13 3 0>, <&lsio_mu13 3 1>; mboxes = <&lsio_mu13 2 0>, <&lsio_mu13 2 1>, <&lsio_mu13 3 0>, <&lsio_mu13 3 1>;
memory-region = <&dsp_reserved>;
}; };

7
Documentation/devicetree/bindings/iio/adc/adi,ad7192.yaml
View File

@ -43,13 +43,9 @@ properties:
dvdd-supply: dvdd-supply:
description: DVdd voltage supply description: DVdd voltage supply
items:
- const: dvdd
avdd-supply: avdd-supply:
description: AVdd voltage supply description: AVdd voltage supply
items:
- const: avdd
adi,rejection-60-Hz-enable: adi,rejection-60-Hz-enable:
description: | description: |
@ -99,6 +95,9 @@ required:
examples: examples:
- | - |
spi0 { spi0 {
#address-cells = <1>;
#size-cells = <0>;
adc@0 { adc@0 {
compatible = "adi,ad7192"; compatible = "adi,ad7192";
reg = <0>; reg = <0>;

1
Documentation/devicetree/bindings/media/rc.yaml
View File

@ -73,7 +73,6 @@ properties:
- rc-genius-tvgo-a11mce - rc-genius-tvgo-a11mce
- rc-gotview7135 - rc-gotview7135
- rc-hauppauge - rc-hauppauge
- rc-hauppauge
- rc-hisi-poplar - rc-hisi-poplar
- rc-hisi-tv-demo - rc-hisi-tv-demo
- rc-imon-mce - rc-imon-mce

2
Documentation/devicetree/bindings/phy/lantiq,vrx200-pcie-phy.yaml
View File

@ -37,7 +37,7 @@ properties:
- description: exclusive PHY reset line - description: exclusive PHY reset line
- description: shared reset line between the PCIe PHY and PCIe controller - description: shared reset line between the PCIe PHY and PCIe controller
resets-names: reset-names:
items: items:
- const: phy - const: phy
- const: pcie - const: pcie