diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2018-01-24 13:51:50 -0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-24 13:51:50 -0200 |
| commit | 2e4575e9ced4a5ac27cf4010c2e975c271b155f7 (patch) | |
| tree | fbeb9a6ed9d1248fa022a549bcd50a7750de8dbe /arch/arm/boot | |
| parent | 953c6e30c9701fda69ef08e2476c541dc4fb1453 (diff) | |
| parent | 0710597796a48009846e1aa72644c27e846296a9 (diff) | |
Merge pull request #22 from falstaff84/4.9-1.0.x-imx-stable-merge
4.9 1.0.x imx stable merge
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/am335x-evmsk.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/dra7.dtsi | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts index 975c36e332a2..8e6b3938bef9 100644 --- a/arch/arm/boot/dts/am335x-evmsk.dts +++ b/arch/arm/boot/dts/am335x-evmsk.dts @@ -668,6 +668,7 @@ ti,non-removable; bus-width = <4>; cap-power-off-card; + keep-power-in-suspend; pinctrl-names = "default"; pinctrl-0 = <&mmc2_pins>; diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi index 064d84f87e45..ce54a70b7695 100644 --- a/arch/arm/boot/dts/dra7.dtsi +++ b/arch/arm/boot/dts/dra7.dtsi @@ -282,6 +282,7 @@ device_type = "pci"; ranges = <0x81000000 0 0 0x03000 0 0x00010000 0x82000000 0 0x20013000 0x13000 0 0xffed000>; + bus-range = <0x00 0xff>; #interrupt-cells = <1>; num-lanes = <1>; linux,pci-domain = <0>; @@ -318,6 +319,7 @@ device_type = "pci"; ranges = <0x81000000 0 0 0x03000 0 0x00010000 0x82000000 0 0x30013000 0x13000 0 0xffed000>; + bus-range = <0x00 0xff>; #interrupt-cells = <1>; num-lanes = <1>; linux,pci-domain = <1>; |