Commit da8d07af authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'devicetree-for-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux 

Pull devicetree updates from Rob Herring:
 "Bindings:

   - Add spi-peripheral-props.yaml references to various SPI device
     bindings

   - Convert qcom,pm8916-wdt, ds1307, Qualcomm BAM DMA, is31fl319x,
     skyworks,aat1290, Rockchip EMAC, gpio-ir-receiver, ahci-ceva, Arm
     CCN PMU, rda,8810pl-intc, sil,sii9022, ps2-gpio, and
     arm-firmware-suite bindings to DT schema format

   - New bindings for Arm virtual platforms display, Qualcomm IMEM
     memory region, Samsung S5PV210 ChipID, EM Microelectronic EM3027
     RTC, and arm,cortex-a78ae

   - Add vendor prefixes for asrock, bytedance, hxt, ingrasys, inventec,
     quanta, and densitron

   - Add missing MSI and IOMMU properties to host-generic-pci

   - Remove bindings for removed EFM32 platform

   - Remove old chosen.txt binding (replaced by schema)

   - Treewide add missing type information for properties

   - Treewide fixing of typos and its vs. it's in bindings. Its all good
     now.

   - Drop unnecessary quoting in power related schemas

   - Several LED binding updates which didn't get picked up

   - Move various bindings to proper directories

  DT core code:

   - Convert unittest GPIO related tests to use fwnode

   - Check ima-kexec-buffer against memory bounds

   - Print reserved-memory allocation/reservation failures as errors

   - Cleanup early_init_dt_reserve_memory_arch()

   - Simplify of_overlay_fdt_apply() tail"

* tag 'devicetree-for-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (65 commits)
  dt-bindings: mtd: microchip,mchp48l640: use spi-peripheral-props.yaml
  dt-bindings: power: supply: drop quotes when not needed
  dt-bindings: power: reset: drop quotes when not needed
  dt-bindings: power: drop quotes when not needed
  dt-bindings: PCI: host-generic-pci: Allow IOMMU and MSI properties
  of/fdt: declared return type does not match actual return type
  devicetree/bindings: correct possessive "its" typos
  dt-bindings: net: convert emac_rockchip.txt to YAML
  dt-bindings: eeprom: microchip,93lc46b: move to eeprom directory
  dt-bindings: eeprom: at25: use spi-peripheral-props.yaml
  dt-bindings: display: use spi-peripheral-props.yaml
  dt-bindings: watchdog: qcom,pm8916-wdt: convert to dtschema
  dt-bindings: power: reset: qcom,pon: use absolute path to other schema
  dt-bindings: iio/dac: adi,ad5766: Add missing type to 'output-range-microvolts'
  dt-bindings: power: supply: charger-manager: Add missing type for 'cm-battery-stat'
  dt-bindings: panel: raydium,rm67191: Add missing type to 'video-mode'
  of/fdt: Clean up early_init_dt_reserve_memory_arch()
  dt-bindings: PCI: fsl,imx6q-pcie: Add missing type for 'reset-gpio-active-high'
  dt-bindings: rtc: Add EM Microelectronic EM3027 bindings
  dt-bindings: rtc: ds1307: Convert to json-schema
  ...
parents 8d9420ca 7e7a24c3

Documentation/devicetree/bindings/arm/cpus.yaml

+1 −0
Original line number Original line Diff line number Diff line
@@ -138,6 +138,7 @@ properties: 
      - arm,cortex-a76

      - arm,cortex-a76

      - arm,cortex-a77

      - arm,cortex-a77

      - arm,cortex-a78

      - arm,cortex-a78

      - arm,cortex-a78ae

      - arm,cortex-a510

      - arm,cortex-a510

      - arm,cortex-a710

      - arm,cortex-a710

      - arm,cortex-m0

      - arm,cortex-m0

Documentation/devicetree/bindings/arm/msm/qcom,saw2.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -10,7 +10,7 @@ system, notifying them when a low power state is entered or exited. 
Multiple revisions of the SAW hardware are supported using these Device Nodes.

Multiple revisions of the SAW hardware are supported using these Device Nodes.

SAW2 revisions differ in the register offset and configuration data. Also, the

SAW2 revisions differ in the register offset and configuration data. Also, the

same revision of the SAW in different SoCs may have different configuration

same revision of the SAW in different SoCs may have different configuration

data due the the differences in hardware capabilities. Hence the SoC name, the

data due the differences in hardware capabilities. Hence the SoC name, the

version of the SAW hardware in that SoC and the distinction between cpu (big

version of the SAW hardware in that SoC and the distinction between cpu (big

or Little) or cache, may be needed to uniquely identify the SAW register

or Little) or cache, may be needed to uniquely identify the SAW register

configuration and initialization data. The compatible string is used to

configuration and initialization data. The compatible string is used to

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.yaml

