diff options
| author | Rob Herring <robh@kernel.org> | 2020-03-10 14:32:14 -0500 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2020-03-10 14:32:14 -0500 |
| commit | eb32d1e45ecdc92b19bcbeae0a98c905820a780b (patch) | |
| tree | 7cba65bb6ff5a2437b52dfc0de8abc0e6d9eb2a7 /Documentation/devicetree/bindings/mmc | |
| parent | f15652859cbe34ec4f3667169facd86309f438d2 (diff) | |
| parent | d2334a91a3b01dce4f290b4536fcfa4b9e923a3d (diff) | |
| download | lwn-eb32d1e45ecdc92b19bcbeae0a98c905820a780b.tar.gz lwn-eb32d1e45ecdc92b19bcbeae0a98c905820a780b.zip | |
Merge branch 'dt/linus' into dt/next
Diffstat (limited to 'Documentation/devicetree/bindings/mmc')
| -rw-r--r-- | Documentation/devicetree/bindings/mmc/mmc-controller.yaml | 1 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/mmc/mmc-controller.yaml b/Documentation/devicetree/bindings/mmc/mmc-controller.yaml index 3c0df4016a12..8fded83c519a 100644 --- a/Documentation/devicetree/bindings/mmc/mmc-controller.yaml +++ b/Documentation/devicetree/bindings/mmc/mmc-controller.yaml @@ -370,6 +370,7 @@ examples: mmc3: mmc@1c12000 { #address-cells = <1>; #size-cells = <0>; + reg = <0x1c12000 0x200>; pinctrl-names = "default"; pinctrl-0 = <&mmc3_pins_a>; vmmc-supply = <®_vmmc3>; diff --git a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt index 19f5508a7569..4a9145ef15d6 100644 --- a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt +++ b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt @@ -124,7 +124,7 @@ not every application needs SDIO irq, e.g. MMC cards. pinctrl-1 = <&mmc1_idle>; pinctrl-2 = <&mmc1_sleep>; ... - interrupts-extended = <&intc 64 &gpio2 28 GPIO_ACTIVE_LOW>; + interrupts-extended = <&intc 64 &gpio2 28 IRQ_TYPE_LEVEL_LOW>; }; mmc1_idle : pinmux_cirq_pin { |