Commit 33b2e2f0c24d1ef3cd7f5f637973b0fc7e8b6152
Exists in
smarct4x-processor-sdk-linux-03.00.00.04
and in
2 other branches
Merge branch 'ti-linux-4.4.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel into ti-lsk-linux-4.4.y
TI-Feature: ti_linux_base_lsk TI-Tree: git@git.ti.com:ti-linux-kernel/ti-linux-kernel.git TI-Branch: ti-linux-4.4.y * 'ti-linux-4.4.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel: ti_config_fragments/connectivity.cfg: build matrix-keypad as module ARM: dts: keystone: remove bogus PCI IO resources in DT bindings Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
Showing 3 changed files Side-by-side Diff
arch/arm/boot/dts/keystone-k2e.dtsi
| ... | ... | @@ -134,8 +134,8 @@ |
| 134 | 134 | #address-cells = <3>; |
| 135 | 135 | #size-cells = <2>; |
| 136 | 136 | reg = <0x21021000 0x2000>, <0x21020000 0x1000>, <0x02620128 4>; |
| 137 | - ranges = <0x81000000 0 0 0x23260000 0x4000 0x4000 | |
| 138 | - 0x82000000 0 0x60000000 0x60000000 0 0x10000000>; | |
| 137 | + ranges = <0x82000000 0 0x60000000 0x60000000 | |
| 138 | + 0 0x10000000>; | |
| 139 | 139 | |
| 140 | 140 | status = "disabled"; |
| 141 | 141 | device_type = "pci"; |
arch/arm/boot/dts/keystone.dtsi
| ... | ... | @@ -313,8 +313,8 @@ |
| 313 | 313 | #address-cells = <3>; |
| 314 | 314 | #size-cells = <2>; |
| 315 | 315 | reg = <0x21801000 0x2000>, <0x21800000 0x1000>, <0x02620128 4>; |
| 316 | - ranges = <0x81000000 0 0 0x23250000 0 0x4000 | |
| 317 | - 0x82000000 0 0x50000000 0x50000000 0 0x10000000>; | |
| 316 | + ranges = <0x82000000 0 0x50000000 0x50000000 | |
| 317 | + 0 0x10000000>; | |
| 318 | 318 | |
| 319 | 319 | status = "disabled"; |
| 320 | 320 | device_type = "pci"; |