+1 −1
Original line number Original line Diff line number Diff line
@@ -208,7 +208,7 @@ properties: 
      "^[a-z0-9]+$":

      "^[a-z0-9]+$":

        type: object

        type: object





        patternProperties:

        properties:

          clocks:

          clocks:

            minItems: 1

            minItems: 1

            maxItems: 8

            maxItems: 8

Documentation/devicetree/bindings/arm/vexpress-sysreg.yaml

+8 −2
Original line number Original line Diff line number Diff line
@@ -29,6 +29,13 @@ properties: 




  ranges: true

  ranges: true





  gpio-controller:

    deprecated: true



  "#gpio-cells":

    deprecated: true

    const: 2



additionalProperties: false

additionalProperties: false





patternProperties:

patternProperties:
@@ -67,8 +74,7 @@ patternProperties: 




required:

required:

  - compatible

  - compatible

  - "#address-cells"

  - reg

  - "#size-cells"





examples:

examples:

  - |

  - |

Documentation/devicetree/bindings/ata/ahci-ceva.txt

deleted100644 → 0
+0 −63
Original line number Original line Diff line number Diff line 
Binding for CEVA AHCI SATA Controller



Required properties:

  - reg: Physical base address and size of the controller's register area.

  - compatible: Compatibility string. Must be 'ceva,ahci-1v84'.

  - clocks: Input clock specifier. Refer to common clock bindings.

  - interrupts: Interrupt specifier. Refer to interrupt binding.

  - ceva,p0-cominit-params: OOB timing value for COMINIT parameter for port 0.

  - ceva,p1-cominit-params: OOB timing value for COMINIT parameter for port 1.

			The fields for the above parameter must be as shown below:

			ceva,pN-cominit-params = /bits/ 8 <CIBGMN CIBGMX CIBGN CINMP>;

			CINMP : COMINIT Negate Minimum Period.

			CIBGN : COMINIT Burst Gap Nominal.

			CIBGMX: COMINIT Burst Gap Maximum.

			CIBGMN: COMINIT Burst Gap Minimum.

  - ceva,p0-comwake-params: OOB timing value for COMWAKE parameter for port 0.

  - ceva,p1-comwake-params: OOB timing value for COMWAKE parameter for port 1.

			The fields for the above parameter must be as shown below:

			ceva,pN-comwake-params = /bits/ 8 <CWBGMN CWBGMX CWBGN CWNMP>;

			CWBGMN: COMWAKE Burst Gap Minimum.

			CWBGMX: COMWAKE Burst Gap Maximum.

			CWBGN: COMWAKE Burst Gap Nominal.

			CWNMP: COMWAKE Negate Minimum Period.

  - ceva,p0-burst-params: Burst timing value for COM parameter for port 0.

  - ceva,p1-burst-params: Burst timing value for COM parameter for port 1.

			The fields for the above parameter must be as shown below:

			ceva,pN-burst-params = /bits/ 8 <BMX BNM SFD PTST>;

			BMX: COM Burst Maximum.

			BNM: COM Burst Nominal.

			SFD: Signal Failure Detection value.

			PTST: Partial to Slumber timer value.

  - ceva,p0-retry-params: Retry interval timing value for port 0.

  - ceva,p1-retry-params: Retry interval timing value for port 1.

			The fields for the above parameter must be as shown below:

			ceva,pN-retry-params = /bits/ 16 <RIT RCT>;

			RIT:  Retry Interval Timer.

			RCT:  Rate Change Timer.



Optional properties:

  - ceva,broken-gen2: limit to gen1 speed instead of gen2.

  - phys: phandle for the PHY device

  - resets: phandle to the reset controller for the SATA IP



Examples:

	ahci@fd0c0000 {

		compatible = "ceva,ahci-1v84";

		reg = <0xfd0c0000 0x200>;

		interrupt-parent = <&gic>;

		interrupts = <0 133 4>;

		clocks = <&clkc SATA_CLK_ID>;

		ceva,p0-cominit-params = /bits/ 8 <0x0F 0x25 0x18 0x29>;

		ceva,p0-comwake-params = /bits/ 8 <0x04 0x0B 0x08 0x0F>;

		ceva,p0-burst-params = /bits/ 8 <0x0A 0x08 0x4A 0x06>;

		ceva,p0-retry-params = /bits/ 16 <0x0216 0x7F06>;



		ceva,p1-cominit-params = /bits/ 8 <0x0F 0x25 0x18 0x29>;

		ceva,p1-comwake-params = /bits/ 8 <0x04 0x0B 0x08 0x0F>;

		ceva,p1-burst-params = /bits/ 8 <0x0A 0x08 0x4A 0x06>;

		ceva,p1-retry-params = /bits/ 16 <0x0216 0x7F06>;

		ceva,broken-gen2;

		phys = <&psgtr 1 PHY_TYPE_SATA 1 1>;

		resets = <&zynqmp_reset ZYNQMP_RESET_SATA>;

	};