| ... | ... | @@ -494,7 +494,7 @@ |
| 494 | 494 | :000000 100644 0000000000000000000000000000000000000000 1f1b56e57346e3b939a4597b9242d2aacbcbc33d A	include/dt-bindings/reset/amlogic,meson8b-clkc-reset.h |
| 495 | 495 | |
| 496 | 496 | diff --git a/Documentation/devicetree/bindings/arm/amlogic.txt b/Documentation/devicetree/bindings/arm/amlogic.txt |
| 497 | | index 520cdd2127cf..4e4bc0bae597 100644 |
| 497 | index 520cdd2127cf8e864cc7975b0aab505922d88b13..4e4bc0bae597ad27b488a74c7b83762e7cb51a88 100644 |
| 498 | 498 | --- a/Documentation/devicetree/bindings/arm/amlogic.txt |
| 499 | 499 | +++ b/Documentation/devicetree/bindings/arm/amlogic.txt |
| 500 | 500 | @@ -1,6 +1,18 @@ |
| ... | ... | @@ -517,7 +517,7 @@ index 520cdd2127cf..4e4bc0bae597 100644 |
| 517 | 517 | Required root node property: |
| 518 | 518 | compatible: "amlogic,meson6" |
| 519 | 519 | diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt |
| 520 | | index 9c97de23919a..3e3efa046ac5 100644 |
| 520 | index 9c97de23919ae4312c3c42085393baf2536a727d..3e3efa046ac57ab49cee7d706cfff3b2d93c6247 100644 |
| 521 | 521 | --- a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt |
| 522 | 522 | +++ b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt |
| 523 | 523 | @@ -42,6 +42,10 @@ Raspberry Pi Zero |
| ... | ... | @@ -533,7 +533,7 @@ index 9c97de23919a..3e3efa046ac5 100644 |
| 533 | 533 | compatible = "brcm,bcm2835"; |
| 534 | 534 | diff --git a/Documentation/devicetree/bindings/arm/bhf.txt b/Documentation/devicetree/bindings/arm/bhf.txt |
| 535 | 535 | new file mode 100644 |
| 536 | | index 000000000000..886b503caf9c |
| 536 | index 0000000000000000000000000000000000000000..886b503caf9cc07b30c92f3027853e24ced181d2 |
| 537 | 537 | --- /dev/null |
| 538 | 538 | +++ b/Documentation/devicetree/bindings/arm/bhf.txt |
| 539 | 539 | @@ -0,0 +1,6 @@ |
| ... | ... | @@ -544,7 +544,7 @@ index 000000000000..886b503caf9c |
| 544 | 544 | +Required root node properties: |
| 545 | 545 | + - compatible = "bhf,cx9020", "fsl,imx53"; |
| 546 | 546 | diff --git a/Documentation/devicetree/bindings/arm/cpus.txt b/Documentation/devicetree/bindings/arm/cpus.txt |
| 547 | | index a44253cad269..b92f12bd5244 100644 |
| 547 | index a44253cad2692e2c209e4fa1f148ccd89415496c..b92f12bd5244a7e6fe911f8000f7a37e499e0e40 100644 |
| 548 | 548 | --- a/Documentation/devicetree/bindings/arm/cpus.txt |
| 549 | 549 | +++ b/Documentation/devicetree/bindings/arm/cpus.txt |
| 550 | 550 | @@ -200,6 +200,7 @@ described below. |
| ... | ... | @@ -557,7 +557,7 @@ index a44253cad269..b92f12bd5244 100644 |
| 557 | 557 | 			 "marvell,armada-375-smp" |
| 558 | 558 | diff --git a/Documentation/devicetree/bindings/arm/marvell/armada-8kp.txt b/Documentation/devicetree/bindings/arm/marvell/armada-8kp.txt |
| 559 | 559 | new file mode 100644 |
| 560 | | index 000000000000..f3e9624534c6 |
| 560 | index 0000000000000000000000000000000000000000..f3e9624534c6baf30cca4dc41fff5d65a1be129b |
| 561 | 561 | --- /dev/null |
| 562 | 562 | +++ b/Documentation/devicetree/bindings/arm/marvell/armada-8kp.txt |
| 563 | 563 | @@ -0,0 +1,15 @@ |
| ... | ... | @@ -577,7 +577,7 @@ index 000000000000..f3e9624534c6 |
| 577 | 577 | +compatible = "marvell,armada-8080-db", "marvell,armada-8080", |
| 578 | 578 | +	 "marvell,armada-ap810-octa", "marvell,armada-ap810" |
| 579 | 579 | diff --git a/Documentation/devicetree/bindings/arm/mediatek.txt b/Documentation/devicetree/bindings/arm/mediatek.txt |
| 580 | | index da7bd138e6f2..91d517849483 100644 |
| 580 | index da7bd138e6f2133bb43107e8b3cb8885f9791cb7..91d5178494834b57e2abe152bf5739a8930c0cd2 100644 |
| 581 | 581 | --- a/Documentation/devicetree/bindings/arm/mediatek.txt |
| 582 | 582 | +++ b/Documentation/devicetree/bindings/arm/mediatek.txt |
| 583 | 583 | @@ -1,12 +1,12 @@ |
| ... | ... | @@ -631,7 +631,7 @@ index da7bd138e6f2..91d517849483 100644 |
| 631 | 631 | Required root node properties: |
| 632 | 632 | - compatible = "mediatek,mt8127-moose", "mediatek,mt8127"; |
| 633 | 633 | diff --git a/Documentation/devicetree/bindings/arm/omap/omap.txt b/Documentation/devicetree/bindings/arm/omap/omap.txt |
| 634 | | index 9c6bebe43449..2ecc712bf707 100644 |
| 634 | index 9c6bebe434497479579460fce6bdbe2c2ca95853..2ecc712bf7075da21bd29104024a9c0fc15186f6 100644 |
| 635 | 635 | --- a/Documentation/devicetree/bindings/arm/omap/omap.txt |
| 636 | 636 | +++ b/Documentation/devicetree/bindings/arm/omap/omap.txt |
| 637 | 637 | @@ -157,6 +157,9 @@ Boards: |
| ... | ... | @@ -655,7 +655,7 @@ index 9c6bebe43449..2ecc712bf707 100644 |
| 655 | 655 | compatible = "ti,dra7-evm", "ti,dra742", "ti,dra74", "ti,dra7" |
| 656 | 656 | |
| 657 | 657 | diff --git a/Documentation/devicetree/bindings/arm/qcom.txt b/Documentation/devicetree/bindings/arm/qcom.txt |
| 658 | | index 028d16e72186..0ed4d39d7fe1 100644 |
| 658 | index 028d16e721862effcf95ee4e9055856255e99879..0ed4d39d7fe1876ec439a713576dfc4bf8d18518 100644 |
| 659 | 659 | --- a/Documentation/devicetree/bindings/arm/qcom.txt |
| 660 | 660 | +++ b/Documentation/devicetree/bindings/arm/qcom.txt |
| 661 | 661 | @@ -25,6 +25,7 @@ The 'SoC' element must be one of the following strings: |
| ... | ... | @@ -675,7 +675,7 @@ index 028d16e72186..0ed4d39d7fe1 100644 |
| 675 | 675 | The 'soc_version' and 'board_version' elements take the form of v<Major>.<Minor> |
| 676 | 676 | where the minor number may be omitted when it's zero, i.e. v1.0 is the same |
| 677 | 677 | diff --git a/Documentation/devicetree/bindings/arm/rockchip.txt b/Documentation/devicetree/bindings/arm/rockchip.txt |
| 678 | | index 11c0ac4a2d56..b003148e2945 100644 |
| 678 | index 11c0ac4a2d56686d04bd969c44ea3c9c7efeabe2..b003148e2945129ef834feacb5b198813195484e 100644 |
| 679 | 679 | --- a/Documentation/devicetree/bindings/arm/rockchip.txt |
| 680 | 680 | +++ b/Documentation/devicetree/bindings/arm/rockchip.txt |
| 681 | 681 | @@ -134,6 +134,10 @@ Rockchip platforms device tree bindings |
| ... | ... | @@ -705,7 +705,7 @@ index 11c0ac4a2d56..b003148e2945 100644 |
| 705 | 705 | Required root node properties: |
| 706 | 706 | - compatible = "tronsmart,orion-r68-meta", "rockchip,rk3368"; |
| 707 | 707 | diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt |
| 708 | | index 1a671e329864..ae75cb3b1331 100644 |
| 708 | index 1a671e3298643d9eaaec617b2b6183f77b380bed..ae75cb3b1331f82782c95a814d3a6bbda3f63857 100644 |
| 709 | 709 | --- a/Documentation/devicetree/bindings/arm/shmobile.txt |
| 710 | 710 | +++ b/Documentation/devicetree/bindings/arm/shmobile.txt |
| 711 | 711 | @@ -39,6 +39,8 @@ SoCs: |
| ... | ... | @@ -738,7 +738,7 @@ index 1a671e329864..ae75cb3b1331 100644 |
| 738 | 738 | compatible = "iwave,g20d", "iwave,g20m", "renesas,r8a7743" |
| 739 | 739 | - iWave Systems RZ/G1M Qseven System On Module (iW-RainboW-G20M-Qseven) |
| 740 | 740 | diff --git a/Documentation/devicetree/bindings/clock/amlogic,meson8b-clkc.txt b/Documentation/devicetree/bindings/clock/amlogic,meson8b-clkc.txt |
| 741 | | index 207682647d33..b455c5aa9139 100644 |
| 741 | index 207682647d33a41fd6bbee805dfebe2e8b04ef83..b455c5aa9139edba0223ba9c25270255b60a0d86 100644 |
| 742 | 742 | --- a/Documentation/devicetree/bindings/clock/amlogic,meson8b-clkc.txt |
| 743 | 743 | +++ b/Documentation/devicetree/bindings/clock/amlogic,meson8b-clkc.txt |
| 744 | 744 | @@ -16,18 +16,25 @@ Required Properties: |
| ... | ... | @@ -769,7 +769,7 @@ index 207682647d33..b455c5aa9139 100644 |
| 769 | 769 | |
| 770 | 770 | |
| 771 | 771 | diff --git a/Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt b/Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt |
| 772 | | index cb7ffc58c564..b1a8929c2536 100644 |
| 772 | index cb7ffc58c564722a04e18c562e83155c2a051a57..b1a8929c2536cc324a1d34073dabc2fe2ddf53cf 100644 |
| 773 | 773 | --- a/Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt |
| 774 | 774 | +++ b/Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt |
| 775 | 775 | @@ -13,6 +13,7 @@ Required properties: |
| ... | ... | @@ -781,7 +781,7 @@ index cb7ffc58c564..b1a8929c2536 100644 |
| 781 | 781 | |
| 782 | 782 | When compatible with generic versions, nodes must list the SoC-specific |
| 783 | 783 | diff --git a/Documentation/devicetree/bindings/display/renesas,du.txt b/Documentation/devicetree/bindings/display/renesas,du.txt |
| 784 | | index c6cb96a4fa93..4bbd1e9bf3be 100644 |
| 784 | index c6cb96a4fa939a5672b4770ba7f8673136cb0031..4bbd1e9bf3be40ee158be1e62a9be15167cec57c 100644 |
| 785 | 785 | --- a/Documentation/devicetree/bindings/display/renesas,du.txt |
| 786 | 786 | +++ b/Documentation/devicetree/bindings/display/renesas,du.txt |
| 787 | 787 | @@ -36,8 +36,10 @@ Required Properties: |
| ... | ... | @@ -862,7 +862,7 @@ index c6cb96a4fa93..4bbd1e9bf3be 100644 |
| 862 | 862 | 			}; |
| 863 | 863 | 		}; |
| 864 | 864 | diff --git a/Documentation/devicetree/bindings/dma/ti-edma.txt b/Documentation/devicetree/bindings/dma/ti-edma.txt |
| 865 | | index 33d9e386dc45..41f0c1a07c56 100644 |
| 865 | index 33d9e386dc45c457de837fe8d7209b4302d54003..41f0c1a07c562b754fd2324d7a41d9cb6df52158 100644 |
| 866 | 866 | --- a/Documentation/devicetree/bindings/dma/ti-edma.txt |
| 867 | 867 | +++ b/Documentation/devicetree/bindings/dma/ti-edma.txt |
| 868 | 868 | @@ -9,7 +9,12 @@ execute the actual DMA tansfer. |
| ... | ... | @@ -998,7 +998,7 @@ index 33d9e386dc45..41f0c1a07c56 100644 |
| 998 | 998 | DEPRECATED binding, new DTS files must use the ti,edma3-tpcc/ti,edma3-tptc |
| 999 | 999 | binding. |
| 1000 | 1000 | diff --git a/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt b/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt |
| 1001 | | index 5aa5926029ee..039219df05c5 100644 |
| 1001 | index 5aa5926029ee7286c4cd2e41a446574c13102021..039219df05c5f69836a39bac48bac64ce33d476a 100644 |
| 1002 | 1002 | --- a/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt |
| 1003 | 1003 | +++ b/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt |
| 1004 | 1004 | @@ -17,6 +17,7 @@ Required properties: |
| ... | ... | @@ -1010,7 +1010,7 @@ index 5aa5926029ee..039219df05c5 100644 |
| 1010 | 1010 | - reg : Physical base address of the device and length of the register area. |
| 1011 | 1011 | |
| 1012 | 1012 | diff --git a/Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt b/Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt |
| 1013 | | index 11cc87aeb276..07bf0b9a5139 100644 |
| 1013 | index 11cc87aeb276f0a25b869ba53ed2b6b9213888d8..07bf0b9a5139fed3d5297d495bab184111deb9f9 100644 |
| 1014 | 1014 | --- a/Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt |
| 1015 | 1015 | +++ b/Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt |
| 1016 | 1016 | @@ -17,6 +17,7 @@ Required properties: |
| ... | ... | @@ -1022,7 +1022,7 @@ index 11cc87aeb276..07bf0b9a5139 100644 |
| 1022 | 1022 | - interrupt-controller : Identifies the node as an interrupt controller |
| 1023 | 1023 | - #interrupt-cells : Use the same format as specified by GIC in arm,gic.txt. |
| 1024 | 1024 | diff --git a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt |
| 1025 | | index 0e026c151c1c..3a4ac401e6f9 100644 |
| 1025 | index 0e026c151c1c1a1aa3191129658dc5788f2ed4f2..3a4ac401e6f93a9d8ce3becd4d75410f95f1e50d 100644 |
| 1026 | 1026 | --- a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt |
| 1027 | 1027 | +++ b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt |
| 1028 | 1028 | @@ -1,33 +1,55 @@ |
| ... | ... | @@ -1097,7 +1097,7 @@ index 0e026c151c1c..3a4ac401e6f9 100644 |
| 1097 | 1097 | Examples: |
| 1098 | 1098 | |
| 1099 | 1099 | diff --git a/Documentation/devicetree/bindings/net/can/c_can.txt b/Documentation/devicetree/bindings/net/can/c_can.txt |
| 1100 | | index 5a1d8b0c39e9..2d504256b0d8 100644 |
| 1100 | index 5a1d8b0c39e97af6d3ef56589f0196541d912a51..2d504256b0d8e73183ebe114158f194a85e964d8 100644 |
| 1101 | 1101 | --- a/Documentation/devicetree/bindings/net/can/c_can.txt |
| 1102 | 1102 | +++ b/Documentation/devicetree/bindings/net/can/c_can.txt |
| 1103 | 1103 | @@ -11,9 +11,20 @@ Required properties: |
| ... | ... | @@ -1123,7 +1123,7 @@ index 5a1d8b0c39e9..2d504256b0d8 100644 |
| 1123 | 1123 | 			 RAMINIT register, register offset to the RAMINIT |
| 1124 | 1124 | 			 register and the CAN instance number (0 offset). |
| 1125 | 1125 | diff --git a/Documentation/devicetree/bindings/net/mediatek-net.txt b/Documentation/devicetree/bindings/net/mediatek-net.txt |
| 1126 | | index 1d1168b805cc..214eaa9a6683 100644 |
| 1126 | index 1d1168b805cc8ab2e9607be5dd1068d391d89ff2..214eaa9a6683861fd529d2af6fb84e361b27d80d 100644 |
| 1127 | 1127 | --- a/Documentation/devicetree/bindings/net/mediatek-net.txt |
| 1128 | 1128 | +++ b/Documentation/devicetree/bindings/net/mediatek-net.txt |
| 1129 | 1129 | @@ -20,8 +20,10 @@ Required properties: |
| ... | ... | @@ -1140,7 +1140,7 @@ index 1d1168b805cc..214eaa9a6683 100644 |
| 1140 | 1140 | - mediatek,sgmiisys: phandle to the syscon node that handles the SGMII setup |
| 1141 | 1141 | 	which is required for those SoCs equipped with SGMII such as MT7622 SoC. |
| 1142 | 1142 | diff --git a/Documentation/devicetree/bindings/pci/mvebu-pci.txt b/Documentation/devicetree/bindings/pci/mvebu-pci.txt |
| 1143 | | index 127ae1f53e5a..6173af6885f8 100644 |
| 1143 | index 127ae1f53e5a2d5b4da6893efc7fba898a14fd27..6173af6885f86731a9e81182737afc0a185cd212 100644 |
| 1144 | 1144 | --- a/Documentation/devicetree/bindings/pci/mvebu-pci.txt |
| 1145 | 1145 | +++ b/Documentation/devicetree/bindings/pci/mvebu-pci.txt |
| 1146 | 1146 | @@ -276,7 +276,7 @@ pcie-controller { |
| ... | ... | @@ -1153,7 +1153,7 @@ index 127ae1f53e5a..6173af6885f8 100644 |
| 1153 | 1153 | 		assigned-addresses = <0x82005000 0 0x82000 0 0x2000>; |
| 1154 | 1154 | 		reg = <0x5000 0 0 0 0>; |
| 1155 | 1155 | diff --git a/Documentation/devicetree/bindings/power/renesas,apmu.txt b/Documentation/devicetree/bindings/power/renesas,apmu.txt |
| 1156 | | index 84404c9edff7..af21502e939c 100644 |
| 1156 | index 84404c9edff73d97df9384fb0ce801343d780b0b..af21502e939c4b1f6866e80f7325342833b133c0 100644 |
| 1157 | 1157 | --- a/Documentation/devicetree/bindings/power/renesas,apmu.txt |
| 1158 | 1158 | +++ b/Documentation/devicetree/bindings/power/renesas,apmu.txt |
| 1159 | 1159 | @@ -1,12 +1,13 @@ |
| ... | ... | @@ -1172,7 +1172,7 @@ index 84404c9edff7..af21502e939c 100644 |
| 1172 | 1172 | 		- "renesas,r8a7791-apmu" (R-Car M2-W) |
| 1173 | 1173 | 		- "renesas,r8a7792-apmu" (R-Car V2H) |
| 1174 | 1174 | diff --git a/Documentation/devicetree/bindings/serial/mtk-uart.txt b/Documentation/devicetree/bindings/serial/mtk-uart.txt |
| 1175 | | index b6cf384597e1..f73abff3de43 100644 |
| 1175 | index b6cf384597e1dabc5f5e090982235f0e0c56128a..f73abff3de43bcdb0ecdaabc0f4f23a470d7268d 100644 |
| 1176 | 1176 | --- a/Documentation/devicetree/bindings/serial/mtk-uart.txt |
| 1177 | 1177 | +++ b/Documentation/devicetree/bindings/serial/mtk-uart.txt |
| 1178 | 1178 | @@ -3,6 +3,7 @@ |
| ... | ... | @@ -1184,7 +1184,7 @@ index b6cf384597e1..f73abff3de43 100644 |
| 1184 | 1184 | * "mediatek,mt6582-uart" for MT6582 compatible UARTS |
| 1185 | 1185 | * "mediatek,mt6589-uart" for MT6589 compatible UARTS |
| 1186 | 1186 | diff --git a/Documentation/devicetree/bindings/soc/rockchip/grf.txt b/Documentation/devicetree/bindings/soc/rockchip/grf.txt |
| 1187 | | index cc9f05d3cbc1..7dc5ce858a0e 100644 |
| 1187 | index cc9f05d3cbc1a0b08a2a278364332b8114b027a3..7dc5ce858a0ee3a6659cc0be7a0d3194f7a6fa3e 100644 |
| 1188 | 1188 | --- a/Documentation/devicetree/bindings/soc/rockchip/grf.txt |
| 1189 | 1189 | +++ b/Documentation/devicetree/bindings/soc/rockchip/grf.txt |
| 1190 | 1190 | @@ -21,6 +21,7 @@ Required Properties: |
| ... | ... | @@ -1205,7 +1205,7 @@ index cc9f05d3cbc1..7dc5ce858a0e 100644 |
| 1205 | 1205 | region. |
| 1206 | 1206 | |
| 1207 | 1207 | diff --git a/Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt b/Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt |
| 1208 | | index c705db07d820..66e6265fb0aa 100644 |
| 1208 | index c705db07d8206d74835c729cf6253d97a7227df0..66e6265fb0aa2f2af147c63a776c86bb9a52096f 100644 |
| 1209 | 1209 | --- a/Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt |
| 1210 | 1210 | +++ b/Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt |
| 1211 | 1211 | @@ -46,12 +46,13 @@ Required Properties: |
| ... | ... | @@ -1226,7 +1226,7 @@ index c705db07d820..66e6265fb0aa 100644 |
| 1226 | 1226 | 	}; |
| 1227 | 1227 | diff --git a/Documentation/devicetree/bindings/sram/renesas,smp-sram.txt b/Documentation/devicetree/bindings/sram/renesas,smp-sram.txt |
| 1228 | 1228 | new file mode 100644 |
| 1229 | | index 000000000000..712d05e3e15e |
| 1229 | index 0000000000000000000000000000000000000000..712d05e3e15eeb65faaed7de21f6533ab6bcbb47 |
| 1230 | 1230 | --- /dev/null |
| 1231 | 1231 | +++ b/Documentation/devicetree/bindings/sram/renesas,smp-sram.txt |
| 1232 | 1232 | @@ -0,0 +1,27 @@ |
| ... | ... | @@ -1258,7 +1258,7 @@ index 000000000000..712d05e3e15e |
| 1258 | 1258 | +		}; |
| 1259 | 1259 | +	}; |
| 1260 | 1260 | diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt |
| 1261 | | index 5a79aeb620b3..69183f0fbc78 100644 |
| 1261 | index 5a79aeb620b3a206434bd45bf2410a7ed47db7cb..69183f0fbc7873f13e9b4516a34e3dde41686ab7 100644 |
| 1262 | 1262 | --- a/Documentation/devicetree/bindings/vendor-prefixes.txt |
| 1263 | 1263 | +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt |
| 1264 | 1264 | @@ -48,6 +48,7 @@ avic	Shanghai AVIC Optoelectronics Co., Ltd. |
| ... | ... | @@ -1270,7 +1270,7 @@ index 5a79aeb620b3..69183f0fbc78 100644 |
| 1270 | 1270 | bosch	Bosch Sensortec GmbH |
| 1271 | 1271 | boundary	Boundary Devices Inc. |
| 1272 | 1272 | diff --git a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt |
| 1273 | | index 6a00939a059a..20ada673ab0c 100644 |
| 1273 | index 6a00939a059a1185c5e4ece5bbcd388131bb4987..20ada673ab0c17a1647be7eeb80353aedea64ceb 100644 |
| 1274 | 1274 | --- a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt |
| 1275 | 1275 | +++ b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt |
| 1276 | 1276 | @@ -3,9 +3,9 @@ Mediatek SoCs Watchdog timer |
| ... | ... | @@ -1287,7 +1287,7 @@ index 6a00939a059a..20ada673ab0c 100644 |
| 1287 | 1287 | - reg : Specifies base physical address and size of the registers. |
| 1288 | 1288 | |
| 1289 | 1289 | diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile |
| 1290 | | index 4b17f35dc9a7..faf46abaa4a2 100644 |
| 1290 | index 4b17f35dc9a7167bcce9b5c9c9b35b7375add15c..faf46abaa4a2773721a0c30b012a2ae52308daae 100644 |
| 1291 | 1291 | --- a/arch/arm/boot/dts/Makefile |
| 1292 | 1292 | +++ b/arch/arm/boot/dts/Makefile |
| 1293 | 1293 | @@ -46,6 +46,7 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ |
| ... | ... | @@ -1414,7 +1414,7 @@ index 4b17f35dc9a7..faf46abaa4a2 100644 |
| 1414 | 1414 | 	mt8135-evbp1.dtb |
| 1415 | 1415 | dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb |
| 1416 | 1416 | diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi |
| 1417 | | index 1d154444dfef..48a15fc641f2 100644 |
| 1417 | index 1d154444dfef245bf60e6336da038d1ff766512e..48a15fc641f22e40301c505625fc331efc4610e9 100644 |
| 1418 | 1418 | --- a/arch/arm/boot/dts/am335x-bone-common.dtsi |
| 1419 | 1419 | +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi |
| 1420 | 1420 | @@ -319,13 +319,10 @@ &tps { |
| ... | ... | @@ -1432,7 +1432,7 @@ index 1d154444dfef..48a15fc641f2 100644 |
| 1432 | 1432 | 	}; |
| 1433 | 1433 | |
| 1434 | 1434 | diff --git a/arch/arm/boot/dts/am335x-chiliboard.dts b/arch/arm/boot/dts/am335x-chiliboard.dts |
| 1435 | | index d8769799772e..59431b235944 100644 |
| 1435 | index d8769799772ea6cdacb0693427648cf61e0f0879..59431b23594489dd3f211c0be1a93c031d3c0c46 100644 |
| 1436 | 1436 | --- a/arch/arm/boot/dts/am335x-chiliboard.dts |
| 1437 | 1437 | +++ b/arch/arm/boot/dts/am335x-chiliboard.dts |
| 1438 | 1438 | @@ -191,13 +191,10 @@ &tps { |
| ... | ... | @@ -1450,7 +1450,7 @@ index d8769799772e..59431b235944 100644 |
| 1450 | 1450 | 	}; |
| 1451 | 1451 | }; |
| 1452 | 1452 | diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts |
| 1453 | | index 1c37a7c1ea17..ddd897556e03 100644 |
| 1453 | index 1c37a7c1ea17dd76fc2686c1bd9dd17acc250d99..ddd897556e035b6306306ca33eccc65c7ed45e3b 100644 |
| 1454 | 1454 | --- a/arch/arm/boot/dts/am335x-evm.dts |
| 1455 | 1455 | +++ b/arch/arm/boot/dts/am335x-evm.dts |
| 1456 | 1456 | @@ -531,6 +531,7 @@ nand@0,0 { |
| ... | ... | @@ -1463,7 +1463,7 @@ index 1c37a7c1ea17..ddd897556e03 100644 |
| 1463 | 1463 | 		nand-bus-width = <8>; |
| 1464 | 1464 | diff --git a/arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts b/arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts |
| 1465 | 1465 | new file mode 100644 |
| 1466 | | index 000000000000..f82233cd18e0 |
| 1466 | index 0000000000000000000000000000000000000000..f82233cd18e0bf5b7ddd9c673a15bd28dd7d1994 |
| 1467 | 1467 | --- /dev/null |
| 1468 | 1468 | +++ b/arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts |
| 1469 | 1469 | @@ -0,0 +1,525 @@ |
| ... | ... | @@ -1993,7 +1993,7 @@ index 000000000000..f82233cd18e0 |
| 1993 | 1993 | +	}; |
| 1994 | 1994 | +}; |
| 1995 | 1995 | diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts |
| 1996 | | index 29a538ecd405..afb8eb0a0a16 100644 |
| 1996 | index 29a538ecd405db81959e839768dc2731d10a63aa..afb8eb0a0a16ee63ea1ece64e694ac847c249067 100644 |
| 1997 | 1997 | --- a/arch/arm/boot/dts/am437x-gp-evm.dts |
| 1998 | 1998 | +++ b/arch/arm/boot/dts/am437x-gp-evm.dts |
| 1999 | 1999 | @@ -149,6 +149,13 @@ sound0_master: simple-audio-card,codec { |
| ... | ... | @@ -2033,7 +2033,7 @@ index 29a538ecd405..afb8eb0a0a16 100644 |
| 2033 | 2033 | 		ti,elm-id = <&elm>; |
| 2034 | 2034 | 		nand-bus-width = <8>; |
| 2035 | 2035 | diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts |
| 2036 | | index 54f40f370011..9d276af7c539 100644 |
| 2036 | index 54f40f370011c211664a6583a845146b50b996af..9d276af7c539f3dd1cb382f12d4bca7d9bd2fb3d 100644 |
| 2037 | 2037 | --- a/arch/arm/boot/dts/am43x-epos-evm.dts |
| 2038 | 2038 | +++ b/arch/arm/boot/dts/am43x-epos-evm.dts |
| 2039 | 2039 | @@ -564,6 +564,7 @@ nand@0,0 { |
| ... | ... | @@ -2045,7 +2045,7 @@ index 54f40f370011..9d276af7c539 100644 |
| 2045 | 2045 | 		ti,elm-id = <&elm>; |
| 2046 | 2046 | 		nand-bus-width = <8>; |
| 2047 | 2047 | diff --git a/arch/arm/boot/dts/am571x-idk.dts b/arch/arm/boot/dts/am571x-idk.dts |
| 2048 | | index 7b207835b2d1..debf9464403e 100644 |
| 2048 | index 7b207835b2d161244fc8e09126fe384bf7eae9fa..debf9464403ef52a5c4b7e27135b1a5ed5778fd2 100644 |
| 2049 | 2049 | --- a/arch/arm/boot/dts/am571x-idk.dts |
| 2050 | 2050 | +++ b/arch/arm/boot/dts/am571x-idk.dts |
| 2051 | 2051 | @@ -11,6 +11,7 @@ |
| ... | ... | @@ -2102,7 +2102,7 @@ index 7b207835b2d1..debf9464403e 100644 |
| 2102 | 2102 | +	pinctrl-2 = <&mmc2_pins_ddr_rev20 &mmc2_iodelay_ddr_conf>; |
| 2103 | 2103 | +}; |
| 2104 | 2104 | diff --git a/arch/arm/boot/dts/am572x-idk.dts b/arch/arm/boot/dts/am572x-idk.dts |
| 2105 | | index 9da6d83ca185..a578fe97ba3b 100644 |
| 2105 | index 9da6d83ca185e52c79ea4ebd180fb1d21144280c..a578fe97ba3bd9ec210df3f1827cc936a748d2bd 100644 |
| 2106 | 2106 | --- a/arch/arm/boot/dts/am572x-idk.dts |
| 2107 | 2107 | +++ b/arch/arm/boot/dts/am572x-idk.dts |
| 2108 | 2108 | @@ -12,6 +12,7 @@ |
| ... | ... | @@ -2165,7 +2165,7 @@ index 9da6d83ca185..a578fe97ba3b 100644 |
| 2165 | 2165 | }; |
| 2166 | 2166 | |
| 2167 | 2167 | diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi |
| 2168 | | index fdfe5b16b806..49aeecd312b4 100644 |
| 2168 | index fdfe5b16b806298a1aac3a136a873dfc2ab891df..49aeecd312b4b10af2cb3badd68a4982fa8a921d 100644 |
| 2169 | 2169 | --- a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi |
| 2170 | 2170 | +++ b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi |
| 2171 | 2171 | @@ -9,6 +9,7 @@ |
| ... | ... | @@ -2226,7 +2226,7 @@ index fdfe5b16b806..49aeecd312b4 100644 |
| 2226 | 2226 | }; |
| 2227 | 2227 | |
| 2228 | 2228 | diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts b/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts |
| 2229 | | index 39a92aff0a0d..5a77b334923d 100644 |
| 2229 | index 39a92aff0a0dc5338d29c13949001e2558f17474..5a77b334923d051f6943730b8d51849fe6161596 100644 |
| 2230 | 2230 | --- a/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts |
| 2231 | 2231 | +++ b/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts |
| 2232 | 2232 | @@ -19,8 +19,23 @@ &tpd12s015 { |
| ... | ... | @@ -2256,7 +2256,7 @@ index 39a92aff0a0d..5a77b334923d 100644 |
| 2256 | 2256 | /* errata i880 "Ethernet RGMII2 Limited to 10/100 Mbps" */ |
| 2257 | 2257 | diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-revc.dts b/arch/arm/boot/dts/am57xx-beagle-x15-revc.dts |
| 2258 | 2258 | new file mode 100644 |
| 2259 | | index 000000000000..17c41da3b55f |
| 2259 | index 0000000000000000000000000000000000000000..17c41da3b55f1c7d94460f98647f0fdb084a9dbe |
| 2260 | 2260 | --- /dev/null |
| 2261 | 2261 | +++ b/arch/arm/boot/dts/am57xx-beagle-x15-revc.dts |
| 2262 | 2262 | @@ -0,0 +1,39 @@ |
| ... | ... | @@ -2300,7 +2300,7 @@ index 000000000000..17c41da3b55f |
| 2300 | 2300 | +	pinctrl-2 = <&mmc2_pins_ddr_rev20>; |
| 2301 | 2301 | +}; |
| 2302 | 2302 | diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts |
| 2303 | | index 19a60a11c198..d6689106d2a8 100644 |
| 2303 | index 19a60a11c19890d49f608e12c4a4c3a5d3c822bc..d6689106d2a83935ea6ac98fd89f42ce06132879 100644 |
| 2304 | 2304 | --- a/arch/arm/boot/dts/am57xx-beagle-x15.dts |
| 2305 | 2305 | +++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts |
| 2306 | 2306 | @@ -20,9 +20,20 @@ &tpd12s015 { |
| ... | ... | @@ -2325,7 +2325,7 @@ index 19a60a11c198..d6689106d2a8 100644 |
| 2325 | 2325 | &phy1 { |
| 2326 | 2326 | 	max-speed = <100>; |
| 2327 | 2327 | diff --git a/arch/arm/boot/dts/am57xx-idk-common.dtsi b/arch/arm/boot/dts/am57xx-idk-common.dtsi |
| 2328 | | index c536b2f5389f..97aa8e6a56da 100644 |
| 2328 | index c536b2f5389f2786930a48eb0f7446311c622121..97aa8e6a56da8f7c8722f5243e01fca0e944f629 100644 |
| 2329 | 2329 | --- a/arch/arm/boot/dts/am57xx-idk-common.dtsi |
| 2330 | 2330 | +++ b/arch/arm/boot/dts/am57xx-idk-common.dtsi |
| 2331 | 2331 | @@ -399,6 +399,14 @@ &usb2 { |
| ... | ... | @@ -2344,7 +2344,7 @@ index c536b2f5389f..97aa8e6a56da 100644 |
| 2344 | 2344 | 	status = "okay"; |
| 2345 | 2345 | 	vmmc-supply = <&v3_3d>; |
| 2346 | 2346 | diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi |
| 2347 | | index f9cf1273f35e..b1cf5a26f3c2 100644 |
| 2347 | index f9cf1273f35e0ae65dd4398037f9662bcf4ff28e..b1cf5a26f3c2a460b7b9d8fc41127c30cf2cc533 100644 |
| 2348 | 2348 | --- a/arch/arm/boot/dts/armada-370.dtsi |
| 2349 | 2349 | +++ b/arch/arm/boot/dts/armada-370.dtsi |
| 2350 | 2350 | @@ -72,7 +72,7 @@ bootrom { |
| ... | ... | @@ -2373,7 +2373,7 @@ index f9cf1273f35e..b1cf5a26f3c2 100644 |
| 2373 | 2373 | 				interrupt-map = <0 0 0 0 &mpic 62>; |
| 2374 | 2374 | 				marvell,pcie-port = <1>; |
| 2375 | 2375 | diff --git a/arch/arm/boot/dts/armada-375.dtsi b/arch/arm/boot/dts/armada-375.dtsi |
| 2376 | | index 50c5e8417802..7225c7ce9a8d 100644 |
| 2376 | index 50c5e8417802cd42c3beee13bcf9a23b3a127791..7225c7ce9a8dbca5cb909c0c1b55376072c2e263 100644 |
| 2377 | 2377 | --- a/arch/arm/boot/dts/armada-375.dtsi |
| 2378 | 2378 | +++ b/arch/arm/boot/dts/armada-375.dtsi |
| 2379 | 2379 | @@ -582,7 +582,7 @@ coredivclk: corediv-clock@e8250 { |
| ... | ... | @@ -2402,7 +2402,7 @@ index 50c5e8417802..7225c7ce9a8d 100644 |
| 2402 | 2402 | 				interrupt-map = <0 0 0 0 &gic GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>; |
| 2403 | 2403 | 				marvell,pcie-port = <0>; |
| 2404 | 2404 | diff --git a/arch/arm/boot/dts/armada-380.dtsi b/arch/arm/boot/dts/armada-380.dtsi |
| 2405 | | index e392f6036f39..132596fd0860 100644 |
| 2405 | index e392f6036f3956a7b2494d7fb502f5b5a3a99349..132596fd08603e68d458cb264ae23ca48c0c7929 100644 |
| 2406 | 2406 | --- a/arch/arm/boot/dts/armada-380.dtsi |
| 2407 | 2407 | +++ b/arch/arm/boot/dts/armada-380.dtsi |
| 2408 | 2408 | @@ -71,7 +71,7 @@ pinctrl@18000 { |
| ... | ... | @@ -2439,7 +2439,7 @@ index e392f6036f39..132596fd0860 100644 |
| 2439 | 2439 | 				interrupt-map = <0 0 0 0 &gic GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>; |
| 2440 | 2440 | 				marvell,pcie-port = <2>; |
| 2441 | 2441 | diff --git a/arch/arm/boot/dts/armada-385-db-ap.dts b/arch/arm/boot/dts/armada-385-db-ap.dts |
| 2442 | | index db5b9f6b615d..25d2d720dc0e 100644 |
| 2442 | index db5b9f6b615d8f8ea430f7ae790bc82858add8e8..25d2d720dc0e2cacc98b402e609e0fe78eb01acb 100644 |
| 2443 | 2443 | --- a/arch/arm/boot/dts/armada-385-db-ap.dts |
| 2444 | 2444 | +++ b/arch/arm/boot/dts/armada-385-db-ap.dts |
| 2445 | 2445 | @@ -209,7 +209,7 @@ bm-bppi { |
| ... | ... | @@ -2452,7 +2452,7 @@ index db5b9f6b615d..25d2d720dc0e 100644 |
| 2452 | 2452 | |
| 2453 | 2453 | 			/* |
| 2454 | 2454 | diff --git a/arch/arm/boot/dts/armada-385-turris-omnia.dts b/arch/arm/boot/dts/armada-385-turris-omnia.dts |
| 2455 | | index be16ce39fb3d..06831e1e3f80 100644 |
| 2455 | index be16ce39fb3d659f4833722063a26aa043bace11..06831e1e3f808b8419b299e72d8dfbd94568de3f 100644 |
| 2456 | 2456 | --- a/arch/arm/boot/dts/armada-385-turris-omnia.dts |
| 2457 | 2457 | +++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts |
| 2458 | 2458 | @@ -96,7 +96,7 @@ usb3@f8000 { |
| ... | ... | @@ -2465,7 +2465,7 @@ index be16ce39fb3d..06831e1e3f80 100644 |
| 2465 | 2465 | |
| 2466 | 2466 | 			pcie@1,0 { |
| 2467 | 2467 | diff --git a/arch/arm/boot/dts/armada-385.dtsi b/arch/arm/boot/dts/armada-385.dtsi |
| 2468 | | index 7fcc4c4885cf..74863aff01c6 100644 |
| 2468 | index 7fcc4c4885cffa9b51fe8c1c9911e4ea3cfcc138..74863aff01c6e0259576403ae22ece1cc12a7d4d 100644 |
| 2469 | 2469 | --- a/arch/arm/boot/dts/armada-385.dtsi |
| 2470 | 2470 | +++ b/arch/arm/boot/dts/armada-385.dtsi |
| 2471 | 2471 | @@ -70,7 +70,7 @@ cpu@1 { |
| ... | ... | @@ -2510,7 +2510,7 @@ index 7fcc4c4885cf..74863aff01c6 100644 |
| 2510 | 2510 | 				interrupt-map = <0 0 0 0 &gic GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>; |
| 2511 | 2511 | 				marvell,pcie-port = <3>; |
| 2512 | 2512 | diff --git a/arch/arm/boot/dts/armada-388-clearfog.dts b/arch/arm/boot/dts/armada-388-clearfog.dts |
| 2513 | | index 0d5f1f062275..ee7b0089eff0 100644 |
| 2513 | index 0d5f1f06227568389c072194bf7da8ae6957012d..ee7b0089eff035a7f0fda7ed43b6878183c6c53a 100644 |
| 2514 | 2514 | --- a/arch/arm/boot/dts/armada-388-clearfog.dts |
| 2515 | 2515 | +++ b/arch/arm/boot/dts/armada-388-clearfog.dts |
| 2516 | 2516 | @@ -62,7 +62,7 @@ usb3@f0000 { |
| ... | ... | @@ -2523,7 +2523,7 @@ index 0d5f1f062275..ee7b0089eff0 100644 |
| 2523 | 2523 | 				/* Port 2, Lane 0. CON2, nearest CPU. */ |
| 2524 | 2524 | 				reset-gpios = <&expander0 2 GPIO_ACTIVE_LOW>; |
| 2525 | 2525 | diff --git a/arch/arm/boot/dts/armada-388-clearfog.dtsi b/arch/arm/boot/dts/armada-388-clearfog.dtsi |
| 2526 | | index 0f5938bede53..68acfc968706 100644 |
| 2526 | index 0f5938bede53c30ce84f24a9a9b733517cc52118..68acfc9687069bf141c01309608b8806920bb446 100644 |
| 2527 | 2527 | --- a/arch/arm/boot/dts/armada-388-clearfog.dtsi |
| 2528 | 2528 | +++ b/arch/arm/boot/dts/armada-388-clearfog.dtsi |
| 2529 | 2529 | @@ -104,7 +104,7 @@ usb3@f8000 { |
| ... | ... | @@ -2536,7 +2536,7 @@ index 0f5938bede53..68acfc968706 100644 |
| 2536 | 2536 | 			/* |
| 2537 | 2537 | 			 * The two PCIe units are accessible through |
| 2538 | 2538 | diff --git a/arch/arm/boot/dts/armada-388-db.dts b/arch/arm/boot/dts/armada-388-db.dts |
| 2539 | | index 1ac923826445..a4ec1fa37529 100644 |
| 2539 | index 1ac923826445495edd6f725b44ce9c2134a5382f..a4ec1fa3752979fd30a1c9870a072d217c374b18 100644 |
| 2540 | 2540 | --- a/arch/arm/boot/dts/armada-388-db.dts |
| 2541 | 2541 | +++ b/arch/arm/boot/dts/armada-388-db.dts |
| 2542 | 2542 | @@ -172,7 +172,7 @@ bm-bppi { |
| ... | ... | @@ -2549,7 +2549,7 @@ index 1ac923826445..a4ec1fa37529 100644 |
| 2549 | 2549 | 			/* |
| 2550 | 2550 | 			 * The two PCIe units are accessible through |
| 2551 | 2551 | diff --git a/arch/arm/boot/dts/armada-388-gp.dts b/arch/arm/boot/dts/armada-388-gp.dts |
| 2552 | | index 563901e0ec07..f503955dbd3b 100644 |
| 2552 | index 563901e0ec071f0c66a4590b17fe5c3f6cfcbd69..f503955dbd3b810db157344e3f9cf48dadd4b1ca 100644 |
| 2553 | 2553 | --- a/arch/arm/boot/dts/armada-388-gp.dts |
| 2554 | 2554 | +++ b/arch/arm/boot/dts/armada-388-gp.dts |
| 2555 | 2555 | @@ -240,7 +240,7 @@ bm-bppi { |
| ... | ... | @@ -2562,7 +2562,7 @@ index 563901e0ec07..f503955dbd3b 100644 |
| 2562 | 2562 | 			/* |
| 2563 | 2563 | 			 * One PCIe units is accessible through |
| 2564 | 2564 | diff --git a/arch/arm/boot/dts/armada-388-rd.dts b/arch/arm/boot/dts/armada-388-rd.dts |
| 2565 | | index af82f275eac2..9cc3ca0376b9 100644 |
| 2565 | index af82f275eac248791a2286b49c87bfd7c536db08..9cc3ca0376b934e10c863735f3e9a14ee72c0ee1 100644 |
| 2566 | 2566 | --- a/arch/arm/boot/dts/armada-388-rd.dts |
| 2567 | 2567 | +++ b/arch/arm/boot/dts/armada-388-rd.dts |
| 2568 | 2568 | @@ -117,7 +117,7 @@ usb3@f0000 { |
| ... | ... | @@ -2575,7 +2575,7 @@ index af82f275eac2..9cc3ca0376b9 100644 |
| 2575 | 2575 | 			/* |
| 2576 | 2576 | 			 * One PCIe units is accessible through |
| 2577 | 2577 | diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi |
| 2578 | | index af31f5d6c0e5..7ff0811e61db 100644 |
| 2578 | index af31f5d6c0e571f607fa47eb7aa00094d3ffdcb9..7ff0811e61db3ad73be8f0c9ea8f79ebde1681c7 100644 |
| 2579 | 2579 | --- a/arch/arm/boot/dts/armada-38x.dtsi |
| 2580 | 2580 | +++ b/arch/arm/boot/dts/armada-38x.dtsi |
| 2581 | 2581 | @@ -154,6 +154,13 @@ scu@c000 { |
| ... | ... | @@ -2593,7 +2593,7 @@ index af31f5d6c0e5..7ff0811e61db 100644 |
| 2593 | 2593 | 				compatible = "arm,cortex-a9-twd-timer"; |
| 2594 | 2594 | 				reg = <0xc600 0x20>; |
| 2595 | 2595 | diff --git a/arch/arm/boot/dts/armada-390-db.dts b/arch/arm/boot/dts/armada-390-db.dts |
| 2596 | | index 2afed2ce4741..c718a5242595 100644 |
| 2596 | index 2afed2ce47412dce518785bdc1092c27b08766fb..c718a5242595f4157215ea476fccc998372bbccf 100644 |
| 2597 | 2597 | --- a/arch/arm/boot/dts/armada-390-db.dts |
| 2598 | 2598 | +++ b/arch/arm/boot/dts/armada-390-db.dts |
| 2599 | 2599 | @@ -123,7 +123,7 @@ usb3@f8000 { |
| ... | ... | @@ -2606,7 +2606,7 @@ index 2afed2ce4741..c718a5242595 100644 |
| 2606 | 2606 | |
| 2607 | 2607 | 			/* CON30 */ |
| 2608 | 2608 | diff --git a/arch/arm/boot/dts/armada-395-gp.dts b/arch/arm/boot/dts/armada-395-gp.dts |
| 2609 | | index 2cdbba804c1e..ef491b524fd6 100644 |
| 2609 | index 2cdbba804c1eaedf2034902e038e1696850c42f3..ef491b524fd6c4c39b391d4c022210c4744f9e37 100644 |
| 2610 | 2610 | --- a/arch/arm/boot/dts/armada-395-gp.dts |
| 2611 | 2611 | +++ b/arch/arm/boot/dts/armada-395-gp.dts |
| 2612 | 2612 | @@ -139,7 +139,7 @@ usb3@f0000 { |
| ... | ... | @@ -2619,7 +2619,7 @@ index 2cdbba804c1e..ef491b524fd6 100644 |
| 2619 | 2619 | |
| 2620 | 2620 | 			/* |
| 2621 | 2621 | diff --git a/arch/arm/boot/dts/armada-398-db.dts b/arch/arm/boot/dts/armada-398-db.dts |
| 2622 | | index e8604281c3c9..f0e0379f7619 100644 |
| 2622 | index e8604281c3c9916522d496937c73c1b31c6f22c9..f0e0379f7619220d39defb0f72887623ba850768 100644 |
| 2623 | 2623 | --- a/arch/arm/boot/dts/armada-398-db.dts |
| 2624 | 2624 | +++ b/arch/arm/boot/dts/armada-398-db.dts |
| 2625 | 2625 | @@ -118,7 +118,7 @@ usb3@f8000 { |
| ... | ... | @@ -2632,7 +2632,7 @@ index e8604281c3c9..f0e0379f7619 100644 |
| 2632 | 2632 | |
| 2633 | 2633 | 			pcie@1,0 { |
| 2634 | 2634 | diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi |
| 2635 | | index 60fbfd5907c7..ea657071e278 100644 |
| 2635 | index 60fbfd5907c71049e75935cba303f795be38ad72..ea657071e27888c49294556e047f556d499f6300 100644 |
| 2636 | 2636 | --- a/arch/arm/boot/dts/armada-39x.dtsi |
| 2637 | 2637 | +++ b/arch/arm/boot/dts/armada-39x.dtsi |
| 2638 | 2638 | @@ -442,7 +442,7 @@ thermal@e8078 { |
| ... | ... | @@ -2677,7 +2677,7 @@ index 60fbfd5907c7..ea657071e278 100644 |
| 2677 | 2677 | 				interrupt-map = <0 0 0 0 &gic GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>; |
| 2678 | 2678 | 				marvell,pcie-port = <3>; |
| 2679 | 2679 | diff --git a/arch/arm/boot/dts/armada-xp-98dx3236.dtsi b/arch/arm/boot/dts/armada-xp-98dx3236.dtsi |
| 2680 | | index be22ec5236ac..bdd4c7a45fbf 100644 |
| 2680 | index be22ec5236acfe5f11626a7f50447944564fda60..bdd4c7a45fbf43995f899982c499d9e9c99da5c5 100644 |
| 2681 | 2681 | --- a/arch/arm/boot/dts/armada-xp-98dx3236.dtsi |
| 2682 | 2682 | +++ b/arch/arm/boot/dts/armada-xp-98dx3236.dtsi |
| 2683 | 2683 | @@ -91,7 +91,7 @@ bootrom { |
| ... | ... | @@ -2698,7 +2698,7 @@ index be22ec5236ac..bdd4c7a45fbf 100644 |
| 2698 | 2698 | 				interrupt-map = <0 0 0 0 &mpic 58>; |
| 2699 | 2699 | 				marvell,pcie-port = <0>; |
| 2700 | 2700 | diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts |
| 2701 | | index a33974254d8c..065282c21789 100644 |
| 2701 | index a33974254d8cddb36ee6538bc1eec767c0ce756d..065282c217897fdfdab6ecb0dd365614a6478468 100644 |
| 2702 | 2702 | --- a/arch/arm/boot/dts/armada-xp-db.dts |
| 2703 | 2703 | +++ b/arch/arm/boot/dts/armada-xp-db.dts |
| 2704 | 2704 | @@ -242,7 +242,7 @@ pcie@9,0 { |
| ... | ... | @@ -2711,7 +2711,7 @@ index a33974254d8c..065282c21789 100644 |
| 2711 | 2711 | 		status = "okay"; |
| 2712 | 2712 | 	}; |
| 2713 | 2713 | diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts |
| 2714 | | index d62bf7bea1df..ac9eab8ac186 100644 |
| 2714 | index d62bf7bea1df4db579d8d22311d40ef8f0eaa25e..ac9eab8ac186c78ba88e0e03907f429886953e04 100644 |
| 2715 | 2715 | --- a/arch/arm/boot/dts/armada-xp-gp.dts |
| 2716 | 2716 | +++ b/arch/arm/boot/dts/armada-xp-gp.dts |
| 2717 | 2717 | @@ -227,7 +227,7 @@ pcie@9,0 { |
| ... | ... | @@ -2724,7 +2724,7 @@ index d62bf7bea1df..ac9eab8ac186 100644 |
| 2724 | 2724 | 		status = "okay"; |
| 2725 | 2725 | 	}; |
| 2726 | 2726 | diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi |
| 2727 | | index 9f25814077f2..129738f7973d 100644 |
| 2727 | index 9f25814077f2b446f9c54ab22ee277a10288fae6..129738f7973d4b4c90cdd79d14864b8e34de76db 100644 |
| 2728 | 2728 | --- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi |
| 2729 | 2729 | +++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi |
| 2730 | 2730 | @@ -86,7 +86,7 @@ soc { |
| ... | ... | @@ -2777,7 +2777,7 @@ index 9f25814077f2..129738f7973d 100644 |
| 2777 | 2777 | 				interrupt-map = <0 0 0 0 &mpic 62>; |
| 2778 | 2778 | 				marvell,pcie-port = <1>; |
| 2779 | 2779 | diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi |
| 2780 | | index 2bfe07aebf1a..e58d597e37b9 100644 |
| 2780 | index 2bfe07aebf1aefae7611c2b7899b824c1527306a..e58d597e37b98a414aa430f4d2635c90315b3a82 100644 |
| 2781 | 2781 | --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi |
| 2782 | 2782 | +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi |
| 2783 | 2783 | @@ -87,7 +87,7 @@ soc { |
| ... | ... | @@ -2862,7 +2862,7 @@ index 2bfe07aebf1a..e58d597e37b9 100644 |
| 2862 | 2862 | 				interrupt-map = <0 0 0 0 &mpic 99>; |
| 2863 | 2863 | 				marvell,pcie-port = <2>; |
| 2864 | 2864 | diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi |
| 2865 | | index 6c33935f7074..a5c961cee7de 100644 |
| 2865 | index 6c33935f7074730e193781173661ad717a202e32..a5c961cee7de3856d33046ca365d5d0f998d993c 100644 |
| 2866 | 2866 | --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi |
| 2867 | 2867 | +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi |
| 2868 | 2868 | @@ -104,7 +104,7 @@ soc { |
| ... | ... | @@ -2964,7 +2964,7 @@ index 6c33935f7074..a5c961cee7de 100644 |
| 2964 | 2964 | 				interrupt-map = <0 0 0 0 &mpic 103>; |
| 2965 | 2965 | 				marvell,pcie-port = <3>; |
| 2966 | 2966 | diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi |
| 2967 | | index 8a04c7e2d818..22b958537d31 100644 |
| 2967 | index 8a04c7e2d8185c9a72ea7824785ac93009672561..22b958537d31ada6dac768be3de7e2eddf31bfdb 100644 |
| 2968 | 2968 | --- a/arch/arm/boot/dts/aspeed-g4.dtsi |
| 2969 | 2969 | +++ b/arch/arm/boot/dts/aspeed-g4.dtsi |
| 2970 | 2970 | @@ -26,7 +26,7 @@ ahb { |
| ... | ... | @@ -2987,7 +2987,7 @@ index 8a04c7e2d818..22b958537d31 100644 |
| 2987 | 2987 | 			compatible = "aspeed,ast2400-spi"; |
| 2988 | 2988 | diff --git a/arch/arm/boot/dts/at91-sama5d27_som1.dtsi b/arch/arm/boot/dts/at91-sama5d27_som1.dtsi |
| 2989 | 2989 | new file mode 100644 |
| 2990 | | index 000000000000..63a5af898165 |
| 2990 | index 0000000000000000000000000000000000000000..63a5af8981659fb7f3162323be34e55dbcc345d6 |
| 2991 | 2991 | --- /dev/null |
| 2992 | 2992 | +++ b/arch/arm/boot/dts/at91-sama5d27_som1.dtsi |
| 2993 | 2993 | @@ -0,0 +1,102 @@ |
| ... | ... | @@ -3095,7 +3095,7 @@ index 000000000000..63a5af898165 |
| 3095 | 3095 | +}; |
| 3096 | 3096 | diff --git a/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts |
| 3097 | 3097 | new file mode 100644 |
| 3098 | | index 000000000000..9c9088c99cc4 |
| 3098 | index 0000000000000000000000000000000000000000..9c9088c99cc4cdb36d963c61e648216ee7fc4c4c |
| 3099 | 3099 | --- /dev/null |
| 3100 | 3100 | +++ b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts |
| 3101 | 3101 | @@ -0,0 +1,537 @@ |
| ... | ... | @@ -3637,7 +3637,7 @@ index 000000000000..9c9088c99cc4 |
| 3637 | 3637 | +	}; |
| 3638 | 3638 | +}; |
| 3639 | 3639 | diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts |
| 3640 | | index 2e2c3d1a1fa2..c7e9ccf2bc87 100644 |
| 3640 | index 2e2c3d1a1fa28a36111ae9725b68c4120a1b0609..c7e9ccf2bc8724304f44c574bc901b3e9b3999af 100644 |
| 3641 | 3641 | --- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts |
| 3642 | 3642 | +++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts |
| 3643 | 3643 | @@ -68,7 +68,7 @@ main_xtal { |
| ... | ... | @@ -3744,7 +3744,7 @@ index 2e2c3d1a1fa2..c7e9ccf2bc87 100644 |
| 3744 | 3744 | 		}; |
| 3745 | 3745 | 	}; |
| 3746 | 3746 | diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi |
| 3747 | | index a4808c4fbc05..64fa3f9a39d3 100644 |
| 3747 | index a4808c4fbc05897983df72024fc0f7667d75fbac..64fa3f9a39d3353ea18eb806a62b2498045a4d81 100644 |
| 3748 | 3748 | --- a/arch/arm/boot/dts/at91sam9g45.dtsi |
| 3749 | 3749 | +++ b/arch/arm/boot/dts/at91sam9g45.dtsi |
| 3750 | 3750 | @@ -455,6 +455,16 @@ pinctrl@fffff200 { |
| ... | ... | @@ -3783,7 +3783,7 @@ index a4808c4fbc05..64fa3f9a39d3 100644 |
| 3783 | 3783 | 				#address-cells = <1>; |
| 3784 | 3784 | 				#size-cells = <0>; |
| 3785 | 3785 | diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts |
| 3786 | | index 2522c3308305..94c52c555f83 100644 |
| 3786 | index 2522c330830561989dd31d985b1349cc50062d27..94c52c555f832d69cab669b64204f614fd00bced 100644 |
| 3787 | 3787 | --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts |
| 3788 | 3788 | +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts |
| 3789 | 3789 | @@ -166,6 +166,10 @@ usb2: gadget@fff78000 { |
| ... | ... | @@ -3798,7 +3798,7 @@ index 2522c3308305..94c52c555f83 100644 |
| 3798 | 3798 | 				pinctrl-names = "default"; |
| 3799 | 3799 | 				pinctrl-0 = < |
| 3800 | 3800 | diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi |
| 3801 | | index bf8c83815753..7c957ea06c66 100644 |
| 3801 | index bf8c838157539e697e3b5e875ac05f59325c3b3e..7c957ea06c66ce6b603277e452584dc8df05e5ef 100644 |
| 3802 | 3802 | --- a/arch/arm/boot/dts/bcm-cygnus.dtsi |
| 3803 | 3803 | +++ b/arch/arm/boot/dts/bcm-cygnus.dtsi |
| 3804 | 3804 | @@ -55,6 +55,11 @@ cpu@0 { |
| ... | ... | @@ -4013,7 +4013,7 @@ index bf8c83815753..7c957ea06c66 100644 |
| 4013 | 4013 | 	}; |
| 4014 | 4014 | }; |
| 4015 | 4015 | diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi |
| 4016 | | index 7204d1def23d..dff66974feed 100644 |
| 4016 | index 7204d1def23df1c5712bc9a559a599392ffef4b7..dff66974feeda575c06f38c38ddff3e4ecdf41ce 100644 |
| 4017 | 4017 | --- a/arch/arm/boot/dts/bcm-nsp.dtsi |
| 4018 | 4018 | +++ b/arch/arm/boot/dts/bcm-nsp.dtsi |
| 4019 | 4019 | @@ -215,6 +215,7 @@ sdio: sdhci@21000 { |
| ... | ... | @@ -4167,7 +4167,7 @@ index 7204d1def23d..dff66974feed 100644 |
| 4167 | 4167 | |
| 4168 | 4168 | 		msi-parent = <&msi2>; |
| 4169 | 4169 | diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts |
| 4170 | | index d0704540db6b..9f866491efdf 100644 |
| 4170 | index d0704540db6b3cc136bd92dfb3038077d8083312..9f866491efdf5ac6c3bad1f785a9837fce33073c 100644 |
| 4171 | 4171 | --- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts |
| 4172 | 4172 | +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts |
| 4173 | 4173 | @@ -99,3 +99,9 @@ i2s_alt0: i2s_alt0 { |
| ... | ... | @@ -4181,7 +4181,7 @@ index d0704540db6b..9f866491efdf 100644 |
| 4181 | 4181 | +	status = "okay"; |
| 4182 | 4182 | +}; |
| 4183 | 4183 | diff --git a/arch/arm/boot/dts/bcm2835-rpi-a.dts b/arch/arm/boot/dts/bcm2835-rpi-a.dts |
| 4184 | | index 46d078e29017..4b1af06c8dc0 100644 |
| 4184 | index 46d078e29017eeda2ea5d92c6d0c21d1ce9deccd..4b1af06c8dc03157113781ab27e9085346cd59d9 100644 |
| 4185 | 4185 | --- a/arch/arm/boot/dts/bcm2835-rpi-a.dts |
| 4186 | 4186 | +++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts |
| 4187 | 4187 | @@ -94,3 +94,9 @@ i2s_alt2: i2s_alt2 { |
| ... | ... | @@ -4195,7 +4195,7 @@ index 46d078e29017..4b1af06c8dc0 100644 |
| 4195 | 4195 | +	status = "okay"; |
| 4196 | 4196 | +}; |
| 4197 | 4197 | diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts |
| 4198 | | index 432088ebb0a1..a846f1e781d8 100644 |
| 4198 | index 432088ebb0a19a97e5390a3c90f88af9f796476d..a846f1e781d8a30e2e0afeaed5e67c32005f9b97 100644 |
| 4199 | 4199 | --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts |
| 4200 | 4200 | +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts |
| 4201 | 4201 | @@ -101,3 +101,9 @@ i2s_alt0: i2s_alt0 { |
| ... | ... | @@ -4209,7 +4209,7 @@ index 432088ebb0a1..a846f1e781d8 100644 |
| 4209 | 4209 | +	status = "okay"; |
| 4210 | 4210 | +}; |
| 4211 | 4211 | diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts |
| 4212 | | index 4133bc2cd9be..e860964e39fa 100644 |
| 4212 | index 4133bc2cd9be309a3885e6d002b767fe2c4d0458..e860964e39fa9ce61fee3f858924019df37fdf81 100644 |
| 4213 | 4213 | --- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts |
| 4214 | 4214 | +++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts |
| 4215 | 4215 | @@ -94,3 +94,9 @@ i2s_alt2: i2s_alt2 { |
| ... | ... | @@ -4223,7 +4223,7 @@ index 4133bc2cd9be..e860964e39fa 100644 |
| 4223 | 4223 | +	status = "okay"; |
| 4224 | 4224 | +}; |
| 4225 | 4225 | diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts |
| 4226 | | index 4d56fe3006b0..5d77f3f8c4c5 100644 |
| 4226 | index 4d56fe3006b0c38b652d88b36af09306ea455b2e..5d77f3f8c4c58475fcf5948af3d5815f7b6cd728 100644 |
| 4227 | 4227 | --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts |
| 4228 | 4228 | +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts |
| 4229 | 4229 | @@ -89,3 +89,9 @@ &gpio { |
| ... | ... | @@ -4238,7 +4238,7 @@ index 4d56fe3006b0..5d77f3f8c4c5 100644 |
| 4238 | 4238 | +}; |
| 4239 | 4239 | diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts |
| 4240 | 4240 | new file mode 100644 |
| 4241 | | index 000000000000..82651c3eb682 |
| 4241 | index 0000000000000000000000000000000000000000..82651c3eb682a749652a31eadbb4f910961151f7 |
| 4242 | 4242 | --- /dev/null |
| 4243 | 4243 | +++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts |
| 4244 | 4244 | @@ -0,0 +1,139 @@ |
| ... | ... | @@ -4382,7 +4382,7 @@ index 000000000000..82651c3eb682 |
| 4382 | 4382 | +	status = "okay"; |
| 4383 | 4383 | +}; |
| 4384 | 4384 | diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero.dts b/arch/arm/boot/dts/bcm2835-rpi-zero.dts |
| 4385 | | index 79a20d520931..70362405c595 100644 |
| 4385 | index 79a20d5209310b2cfd912a9dbf1e67bc5b804b4d..70362405c59522fb7835a7b4b13ebb43592edfc4 100644 |
| 4386 | 4386 | --- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts |
| 4387 | 4387 | +++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts |
| 4388 | 4388 | @@ -103,3 +103,9 @@ i2s_alt0: i2s_alt0 { |
| ... | ... | @@ -4396,7 +4396,7 @@ index 79a20d520931..70362405c595 100644 |
| 4396 | 4396 | +	status = "okay"; |
| 4397 | 4397 | +}; |
| 4398 | 4398 | diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi |
| 4399 | | index e55b362b9d6e..e36c392a2b8f 100644 |
| 4399 | index e55b362b9d6e92124a22d6e5718adf1f63be3818..e36c392a2b8fdfe36dab81b0128e85dfd422ab7b 100644 |
| 4400 | 4400 | --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi |
| 4401 | 4401 | +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi |
| 4402 | 4402 | @@ -39,7 +39,7 @@ gpioout: gpioout { |
| ... | ... | @@ -4409,7 +4409,7 @@ index e55b362b9d6e..e36c392a2b8f 100644 |
| 4409 | 4409 | 	}; |
| 4410 | 4410 | }; |
| 4411 | 4411 | diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts |
| 4412 | | index bf19e8cfb9e6..e8de41444b68 100644 |
| 4412 | index bf19e8cfb9e63cc9cd0a1c26e69a286b9a3c4bdf..e8de41444b68eed33efa16e92ddf29e3ace5fd1c 100644 |
| 4413 | 4413 | --- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts |
| 4414 | 4414 | +++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts |
| 4415 | 4415 | @@ -39,3 +39,9 @@ i2s_alt0: i2s_alt0 { |
| ... | ... | @@ -4423,7 +4423,7 @@ index bf19e8cfb9e6..e8de41444b68 100644 |
| 4423 | 4423 | +	status = "okay"; |
| 4424 | 4424 | +}; |
| 4425 | 4425 | diff --git a/arch/arm/boot/dts/bcm2836.dtsi b/arch/arm/boot/dts/bcm2836.dtsi |
| 4426 | | index da3deeb42592..2c26d0be8b03 100644 |
| 4426 | index da3deeb42592926f36b49770b50b549abcb6ece7..2c26d0be8b0316792188890ed677e87fc1fb13ea 100644 |
| 4427 | 4427 | --- a/arch/arm/boot/dts/bcm2836.dtsi |
| 4428 | 4428 | +++ b/arch/arm/boot/dts/bcm2836.dtsi |
| 4429 | 4429 | @@ -36,6 +36,7 @@ timer { |
| ... | ... | @@ -4435,7 +4435,7 @@ index da3deeb42592..2c26d0be8b03 100644 |
| 4435 | 4435 | 		v7_cpu0: cpu@0 { |
| 4436 | 4436 | 			device_type = "cpu"; |
| 4437 | 4437 | diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts |
| 4438 | | index c72a27d908b6..20725ca487f3 100644 |
| 4438 | index c72a27d908b6f191b6be47c305221b2ee242e3be..20725ca487f30afd5e84059fbcb1513d3399cfa8 100644 |
| 4439 | 4439 | --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts |
| 4440 | 4440 | +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts |
| 4441 | 4441 | @@ -1 +1,51 @@ |
| ... | ... | @@ -4493,7 +4493,7 @@ index c72a27d908b6..20725ca487f3 100644 |
| 4493 | 4493 | +}; |
| 4494 | 4494 | diff --git a/arch/arm/boot/dts/bcm2837.dtsi b/arch/arm/boot/dts/bcm2837.dtsi |
| 4495 | 4495 | new file mode 100644 |
| 4496 | | index 000000000000..bc1cca5cf43c |
| 4496 | index 0000000000000000000000000000000000000000..bc1cca5cf43c41b8dad3902ce1a627b625883cb3 |
| 4497 | 4497 | --- /dev/null |
| 4498 | 4498 | +++ b/arch/arm/boot/dts/bcm2837.dtsi |
| 4499 | 4499 | @@ -0,0 +1,87 @@ |
| ... | ... | @@ -4585,7 +4585,7 @@ index 000000000000..bc1cca5cf43c |
| 4585 | 4585 | +	status = "okay"; |
| 4586 | 4586 | +}; |
| 4587 | 4587 | diff --git a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts |
| 4588 | | index 62e1427b3f10..8b64caabaad8 100644 |
| 4588 | index 62e1427b3f1076072301e14b6c26aead71235bd4..8b64caabaad8401876706da9b2ebf521b3401e6c 100644 |
| 4589 | 4589 | --- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts |
| 4590 | 4590 | +++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts |
| 4591 | 4591 | @@ -52,6 +52,10 @@ leds { |
| ... | ... | @@ -4600,7 +4600,7 @@ index 62e1427b3f10..8b64caabaad8 100644 |
| 4600 | 4600 | |
| 4601 | 4601 | 		power0 { |
| 4602 | 4602 | diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts |
| 4603 | | index a5647efe4118..d7c34fa72b4b 100644 |
| 4603 | index a5647efe41187eaa2e0dc70d9bfc125856562f45..d7c34fa72b4b7525303ba5e06b93e0c9c00b4b82 100644 |
| 4604 | 4604 | --- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts |
| 4605 | 4605 | +++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts |
| 4606 | 4606 | @@ -48,6 +48,9 @@ power1 { |
| ... | ... | @@ -4614,7 +4614,7 @@ index a5647efe4118..d7c34fa72b4b 100644 |
| 4614 | 4614 | |
| 4615 | 4615 | 		wireless { |
| 4616 | 4616 | diff --git a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts |
| 4617 | | index 19ee924d7d53..83a4c60bb431 100644 |
| 4617 | index 19ee924d7d53fa0c1b86bbbbf0d3787ea8a0bbfa..83a4c60bb431233a715140e46db00548f1ce0a7d 100644 |
| 4618 | 4618 | --- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts |
| 4619 | 4619 | +++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts |
| 4620 | 4620 | @@ -42,16 +42,22 @@ power-amber { |
| ... | ... | @@ -4641,7 +4641,7 @@ index 19ee924d7d53..83a4c60bb431 100644 |
| 4641 | 4641 | |
| 4642 | 4642 | 		wps { |
| 4643 | 4643 | diff --git a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts |
| 4644 | | index a854a5174b7f..3ed8de42cb48 100644 |
| 4644 | index a854a5174b7fd95e3ca00d585a7b0f630ead2981..3ed8de42cb4877bb78f022efd470640b43cef18f 100644 |
| 4645 | 4645 | --- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts |
| 4646 | 4646 | +++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts |
| 4647 | 4647 | @@ -36,6 +36,8 @@ lan { |
| ... | ... | @@ -4663,7 +4663,7 @@ index a854a5174b7f..3ed8de42cb48 100644 |
| 4663 | 4663 | 	}; |
| 4664 | 4664 | |
| 4665 | 4665 | diff --git a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts |
| 4666 | | index 97aa5d59a1d8..ec4a50e440f6 100644 |
| 4666 | index 97aa5d59a1d805f155846fad9fec15deaf6765b0..ec4a50e440f6bc4e831be87c2c5b848070925d26 100644 |
| 4667 | 4667 | --- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts |
| 4668 | 4668 | +++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts |
| 4669 | 4669 | @@ -46,11 +46,16 @@ wps { |
| ... | ... | @@ -4684,7 +4684,7 @@ index 97aa5d59a1d8..ec4a50e440f6 100644 |
| 4684 | 4684 | |
| 4685 | 4685 | 		wan-blue { |
| 4686 | 4686 | diff --git a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts |
| 4687 | | index 51b0641b5f79..7cc7d344fe5b 100644 |
| 4687 | index 51b0641b5f79c9f0a2cff8e1a9b94233d2fc4dac..7cc7d344fe5b69fd4699b946c5f62961dd2a9450 100644 |
| 4688 | 4688 | --- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts |
| 4689 | 4689 | +++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts |
| 4690 | 4690 | @@ -71,6 +71,9 @@ wan-amber { |
| ... | ... | @@ -4698,7 +4698,7 @@ index 51b0641b5f79..7cc7d344fe5b 100644 |
| 4698 | 4698 | |
| 4699 | 4699 | 		2ghz { |
| 4700 | 4700 | diff --git a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts |
| 4701 | | index 5f8621d00c50..bc1d1e10d4ac 100644 |
| 4701 | index 5f8621d00c5003282eaf68608ab24d3c02d5b94e..bc1d1e10d4acc460f76953bc36d033b6610e567d 100644 |
| 4702 | 4702 | --- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts |
| 4703 | 4703 | +++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts |
| 4704 | 4704 | @@ -59,6 +59,9 @@ lan2	{ |
| ... | ... | @@ -4712,7 +4712,7 @@ index 5f8621d00c50..bc1d1e10d4ac 100644 |
| 4712 | 4712 | |
| 4713 | 4713 | 		status	{ |
| 4714 | 4714 | diff --git a/arch/arm/boot/dts/bcm47189-tenda-ac9.dts b/arch/arm/boot/dts/bcm47189-tenda-ac9.dts |
| 4715 | | index 34417dac1cd0..19e61b5b066c 100644 |
| 4715 | index 34417dac1cd0937292469da3b86b54f2e8cfff1c..19e61b5b066c574d8ee464a6fe91d564c1436e86 100644 |
| 4716 | 4716 | --- a/arch/arm/boot/dts/bcm47189-tenda-ac9.dts |
| 4717 | 4717 | +++ b/arch/arm/boot/dts/bcm47189-tenda-ac9.dts |
| 4718 | 4718 | @@ -26,6 +26,8 @@ leds { |
| ... | ... | @@ -4725,7 +4725,7 @@ index 34417dac1cd0..19e61b5b066c 100644 |
| 4725 | 4725 | |
| 4726 | 4726 | 		wps { |
| 4727 | 4727 | diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi |
| 4728 | | index 98647d22b291..045b9bb857f9 100644 |
| 4728 | index 98647d22b291f100399290adf1d2ed67b31fe0e7..045b9bb857f9a030491bc3bdbf82ae67bb841b73 100644 |
| 4729 | 4729 | --- a/arch/arm/boot/dts/bcm5301x.dtsi |
| 4730 | 4730 | +++ b/arch/arm/boot/dts/bcm5301x.dtsi |
| 4731 | 4731 | @@ -272,6 +272,19 @@ ehci: ehci@21000 { |
| ... | ... | @@ -4784,7 +4784,7 @@ index 98647d22b291..045b9bb857f9 100644 |
| 4784 | 4784 | 		}; |
| 4785 | 4785 | |
| 4786 | 4786 | diff --git a/arch/arm/boot/dts/bcm53573.dtsi b/arch/arm/boot/dts/bcm53573.dtsi |
| 4787 | | index eae623f76401..c698a565b8ae 100644 |
| 4787 | index eae623f7640138abb794f52cfc2604321947308e..c698a565b8ae9e2134c36fc796e983159b686a67 100644 |
| 4788 | 4788 | --- a/arch/arm/boot/dts/bcm53573.dtsi |
| 4789 | 4789 | +++ b/arch/arm/boot/dts/bcm53573.dtsi |
| 4790 | 4790 | @@ -138,10 +138,12 @@ ehci: ehci@4000 { |
| ... | ... | @@ -4814,7 +4814,7 @@ index eae623f76401..c698a565b8ae 100644 |
| 4814 | 4814 | 			}; |
| 4815 | 4815 | 		}; |
| 4816 | 4816 | diff --git a/arch/arm/boot/dts/bcm911360_entphn.dts b/arch/arm/boot/dts/bcm911360_entphn.dts |
| 4817 | | index 000f5f19215e..53f990defd6a 100644 |
| 4817 | index 000f5f19215e0cef9adea11ead762a3e027d5ed7..53f990defd6ae9f7af35eac9e1a04a16ae47c048 100644 |
| 4818 | 4818 | --- a/arch/arm/boot/dts/bcm911360_entphn.dts |
| 4819 | 4819 | +++ b/arch/arm/boot/dts/bcm911360_entphn.dts |
| 4820 | 4820 | @@ -39,9 +39,12 @@ / { |
| ... | ... | @@ -4834,7 +4834,7 @@ index 000f5f19215e..53f990defd6a 100644 |
| 4834 | 4834 | 	gpio_keys { |
| 4835 | 4835 | diff --git a/arch/arm/boot/dts/bcm947189acdbmr.dts b/arch/arm/boot/dts/bcm947189acdbmr.dts |
| 4836 | 4836 | new file mode 100644 |
| 4837 | | index 000000000000..ef263412fea5 |
| 4837 | index 0000000000000000000000000000000000000000..ef263412fea513068a67a11ef80dff18d863802a |
| 4838 | 4838 | --- /dev/null |
| 4839 | 4839 | +++ b/arch/arm/boot/dts/bcm947189acdbmr.dts |
| 4840 | 4840 | @@ -0,0 +1,97 @@ |
| ... | ... | @@ -4936,7 +4936,7 @@ index 000000000000..ef263412fea5 |
| 4936 | 4936 | +	vcc-gpio = <&chipcommon 8 GPIO_ACTIVE_HIGH>; |
| 4937 | 4937 | +}; |
| 4938 | 4938 | diff --git a/arch/arm/boot/dts/bcm958522er.dts b/arch/arm/boot/dts/bcm958522er.dts |
| 4939 | | index f5c42962c201..f9dd342cc2ae 100644 |
| 4939 | index f5c42962c20131dcb1c3bdeef6614c5a36456c36..f9dd342cc2ae499340529c4e842a0da6a1a133b6 100644 |
| 4940 | 4940 | --- a/arch/arm/boot/dts/bcm958522er.dts |
| 4941 | 4941 | +++ b/arch/arm/boot/dts/bcm958522er.dts |
| 4942 | 4942 | @@ -170,3 +170,11 @@ partition@700000 { |
| ... | ... | @@ -4952,7 +4952,7 @@ index f5c42962c201..f9dd342cc2ae 100644 |
| 4952 | 4952 | +	status = "okay"; |
| 4953 | 4953 | +}; |
| 4954 | 4954 | diff --git a/arch/arm/boot/dts/bcm958525er.dts b/arch/arm/boot/dts/bcm958525er.dts |
| 4955 | | index efcb1f67bdad..374508a9cfbf 100644 |
| 4955 | index efcb1f67bdadf7abcb71f625ec7a12aec56e4d9d..374508a9cfbfb2820d503c65cfa527066163034c 100644 |
| 4956 | 4956 | --- a/arch/arm/boot/dts/bcm958525er.dts |
| 4957 | 4957 | +++ b/arch/arm/boot/dts/bcm958525er.dts |
| 4958 | 4958 | @@ -182,3 +182,11 @@ &sata { |
| ... | ... | @@ -4968,7 +4968,7 @@ index efcb1f67bdad..374508a9cfbf 100644 |
| 4968 | 4968 | +	status = "okay"; |
| 4969 | 4969 | +}; |
| 4970 | 4970 | diff --git a/arch/arm/boot/dts/bcm958525xmc.dts b/arch/arm/boot/dts/bcm958525xmc.dts |
| 4971 | | index b335ce02e32f..403250c5ad8e 100644 |
| 4971 | index b335ce02e32f9cdda5282cd5180121daa33ea457..403250c5ad8e7b462198185a5add47b2b611e068 100644 |
| 4972 | 4972 | --- a/arch/arm/boot/dts/bcm958525xmc.dts |
| 4973 | 4973 | +++ b/arch/arm/boot/dts/bcm958525xmc.dts |
| 4974 | 4974 | @@ -202,3 +202,11 @@ &sdio { |
| ... | ... | @@ -4984,7 +4984,7 @@ index b335ce02e32f..403250c5ad8e 100644 |
| 4984 | 4984 | +	status = "okay"; |
| 4985 | 4985 | +}; |
| 4986 | 4986 | diff --git a/arch/arm/boot/dts/bcm958622hr.dts b/arch/arm/boot/dts/bcm958622hr.dts |
| 4987 | | index 16ab2d82a14b..fd8b8c689ffe 100644 |
| 4987 | index 16ab2d82a14ba63bf98577786b844795e8a02ed9..fd8b8c689ffe99f3421ae6f02b1a46a2ee3c3b72 100644 |
| 4988 | 4988 | --- a/arch/arm/boot/dts/bcm958622hr.dts |
| 4989 | 4989 | +++ b/arch/arm/boot/dts/bcm958622hr.dts |
| 4990 | 4990 | @@ -219,3 +219,11 @@ fixed-link { |
| ... | ... | @@ -5000,7 +5000,7 @@ index 16ab2d82a14b..fd8b8c689ffe 100644 |
| 5000 | 5000 | +	status = "okay"; |
| 5001 | 5001 | +}; |
| 5002 | 5002 | diff --git a/arch/arm/boot/dts/bcm958623hr.dts b/arch/arm/boot/dts/bcm958623hr.dts |
| 5003 | | index 9b921c6aa8f8..3bc50849d013 100644 |
| 5003 | index 9b921c6aa8f8de19807c9a29d8f72eb404af6a49..3bc50849d013ff0442f559dce24274972202f5f2 100644 |
| 5004 | 5004 | --- a/arch/arm/boot/dts/bcm958623hr.dts |
| 5005 | 5005 | +++ b/arch/arm/boot/dts/bcm958623hr.dts |
| 5006 | 5006 | @@ -227,3 +227,11 @@ fixed-link { |
| ... | ... | @@ -5016,7 +5016,7 @@ index 9b921c6aa8f8..3bc50849d013 100644 |
| 5016 | 5016 | +	status = "okay"; |
| 5017 | 5017 | +}; |
| 5018 | 5018 | diff --git a/arch/arm/boot/dts/bcm958625hr.dts b/arch/arm/boot/dts/bcm958625hr.dts |
| 5019 | | index 006b08e41a3b..d94d14b3c745 100644 |
| 5019 | index 006b08e41a3ba0187412c99108e707df11380dd5..d94d14b3c745a0d01c031b6d9b9e6426e0e7b2ec 100644 |
| 5020 | 5020 | --- a/arch/arm/boot/dts/bcm958625hr.dts |
| 5021 | 5021 | +++ b/arch/arm/boot/dts/bcm958625hr.dts |
| 5022 | 5022 | @@ -229,3 +229,11 @@ fixed-link { |
| ... | ... | @@ -5032,7 +5032,7 @@ index 006b08e41a3b..d94d14b3c745 100644 |
| 5032 | 5032 | +	status = "okay"; |
| 5033 | 5033 | +}; |
| 5034 | 5034 | diff --git a/arch/arm/boot/dts/bcm958625k.dts b/arch/arm/boot/dts/bcm958625k.dts |
| 5035 | | index 64740f85cf4c..2cf2392483b2 100644 |
| 5035 | index 64740f85cf4c906a9ea1d9397087c1515e3024db..2cf2392483b2af6269093f6edaf842bb4e12e776 100644 |
| 5036 | 5036 | --- a/arch/arm/boot/dts/bcm958625k.dts |
| 5037 | 5037 | +++ b/arch/arm/boot/dts/bcm958625k.dts |
| 5038 | 5038 | @@ -264,3 +264,11 @@ &uart0 { |
| ... | ... | @@ -5048,7 +5048,7 @@ index 64740f85cf4c..2cf2392483b2 100644 |
| 5048 | 5048 | +	status = "okay"; |
| 5049 | 5049 | +}; |
| 5050 | 5050 | diff --git a/arch/arm/boot/dts/da850-lego-ev3.dts b/arch/arm/boot/dts/da850-lego-ev3.dts |
| 5051 | | index 45983c04a8a7..413dbd5d9f64 100644 |
| 5051 | index 45983c04a8a71e7967fb99b54e1a02a8602080d0..413dbd5d9f6442b8dae4b7f132b35e5f816cf798 100644 |
| 5052 | 5052 | --- a/arch/arm/boot/dts/da850-lego-ev3.dts |
| 5053 | 5053 | +++ b/arch/arm/boot/dts/da850-lego-ev3.dts |
| 5054 | 5054 | @@ -249,6 +249,15 @@ battery_pins: pinmux_battery_pins { |
| ... | ... | @@ -5090,7 +5090,7 @@ index 45983c04a8a7..413dbd5d9f64 100644 |
| 5090 | 5090 | 	status = "okay"; |
| 5091 | 5091 | }; |
| 5092 | 5092 | diff --git a/arch/arm/boot/dts/dove-d3plug.dts b/arch/arm/boot/dts/dove-d3plug.dts |
| 5093 | | index f5f59bb5a534..e88ff83f1dec 100644 |
| 5093 | index f5f59bb5a53464eb9bcaeb7d035a28236790abc1..e88ff83f1dec8eb6a67332aedbb4e46cd4c4d957 100644 |
| 5094 | 5094 | --- a/arch/arm/boot/dts/dove-d3plug.dts |
| 5095 | 5095 | +++ b/arch/arm/boot/dts/dove-d3plug.dts |
| 5096 | 5096 | @@ -88,7 +88,7 @@ spi-flash@0 { |
| ... | ... | @@ -5112,7 +5112,7 @@ index f5f59bb5a534..e88ff83f1dec 100644 |
| 5112 | 5112 | 		reset-gpios = <&gpio0 25 1>; |
| 5113 | 5113 | 	}; |
| 5114 | 5114 | diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi |
| 5115 | | index 698d58cea20d..1475d3672e56 100644 |
| 5115 | index 698d58cea20d2e8c1a3c7d8e7a4dadb717847624..1475d3672e56343e286f0883efbf1ed49fdb2e72 100644 |
| 5116 | 5116 | --- a/arch/arm/boot/dts/dove.dtsi |
| 5117 | 5117 | +++ b/arch/arm/boot/dts/dove.dtsi |
| 5118 | 5118 | @@ -89,7 +89,7 @@ MBUS_ID(0x01, 0xfd) 0 0xf8000000 0x8000000 /* BootROM 128M */ |
| ... | ... | @@ -5159,7 +5159,7 @@ index 698d58cea20d..1475d3672e56 100644 |
| 5159 | 5159 | 				interrupt-map-mask = <0 0 0 0>; |
| 5160 | 5160 | diff --git a/arch/arm/boot/dts/dra7-evm-common.dtsi b/arch/arm/boot/dts/dra7-evm-common.dtsi |
| 5161 | 5161 | new file mode 100644 |
| 5162 | | index 000000000000..343e95f9a001 |
| 5162 | index 0000000000000000000000000000000000000000..343e95f9a00144203b30e4e0beceee5e8bbbbbc7 |
| 5163 | 5163 | --- /dev/null |
| 5164 | 5164 | +++ b/arch/arm/boot/dts/dra7-evm-common.dtsi |
| 5165 | 5165 | @@ -0,0 +1,258 @@ |
| ... | ... | @@ -5422,7 +5422,7 @@ index 000000000000..343e95f9a001 |
| 5422 | 5422 | +	}; |
| 5423 | 5423 | +}; |
| 5424 | 5424 | diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts |
| 5425 | | index f47fc4daf062..aa426dabb6c3 100644 |
| 5425 | index f47fc4daf0628a43278a5dcb4cdcf81c34fc56c9..aa426dabb6c349d9f1b5a4a0173ae30ad3b7cc58 100644 |
| 5426 | 5426 | --- a/arch/arm/boot/dts/dra7-evm.dts |
| 5427 | 5427 | +++ b/arch/arm/boot/dts/dra7-evm.dts |
| 5428 | 5428 | @@ -8,9 +8,8 @@ |
| ... | ... | @@ -5775,7 +5775,7 @@ index f47fc4daf062..aa426dabb6c3 100644 |
| 5775 | 5775 | -	}; |
| 5776 | 5776 | }; |
| 5777 | 5777 | diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi |
| 5778 | | index 0f0f6f58bd18..02a136a4661a 100644 |
| 5778 | index 0f0f6f58bd187db819701d3bafcd68ae7bb7c46e..02a136a4661aa1ed172e4926a7a8dabad9e271b9 100644 |
| 5779 | 5779 | --- a/arch/arm/boot/dts/dra7.dtsi |
| 5780 | 5780 | +++ b/arch/arm/boot/dts/dra7.dtsi |
| 5781 | 5781 | @@ -196,6 +196,7 @@ dra7_pmx_core: pinmux@1400 { |
| ... | ... | @@ -5877,7 +5877,7 @@ index 0f0f6f58bd18..02a136a4661a 100644 |
| 5877 | 5877 | |
| 5878 | 5878 | 		mmu0_dsp1: mmu@40d01000 { |
| 5879 | 5879 | diff --git a/arch/arm/boot/dts/dra71-evm.dts b/arch/arm/boot/dts/dra71-evm.dts |
| 5880 | | index 9897e8fa6845..41c9132eb550 100644 |
| 5880 | index 9897e8fa684516a245c63f435baa3e5855362218..41c9132eb550d07dd686a85eda0296bbfad0b6f7 100644 |
| 5881 | 5881 | --- a/arch/arm/boot/dts/dra71-evm.dts |
| 5882 | 5882 | +++ b/arch/arm/boot/dts/dra71-evm.dts |
| 5883 | 5883 | @@ -7,6 +7,7 @@ |
| ... | ... | @@ -5932,7 +5932,7 @@ index 9897e8fa6845..41c9132eb550 100644 |
| 5932 | 5932 | |
| 5933 | 5933 | &mac { |
| 5934 | 5934 | diff --git a/arch/arm/boot/dts/dra72-evm-common.dtsi b/arch/arm/boot/dts/dra72-evm-common.dtsi |
| 5935 | | index 85780549bc26..2e485a13dfd7 100644 |
| 5935 | index 85780549bc26359269b5f5bd05023364b0143905..2e485a13dfd7e1fe470f071022ac4332e1445ea1 100644 |
| 5936 | 5936 | --- a/arch/arm/boot/dts/dra72-evm-common.dtsi |
| 5937 | 5937 | +++ b/arch/arm/boot/dts/dra72-evm-common.dtsi |
| 5938 | 5938 | @@ -311,6 +311,7 @@ nand@0,0 { |
| ... | ... | @@ -5961,7 +5961,7 @@ index 85780549bc26..2e485a13dfd7 100644 |
| 5961 | 5961 | +	status = "okay"; |
| 5962 | 5962 | +}; |
| 5963 | 5963 | diff --git a/arch/arm/boot/dts/dra72-evm-revc.dts b/arch/arm/boot/dts/dra72-evm-revc.dts |
| 5964 | | index 6f9b6f31437e..bf588d00728d 100644 |
| 5964 | index 6f9b6f31437efeb3009825cd205d06630e5c74b1..bf588d00728d1973c3426f09421dc5c2bbb5bbe0 100644 |
| 5965 | 5965 | --- a/arch/arm/boot/dts/dra72-evm-revc.dts |
| 5966 | 5966 | +++ b/arch/arm/boot/dts/dra72-evm-revc.dts |
| 5967 | 5967 | @@ -6,6 +6,7 @@ |
| ... | ... | @@ -6015,7 +6015,7 @@ index 6f9b6f31437e..bf588d00728d 100644 |
| 6015 | 6015 | +	vmmc-supply = <&evm_1v8_sw>; |
| 6016 | 6016 | +}; |
| 6017 | 6017 | diff --git a/arch/arm/boot/dts/dra72-evm-tps65917.dtsi b/arch/arm/boot/dts/dra72-evm-tps65917.dtsi |
| 6018 | | index e6df676886c0..57bfe5caf5e4 100644 |
| 6018 | index e6df676886c0c35052921669039ae31fd446ccbf..57bfe5caf5e4f12c6468575abe646ca78e19a01e 100644 |
| 6019 | 6019 | --- a/arch/arm/boot/dts/dra72-evm-tps65917.dtsi |
| 6020 | 6020 | +++ b/arch/arm/boot/dts/dra72-evm-tps65917.dtsi |
| 6021 | 6021 | @@ -146,5 +146,5 @@ &dss { |
| ... | ... | @@ -6026,7 +6026,7 @@ index e6df676886c0..57bfe5caf5e4 100644 |
| 6026 | 6026 | +	vqmmc-supply = <&ldo1_reg>; |
| 6027 | 6027 | }; |
| 6028 | 6028 | diff --git a/arch/arm/boot/dts/dra72-evm.dts b/arch/arm/boot/dts/dra72-evm.dts |
| 6029 | | index cd9c4ff12654..c572693b1665 100644 |
| 6029 | index cd9c4ff12654ce00ae443c654a888dc14b4a66c6..c572693b16657b69565b3581ac39c9bd8298cba2 100644 |
| 6030 | 6030 | --- a/arch/arm/boot/dts/dra72-evm.dts |
| 6031 | 6031 | +++ b/arch/arm/boot/dts/dra72-evm.dts |
| 6032 | 6032 | @@ -6,6 +6,7 @@ |
| ... | ... | @@ -6081,7 +6081,7 @@ index cd9c4ff12654..c572693b1665 100644 |
| 6081 | 6081 | +}; |
| 6082 | 6082 | diff --git a/arch/arm/boot/dts/dra72x-mmc-iodelay.dtsi b/arch/arm/boot/dts/dra72x-mmc-iodelay.dtsi |
| 6083 | 6083 | new file mode 100644 |
| 6084 | | index 000000000000..088013c6dc6e |
| 6084 | index 0000000000000000000000000000000000000000..088013c6dc6ed4bdb9665179ae267f84700dc272 |
| 6085 | 6085 | --- /dev/null |
| 6086 | 6086 | +++ b/arch/arm/boot/dts/dra72x-mmc-iodelay.dtsi |
| 6087 | 6087 | @@ -0,0 +1,350 @@ |
| ... | ... | @@ -6437,7 +6437,7 @@ index 000000000000..088013c6dc6e |
| 6437 | 6437 | +}; |
| 6438 | 6438 | diff --git a/arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi b/arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi |
| 6439 | 6439 | new file mode 100644 |
| 6440 | | index 000000000000..28ebb4eb884a |
| 6440 | index 0000000000000000000000000000000000000000..28ebb4eb884a9450f51508c576e2b37d3d8a0808 |
| 6441 | 6441 | --- /dev/null |
| 6442 | 6442 | +++ b/arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi |
| 6443 | 6443 | @@ -0,0 +1,647 @@ |
| ... | ... | @@ -7090,7 +7090,7 @@ index 000000000000..28ebb4eb884a |
| 7090 | 7090 | +}; |
| 7091 | 7091 | diff --git a/arch/arm/boot/dts/dra76-evm.dts b/arch/arm/boot/dts/dra76-evm.dts |
| 7092 | 7092 | new file mode 100644 |
| 7093 | | index 000000000000..b024a65c6e27 |
| 7093 | index 0000000000000000000000000000000000000000..b024a65c6e2711abb4beeb288556860841ea22c0 |
| 7094 | 7094 | --- /dev/null |
| 7095 | 7095 | +++ b/arch/arm/boot/dts/dra76-evm.dts |
| 7096 | 7096 | @@ -0,0 +1,423 @@ |
| ... | ... | @@ -7519,7 +7519,7 @@ index 000000000000..b024a65c6e27 |
| 7519 | 7519 | +}; |
| 7520 | 7520 | diff --git a/arch/arm/boot/dts/dra76x.dtsi b/arch/arm/boot/dts/dra76x.dtsi |
| 7521 | 7521 | new file mode 100644 |
| 7522 | | index 000000000000..1c88c581ff18 |
| 7522 | index 0000000000000000000000000000000000000000..1c88c581ff18879a4991f3a77634e3b998d56b3d |
| 7523 | 7523 | --- /dev/null |
| 7524 | 7524 | +++ b/arch/arm/boot/dts/dra76x.dtsi |
| 7525 | 7525 | @@ -0,0 +1,19 @@ |
| ... | ... | @@ -7543,7 +7543,7 @@ index 000000000000..1c88c581ff18 |
| 7543 | 7543 | +	ti,irqs-skip = <10 67 68 133 139 140>; |
| 7544 | 7544 | +}; |
| 7545 | 7545 | diff --git a/arch/arm/boot/dts/exynos3250-artik5-eval.dts b/arch/arm/boot/dts/exynos3250-artik5-eval.dts |
| 7546 | | index 4bd2ee87124e..4cbfa09c6c4e 100644 |
| 7546 | index 4bd2ee87124eab05014568fdbc24d308611bdf16..4cbfa09c6c4e46fb25bfea03996aee13dcddc662 100644 |
| 7547 | 7547 | --- a/arch/arm/boot/dts/exynos3250-artik5-eval.dts |
| 7548 | 7548 | +++ b/arch/arm/boot/dts/exynos3250-artik5-eval.dts |
| 7549 | 7549 | @@ -22,7 +22,6 @@ / { |
| ... | ... | @@ -7555,7 +7555,7 @@ index 4bd2ee87124e..4cbfa09c6c4e 100644 |
| 7555 | 7555 | 	disable-wp; |
| 7556 | 7556 | 	vqmmc-supply = <&ldo3_reg>; |
| 7557 | 7557 | diff --git a/arch/arm/boot/dts/exynos3250-artik5.dtsi b/arch/arm/boot/dts/exynos3250-artik5.dtsi |
| 7558 | | index 59c89d7662a8..639c2e605f3c 100644 |
| 7558 | index 59c89d7662a8004b03f52cbdab7d3f9903bf9326..639c2e605f3c99a4c5478b85c4ac69c236f8bfba 100644 |
| 7559 | 7559 | --- a/arch/arm/boot/dts/exynos3250-artik5.dtsi |
| 7560 | 7560 | +++ b/arch/arm/boot/dts/exynos3250-artik5.dtsi |
| 7561 | 7561 | @@ -304,7 +304,6 @@ buck5_reg: BUCK5 { |
| ... | ... | @@ -7567,7 +7567,7 @@ index 59c89d7662a8..639c2e605f3c 100644 |
| 7567 | 7567 | 	cap-mmc-highspeed; |
| 7568 | 7568 | 	card-detect-delay = <200>; |
| 7569 | 7569 | diff --git a/arch/arm/boot/dts/exynos3250-monk.dts b/arch/arm/boot/dts/exynos3250-monk.dts |
| 7570 | | index accee81da266..bbdfcbc6e7d2 100644 |
| 7570 | index accee81da266e3c1e9a3cb7e55998c658f1017a7..bbdfcbc6e7d29a5cdbb854ba030f1d77cae048ad 100644 |
| 7571 | 7571 | --- a/arch/arm/boot/dts/exynos3250-monk.dts |
| 7572 | 7572 | +++ b/arch/arm/boot/dts/exynos3250-monk.dts |
| 7573 | 7573 | @@ -426,7 +426,6 @@ &i2s2 { |
| ... | ... | @@ -7579,7 +7579,7 @@ index accee81da266..bbdfcbc6e7d2 100644 |
| 7579 | 7579 | 	non-removable; |
| 7580 | 7580 | 	cap-mmc-highspeed; |
| 7581 | 7581 | diff --git a/arch/arm/boot/dts/exynos3250-rinato.dts b/arch/arm/boot/dts/exynos3250-rinato.dts |
| 7582 | | index 443e0c98dc73..0b45467d77a8 100644 |
| 7582 | index 443e0c98dc73089213ce3aca04a0bdb44dfc64ed..0b45467d77a8f53d5b21ce910cadfd2d1226565e 100644 |
| 7583 | 7583 | --- a/arch/arm/boot/dts/exynos3250-rinato.dts |
| 7584 | 7584 | +++ b/arch/arm/boot/dts/exynos3250-rinato.dts |
| 7585 | 7585 | @@ -220,21 +220,6 @@ &dsi_0 { |
| ... | ... | @@ -7626,7 +7626,7 @@ index 443e0c98dc73..0b45467d77a8 100644 |
| 7626 | 7626 | 	non-removable; |
| 7627 | 7627 | 	cap-mmc-highspeed; |
| 7628 | 7628 | diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts |
| 7629 | | index 645feffb9239..7b6ab7265110 100644 |
| 7629 | index 645feffb9239d2465782ea04989ce063b6ae2b97..7b6ab726511053d008789a3270d7eb84b421dbd1 100644 |
| 7630 | 7630 | --- a/arch/arm/boot/dts/exynos4210-trats.dts |
| 7631 | 7631 | +++ b/arch/arm/boot/dts/exynos4210-trats.dts |
| 7632 | 7632 | @@ -202,21 +202,6 @@ &dsi_0 { |
| ... | ... | @@ -7665,7 +7665,7 @@ index 645feffb9239..7b6ab7265110 100644 |
| 7665 | 7665 | }; |
| 7666 | 7666 | |
| 7667 | 7667 | diff --git a/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi b/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi |
| 7668 | | index 4cd62487bb16..14ce2c69bc0b 100644 |
| 7668 | index 4cd62487bb16f28a2b1303ac4ce3486a552a7214..14ce2c69bc0b4972d4cb4817fcfaaca0b8b953d4 100644 |
| 7669 | 7669 | --- a/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi |
| 7670 | 7670 | +++ b/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi |
| 7671 | 7671 | @@ -466,7 +466,6 @@ &mshc_0 { |
| ... | ... | @@ -7677,7 +7677,7 @@ index 4cd62487bb16..14ce2c69bc0b 100644 |
| 7677 | 7677 | 	card-detect-delay = <200>; |
| 7678 | 7678 | 	samsung,dw-mshc-ciu-div = <3>; |
| 7679 | 7679 | diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi |
| 7680 | | index 219d587c5a85..102acd78be15 100644 |
| 7680 | index 219d587c5a85059f9bd44ac69a794cae25a21bf7..102acd78be15a9a972a2334cb520021424045ba0 100644 |
| 7681 | 7681 | --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi |
| 7682 | 7682 | +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi |
| 7683 | 7683 | @@ -516,7 +516,6 @@ &mshc_0 { |
| ... | ... | @@ -7689,7 +7689,7 @@ index 219d587c5a85..102acd78be15 100644 |
| 7689 | 7689 | 	card-detect-delay = <200>; |
| 7690 | 7690 | 	samsung,dw-mshc-ciu-div = <3>; |
| 7691 | 7691 | diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts |
| 7692 | | index 7a83e2df18a6..8a89eb893d64 100644 |
| 7692 | index 7a83e2df18a606a8247859647aa0fa5f7e172236..8a89eb893d644d46ad79d7f3e7161edb2d0eccf0 100644 |
| 7693 | 7693 | --- a/arch/arm/boot/dts/exynos4412-origen.dts |
| 7694 | 7694 | +++ b/arch/arm/boot/dts/exynos4412-origen.dts |
| 7695 | 7695 | @@ -488,7 +488,6 @@ &mshc_0 { |
| ... | ... | @@ -7701,7 +7701,7 @@ index 7a83e2df18a6..8a89eb893d64 100644 |
| 7701 | 7701 | 	card-detect-delay = <200>; |
| 7702 | 7702 | 	samsung,dw-mshc-ciu-div = <3>; |
| 7703 | 7703 | diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts |
| 7704 | | index 35e9b94b86b8..bceb919ac637 100644 |
| 7704 | index 35e9b94b86b8d6853e919574fec8d486543061c8..bceb919ac6379ad8d5034913b32ecdfd436a7030 100644 |
| 7705 | 7705 | --- a/arch/arm/boot/dts/exynos4412-trats2.dts |
| 7706 | 7706 | +++ b/arch/arm/boot/dts/exynos4412-trats2.dts |
| 7707 | 7707 | @@ -390,21 +390,6 @@ &dsi_0 { |
| ... | ... | @@ -7748,7 +7748,7 @@ index 35e9b94b86b8..bceb919ac637 100644 |
| 7748 | 7748 | 	non-removable; |
| 7749 | 7749 | 	card-detect-delay = <200>; |
| 7750 | 7750 | diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts |
| 7751 | | index 6a432460eb77..18a7f396ac5f 100644 |
| 7751 | index 6a432460eb77b910d58c3d174ae22c03b7adbae4..18a7f396ac5f727b4daa0c15b2723b3ca89035d2 100644 |
| 7752 | 7752 | --- a/arch/arm/boot/dts/exynos5250-arndale.dts |
| 7753 | 7753 | +++ b/arch/arm/boot/dts/exynos5250-arndale.dts |
| 7754 | 7754 | @@ -518,7 +518,6 @@ &i2s0 { |
| ... | ... | @@ -7768,7 +7768,7 @@ index 6a432460eb77..18a7f396ac5f 100644 |
| 7768 | 7768 | 	samsung,dw-mshc-ciu-div = <3>; |
| 7769 | 7769 | 	samsung,dw-mshc-sdr-timing = <2 3>; |
| 7770 | 7770 | diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts |
| 7771 | | index 6632f657394e..062cba4c2c31 100644 |
| 7771 | index 6632f657394e6d4ee44774573487a77c08acae5b..062cba4c2c310b28846634d354b10fe4d07e786c 100644 |
| 7772 | 7772 | --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts |
| 7773 | 7773 | +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts |
| 7774 | 7774 | @@ -346,7 +346,6 @@ &i2s0 { |
| ... | ... | @@ -7788,7 +7788,7 @@ index 6632f657394e..062cba4c2c31 100644 |
| 7788 | 7788 | 	samsung,dw-mshc-ciu-div = <3>; |
| 7789 | 7789 | 	samsung,dw-mshc-sdr-timing = <2 3>; |
| 7790 | 7790 | diff --git a/arch/arm/boot/dts/exynos5250-snow-common.dtsi b/arch/arm/boot/dts/exynos5250-snow-common.dtsi |
| 7791 | | index e1d293dbbe5d..8788880e459d 100644 |
| 7791 | index e1d293dbbe5d95623ddd8b26a951c5e3360afb24..8788880e459d3e1dde6bfddbe80ae3c631693d89 100644 |
| 7792 | 7792 | --- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi |
| 7793 | 7793 | +++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi |
| 7794 | 7794 | @@ -530,7 +530,6 @@ &i2s0 { |
| ... | ... | @@ -7816,7 +7816,7 @@ index e1d293dbbe5d..8788880e459d 100644 |
| 7816 | 7816 | 	cap-sdio-irq; |
| 7817 | 7817 | 	keep-power-in-suspend; |
| 7818 | 7818 | diff --git a/arch/arm/boot/dts/exynos5250-spring.dts b/arch/arm/boot/dts/exynos5250-spring.dts |
| 7819 | | index 95c3bcace9dc..d53bfcbeb39c 100644 |
| 7819 | index 95c3bcace9dcbe8fcc233a17d88320f3ffd73fd6..d53bfcbeb39c42f3789514953f152413418d0d49 100644 |
| 7820 | 7820 | --- a/arch/arm/boot/dts/exynos5250-spring.dts |
| 7821 | 7821 | +++ b/arch/arm/boot/dts/exynos5250-spring.dts |
| 7822 | 7822 | @@ -427,7 +427,6 @@ &i2s0 { |
| ... | ... | @@ -7836,7 +7836,7 @@ index 95c3bcace9dc..d53bfcbeb39c 100644 |
| 7836 | 7836 | 	card-detect-delay = <200>; |
| 7837 | 7837 | 	samsung,dw-mshc-ciu-div = <3>; |
| 7838 | 7838 | diff --git a/arch/arm/boot/dts/exynos5260-xyref5260.dts b/arch/arm/boot/dts/exynos5260-xyref5260.dts |
| 7839 | | index d0cc300cfb4b..73b7cdd5f522 100644 |
| 7839 | index d0cc300cfb4b6ae185677e9971e537f31f560559..73b7cdd5f5223cafaa99c7181d23586061f1b189 100644 |
| 7840 | 7840 | --- a/arch/arm/boot/dts/exynos5260-xyref5260.dts |
| 7841 | 7841 | +++ b/arch/arm/boot/dts/exynos5260-xyref5260.dts |
| 7842 | 7842 | @@ -67,7 +67,6 @@ &uart3 { |
| ... | ... | @@ -7856,7 +7856,7 @@ index d0cc300cfb4b..73b7cdd5f522 100644 |
| 7856 | 7856 | 	card-detect-delay = <200>; |
| 7857 | 7857 | 	samsung,dw-mshc-ciu-div = <3>; |
| 7858 | 7858 | diff --git a/arch/arm/boot/dts/exynos5410-smdk5410.dts b/arch/arm/boot/dts/exynos5410-smdk5410.dts |
| 7859 | | index 6cc74d97daae..9cb7726ef8d0 100644 |
| 7859 | index 6cc74d97daaea595d8b6d0ece1d10c773a71f720..9cb7726ef8d0dbc1f4bb6964acc64bc34abd566e 100644 |
| 7860 | 7860 | --- a/arch/arm/boot/dts/exynos5410-smdk5410.dts |
| 7861 | 7861 | +++ b/arch/arm/boot/dts/exynos5410-smdk5410.dts |
| 7862 | 7862 | @@ -41,7 +41,6 @@ firmware@02037000 { |
| ... | ... | @@ -7876,7 +7876,7 @@ index 6cc74d97daae..9cb7726ef8d0 100644 |
| 7876 | 7876 | 	card-detect-delay = <200>; |
| 7877 | 7877 | 	samsung,dw-mshc-ciu-div = <3>; |
| 7878 | 7878 | diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts |
| 7879 | | index f9a75bfd3f2b..683a4cfb4a23 100644 |
| 7879 | index f9a75bfd3f2bfdc45575c5947f6107024d15e42a..683a4cfb4a23d469ba91670f414e27ea03d57f5a 100644 |
| 7880 | 7880 | --- a/arch/arm/boot/dts/exynos5420-peach-pit.dts |
| 7881 | 7881 | +++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts |
| 7882 | 7882 | @@ -699,7 +699,6 @@ &i2s0 { |
| ... | ... | @@ -7904,7 +7904,7 @@ index f9a75bfd3f2b..683a4cfb4a23 100644 |
| 7904 | 7904 | 	card-detect-delay = <200>; |
| 7905 | 7905 | 	clock-frequency = <400000000>; |
| 7906 | 7906 | diff --git a/arch/arm/boot/dts/exynos5440.dtsi b/arch/arm/boot/dts/exynos5440.dtsi |
| 7907 | | index bc4954e69f7b..7a00be7ea6d7 100644 |
| 7907 | index bc4954e69f7b148c3e33dd624e039726f0f0026a..7a00be7ea6d716e38bf979a6d9e4da7397f7dfd1 100644 |
| 7908 | 7908 | --- a/arch/arm/boot/dts/exynos5440.dtsi |
| 7909 | 7909 | +++ b/arch/arm/boot/dts/exynos5440.dtsi |
| 7910 | 7910 | @@ -317,6 +317,7 @@ pcie_0: pcie@290000 { |
| ... | ... | @@ -7924,7 +7924,7 @@ index bc4954e69f7b..7a00be7ea6d7 100644 |
| 7924 | 7924 | 		interrupt-map-mask = <0 0 0 0>; |
| 7925 | 7925 | 		interrupt-map = <0x0 0 &gic 56>; |
| 7926 | 7926 | diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts |
| 7927 | | index 953dc8677dc8..b2b95ff205e8 100644 |
| 7927 | index 953dc8677dc888d21f4207d27de2d8268d812198..b2b95ff205e81ba9248f3f29416001459e3c3d77 100644 |
| 7928 | 7928 | --- a/arch/arm/boot/dts/exynos5800-peach-pi.dts |
| 7929 | 7929 | +++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts |
| 7930 | 7930 | @@ -667,7 +667,6 @@ &i2s0 { |
| ... | ... | @@ -7953,7 +7953,7 @@ index 953dc8677dc8..b2b95ff205e8 100644 |
| 7953 | 7953 | 	clock-frequency = <400000000>; |
| 7954 | 7954 | diff --git a/arch/arm/boot/dts/gemini-dlink-dir-685.dts b/arch/arm/boot/dts/gemini-dlink-dir-685.dts |
| 7955 | 7955 | new file mode 100644 |
| 7956 | | index 000000000000..e75e2d44371c |
| 7956 | index 0000000000000000000000000000000000000000..e75e2d44371cdd7bf719ab8ac2504717f1a742b3 |
| 7957 | 7957 | --- /dev/null |
| 7958 | 7958 | +++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts |
| 7959 | 7959 | @@ -0,0 +1,246 @@ |
| ... | ... | @@ -8204,7 +8204,7 @@ index 000000000000..e75e2d44371c |
| 8204 | 8204 | +	}; |
| 8205 | 8205 | +}; |
| 8206 | 8206 | diff --git a/arch/arm/boot/dts/gemini-nas4220b.dts b/arch/arm/boot/dts/gemini-nas4220b.dts |
| 8207 | | index 55f6a4f1f801..b4fc58c8cf8d 100644 |
| 8207 | index 55f6a4f1f8016754274af65ed6895b7e8ab47a3f..b4fc58c8cf8d7b855a5a686beb2dfedede1add50 100644 |
| 8208 | 8208 | --- a/arch/arm/boot/dts/gemini-nas4220b.dts |
| 8209 | 8209 | +++ b/arch/arm/boot/dts/gemini-nas4220b.dts |
| 8210 | 8210 | @@ -33,6 +33,7 @@ button@29 { |
| ... | ... | @@ -8271,7 +8271,7 @@ index 55f6a4f1f801..b4fc58c8cf8d 100644 |
| 8271 | 8271 | 			status = "okay"; |
| 8272 | 8272 | 		}; |
| 8273 | 8273 | diff --git a/arch/arm/boot/dts/gemini-rut1xx.dts b/arch/arm/boot/dts/gemini-rut1xx.dts |
| 8274 | | index 7b920bfbda32..3613b264f45f 100644 |
| 8274 | index 7b920bfbda32cfcf01b63e022c8787cff60cdcba..3613b264f45faff79459cb5d9daf76f158406e08 100644 |
| 8275 | 8275 | --- a/arch/arm/boot/dts/gemini-rut1xx.dts |
| 8276 | 8276 | +++ b/arch/arm/boot/dts/gemini-rut1xx.dts |
| 8277 | 8277 | @@ -33,6 +33,7 @@ button@28 { |
| ... | ... | @@ -8340,7 +8340,7 @@ index 7b920bfbda32..3613b264f45f 100644 |
| 8340 | 8340 | 	}; |
| 8341 | 8341 | }; |
| 8342 | 8342 | diff --git a/arch/arm/boot/dts/gemini-sq201.dts b/arch/arm/boot/dts/gemini-sq201.dts |
| 8343 | | index 4d200f0bcd45..7cfa9caf47d4 100644 |
| 8343 | index 4d200f0bcd451ac780b23ec1f181c056befcc057..7cfa9caf47d4e642031a2315bd41f743ace7a75b 100644 |
| 8344 | 8344 | --- a/arch/arm/boot/dts/gemini-sq201.dts |
| 8345 | 8345 | +++ b/arch/arm/boot/dts/gemini-sq201.dts |
| 8346 | 8346 | @@ -33,6 +33,7 @@ button@18 { |
| ... | ... | @@ -8420,7 +8420,7 @@ index 4d200f0bcd45..7cfa9caf47d4 100644 |
| 8420 | 8420 | 			status = "okay"; |
| 8421 | 8421 | 			interrupt-map-mask = <0xf800 0 0 7>; |
| 8422 | 8422 | diff --git a/arch/arm/boot/dts/gemini-wbd111.dts b/arch/arm/boot/dts/gemini-wbd111.dts |
| 8423 | | index 63b756e3bf5a..38a49e750478 100644 |
| 8423 | index 63b756e3bf5a2fcdd42eb8a3fe6760e36878be85..38a49e7504785077bd809a078d082fd51a2f4dbf 100644 |
| 8424 | 8424 | --- a/arch/arm/boot/dts/gemini-wbd111.dts |
| 8425 | 8425 | +++ b/arch/arm/boot/dts/gemini-wbd111.dts |
| 8426 | 8426 | @@ -33,6 +33,7 @@ button@5 { |
| ... | ... | @@ -8485,7 +8485,7 @@ index 63b756e3bf5a..38a49e750478 100644 |
| 8485 | 8485 | 	}; |
| 8486 | 8486 | }; |
| 8487 | 8487 | diff --git a/arch/arm/boot/dts/gemini-wbd222.dts b/arch/arm/boot/dts/gemini-wbd222.dts |
| 8488 | | index 9747f5a47807..f77e34e0df0b 100644 |
| 8488 | index 9747f5a47807b4679f7cdd8476c9da58c5b78b9c..f77e34e0df0bcdead3b341dd1e155deaee10b37b 100644 |
| 8489 | 8489 | --- a/arch/arm/boot/dts/gemini-wbd222.dts |
| 8490 | 8490 | +++ b/arch/arm/boot/dts/gemini-wbd222.dts |
| 8491 | 8491 | @@ -33,6 +33,7 @@ button@5 { |
| ... | ... | @@ -8550,7 +8550,7 @@ index 9747f5a47807..f77e34e0df0b 100644 |
| 8550 | 8550 | 	}; |
| 8551 | 8551 | }; |
| 8552 | 8552 | diff --git a/arch/arm/boot/dts/gemini.dtsi b/arch/arm/boot/dts/gemini.dtsi |
| 8553 | | index 141d8d3a1d07..c68e8d430234 100644 |
| 8553 | index 141d8d3a1d07bfab1c0df4e5f559ac2075828793..c68e8d430234c3824198d46b336f0d689cf38611 100644 |
| 8554 | 8554 | --- a/arch/arm/boot/dts/gemini.dtsi |
| 8555 | 8555 | +++ b/arch/arm/boot/dts/gemini.dtsi |
| 8556 | 8556 | @@ -5,6 +5,8 @@ |
| ... | ... | @@ -8846,7 +8846,7 @@ index 141d8d3a1d07..c68e8d430234 100644 |
| 8846 | 8846 | 			/* Bus interface AHB1 (AHB0) is totally tilted */ |
| 8847 | 8847 | 			lli-bus-interface-ahb2; |
| 8848 | 8848 | diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi |
| 8849 | | index 0ade3619f3c3..09ce8b81fafa 100644 |
| 8849 | index 0ade3619f3c3f1332b8d89c8d06ed4a67f29025b..09ce8b81fafa477b7d04a0e382dee57125088b20 100644 |
| 8850 | 8850 | --- a/arch/arm/boot/dts/imx25.dtsi |
| 8851 | 8851 | +++ b/arch/arm/boot/dts/imx25.dtsi |
| 8852 | 8852 | @@ -452,6 +452,13 @@ scc: crypto@53fac000 { |
| ... | ... | @@ -8865,7 +8865,7 @@ index 0ade3619f3c3..09ce8b81fafa 100644 |
| 8865 | 8865 | 				reg = <0x53fb4000 0x4000>; |
| 8866 | 8866 | diff --git a/arch/arm/boot/dts/imx53-cx9020.dts b/arch/arm/boot/dts/imx53-cx9020.dts |
| 8867 | 8867 | new file mode 100644 |
| 8868 | | index 000000000000..4f54fd4418a3 |
| 8868 | index 0000000000000000000000000000000000000000..4f54fd4418a33e05bafbbca05827ca554d9b8feb |
| 8869 | 8869 | --- /dev/null |
| 8870 | 8870 | +++ b/arch/arm/boot/dts/imx53-cx9020.dts |
| 8871 | 8871 | @@ -0,0 +1,297 @@ |
| ... | ... | @@ -9167,7 +9167,7 @@ index 000000000000..4f54fd4418a3 |
| 9167 | 9167 | +	}; |
| 9168 | 9168 | +}; |
| 9169 | 9169 | diff --git a/arch/arm/boot/dts/imx53-pinfunc.h b/arch/arm/boot/dts/imx53-pinfunc.h |
| 9170 | | index aec406bc65eb..59f9c29e3fe2 100644 |
| 9170 | index aec406bc65eb70ce2a0980a9779d7e6e6913e26f..59f9c29e3fe2ff37a626a2bdf51bdbff44d844cf 100644 |
| 9171 | 9171 | --- a/arch/arm/boot/dts/imx53-pinfunc.h |
| 9172 | 9172 | +++ b/arch/arm/boot/dts/imx53-pinfunc.h |
| 9173 | 9173 | @@ -524,6 +524,7 @@ |
| ... | ... | @@ -9203,7 +9203,7 @@ index aec406bc65eb..59f9c29e3fe2 100644 |
| 9203 | 9203 | #define MX53_PAD_EIM_D29__IPU_DISPB0_SER_RS			0x150 0x498 0x000 0x3 0x0 |
| 9204 | 9204 | #define MX53_PAD_EIM_D29__CSPI_SS0				0x150 0x498 0x78c 0x4 0x2 |
| 9205 | 9205 | diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi |
| 9206 | | index 2e516f4985e4..8bf0d89cdd35 100644 |
| 9206 | index 2e516f4985e4cd2e470f8ddb0195a34821a1d09d..8bf0d89cdd355cf0c9484335476e08fb0fca1b5e 100644 |
| 9207 | 9207 | --- a/arch/arm/boot/dts/imx53.dtsi |
| 9208 | 9208 | +++ b/arch/arm/boot/dts/imx53.dtsi |
| 9209 | 9209 | @@ -433,6 +433,15 @@ gpt: timer@53fa0000 { |
| ... | ... | @@ -9223,7 +9223,7 @@ index 2e516f4985e4..8bf0d89cdd35 100644 |
| 9223 | 9223 | 				compatible = "fsl,imx53-iomuxc"; |
| 9224 | 9224 | 				reg = <0x53fa8000 0x4000>; |
| 9225 | 9225 | diff --git a/arch/arm/boot/dts/imx6dl-gw52xx.dts b/arch/arm/boot/dts/imx6dl-gw52xx.dts |
| 9226 | | index a2e0b73fdd4a..5f9f8948100d 100644 |
| 9226 | index a2e0b73fdd4a78440aac51149d9b251fc04707af..5f9f8948100deb2440ccf487d022d2ec75f1b736 100644 |
| 9227 | 9227 | --- a/arch/arm/boot/dts/imx6dl-gw52xx.dts |
| 9228 | 9228 | +++ b/arch/arm/boot/dts/imx6dl-gw52xx.dts |
| 9229 | 9229 | @@ -17,3 +17,61 @@ / { |
| ... | ... | @@ -9289,7 +9289,7 @@ index a2e0b73fdd4a..5f9f8948100d 100644 |
| 9289 | 9289 | +	}; |
| 9290 | 9290 | +}; |
| 9291 | 9291 | diff --git a/arch/arm/boot/dts/imx6dl-gw53xx.dts b/arch/arm/boot/dts/imx6dl-gw53xx.dts |
| 9292 | | index 6844b708d2f8..9bfc620d37bd 100644 |
| 9292 | index 6844b708d2f89ec09b6da02f0965fad905ed0b3d..9bfc620d37bd0601d925b0dc7faa9e9d0aa3f032 100644 |
| 9293 | 9293 | --- a/arch/arm/boot/dts/imx6dl-gw53xx.dts |
| 9294 | 9294 | +++ b/arch/arm/boot/dts/imx6dl-gw53xx.dts |
| 9295 | 9295 | @@ -17,3 +17,61 @@ / { |
| ... | ... | @@ -9355,7 +9355,7 @@ index 6844b708d2f8..9bfc620d37bd 100644 |
| 9355 | 9355 | +	}; |
| 9356 | 9356 | +}; |
| 9357 | 9357 | diff --git a/arch/arm/boot/dts/imx6dl-gw54xx.dts b/arch/arm/boot/dts/imx6dl-gw54xx.dts |
| 9358 | | index be915412f852..b909bdf9a2ef 100644 |
| 9358 | index be915412f852ea5af34121808ecc22b04c592b4e..b909bdf9a2efcc2c1e8ff89a0a57fc79638e1f14 100644 |
| 9359 | 9359 | --- a/arch/arm/boot/dts/imx6dl-gw54xx.dts |
| 9360 | 9360 | +++ b/arch/arm/boot/dts/imx6dl-gw54xx.dts |
| 9361 | 9361 | @@ -17,3 +17,61 @@ / { |
| ... | ... | @@ -9421,7 +9421,7 @@ index be915412f852..b909bdf9a2ef 100644 |
| 9421 | 9421 | +	}; |
| 9422 | 9422 | +}; |
| 9423 | 9423 | diff --git a/arch/arm/boot/dts/imx6dl-riotboard.dts b/arch/arm/boot/dts/imx6dl-riotboard.dts |
| 9424 | | index 29b45f2e64e0..275c6c05219d 100644 |
| 9424 | index 29b45f2e64e0ad1073a9289588601cbcfb358719..275c6c05219dbdc54ba4c994459a45506608e65b 100644 |
| 9425 | 9425 | --- a/arch/arm/boot/dts/imx6dl-riotboard.dts |
| 9426 | 9426 | +++ b/arch/arm/boot/dts/imx6dl-riotboard.dts |
| 9427 | 9427 | @@ -101,6 +101,51 @@ &fec { |
| ... | ... | @@ -9478,7 +9478,7 @@ index 29b45f2e64e0..275c6c05219d 100644 |
| 9478 | 9478 | 	status = "okay"; |
| 9479 | 9479 | diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/imx6q-apalis-eval.dts |
| 9480 | 9480 | new file mode 100644 |
| 9481 | | index 000000000000..4bbfe3d61027 |
| 9481 | index 0000000000000000000000000000000000000000..4bbfe3d6102756178a14e76a4b60b1c02dfead96 |
| 9482 | 9482 | --- /dev/null |
| 9483 | 9483 | +++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts |
| 9484 | 9484 | @@ -0,0 +1,278 @@ |
| ... | ... | @@ -9762,7 +9762,7 @@ index 000000000000..4bbfe3d61027 |
| 9762 | 9762 | +}; |
| 9763 | 9763 | diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts |
| 9764 | 9764 | new file mode 100644 |
| 9765 | | index 000000000000..a35c7a54ad3b |
| 9765 | index 0000000000000000000000000000000000000000..a35c7a54ad3b5484be85987024d771e42fb01bb1 |
| 9766 | 9766 | --- /dev/null |
| 9767 | 9767 | +++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts |
| 9768 | 9768 | @@ -0,0 +1,291 @@ |
| ... | ... | @@ -10058,7 +10058,7 @@ index 000000000000..a35c7a54ad3b |
| 10058 | 10058 | +	}; |
| 10059 | 10059 | +}; |
| 10060 | 10060 | diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-apalis-ixora.dts |
| 10061 | | index 88cc7f51a4e9..60d33e99de76 100644 |
| 10061 | index 88cc7f51a4e902fb323a7c8956acaee442d2e425..60d33e99de76037cf546c8000ade4304c959c1c6 100644 |
| 10062 | 10062 | --- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts |
| 10063 | 10063 | +++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts |
| 10064 | 10064 | @@ -1,5 +1,5 @@ |
| ... | ... | @@ -10136,7 +10136,7 @@ index 88cc7f51a4e9..60d33e99de76 100644 |
| 10136 | 10136 | 	pinctrl-0 = <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2 |
| 10137 | 10137 | 		 &pinctrl_apalis_gpio3 &pinctrl_apalis_gpio4 |
| 10138 | 10138 | diff --git a/arch/arm/boot/dts/imx6q-b850v3.dts b/arch/arm/boot/dts/imx6q-b850v3.dts |
| 10139 | | index 2c1e98e0cf7b..46bdc6722715 100644 |
| 10139 | index 2c1e98e0cf7bf469593f0d28f9a830b73deb35bb..46bdc67227157cfd146986d0237abdf4c5cf2226 100644 |
| 10140 | 10140 | --- a/arch/arm/boot/dts/imx6q-b850v3.dts |
| 10141 | 10141 | +++ b/arch/arm/boot/dts/imx6q-b850v3.dts |
| 10142 | 10142 | @@ -57,7 +57,7 @@ &clks { |
| ... | ... | @@ -10149,7 +10149,7 @@ index 2c1e98e0cf7b..46bdc6722715 100644 |
| 10149 | 10149 | 				 <&clks IMX6QDL_CLK_PLL5_VIDEO_DIV>, |
| 10150 | 10150 | 				 <&clks IMX6QDL_CLK_PLL2_PFD2_396M>, |
| 10151 | 10151 | diff --git a/arch/arm/boot/dts/imx6q-bx50v3.dtsi b/arch/arm/boot/dts/imx6q-bx50v3.dtsi |
| 10152 | | index c90b26f00e24..1015e55ca8f7 100644 |
| 10152 | index c90b26f00e24c8395b3ebd2d0d20f1a2481e0a33..1015e55ca8f7bd9eaa2edf68ed499f577fbac083 100644 |
| 10153 | 10153 | --- a/arch/arm/boot/dts/imx6q-bx50v3.dtsi |
| 10154 | 10154 | +++ b/arch/arm/boot/dts/imx6q-bx50v3.dtsi |
| 10155 | 10155 | @@ -111,6 +111,11 @@ m25_eeprom: m25p80@0 { |
| ... | ... | @@ -10209,7 +10209,7 @@ index c90b26f00e24..1015e55ca8f7 100644 |
| 10209 | 10209 | 	pinctrl-names = "default"; |
| 10210 | 10210 | 	pinctrl-0 = <&pinctrl_usdhc4>; |
| 10211 | 10211 | diff --git a/arch/arm/boot/dts/imx6q-gw52xx.dts b/arch/arm/boot/dts/imx6q-gw52xx.dts |
| 10212 | | index a12c47e5ee05..0b8ae007ad73 100644 |
| 10212 | index a12c47e5ee059fbf45216ee6a9e65ce06f2f97b0..0b8ae007ad73fc08640c72a8cde3e902bf74d1a4 100644 |
| 10213 | 10213 | --- a/arch/arm/boot/dts/imx6q-gw52xx.dts |
| 10214 | 10214 | +++ b/arch/arm/boot/dts/imx6q-gw52xx.dts |
| 10215 | 10215 | @@ -18,6 +18,64 @@ / { |
| ... | ... | @@ -10278,7 +10278,7 @@ index a12c47e5ee05..0b8ae007ad73 100644 |
| 10278 | 10278 | 	status = "okay"; |
| 10279 | 10279 | }; |
| 10280 | 10280 | diff --git a/arch/arm/boot/dts/imx6q-gw53xx.dts b/arch/arm/boot/dts/imx6q-gw53xx.dts |
| 10281 | | index d76aaa83dad0..a56ef77eff3f 100644 |
| 10281 | index d76aaa83dad070ade4861a599dee1168da69c5cf..a56ef77eff3f9fb0aa2706aa027825311d14dece 100644 |
| 10282 | 10282 | --- a/arch/arm/boot/dts/imx6q-gw53xx.dts |
| 10283 | 10283 | +++ b/arch/arm/boot/dts/imx6q-gw53xx.dts |
| 10284 | 10284 | @@ -18,6 +18,64 @@ / { |
| ... | ... | @@ -10347,7 +10347,7 @@ index d76aaa83dad0..a56ef77eff3f 100644 |
| 10347 | 10347 | +	}; |
| 10348 | 10348 | +}; |
| 10349 | 10349 | diff --git a/arch/arm/boot/dts/imx6q-gw54xx.dts b/arch/arm/boot/dts/imx6q-gw54xx.dts |
| 10350 | | index 6e8f53e92a2d..56e5b5050fcf 100644 |
| 10350 | index 6e8f53e92a2d24d49d4d1fb15788a4237fe08890..56e5b5050fcfcc2e5f093593c95c5f7c944e1ad1 100644 |
| 10351 | 10351 | --- a/arch/arm/boot/dts/imx6q-gw54xx.dts |
| 10352 | 10352 | +++ b/arch/arm/boot/dts/imx6q-gw54xx.dts |
| 10353 | 10353 | @@ -18,6 +18,64 @@ / { |
| ... | ... | @@ -10416,7 +10416,7 @@ index 6e8f53e92a2d..56e5b5050fcf 100644 |
| 10416 | 10416 | +	}; |
| 10417 | 10417 | +}; |
| 10418 | 10418 | diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi |
| 10419 | | index ba01dd76d887..ea339fa58f4a 100644 |
| 10419 | index ba01dd76d8874fc6df4a87efa48c3bcc5ddff163..ea339fa58f4a5a99f1834778e926ce022f139cdd 100644 |
| 10420 | 10420 | --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi |
| 10421 | 10421 | +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi |
| 10422 | 10422 | @@ -1,5 +1,5 @@ |
| ... | ... | @@ -10519,7 +10519,7 @@ index ba01dd76d887..ea339fa58f4a 100644 |
| 10519 | 10519 | 			MX6QDL_PAD_NANDF_D1__SD1_DATA5 0x17071 |
| 10520 | 10520 | 			MX6QDL_PAD_NANDF_D2__SD1_DATA6 0x17071 |
| 10521 | 10521 | diff --git a/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi |
| 10522 | | index e8c1edc82e6e..885556260bd0 100644 |
| 10522 | index e8c1edc82e6ef122a7fb68ee568d50d0f59a3d11..885556260bd0737b2164967dcad8af83d44ef066 100644 |
| 10523 | 10523 | --- a/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi |
| 10524 | 10524 | +++ b/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi |
| 10525 | 10525 | @@ -231,6 +231,37 @@ &i2c3 { |
| ... | ... | @@ -10598,7 +10598,7 @@ index e8c1edc82e6e..885556260bd0 100644 |
| 10598 | 10598 | 			fsl,pins = < |
| 10599 | 10599 | 				MX6QDL_PAD_GPIO_0__GPIO1_IO00		0x1b0b0 |
| 10600 | 10600 | diff --git a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi |
| 10601 | | index 91991d63a69c..115d706228ef 100644 |
| 10601 | index 91991d63a69c9a9af6aac4772be2b21014a8a493..115d706228eff5067f6a536e049e07183a778631 100644 |
| 10602 | 10602 | --- a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi |
| 10603 | 10603 | +++ b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi |
| 10604 | 10604 | @@ -377,7 +377,6 @@ &ssi1 { |
| ... | ... | @@ -10610,7 +10610,7 @@ index 91991d63a69c..115d706228ef 100644 |
| 10610 | 10610 | 	status = "okay"; |
| 10611 | 10611 | }; |
| 10612 | 10612 | diff --git a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi |
| 10613 | | index 5bc6ed1a5b35..24be7965056c 100644 |
| 10613 | index 5bc6ed1a5b35ad1240cd7e6ae560c6d2f666a267..24be7965056c13d898d026eb852ba30db284b206 100644 |
| 10614 | 10614 | --- a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi |
| 10615 | 10615 | +++ b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi |
| 10616 | 10616 | @@ -368,7 +368,6 @@ &ssi1 { |
| ... | ... | @@ -10622,7 +10622,7 @@ index 5bc6ed1a5b35..24be7965056c 100644 |
| 10622 | 10622 | 	status = "okay"; |
| 10623 | 10623 | }; |
| 10624 | 10624 | diff --git a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi |
| 10625 | | index 66fcf838e964..4594b2279169 100644 |
| 10625 | index 66fcf838e964502329391f457a2c5e9801ace1a4..4594b22791695436df2cd9ff372f332db74ad5c4 100644 |
| 10626 | 10626 | --- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi |
| 10627 | 10627 | +++ b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi |
| 10628 | 10628 | @@ -416,7 +416,6 @@ &ssi2 { |
| ... | ... | @@ -10634,7 +10634,7 @@ index 66fcf838e964..4594b2279169 100644 |
| 10634 | 10634 | 	status = "okay"; |
| 10635 | 10635 | }; |
| 10636 | 10636 | diff --git a/arch/arm/boot/dts/imx6qdl-gw553x.dtsi b/arch/arm/boot/dts/imx6qdl-gw553x.dtsi |
| 10637 | | index 57374dddf98d..1a0faa1a14c8 100644 |
| 10637 | index 57374dddf98d129c8019b4e0b14d63acd546766c..1a0faa1a14c8a4942d72ed1e3b1f6ef97a9b6c48 100644 |
| 10638 | 10638 | --- a/arch/arm/boot/dts/imx6qdl-gw553x.dtsi |
| 10639 | 10639 | +++ b/arch/arm/boot/dts/imx6qdl-gw553x.dtsi |
| 10640 | 10640 | @@ -261,6 +261,37 @@ &i2c3 { |
| ... | ... | @@ -10713,7 +10713,7 @@ index 57374dddf98d..1a0faa1a14c8 100644 |
| 10713 | 10713 | 		fsl,pins = < |
| 10714 | 10714 | 			MX6QDL_PAD_KEY_COL2__GPIO4_IO10		0x1b0b0 |
| 10715 | 10715 | diff --git a/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi b/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi |
| 10716 | | index 5fab5be414fe..7ca291e9dbdb 100644 |
| 10716 | index 5fab5be414feb729fb3458fab43852c2644d0969..7ca291e9dbdb234b253d09b72fd1cb2a3f5aac71 100644 |
| 10717 | 10717 | --- a/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi |
| 10718 | 10718 | +++ b/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi |
| 10719 | 10719 | @@ -184,7 +184,6 @@ &pcie { |
| ... | ... | @@ -10725,7 +10725,7 @@ index 5fab5be414fe..7ca291e9dbdb 100644 |
| 10725 | 10725 | }; |
| 10726 | 10726 | |
| 10727 | 10727 | diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi |
| 10728 | | index f22e5879340b..d309a4d0eb08 100644 |
| 10728 | index f22e5879340bc41c7f722c9d3314a41935070a11..d309a4d0eb08b38c0ba551ee3652549421538eb5 100644 |
| 10729 | 10729 | --- a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi |
| 10730 | 10730 | +++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi |
| 10731 | 10731 | @@ -108,6 +108,18 @@ reg_wlan_vmmc: regulator@4 { |
| ... | ... | @@ -10769,7 +10769,7 @@ index f22e5879340b..d309a4d0eb08 100644 |
| 10769 | 10769 | }; |
| 10770 | 10770 | |
| 10771 | 10771 | diff --git a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi |
| 10772 | | index afe7449c47da..756c5054f047 100644 |
| 10772 | index afe7449c47da2d0b67ffc2628d323feaa4e00ea5..756c5054f047724f7e12a1fad1ca98fde09f50c2 100644 |
| 10773 | 10773 | --- a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi |
| 10774 | 10774 | +++ b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi |
| 10775 | 10775 | @@ -123,6 +123,18 @@ reg_2p8v: regulator@6 { |
| ... | ... | @@ -10813,7 +10813,7 @@ index afe7449c47da..756c5054f047 100644 |
| 10813 | 10813 | }; |
| 10814 | 10814 | |
| 10815 | 10815 | diff --git a/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi b/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi |
| 10816 | | index 5d94b5ee6aa0..eeb7679fd348 100644 |
| 10816 | index 5d94b5ee6aa0c992cdfc09bc0a4fe1a3a7a9aa2a..eeb7679fd348a4932d123a8bd7ec76fb5107cc63 100644 |
| 10817 | 10817 | --- a/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi |
| 10818 | 10818 | +++ b/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi |
| 10819 | 10819 | @@ -59,6 +59,14 @@ mdio1: mdio { |
| ... | ... | @@ -10955,7 +10955,7 @@ index 5d94b5ee6aa0..eeb7679fd348 100644 |
| 10955 | 10955 | 		fsl,pins = < |
| 10956 | 10956 | 			MX6QDL_PAD_GPIO_9__GPIO1_IO09		0x10 |
| 10957 | 10957 | diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi |
| 10958 | | index a9723b94bafa..8884b4a3cafb 100644 |
| 10958 | index a9723b94bafa2e1eae8bad3206d79c76ffc0397a..8884b4a3cafb6f979189ba4be89295ad3777bfee 100644 |
| 10959 | 10959 | --- a/arch/arm/boot/dts/imx6qdl.dtsi |
| 10960 | 10960 | +++ b/arch/arm/boot/dts/imx6qdl.dtsi |
| 10961 | 10961 | @@ -769,6 +769,7 @@ snvs_poweroff: snvs-poweroff { |
| ... | ... | @@ -10967,7 +10967,7 @@ index a9723b94bafa..8884b4a3cafb 100644 |
| 10967 | 10967 | 					status = "disabled"; |
| 10968 | 10968 | 				}; |
| 10969 | 10969 | diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi |
| 10970 | | index 3243af4a9984..3f76f980947e 100644 |
| 10970 | index 3243af4a99844b30075f2c3e2ac7c2872d7a9310..3f76f980947ed6ecd88cb5a8b48cbfc3dc5bd63b 100644 |
| 10971 | 10971 | --- a/arch/arm/boot/dts/imx6sl.dtsi |
| 10972 | 10972 | +++ b/arch/arm/boot/dts/imx6sl.dtsi |
| 10973 | 10973 | @@ -655,6 +655,7 @@ snvs_poweroff: snvs-poweroff { |
| ... | ... | @@ -10979,7 +10979,7 @@ index 3243af4a9984..3f76f980947e 100644 |
| 10979 | 10979 | 					status = "disabled"; |
| 10980 | 10980 | 				}; |
| 10981 | 10981 | diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi |
| 10982 | | index f16b9df9d0c6..6c7eb54be9e2 100644 |
| 10982 | index f16b9df9d0c60a7f17c35627c458ab43906424aa..6c7eb54be9e2a4912d27cd4dcc2803a338390323 100644 |
| 10983 | 10983 | --- a/arch/arm/boot/dts/imx6sx.dtsi |
| 10984 | 10984 | +++ b/arch/arm/boot/dts/imx6sx.dtsi |
| 10985 | 10985 | @@ -710,6 +710,7 @@ snvs_poweroff: snvs-poweroff { |
| ... | ... | @@ -10991,7 +10991,7 @@ index f16b9df9d0c6..6c7eb54be9e2 100644 |
| 10991 | 10991 | 					status = "disabled"; |
| 10992 | 10992 | 				}; |
| 10993 | 10993 | diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dts b/arch/arm/boot/dts/imx6ul-14x14-evk.dts |
| 10994 | | index d2be8aa3370b..9c23e017d86a 100644 |
| 10994 | index d2be8aa3370b7840e014964c147a4742d5ca87e8..9c23e017d86ad9194d48d7ef3bdb767210fd8dee 100644 |
| 10995 | 10995 | --- a/arch/arm/boot/dts/imx6ul-14x14-evk.dts |
| 10996 | 10996 | +++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dts |
| 10997 | 10997 | @@ -22,7 +22,7 @@ memory { |
| ... | ... | @@ -11066,7 +11066,7 @@ index d2be8aa3370b..9c23e017d86a 100644 |
| 11066 | 11066 | |
| 11067 | 11067 | diff --git a/arch/arm/boot/dts/imx6ul-geam-kit.dts b/arch/arm/boot/dts/imx6ul-geam-kit.dts |
| 11068 | 11068 | deleted file mode 100644 |
| 11069 | | index 142e60cab65f..000000000000 |
| 11069 | index 142e60cab65f509e14909033822645785dea17b2..0000000000000000000000000000000000000000 |
| 11070 | 11070 | --- a/arch/arm/boot/dts/imx6ul-geam-kit.dts |
| 11071 | 11071 | +++ /dev/null |
| 11072 | 11072 | @@ -1,101 +0,0 @@ |
| ... | ... | @@ -11173,7 +11173,7 @@ index 142e60cab65f..000000000000 |
| 11173 | 11173 | -}; |
| 11174 | 11174 | diff --git a/arch/arm/boot/dts/imx6ul-geam.dts b/arch/arm/boot/dts/imx6ul-geam.dts |
| 11175 | 11175 | new file mode 100644 |
| 11176 | | index 000000000000..571eea7f1c6b |
| 11176 | index 0000000000000000000000000000000000000000..571eea7f1c6b47a962d66142adf5e954b5ac604d |
| 11177 | 11177 | --- /dev/null |
| 11178 | 11178 | +++ b/arch/arm/boot/dts/imx6ul-geam.dts |
| 11179 | 11179 | @@ -0,0 +1,480 @@ |
| ... | ... | @@ -11659,7 +11659,7 @@ index 000000000000..571eea7f1c6b |
| 11659 | 11659 | +}; |
| 11660 | 11660 | diff --git a/arch/arm/boot/dts/imx6ul-geam.dtsi b/arch/arm/boot/dts/imx6ul-geam.dtsi |
| 11661 | 11661 | deleted file mode 100644 |
| 11662 | | index eb94d956808b..000000000000 |
| 11662 | index eb94d956808bb21d05d190d11a6a652bb9f84ff9..0000000000000000000000000000000000000000 |
| 11663 | 11663 | --- a/arch/arm/boot/dts/imx6ul-geam.dtsi |
| 11664 | 11664 | +++ /dev/null |
| 11665 | 11665 | @@ -1,406 +0,0 @@ |
| ... | ... | @@ -12071,7 +12071,7 @@ index eb94d956808b..000000000000 |
| 12071 | 12071 | -}; |
| 12072 | 12072 | diff --git a/arch/arm/boot/dts/imx6ul-isiot-common.dtsi b/arch/arm/boot/dts/imx6ul-isiot-common.dtsi |
| 12073 | 12073 | deleted file mode 100644 |
| 12074 | | index 2beaab6e272e..000000000000 |
| 12074 | index 2beaab6e272e51df5e71a602eeceaa6bdd185ccf..0000000000000000000000000000000000000000 |
| 12075 | 12075 | --- a/arch/arm/boot/dts/imx6ul-isiot-common.dtsi |
| 12076 | 12076 | +++ /dev/null |
| 12077 | 12077 | @@ -1,141 +0,0 @@ |
| ... | ... | @@ -12217,7 +12217,7 @@ index 2beaab6e272e..000000000000 |
| 12217 | 12217 | -	}; |
| 12218 | 12218 | -}; |
| 12219 | 12219 | diff --git a/arch/arm/boot/dts/imx6ul-isiot-emmc.dts b/arch/arm/boot/dts/imx6ul-isiot-emmc.dts |
| 12220 | | index 73a1d0f0b9d5..f5b422898e61 100644 |
| 12220 | index 73a1d0f0b9d543b18d498a0c4c38becef68831b9..f5b422898e61dd22ed1c13a3357a62fb2209f8f1 100644 |
| 12221 | 12221 | --- a/arch/arm/boot/dts/imx6ul-isiot-emmc.dts |
| 12222 | 12222 | +++ b/arch/arm/boot/dts/imx6ul-isiot-emmc.dts |
| 12223 | 12223 | @@ -43,7 +43,6 @@ |
| ... | ... | @@ -12229,7 +12229,7 @@ index 73a1d0f0b9d5..f5b422898e61 100644 |
| 12229 | 12229 | / { |
| 12230 | 12230 | 	model = "Engicam Is.IoT MX6UL eMMC Starter kit"; |
| 12231 | 12231 | diff --git a/arch/arm/boot/dts/imx6ul-isiot-nand.dts b/arch/arm/boot/dts/imx6ul-isiot-nand.dts |
| 12232 | | index da29a86eb6a8..de15e1c75dd1 100644 |
| 12232 | index da29a86eb6a8f83dc9e3fc64bf50f4b6d0cd2b74..de15e1c75dd1ddf606976d0f3571fdf6bb1c10e7 100644 |
| 12233 | 12233 | --- a/arch/arm/boot/dts/imx6ul-isiot-nand.dts |
| 12234 | 12234 | +++ b/arch/arm/boot/dts/imx6ul-isiot-nand.dts |
| 12235 | 12235 | @@ -43,7 +43,6 @@ |
| ... | ... | @@ -12241,7 +12241,7 @@ index da29a86eb6a8..de15e1c75dd1 100644 |
| 12241 | 12241 | / { |
| 12242 | 12242 | 	model = "Engicam Is.IoT MX6UL NAND Starter kit"; |
| 12243 | 12243 | diff --git a/arch/arm/boot/dts/imx6ul-isiot.dtsi b/arch/arm/boot/dts/imx6ul-isiot.dtsi |
| 12244 | | index ea30380ad7a4..950fb28b630a 100644 |
| 12244 | index ea30380ad7a4bef0e1261bdc7788b9257579b2ec..950fb28b630a4dc88ee1f28840dab90317f01c83 100644 |
| 12245 | 12245 | --- a/arch/arm/boot/dts/imx6ul-isiot.dtsi |
| 12246 | 12246 | +++ b/arch/arm/boot/dts/imx6ul-isiot.dtsi |
| 12247 | 12247 | @@ -69,6 +69,68 @@ backlight { |
| ... | ... | @@ -12470,7 +12470,7 @@ index ea30380ad7a4..950fb28b630a 100644 |
| 12470 | 12470 | 		fsl,pins = < |
| 12471 | 12471 | 			MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b1 |
| 12472 | 12472 | diff --git a/arch/arm/boot/dts/imx6ul-liteboard.dts b/arch/arm/boot/dts/imx6ul-liteboard.dts |
| 12473 | | index ed1d891d6a89..1d863a16bcf0 100644 |
| 12473 | index ed1d891d6a8953dde12c99e0b675bf033471e948..1d863a16bcf09c54ed76650edf2591b1be56ac52 100644 |
| 12474 | 12474 | --- a/arch/arm/boot/dts/imx6ul-liteboard.dts |
| 12475 | 12475 | +++ b/arch/arm/boot/dts/imx6ul-liteboard.dts |
| 12476 | 12476 | @@ -124,6 +124,10 @@ ethphy0: ethernet-phy@0 { |
| ... | ... | @@ -12485,7 +12485,7 @@ index ed1d891d6a89..1d863a16bcf0 100644 |
| 12485 | 12485 | 	pinctrl-names = "default"; |
| 12486 | 12486 | 	pinctrl-0 = <&pinctrl_uart1>; |
| 12487 | 12487 | diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi |
| 12488 | | index 6da2b77edd46..f11a241a340d 100644 |
| 12488 | index 6da2b77edd460ff7a6b592d887c98ccb3449f8c8..f11a241a340d52b6cf95b184b69696e13e29c88d 100644 |
| 12489 | 12489 | --- a/arch/arm/boot/dts/imx6ul.dtsi |
| 12490 | 12490 | +++ b/arch/arm/boot/dts/imx6ul.dtsi |
| 12491 | 12491 | @@ -614,6 +614,7 @@ snvs_poweroff: snvs-poweroff { |
| ... | ... | @@ -12497,7 +12497,7 @@ index 6da2b77edd46..f11a241a340d 100644 |
| 12497 | 12497 | 					status = "disabled"; |
| 12498 | 12498 | 				}; |
| 12499 | 12499 | diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi |
| 12500 | | index d7753f79937a..0a3915868aa3 100644 |
| 12500 | index d7753f79937a7f543148dd982dbc8ae3931a1c8f..0a3915868aa328fc4bafa4650ecf9085ce85b8df 100644 |
| 12501 | 12501 | --- a/arch/arm/boot/dts/imx7-colibri.dtsi |
| 12502 | 12502 | +++ b/arch/arm/boot/dts/imx7-colibri.dtsi |
| 12503 | 12503 | @@ -106,6 +106,15 @@ &fec1 { |
| ... | ... | @@ -12517,7 +12517,7 @@ index d7753f79937a..0a3915868aa3 100644 |
| 12517 | 12517 | 	clock-frequency = <100000>; |
| 12518 | 12518 | 	pinctrl-names = "default"; |
| 12519 | 12519 | diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts |
| 12520 | | index 0a24d1bf3c39..44637cabcc56 100644 |
| 12520 | index 0a24d1bf3c393463148919e685a879df39af58ef..44637cabcc566d402847992607984f9736db5a27 100644 |
| 12521 | 12521 | --- a/arch/arm/boot/dts/imx7d-sdb.dts |
| 12522 | 12522 | +++ b/arch/arm/boot/dts/imx7d-sdb.dts |
| 12523 | 12523 | @@ -117,6 +117,37 @@ reg_brcm: regulator-brcm { |
| ... | ... | @@ -12673,7 +12673,7 @@ index 0a24d1bf3c39..44637cabcc56 100644 |
| 12673 | 12673 | 	}; |
| 12674 | 12674 | }; |
| 12675 | 12675 | diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi |
| 12676 | | index 4cf6c458b583..82ad26e766eb 100644 |
| 12676 | index 4cf6c458b583f68a45e78301734b317db39bbac5..82ad26e766eb71b7191afd9b7334ea4ac3b80480 100644 |
| 12677 | 12677 | --- a/arch/arm/boot/dts/imx7s.dtsi |
| 12678 | 12678 | +++ b/arch/arm/boot/dts/imx7s.dtsi |
| 12679 | 12679 | @@ -540,6 +540,7 @@ snvs_poweroff: snvs-poweroff { |
| ... | ... | @@ -12722,7 +12722,7 @@ index 4cf6c458b583..82ad26e766eb 100644 |
| 12722 | 12722 | 	}; |
| 12723 | 12723 | }; |
| 12724 | 12724 | diff --git a/arch/arm/boot/dts/keystone-k2e-evm.dts b/arch/arm/boot/dts/keystone-k2e-evm.dts |
| 12725 | | index ae1ebe7ee021..f1f32c54e72f 100644 |
| 12725 | index ae1ebe7ee0217e8a44d0e607149ced326a6070dc..f1f32c54e72fe7846d09de647a0d5ea8703f5f74 100644 |
| 12726 | 12726 | --- a/arch/arm/boot/dts/keystone-k2e-evm.dts |
| 12727 | 12727 | +++ b/arch/arm/boot/dts/keystone-k2e-evm.dts |
| 12728 | 12728 | @@ -16,6 +16,19 @@ / { |
| ... | ... | @@ -12755,7 +12755,7 @@ index ae1ebe7ee021..f1f32c54e72f 100644 |
| 12755 | 12755 | +	status = "okay"; |
| 12756 | 12756 | +}; |
| 12757 | 12757 | diff --git a/arch/arm/boot/dts/keystone-k2e.dtsi b/arch/arm/boot/dts/keystone-k2e.dtsi |
| 12758 | | index 0dd4cdd6d40c..819ab8345916 100644 |
| 12758 | index 0dd4cdd6d40c8afe9f15f355b8ec493844154d0f..819ab83459163963a80c9471c1b61c7eca422311 100644 |
| 12759 | 12759 | --- a/arch/arm/boot/dts/keystone-k2e.dtsi |
| 12760 | 12760 | +++ b/arch/arm/boot/dts/keystone-k2e.dtsi |
| 12761 | 12761 | @@ -45,6 +45,10 @@ cpu@3 { |
| ... | ... | @@ -12793,7 +12793,7 @@ index 0dd4cdd6d40c..819ab8345916 100644 |
| 12793 | 12793 | 			compatible = "ti,keystone-pcie","snps,dw-pcie"; |
| 12794 | 12794 | 			clocks = <&clkpcie1>; |
| 12795 | 12795 | diff --git a/arch/arm/boot/dts/keystone-k2g-evm.dts b/arch/arm/boot/dts/keystone-k2g-evm.dts |
| 12796 | | index 61883cb969d2..f462f1043531 100644 |
| 12796 | index 61883cb969d2131323f0c191a5c938b9c9f3923e..f462f1043531682f2c00dcc9f287dad5df8dd03e 100644 |
| 12797 | 12797 | --- a/arch/arm/boot/dts/keystone-k2g-evm.dts |
| 12798 | 12798 | +++ b/arch/arm/boot/dts/keystone-k2g-evm.dts |
| 12799 | 12799 | @@ -25,6 +25,26 @@ memory@800000000 { |
| ... | ... | @@ -12886,7 +12886,7 @@ index 61883cb969d2..f462f1043531 100644 |
| 12886 | 12886 | +	status = "okay"; |
| 12887 | 12887 | +}; |
| 12888 | 12888 | diff --git a/arch/arm/boot/dts/keystone-k2g-ice.dts b/arch/arm/boot/dts/keystone-k2g-ice.dts |
| 12889 | | index d820d37b5148..78692745e0af 100644 |
| 12889 | index d820d37b5148ec9f83985e55604b9f3ed2014d6d..78692745e0af2e5562f0f215b879e73f1c6df678 100644 |
| 12890 | 12890 | --- a/arch/arm/boot/dts/keystone-k2g-ice.dts |
| 12891 | 12891 | +++ b/arch/arm/boot/dts/keystone-k2g-ice.dts |
| 12892 | 12892 | @@ -17,6 +17,19 @@ memory@800000000 { |
| ... | ... | @@ -12919,7 +12919,7 @@ index d820d37b5148..78692745e0af 100644 |
| 12919 | 12919 | +	status = "okay"; |
| 12920 | 12920 | +}; |
| 12921 | 12921 | diff --git a/arch/arm/boot/dts/keystone-k2g.dtsi b/arch/arm/boot/dts/keystone-k2g.dtsi |
| 12922 | | index a789f75a1ed5..826b286665e6 100644 |
| 12922 | index a789f75a1ed522e57b8a23f5306674d19e4db6ee..826b286665e62491bc85dccf65f0528cc425512c 100644 |
| 12923 | 12923 | --- a/arch/arm/boot/dts/keystone-k2g.dtsi |
| 12924 | 12924 | +++ b/arch/arm/boot/dts/keystone-k2g.dtsi |
| 12925 | 12925 | @@ -15,6 +15,7 @@ |
| ... | ... | @@ -13161,7 +13161,7 @@ index a789f75a1ed5..826b286665e6 100644 |
| 13161 | 13161 | 	}; |
| 13162 | 13162 | }; |
| 13163 | 13163 | diff --git a/arch/arm/boot/dts/keystone-k2hk-evm.dts b/arch/arm/boot/dts/keystone-k2hk-evm.dts |
| 13164 | | index 2156ff92d08f..6dd13b98aaba 100644 |
| 13164 | index 2156ff92d08f1a93608ef33a5c129b44775689a0..6dd13b98aababd4f10676f9f49ce647c607c9e17 100644 |
| 13165 | 13165 | --- a/arch/arm/boot/dts/keystone-k2hk-evm.dts |
| 13166 | 13166 | +++ b/arch/arm/boot/dts/keystone-k2hk-evm.dts |
| 13167 | 13167 | @@ -16,6 +16,19 @@ / { |
| ... | ... | @@ -13229,7 +13229,7 @@ index 2156ff92d08f..6dd13b98aaba 100644 |
| 13229 | 13229 | +	status = "okay"; |
| 13230 | 13230 | +}; |
| 13231 | 13231 | diff --git a/arch/arm/boot/dts/keystone-k2hk.dtsi b/arch/arm/boot/dts/keystone-k2hk.dtsi |
| 13232 | | index 69d449430511..31dc00e4e5fd 100644 |
| 13232 | index 69d449430511a45b2d2d242771b1ac9b7402792a..31dc00e4e5fd8ce1124c48e575b9772804a0798f 100644 |
| 13233 | 13233 | --- a/arch/arm/boot/dts/keystone-k2hk.dtsi |
| 13234 | 13234 | +++ b/arch/arm/boot/dts/keystone-k2hk.dtsi |
| 13235 | 13235 | @@ -45,6 +45,17 @@ cpu@3 { |
| ... | ... | @@ -13386,7 +13386,7 @@ index 69d449430511..31dc00e4e5fd 100644 |
| 13386 | 13386 | 			compatible	= "ti,keystone_mdio", "ti,davinci_mdio"; |
| 13387 | 13387 | 			#address-cells = <1>; |
| 13388 | 13388 | diff --git a/arch/arm/boot/dts/keystone-k2l-evm.dts b/arch/arm/boot/dts/keystone-k2l-evm.dts |
| 13389 | | index 056b42f99d7a..528667618db4 100644 |
| 13389 | index 056b42f99d7acabdf531af6654d282979ddebae7..528667618db45ee625916eb6d72d116a8e9e4aed 100644 |
| 13390 | 13390 | --- a/arch/arm/boot/dts/keystone-k2l-evm.dts |
| 13391 | 13391 | +++ b/arch/arm/boot/dts/keystone-k2l-evm.dts |
| 13392 | 13392 | @@ -16,6 +16,19 @@ / { |
| ... | ... | @@ -13434,7 +13434,7 @@ index 056b42f99d7a..528667618db4 100644 |
| 13434 | 13434 | +	status = "okay"; |
| 13435 | 13435 | +}; |
| 13436 | 13436 | diff --git a/arch/arm/boot/dts/keystone-k2l.dtsi b/arch/arm/boot/dts/keystone-k2l.dtsi |
| 13437 | | index 148650406cf7..4431310bc922 100644 |
| 13437 | index 148650406cf701cd7ffc5ac92d9054d606e97bfd..4431310bc922bf3c6e4de97f4bcd0dc2ee262056 100644 |
| 13438 | 13438 | --- a/arch/arm/boot/dts/keystone-k2l.dtsi |
| 13439 | 13439 | +++ b/arch/arm/boot/dts/keystone-k2l.dtsi |
| 13440 | 13440 | @@ -33,6 +33,13 @@ cpu@1 { |
| ... | ... | @@ -13523,7 +13523,7 @@ index 148650406cf7..4431310bc922 100644 |
| 13523 | 13523 | 			compatible	= "ti,keystone_mdio", "ti,davinci_mdio"; |
| 13524 | 13524 | 			#address-cells = <1>; |
| 13525 | 13525 | diff --git a/arch/arm/boot/dts/kirkwood-6192.dtsi b/arch/arm/boot/dts/kirkwood-6192.dtsi |
| 13526 | | index d573e03f3134..f003f3f1bd65 100644 |
| 13526 | index d573e03f3134b709f8d6c8ef6ca37c4d7dc9b9c4..f003f3f1bd659d39139f03890565162cc6e321b6 100644 |
| 13527 | 13527 | --- a/arch/arm/boot/dts/kirkwood-6192.dtsi |
| 13528 | 13528 | +++ b/arch/arm/boot/dts/kirkwood-6192.dtsi |
| 13529 | 13529 | @@ -1,6 +1,6 @@ |
| ... | ... | @@ -13543,7 +13543,7 @@ index d573e03f3134..f003f3f1bd65 100644 |
| 13543 | 13543 | 				interrupt-map = <0 0 0 0 &intc 9>; |
| 13544 | 13544 | 				marvell,pcie-port = <0>; |
| 13545 | 13545 | diff --git a/arch/arm/boot/dts/kirkwood-6281.dtsi b/arch/arm/boot/dts/kirkwood-6281.dtsi |
| 13546 | | index 748d0b62f233..47d4b3d3d9e9 100644 |
| 13546 | index 748d0b62f233348f4e0c01216053087932a327b0..47d4b3d3d9e969ee5ca47dd32fb0c53035c8e700 100644 |
| 13547 | 13547 | --- a/arch/arm/boot/dts/kirkwood-6281.dtsi |
| 13548 | 13548 | +++ b/arch/arm/boot/dts/kirkwood-6281.dtsi |
| 13549 | 13549 | @@ -1,6 +1,6 @@ |
| ... | ... | @@ -13563,7 +13563,7 @@ index 748d0b62f233..47d4b3d3d9e9 100644 |
| 13563 | 13563 | 				interrupt-map = <0 0 0 0 &intc 9>; |
| 13564 | 13564 | 				marvell,pcie-port = <0>; |
| 13565 | 13565 | diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi |
| 13566 | | index bb63d2d50fc5..a13dad0a7c08 100644 |
| 13566 | index bb63d2d50fc533f9f264b16ef7fe8b6b3ba441ac..a13dad0a7c080b84db015d36d949daa544bcb05f 100644 |
| 13567 | 13567 | --- a/arch/arm/boot/dts/kirkwood-6282.dtsi |
| 13568 | 13568 | +++ b/arch/arm/boot/dts/kirkwood-6282.dtsi |
| 13569 | 13569 | @@ -1,6 +1,6 @@ |
| ... | ... | @@ -13591,7 +13591,7 @@ index bb63d2d50fc5..a13dad0a7c08 100644 |
| 13591 | 13591 | 				interrupt-map = <0 0 0 0 &intc 10>; |
| 13592 | 13592 | 				marvell,pcie-port = <1>; |
| 13593 | 13593 | diff --git a/arch/arm/boot/dts/kirkwood-98dx4122.dtsi b/arch/arm/boot/dts/kirkwood-98dx4122.dtsi |
| 13594 | | index 720c210d491d..90d4d71b6683 100644 |
| 13594 | index 720c210d491dc80e25241dac26506dd52533010e..90d4d71b6683cbaa196a9fe16581dce41ef44ea1 100644 |
| 13595 | 13595 | --- a/arch/arm/boot/dts/kirkwood-98dx4122.dtsi |
| 13596 | 13596 | +++ b/arch/arm/boot/dts/kirkwood-98dx4122.dtsi |
| 13597 | 13597 | @@ -1,6 +1,6 @@ |
| ... | ... | @@ -13611,7 +13611,7 @@ index 720c210d491d..90d4d71b6683 100644 |
| 13611 | 13611 | 				interrupt-map = <0 0 0 0 &intc 9>; |
| 13612 | 13612 | 				marvell,pcie-port = <0>; |
| 13613 | 13613 | diff --git a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts |
| 13614 | | index 43e9364083de..b4575bbaf085 100644 |
| 13614 | index 43e9364083de84383a34815c04a6bd1021b3baa0..b4575bbaf0852a4cfff98f5bae93f8eb93c4d6ef 100644 |
| 13615 | 13615 | --- a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts |
| 13616 | 13616 | +++ b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts |
| 13617 | 13617 | @@ -192,7 +192,7 @@ &mmc1 { |
| ... | ... | @@ -13624,7 +13624,7 @@ index 43e9364083de..b4575bbaf085 100644 |
| 13624 | 13624 | 	bus-width = <4>; |
| 13625 | 13625 | 	cap-power-off-card; |
| 13626 | 13626 | diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi |
| 13627 | | index 15204e44161d..cd6ad072e72c 100644 |
| 13627 | index 15204e44161da6c98e8528488c8bf2be3a46ca6a..cd6ad072e72c17ebe287b72d3f26657a402a97ba 100644 |
| 13628 | 13628 | --- a/arch/arm/boot/dts/meson.dtsi |
| 13629 | 13629 | +++ b/arch/arm/boot/dts/meson.dtsi |
| 13630 | 13630 | @@ -86,14 +86,14 @@ hwrng: rng@8100 { |
| ... | ... | @@ -13698,7 +13698,7 @@ index 15204e44161d..cd6ad072e72c 100644 |
| 13698 | 13698 | 	}; |
| 13699 | 13699 | }; /* end of / */ |
| 13700 | 13700 | diff --git a/arch/arm/boot/dts/meson6.dtsi b/arch/arm/boot/dts/meson6.dtsi |
| 13701 | | index 8557b6117a4b..ef281d290052 100644 |
| 13701 | index 8557b6117a4b97f23bf2359d585d1e6c2c787d49..ef281d2900527703af28b49f425df50415d1bd2d 100644 |
| 13702 | 13702 | --- a/arch/arm/boot/dts/meson6.dtsi |
| 13703 | 13703 | +++ b/arch/arm/boot/dts/meson6.dtsi |
| 13704 | 13704 | @@ -70,9 +70,37 @@ cpu@201 { |
| ... | ... | @@ -13740,7 +13740,7 @@ index 8557b6117a4b..ef281d290052 100644 |
| 13740 | 13740 | +	clock-names = "xtal", "pclk", "baud"; |
| 13741 | 13741 | +}; |
| 13742 | 13742 | diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi |
| 13743 | | index cada35828931..b98d44fde6b6 100644 |
| 13743 | index cada35828931e49a4e37d750bfbe837064488262..b98d44fde6b60bc9301a3b23cb65f2ccd0d8e64c 100644 |
| 13744 | 13744 | --- a/arch/arm/boot/dts/meson8.dtsi |
| 13745 | 13745 | +++ b/arch/arm/boot/dts/meson8.dtsi |
| 13746 | 13746 | @@ -168,10 +168,18 @@ mux { |
| ... | ... | @@ -13778,7 +13778,7 @@ index cada35828931..b98d44fde6b6 100644 |
| 13778 | 13778 | 	compatible = "amlogic,meson8-saradc", "amlogic,meson-saradc"; |
| 13779 | 13779 | 	clocks = <&clkc CLKID_XTAL>, |
| 13780 | 13780 | diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi |
| 13781 | | index 72e4f425f190..bc278da7df0d 100644 |
| 13781 | index 72e4f425f190d03902713831eb8ba5b1a6373c77..bc278da7df0d93b260eb36d0080b64de2711c592 100644 |
| 13782 | 13782 | --- a/arch/arm/boot/dts/meson8b.dtsi |
| 13783 | 13783 | +++ b/arch/arm/boot/dts/meson8b.dtsi |
| 13784 | 13784 | @@ -119,6 +119,7 @@ mux { |
| ... | ... | @@ -13847,7 +13847,7 @@ index 72e4f425f190..bc278da7df0d 100644 |
| 13847 | 13847 | +	compatible = "amlogic,meson8b-wdt"; |
| 13848 | 13848 | +}; |
| 13849 | 13849 | diff --git a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi |
| 13850 | | index 1eb5da1dc8f0..4d61e5b1334a 100644 |
| 13850 | index 1eb5da1dc8f0a9fd2ee02195678b56aa67ddf23a..4d61e5b1334a632b984016bada159e94ce34e1a2 100644 |
| 13851 | 13851 | --- a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi |
| 13852 | 13852 | +++ b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi |
| 13853 | 13853 | @@ -255,5 +255,6 @@ vaudio: VAUDIO { |
| ... | ... | @@ -13858,7 +13858,7 @@ index 1eb5da1dc8f0..4d61e5b1334a 100644 |
| 13858 | 13858 | 	}; |
| 13859 | 13859 | }; |
| 13860 | 13860 | diff --git a/arch/arm/boot/dts/mt2701.dtsi b/arch/arm/boot/dts/mt2701.dtsi |
| 13861 | | index f1efdc63656a..afe12e5b51f9 100644 |
| 13861 | index f1efdc63656a52bb271aa3d8ac554aede0e74d68..afe12e5b51f95374e2f8f5f91b91f2bbc189e193 100644 |
| 13862 | 13862 | --- a/arch/arm/boot/dts/mt2701.dtsi |
| 13863 | 13863 | +++ b/arch/arm/boot/dts/mt2701.dtsi |
| 13864 | 13864 | @@ -13,6 +13,7 @@ |
| ... | ... | @@ -14010,7 +14010,7 @@ index f1efdc63656a..afe12e5b51f9 100644 |
| 14010 | 14010 | 		reg = <0 0x1c000000 0 0x1000>; |
| 14011 | 14011 | diff --git a/arch/arm/boot/dts/mt6323.dtsi b/arch/arm/boot/dts/mt6323.dtsi |
| 14012 | 14012 | new file mode 100644 |
| 14013 | | index 000000000000..7c783d6c750e |
| 14013 | index 0000000000000000000000000000000000000000..7c783d6c750e31e232828276471844340be111a4 |
| 14014 | 14014 | --- /dev/null |
| 14015 | 14015 | +++ b/arch/arm/boot/dts/mt6323.dtsi |
| 14016 | 14016 | @@ -0,0 +1,241 @@ |
| ... | ... | @@ -14257,7 +14257,7 @@ index 000000000000..7c783d6c750e |
| 14257 | 14257 | +}; |
| 14258 | 14258 | diff --git a/arch/arm/boot/dts/mt7623-evb.dts b/arch/arm/boot/dts/mt7623-evb.dts |
| 14259 | 14259 | deleted file mode 100644 |
| 14260 | | index b60b41cad592..000000000000 |
| 14260 | index b60b41cad592e66655b9ee5127f4e0174a86aa65..0000000000000000000000000000000000000000 |
| 14261 | 14261 | --- a/arch/arm/boot/dts/mt7623-evb.dts |
| 14262 | 14262 | +++ /dev/null |
| 14263 | 14263 | @@ -1,33 +0,0 @@ |
| ... | ... | @@ -14295,7 +14295,7 @@ index b60b41cad592..000000000000 |
| 14295 | 14295 | -	status = "okay"; |
| 14296 | 14296 | -}; |
| 14297 | 14297 | diff --git a/arch/arm/boot/dts/mt7623.dtsi b/arch/arm/boot/dts/mt7623.dtsi |
| 14298 | | index d81158b2b02f..ec8a07415cb3 100644 |
| 14298 | index d81158b2b02f00cba1446bbba3e62139481f0d89..ec8a07415cb38816db5990aa240744b9d9b27e64 100644 |
| 14299 | 14299 | --- a/arch/arm/boot/dts/mt7623.dtsi |
| 14300 | 14300 | +++ b/arch/arm/boot/dts/mt7623.dtsi |
| 14301 | 14301 | @@ -21,36 +21,99 @@ |
| ... | ... | @@ -14627,7 +14627,7 @@ index d81158b2b02f..ec8a07415cb3 100644 |
| 14627 | 14627 | 		mediatek,pctl = <&syscfg_pctl_a>; |
| 14628 | 14628 | diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts |
| 14629 | 14629 | new file mode 100644 |
| 14630 | | index 000000000000..688a86378cee |
| 14630 | index 0000000000000000000000000000000000000000..688a86378ceef8148526c5f1c68ed0f87c99b967 |
| 14631 | 14631 | --- /dev/null |
| 14632 | 14632 | +++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts |
| 14633 | 14633 | @@ -0,0 +1,487 @@ |
| ... | ... | @@ -15120,7 +15120,7 @@ index 000000000000..688a86378cee |
| 15120 | 15120 | + |
| 15121 | 15121 | diff --git a/arch/arm/boot/dts/mt7623n-rfb-nand.dts b/arch/arm/boot/dts/mt7623n-rfb-nand.dts |
| 15122 | 15122 | new file mode 100644 |
| 15123 | | index 000000000000..17c578f0d261 |
| 15123 | index 0000000000000000000000000000000000000000..17c578f0d261b255c34e45930d90911aba26932e |
| 15124 | 15124 | --- /dev/null |
| 15125 | 15125 | +++ b/arch/arm/boot/dts/mt7623n-rfb-nand.dts |
| 15126 | 15126 | @@ -0,0 +1,111 @@ |
| ... | ... | @@ -15237,7 +15237,7 @@ index 000000000000..17c578f0d261 |
| 15237 | 15237 | +}; |
| 15238 | 15238 | diff --git a/arch/arm/boot/dts/mt7623n-rfb.dtsi b/arch/arm/boot/dts/mt7623n-rfb.dtsi |
| 15239 | 15239 | new file mode 100644 |
| 15240 | | index 000000000000..256c5fd947bf |
| 15240 | index 0000000000000000000000000000000000000000..256c5fd947bf4344bc6fbd42156ca523a52c3489 |
| 15241 | 15241 | --- /dev/null |
| 15242 | 15242 | +++ b/arch/arm/boot/dts/mt7623n-rfb.dtsi |
| 15243 | 15243 | @@ -0,0 +1,92 @@ |
| ... | ... | @@ -15334,7 +15334,7 @@ index 000000000000..256c5fd947bf |
| 15334 | 15334 | +	status = "okay"; |
| 15335 | 15335 | +}; |
| 15336 | 15336 | diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts |
| 15337 | | index 673cee2234b2..683b96a8f73e 100644 |
| 15337 | index 673cee2234b2979f4102236b3296b13fb9aed244..683b96a8f73e01248349440d1caab8fd7ffeb7cc 100644 |
| 15338 | 15338 | --- a/arch/arm/boot/dts/omap3-beagle-xm.dts |
| 15339 | 15339 | +++ b/arch/arm/boot/dts/omap3-beagle-xm.dts |
| 15340 | 15340 | @@ -299,7 +299,7 @@ &i2c3 { |
| ... | ... | @@ -15347,7 +15347,7 @@ index 673cee2234b2..683b96a8f73e 100644 |
| 15347 | 15347 | }; |
| 15348 | 15348 | |
| 15349 | 15349 | diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts |
| 15350 | | index 4be85ce59dd1..4d2eaf843fa9 100644 |
| 15350 | index 4be85ce59dd14eea19c95dc0cea5ff12748177bc..4d2eaf843fa960190514dffb06b24d46056adb3e 100644 |
| 15351 | 15351 | --- a/arch/arm/boot/dts/omap3-beagle.dts |
| 15352 | 15352 | +++ b/arch/arm/boot/dts/omap3-beagle.dts |
| 15353 | 15353 | @@ -283,7 +283,7 @@ &i2c3 { |
| ... | ... | @@ -15360,7 +15360,7 @@ index 4be85ce59dd1..4d2eaf843fa9 100644 |
| 15360 | 15360 | }; |
| 15361 | 15361 | |
| 15362 | 15362 | diff --git a/arch/arm/boot/dts/omap3-cm-t3517.dts b/arch/arm/boot/dts/omap3-cm-t3517.dts |
| 15363 | | index 53ae04f9104d..3d293b345e99 100644 |
| 15363 | index 53ae04f9104d6b92f6bce75c337d5fba1c77ae53..3d293b345e9940e31f525f38ea46153a170aa50b 100644 |
| 15364 | 15364 | --- a/arch/arm/boot/dts/omap3-cm-t3517.dts |
| 15365 | 15365 | +++ b/arch/arm/boot/dts/omap3-cm-t3517.dts |
| 15366 | 15366 | @@ -129,7 +129,7 @@ &mmc2 { |
| ... | ... | @@ -15373,7 +15373,7 @@ index 53ae04f9104d..3d293b345e99 100644 |
| 15373 | 15373 | 	bus-width = <4>; |
| 15374 | 15374 | 	cap-power-off-card; |
| 15375 | 15375 | diff --git a/arch/arm/boot/dts/omap3-cm-t3730.dts b/arch/arm/boot/dts/omap3-cm-t3730.dts |
| 15376 | | index 2294f5b0aa10..bdf4b7fdda39 100644 |
| 15376 | index 2294f5b0aa102d9195aa93b33a9e298ac91cba26..bdf4b7fdda39c1c64e2493ecd8d00cfc4f106985 100644 |
| 15377 | 15377 | --- a/arch/arm/boot/dts/omap3-cm-t3730.dts |
| 15378 | 15378 | +++ b/arch/arm/boot/dts/omap3-cm-t3730.dts |
| 15379 | 15379 | @@ -69,7 +69,7 @@ &mmc2 { |
| ... | ... | @@ -15386,7 +15386,7 @@ index 2294f5b0aa10..bdf4b7fdda39 100644 |
| 15386 | 15386 | 	bus-width = <4>; |
| 15387 | 15387 | 	cap-power-off-card; |
| 15388 | 15388 | diff --git a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi |
| 15389 | | index 82aa9c4a0f1c..0c0bb1b01b0b 100644 |
| 15389 | index 82aa9c4a0f1c331f54c70409993ee17bdc493d00..0c0bb1b01b0ba004af0afbb5c5b4fca099a57055 100644 |
| 15390 | 15390 | --- a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi |
| 15391 | 15391 | +++ b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi |
| 15392 | 15392 | @@ -149,7 +149,7 @@ &i2c3 { |
| ... | ... | @@ -15399,7 +15399,7 @@ index 82aa9c4a0f1c..0c0bb1b01b0b 100644 |
| 15399 | 15399 | }; |
| 15400 | 15400 | |
| 15401 | 15401 | diff --git a/arch/arm/boot/dts/omap3-evm-common.dtsi b/arch/arm/boot/dts/omap3-evm-common.dtsi |
| 15402 | | index 2b1d6977a535..ff35803088e3 100644 |
| 15402 | index 2b1d6977a53572ead16e74ff97310fbd3cf7fcc3..ff35803088e3455b2fa116e4e7e41872590f053b 100644 |
| 15403 | 15403 | --- a/arch/arm/boot/dts/omap3-evm-common.dtsi |
| 15404 | 15404 | +++ b/arch/arm/boot/dts/omap3-evm-common.dtsi |
| 15405 | 15405 | @@ -115,7 +115,7 @@ tsc2046@0 { |
| ... | ... | @@ -15412,7 +15412,7 @@ index 2b1d6977a535..ff35803088e3 100644 |
| 15412 | 15412 | }; |
| 15413 | 15413 | |
| 15414 | 15414 | diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts |
| 15415 | | index 49f37084e435..26c20e1167b9 100644 |
| 15415 | index 49f37084e43507b1f2b87b11d79eecacfe0599dc..26c20e1167b9531ca1fde008787a714856b67c62 100644 |
| 15416 | 15416 | --- a/arch/arm/boot/dts/omap3-n900.dts |
| 15417 | 15417 | +++ b/arch/arm/boot/dts/omap3-n900.dts |
| 15418 | 15418 | @@ -144,6 +144,15 @@ battery: n900-battery { |
| ... | ... | @@ -15547,7 +15547,7 @@ index 49f37084e435..26c20e1167b9 100644 |
| 15547 | 15547 | 	non-removable; |
| 15548 | 15548 | 	no-sdio; |
| 15549 | 15549 | diff --git a/arch/arm/boot/dts/omap3-overo-base.dtsi b/arch/arm/boot/dts/omap3-overo-base.dtsi |
| 15550 | | index cd220342a805..f25e158e7163 100644 |
| 15550 | index cd220342a805aa2844613b171a31279a651407b1..f25e158e7163b23201ca8e643f557b3965fc959d 100644 |
| 15551 | 15551 | --- a/arch/arm/boot/dts/omap3-overo-base.dtsi |
| 15552 | 15552 | +++ b/arch/arm/boot/dts/omap3-overo-base.dtsi |
| 15553 | 15553 | @@ -181,7 +181,7 @@ &mmc2 { |
| ... | ... | @@ -15560,7 +15560,7 @@ index cd220342a805..f25e158e7163 100644 |
| 15560 | 15560 | 	cap-sdio-irq; |
| 15561 | 15561 | 	non-removable; |
| 15562 | 15562 | diff --git a/arch/arm/boot/dts/omap3-tao3530.dtsi b/arch/arm/boot/dts/omap3-tao3530.dtsi |
| 15563 | | index 06ac0f80bcf0..9a601d15247b 100644 |
| 15563 | index 06ac0f80bcf083ad0b4ed6a0cb30bcf64b22e7c5..9a601d15247bef5da1519db88b1680b119381b6d 100644 |
| 15564 | 15564 | --- a/arch/arm/boot/dts/omap3-tao3530.dtsi |
| 15565 | 15565 | +++ b/arch/arm/boot/dts/omap3-tao3530.dtsi |
| 15566 | 15566 | @@ -223,7 +223,7 @@ &mmc1 { |
| ... | ... | @@ -15573,7 +15573,7 @@ index 06ac0f80bcf0..9a601d15247b 100644 |
| 15573 | 15573 | 	bus-width = <8>; |
| 15574 | 15574 | }; |
| 15575 | 15575 | diff --git a/arch/arm/boot/dts/omap3-zoom3.dts b/arch/arm/boot/dts/omap3-zoom3.dts |
| 15576 | | index 45e2ce0803de..96d0301a336a 100644 |
| 15576 | index 45e2ce0803dec8a01d20c92a98a3b1f3b95735d1..96d0301a336a9b819828c9f0aef3cfe34d8bb5af 100644 |
| 15577 | 15577 | --- a/arch/arm/boot/dts/omap3-zoom3.dts |
| 15578 | 15578 | +++ b/arch/arm/boot/dts/omap3-zoom3.dts |
| 15579 | 15579 | @@ -174,7 +174,7 @@ &twl_gpio { |
| ... | ... | @@ -15586,7 +15586,7 @@ index 45e2ce0803de..96d0301a336a 100644 |
| 15586 | 15586 | 	pinctrl-names = "default"; |
| 15587 | 15587 | 	pinctrl-0 = <&mmc1_pins>; |
| 15588 | 15588 | diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi |
| 15589 | | index a3ff4933dbc1..bdaf30c8c405 100644 |
| 15589 | index a3ff4933dbc173936bbec5a222aba6642e70564d..bdaf30c8c405716ad2f1e434ac8abbd40bcdb786 100644 |
| 15590 | 15590 | --- a/arch/arm/boot/dts/omap3.dtsi |
| 15591 | 15591 | +++ b/arch/arm/boot/dts/omap3.dtsi |
| 15592 | 15592 | @@ -713,14 +713,12 @@ usbhshost: usbhshost@48064000 { |
| ... | ... | @@ -15621,7 +15621,7 @@ index a3ff4933dbc1..bdaf30c8c405 100644 |
| 15621 | 15621 | 					 <70>; |
| 15622 | 15622 | 			}; |
| 15623 | 15623 | diff --git a/arch/arm/boot/dts/omap3430-sdp.dts b/arch/arm/boot/dts/omap3430-sdp.dts |
| 15624 | | index abd6921143be..908951eb5943 100644 |
| 15624 | index abd6921143beb328aad5e84d60d209d98147854f..908951eb5943ec4f938ee294f811fc0577236890 100644 |
| 15625 | 15625 | --- a/arch/arm/boot/dts/omap3430-sdp.dts |
| 15626 | 15626 | +++ b/arch/arm/boot/dts/omap3430-sdp.dts |
| 15627 | 15627 | @@ -33,7 +33,7 @@ twl: twl@48 { |
| ... | ... | @@ -15634,7 +15634,7 @@ index abd6921143be..908951eb5943 100644 |
| 15634 | 15634 | 	 * S6-3 must be in ON position for 8 bit mode to function |
| 15635 | 15635 | 	 * Else, use 4 bit mode |
| 15636 | 15636 | diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts |
| 15637 | | index 10ca1c174995..8b93d37310f2 100644 |
| 15637 | index 10ca1c174995280f33facc0ffabdaf7514c481f4..8b93d37310f28ba4c10ad81d35f8419914ef4633 100644 |
| 15638 | 15638 | --- a/arch/arm/boot/dts/omap4-droid4-xt894.dts |
| 15639 | 15639 | +++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts |
| 15640 | 15640 | @@ -129,6 +129,34 @@ touchscreen_reset { |
| ... | ... | @@ -15701,7 +15701,7 @@ index 10ca1c174995..8b93d37310f2 100644 |
| 15701 | 15701 | |
| 15702 | 15702 | &uart3 { |
| 15703 | 15703 | diff --git a/arch/arm/boot/dts/omap4-duovero-parlor.dts b/arch/arm/boot/dts/omap4-duovero-parlor.dts |
| 15704 | | index 1b825128a7b9..a9a584b5b955 100644 |
| 15704 | index 1b825128a7b952568610e0b283415eebd3320724..a9a584b5b9558d737c337806ae7f2d2f34840c7d 100644 |
| 15705 | 15705 | --- a/arch/arm/boot/dts/omap4-duovero-parlor.dts |
| 15706 | 15706 | +++ b/arch/arm/boot/dts/omap4-duovero-parlor.dts |
| 15707 | 15707 | @@ -100,7 +100,7 @@ OMAP4_IOPAD(0x070, PIN_INPUT_PULLUP | MUX_MODE3)	/* gpmc_a24.gpio_48: amdix enab |
| ... | ... | @@ -15714,7 +15714,7 @@ index 1b825128a7b9..a9a584b5b955 100644 |
| 15714 | 15714 | 			OMAP4_IOPAD(0x09e, PIN_INPUT_PULLUP | MUX_MODE0)	/* hdmi_ddc_sda.hdmi_ddc_sda */ |
| 15715 | 15715 | 		>; |
| 15716 | 15716 | diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi |
| 15717 | | index edbc4090297d..2b48e51c372a 100644 |
| 15717 | index edbc4090297ddcd3d5e7cf035261156898271196..2b48e51c372ab70122e13ee13d4f4a11722cd632 100644 |
| 15718 | 15718 | --- a/arch/arm/boot/dts/omap4-panda-common.dtsi |
| 15719 | 15719 | +++ b/arch/arm/boot/dts/omap4-panda-common.dtsi |
| 15720 | 15720 | @@ -267,7 +267,7 @@ OMAP4_IOPAD(0x184, PIN_OUTPUT | MUX_MODE3)	/* gpio_0 */ |
| ... | ... | @@ -15727,7 +15727,7 @@ index edbc4090297d..2b48e51c372a 100644 |
| 15727 | 15727 | 			OMAP4_IOPAD(0x09e, PIN_INPUT_PULLUP | MUX_MODE0)	/* hdmi_sda.hdmi_sda */ |
| 15728 | 15728 | 		>; |
| 15729 | 15729 | diff --git a/arch/arm/boot/dts/omap4-sdp-es23plus.dts b/arch/arm/boot/dts/omap4-sdp-es23plus.dts |
| 15730 | | index b4d19a7ae393..3d3140fd9659 100644 |
| 15730 | index b4d19a7ae39304e93c2d741a2bbd4830674eb663..3d3140fd9659463829e979069dcf81cb9c169055 100644 |
| 15731 | 15731 | --- a/arch/arm/boot/dts/omap4-sdp-es23plus.dts |
| 15732 | 15732 | +++ b/arch/arm/boot/dts/omap4-sdp-es23plus.dts |
| 15733 | 15733 | @@ -10,7 +10,7 @@ |
| ... | ... | @@ -15740,7 +15740,7 @@ index b4d19a7ae393..3d3140fd9659 100644 |
| 15740 | 15740 | 		OMAP4_IOPAD(0x09e, PIN_INPUT | MUX_MODE0)		/* hdmi_sda.hdmi_sda */ |
| 15741 | 15741 | 		>; |
| 15742 | 15742 | diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts |
| 15743 | | index d728ec963111..280d92d42bf1 100644 |
| 15743 | index d728ec96311114cd71c0c1bd752be925d14c995f..280d92d42bf13b12983fca36e7786c13eadaa8cd 100644 |
| 15744 | 15744 | --- a/arch/arm/boot/dts/omap4-sdp.dts |
| 15745 | 15745 | +++ b/arch/arm/boot/dts/omap4-sdp.dts |
| 15746 | 15746 | @@ -290,7 +290,7 @@ OMAP4_IOPAD(0x138, PIN_INPUT | MUX_MODE0)		/* mcspi1_cs0.mcspi1_cs0 */ |
| ... | ... | @@ -15753,7 +15753,7 @@ index d728ec963111..280d92d42bf1 100644 |
| 15753 | 15753 | 			OMAP4_IOPAD(0x09e, PIN_INPUT_PULLUP | MUX_MODE0)	/* hdmi_sda.hdmi_sda */ |
| 15754 | 15754 | 		>; |
| 15755 | 15755 | diff --git a/arch/arm/boot/dts/omap4-var-om44customboard.dtsi b/arch/arm/boot/dts/omap4-var-om44customboard.dtsi |
| 15756 | | index 74940b6d7719..676d8dd0624a 100644 |
| 15756 | index 74940b6d7719ed28ed6f2a34cf83f033bb18aa72..676d8dd0624a63dc56513e68edb35358c49cac2b 100644 |
| 15757 | 15757 | --- a/arch/arm/boot/dts/omap4-var-om44customboard.dtsi |
| 15758 | 15758 | +++ b/arch/arm/boot/dts/omap4-var-om44customboard.dtsi |
| 15759 | 15759 | @@ -122,7 +122,7 @@ OMAP4_IOPAD(0x1d4, PIN_OUTPUT | MUX_MODE5)		/* dispc2_data0 */ |
| ... | ... | @@ -15766,7 +15766,7 @@ index 74940b6d7719..676d8dd0624a 100644 |
| 15766 | 15766 | 			OMAP4_IOPAD(0x09e, PIN_INPUT_PULLUP | MUX_MODE0)	/* hdmi_sda.hdmi_sda */ |
| 15767 | 15767 | 		>; |
| 15768 | 15768 | diff --git a/arch/arm/boot/dts/omap5-board-common.dtsi b/arch/arm/boot/dts/omap5-board-common.dtsi |
| 15769 | | index 4caadb253249..7824b2631cb6 100644 |
| 15769 | index 4caadb25324977e67c40d4ebde2929cd6782cbf8..7824b2631cb6b3f93ffaedbaff5ebc65d6064292 100644 |
| 15770 | 15770 | --- a/arch/arm/boot/dts/omap5-board-common.dtsi |
| 15771 | 15771 | +++ b/arch/arm/boot/dts/omap5-board-common.dtsi |
| 15772 | 15772 | @@ -290,7 +290,7 @@ OMAP5_IOPAD(0x1b6, PIN_OUTPUT | MUX_MODE0) /* uart5_cts.uart5_rts */ |
| ... | ... | @@ -15779,7 +15779,7 @@ index 4caadb253249..7824b2631cb6 100644 |
| 15779 | 15779 | 			OMAP5_IOPAD(0x142, PIN_INPUT | MUX_MODE0)	/* hdmi_ddc_sda.hdmi_ddc_sda */ |
| 15780 | 15780 | 		>; |
| 15781 | 15781 | diff --git a/arch/arm/boot/dts/omap5-cm-t54.dts b/arch/arm/boot/dts/omap5-cm-t54.dts |
| 15782 | | index 78397f66d0b2..552a5c4c5942 100644 |
| 15782 | index 78397f66d0b2d5611cf665ffbf72f2ac02035413..552a5c4c594254aceecbc36281edd0bcdfeebd0a 100644 |
| 15783 | 15783 | --- a/arch/arm/boot/dts/omap5-cm-t54.dts |
| 15784 | 15784 | +++ b/arch/arm/boot/dts/omap5-cm-t54.dts |
| 15785 | 15785 | @@ -266,7 +266,7 @@ OMAP5_IOPAD(0x00b6, PIN_OUTPUT | MUX_MODE6) /* hsi2_acdata.gpio3_83 */ |
| ... | ... | @@ -15792,7 +15792,7 @@ index 78397f66d0b2..552a5c4c5942 100644 |
| 15792 | 15792 | 			OMAP5_IOPAD(0x0142, PIN_INPUT | MUX_MODE0) /* hdmi_ddc_sda */ |
| 15793 | 15793 | 		>; |
| 15794 | 15794 | diff --git a/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi b/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi |
| 15795 | | index b9457dd21a69..e413b21ee331 100644 |
| 15795 | index b9457dd21a695ddca61268a4262cae05fdd0aa58..e413b21ee3319be02927dca42aeef0c837698d00 100644 |
| 15796 | 15796 | --- a/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi |
| 15797 | 15797 | +++ b/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi |
| 15798 | 15798 | @@ -20,27 +20,12 @@ / { |
| ... | ... | @@ -15841,7 +15841,7 @@ index b9457dd21a69..e413b21ee331 100644 |
| 15841 | 15841 | 	}; |
| 15842 | 15842 | }; |
| 15843 | 15843 | diff --git a/arch/arm/boot/dts/qcom-ipq4019.dtsi b/arch/arm/boot/dts/qcom-ipq4019.dtsi |
| 15844 | | index 4b7d97275c62..10d112a4078e 100644 |
| 15844 | index 4b7d97275c621af5a219856d38f489a3e704b2e7..10d112a4078ecef3c1a70dc3482de7a7511e599b 100644 |
| 15845 | 15845 | --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi |
| 15846 | 15846 | +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi |
| 15847 | 15847 | @@ -96,6 +96,21 @@ sleep_clk: sleep_clk { |
| ... | ... | @@ -15974,7 +15974,7 @@ index 4b7d97275c62..10d112a4078e 100644 |
| 15974 | 15974 | 	}; |
| 15975 | 15975 | }; |
| 15976 | 15976 | diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi |
| 15977 | | index c5ee68a3f7f5..a39207625354 100644 |
| 15977 | index c5ee68a3f7f5c28f4fe02f842f4a89a9134252e6..a39207625354cb947ba3ab509552034c76afba19 100644 |
| 15978 | 15978 | --- a/arch/arm/boot/dts/qcom-msm8974.dtsi |
| 15979 | 15979 | +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi |
| 15980 | 15980 | @@ -779,7 +779,7 @@ tpiu_in: endpoint { |
| ... | ... | @@ -15987,7 +15987,7 @@ index c5ee68a3f7f5..a39207625354 100644 |
| 15987 | 15987 | |
| 15988 | 15988 | 			clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>; |
| 15989 | 15989 | diff --git a/arch/arm/boot/dts/r7s72100-genmai.dts b/arch/arm/boot/dts/r7s72100-genmai.dts |
| 15990 | | index 52a7b586bac7..cd4d5ff7749e 100644 |
| 15990 | index 52a7b586bac72277f411ccb306fe0c0d719aaa5d..cd4d5ff7749eaf535f5e72d43238d9778d07a8b7 100644 |
| 15991 | 15991 | --- a/arch/arm/boot/dts/r7s72100-genmai.dts |
| 15992 | 15992 | +++ b/arch/arm/boot/dts/r7s72100-genmai.dts |
| 15993 | 15993 | @@ -11,6 +11,8 @@ |
| ... | ... | @@ -16095,7 +16095,7 @@ index 52a7b586bac7..cd4d5ff7749e 100644 |
| 16095 | 16095 | }; |
| 16096 | 16096 | |
| 16097 | 16097 | diff --git a/arch/arm/boot/dts/r7s72100-rskrza1.dts b/arch/arm/boot/dts/r7s72100-rskrza1.dts |
| 16098 | | index 72df20a04320..5dcaaf131d27 100644 |
| 16098 | index 72df20a04320e7ac61dccde306f5799bdf1bd78c..5dcaaf131d2788ac55be89d3d4d9f9ced9beac9e 100644 |
| 16099 | 16099 | --- a/arch/arm/boot/dts/r7s72100-rskrza1.dts |
| 16100 | 16100 | +++ b/arch/arm/boot/dts/r7s72100-rskrza1.dts |
| 16101 | 16101 | @@ -10,6 +10,8 @@ |
| ... | ... | @@ -16199,7 +16199,7 @@ index 72df20a04320..5dcaaf131d27 100644 |
| 16199 | 16199 | 	status = "okay"; |
| 16200 | 16200 | }; |
| 16201 | 16201 | diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi |
| 16202 | | index 5cf53e9943af..4ed12a4d9d51 100644 |
| 16202 | index 5cf53e9943af705726572c5504e37da7cbd7d45d..4ed12a4d9d51382143357585358f20081e216b35 100644 |
| 16203 | 16203 | --- a/arch/arm/boot/dts/r7s72100.dtsi |
| 16204 | 16204 | +++ b/arch/arm/boot/dts/r7s72100.dtsi |
| 16205 | 16205 | @@ -207,6 +207,84 @@ cpu@0 { |
| ... | ... | @@ -16288,7 +16288,7 @@ index 5cf53e9943af..4ed12a4d9d51 100644 |
| 16288 | 16288 | 		compatible = "renesas,scif-r7s72100", "renesas,scif"; |
| 16289 | 16289 | 		reg = <0xe8007000 64>; |
| 16290 | 16290 | diff --git a/arch/arm/boot/dts/r8a7743-iwg20d-q7.dts b/arch/arm/boot/dts/r8a7743-iwg20d-q7.dts |
| 16291 | | index 9b54783cc2a5..081af0192851 100644 |
| 16291 | index 9b54783cc2a53977546c61ebaf1a4d3722178c13..081af01928519e333deef4ac6ab1e579419aa08a 100644 |
| 16292 | 16292 | --- a/arch/arm/boot/dts/r8a7743-iwg20d-q7.dts |
| 16293 | 16293 | +++ b/arch/arm/boot/dts/r8a7743-iwg20d-q7.dts |
| 16294 | 16294 | @@ -17,9 +17,40 @@ / { |
| ... | ... | @@ -16333,7 +16333,7 @@ index 9b54783cc2a5..081af0192851 100644 |
| 16333 | 16333 | +	}; |
| 16334 | 16334 | +}; |
| 16335 | 16335 | diff --git a/arch/arm/boot/dts/r8a7743-iwg20m.dtsi b/arch/arm/boot/dts/r8a7743-iwg20m.dtsi |
| 16336 | | index 001ca9144f4b..ff7993818637 100644 |
| 16336 | index 001ca9144f4b0dc951fd97ce5d97285ccdcb341b..ff799381863763decedb115e645980670d973b5b 100644 |
| 16337 | 16337 | --- a/arch/arm/boot/dts/r8a7743-iwg20m.dtsi |
| 16338 | 16338 | +++ b/arch/arm/boot/dts/r8a7743-iwg20m.dtsi |
| 16339 | 16339 | @@ -22,8 +22,34 @@ memory@200000000 { |
| ... | ... | @@ -16372,7 +16372,7 @@ index 001ca9144f4b..ff7993818637 100644 |
| 16372 | 16372 | +	status = "okay"; |
| 16373 | 16373 | +}; |
| 16374 | 16374 | diff --git a/arch/arm/boot/dts/r8a7743-sk-rzg1m.dts b/arch/arm/boot/dts/r8a7743-sk-rzg1m.dts |
| 16375 | | index 3a22538208f2..3d918d106593 100644 |
| 16375 | index 3a22538208f25117ea008e45a45d52c03c9b4ba5..3d918d106593d2684eaa7e6e8f95de8695c3efbc 100644 |
| 16376 | 16376 | --- a/arch/arm/boot/dts/r8a7743-sk-rzg1m.dts |
| 16377 | 16377 | +++ b/arch/arm/boot/dts/r8a7743-sk-rzg1m.dts |
| 16378 | 16378 | @@ -1,7 +1,7 @@ |
| ... | ... | @@ -16420,7 +16420,7 @@ index 3a22538208f2..3d918d106593 100644 |
| 16420 | 16420 | 	renesas,ether-link-active-low; |
| 16421 | 16421 | 	status = "okay"; |
| 16422 | 16422 | diff --git a/arch/arm/boot/dts/r8a7743.dtsi b/arch/arm/boot/dts/r8a7743.dtsi |
| 16423 | | index 0ddac81742e4..14222c72f0e0 100644 |
| 16423 | index 0ddac81742e4cdc7dc93be53fd019db00de98faa..14222c72f0e0f7d5ad95a46d68b310df76fff6cc 100644 |
| 16424 | 16424 | --- a/arch/arm/boot/dts/r8a7743.dtsi |
| 16425 | 16425 | +++ b/arch/arm/boot/dts/r8a7743.dtsi |
| 16426 | 16426 | @@ -1,7 +1,7 @@ |
| ... | ... | @@ -16793,7 +16793,7 @@ index 0ddac81742e4..14222c72f0e0 100644 |
| 16793 | 16793 | |
| 16794 | 16794 | 	/* External root clock */ |
| 16795 | 16795 | diff --git a/arch/arm/boot/dts/r8a7745-sk-rzg1e.dts b/arch/arm/boot/dts/r8a7745-sk-rzg1e.dts |
| 16796 | | index 97840b340197..b4d679b04ad6 100644 |
| 16796 | index 97840b3401976095c5dbecc7928773756551b648..b4d679b04ad618a98337b9839b314a2d6ace4474 100644 |
| 16797 | 16797 | --- a/arch/arm/boot/dts/r8a7745-sk-rzg1e.dts |
| 16798 | 16798 | +++ b/arch/arm/boot/dts/r8a7745-sk-rzg1e.dts |
| 16799 | 16799 | @@ -1,7 +1,7 @@ |
| ... | ... | @@ -16841,7 +16841,7 @@ index 97840b340197..b4d679b04ad6 100644 |
| 16841 | 16841 | 	renesas,ether-link-active-low; |
| 16842 | 16842 | 	status = "okay"; |
| 16843 | 16843 | diff --git a/arch/arm/boot/dts/r8a7745.dtsi b/arch/arm/boot/dts/r8a7745.dtsi |
| 16844 | | index 2feb0084bb3b..aff90dfb8b32 100644 |
| 16844 | index 2feb0084bb3b1b5149afe1efd3f50aeeb6984117..aff90dfb8b32169c1cf0c4cf98adc7a090ce5419 100644 |
| 16845 | 16845 | --- a/arch/arm/boot/dts/r8a7745.dtsi |
| 16846 | 16846 | +++ b/arch/arm/boot/dts/r8a7745.dtsi |
| 16847 | 16847 | @@ -1,7 +1,7 @@ |
| ... | ... | @@ -16896,7 +16896,7 @@ index 2feb0084bb3b..aff90dfb8b32 100644 |
| 16896 | 16896 | 			compatible = "renesas,ether-r8a7745"; |
| 16897 | 16897 | 			reg = <0 0xee700000 0 0x400>; |
| 16898 | 16898 | diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi |
| 16899 | | index 2805a8608d4b..16358bf8d1db 100644 |
| 16899 | index 2805a8608d4ba007693b129dddb4d5d1600fa353..16358bf8d1dbffdceceeb53124bf45dea8ae31ec 100644 |
| 16900 | 16900 | --- a/arch/arm/boot/dts/r8a7790.dtsi |
| 16901 | 16901 | +++ b/arch/arm/boot/dts/r8a7790.dtsi |
| 16902 | 16902 | @@ -830,6 +830,24 @@ hscif1: serial@e62c8000 { |
| ... | ... | @@ -16979,7 +16979,7 @@ index 2805a8608d4b..16358bf8d1db 100644 |
| 16979 | 16979 | 		interrupts = <GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH>; |
| 16980 | 16980 | 		clocks = <&mstp8_clks R8A7790_CLK_VIN3>; |
| 16981 | 16981 | diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts |
| 16982 | | index 001e6116c47c..0ce0b278e1cb 100644 |
| 16982 | index 001e6116c47c7c3bd9a22eb0106e369e47dedcae..0ce0b278e1cbe2bf44113586460953edd6ab5f7d 100644 |
| 16983 | 16983 | --- a/arch/arm/boot/dts/r8a7791-koelsch.dts |
| 16984 | 16984 | +++ b/arch/arm/boot/dts/r8a7791-koelsch.dts |
| 16985 | 16985 | @@ -642,11 +642,19 @@ adv7180: endpoint { |
| ... | ... | @@ -17012,7 +17012,7 @@ index 001e6116c47c..0ce0b278e1cb 100644 |
| 17012 | 17012 | 		pagesize = <16>; |
| 17013 | 17013 | 	}; |
| 17014 | 17014 | diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi |
| 17015 | | index bd93f699ad84..f1d1a9772153 100644 |
| 17015 | index bd93f699ad84098762e99082cfa027dfa4abc088..f1d1a977215308e6cc831a6062780810c150b8a8 100644 |
| 17016 | 17016 | --- a/arch/arm/boot/dts/r8a7791.dtsi |
| 17017 | 17017 | +++ b/arch/arm/boot/dts/r8a7791.dtsi |
| 17018 | 17018 | @@ -890,6 +890,24 @@ hscif2: serial@e62d0000 { |
| ... | ... | @@ -17086,7 +17086,7 @@ index bd93f699ad84..f1d1a9772153 100644 |
| 17086 | 17086 | 		interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>; |
| 17087 | 17087 | 		clocks = <&mstp8_clks R8A7791_CLK_VIN2>; |
| 17088 | 17088 | diff --git a/arch/arm/boot/dts/r8a7792.dtsi b/arch/arm/boot/dts/r8a7792.dtsi |
| 17089 | | index 0efecb232ee5..2623f39bed2b 100644 |
| 17089 | index 0efecb232ee52ce0d75c189b1e378fbb274cc836..2623f39bed2b73bb6f180a72e89586702a90f2cc 100644 |
| 17090 | 17090 | --- a/arch/arm/boot/dts/r8a7792.dtsi |
| 17091 | 17091 | +++ b/arch/arm/boot/dts/r8a7792.dtsi |
| 17092 | 17092 | @@ -465,6 +465,24 @@ hscif1: serial@e62c8000 { |
| ... | ... | @@ -17115,7 +17115,7 @@ index 0efecb232ee5..2623f39bed2b 100644 |
| 17115 | 17115 | 			compatible = "renesas,sdhi-r8a7792"; |
| 17116 | 17116 | 			reg = <0 0xee100000 0 0x328>; |
| 17117 | 17117 | diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi |
| 17118 | | index 13b980f27bbc..497716b6fbe2 100644 |
| 17118 | index 13b980f27bbc885f2a36b26361562e941fe9291a..497716b6fbe2416423b53b2fd3be3303bc60c92c 100644 |
| 17119 | 17119 | --- a/arch/arm/boot/dts/r8a7793.dtsi |
| 17120 | 17120 | +++ b/arch/arm/boot/dts/r8a7793.dtsi |
| 17121 | 17121 | @@ -848,6 +848,24 @@ hscif2: serial@e62d0000 { |
| ... | ... | @@ -17144,7 +17144,7 @@ index 13b980f27bbc..497716b6fbe2 100644 |
| 17144 | 17144 | 		compatible = "renesas,ether-r8a7793"; |
| 17145 | 17145 | 		reg = <0 0xee700000 0 0x400>; |
| 17146 | 17146 | diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi |
| 17147 | | index 7d9a81d970d8..26535414203a 100644 |
| 17147 | index 7d9a81d970d87c6b0ebae4df4bd460305fb0cfa5..26535414203a0b1e43bab73a12ec16238c8b3b1b 100644 |
| 17148 | 17148 | --- a/arch/arm/boot/dts/r8a7794.dtsi |
| 17149 | 17149 | +++ b/arch/arm/boot/dts/r8a7794.dtsi |
| 17150 | 17150 | @@ -588,6 +588,24 @@ hscif2: serial@e62d0000 { |
| ... | ... | @@ -17191,7 +17191,7 @@ index 7d9a81d970d8..26535414203a 100644 |
| 17191 | 17191 | 		interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>; |
| 17192 | 17192 | 		clocks = <&mstp8_clks R8A7794_CLK_VIN1>; |
| 17193 | 17193 | diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts |
| 17194 | | index 5726135b7f8a..fdb1570bc7d3 100644 |
| 17194 | index 5726135b7f8a89e1ff0620205c667baaef7f5ea7..fdb1570bc7d3137fcfed7acf2fb970ca4ff1a75a 100644 |
| 17195 | 17195 | --- a/arch/arm/boot/dts/rk3036-kylin.dts |
| 17196 | 17196 | +++ b/arch/arm/boot/dts/rk3036-kylin.dts |
| 17197 | 17197 | @@ -357,7 +357,6 @@ &sdio { |
| ... | ... | @@ -17211,7 +17211,7 @@ index 5726135b7f8a..fdb1570bc7d3 100644 |
| 17211 | 17211 | 	pinctrl-0 = <&sdmmc_clk>, <&sdmmc_cmd>, <&sdmmc_cd>, <&sdmmc_bus4>; |
| 17212 | 17212 | }; |
| 17213 | 17213 | diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi |
| 17214 | | index ec91325d3b6e..4916c65e0ace 100644 |
| 17214 | index ec91325d3b6ebeb50da67b44607c600a88cf64bc..4916c65e0ace7ca0b9ec68cddaca34b55c39d932 100644 |
| 17215 | 17215 | --- a/arch/arm/boot/dts/rk3036.dtsi |
| 17216 | 17216 | +++ b/arch/arm/boot/dts/rk3036.dtsi |
| 17217 | 17217 | @@ -287,7 +287,6 @@ emmc: dwmmc@1021c000 { |
| ... | ... | @@ -17232,7 +17232,7 @@ index ec91325d3b6e..4916c65e0ace 100644 |
| 17232 | 17232 | 			}; |
| 17233 | 17233 | |
| 17234 | 17234 | diff --git a/arch/arm/boot/dts/rk3066a-bqcurie2.dts b/arch/arm/boot/dts/rk3066a-bqcurie2.dts |
| 17235 | | index e1f5198723b2..ef1eabf2512c 100644 |
| 17235 | index e1f5198723b22de9dc2cb47a9b46a1a72f11a134..ef1eabf2512c5eec210b8694ca50e1072ba85960 100644 |
| 17236 | 17236 | --- a/arch/arm/boot/dts/rk3066a-bqcurie2.dts |
| 17237 | 17237 | +++ b/arch/arm/boot/dts/rk3066a-bqcurie2.dts |
| 17238 | 17238 | @@ -190,7 +190,6 @@ vcc28_cif: regulator@12 { |
| ... | ... | @@ -17252,7 +17252,7 @@ index e1f5198723b2..ef1eabf2512c 100644 |
| 17252 | 17252 | 	non-removable; |
| 17253 | 17253 | |
| 17254 | 17254 | diff --git a/arch/arm/boot/dts/rk3066a-mk808.dts b/arch/arm/boot/dts/rk3066a-mk808.dts |
| 17255 | | index 7ca1cf5241e0..13e285c53def 100644 |
| 17255 | index 7ca1cf5241e036c9a5b56f8b6988bef1fd043c0a..13e285c53defd633967f3058b4b3ce12e673dfa7 100644 |
| 17256 | 17256 | --- a/arch/arm/boot/dts/rk3066a-mk808.dts |
| 17257 | 17257 | +++ b/arch/arm/boot/dts/rk3066a-mk808.dts |
| 17258 | 17258 | @@ -132,7 +132,6 @@ &mmc0 { |
| ... | ... | @@ -17272,7 +17272,7 @@ index 7ca1cf5241e0..13e285c53def 100644 |
| 17272 | 17272 | 	pinctrl-names = "default"; |
| 17273 | 17273 | 	vmmc-supply = <&vcc_wifi>; |
| 17274 | 17274 | diff --git a/arch/arm/boot/dts/rk3066a-rayeager.dts b/arch/arm/boot/dts/rk3066a-rayeager.dts |
| 17275 | | index 8907deaab18e..400cbf9609e3 100644 |
| 17275 | index 8907deaab18e30038fc094607bfcc1b6faf1044f..400cbf9609e3707b7792139bba326c947df81fe8 100644 |
| 17276 | 17276 | --- a/arch/arm/boot/dts/rk3066a-rayeager.dts |
| 17277 | 17277 | +++ b/arch/arm/boot/dts/rk3066a-rayeager.dts |
| 17278 | 17278 | @@ -185,7 +185,6 @@ &emmc { |
| ... | ... | @@ -17300,7 +17300,7 @@ index 8907deaab18e..400cbf9609e3 100644 |
| 17300 | 17300 | 	pinctrl-0 = <&sd1_clk>, <&sd1_cmd>, <&sd1_bus4>; |
| 17301 | 17301 | 	vmmc-supply = <&vccio_wl>; |
| 17302 | 17302 | diff --git a/arch/arm/boot/dts/rk3188-px3-evb.dts b/arch/arm/boot/dts/rk3188-px3-evb.dts |
| 17303 | | index 5b2a0b6885cd..8ba9e06062f3 100644 |
| 17303 | index 5b2a0b6885cd0790d663ab3ba2d87927b9b32742..8ba9e06062f3e05434cf954fa1027146abbdb3d6 100644 |
| 17304 | 17304 | --- a/arch/arm/boot/dts/rk3188-px3-evb.dts |
| 17305 | 17305 | +++ b/arch/arm/boot/dts/rk3188-px3-evb.dts |
| 17306 | 17306 | @@ -89,7 +89,6 @@ &emmc { |
| ... | ... | @@ -17320,7 +17320,7 @@ index 5b2a0b6885cd..8ba9e06062f3 100644 |
| 17320 | 17320 | 	pinctrl-names = "default"; |
| 17321 | 17321 | 	pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>; |
| 17322 | 17322 | diff --git a/arch/arm/boot/dts/rk3188-radxarock.dts b/arch/arm/boot/dts/rk3188-radxarock.dts |
| 17323 | | index ca0a1c4bc15c..53d6fc2fdbce 100644 |
| 17323 | index ca0a1c4bc15cdd3fea84d305eba5cf219969a00f..53d6fc2fdbce89fb2118c30e2115c05bc29eebcd 100644 |
| 17324 | 17324 | --- a/arch/arm/boot/dts/rk3188-radxarock.dts |
| 17325 | 17325 | +++ b/arch/arm/boot/dts/rk3188-radxarock.dts |
| 17326 | 17326 | @@ -296,7 +296,6 @@ vcc28: REG12 { |
| ... | ... | @@ -17332,7 +17332,7 @@ index ca0a1c4bc15c..53d6fc2fdbce 100644 |
| 17332 | 17332 | 	pinctrl-names = "default"; |
| 17333 | 17333 | 	pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>; |
| 17334 | 17334 | diff --git a/arch/arm/boot/dts/rk3229-evb.dts b/arch/arm/boot/dts/rk3229-evb.dts |
| 17335 | | index 1b55192b7d04..73e384585755 100644 |
| 17335 | index 1b55192b7d04683ce464eb824f45cee43fd4c486..73e38458575541d4571758989d4ecb073eac7d23 100644 |
| 17336 | 17336 | --- a/arch/arm/boot/dts/rk3229-evb.dts |
| 17337 | 17337 | +++ b/arch/arm/boot/dts/rk3229-evb.dts |
| 17338 | 17338 | @@ -40,7 +40,8 @@ |
| ... | ... | @@ -17512,7 +17512,7 @@ index 1b55192b7d04..73e384585755 100644 |
| 17512 | 17512 | }; |
| 17513 | 17513 | diff --git a/arch/arm/boot/dts/rk3229.dtsi b/arch/arm/boot/dts/rk3229.dtsi |
| 17514 | 17514 | new file mode 100644 |
| 17515 | | index 000000000000..6fe6c15fc13a |
| 17515 | index 0000000000000000000000000000000000000000..6fe6c15fc13a348369ad9358f3940621538c0ab8 |
| 17516 | 17516 | --- /dev/null |
| 17517 | 17517 | +++ b/arch/arm/boot/dts/rk3229.dtsi |
| 17518 | 17518 | @@ -0,0 +1,89 @@ |
| ... | ... | @@ -17606,7 +17606,7 @@ index 000000000000..6fe6c15fc13a |
| 17606 | 17606 | +	}; |
| 17607 | 17607 | +}; |
| 17608 | 17608 | diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi |
| 17609 | | index f3e4ffd9f818..06814421eed2 100644 |
| 17609 | index f3e4ffd9f8180bfaade6a9ecfb0e7abaa502f0d1..06814421eed2ef9c41fd5db803bc60f91ee85bed 100644 |
| 17610 | 17610 | --- a/arch/arm/boot/dts/rk322x.dtsi |
| 17611 | 17611 | +++ b/arch/arm/boot/dts/rk322x.dtsi |
| 17612 | 17612 | @@ -55,6 +55,7 @@ aliases { |
| ... | ... | @@ -17915,7 +17915,7 @@ index f3e4ffd9f818..06814421eed2 100644 |
| 17915 | 17915 | 			otp_gpio: otp-gpio { |
| 17916 | 17916 | 				rockchip,pins = <0 24 RK_FUNC_GPIO &pcfg_pull_none>; |
| 17917 | 17917 | diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi |
| 17918 | | index 0dec94c3583b..39b61dce97ad 100644 |
| 17918 | index 0dec94c3583b4523d44defc903821beaa810116f..39b61dce97ad344e0884a02f87ff66c6155eb51d 100644 |
| 17919 | 17919 | --- a/arch/arm/boot/dts/rk3288-evb.dtsi |
| 17920 | 17920 | +++ b/arch/arm/boot/dts/rk3288-evb.dtsi |
| 17921 | 17921 | @@ -45,7 +45,44 @@ |
| ... | ... | @@ -18002,7 +18002,7 @@ index 0dec94c3583b..39b61dce97ad 100644 |
| 18002 | 18002 | 	ddc-i2c-bus = <&i2c5>; |
| 18003 | 18003 | 	status = "okay"; |
| 18004 | 18004 | diff --git a/arch/arm/boot/dts/rk3288-fennec.dts b/arch/arm/boot/dts/rk3288-fennec.dts |
| 18005 | | index 61d1c1028317..41405974253a 100644 |
| 18005 | index 61d1c1028317818e1e8b59ac2007f1197a00f8c4..41405974253a4ba945362ecac43d8eb61484538c 100644 |
| 18006 | 18006 | --- a/arch/arm/boot/dts/rk3288-fennec.dts |
| 18007 | 18007 | +++ b/arch/arm/boot/dts/rk3288-fennec.dts |
| 18008 | 18008 | @@ -47,7 +47,7 @@ / { |
| ... | ... | @@ -18035,7 +18035,7 @@ index 61d1c1028317..41405974253a 100644 |
| 18035 | 18035 | 	status = "okay"; |
| 18036 | 18036 | }; |
| 18037 | 18037 | diff --git a/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi b/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi |
| 18038 | | index 813496618d08..5f05815f47e0 100644 |
| 18038 | index 813496618d08ecaad55b250e40cf472efd10b84c..5f05815f47e09278bdc9eb7870d25ab0c504e549 100644 |
| 18039 | 18039 | --- a/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi |
| 18040 | 18040 | +++ b/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi |
| 18041 | 18041 | @@ -47,7 +47,7 @@ |
| ... | ... | @@ -18056,7 +18056,7 @@ index 813496618d08..5f05815f47e0 100644 |
| 18056 | 18056 | 	pinctrl-0 = <&emmc_clk>, <&emmc_cmd>, <&emmc_pwr>, <&emmc_bus8>; |
| 18057 | 18057 | 	vmmc-supply = <&vcc_io>; |
| 18058 | 18058 | diff --git a/arch/arm/boot/dts/rk3288-firefly-reload.dts b/arch/arm/boot/dts/rk3288-firefly-reload.dts |
| 18059 | | index b11a282c334c..7da0947ababb 100644 |
| 18059 | index b11a282c334c4d03cc1fdc1e1665029fc0f1de18..7da0947ababbc4a1cda11e6f5b4190ee9f803a88 100644 |
| 18060 | 18060 | --- a/arch/arm/boot/dts/rk3288-firefly-reload.dts |
| 18061 | 18061 | +++ b/arch/arm/boot/dts/rk3288-firefly-reload.dts |
| 18062 | 18062 | @@ -269,7 +269,6 @@ &sdmmc { |
| ... | ... | @@ -18076,7 +18076,7 @@ index b11a282c334c..7da0947ababb 100644 |
| 18076 | 18076 | 	pinctrl-0 = <&sdio0_bus4>, <&sdio0_cmd>, <&sdio0_clk>, <&sdio0_int>; |
| 18077 | 18077 | 	sd-uhs-sdr12; |
| 18078 | 18078 | diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi |
| 18079 | | index 32dabae12e67..b9e6f3a97240 100644 |
| 18079 | index 32dabae12e673778303e1e91f7fed02af4eeee08..b9e6f3a97240c4a8e422cc44052604e05893fcdc 100644 |
| 18080 | 18080 | --- a/arch/arm/boot/dts/rk3288-firefly.dtsi |
| 18081 | 18081 | +++ b/arch/arm/boot/dts/rk3288-firefly.dtsi |
| 18082 | 18082 | @@ -46,7 +46,7 @@ |
| ... | ... | @@ -18113,7 +18113,7 @@ index 32dabae12e67..b9e6f3a97240 100644 |
| 18113 | 18113 | 	pinctrl-0 = <&sdmmc_clk>, <&sdmmc_cmd>, <&sdmmc_cd>, <&sdmmc_bus4>; |
| 18114 | 18114 | 	vmmc-supply = <&vcc_sd>; |
| 18115 | 18115 | diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts |
| 18116 | | index 30e93f694ae8..4d923aa6ed11 100644 |
| 18116 | index 30e93f694ae86699194fb830a45f7d5644d6d23f..4d923aa6ed1196395897cd6abefa56dc557ff5a4 100644 |
| 18117 | 18117 | --- a/arch/arm/boot/dts/rk3288-miqi.dts |
| 18118 | 18118 | +++ b/arch/arm/boot/dts/rk3288-miqi.dts |
| 18119 | 18119 | @@ -54,7 +54,7 @@ chosen { |
| ... | ... | @@ -18142,7 +18142,7 @@ index 30e93f694ae8..4d923aa6ed11 100644 |
| 18142 | 18142 | 	pinctrl-0 = <&sdmmc_clk>, <&sdmmc_cmd>, <&sdmmc_cd>, <&sdmmc_bus4>; |
| 18143 | 18143 | 	vmmc-supply = <&vcc_sd>; |
| 18144 | 18144 | diff --git a/arch/arm/boot/dts/rk3288-phycore-rdk.dts b/arch/arm/boot/dts/rk3288-phycore-rdk.dts |
| 18145 | | index 3dda79579b51..1241cbcfc16f 100644 |
| 18145 | index 3dda79579b5192402f3ecc37f2969bbb2706af82..1241cbcfc16fae404a269917abe86f03b8f17c0f 100644 |
| 18146 | 18146 | --- a/arch/arm/boot/dts/rk3288-phycore-rdk.dts |
| 18147 | 18147 | +++ b/arch/arm/boot/dts/rk3288-phycore-rdk.dts |
| 18148 | 18148 | @@ -263,7 +263,6 @@ &sdmmc { |
| ... | ... | @@ -18154,7 +18154,7 @@ index 3dda79579b51..1241cbcfc16f 100644 |
| 18154 | 18154 | 	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; |
| 18155 | 18155 | 	vmmc-supply = <&vdd_io_sd>; |
| 18156 | 18156 | diff --git a/arch/arm/boot/dts/rk3288-phycore-som.dtsi b/arch/arm/boot/dts/rk3288-phycore-som.dtsi |
| 18157 | | index 26cd3ad45160..99cfae875e12 100644 |
| 18157 | index 26cd3ad45160714351993413a4180107ff670339..99cfae875e12e6e3ec9e333c7534a058bbe0a3e8 100644 |
| 18158 | 18158 | --- a/arch/arm/boot/dts/rk3288-phycore-som.dtsi |
| 18159 | 18159 | +++ b/arch/arm/boot/dts/rk3288-phycore-som.dtsi |
| 18160 | 18160 | @@ -55,7 +55,7 @@ / { |
| ... | ... | @@ -18175,7 +18175,7 @@ index 26cd3ad45160..99cfae875e12 100644 |
| 18175 | 18175 | 	pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>; |
| 18176 | 18176 | 	vmmc-supply = <&vdd_3v3_io>; |
| 18177 | 18177 | diff --git a/arch/arm/boot/dts/rk3288-popmetal.dts b/arch/arm/boot/dts/rk3288-popmetal.dts |
| 18178 | | index aa1f9ecff231..f084e0c8dcb3 100644 |
| 18178 | index aa1f9ecff23109b7671e81d0afd62f217a563b18..f084e0c8dcb350726949d698cd8021c0168d8a9e 100644 |
| 18179 | 18179 | --- a/arch/arm/boot/dts/rk3288-popmetal.dts |
| 18180 | 18180 | +++ b/arch/arm/boot/dts/rk3288-popmetal.dts |
| 18181 | 18181 | @@ -50,7 +50,7 @@ / { |
| ... | ... | @@ -18204,7 +18204,7 @@ index aa1f9ecff231..f084e0c8dcb3 100644 |
| 18204 | 18204 | 	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; |
| 18205 | 18205 | 	sd-uhs-sdr12; |
| 18206 | 18206 | diff --git a/arch/arm/boot/dts/rk3288-r89.dts b/arch/arm/boot/dts/rk3288-r89.dts |
| 18207 | | index 1145b62edde7..e95215c9788b 100644 |
| 18207 | index 1145b62edde7fb8ddf3aee9b1674dad07afb1568..e95215c9788b38376a78cc8d2567798662d0d51f 100644 |
| 18208 | 18208 | --- a/arch/arm/boot/dts/rk3288-r89.dts |
| 18209 | 18209 | +++ b/arch/arm/boot/dts/rk3288-r89.dts |
| 18210 | 18210 | @@ -50,7 +50,7 @@ / { |
| ... | ... | @@ -18225,7 +18225,7 @@ index 1145b62edde7..e95215c9788b 100644 |
| 18225 | 18225 | 	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; |
| 18226 | 18226 | 	vmmc-supply = <&vcc_sdmmc>; |
| 18227 | 18227 | diff --git a/arch/arm/boot/dts/rk3288-rock2-som.dtsi b/arch/arm/boot/dts/rk3288-rock2-som.dtsi |
| 18228 | | index 749a9b86e6e2..b9c471fcbd42 100644 |
| 18228 | index 749a9b86e6e27c9a1d7d5e50786022d6804d24e5..b9c471fcbd42b080305e2c89318dd2bea4036603 100644 |
| 18229 | 18229 | --- a/arch/arm/boot/dts/rk3288-rock2-som.dtsi |
| 18230 | 18230 | +++ b/arch/arm/boot/dts/rk3288-rock2-som.dtsi |
| 18231 | 18231 | @@ -43,7 +43,7 @@ |
| ... | ... | @@ -18246,7 +18246,7 @@ index 749a9b86e6e2..b9c471fcbd42 100644 |
| 18246 | 18246 | 	pinctrl-names = "default"; |
| 18247 | 18247 | 	pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>; |
| 18248 | 18248 | diff --git a/arch/arm/boot/dts/rk3288-rock2-square.dts b/arch/arm/boot/dts/rk3288-rock2-square.dts |
| 18249 | | index 8ed25e9f60bc..0e084b8a86ac 100644 |
| 18249 | index 8ed25e9f60bc480309765ab26c10426a5965e2cd..0e084b8a86acb01fb53fa2aca461fc727d6c7544 100644 |
| 18250 | 18250 | --- a/arch/arm/boot/dts/rk3288-rock2-square.dts |
| 18251 | 18251 | +++ b/arch/arm/boot/dts/rk3288-rock2-square.dts |
| 18252 | 18252 | @@ -147,7 +147,6 @@ &sdio0 { |
| ... | ... | @@ -18266,7 +18266,7 @@ index 8ed25e9f60bc..0e084b8a86ac 100644 |
| 18266 | 18266 | 	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; |
| 18267 | 18267 | 	vmmc-supply = <&vcc_sd>; |
| 18268 | 18268 | diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts |
| 18269 | | index f601c78386a9..346b0d8b474d 100644 |
| 18269 | index f601c78386a92f67e780b18a7aaf6c08cf4f25bd..346b0d8b474d9995f000d0dd3fedca46cff755cf 100644 |
| 18270 | 18270 | --- a/arch/arm/boot/dts/rk3288-tinker.dts |
| 18271 | 18271 | +++ b/arch/arm/boot/dts/rk3288-tinker.dts |
| 18272 | 18272 | @@ -50,7 +50,7 @@ / { |
| ... | ... | @@ -18299,7 +18299,7 @@ index f601c78386a9..346b0d8b474d 100644 |
| 18299 | 18299 | 	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; |
| 18300 | 18300 | 	status = "okay"; |
| 18301 | 18301 | diff --git a/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi b/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi |
| 18302 | | index aef07101e9ab..95e9bee8bca2 100644 |
| 18302 | index aef07101e9abaa549cc6e2fa3c311c4f5dbd47b2..95e9bee8bca2bd0c6c619dcd58670a298661548c 100644 |
| 18303 | 18303 | --- a/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi |
| 18304 | 18304 | +++ b/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi |
| 18305 | 18305 | @@ -117,7 +117,6 @@ &sdmmc { |
| ... | ... | @@ -18311,7 +18311,7 @@ index aef07101e9ab..95e9bee8bca2 100644 |
| 18311 | 18311 | 	sd-uhs-sdr25; |
| 18312 | 18312 | 	sd-uhs-sdr50; |
| 18313 | 18313 | diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi |
| 18314 | | index d709fa1847f9..6e5bd8974f22 100644 |
| 18314 | index d709fa1847f9a8ca2f435a95ecc7b78536af1ffb..6e5bd8974f22dc9aac0fdf7daeeae8ca490f82d0 100644 |
| 18315 | 18315 | --- a/arch/arm/boot/dts/rk3288-veyron.dtsi |
| 18316 | 18316 | +++ b/arch/arm/boot/dts/rk3288-veyron.dtsi |
| 18317 | 18317 | @@ -49,7 +49,7 @@ |
| ... | ... | @@ -18340,7 +18340,7 @@ index d709fa1847f9..6e5bd8974f22 100644 |
| 18340 | 18340 | 	pinctrl-0 = <&sdio0_clk &sdio0_cmd &sdio0_bus4>; |
| 18341 | 18341 | 	sd-uhs-sdr12; |
| 18342 | 18342 | diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi |
| 18343 | | index 858e1fed762a..356ed1e62452 100644 |
| 18343 | index 858e1fed762a1df80f33bac4576b5d900e021bcf..356ed1e624525224c8e797da0990f83a75823008 100644 |
| 18344 | 18344 | --- a/arch/arm/boot/dts/rk3288.dtsi |
| 18345 | 18345 | +++ b/arch/arm/boot/dts/rk3288.dtsi |
| 18346 | 18346 | @@ -49,8 +49,8 @@ |
| ... | ... | @@ -19079,7 +19079,7 @@ index 858e1fed762a..356ed1e62452 100644 |
| 19079 | 19079 | 			clocks = <&cru PCLK_GPIO8>; |
| 19080 | 19080 | |
| 19081 | 19081 | diff --git a/arch/arm/boot/dts/rv1108-evb.dts b/arch/arm/boot/dts/rv1108-evb.dts |
| 19082 | | index 58cf4ac079c3..86a57f823616 100644 |
| 19082 | index 58cf4ac079c3dea6b307148bca9311bda36162a3..86a57f823616185a14ede94aebdcf853e6edfa16 100644 |
| 19083 | 19083 | --- a/arch/arm/boot/dts/rv1108-evb.dts |
| 19084 | 19084 | +++ b/arch/arm/boot/dts/rv1108-evb.dts |
| 19085 | 19085 | @@ -54,6 +54,184 @@ memory@60000000 { |
| ... | ... | @@ -19284,7 +19284,7 @@ index 58cf4ac079c3..86a57f823616 100644 |
| 19284 | 19284 | +	status = "okay"; |
| 19285 | 19285 | +}; |
| 19286 | 19286 | diff --git a/arch/arm/boot/dts/rv1108.dtsi b/arch/arm/boot/dts/rv1108.dtsi |
| 19287 | | index 437098b556eb..e7cd1315db1b 100644 |
| 19287 | index 437098b556eb8b9119f2fbbda79f35ce664e7920..e7cd1315db1b7bc08c688867dd77c4687396fe92 100644 |
| 19288 | 19288 | --- a/arch/arm/boot/dts/rv1108.dtsi |
| 19289 | 19289 | +++ b/arch/arm/boot/dts/rv1108.dtsi |
| 19290 | 19290 | @@ -52,6 +52,10 @@ / { |
| ... | ... | @@ -19737,7 +19737,7 @@ index 437098b556eb..e7cd1315db1b 100644 |
| 19737 | 19737 | 			sdmmc_clk: sdmmc-clk { |
| 19738 | 19738 | 				rockchip,pins = <3 RK_PC4 RK_FUNC_1 &pcfg_pull_none_drv_4ma>; |
| 19739 | 19739 | diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi |
| 19740 | | index 60e69aeacbdb..38d2216c7ead 100644 |
| 19740 | index 60e69aeacbdbf4dff78923f227f96f8bc49c1fbc..38d2216c7ead9ff422cce1e740a820e47977a700 100644 |
| 19741 | 19741 | --- a/arch/arm/boot/dts/sama5d2.dtsi |
| 19742 | 19742 | +++ b/arch/arm/boot/dts/sama5d2.dtsi |
| 19743 | 19743 | @@ -416,6 +416,17 @@ hlcdc_pwm: hlcdc-pwm { |
| ... | ... | @@ -19863,7 +19863,7 @@ index 60e69aeacbdb..38d2216c7ead 100644 |
| 19863 | 19863 | 				compatible = "bosch,m_can"; |
| 19864 | 19864 | 				reg = <0xfc050000 0x4000>, <0x210000 0x4000>; |
| 19865 | 19865 | diff --git a/arch/arm/boot/dts/spear1310.dtsi b/arch/arm/boot/dts/spear1310.dtsi |
| 19866 | | index 54bc6d3cf290..40f4ad3c34c6 100644 |
| 19866 | index 54bc6d3cf2903e8d710aaa0ea178232d3be09942..40f4ad3c34c6e5e496622a99936c0b3bdfc1830c 100644 |
| 19867 | 19867 | --- a/arch/arm/boot/dts/spear1310.dtsi |
| 19868 | 19868 | +++ b/arch/arm/boot/dts/spear1310.dtsi |
| 19869 | 19869 | @@ -98,6 +98,7 @@ pcie0: pcie@b1000000 { |
| ... | ... | @@ -19891,7 +19891,7 @@ index 54bc6d3cf290..40f4ad3c34c6 100644 |
| 19891 | 19891 | 		}; |
| 19892 | 19892 | |
| 19893 | 19893 | diff --git a/arch/arm/boot/dts/spear1340.dtsi b/arch/arm/boot/dts/spear1340.dtsi |
| 19894 | | index df2232d767ed..5f347054527d 100644 |
| 19894 | index df2232d767ed2ea7ffca8383e258cecb768dc679..5f347054527def7bc99e5a62575e986d0d5b067a 100644 |
| 19895 | 19895 | --- a/arch/arm/boot/dts/spear1340.dtsi |
| 19896 | 19896 | +++ b/arch/arm/boot/dts/spear1340.dtsi |
| 19897 | 19897 | @@ -63,6 +63,7 @@ pcie0: pcie@b1000000 { |
| ... | ... | @@ -19903,7 +19903,7 @@ index df2232d767ed..5f347054527d 100644 |
| 19903 | 19903 | 		}; |
| 19904 | 19904 | |
| 19905 | 19905 | diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi |
| 19906 | | index 6c5affe2d0f5..2310a4e97768 100644 |
| 19906 | index 6c5affe2d0f556eab1d3415718bd5e8fcf36842a..2310a4e97768c222ca19fe8f125c5aede36be8d1 100644 |
| 19907 | 19907 | --- a/arch/arm/boot/dts/ste-dbx5x0.dtsi |
| 19908 | 19908 | +++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi |
| 19909 | 19909 | @@ -37,6 +37,14 @@ CPU0: cpu@300 { |
| ... | ... | @@ -19936,7 +19936,7 @@ index 6c5affe2d0f5..2310a4e97768 100644 |
| 19936 | 19936 | 				compatible = "stericsson,db8500-thermal"; |
| 19937 | 19937 | 				reg = <0x801573c0 0x40>; |
| 19938 | 19938 | diff --git a/arch/arm/boot/dts/stm32429i-eval.dts b/arch/arm/boot/dts/stm32429i-eval.dts |
| 19939 | | index dcda0bbefe5b..97b1c2321ba9 100644 |
| 19939 | index dcda0bbefe5b5a532df6a00f9c8a1083747acefe..97b1c2321ba9dd4f7791213b47beaeb740d6542f 100644 |
| 19940 | 19940 | --- a/arch/arm/boot/dts/stm32429i-eval.dts |
| 19941 | 19941 | +++ b/arch/arm/boot/dts/stm32429i-eval.dts |
| 19942 | 19942 | @@ -55,7 +55,7 @@ / { |
| ... | ... | @@ -19949,7 +19949,7 @@ index dcda0bbefe5b..97b1c2321ba9 100644 |
| 19949 | 19949 | 	}; |
| 19950 | 19950 | |
| 19951 | 19951 | diff --git a/arch/arm/boot/dts/stm32f429-disco.dts b/arch/arm/boot/dts/stm32f429-disco.dts |
| 19952 | | index ae47cde7952f..c66d617e4245 100644 |
| 19952 | index ae47cde7952f6bb16fe13b435a0f704cda7fbc8a..c66d617e4245b4c7b83f45e2266480c1ac64759d 100644 |
| 19953 | 19953 | --- a/arch/arm/boot/dts/stm32f429-disco.dts |
| 19954 | 19954 | +++ b/arch/arm/boot/dts/stm32f429-disco.dts |
| 19955 | 19955 | @@ -54,7 +54,7 @@ / { |
| ... | ... | @@ -19962,7 +19962,7 @@ index ae47cde7952f..c66d617e4245 100644 |
| 19962 | 19962 | 	}; |
| 19963 | 19963 | |
| 19964 | 19964 | diff --git a/arch/arm/boot/dts/stm32f429.dtsi b/arch/arm/boot/dts/stm32f429.dtsi |
| 19965 | | index a8113dc879cf..dd7e99b1f43b 100644 |
| 19965 | index a8113dc879cfeed36a67eb32417764374cfd23e1..dd7e99b1f43bc78111f0de584849367a8f07cf8a 100644 |
| 19966 | 19966 | --- a/arch/arm/boot/dts/stm32f429.dtsi |
| 19967 | 19967 | +++ b/arch/arm/boot/dts/stm32f429.dtsi |
| 19968 | 19968 | @@ -361,6 +361,31 @@ i2c1: i2c@40005400 { |
| ... | ... | @@ -19998,7 +19998,7 @@ index a8113dc879cf..dd7e99b1f43b 100644 |
| 19998 | 19998 | 			compatible = "st,stm32-usart", "st,stm32-uart"; |
| 19999 | 19999 | 			reg = <0x40007800 0x400>; |
| 20000 | 20000 | diff --git a/arch/arm/boot/dts/stm32f469-disco.dts b/arch/arm/boot/dts/stm32f469-disco.dts |
| 20001 | | index 75470c34b92c..6ae1f037f3f0 100644 |
| 20001 | index 75470c34b92cb36c5f1f6eb61c3c0f31e94a84bf..6ae1f037f3f0e5065eb80a6159a8bfb1d5eb3ba1 100644 |
| 20002 | 20002 | --- a/arch/arm/boot/dts/stm32f469-disco.dts |
| 20003 | 20003 | +++ b/arch/arm/boot/dts/stm32f469-disco.dts |
| 20004 | 20004 | @@ -53,7 +53,7 @@ / { |
| ... | ... | @@ -20011,7 +20011,7 @@ index 75470c34b92c..6ae1f037f3f0 100644 |
| 20011 | 20011 | 	}; |
| 20012 | 20012 | |
| 20013 | 20013 | diff --git a/arch/arm/boot/dts/stm32f746.dtsi b/arch/arm/boot/dts/stm32f746.dtsi |
| 20014 | | index 4506eb97a4ab..5633860037d2 100644 |
| 20014 | index 4506eb97a4ab47baf45cda13f851083a951cb440..5633860037d23397379b092a4cf5bba353abb367 100644 |
| 20015 | 20015 | --- a/arch/arm/boot/dts/stm32f746.dtsi |
| 20016 | 20016 | +++ b/arch/arm/boot/dts/stm32f746.dtsi |
| 20017 | 20017 | @@ -167,6 +167,15 @@ usart5: serial@40005000 { |
| ... | ... | @@ -20087,7 +20087,7 @@ index 4506eb97a4ab..5633860037d2 100644 |
| 20087 | 20087 | }; |
| 20088 | 20088 | |
| 20089 | 20089 | diff --git a/arch/arm/boot/dts/stm32f769-disco.dts b/arch/arm/boot/dts/stm32f769-disco.dts |
| 20090 | | index 166728aeb166..4463ca13a740 100644 |
| 20090 | index 166728aeb16669f5a1086e9ace525a1d17490328..4463ca13a740e8ce0c568a6d0e8ece07f962d80c 100644 |
| 20091 | 20091 | --- a/arch/arm/boot/dts/stm32f769-disco.dts |
| 20092 | 20092 | +++ b/arch/arm/boot/dts/stm32f769-disco.dts |
| 20093 | 20093 | @@ -63,6 +63,12 @@ aliases { |
| ... | ... | @@ -20104,7 +20104,7 @@ index 166728aeb166..4463ca13a740 100644 |
| 20104 | 20104 | 	clock-frequency = <25000000>; |
| 20105 | 20105 | }; |
| 20106 | 20106 | diff --git a/arch/arm/boot/dts/stm32h743.dtsi b/arch/arm/boot/dts/stm32h743.dtsi |
| 20107 | | index 36a99db0a3b4..58ec2275181e 100644 |
| 20107 | index 36a99db0a3b4cd08a1e8388ad5c8d832efeb8781..58ec2275181ef7c196087ba8ba2ac6d05da6524a 100644 |
| 20108 | 20108 | --- a/arch/arm/boot/dts/stm32h743.dtsi |
| 20109 | 20109 | +++ b/arch/arm/boot/dts/stm32h743.dtsi |
| 20110 | 20110 | @@ -59,6 +59,45 @@ timer_clk: timer-clk { |
| ... | ... | @@ -20254,7 +20254,7 @@ index 36a99db0a3b4..58ec2275181e 100644 |
| 20254 | 20254 | 	}; |
| 20255 | 20255 | }; |
| 20256 | 20256 | diff --git a/arch/arm/boot/dts/stm32h743i-eval.dts b/arch/arm/boot/dts/stm32h743i-eval.dts |
| 20257 | | index c6effbb36e4a..6c07786e7ddb 100644 |
| 20257 | index c6effbb36e4a8983131998ef00780b465c6327ff..6c07786e7ddb9195fc88108d5d1906deb13f6c12 100644 |
| 20258 | 20258 | --- a/arch/arm/boot/dts/stm32h743i-eval.dts |
| 20259 | 20259 | +++ b/arch/arm/boot/dts/stm32h743i-eval.dts |
| 20260 | 20260 | @@ -60,6 +60,24 @@ memory { |
| ... | ... | @@ -20283,7 +20283,7 @@ index c6effbb36e4a..6c07786e7ddb 100644 |
| 20283 | 20283 | |
| 20284 | 20284 | &clk_hse { |
| 20285 | 20285 | diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi |
| 20286 | | index aebc3f9dc7b6..b147cb0dc14b 100644 |
| 20286 | index aebc3f9dc7b679da02f85e96a26f74719182ead4..b147cb0dc14b26ce92db7ea70bba2a8f77bd0d38 100644 |
| 20287 | 20287 | --- a/arch/arm/boot/dts/sun6i-a31.dtsi |
| 20288 | 20288 | +++ b/arch/arm/boot/dts/sun6i-a31.dtsi |
| 20289 | 20289 | @@ -1155,11 +1155,11 @@ rtc: rtc@01f00000 { |
| ... | ... | @@ -20302,7 +20302,7 @@ index aebc3f9dc7b6..b147cb0dc14b 100644 |
| 20302 | 20302 | 		}; |
| 20303 | 20303 | |
| 20304 | 20304 | diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts |
| 20305 | | index bb510187602c..852a0aa24dce 100644 |
| 20305 | index bb510187602c1c2e43c01d43a210430f3317b70b..852a0aa24dcee6c577b167c9d36d9c01b9a59403 100644 |
| 20306 | 20306 | --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts |
| 20307 | 20307 | +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts |
| 20308 | 20308 | @@ -271,6 +271,10 @@ &ac_power_supply { |
| ... | ... | @@ -20317,7 +20317,7 @@ index bb510187602c..852a0aa24dce 100644 |
| 20317 | 20317 | 	regulator-always-on; |
| 20318 | 20318 | 	regulator-min-microvolt = <1000000>; |
| 20319 | 20319 | diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi |
| 20320 | | index a8b978d0f35b..ea50dda75adc 100644 |
| 20320 | index a8b978d0f35b5f68b6621fa5e4ac71c3e3395dce..ea50dda75adceba97c0d9f16ff4f90eab366c3d9 100644 |
| 20321 | 20321 | --- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi |
| 20322 | 20322 | +++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi |
| 20323 | 20323 | @@ -519,11 +519,11 @@ rtc: rtc@01f00000 { |
| ... | ... | @@ -20336,7 +20336,7 @@ index a8b978d0f35b..ea50dda75adc 100644 |
| 20336 | 20336 | 		}; |
| 20337 | 20337 | |
| 20338 | 20338 | diff --git a/arch/arm/boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts b/arch/arm/boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts |
| 20339 | | index aecdeeb368ed..1f0d60afb25b 100644 |
| 20339 | index aecdeeb368ed85e0c5e59c47f7aeebcd5cbf9a70..1f0d60afb25b695c44523c70d80677f1dd753ecb 100644 |
| 20340 | 20340 | --- a/arch/arm/boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts |
| 20341 | 20341 | +++ b/arch/arm/boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts |
| 20342 | 20342 | @@ -43,6 +43,7 @@ |
| ... | ... | @@ -20442,7 +20442,7 @@ index aecdeeb368ed..1f0d60afb25b 100644 |
| 20442 | 20442 | +}; |
| 20443 | 20443 | diff --git a/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts b/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts |
| 20444 | 20444 | new file mode 100644 |
| 20445 | | index 000000000000..2bafd7e99ef7 |
| 20445 | index 0000000000000000000000000000000000000000..2bafd7e99ef7f2d0d83cfcd155240492059e5d91 |
| 20446 | 20446 | --- /dev/null |
| 20447 | 20447 | +++ b/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts |
| 20448 | 20448 | @@ -0,0 +1,148 @@ |
| ... | ... | @@ -20595,7 +20595,7 @@ index 000000000000..2bafd7e99ef7 |
| 20595 | 20595 | +	status = "okay"; |
| 20596 | 20596 | +}; |
| 20597 | 20597 | diff --git a/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts b/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts |
| 20598 | | index cff33454fc24..716a205c6dbb 100644 |
| 20598 | index cff33454fc2458bf0e1fee5110ab8dd86c88cc21..716a205c6dbbeca282efbe4498742634205ad8bd 100644 |
| 20599 | 20599 | --- a/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts |
| 20600 | 20600 | +++ b/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts |
| 20601 | 20601 | @@ -44,6 +44,7 @@ |
| ... | ... | @@ -20725,7 +20725,7 @@ index cff33454fc24..716a205c6dbb 100644 |
| 20725 | 20725 | +	status = "okay"; |
| 20726 | 20726 | +}; |
| 20727 | 20727 | diff --git a/arch/arm/boot/dts/sun8i-a83t.dtsi b/arch/arm/boot/dts/sun8i-a83t.dtsi |
| 20728 | | index 19a8f4fcfab5..f996bd343e50 100644 |
| 20728 | index 19a8f4fcfab50ef5300360d980f1738d99345a94..f996bd343e50ca156830b373048f3d51a0234116 100644 |
| 20729 | 20729 | --- a/arch/arm/boot/dts/sun8i-a83t.dtsi |
| 20730 | 20730 | +++ b/arch/arm/boot/dts/sun8i-a83t.dtsi |
| 20731 | 20731 | @@ -47,6 +47,7 @@ |
| ... | ... | @@ -20940,7 +20940,7 @@ index 19a8f4fcfab5..f996bd343e50 100644 |
| 20940 | 20940 | 	}; |
| 20941 | 20941 | }; |
| 20942 | 20942 | diff --git a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts |
| 20943 | | index e7fae65eb5d3..10da56e86ab8 100644 |
| 20943 | index e7fae65eb5d3dd88b478c4e4f81050c1790e5568..10da56e86ab800809e9f28b72bd9b94edf02a547 100644 |
| 20944 | 20944 | --- a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts |
| 20945 | 20945 | +++ b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts |
| 20946 | 20946 | @@ -100,6 +100,10 @@ spdif_out: spdif-out { |
| ... | ... | @@ -20992,7 +20992,7 @@ index e7fae65eb5d3..10da56e86ab8 100644 |
| 20992 | 20992 | }; |
| 20993 | 20993 | diff --git a/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts b/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts |
| 20994 | 20994 | new file mode 100644 |
| 20995 | | index 000000000000..eaf09666720d |
| 20995 | index 0000000000000000000000000000000000000000..eaf09666720dcadfb2a008c590eaa4daf355ee04 |
| 20996 | 20996 | --- /dev/null |
| 20997 | 20997 | +++ b/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts |
| 20998 | 20998 | @@ -0,0 +1,321 @@ |
| ... | ... | @@ -21318,7 +21318,7 @@ index 000000000000..eaf09666720d |
| 21318 | 21318 | +	status = "okay"; |
| 21319 | 21319 | +}; |
| 21320 | 21320 | diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts |
| 21321 | | index 1444fbd543e7..5af4dd321952 100644 |
| 21321 | index 1444fbd543e724e367b0091669a7642724023ed1..5af4dd3219520d265f4046d84b9c8cb64c73a000 100644 |
| 21322 | 21322 | --- a/arch/arm/boot/dts/tegra114-dalmore.dts |
| 21323 | 21323 | +++ b/arch/arm/boot/dts/tegra114-dalmore.dts |
| 21324 | 21324 | @@ -1122,6 +1122,16 @@ sdhci@78000600 { |
| ... | ... | @@ -21339,7 +21339,7 @@ index 1444fbd543e7..5af4dd321952 100644 |
| 21339 | 21339 | 		status = "okay"; |
| 21340 | 21340 | 	}; |
| 21341 | 21341 | diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts |
| 21342 | | index 7bacb2954f58..61873d642a45 100644 |
| 21342 | index 7bacb2954f586357bb689dbbd4c51895a4f5653d..61873d642a45b207ef33c885b76469f9d9ed084b 100644 |
| 21343 | 21343 | --- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts |
| 21344 | 21344 | +++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts |
| 21345 | 21345 | @@ -1722,7 +1722,7 @@ usb2 { |
| ... | ... | @@ -21369,7 +21369,7 @@ index 7bacb2954f58..61873d642a45 100644 |
| 21369 | 21369 | 	usb@7d004000 { |
| 21370 | 21370 | 		status = "okay"; |
| 21371 | 21371 | diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi |
| 21372 | | index 1b10b14a6abd..8baf00b89efb 100644 |
| 21372 | index 1b10b14a6abdff8af2442412c87738c0eca85d27..8baf00b89efb98d1693505aa3a8251f1e0a10ac8 100644 |
| 21373 | 21373 | --- a/arch/arm/boot/dts/tegra124.dtsi |
| 21374 | 21374 | +++ b/arch/arm/boot/dts/tegra124.dtsi |
| 21375 | 21375 | @@ -87,6 +87,7 @@ host1x@50000000 { |
| ... | ... | @@ -21381,7 +21381,7 @@ index 1b10b14a6abd..8baf00b89efb 100644 |
| 21381 | 21381 | 		#address-cells = <2>; |
| 21382 | 21382 | 		#size-cells = <2>; |
| 21383 | 21383 | diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts |
| 21384 | | index b4bfa5586c23..bfa9421fcf94 100644 |
| 21384 | index b4bfa5586c233a48b3aeba14b53c3187e245b753..bfa9421fcf94a0ea433c4f2ec2da08665a5193f1 100644 |
| 21385 | 21385 | --- a/arch/arm/boot/dts/tegra20-paz00.dts |
| 21386 | 21386 | +++ b/arch/arm/boot/dts/tegra20-paz00.dts |
| 21387 | 21387 | @@ -452,7 +452,9 @@ pmc@7000e400 { |
| ... | ... | @@ -21395,7 +21395,7 @@ index b4bfa5586c23..bfa9421fcf94 100644 |
| 21395 | 21395 | |
| 21396 | 21396 | 	usb-phy@c5000000 { |
| 21397 | 21397 | diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts |
| 21398 | | index 4f41b18d9547..3e104ddeb220 100644 |
| 21398 | index 4f41b18d95476b7e2db95b3cd9148bf0d8e6626a..3e104ddeb220528c1ec984c428d4f64688e84b00 100644 |
| 21399 | 21399 | --- a/arch/arm/boot/dts/tegra30-beaver.dts |
| 21400 | 21400 | +++ b/arch/arm/boot/dts/tegra30-beaver.dts |
| 21401 | 21401 | @@ -1927,6 +1927,16 @@ sdhci@78000600 { |
| ... | ... | @@ -21416,7 +21416,7 @@ index 4f41b18d9547..3e104ddeb220 100644 |
| 21416 | 21416 | 		status = "okay"; |
| 21417 | 21417 | 	}; |
| 21418 | 21418 | diff --git a/arch/arm/boot/dts/tps65217.dtsi b/arch/arm/boot/dts/tps65217.dtsi |
| 21419 | | index 02de56b55823..399baaa0a2ab 100644 |
| 21419 | index 02de56b55823e78fd82fa6d4ad39d103a8e28fa1..399baaa0a2abe1d3e17bac5d8543f29d06fc6b42 100644 |
| 21420 | 21420 | --- a/arch/arm/boot/dts/tps65217.dtsi |
| 21421 | 21421 | +++ b/arch/arm/boot/dts/tps65217.dtsi |
| 21422 | 21422 | @@ -18,11 +18,14 @@ &tps { |
| ... | ... | @@ -21435,7 +21435,7 @@ index 02de56b55823..399baaa0a2ab 100644 |
| 21435 | 21435 | 	}; |
| 21436 | 21436 | |
| 21437 | 21437 | diff --git a/arch/arm/boot/dts/uniphier-ld4-ref.dts b/arch/arm/boot/dts/uniphier-ld4-ref.dts |
| 21438 | | index 4817ebb28eb2..b3aaab354f3e 100644 |
| 21438 | index 4817ebb28eb2ef81ab2ae92888e003fac77557db..b3aaab354f3e0e8ff842db3549f865e7c1c60e10 100644 |
| 21439 | 21439 | --- a/arch/arm/boot/dts/uniphier-ld4-ref.dts |
| 21440 | 21440 | +++ b/arch/arm/boot/dts/uniphier-ld4-ref.dts |
| 21441 | 21441 | @@ -8,9 +8,9 @@ |
| ... | ... | @@ -21460,7 +21460,7 @@ index 4817ebb28eb2..b3aaab354f3e 100644 |
| 21460 | 21460 | +	status = "okay"; |
| 21461 | 21461 | +}; |
| 21462 | 21462 | diff --git a/arch/arm/boot/dts/uniphier-ld4.dtsi b/arch/arm/boot/dts/uniphier-ld4.dtsi |
| 21463 | | index fb2fd9605b9d..79183db5b386 100644 |
| 21463 | index fb2fd9605b9de640c8caed33a0ecfeb7f7f57814..79183db5b386895781b21635407bce3fa7efb8ac 100644 |
| 21464 | 21464 | --- a/arch/arm/boot/dts/uniphier-ld4.dtsi |
| 21465 | 21465 | +++ b/arch/arm/boot/dts/uniphier-ld4.dtsi |
| 21466 | 21466 | @@ -270,6 +270,13 @@ intc: interrupt-controller@60001000 { |
| ... | ... | @@ -21498,7 +21498,7 @@ index fb2fd9605b9d..79183db5b386 100644 |
| 21498 | 21498 | -/include/ "uniphier-pinctrl.dtsi" |
| 21499 | 21499 | +#include "uniphier-pinctrl.dtsi" |
| 21500 | 21500 | diff --git a/arch/arm/boot/dts/uniphier-ld6b-ref.dts b/arch/arm/boot/dts/uniphier-ld6b-ref.dts |
| 21501 | | index 96db4abc02c3..2188d114d79b 100644 |
| 21501 | index 96db4abc02c3eb1835e76db9a018680c2a4d0c7c..2188d114d79b06c9b9b1bfde5d8cee1bc82e02df 100644 |
| 21502 | 21502 | --- a/arch/arm/boot/dts/uniphier-ld6b-ref.dts |
| 21503 | 21503 | +++ b/arch/arm/boot/dts/uniphier-ld6b-ref.dts |
| 21504 | 21504 | @@ -8,9 +8,9 @@ |
| ... | ... | @@ -21523,7 +21523,7 @@ index 96db4abc02c3..2188d114d79b 100644 |
| 21523 | 21523 | +	status = "okay"; |
| 21524 | 21524 | +}; |
| 21525 | 21525 | diff --git a/arch/arm/boot/dts/uniphier-ld6b.dtsi b/arch/arm/boot/dts/uniphier-ld6b.dtsi |
| 21526 | | index 8b9a79731bd3..9a7b25cc8233 100644 |
| 21526 | index 8b9a79731bd33cf5f75ac03e626de878efed3542..9a7b25cc8233accb08c4720d66cfb792ebfb8bbb 100644 |
| 21527 | 21527 | --- a/arch/arm/boot/dts/uniphier-ld6b.dtsi |
| 21528 | 21528 | +++ b/arch/arm/boot/dts/uniphier-ld6b.dtsi |
| 21529 | 21529 | @@ -12,7 +12,7 @@ |
| ... | ... | @@ -21536,7 +21536,7 @@ index 8b9a79731bd3..9a7b25cc8233 100644 |
| 21536 | 21536 | / { |
| 21537 | 21537 | 	compatible = "socionext,uniphier-ld6b"; |
| 21538 | 21538 | diff --git a/arch/arm/boot/dts/uniphier-pinctrl.dtsi b/arch/arm/boot/dts/uniphier-pinctrl.dtsi |
| 21539 | | index 246f35ffb638..be82cddc4072 100644 |
| 21539 | index 246f35ffb638119fc81c9e159afe870fb7e72a48..be82cddc407245b82cfde6b02cbcc970576e6e0d 100644 |
| 21540 | 21540 | --- a/arch/arm/boot/dts/uniphier-pinctrl.dtsi |
| 21541 | 21541 | +++ b/arch/arm/boot/dts/uniphier-pinctrl.dtsi |
| 21542 | 21542 | @@ -4,51 +4,35 @@ |
| ... | ... | @@ -21613,7 +21613,7 @@ index 246f35ffb638..be82cddc4072 100644 |
| 21613 | 21613 | 		groups = "i2c0"; |
| 21614 | 21614 | 		function = "i2c0"; |
| 21615 | 21615 | diff --git a/arch/arm/boot/dts/uniphier-pro4-ace.dts b/arch/arm/boot/dts/uniphier-pro4-ace.dts |
| 21616 | | index 11690b57931c..089419cee273 100644 |
| 21616 | index 11690b57931cef20c2e34ef0ae328ada08c9d35b..089419cee273ea29341d9d0878afe5c0bf1bbffd 100644 |
| 21617 | 21617 | --- a/arch/arm/boot/dts/uniphier-pro4-ace.dts |
| 21618 | 21618 | +++ b/arch/arm/boot/dts/uniphier-pro4-ace.dts |
| 21619 | 21619 | @@ -8,7 +8,7 @@ |
| ... | ... | @@ -21626,7 +21626,7 @@ index 11690b57931c..089419cee273 100644 |
| 21626 | 21626 | / { |
| 21627 | 21627 | 	model = "UniPhier Pro4 Ace Board"; |
| 21628 | 21628 | diff --git a/arch/arm/boot/dts/uniphier-pro4-ref.dts b/arch/arm/boot/dts/uniphier-pro4-ref.dts |
| 21629 | | index 4cf539245f2e..903df6348e77 100644 |
| 21629 | index 4cf539245f2e75c40c3cdeeb5ea24ea6a4182307..903df6348e77db51d2bcc86d2aa1d32a0cf3dece 100644 |
| 21630 | 21630 | --- a/arch/arm/boot/dts/uniphier-pro4-ref.dts |
| 21631 | 21631 | +++ b/arch/arm/boot/dts/uniphier-pro4-ref.dts |
| 21632 | 21632 | @@ -8,9 +8,9 @@ |
| ... | ... | @@ -21651,7 +21651,7 @@ index 4cf539245f2e..903df6348e77 100644 |
| 21651 | 21651 | +	status = "okay"; |
| 21652 | 21652 | +}; |
| 21653 | 21653 | diff --git a/arch/arm/boot/dts/uniphier-pro4-sanji.dts b/arch/arm/boot/dts/uniphier-pro4-sanji.dts |
| 21654 | | index 2763cebcd76a..adef212b45b2 100644 |
| 21654 | index 2763cebcd76ace8f0c8e4570c7c0d5f15b73b65a..adef212b45b2b01c21cf4098fb9762924c72d198 100644 |
| 21655 | 21655 | --- a/arch/arm/boot/dts/uniphier-pro4-sanji.dts |
| 21656 | 21656 | +++ b/arch/arm/boot/dts/uniphier-pro4-sanji.dts |
| 21657 | 21657 | @@ -8,7 +8,7 @@ |
| ... | ... | @@ -21664,7 +21664,7 @@ index 2763cebcd76a..adef212b45b2 100644 |
| 21664 | 21664 | / { |
| 21665 | 21665 | 	model = "UniPhier Pro4 Sanji Board"; |
| 21666 | 21666 | diff --git a/arch/arm/boot/dts/uniphier-pro4.dtsi b/arch/arm/boot/dts/uniphier-pro4.dtsi |
| 21667 | | index 37400becf4ba..b3dbbd9b6e39 100644 |
| 21667 | index 37400becf4baaafa1e39bf4767de74daa540f5d2..b3dbbd9b6e3955f3330cb3cb4bb5d71c617f4f9a 100644 |
| 21668 | 21668 | --- a/arch/arm/boot/dts/uniphier-pro4.dtsi |
| 21669 | 21669 | +++ b/arch/arm/boot/dts/uniphier-pro4.dtsi |
| 21670 | 21670 | @@ -268,6 +268,13 @@ pinctrl: pinctrl { |
| ... | ... | @@ -21702,7 +21702,7 @@ index 37400becf4ba..b3dbbd9b6e39 100644 |
| 21702 | 21702 | -/include/ "uniphier-pinctrl.dtsi" |
| 21703 | 21703 | +#include "uniphier-pinctrl.dtsi" |
| 21704 | 21704 | diff --git a/arch/arm/boot/dts/uniphier-pro5.dtsi b/arch/arm/boot/dts/uniphier-pro5.dtsi |
| 21705 | | index 9577769a0add..b026bcd42a06 100644 |
| 21705 | index 9577769a0add6cfe9fd39e68fb1110a90602e31f..b026bcd42a069351b1786959be0af090eaef21d3 100644 |
| 21706 | 21706 | --- a/arch/arm/boot/dts/uniphier-pro5.dtsi |
| 21707 | 21707 | +++ b/arch/arm/boot/dts/uniphier-pro5.dtsi |
| 21708 | 21708 | @@ -4,43 +4,7 @@ |
| ... | ... | @@ -21794,7 +21794,7 @@ index 9577769a0add..b026bcd42a06 100644 |
| 21794 | 21794 | -/include/ "uniphier-pinctrl.dtsi" |
| 21795 | 21795 | +#include "uniphier-pinctrl.dtsi" |
| 21796 | 21796 | diff --git a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts |
| 21797 | | index 81560f75bfa7..7dfae2667f50 100644 |
| 21797 | index 81560f75bfa79511c3957405698db2ebc9d6bc35..7dfae2667f5066baa2b5e4424157a85411399166 100644 |
| 21798 | 21798 | --- a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts |
| 21799 | 21799 | +++ b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts |
| 21800 | 21800 | @@ -8,7 +8,7 @@ |
| ... | ... | @@ -21807,7 +21807,7 @@ index 81560f75bfa7..7dfae2667f50 100644 |
| 21807 | 21807 | / { |
| 21808 | 21808 | 	model = "UniPhier PXs2 Gentil Board"; |
| 21809 | 21809 | diff --git a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts |
| 21810 | | index dc2d0579c666..0cf615463a82 100644 |
| 21810 | index dc2d0579c666126ce61a14fcf6b602d80bd19256..0cf615463a82fcbc20941410bb99cfa55b614caf 100644 |
| 21811 | 21811 | --- a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts |
| 21812 | 21812 | +++ b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts |
| 21813 | 21813 | @@ -8,7 +8,7 @@ |
| ... | ... | @@ -21820,7 +21820,7 @@ index dc2d0579c666..0cf615463a82 100644 |
| 21820 | 21820 | / { |
| 21821 | 21821 | 	model = "UniPhier PXs2 Vodka Board"; |
| 21822 | 21822 | diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi |
| 21823 | | index bace751d4023..90b020c95083 100644 |
| 21823 | index bace751d40239e9a477d5af51f11161664c7df06..90b020c950837d5d0c9d2a43d74d4a2c208b7463 100644 |
| 21824 | 21824 | --- a/arch/arm/boot/dts/uniphier-pxs2.dtsi |
| 21825 | 21825 | +++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi |
| 21826 | 21826 | @@ -276,7 +276,7 @@ smpctrl@59801000 { |
| ... | ... | @@ -21868,7 +21868,7 @@ index bace751d4023..90b020c95083 100644 |
| 21868 | 21868 | +#include "uniphier-pinctrl.dtsi" |
| 21869 | 21869 | diff --git a/arch/arm/boot/dts/uniphier-sld3-ref.dts b/arch/arm/boot/dts/uniphier-sld3-ref.dts |
| 21870 | 21870 | deleted file mode 100644 |
| 21871 | | index 70cda39a3dd2..000000000000 |
| 21871 | index 70cda39a3dd2d41962160a47f6266d2e9e4330c1..0000000000000000000000000000000000000000 |
| 21872 | 21872 | --- a/arch/arm/boot/dts/uniphier-sld3-ref.dts |
| 21873 | 21873 | +++ /dev/null |
| 21874 | 21874 | @@ -1,75 +0,0 @@ |
| ... | ... | @@ -21949,7 +21949,7 @@ index 70cda39a3dd2..000000000000 |
| 21949 | 21949 | -}; |
| 21950 | 21950 | diff --git a/arch/arm/boot/dts/uniphier-sld3.dtsi b/arch/arm/boot/dts/uniphier-sld3.dtsi |
| 21951 | 21951 | deleted file mode 100644 |
| 21952 | | index 408287936613..000000000000 |
| 21952 | index 408287936613c78684a719a9af8596c78338c4d6..0000000000000000000000000000000000000000 |
| 21953 | 21953 | --- a/arch/arm/boot/dts/uniphier-sld3.dtsi |
| 21954 | 21954 | +++ /dev/null |
| 21955 | 21955 | @@ -1,260 +0,0 @@ |
| ... | ... | @@ -22214,7 +22214,7 @@ index 408287936613..000000000000 |
| 22214 | 22214 | -	}; |
| 22215 | 22215 | -}; |
| 22216 | 22216 | diff --git a/arch/arm/boot/dts/uniphier-sld8-ref.dts b/arch/arm/boot/dts/uniphier-sld8-ref.dts |
| 22217 | | index 4536d5b71297..5accd3cc76e4 100644 |
| 22217 | index 4536d5b7129796f188dd95c0f68a28aca3cb2b5f..5accd3cc76e4aaee7471f0ce7542bfc7eb6d1ac9 100644 |
| 22218 | 22218 | --- a/arch/arm/boot/dts/uniphier-sld8-ref.dts |
| 22219 | 22219 | +++ b/arch/arm/boot/dts/uniphier-sld8-ref.dts |
| 22220 | 22220 | @@ -8,9 +8,9 @@ |
| ... | ... | @@ -22239,7 +22239,7 @@ index 4536d5b71297..5accd3cc76e4 100644 |
| 22239 | 22239 | +	status = "okay"; |
| 22240 | 22240 | +}; |
| 22241 | 22241 | diff --git a/arch/arm/boot/dts/uniphier-sld8.dtsi b/arch/arm/boot/dts/uniphier-sld8.dtsi |
| 22242 | | index 9fb9167f2db4..b08390332971 100644 |
| 22242 | index 9fb9167f2db43d9e8a99adc679003847d38646e5..b0839033297169272ed3688cb352385920a41ea1 100644 |
| 22243 | 22243 | --- a/arch/arm/boot/dts/uniphier-sld8.dtsi |
| 22244 | 22244 | +++ b/arch/arm/boot/dts/uniphier-sld8.dtsi |
| 22245 | 22245 | @@ -270,6 +270,13 @@ intc: interrupt-controller@60001000 { |
| ... | ... | @@ -22277,7 +22277,7 @@ index 9fb9167f2db4..b08390332971 100644 |
| 22277 | 22277 | -/include/ "uniphier-pinctrl.dtsi" |
| 22278 | 22278 | +#include "uniphier-pinctrl.dtsi" |
| 22279 | 22279 | diff --git a/arch/arm/boot/dts/versatile-pb.dts b/arch/arm/boot/dts/versatile-pb.dts |
| 22280 | | index 06e2331f666d..9abe26028c8b 100644 |
| 22280 | index 06e2331f666d45fb2a2432ac1ef5401c3c50e37d..9abe26028c8b835b987892445157d148f0b24c57 100644 |
| 22281 | 22281 | --- a/arch/arm/boot/dts/versatile-pb.dts |
| 22282 | 22282 | +++ b/arch/arm/boot/dts/versatile-pb.dts |
| 22283 | 22283 | @@ -39,7 +39,7 @@ gpio3: gpio@101e7000 { |
| ... | ... | @@ -22290,7 +22290,7 @@ index 06e2331f666d..9abe26028c8b 100644 |
| 22290 | 22290 | 			device_type = "pci"; |
| 22291 | 22291 | 			reg = <0x10001000 0x1000 |
| 22292 | 22292 | diff --git a/arch/arm/boot/dts/zx296702-ad1.dts b/arch/arm/boot/dts/zx296702-ad1.dts |
| 22293 | | index 081f980cfbe6..b0183c3a1d7c 100644 |
| 22293 | index 081f980cfbe628426e1d2c6b5efb8a272fe766e8..b0183c3a1d7c4627b008278e6290fbe908d0c6df 100644 |
| 22294 | 22294 | --- a/arch/arm/boot/dts/zx296702-ad1.dts |
| 22295 | 22295 | +++ b/arch/arm/boot/dts/zx296702-ad1.dts |
| 22296 | 22296 | @@ -18,7 +18,6 @@ memory { |
| ... | ... | @@ -22310,7 +22310,7 @@ index 081f980cfbe6..b0183c3a1d7c 100644 |
| 22310 | 22310 | 	non-removable; |
| 22311 | 22311 | 	disable-wp; |
| 22312 | 22312 | diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi |
| 22313 | | index f3ac9bfe580e..0f79fe1ccd9d 100644 |
| 22313 | index f3ac9bfe580ea27a1e82a3d360c05f89490c3161..0f79fe1ccd9d99e5fae27d275e94ae3c214ef77a 100644 |
| 22314 | 22314 | --- a/arch/arm/boot/dts/zynq-7000.dtsi |
| 22315 | 22315 | +++ b/arch/arm/boot/dts/zynq-7000.dtsi |
| 22316 | 22316 | @@ -42,6 +42,14 @@ cpu1: cpu@1 { |
| ... | ... | @@ -22329,7 +22329,7 @@ index f3ac9bfe580e..0f79fe1ccd9d 100644 |
| 22329 | 22329 | 		compatible = "arm,cortex-a9-pmu"; |
| 22330 | 22330 | 		interrupts = <0 5 4>, <0 6 4>; |
| 22331 | 22331 | diff --git a/arch/arm/boot/dts/zynq-parallella.dts b/arch/arm/boot/dts/zynq-parallella.dts |
| 22332 | | index 64a6390fc501..0144acfa9793 100644 |
| 22332 | index 64a6390fc5017bdd111a88947e736fd1364b85ef..0144acfa97936e1c829c539d6c148df3d423ce3d 100644 |
| 22333 | 22333 | --- a/arch/arm/boot/dts/zynq-parallella.dts |
| 22334 | 22334 | +++ b/arch/arm/boot/dts/zynq-parallella.dts |
| 22335 | 22335 | @@ -34,7 +34,7 @@ memory@0 { |
| ... | ... | @@ -22350,7 +22350,7 @@ index 64a6390fc501..0144acfa9793 100644 |
| 22350 | 22350 | 		 <0x3 0x11 0xfff0 0xa>; |
| 22351 | 22351 | 	}; |
| 22352 | 22352 | diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts |
| 22353 | | index 0cdad2cc8b78..34e8277fce0d 100644 |
| 22353 | index 0cdad2cc8b78678c63b1ca06a5dec22f76527ae0..34e8277fce0d36a875cccb1278a9c016236b53d0 100644 |
| 22354 | 22354 | --- a/arch/arm/boot/dts/zynq-zc702.dts |
| 22355 | 22355 | +++ b/arch/arm/boot/dts/zynq-zc702.dts |
| 22356 | 22356 | @@ -12,7 +12,7 @@ |
| ... | ... | @@ -22402,7 +22402,7 @@ index 0cdad2cc8b78..34e8277fce0d 100644 |
| 22402 | 22402 | 			#address-cells = <1>; |
| 22403 | 22403 | 			#size-cells = <0>; |
| 22404 | 22404 | diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts |
| 22405 | | index ad4bb06dba25..7ebc8c5ae39d 100644 |
| 22405 | index ad4bb06dba251d15bd282b9d7ee7a04185c7d201..7ebc8c5ae39dce63ce99add3fea8e4eea121d924 100644 |
| 22406 | 22406 | --- a/arch/arm/boot/dts/zynq-zc706.dts |
| 22407 | 22407 | +++ b/arch/arm/boot/dts/zynq-zc706.dts |
| 22408 | 22408 | @@ -12,7 +12,7 @@ |
| ... | ... | @@ -22454,7 +22454,7 @@ index ad4bb06dba25..7ebc8c5ae39d 100644 |
| 22454 | 22454 | 			#address-cells = <1>; |
| 22455 | 22455 | 			#size-cells = <0>; |
| 22456 | 22456 | diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zed.dts |
| 22457 | | index 325379f7983c..5e44dc12fd60 100644 |
| 22457 | index 325379f7983cd386af42aeafb758a1c22895d622..5e44dc12fd60a5d00a622d079e6776d100de05dd 100644 |
| 22458 | 22458 | --- a/arch/arm/boot/dts/zynq-zed.dts |
| 22459 | 22459 | +++ b/arch/arm/boot/dts/zynq-zed.dts |
| 22460 | 22460 | @@ -12,7 +12,7 @@ |
| ... | ... | @@ -22484,7 +22484,7 @@ index 325379f7983c..5e44dc12fd60 100644 |
| 22484 | 22484 | }; |
| 22485 | 22485 | |
| 22486 | 22486 | diff --git a/arch/arm/boot/dts/zynq-zybo.dts b/arch/arm/boot/dts/zynq-zybo.dts |
| 22487 | | index 590ec24b8749..e40cafc5ee5b 100644 |
| 22487 | index 590ec24b8749649d1d4e6660c887e2d3448161af..e40cafc5ee5b638c7371709d51241bc5d8a1c5fe 100644 |
| 22488 | 22488 | --- a/arch/arm/boot/dts/zynq-zybo.dts |
| 22489 | 22489 | +++ b/arch/arm/boot/dts/zynq-zybo.dts |
| 22490 | 22490 | @@ -12,7 +12,7 @@ |
| ... | ... | @@ -22514,7 +22514,7 @@ index 590ec24b8749..e40cafc5ee5b 100644 |
| 22514 | 22514 | }; |
| 22515 | 22515 | |
| 22516 | 22516 | diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms |
| 22517 | | index b65a7e876a26..6b54ee8c1262 100644 |
| 22517 | index b65a7e876a268a668099aecb4001ce41e62d0b88..6b54ee8c1262dd1587b9081ef8894166b0c14211 100644 |
| 22518 | 22518 | --- a/arch/arm64/Kconfig.platforms |
| 22519 | 22519 | +++ b/arch/arm64/Kconfig.platforms |
| 22520 | 22520 | @@ -184,6 +184,12 @@ config ARCH_R8A7796 |
| ... | ... | @@ -22531,7 +22531,7 @@ index b65a7e876a26..6b54ee8c1262 100644 |
| 22531 | 22531 | 	bool "Altera's Stratix 10 SoCFPGA Family" |
| 22532 | 22532 | 	help |
| 22533 | 22533 | diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile |
| 22534 | | index 108f12ce6d1d..19c3fbd75eda 100644 |
| 22534 | index 108f12ce6d1d0706900d46533b9dd3cb33bb368f..19c3fbd75eda663b9a3ed61993ed353bf465cc0f 100644 |
| 22535 | 22535 | --- a/arch/arm64/boot/dts/allwinner/Makefile |
| 22536 | 22536 | +++ b/arch/arm64/boot/dts/allwinner/Makefile |
| 22537 | 22537 | @@ -1,4 +1,6 @@ |
| ... | ... | @@ -22543,7 +22543,7 @@ index 108f12ce6d1d..19c3fbd75eda 100644 |
| 22543 | 22543 | dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-sopine-baseboard.dtb |
| 22544 | 22544 | diff --git a/arch/arm64/boot/dts/allwinner/axp803.dtsi b/arch/arm64/boot/dts/allwinner/axp803.dtsi |
| 22545 | 22545 | new file mode 100644 |
| 22546 | | index 000000000000..ff8af52743ff |
| 22546 | index 0000000000000000000000000000000000000000..ff8af52743ff4c2e714e233d5fd21e38d4c2d9f9 |
| 22547 | 22547 | --- /dev/null |
| 22548 | 22548 | +++ b/arch/arm64/boot/dts/allwinner/axp803.dtsi |
| 22549 | 22549 | @@ -0,0 +1,150 @@ |
| ... | ... | @@ -22698,7 +22698,7 @@ index 000000000000..ff8af52743ff |
| 22698 | 22698 | +	}; |
| 22699 | 22699 | +}; |
| 22700 | 22700 | diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts |
| 22701 | | index 6872135d7f84..d347f52e27f6 100644 |
| 22701 | index 6872135d7f849b1df7e0529b9b95d2b0d9c86478..d347f52e27f6070ebf79a5f6fe890feecee2a94b 100644 |
| 22702 | 22702 | --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts |
| 22703 | 22703 | +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts |
| 22704 | 22704 | @@ -59,14 +59,16 @@ chosen { |
| ... | ... | @@ -22888,7 +22888,7 @@ index 6872135d7f84..d347f52e27f6 100644 |
| 22888 | 22888 | +}; |
| 22889 | 22889 | diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts |
| 22890 | 22890 | new file mode 100644 |
| 22891 | | index 000000000000..2beef9e6cb88 |
| 22891 | index 0000000000000000000000000000000000000000..2beef9e6cb885c0cfd6774175910735e9faa78f7 |
| 22892 | 22892 | --- /dev/null |
| 22893 | 22893 | +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts |
| 22894 | 22894 | @@ -0,0 +1,207 @@ |
| ... | ... | @@ -23101,7 +23101,7 @@ index 000000000000..2beef9e6cb88 |
| 23101 | 23101 | +}; |
| 23102 | 23102 | diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts |
| 23103 | 23103 | new file mode 100644 |
| 23104 | | index 000000000000..338e786155b1 |
| 23104 | index 0000000000000000000000000000000000000000..338e786155b1f77f4bd206d30c02445125c5967e |
| 23105 | 23105 | --- /dev/null |
| 23106 | 23106 | +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts |
| 23107 | 23107 | @@ -0,0 +1,199 @@ |
| ... | ... | @@ -23305,7 +23305,7 @@ index 000000000000..338e786155b1 |
| 23305 | 23305 | +	status = "okay"; |
| 23306 | 23306 | +}; |
| 23307 | 23307 | diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts |
| 23308 | | index 7c533b6d4ba9..caf8b6fbe5e3 100644 |
| 23308 | index 7c533b6d4ba9abb3c48ae7ce04e1e5fac0e647c3..caf8b6fbe5e350de2095d16489f19ce734ca4bc3 100644 |
| 23309 | 23309 | --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts |
| 23310 | 23310 | +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts |
| 23311 | 23311 | @@ -107,6 +107,118 @@ &ohci1 { |
| ... | ... | @@ -23428,7 +23428,7 @@ index 7c533b6d4ba9..caf8b6fbe5e3 100644 |
| 23428 | 23428 | &uart0 { |
| 23429 | 23429 | 	pinctrl-names = "default"; |
| 23430 | 23430 | diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts |
| 23431 | | index d891a1a27f6c..17ccc12b58df 100644 |
| 23431 | index d891a1a27f6c56f7a1d1a9a09fba0d27012fa1a3..17ccc12b58df7057ebf695b8c3e4696c7dbbd868 100644 |
| 23432 | 23432 | --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts |
| 23433 | 23433 | +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts |
| 23434 | 23434 | @@ -95,6 +95,28 @@ &ohci1 { |
| ... | ... | @@ -23461,7 +23461,7 @@ index d891a1a27f6c..17ccc12b58df 100644 |
| 23461 | 23461 | 	pinctrl-names = "default"; |
| 23462 | 23462 | 	pinctrl-0 = <&uart0_pins_a>; |
| 23463 | 23463 | diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi |
| 23464 | | index 475518b031dd..a5da18a6f286 100644 |
| 23464 | index 475518b031dd811269c2e1c1616056f877197af8..a5da18a6f2866d34537c55dcc5d3288daf6c8331 100644 |
| 23465 | 23465 | --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi |
| 23466 | 23466 | +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi |
| 23467 | 23467 | @@ -63,3 +63,89 @@ &mmc0 { |
| ... | ... | @@ -23555,7 +23555,7 @@ index 475518b031dd..a5da18a6f286 100644 |
| 23555 | 23555 | +	regulator-name = "vcc-rtc"; |
| 23556 | 23556 | +}; |
| 23557 | 23557 | diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi |
| 23558 | | index 68aadc9b96dc..8c8db1b057df 100644 |
| 23558 | index 68aadc9b96dc1ea2e7c26e658e0056d4f38ba4f9..8c8db1b057dfc687aa5bcabce4732cc3653bebbd 100644 |
| 23559 | 23559 | --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi |
| 23560 | 23560 | +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi |
| 23561 | 23561 | @@ -467,6 +467,15 @@ rtc: rtc@1f00000 { |
| ... | ... | @@ -23575,7 +23575,7 @@ index 68aadc9b96dc..8c8db1b057df 100644 |
| 23575 | 23575 | 			compatible = "allwinner,sun50i-a64-r-ccu"; |
| 23576 | 23576 | 			reg = <0x01f01400 0x100>; |
| 23577 | 23577 | diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi |
| 23578 | | index dc478d094c11..c89010e56488 100644 |
| 23578 | index dc478d094c113a3b9ce1a7dd13d4352cbd1a4353..c89010e564888ee76f0f2764a10592fb59ab7672 100644 |
| 23579 | 23579 | --- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi |
| 23580 | 23580 | +++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi |
| 23581 | 23581 | @@ -121,6 +121,13 @@ hdmi_connector_in: endpoint { |
| ... | ... | @@ -23593,7 +23593,7 @@ index dc478d094c11..c89010e56488 100644 |
| 23593 | 23593 | 	cvbs_vdac_out: endpoint { |
| 23594 | 23594 | 		remote-endpoint = <&cvbs_connector_in>; |
| 23595 | 23595 | diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi |
| 23596 | | index 738ed689ff69..f175db846286 100644 |
| 23596 | index 738ed689ff692b0f16b9add648f9f32dd514d010..f175db84628612044517ad32987aadb3f2cf2d45 100644 |
| 23597 | 23597 | --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi |
| 23598 | 23598 | +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi |
| 23599 | 23599 | @@ -225,7 +225,7 @@ reset: reset-controller@4404 { |
| ... | ... | @@ -23696,7 +23696,7 @@ index 738ed689ff69..f175db846286 100644 |
| 23696 | 23696 | 			status = "disabled"; |
| 23697 | 23697 | 		}; |
| 23698 | 23698 | diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts |
| 23699 | | index fa462831ccaf..9697a7a79464 100644 |
| 23699 | index fa462831ccaf45b86dd6625961d8d1928537eaff..9697a7a794644bdfd5e7dbedfa6f71dcd8451e24 100644 |
| 23700 | 23700 | --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts |
| 23701 | 23701 | +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts |
| 23702 | 23702 | @@ -175,6 +175,64 @@ &ir { |
| ... | ... | @@ -23765,7 +23765,7 @@ index fa462831ccaf..9697a7a79464 100644 |
| 23765 | 23765 | 	status = "okay"; |
| 23766 | 23766 | 	pinctrl-0 = <&pwm_e_pins>; |
| 23767 | 23767 | diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts |
| 23768 | | index a1078b3e1c76..9c59c3c6d1b6 100644 |
| 23768 | index a1078b3e1c760d2a1eeb7d8a70c906d25ca5a23e..9c59c3c6d1b6a5d2e3d8cd9d234caef971b352c3 100644 |
| 23769 | 23769 | --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts |
| 23770 | 23770 | +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts |
| 23771 | 23771 | @@ -171,6 +171,13 @@ cvbs_vdac_out: endpoint { |
| ... | ... | @@ -23783,7 +23783,7 @@ index a1078b3e1c76..9c59c3c6d1b6 100644 |
| 23783 | 23783 | 	status = "okay"; |
| 23784 | 23784 | 	pinctrl-0 = <&eth_rmii_pins>; |
| 23785 | 23785 | diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi |
| 23786 | | index d904deb1018c..81ffc689a5bf 100644 |
| 23786 | index d904deb1018cefa602764167219d5ee3a82a385a..81ffc689a5bf42532f25706545b1f84cb5dcdbac 100644 |
| 23787 | 23787 | --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi |
| 23788 | 23788 | +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi |
| 23789 | 23789 | @@ -84,6 +84,9 @@ vddio_card: gpio-regulator { |
| ... | ... | @@ -23811,7 +23811,7 @@ index d904deb1018c..81ffc689a5bf 100644 |
| 23811 | 23811 | 	cvbs_vdac_out: endpoint { |
| 23812 | 23812 | 		remote-endpoint = <&cvbs_connector_in>; |
| 23813 | 23813 | diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts |
| 23814 | | index e76ac313fef9..f7144fd5e03f 100644 |
| 23814 | index e76ac313fef9cfb1ea97d4dc5c131d559a12d883..f7144fd5e03f43aa29288178980f75ab49c08d6e 100644 |
| 23815 | 23815 | --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts |
| 23816 | 23816 | +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts |
| 23817 | 23817 | @@ -108,6 +108,12 @@ hdmi_connector_in: endpoint { |
| ... | ... | @@ -23828,7 +23828,7 @@ index e76ac313fef9..f7144fd5e03f 100644 |
| 23828 | 23828 | &cvbs_vdac_port { |
| 23829 | 23829 | 	cvbs_vdac_out: endpoint { |
| 23830 | 23830 | diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi |
| 23831 | | index 17d3efdf1469..52f1687e7a09 100644 |
| 23831 | index 17d3efdf146968b9ea60a47ec10045e49be6a4d8..52f1687e7a099af5789ed97e3597b727a8ee4d82 100644 |
| 23832 | 23832 | --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi |
| 23833 | 23833 | +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi |
| 23834 | 23834 | @@ -307,6 +307,15 @@ spifc: spi@8c80 { |
| ... | ... | @@ -23880,7 +23880,7 @@ index 17d3efdf1469..52f1687e7a09 100644 |
| 23880 | 23880 | 	compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-vpu"; |
| 23881 | 23881 | }; |
| 23882 | 23882 | diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts |
| 23883 | | index 3e0c023d6abd..6827f235d7cf 100644 |
| 23883 | index 3e0c023d6abde14afa98381e02c3f1dec0c271e4..6827f235d7cfe9a94fe5fe872e01dc1256077637 100644 |
| 23884 | 23884 | --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts |
| 23885 | 23885 | +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts |
| 23886 | 23886 | @@ -97,6 +97,13 @@ hdmi_connector_in: endpoint { |
| ... | ... | @@ -23906,7 +23906,7 @@ index 3e0c023d6abd..6827f235d7cf 100644 |
| 23906 | 23906 | 	status = "okay"; |
| 23907 | 23907 | 	pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; |
| 23908 | 23908 | diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts |
| 23909 | | index 94567eb17875..edc512ad0bac 100644 |
| 23909 | index 94567eb178759c18162c276baa4ba481f903c064..edc512ad0bac3d5794d669dc0d21da6e266afda5 100644 |
| 23910 | 23910 | --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts |
| 23911 | 23911 | +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts |
| 23912 | 23912 | @@ -67,6 +67,13 @@ hdmi_connector_in: endpoint { |
| ... | ... | @@ -23987,7 +23987,7 @@ index 94567eb17875..edc512ad0bac 100644 |
| 23987 | 23987 | 	status = "okay"; |
| 23988 | 23988 | 	pinctrl-0 = <&pwm_ao_a_3_pins>, <&pwm_ao_b_pins>; |
| 23989 | 23989 | diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts |
| 23990 | | index 266fbcf3e47f..69ca14ac10fa 100644 |
| 23990 | index 266fbcf3e47f5640b565c09fae289003b7b9e679..69ca14ac10fa097633562cb96db4f088e543ebd9 100644 |
| 23991 | 23991 | --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts |
| 23992 | 23992 | +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts |
| 23993 | 23993 | @@ -101,6 +101,13 @@ vddio_boot: regulator-vddio_boot { |
| ... | ... | @@ -24069,7 +24069,7 @@ index 266fbcf3e47f..69ca14ac10fa 100644 |
| 24069 | 24069 | &sd_emmc_b { |
| 24070 | 24070 | 	status = "okay"; |
| 24071 | 24071 | diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts |
| 24072 | | index 6633a5d8fdd3..4c2ac7650fcd 100644 |
| 24072 | index 6633a5d8fdd39193be747582e8facc8a581a9486..4c2ac7650fcd3317a673efdd7308891a154272d8 100644 |
| 24073 | 24073 | --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts |
| 24074 | 24074 | +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts |
| 24075 | 24075 | @@ -140,6 +140,13 @@ hdmi_connector_in: endpoint { |
| ... | ... | @@ -24087,7 +24087,7 @@ index 6633a5d8fdd3..4c2ac7650fcd 100644 |
| 24087 | 24087 | 	cvbs_vdac_out: endpoint { |
| 24088 | 24088 | 		remote-endpoint = <&cvbs_connector_in>; |
| 24089 | 24089 | diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts |
| 24090 | | index 6ab17c1eeefd..6e2bf858291c 100644 |
| 24090 | index 6ab17c1eeefdc198f7e4417baa780935b885c6c5..6e2bf858291c5f58b0268200c1a014554d24a59d 100644 |
| 24091 | 24091 | --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts |
| 24092 | 24092 | +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts |
| 24093 | 24093 | @@ -71,6 +71,13 @@ hdmi_connector_in: endpoint { |
| ... | ... | @@ -24105,7 +24105,7 @@ index 6ab17c1eeefd..6e2bf858291c 100644 |
| 24105 | 24105 | 	cvbs_vdac_out: endpoint { |
| 24106 | 24106 | 		remote-endpoint = <&cvbs_connector_in>; |
| 24107 | 24107 | diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi |
| 24108 | | index 8d4f3160a0ee..d6876e64979e 100644 |
| 24108 | index 8d4f3160a0eefa1220e48541eb8e117441ed6c42..d6876e64979e7a5c5d539dc3eba7006fe4d79315 100644 |
| 24109 | 24109 | --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi |
| 24110 | 24110 | +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi |
| 24111 | 24111 | @@ -43,6 +43,7 @@ |
| ... | ... | @@ -24165,7 +24165,7 @@ index 8d4f3160a0ee..d6876e64979e 100644 |
| 24165 | 24165 | 	compatible = "amlogic,meson-gxl-vpu", "amlogic,meson-gx-vpu"; |
| 24166 | 24166 | }; |
| 24167 | 24167 | diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts |
| 24168 | | index 5f626d683088..9b10c5f4f8c0 100644 |
| 24168 | index 5f626d6830883466b80b9364547efcf066f6317b..9b10c5f4f8c0311af38380f7d5c4c2a0e709e747 100644 |
| 24169 | 24169 | --- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts |
| 24170 | 24170 | +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts |
| 24171 | 24171 | @@ -113,6 +113,13 @@ hdmi_connector_in: endpoint { |
| ... | ... | @@ -24183,7 +24183,7 @@ index 5f626d683088..9b10c5f4f8c0 100644 |
| 24183 | 24183 | 	cvbs_vdac_out: endpoint { |
| 24184 | 24184 | 		remote-endpoint = <&cvbs_connector_in>; |
| 24185 | 24185 | diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi |
| 24186 | | index fe451cce93e7..19a798d2ae2f 100644 |
| 24186 | index fe451cce93e783ce12b857117ab6c3eaa84a9108..19a798d2ae2fdd61a2c3e708dea2b1d59f71e061 100644 |
| 24187 | 24187 | --- a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi |
| 24188 | 24188 | +++ b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi |
| 24189 | 24189 | @@ -117,6 +117,10 @@ cpu7: cpu@103 { |
| ... | ... | @@ -24198,7 +24198,7 @@ index fe451cce93e7..19a798d2ae2f 100644 |
| 24198 | 24198 | 	compatible = "amlogic,meson-gxm-saradc", "amlogic,meson-saradc"; |
| 24199 | 24199 | }; |
| 24200 | 24200 | diff --git a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi |
| 24201 | | index 72720e9132a1..c9ffffb96e43 100644 |
| 24201 | index 72720e9132a1de4b85a53f55e5a85a95eb4c423a..c9ffffb96e431ec8d4ed875e40c33f901466b7d4 100644 |
| 24202 | 24202 | --- a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi |
| 24203 | 24203 | +++ b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi |
| 24204 | 24204 | @@ -626,6 +626,7 @@ pcie0: pcie@1f2b0000 { |
| ... | ... | @@ -24218,7 +24218,7 @@ index 72720e9132a1..c9ffffb96e43 100644 |
| 24218 | 24218 | 			interrupt-map = <0x0 0x0 0x0 0x1 &gic 0x0 0x0 0x0 0x16 0x4 |
| 24219 | 24219 | 					 0x0 0x0 0x0 0x2 &gic 0x0 0x0 0x0 0x17 0x4 |
| 24220 | 24220 | diff --git a/arch/arm64/boot/dts/apm/apm-storm.dtsi b/arch/arm64/boot/dts/apm/apm-storm.dtsi |
| 24221 | | index 63be8e51eaa8..c09a36fed917 100644 |
| 24221 | index 63be8e51eaa8624e4006e1fceda8387d61fd7ce4..c09a36fed91701be7407d6ec42584d88ad511144 100644 |
| 24222 | 24222 | --- a/arch/arm64/boot/dts/apm/apm-storm.dtsi |
| 24223 | 24223 | +++ b/arch/arm64/boot/dts/apm/apm-storm.dtsi |
| 24224 | 24224 | @@ -626,6 +626,7 @@ pcie0: pcie@1f2b0000 { |
| ... | ... | @@ -24262,7 +24262,7 @@ index 63be8e51eaa8..c09a36fed917 100644 |
| 24262 | 24262 | 			interrupt-map = <0x0 0x0 0x0 0x1 &gic 0x0 0xda 0x4 |
| 24263 | 24263 | 					 0x0 0x0 0x0 0x2 &gic 0x0 0xdb 0x4 |
| 24264 | 24264 | diff --git a/arch/arm64/boot/dts/arm/foundation-v8.dtsi b/arch/arm64/boot/dts/arm/foundation-v8.dtsi |
| 24265 | | index 7cfa8e414e7f..8ecdd4331980 100644 |
| 24265 | index 7cfa8e414e7f5111d9c676ee3bc9c6c2fbe8941d..8ecdd4331980e448f6a5c23ad2785cbfd19a9a10 100644 |
| 24266 | 24266 | --- a/arch/arm64/boot/dts/arm/foundation-v8.dtsi |
| 24267 | 24267 | +++ b/arch/arm64/boot/dts/arm/foundation-v8.dtsi |
| 24268 | 24268 | @@ -226,7 +226,7 @@ v2m_serial3: uart@0c0000 { |
| ... | ... | @@ -24275,7 +24275,7 @@ index 7cfa8e414e7f..8ecdd4331980 100644 |
| 24275 | 24275 | 				reg = <0x130000 0x200>; |
| 24276 | 24276 | 				interrupts = <42>; |
| 24277 | 24277 | diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi |
| 24278 | | index e8b7413ec890..fbafe62d6b22 100644 |
| 24278 | index e8b7413ec890b8fc88f1fb62d691d7ffcdae8570..fbafe62d6b22deaf3bc22b361c80d38a876f8d34 100644 |
| 24279 | 24279 | --- a/arch/arm64/boot/dts/arm/juno-base.dtsi |
| 24280 | 24280 | +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi |
| 24281 | 24281 | @@ -201,7 +201,7 @@ stm_out_port: endpoint { |
| ... | ... | @@ -24342,7 +24342,7 @@ index e8b7413ec890..fbafe62d6b22 100644 |
| 24342 | 24342 | |
| 24343 | 24343 | 		clocks = <&soc_smc50mhz>; |
| 24344 | 24344 | diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi |
| 24345 | | index 161ac98418a3..528875c75598 100644 |
| 24345 | index 161ac98418a301ef11eafb7dd3539280cad4e9d9..528875c7559871720d0577867737f3c0987ff1f7 100644 |
| 24346 | 24346 | --- a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi |
| 24347 | 24347 | +++ b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi |
| 24348 | 24348 | @@ -219,7 +219,7 @@ panel-timing { |
| ... | ... | @@ -24355,7 +24355,7 @@ index 161ac98418a3..528875c75598 100644 |
| 24355 | 24355 | 				reg = <0x130000 0x200>; |
| 24356 | 24356 | 				interrupts = <42>; |
| 24357 | 24357 | diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile |
| 24358 | | index f11bdd6689ea..3eaef3895d66 100644 |
| 24358 | index f11bdd6689ea96b2fce04404ae2166349c7d2c26..3eaef3895d663b150fcbe4b2974c8548620cbf12 100644 |
| 24359 | 24359 | --- a/arch/arm64/boot/dts/broadcom/Makefile |
| 24360 | 24360 | +++ b/arch/arm64/boot/dts/broadcom/Makefile |
| 24361 | 24361 | @@ -1,7 +1,7 @@ |
| ... | ... | @@ -24370,14 +24370,14 @@ index f11bdd6689ea..3eaef3895d66 100644 |
| 24370 | 24370 | clean-files	:= *.dtb |
| 24371 | 24371 | diff --git a/arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi b/arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi |
| 24372 | 24372 | deleted file mode 120000 |
| 24373 | | index 3937b77cb310..000000000000 |
| 24373 | index 3937b77cb310335840d92e4d0d9e085b63d32ecb..0000000000000000000000000000000000000000 |
| 24374 | 24374 | --- a/arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi |
| 24375 | 24375 | +++ /dev/null |
| 24376 | 24376 | @@ -1 +0,0 @@ |
| 24377 | 24377 | -../../../../arm/boot/dts/bcm2835-rpi.dtsi |
| 24378 | 24378 | \ No newline at end of file |
| 24379 | 24379 | diff --git a/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts b/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts |
| 24380 | | index 972f14db28ac..699d340a3437 100644 |
| 24380 | index 972f14db28accd1f25e5d5cd9d7ce2854c9976c8..699d340a3437eaaca7b56d4124706c1533d1eacf 100644 |
| 24381 | 24381 | --- a/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts |
| 24382 | 24382 | +++ b/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts |
| 24383 | 24383 | @@ -1,41 +1 @@ |
| ... | ... | @@ -24425,7 +24425,7 @@ index 972f14db28ac..699d340a3437 100644 |
| 24425 | 24425 | +#include "arm/bcm2837-rpi-3-b.dts" |
| 24426 | 24426 | diff --git a/arch/arm64/boot/dts/broadcom/bcm2837.dtsi b/arch/arm64/boot/dts/broadcom/bcm2837.dtsi |
| 24427 | 24427 | deleted file mode 100644 |
| 24428 | | index 2d5de6f0f78d..000000000000 |
| 24428 | index 2d5de6f0f78d5be78559477f18f0940bba3e5a15..0000000000000000000000000000000000000000 |
| 24429 | 24429 | --- a/arch/arm64/boot/dts/broadcom/bcm2837.dtsi |
| 24430 | 24430 | +++ /dev/null |
| 24431 | 24431 | @@ -1,86 +0,0 @@ |
| ... | ... | @@ -24517,7 +24517,7 @@ index 2d5de6f0f78d..000000000000 |
| 24517 | 24517 | -}; |
| 24518 | 24518 | diff --git a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi |
| 24519 | 24519 | deleted file mode 120000 |
| 24520 | | index dca7c057d5a5..000000000000 |
| 24520 | index dca7c057d5a573f572da3cd91ee61df988aa95a0..0000000000000000000000000000000000000000 |
| 24521 | 24521 | --- a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi |
| 24522 | 24522 | +++ /dev/null |
| 24523 | 24523 | @@ -1 +0,0 @@ |
| ... | ... | @@ -24525,7 +24525,7 @@ index dca7c057d5a5..000000000000 |
| 24525 | 24525 | \ No newline at end of file |
| 24526 | 24526 | diff --git a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi |
| 24527 | 24527 | deleted file mode 120000 |
| 24528 | | index cbeebe312ff8..000000000000 |
| 24528 | index cbeebe312ff89553fe25ac55a6589331de79399f..0000000000000000000000000000000000000000 |
| 24529 | 24529 | --- a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi |
| 24530 | 24530 | +++ /dev/null |
| 24531 | 24531 | @@ -1 +0,0 @@ |
| ... | ... | @@ -24533,7 +24533,7 @@ index cbeebe312ff8..000000000000 |
| 24533 | 24533 | \ No newline at end of file |
| 24534 | 24534 | diff --git a/arch/arm64/boot/dts/broadcom/bcm283x.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x.dtsi |
| 24535 | 24535 | deleted file mode 120000 |
| 24536 | | index 5f54e4cab99b..000000000000 |
| 24536 | index 5f54e4cab99bb3253634be7907e6706ab2d9bd67..0000000000000000000000000000000000000000 |
| 24537 | 24537 | --- a/arch/arm64/boot/dts/broadcom/bcm283x.dtsi |
| 24538 | 24538 | +++ /dev/null |
| 24539 | 24539 | @@ -1 +0,0 @@ |
| ... | ... | @@ -24541,7 +24541,7 @@ index 5f54e4cab99b..000000000000 |
| 24541 | 24541 | \ No newline at end of file |
| 24542 | 24542 | diff --git a/arch/arm64/boot/dts/broadcom/northstar2/Makefile b/arch/arm64/boot/dts/broadcom/northstar2/Makefile |
| 24543 | 24543 | new file mode 100644 |
| 24544 | | index 000000000000..e01a1485b813 |
| 24544 | index 0000000000000000000000000000000000000000..e01a1485b813ea5cf57ab12efb9875d77ee58724 |
| 24545 | 24545 | --- /dev/null |
| 24546 | 24546 | +++ b/arch/arm64/boot/dts/broadcom/northstar2/Makefile |
| 24547 | 24547 | @@ -0,0 +1,6 @@ |
| ... | ... | @@ -24553,7 +24553,7 @@ index 000000000000..e01a1485b813 |
| 24553 | 24553 | +clean-files	:= *.dtb |
| 24554 | 24554 | diff --git a/arch/arm64/boot/dts/broadcom/northstar2/ns2-clock.dtsi b/arch/arm64/boot/dts/broadcom/northstar2/ns2-clock.dtsi |
| 24555 | 24555 | new file mode 100644 |
| 24556 | | index 000000000000..99009fdf10a4 |
| 24556 | index 0000000000000000000000000000000000000000..99009fdf10a4830b1f4854b2570681b88cfac3f7 |
| 24557 | 24557 | --- /dev/null |
| 24558 | 24558 | +++ b/arch/arm64/boot/dts/broadcom/northstar2/ns2-clock.dtsi |
| 24559 | 24559 | @@ -0,0 +1,105 @@ |
| ... | ... | @@ -24664,7 +24664,7 @@ index 000000000000..99009fdf10a4 |
| 24664 | 24664 | +	}; |
| 24665 | 24665 | diff --git a/arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts b/arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts |
| 24666 | 24666 | new file mode 100644 |
| 24667 | | index 000000000000..ec19fbf928a1 |
| 24667 | index 0000000000000000000000000000000000000000..ec19fbf928a142db6d9e853fee7e98f1e31d66b2 |
| 24668 | 24668 | --- /dev/null |
| 24669 | 24669 | +++ b/arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts |
| 24670 | 24670 | @@ -0,0 +1,236 @@ |
| ... | ... | @@ -24906,7 +24906,7 @@ index 000000000000..ec19fbf928a1 |
| 24906 | 24906 | +}; |
| 24907 | 24907 | diff --git a/arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts b/arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts |
| 24908 | 24908 | new file mode 100644 |
| 24909 | | index 000000000000..ab4ae1a32fab |
| 24909 | index 0000000000000000000000000000000000000000..ab4ae1a32fabd48527694b384f6622ccd125107d |
| 24910 | 24910 | --- /dev/null |
| 24911 | 24911 | +++ b/arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts |
| 24912 | 24912 | @@ -0,0 +1,191 @@ |
| ... | ... | @@ -25103,7 +25103,7 @@ index 000000000000..ab4ae1a32fab |
| 25103 | 25103 | +}; |
| 25104 | 25104 | diff --git a/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi |
| 25105 | 25105 | new file mode 100644 |
| 25106 | | index 000000000000..35c8457e3d1f |
| 25106 | index 0000000000000000000000000000000000000000..35c8457e3d1f23d32c3db46cbf43f95a3e1ef795 |
| 25107 | 25107 | --- /dev/null |
| 25108 | 25108 | +++ b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi |
| 25109 | 25109 | @@ -0,0 +1,765 @@ |
| ... | ... | @@ -25874,7 +25874,7 @@ index 000000000000..35c8457e3d1f |
| 25874 | 25874 | +}; |
| 25875 | 25875 | diff --git a/arch/arm64/boot/dts/broadcom/ns2-clock.dtsi b/arch/arm64/boot/dts/broadcom/ns2-clock.dtsi |
| 25876 | 25876 | deleted file mode 100644 |
| 25877 | | index 99009fdf10a4..000000000000 |
| 25877 | index 99009fdf10a4830b1f4854b2570681b88cfac3f7..0000000000000000000000000000000000000000 |
| 25878 | 25878 | --- a/arch/arm64/boot/dts/broadcom/ns2-clock.dtsi |
| 25879 | 25879 | +++ /dev/null |
| 25880 | 25880 | @@ -1,105 +0,0 @@ |
| ... | ... | @@ -25985,7 +25985,7 @@ index 99009fdf10a4..000000000000 |
| 25985 | 25985 | -	}; |
| 25986 | 25986 | diff --git a/arch/arm64/boot/dts/broadcom/ns2-svk.dts b/arch/arm64/boot/dts/broadcom/ns2-svk.dts |
| 25987 | 25987 | deleted file mode 100644 |
| 25988 | | index ec19fbf928a1..000000000000 |
| 25988 | index ec19fbf928a142db6d9e853fee7e98f1e31d66b2..0000000000000000000000000000000000000000 |
| 25989 | 25989 | --- a/arch/arm64/boot/dts/broadcom/ns2-svk.dts |
| 25990 | 25990 | +++ /dev/null |
| 25991 | 25991 | @@ -1,236 +0,0 @@ |
| ... | ... | @@ -26227,7 +26227,7 @@ index ec19fbf928a1..000000000000 |
| 26227 | 26227 | -}; |
| 26228 | 26228 | diff --git a/arch/arm64/boot/dts/broadcom/ns2-xmc.dts b/arch/arm64/boot/dts/broadcom/ns2-xmc.dts |
| 26229 | 26229 | deleted file mode 100644 |
| 26230 | | index ab4ae1a32fab..000000000000 |
| 26230 | index ab4ae1a32fabd48527694b384f6622ccd125107d..0000000000000000000000000000000000000000 |
| 26231 | 26231 | --- a/arch/arm64/boot/dts/broadcom/ns2-xmc.dts |
| 26232 | 26232 | +++ /dev/null |
| 26233 | 26233 | @@ -1,191 +0,0 @@ |
| ... | ... | @@ -26424,7 +26424,7 @@ index ab4ae1a32fab..000000000000 |
| 26424 | 26424 | -}; |
| 26425 | 26425 | diff --git a/arch/arm64/boot/dts/broadcom/ns2.dtsi b/arch/arm64/boot/dts/broadcom/ns2.dtsi |
| 26426 | 26426 | deleted file mode 100644 |
| 26427 | | index 35c8457e3d1f..000000000000 |
| 26427 | index 35c8457e3d1f23d32c3db46cbf43f95a3e1ef795..0000000000000000000000000000000000000000 |
| 26428 | 26428 | --- a/arch/arm64/boot/dts/broadcom/ns2.dtsi |
| 26429 | 26429 | +++ /dev/null |
| 26430 | 26430 | @@ -1,765 +0,0 @@ |
| ... | ... | @@ -27194,7 +27194,7 @@ index 35c8457e3d1f..000000000000 |
| 27194 | 27194 | -	}; |
| 27195 | 27195 | -}; |
| 27196 | 27196 | diff --git a/arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi b/arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi |
| 27197 | | index 5dca7d10253b..8862ec907fd8 100644 |
| 27197 | index 5dca7d10253bb15bd1657f199889fb48cee76c02..8862ec907fd8e9564aa9d8e5ed4aba173f6a2623 100644 |
| 27198 | 27198 | --- a/arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi |
| 27199 | 27199 | +++ b/arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi |
| 27200 | 27200 | @@ -72,6 +72,78 @@ &memory { /* Default DRAM banks */ |
| ... | ... | @@ -27290,7 +27290,7 @@ index 5dca7d10253b..8862ec907fd8 100644 |
| 27290 | 27290 | 	status = "ok"; |
| 27291 | 27291 | 	nandcs@0 { |
| 27292 | 27292 | diff --git a/arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dts b/arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dts |
| 27293 | | index 5671669ba348..eb6f08cdbd79 100644 |
| 27293 | index 5671669ba34876588f6fae34fd5a711686d1d038..eb6f08cdbd796c3d764393f9e2e70db2129b0e28 100644 |
| 27294 | 27294 | --- a/arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dts |
| 27295 | 27295 | +++ b/arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dts |
| 27296 | 27296 | @@ -39,6 +39,10 @@ / { |
| ... | ... | @@ -27305,7 +27305,7 @@ index 5671669ba348..eb6f08cdbd79 100644 |
| 27305 | 27305 | 	status = "okay"; |
| 27306 | 27306 | }; |
| 27307 | 27307 | diff --git a/arch/arm64/boot/dts/broadcom/stingray/bcm958742t.dts b/arch/arm64/boot/dts/broadcom/stingray/bcm958742t.dts |
| 27308 | | index 6ebe399fda6a..5084b037320f 100644 |
| 27308 | index 6ebe399fda6a7fa01091e8d6b6cb78b2d6c122af..5084b037320fd9cb65133ca929517062a245af3b 100644 |
| 27309 | 27309 | --- a/arch/arm64/boot/dts/broadcom/stingray/bcm958742t.dts |
| 27310 | 27310 | +++ b/arch/arm64/boot/dts/broadcom/stingray/bcm958742t.dts |
| 27311 | 27311 | @@ -38,3 +38,7 @@ / { |
| ... | ... | @@ -27318,7 +27318,7 @@ index 6ebe399fda6a..5084b037320f 100644 |
| 27318 | 27318 | +}; |
| 27319 | 27319 | diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray-fs4.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray-fs4.dtsi |
| 27320 | 27320 | new file mode 100644 |
| 27321 | | index 000000000000..8bf1dc6b46ca |
| 27321 | index 0000000000000000000000000000000000000000..8bf1dc6b46caf303bcae63f2f1fde856127f3a94 |
| 27322 | 27322 | --- /dev/null |
| 27323 | 27323 | +++ b/arch/arm64/boot/dts/broadcom/stingray/stingray-fs4.dtsi |
| 27324 | 27324 | @@ -0,0 +1,118 @@ |
| ... | ... | @@ -27442,7 +27442,7 @@ index 000000000000..8bf1dc6b46ca |
| 27442 | 27442 | +	}; |
| 27443 | 27443 | diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray-sata.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray-sata.dtsi |
| 27444 | 27444 | new file mode 100644 |
| 27445 | | index 000000000000..a774709388df |
| 27445 | index 0000000000000000000000000000000000000000..a774709388df34dfdfb214b0736d7ebd00b0cad3 |
| 27446 | 27446 | --- /dev/null |
| 27447 | 27447 | +++ b/arch/arm64/boot/dts/broadcom/stingray/stingray-sata.dtsi |
| 27448 | 27448 | @@ -0,0 +1,278 @@ |
| ... | ... | @@ -27725,7 +27725,7 @@ index 000000000000..a774709388df |
| 27725 | 27725 | +		}; |
| 27726 | 27726 | +	}; |
| 27727 | 27727 | diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi |
| 27728 | | index 49933cf16c92..e6f75c633623 100644 |
| 27728 | index 49933cf16c92c5be6e138eff6110910395a4b287..e6f75c633623cf45b9efc67844149551eb343e83 100644 |
| 27729 | 27729 | --- a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi |
| 27730 | 27730 | +++ b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi |
| 27731 | 27731 | @@ -152,6 +152,12 @@ scr { |
| ... | ... | @@ -27900,7 +27900,7 @@ index 49933cf16c92..e6f75c633623 100644 |
| 27900 | 27900 | 			compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1"; |
| 27901 | 27901 | 			reg = <0x00360000 0x600>, |
| 27902 | 27902 | diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi |
| 27903 | | index 105b2938082f..297597442c44 100644 |
| 27903 | index 105b2938082fb68539e607b003a0980a05184681..297597442c44217e0f366995314f6c458ca3c7a1 100644 |
| 27904 | 27904 | --- a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi |
| 27905 | 27905 | +++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi |
| 27906 | 27906 | @@ -307,20 +307,6 @@ &dsi { |
| ... | ... | @@ -27952,7 +27952,7 @@ index 105b2938082f..297597442c44 100644 |
| 27952 | 27952 | |
| 27953 | 27953 | &usbdrd30_phy { |
| 27954 | 27954 | diff --git a/arch/arm64/boot/dts/exynos/exynos5433.dtsi b/arch/arm64/boot/dts/exynos/exynos5433.dtsi |
| 27955 | | index 727f36abf3d4..7fe994b750da 100644 |
| 27955 | index 727f36abf3d478d1bd2b86fe09fbe535705401ff..7fe994b750dab050b5a5c834259812acff641705 100644 |
| 27956 | 27956 | --- a/arch/arm64/boot/dts/exynos/exynos5433.dtsi |
| 27957 | 27957 | +++ b/arch/arm64/boot/dts/exynos/exynos5433.dtsi |
| 27958 | 27958 | @@ -1367,7 +1367,7 @@ usbdrd30: usbdrd { |
| ... | ... | @@ -27974,7 +27974,7 @@ index 727f36abf3d4..7fe994b750da 100644 |
| 27974 | 27974 | 				reg = <0x15a00000 0x10000>; |
| 27975 | 27975 | 				interrupts = <GIC_SPI 244 IRQ_TYPE_LEVEL_HIGH>; |
| 27976 | 27976 | diff --git a/arch/arm64/boot/dts/exynos/exynos7-espresso.dts b/arch/arm64/boot/dts/exynos/exynos7-espresso.dts |
| 27977 | | index e5892bb0ae6e..4a8b1fb51243 100644 |
| 27977 | index e5892bb0ae6e55ccf5ba0cc7b30b7b616fea6413..4a8b1fb51243c4a628fd3a27dd7b82ec9ecb3e78 100644 |
| 27978 | 27978 | --- a/arch/arm64/boot/dts/exynos/exynos7-espresso.dts |
| 27979 | 27979 | +++ b/arch/arm64/boot/dts/exynos/exynos7-espresso.dts |
| 27980 | 27980 | @@ -359,7 +359,6 @@ pmic_irq: pmic-irq { |
| ... | ... | @@ -27994,7 +27994,7 @@ index e5892bb0ae6e..4a8b1fb51243 100644 |
| 27994 | 27994 | 	card-detect-delay = <200>; |
| 27995 | 27995 | 	clock-frequency = <400000000>; |
| 27996 | 27996 | diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi |
| 27997 | | index b1554cbd2c54..df83915d6ea6 100644 |
| 27997 | index b1554cbd2c54f4ca08be37f7add0370758b288d9..df83915d6ea629509b829d82061bd7c6019e790c 100644 |
| 27998 | 27998 | --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi |
| 27999 | 27999 | +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi |
| 28000 | 28000 | @@ -444,6 +444,15 @@ edma0: edma@2c00000 { |
| ... | ... | @@ -28028,7 +28028,7 @@ index b1554cbd2c54..df83915d6ea6 100644 |
| 28028 | 28028 | 	}; |
| 28029 | 28029 | }; |
| 28030 | 28030 | diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts |
| 28031 | | index 213abb72de93..0f6fcda36b9e 100644 |
| 28031 | index 213abb72de93e90891b42263adf06854fa1f9fdd..0f6fcda36b9e03279a6a232d4b47d2a31633291b 100644 |
| 28032 | 28032 | --- a/arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts |
| 28033 | 28033 | +++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts |
| 28034 | 28034 | @@ -49,7 +49,7 @@ |
| ... | ... | @@ -28041,7 +28041,7 @@ index 213abb72de93..0f6fcda36b9e 100644 |
| 28041 | 28041 | }; |
| 28042 | 28042 | |
| 28043 | 28043 | diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi |
| 28044 | | index c144d06a6e33..33797b373674 100644 |
| 28044 | index c144d06a6e33150c313580b7144d6ededa08cf06..33797b3736744bbeee590014a3342b514758a0b8 100644 |
| 28045 | 28045 | --- a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi |
| 28046 | 28046 | +++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi |
| 28047 | 28047 | @@ -52,6 +52,10 @@ / { |
| ... | ... | @@ -28187,7 +28187,7 @@ index c144d06a6e33..33797b373674 100644 |
| 28187 | 28187 | |
| 28188 | 28188 | }; |
| 28189 | 28189 | diff --git a/arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts |
| 28190 | | index ed209cd57283..3c99608b9b45 100644 |
| 28190 | index ed209cd57283b66cc8d69640e696d9b3a6ee2935..3c99608b9b45d25b0b2f03ccb0bf4b69cfd3c9de 100644 |
| 28191 | 28191 | --- a/arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts |
| 28192 | 28192 | +++ b/arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts |
| 28193 | 28193 | @@ -55,11 +55,6 @@ / { |
| ... | ... | @@ -28203,7 +28203,7 @@ index ed209cd57283..3c99608b9b45 100644 |
| 28203 | 28203 | 		stdout-path = "serial0:115200n8"; |
| 28204 | 28204 | 	}; |
| 28205 | 28205 | diff --git a/arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts |
| 28206 | | index 67ec3f9c81a1..a4e7de9f70d8 100644 |
| 28206 | index 67ec3f9c81a14848255bed4d2f90dc00581d59f7..a4e7de9f70d8553a05a567589bdf0be6098a674c 100644 |
| 28207 | 28207 | --- a/arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts |
| 28208 | 28208 | +++ b/arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts |
| 28209 | 28209 | @@ -55,11 +55,6 @@ / { |
| ... | ... | @@ -28219,7 +28219,7 @@ index 67ec3f9c81a1..a4e7de9f70d8 100644 |
| 28219 | 28219 | 		stdout-path = "serial1:115200n8"; |
| 28220 | 28220 | 	}; |
| 28221 | 28221 | diff --git a/arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts b/arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts |
| 28222 | | index 3ee718f0aaf8..fbbb73e571c0 100644 |
| 28222 | index 3ee718f0aaf85577866203e30189420934f8c5f9..fbbb73e571c06f0db11909372958fa3ba0a6d334 100644 |
| 28223 | 28223 | --- a/arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts |
| 28224 | 28224 | +++ b/arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts |
| 28225 | 28225 | @@ -52,11 +52,6 @@ / { |
| ... | ... | @@ -28235,7 +28235,7 @@ index 3ee718f0aaf8..fbbb73e571c0 100644 |
| 28235 | 28235 | 		compatible = "smsc,lan91c111"; |
| 28236 | 28236 | 		reg = <0x0 0x2210000 0x0 0x100>; |
| 28237 | 28237 | diff --git a/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi |
| 28238 | | index d789c6814e6a..8d739301e7b8 100644 |
| 28238 | index d789c6814e6a57fd6e7b0d1e8e4700fd8ce2e7a7..8d739301e7b8acbb34951d2b843553bcc101f1e8 100644 |
| 28239 | 28239 | --- a/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi |
| 28240 | 28240 | +++ b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi |
| 28241 | 28241 | @@ -53,6 +53,7 @@ cpu0: cpu@0 { |
| ... | ... | @@ -28319,7 +28319,7 @@ index d789c6814e6a..8d739301e7b8 100644 |
| 28319 | 28319 | |
| 28320 | 28320 | &pcie1 { |
| 28321 | 28321 | diff --git a/arch/arm64/boot/dts/freescale/fsl-ls2088a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls2088a-qds.dts |
| 28322 | | index 4a1df5ce3229..eaee5b1c3a44 100644 |
| 28322 | index 4a1df5ce3229c55d3f8ab62622792d6f9bf88219..eaee5b1c3a448ac95952b6548c6a2d5ac5ddfc26 100644 |
| 28323 | 28323 | --- a/arch/arm64/boot/dts/freescale/fsl-ls2088a-qds.dts |
| 28324 | 28324 | +++ b/arch/arm64/boot/dts/freescale/fsl-ls2088a-qds.dts |
| 28325 | 28325 | @@ -54,11 +54,6 @@ / { |
| ... | ... | @@ -28335,7 +28335,7 @@ index 4a1df5ce3229..eaee5b1c3a44 100644 |
| 28335 | 28335 | 		stdout-path = "serial0:115200n8"; |
| 28336 | 28336 | 	}; |
| 28337 | 28337 | diff --git a/arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts |
| 28338 | | index a76d4b4debd1..c411442cac62 100644 |
| 28338 | index a76d4b4debd16cf7ff887f1d5d5f08213a4ea767..c411442cac62cb2e1309a9759d5959050d247659 100644 |
| 28339 | 28339 | --- a/arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts |
| 28340 | 28340 | +++ b/arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts |
| 28341 | 28341 | @@ -54,11 +54,6 @@ / { |
| ... | ... | @@ -28351,7 +28351,7 @@ index a76d4b4debd1..c411442cac62 100644 |
| 28351 | 28351 | 		stdout-path = "serial1:115200n8"; |
| 28352 | 28352 | 	}; |
| 28353 | 28353 | diff --git a/arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi |
| 28354 | | index 5c695c658056..6aa319dae396 100644 |
| 28354 | index 5c695c6580566020a647f7bbe80efef7df227131..6aa319dae396ffffc135b4e9af9e893029dd1ba7 100644 |
| 28355 | 28355 | --- a/arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi |
| 28356 | 28356 | +++ b/arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi |
| 28357 | 28357 | @@ -53,6 +53,7 @@ cpu0: cpu@0 { |
| ... | ... | @@ -28435,7 +28435,7 @@ index 5c695c658056..6aa319dae396 100644 |
| 28435 | 28435 | |
| 28436 | 28436 | &pcie1 { |
| 28437 | 28437 | diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi |
| 28438 | | index 94cdd3045037..4fb9a0966a84 100644 |
| 28438 | index 94cdd30450371ada8dec5dd0fd1ef398b30d30d0..4fb9a0966a84f2db6c51861c5087ccb5346c49c9 100644 |
| 28439 | 28439 | --- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi |
| 28440 | 28440 | +++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi |
| 28441 | 28441 | @@ -46,6 +46,7 @@ |
| ... | ... | @@ -28518,7 +28518,7 @@ index 94cdd3045037..4fb9a0966a84 100644 |
| 28518 | 28518 | 			compatible = "fsl,qoriq-mc"; |
| 28519 | 28519 | 			reg = <0x00000008 0x0c000000 0 0x40>,	 /* MC portal base */ |
| 28520 | 28520 | diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts |
| 28521 | | index 6609b0fe7a8b..fd4705c451e2 100644 |
| 28521 | index 6609b0fe7a8b48ec02dba0a537731fa02b8061f5..fd4705c451e2697716daea41ff606aabb3bd39fc 100644 |
| 28522 | 28522 | --- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts |
| 28523 | 28523 | +++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts |
| 28524 | 28524 | @@ -39,6 +39,34 @@ memory@0 { |
| ... | ... | @@ -28580,7 +28580,7 @@ index 6609b0fe7a8b..fd4705c451e2 100644 |
| 28580 | 28580 | }; |
| 28581 | 28581 | |
| 28582 | 28582 | diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi |
| 28583 | | index c6a1961e8d55..b7a90d632959 100644 |
| 28583 | index c6a1961e8d55ecb9bdb07e8696fe9a755c8d21e8..b7a90d632959d95b0dee0cc93e37037700194b2d 100644 |
| 28584 | 28584 | --- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi |
| 28585 | 28585 | +++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi |
| 28586 | 28586 | @@ -58,6 +58,8 @@ cpu0: cpu@0 { |
| ... | ... | @@ -28804,7 +28804,7 @@ index c6a1961e8d55..b7a90d632959 100644 |
| 28804 | 28804 | 	}; |
| 28805 | 28805 | }; |
| 28806 | 28806 | diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi |
| 28807 | | index eacbe0db5bc2..02a3aa4b2165 100644 |
| 28807 | index eacbe0db5bc2acebe98c16dd36d22fc996a59d7b..02a3aa4b2165d07e8af616998611923f60256ff9 100644 |
| 28808 | 28808 | --- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi |
| 28809 | 28809 | +++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi |
| 28810 | 28810 | @@ -262,6 +262,12 @@ pm_ctrl: pm_ctrl@f7032000 { |
| ... | ... | @@ -28831,7 +28831,7 @@ index eacbe0db5bc2..02a3aa4b2165 100644 |
| 28831 | 28831 | 		}; |
| 28832 | 28832 | |
| 28833 | 28833 | diff --git a/arch/arm64/boot/dts/hisilicon/hip07-d05.dts b/arch/arm64/boot/dts/hisilicon/hip07-d05.dts |
| 28834 | | index f5d7f0889b41..fe7c16c36025 100644 |
| 28834 | index f5d7f0889b41db47ad784f668845b3e5218c6b84..fe7c16c3602593a9b572fef58bba730dbd1a9c73 100644 |
| 28835 | 28835 | --- a/arch/arm64/boot/dts/hisilicon/hip07-d05.dts |
| 28836 | 28836 | +++ b/arch/arm64/boot/dts/hisilicon/hip07-d05.dts |
| 28837 | 28837 | @@ -84,3 +84,7 @@ &eth3 { |
| ... | ... | @@ -28843,7 +28843,7 @@ index f5d7f0889b41..fe7c16c36025 100644 |
| 28843 | 28843 | +	status = "ok"; |
| 28844 | 28844 | +}; |
| 28845 | 28845 | diff --git a/arch/arm64/boot/dts/hisilicon/hip07.dtsi b/arch/arm64/boot/dts/hisilicon/hip07.dtsi |
| 28846 | | index 283d7b532e16..2c01a21c3665 100644 |
| 28846 | index 283d7b532e161742c3d1be58e5e6621f21bae51a..2c01a21c36656f9e55f110ec31ee4060724879c1 100644 |
| 28847 | 28847 | --- a/arch/arm64/boot/dts/hisilicon/hip07.dtsi |
| 28848 | 28848 | +++ b/arch/arm64/boot/dts/hisilicon/hip07.dtsi |
| 28849 | 28849 | @@ -1534,5 +1534,27 @@ sas2: sas@a3000000 { |
| ... | ... | @@ -28875,7 +28875,7 @@ index 283d7b532e16..2c01a21c3665 100644 |
| 28875 | 28875 | 	}; |
| 28876 | 28876 | }; |
| 28877 | 28877 | diff --git a/arch/arm64/boot/dts/marvell/Makefile b/arch/arm64/boot/dts/marvell/Makefile |
| 28878 | | index 3e6ce6c15a74..6cff81eeaae2 100644 |
| 28878 | index 3e6ce6c15a7449aefd8bf753675de3a2e70ead39..6cff81eeaae2833829391a2b829115ede9a7860f 100644 |
| 28879 | 28879 | --- a/arch/arm64/boot/dts/marvell/Makefile |
| 28880 | 28880 | +++ b/arch/arm64/boot/dts/marvell/Makefile |
| 28881 | 28881 | @@ -8,6 +8,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-espressobin.dtb |
| ... | ... | @@ -28887,7 +28887,7 @@ index 3e6ce6c15a74..6cff81eeaae2 100644 |
| 28887 | 28887 | always		:= $(dtb-y) |
| 28888 | 28888 | subdir-y	:= $(dts-dirs) |
| 28889 | 28889 | diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts |
| 28890 | | index e3a136ed77b0..2ce52ba74f73 100644 |
| 28890 | index e3a136ed77b00ce1d1a0f690c05426cb62783eb2..2ce52ba74f73bac47244aaa5896f29ed4b56596a 100644 |
| 28891 | 28891 | --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts |
| 28892 | 28892 | +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts |
| 28893 | 28893 | @@ -45,6 +45,7 @@ |
| ... | ... | @@ -28949,7 +28949,7 @@ index e3a136ed77b0..2ce52ba74f73 100644 |
| 28949 | 28949 | 	switch0: switch0@1 { |
| 28950 | 28950 | 		compatible = "marvell,mv88e6085"; |
| 28951 | 28951 | diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi |
| 28952 | | index 51763d674050..8c0cf7efac65 100644 |
| 28952 | index 51763d674050cb27c32b0909c62a62724d5d429d..8c0cf7efac65242a50a8ac2b201f351c8c0ce2a6 100644 |
| 28953 | 28953 | --- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi |
| 28954 | 28954 | +++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi |
| 28955 | 28955 | @@ -81,6 +81,11 @@ timer { |
| ... | ... | @@ -28978,7 +28978,7 @@ index 51763d674050..8c0cf7efac65 100644 |
| 28978 | 28978 | 		}; |
| 28979 | 28979 | |
| 28980 | 28980 | diff --git a/arch/arm64/boot/dts/marvell/armada-7040-db.dts b/arch/arm64/boot/dts/marvell/armada-7040-db.dts |
| 28981 | | index 92c761c380d3..9c3bdf87e543 100644 |
| 28981 | index 92c761c380d33c37f5d6070729b02c23a6d93752..9c3bdf87e5433f2a800eae0a2a1e32c8c924dd88 100644 |
| 28982 | 28982 | --- a/arch/arm64/boot/dts/marvell/armada-7040-db.dts |
| 28983 | 28983 | +++ b/arch/arm64/boot/dts/marvell/armada-7040-db.dts |
| 28984 | 28984 | @@ -44,6 +44,7 @@ |
| ... | ... | @@ -29053,7 +29053,7 @@ index 92c761c380d3..9c3bdf87e543 100644 |
| 29053 | 29053 | }; |
| 29054 | 29054 | |
| 29055 | 29055 | diff --git a/arch/arm64/boot/dts/marvell/armada-8040-db.dts b/arch/arm64/boot/dts/marvell/armada-8040-db.dts |
| 29056 | | index 1e8f7242ed6f..0d7b2ae46610 100644 |
| 29056 | index 1e8f7242ed6ff97f7fe153ee7dc26fa1e950def4..0d7b2ae4661002e7443297f680511950c87bfd8f 100644 |
| 29057 | 29057 | --- a/arch/arm64/boot/dts/marvell/armada-8040-db.dts |
| 29058 | 29058 | +++ b/arch/arm64/boot/dts/marvell/armada-8040-db.dts |
| 29059 | 29059 | @@ -44,6 +44,7 @@ |
| ... | ... | @@ -29162,7 +29162,7 @@ index 1e8f7242ed6f..0d7b2ae46610 100644 |
| 29162 | 29162 | }; |
| 29163 | 29163 | |
| 29164 | 29164 | diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts |
| 29165 | | index 4968e731de61..acf5c7d16d79 100644 |
| 29165 | index 4968e731de612e3f781bed2760a0131cb5b42d55..acf5c7d16d79b2f07eedf4691a1fc820073c7ffc 100644 |
| 29166 | 29166 | --- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts |
| 29167 | 29167 | +++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts |
| 29168 | 29168 | @@ -46,11 +46,17 @@ |
| ... | ... | @@ -29359,7 +29359,7 @@ index 4968e731de61..acf5c7d16d79 100644 |
| 29359 | 29359 | 	spi-flash@0 { |
| 29360 | 29360 | diff --git a/arch/arm64/boot/dts/marvell/armada-8080-db.dts b/arch/arm64/boot/dts/marvell/armada-8080-db.dts |
| 29361 | 29361 | new file mode 100644 |
| 29362 | | index 000000000000..707af833832b |
| 29362 | index 0000000000000000000000000000000000000000..707af833832be2039fa82af404e7ac3357b6b38d |
| 29363 | 29363 | --- /dev/null |
| 29364 | 29364 | +++ b/arch/arm64/boot/dts/marvell/armada-8080-db.dts |
| 29365 | 29365 | @@ -0,0 +1,67 @@ |
| ... | ... | @@ -29432,7 +29432,7 @@ index 000000000000..707af833832b |
| 29432 | 29432 | +}; |
| 29433 | 29433 | diff --git a/arch/arm64/boot/dts/marvell/armada-8080.dtsi b/arch/arm64/boot/dts/marvell/armada-8080.dtsi |
| 29434 | 29434 | new file mode 100644 |
| 29435 | | index 000000000000..d5535b716735 |
| 29435 | index 0000000000000000000000000000000000000000..d5535b7167350e135df059ef68b05b83d88a8a32 |
| 29436 | 29436 | --- /dev/null |
| 29437 | 29437 | +++ b/arch/arm64/boot/dts/marvell/armada-8080.dtsi |
| 29438 | 29438 | @@ -0,0 +1,53 @@ |
| ... | ... | @@ -29491,7 +29491,7 @@ index 000000000000..d5535b716735 |
| 29491 | 29491 | +}; |
| 29492 | 29492 | diff --git a/arch/arm64/boot/dts/marvell/armada-ap810-ap0-octa-core.dtsi b/arch/arm64/boot/dts/marvell/armada-ap810-ap0-octa-core.dtsi |
| 29493 | 29493 | new file mode 100644 |
| 29494 | | index 000000000000..bf1b22b70384 |
| 29494 | index 0000000000000000000000000000000000000000..bf1b22b70384ceee5c1284bba316d3298fd21268 |
| 29495 | 29495 | --- /dev/null |
| 29496 | 29496 | +++ b/arch/arm64/boot/dts/marvell/armada-ap810-ap0-octa-core.dtsi |
| 29497 | 29497 | @@ -0,0 +1,104 @@ |
| ... | ... | @@ -29601,7 +29601,7 @@ index 000000000000..bf1b22b70384 |
| 29601 | 29601 | +}; |
| 29602 | 29602 | diff --git a/arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi b/arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi |
| 29603 | 29603 | new file mode 100644 |
| 29604 | | index 000000000000..7e6f039f0f80 |
| 29604 | index 0000000000000000000000000000000000000000..7e6f039f0f80073ba8fce1dc6413f9e9eaa19bee |
| 29605 | 29605 | --- /dev/null |
| 29606 | 29606 | +++ b/arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi |
| 29607 | 29607 | @@ -0,0 +1,163 @@ |
| ... | ... | @@ -29769,7 +29769,7 @@ index 000000000000..7e6f039f0f80 |
| 29769 | 29769 | +	}; |
| 29770 | 29770 | +}; |
| 29771 | 29771 | diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi |
| 29772 | | index 4c68605675a8..8263a8a504a8 100644 |
| 29772 | index 4c68605675a83db1639c0efed23788379c4d9e17..8263a8a504a8fd11896da6aebc99eabdd4be928a 100644 |
| 29773 | 29773 | --- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi |
| 29774 | 29774 | +++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi |
| 29775 | 29775 | @@ -65,25 +65,44 @@ cpm_ethernet: ethernet@0 { |
| ... | ... | @@ -29919,7 +29919,7 @@ index 4c68605675a8..8263a8a504a8 100644 |
| 29919 | 29919 | 				compatible = "marvell,armada-8k-rng", "inside-secure,safexcel-eip76"; |
| 29920 | 29920 | 				reg = <0x760000 0x7d>; |
| 29921 | 29921 | diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi |
| 29922 | | index 923f354b02f0..b71ee6c83668 100644 |
| 29922 | index 923f354b02f00d199db276f60adffb013d688186..b71ee6c83668e8900a4a889614ed83e97e718f85 100644 |
| 29923 | 29923 | --- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi |
| 29924 | 29924 | +++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi |
| 29925 | 29925 | @@ -60,37 +60,49 @@ config-space@f4000000 { |
| ... | ... | @@ -30075,7 +30075,7 @@ index 923f354b02f0..b71ee6c83668 100644 |
| 30075 | 30075 | 				compatible = "marvell,armada-8k-rng", "inside-secure,safexcel-eip76"; |
| 30076 | 30076 | 				reg = <0x760000 0x7d>; |
| 30077 | 30077 | diff --git a/arch/arm64/boot/dts/mediatek/Makefile b/arch/arm64/boot/dts/mediatek/Makefile |
| 30078 | | index 015eb072ddef..151723b5c733 100644 |
| 30078 | index 015eb072ddef78ca3eeae9aff539c4233690898e..151723b5c733d7f3ee91953098ab363ede6f8ff3 100644 |
| 30079 | 30079 | --- a/arch/arm64/boot/dts/mediatek/Makefile |
| 30080 | 30080 | +++ b/arch/arm64/boot/dts/mediatek/Makefile |
| 30081 | 30081 | @@ -1,6 +1,8 @@ |
| ... | ... | @@ -30089,7 +30089,7 @@ index 015eb072ddef..151723b5c733 100644 |
| 30089 | 30089 | always		:= $(dtb-y) |
| 30090 | 30090 | diff --git a/arch/arm64/boot/dts/mediatek/mt2712-evb.dts b/arch/arm64/boot/dts/mediatek/mt2712-evb.dts |
| 30091 | 30091 | new file mode 100644 |
| 30092 | | index 000000000000..8c804df3da4e |
| 30092 | index 0000000000000000000000000000000000000000..8c804df3da4e85d6a6597b0529ca8e33b42c4957 |
| 30093 | 30093 | --- /dev/null |
| 30094 | 30094 | +++ b/arch/arm64/boot/dts/mediatek/mt2712-evb.dts |
| 30095 | 30095 | @@ -0,0 +1,32 @@ |
| ... | ... | @@ -30127,7 +30127,7 @@ index 000000000000..8c804df3da4e |
| 30127 | 30127 | + |
| 30128 | 30128 | diff --git a/arch/arm64/boot/dts/mediatek/mt2712e.dtsi b/arch/arm64/boot/dts/mediatek/mt2712e.dtsi |
| 30129 | 30129 | new file mode 100644 |
| 30130 | | index 000000000000..57d0396b7faa |
| 30130 | index 0000000000000000000000000000000000000000..57d0396b7faaf6fbdffa00d446616bf10213e90a |
| 30131 | 30131 | --- /dev/null |
| 30132 | 30132 | +++ b/arch/arm64/boot/dts/mediatek/mt2712e.dtsi |
| 30133 | 30133 | @@ -0,0 +1,171 @@ |
| ... | ... | @@ -30303,7 +30303,7 @@ index 000000000000..57d0396b7faa |
| 30303 | 30303 | +}; |
| 30304 | 30304 | + |
| 30305 | 30305 | diff --git a/arch/arm64/boot/dts/mediatek/mt6797.dtsi b/arch/arm64/boot/dts/mediatek/mt6797.dtsi |
| 30306 | | index 31088a9f71de..4beaa71107d7 100644 |
| 30306 | index 31088a9f71dea04966a5db22567f0a5b4be899fd..4beaa71107d7d507af80b8a3248a55715224d463 100644 |
| 30307 | 30307 | --- a/arch/arm64/boot/dts/mediatek/mt6797.dtsi |
| 30308 | 30308 | +++ b/arch/arm64/boot/dts/mediatek/mt6797.dtsi |
| 30309 | 30309 | @@ -108,13 +108,6 @@ clk26m: oscillator@0 { |
| ... | ... | @@ -30334,7 +30334,7 @@ index 31088a9f71de..4beaa71107d7 100644 |
| 30334 | 30334 | 		reg = <0 0x1000c000 0 0x1000>; |
| 30335 | 30335 | diff --git a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts |
| 30336 | 30336 | new file mode 100644 |
| 30337 | | index 000000000000..c08309df2cc7 |
| 30337 | index 0000000000000000000000000000000000000000..c08309df2cc7ff61f746f78a0c972c589d86300d |
| 30338 | 30338 | --- /dev/null |
| 30339 | 30339 | +++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts |
| 30340 | 30340 | @@ -0,0 +1,27 @@ |
| ... | ... | @@ -30367,7 +30367,7 @@ index 000000000000..c08309df2cc7 |
| 30367 | 30367 | +}; |
| 30368 | 30368 | diff --git a/arch/arm64/boot/dts/mediatek/mt7622.dtsi b/arch/arm64/boot/dts/mediatek/mt7622.dtsi |
| 30369 | 30369 | new file mode 100644 |
| 30370 | | index 000000000000..b111fec2ed9d |
| 30370 | index 0000000000000000000000000000000000000000..b111fec2ed9d11996606e6b06d2e72b25f980728 |
| 30371 | 30371 | --- /dev/null |
| 30372 | 30372 | +++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi |
| 30373 | 30373 | @@ -0,0 +1,110 @@ |
| ... | ... | @@ -30482,7 +30482,7 @@ index 000000000000..b111fec2ed9d |
| 30482 | 30482 | +	}; |
| 30483 | 30483 | +}; |
| 30484 | 30484 | diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile |
| 30485 | | index cc0f02d9dd02..ff81d7e5805e 100644 |
| 30485 | index cc0f02d9dd02fe43315c96474e73d3b905723c8c..ff81d7e5805e8b9dc4ab8eb886836b28c25ddbfc 100644 |
| 30486 | 30486 | --- a/arch/arm64/boot/dts/qcom/Makefile |
| 30487 | 30487 | +++ b/arch/arm64/boot/dts/qcom/Makefile |
| 30488 | 30488 | @@ -1,5 +1,6 @@ |
| ... | ... | @@ -30493,7 +30493,7 @@ index cc0f02d9dd02..ff81d7e5805e 100644 |
| 30493 | 30493 | dtb-$(CONFIG_ARCH_QCOM)	+= msm8992-bullhead-rev-101.dtb |
| 30494 | 30494 | dtb-$(CONFIG_ARCH_QCOM)	+= msm8994-angler-rev-101.dtb |
| 30495 | 30495 | diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi |
| 30496 | | index d94640812194..790b7775b901 100644 |
| 30496 | index d9464081219467b4ef224d3ebbeddc2a7792773c..790b7775b9016c899228a5be17ebb3fdbe5f4ab8 100644 |
| 30497 | 30497 | --- a/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi |
| 30498 | 30498 | +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi |
| 30499 | 30499 | @@ -17,6 +17,7 @@ pinconf { |
| ... | ... | @@ -30505,7 +30505,7 @@ index d94640812194..790b7775b901 100644 |
| 30505 | 30505 | 	}; |
| 30506 | 30506 | |
| 30507 | 30507 | diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi |
| 30508 | | index bd310ac1967a..1d63e6b879de 100644 |
| 30508 | index bd310ac1967ab5a07f565bcbeead67a482d2e1b3..1d63e6b879de7cc51784077be9b138f9f5635c8e 100644 |
| 30509 | 30509 | --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi |
| 30510 | 30510 | +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi |
| 30511 | 30511 | @@ -88,6 +88,8 @@ adv_bridge: bridge@39 { |
| ... | ... | @@ -30555,7 +30555,7 @@ index bd310ac1967a..1d63e6b879de 100644 |
| 30555 | 30555 | 		compatible = "hdmi-connector"; |
| 30556 | 30556 | 		type = "a"; |
| 30557 | 30557 | diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi |
| 30558 | | index b1142c45fdc9..8e379782597a 100644 |
| 30558 | index b1142c45fdc983151e24fa2ff084dec82852a0d5..8e379782597a258f84d934ef19a54ab6e6176e26 100644 |
| 30559 | 30559 | --- a/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi |
| 30560 | 30560 | +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi |
| 30561 | 30561 | @@ -24,4 +24,28 @@ pinconf { |
| ... | ... | @@ -30588,7 +30588,7 @@ index b1142c45fdc9..8e379782597a 100644 |
| 30588 | 30588 | +	}; |
| 30589 | 30589 | }; |
| 30590 | 30590 | diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi |
| 30591 | | index d2196fc6d739..789f3e87321e 100644 |
| 30591 | index d2196fc6d7397d09b9a9b9c702a45fca08709423..789f3e87321e2d47e51d5af9346441addd385413 100644 |
| 30592 | 30592 | --- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi |
| 30593 | 30593 | +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi |
| 30594 | 30594 | @@ -13,6 +13,7 @@ |
| ... | ... | @@ -30810,7 +30810,7 @@ index d2196fc6d739..789f3e87321e 100644 |
| 30810 | 30810 | }; |
| 30811 | 30811 | diff --git a/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts b/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts |
| 30812 | 30812 | new file mode 100644 |
| 30813 | | index 000000000000..6a838b5d321e |
| 30813 | index 0000000000000000000000000000000000000000..6a838b5d321e31c408674f642698fb7168b9ca93 |
| 30814 | 30814 | --- /dev/null |
| 30815 | 30815 | +++ b/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts |
| 30816 | 30816 | @@ -0,0 +1,52 @@ |
| ... | ... | @@ -30868,7 +30868,7 @@ index 000000000000..6a838b5d321e |
| 30868 | 30868 | +}; |
| 30869 | 30869 | diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi |
| 30870 | 30870 | new file mode 100644 |
| 30871 | | index 000000000000..2bc5dec5614d |
| 30871 | index 0000000000000000000000000000000000000000..2bc5dec5614dec40962e987e0646321a888d4549 |
| 30872 | 30872 | --- /dev/null |
| 30873 | 30873 | +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi |
| 30874 | 30874 | @@ -0,0 +1,194 @@ |
| ... | ... | @@ -31067,7 +31067,7 @@ index 000000000000..2bc5dec5614d |
| 31067 | 31067 | +	}; |
| 31068 | 31068 | +}; |
| 31069 | 31069 | diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi |
| 31070 | | index 039991f80831..dc3817593e14 100644 |
| 31070 | index 039991f808317027822148650831c3509b7d349c..dc3817593e144708a514a5605491801056e662ab 100644 |
| 31071 | 31071 | --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi |
| 31072 | 31072 | +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi |
| 31073 | 31073 | @@ -88,6 +88,11 @@ wcnss_mem: wcnss@89300000 { |
| ... | ... | @@ -31233,7 +31233,7 @@ index 039991f80831..dc3817593e14 100644 |
| 31233 | 31233 | |
| 31234 | 31234 | 	smd { |
| 31235 | 31235 | diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi |
| 31236 | | index 8f085716e258..887b61c872dd 100644 |
| 31236 | index 8f085716e25898a19a4efb8ad493aaf60963eef9..887b61c872dd15b697e4d1969b26be5010a18d4e 100644 |
| 31237 | 31237 | --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi |
| 31238 | 31238 | +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi |
| 31239 | 31239 | @@ -276,12 +276,83 @@ smem { |
| ... | ... | @@ -31592,7 +31592,7 @@ index 8f085716e258..887b61c872dd 100644 |
| 31592 | 31592 | 		compatible = "qcom,smp2p"; |
| 31593 | 31593 | 		qcom,smem = <481>, <430>; |
| 31594 | 31594 | diff --git a/arch/arm64/boot/dts/qcom/pmi8994.dtsi b/arch/arm64/boot/dts/qcom/pmi8994.dtsi |
| 31595 | | index d3879a4e8076..57673f92805d 100644 |
| 31595 | index d3879a4e8076d53a4bdcd9d2b81d343797c637a2..57673f92805d00346559dc65e2c4d01fc17bc5dd 100644 |
| 31596 | 31596 | --- a/arch/arm64/boot/dts/qcom/pmi8994.dtsi |
| 31597 | 31597 | +++ b/arch/arm64/boot/dts/qcom/pmi8994.dtsi |
| 31598 | 31598 | @@ -8,6 +8,23 @@ pmic@2 { |
| ... | ... | @@ -31620,7 +31620,7 @@ index d3879a4e8076..57673f92805d 100644 |
| 31620 | 31620 | |
| 31621 | 31621 | 	pmic@3 { |
| 31622 | 31622 | diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile |
| 31623 | | index acc4bb30d485..381928bc1358 100644 |
| 31623 | index acc4bb30d485b6bc55fa50926ae678d73bdcac92..381928bc1358fd9c97995109143cc72282bda1d4 100644 |
| 31624 | 31624 | --- a/arch/arm64/boot/dts/renesas/Makefile |
| 31625 | 31625 | +++ b/arch/arm64/boot/dts/renesas/Makefile |
| 31626 | 31626 | @@ -2,6 +2,7 @@ dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-x.dtb r8a7795-h3ulcb.dtb |
| ... | ... | @@ -31632,7 +31632,7 @@ index acc4bb30d485..381928bc1358 100644 |
| 31632 | 31632 | always		:= $(dtb-y) |
| 31633 | 31633 | clean-files	:= *.dtb |
| 31634 | 31634 | diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts |
| 31635 | | index 95fe207cb6a3..dd4f9b6a4254 100644 |
| 31635 | index 95fe207cb6a3fd2fcb168e8557e38327d6041ae4..dd4f9b6a42546defb7b1161ce4e589c25f739d5c 100644 |
| 31636 | 31636 | --- a/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts |
| 31637 | 31637 | +++ b/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts |
| 31638 | 31638 | @@ -9,8 +9,6 @@ |
| ... | ... | @@ -31645,7 +31645,7 @@ index 95fe207cb6a3..dd4f9b6a4254 100644 |
| 31645 | 31645 | #include "r8a7795-es1.dtsi" |
| 31646 | 31646 | #include "ulcb.dtsi" |
| 31647 | 31647 | diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts |
| 31648 | | index b84c156ed696..3f7d5f51e428 100644 |
| 31648 | index b84c156ed6969947bc64d602fefb8da9a55ad030..3f7d5f51e42878cb8550402dbb851411c6399492 100644 |
| 31649 | 31649 | --- a/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts |
| 31650 | 31650 | +++ b/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts |
| 31651 | 31651 | @@ -8,8 +8,6 @@ |
| ... | ... | @@ -31658,7 +31658,7 @@ index b84c156ed696..3f7d5f51e428 100644 |
| 31658 | 31658 | #include "r8a7795-es1.dtsi" |
| 31659 | 31659 | #include "salvator-x.dtsi" |
| 31660 | 31660 | diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi |
| 31661 | | index a0ba7bd21ea3..aaa5e67a963e 100644 |
| 31661 | index a0ba7bd21ea3aa185bb725ee43c4a4638609e02b..aaa5e67a963ea9ff1b0dddc3a18d46b3e8ae2031 100644 |
| 31662 | 31662 | --- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi |
| 31663 | 31663 | +++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi |
| 31664 | 31664 | @@ -21,6 +21,14 @@ xhci1: usb@ee0400000 { |
| ... | ... | @@ -31684,7 +31684,7 @@ index a0ba7bd21ea3..aaa5e67a963e 100644 |
| 31684 | 31684 | 	vsps = <&vspd0 &vspd1 &vspd2 &vspd3>; |
| 31685 | 31685 | }; |
| 31686 | 31686 | diff --git a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts |
| 31687 | | index 0426f41765f0..0afe777973de 100644 |
| 31687 | index 0426f41765f0bc68f426e5284d84a354c686dbd8..0afe777973dec8b7e8fa41b1d521652ba450914a 100644 |
| 31688 | 31688 | --- a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts |
| 31689 | 31689 | +++ b/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts |
| 31690 | 31690 | @@ -9,8 +9,6 @@ |
| ... | ... | @@ -31715,7 +31715,7 @@ index 0426f41765f0..0afe777973de 100644 |
| 31715 | 31715 | +		 "dclkin.0", "dclkin.1", "dclkin.2", "dclkin.3"; |
| 31716 | 31716 | +}; |
| 31717 | 31717 | diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts |
| 31718 | | index 684fb3b9d154..17953070f38d 100644 |
| 31718 | index 684fb3b9d154559eb31d85c401303f4bc52f9f4e..17953070f38dff8d1a4e3e3050f1259fe802240a 100644 |
| 31719 | 31719 | --- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts |
| 31720 | 31720 | +++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts |
| 31721 | 31721 | @@ -8,8 +8,6 @@ |
| ... | ... | @@ -31728,7 +31728,7 @@ index 684fb3b9d154..17953070f38d 100644 |
| 31728 | 31728 | #include "r8a7795.dtsi" |
| 31729 | 31729 | #include "salvator-x.dtsi" |
| 31730 | 31730 | diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts |
| 31731 | | index de354957144b..7675de5d4f2c 100644 |
| 31731 | index de354957144b4822479a25894656028f9f1085c1..7675de5d4f2cb13902ecd325654ece89db098741 100644 |
| 31732 | 31732 | --- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts |
| 31733 | 31733 | +++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts |
| 31734 | 31734 | @@ -8,8 +8,6 @@ |
| ... | ... | @@ -31756,7 +31756,7 @@ index de354957144b..7675de5d4f2c 100644 |
| 31756 | 31756 | |
| 31757 | 31757 | &ehci2 { |
| 31758 | 31758 | diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi |
| 31759 | | index e31c1b660b3f..2938195b9571 100644 |
| 31759 | index e31c1b660b3fe78f370a01e1cc67e8c81d24ee97..2938195b9571dd6cd2f568737679770202bc1a3f 100644 |
| 31760 | 31760 | --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi |
| 31761 | 31761 | +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi |
| 31762 | 31762 | @@ -12,6 +12,8 @@ |
| ... | ... | @@ -32177,7 +32177,7 @@ index e31c1b660b3f..2938195b9571 100644 |
| 32177 | 32177 | |
| 32178 | 32178 | 			ports { |
| 32179 | 32179 | diff --git a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts |
| 32180 | | index 38b58b7fca4b..daee1f1a3f68 100644 |
| 32180 | index 38b58b7fca4bf0e9a309a1f9a27f91cb26d9e785..daee1f1a3f68951b4a7615305d219bd4fa990469 100644 |
| 32181 | 32181 | --- a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts |
| 32182 | 32182 | +++ b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts |
| 32183 | 32183 | @@ -9,8 +9,6 @@ |
| ... | ... | @@ -32206,7 +32206,7 @@ index 38b58b7fca4b..daee1f1a3f68 100644 |
| 32206 | 32206 | +		 "dclkin.0", "dclkin.1", "dclkin.2"; |
| 32207 | 32207 | +}; |
| 32208 | 32208 | diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts |
| 32209 | | index db4f162d6bdd..b317be03306e 100644 |
| 32209 | index db4f162d6bdd2c42e13af8057b866498c0bf6c39..b317be03306e69f8ae7357f310c4764b395b1787 100644 |
| 32210 | 32210 | --- a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts |
| 32211 | 32211 | +++ b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts |
| 32212 | 32212 | @@ -8,8 +8,6 @@ |
| ... | ... | @@ -32252,7 +32252,7 @@ index db4f162d6bdd..b317be03306e 100644 |
| 32252 | 32252 | +	remote-endpoint = <&rcar_dw_hdmi0_out>; |
| 32253 | 32253 | +}; |
| 32254 | 32254 | diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi |
| 32255 | | index 1f6710912045..369092e17e34 100644 |
| 32255 | index 1f671091204524e84600c66e697bc57a07d704d6..369092e17e3412914d3204d7f308d57fed3cb152 100644 |
| 32256 | 32256 | --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi |
| 32257 | 32257 | +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi |
| 32258 | 32258 | @@ -12,6 +12,8 @@ |
| ... | ... | @@ -32744,7 +32744,7 @@ index 1f6710912045..369092e17e34 100644 |
| 32744 | 32744 | }; |
| 32745 | 32745 | diff --git a/arch/arm64/boot/dts/renesas/r8a77995-draak.dts b/arch/arm64/boot/dts/renesas/r8a77995-draak.dts |
| 32746 | 32746 | new file mode 100644 |
| 32747 | | index 000000000000..d144370051d5 |
| 32747 | index 0000000000000000000000000000000000000000..d144370051d559fc9b43fd6ab01f2a5e546d94ce |
| 32748 | 32748 | --- /dev/null |
| 32749 | 32749 | +++ b/arch/arm64/boot/dts/renesas/r8a77995-draak.dts |
| 32750 | 32750 | @@ -0,0 +1,46 @@ |
| ... | ... | @@ -32796,7 +32796,7 @@ index 000000000000..d144370051d5 |
| 32796 | 32796 | +}; |
| 32797 | 32797 | diff --git a/arch/arm64/boot/dts/renesas/r8a77995.dtsi b/arch/arm64/boot/dts/renesas/r8a77995.dtsi |
| 32798 | 32798 | new file mode 100644 |
| 32799 | | index 000000000000..d0f95b78c022 |
| 32799 | index 0000000000000000000000000000000000000000..d0f95b78c022de07bed57a2df667c743dbc43814 |
| 32800 | 32800 | --- /dev/null |
| 32801 | 32801 | +++ b/arch/arm64/boot/dts/renesas/r8a77995.dtsi |
| 32802 | 32802 | @@ -0,0 +1,155 @@ |
| ... | ... | @@ -32956,7 +32956,7 @@ index 000000000000..d0f95b78c022 |
| 32956 | 32956 | +	}; |
| 32957 | 32957 | +}; |
| 32958 | 32958 | diff --git a/arch/arm64/boot/dts/renesas/salvator-common.dtsi b/arch/arm64/boot/dts/renesas/salvator-common.dtsi |
| 32959 | | index f903957da504..4786c67b5e65 100644 |
| 32959 | index f903957da504a9e02fa910243b60388dc85ec959..4786c67b5e6527fd99d27aa969ef0b2d4274b4ad 100644 |
| 32960 | 32960 | --- a/arch/arm64/boot/dts/renesas/salvator-common.dtsi |
| 32961 | 32961 | +++ b/arch/arm64/boot/dts/renesas/salvator-common.dtsi |
| 32962 | 32962 | @@ -268,10 +268,6 @@ endpoint { |
| ... | ... | @@ -32971,7 +32971,7 @@ index f903957da504..4786c67b5e65 100644 |
| 32971 | 32971 | }; |
| 32972 | 32972 | |
| 32973 | 32973 | diff --git a/arch/arm64/boot/dts/renesas/salvator-xs.dtsi b/arch/arm64/boot/dts/renesas/salvator-xs.dtsi |
| 32974 | | index 81227e3c2c6f..bf4d200fb546 100644 |
| 32974 | index 81227e3c2c6f1e2d3899e3ea0c824413c3a537a6..bf4d200fb54635eaa448688af444045145a18a96 100644 |
| 32975 | 32975 | --- a/arch/arm64/boot/dts/renesas/salvator-xs.dtsi |
| 32976 | 32976 | +++ b/arch/arm64/boot/dts/renesas/salvator-xs.dtsi |
| 32977 | 32977 | @@ -18,3 +18,13 @@ / { |
| ... | ... | @@ -32989,7 +32989,7 @@ index 81227e3c2c6f..bf4d200fb546 100644 |
| 32989 | 32989 | +	}; |
| 32990 | 32990 | +}; |
| 32991 | 32991 | diff --git a/arch/arm64/boot/dts/renesas/ulcb.dtsi b/arch/arm64/boot/dts/renesas/ulcb.dtsi |
| 32992 | | index d1a3f3b7a0ab..1b868df2393f 100644 |
| 32992 | index d1a3f3b7a0ab0b97aff29a898813a023a7d5bd3d..1b868df2393ffa3dd07ac2ab6c221e9c5c4c9898 100644 |
| 32993 | 32993 | --- a/arch/arm64/boot/dts/renesas/ulcb.dtsi |
| 32994 | 32994 | +++ b/arch/arm64/boot/dts/renesas/ulcb.dtsi |
| 32995 | 32995 | @@ -34,6 +34,16 @@ audio_clkout: audio-clkout { |
| ... | ... | @@ -33072,7 +33072,7 @@ index d1a3f3b7a0ab..1b868df2393f 100644 |
| 33072 | 33072 | 	status = "okay"; |
| 33073 | 33073 | }; |
| 33074 | 33074 | diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile |
| 33075 | | index bcfa53b1e6b7..f1c9b13cea5c 100644 |
| 33075 | index bcfa53b1e6b7ef7e310ba731c090c10fac657bfc..f1c9b13cea5c21ce89efec347c61593e092a681e 100644 |
| 33076 | 33076 | --- a/arch/arm64/boot/dts/rockchip/Makefile |
| 33077 | 33077 | +++ b/arch/arm64/boot/dts/rockchip/Makefile |
| 33078 | 33078 | @@ -1,4 +1,5 @@ |
| ... | ... | @@ -33091,7 +33091,7 @@ index bcfa53b1e6b7..f1c9b13cea5c 100644 |
| 33091 | 33091 | always		:= $(dtb-y) |
| 33092 | 33092 | subdir-y	:= $(dts-dirs) |
| 33093 | 33093 | diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts b/arch/arm64/boot/dts/rockchip/rk3328-evb.dts |
| 33094 | | index b9f36dad17e6..8e6a65431756 100644 |
| 33094 | index b9f36dad17e6dda378c486e98e202aaac00234ab..8e6a6543175673d6fd9e3d7e5d370b29ac7a2c50 100644 |
| 33095 | 33095 | --- a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts |
| 33096 | 33096 | +++ b/arch/arm64/boot/dts/rockchip/rk3328-evb.dts |
| 33097 | 33097 | @@ -51,6 +51,25 @@ chosen { |
| ... | ... | @@ -33274,7 +33274,7 @@ index b9f36dad17e6..8e6a65431756 100644 |
| 33274 | 33274 | +}; |
| 33275 | 33275 | diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts |
| 33276 | 33276 | new file mode 100644 |
| 33277 | | index 000000000000..d4f80786e7c2 |
| 33277 | index 0000000000000000000000000000000000000000..d4f80786e7c20c0a46bacb9636f8defc7ef137b4 |
| 33278 | 33278 | --- /dev/null |
| 33279 | 33279 | +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts |
| 33280 | 33280 | @@ -0,0 +1,333 @@ |
| ... | ... | @@ -33612,7 +33612,7 @@ index 000000000000..d4f80786e7c2 |
| 33612 | 33612 | +	status = "okay"; |
| 33613 | 33613 | +}; |
| 33614 | 33614 | diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi |
| 33615 | | index d48bf5d9f8bd..6d615cb6e64d 100644 |
| 33615 | index d48bf5d9f8bd04c03d21b9f2d7be42a654b0c15f..6d615cb6e64d07cebcfa0a7ecebf04b8afb152b2 100644 |
| 33616 | 33616 | --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi |
| 33617 | 33617 | +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi |
| 33618 | 33618 | @@ -47,6 +47,7 @@ |
| ... | ... | @@ -34112,7 +34112,7 @@ index d48bf5d9f8bd..6d615cb6e64d 100644 |
| 34112 | 34112 | 			otp_gpio: otp-gpio { |
| 34113 | 34113 | 				rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; |
| 34114 | 34114 | diff --git a/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi |
| 34115 | | index 4772917c5f7e..a37220a9387c 100644 |
| 34115 | index 4772917c5f7e6067a79cd22080741156329f215c..a37220a9387c325a1caf7e2c735ee5c776af4982 100644 |
| 34116 | 34116 | --- a/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi |
| 34117 | 34117 | +++ b/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi |
| 34118 | 34118 | @@ -156,7 +156,6 @@ &emmc { |
| ... | ... | @@ -34124,7 +34124,7 @@ index 4772917c5f7e..a37220a9387c 100644 |
| 34124 | 34124 | 	pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>; |
| 34125 | 34125 | 	status = "okay"; |
| 34126 | 34126 | diff --git a/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts b/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts |
| 34127 | | index e631d424f08e..5e4d3a7015f5 100644 |
| 34127 | index e631d424f08ea64991b6d00d748819ce5328ae9c..5e4d3a7015f52de883c2a43ce38da7f5c5421993 100644 |
| 34128 | 34128 | --- a/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts |
| 34129 | 34129 | +++ b/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts |
| 34130 | 34130 | @@ -117,7 +117,6 @@ &emmc { |
| ... | ... | @@ -34136,7 +34136,7 @@ index e631d424f08e..5e4d3a7015f5 100644 |
| 34136 | 34136 | 	vqmmc-supply = <&vcc18_flash>; |
| 34137 | 34137 | 	pinctrl-names = "default"; |
| 34138 | 34138 | diff --git a/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts b/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts |
| 34139 | | index fac116acc12f..d3f6c8e0d206 100644 |
| 34139 | index fac116acc12fa0f65755fe3897a87347cf75fded..d3f6c8e0d206d0fcf28ade6612499fec212dcc6a 100644 |
| 34140 | 34140 | --- a/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts |
| 34141 | 34141 | +++ b/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts |
| 34142 | 34142 | @@ -203,7 +203,6 @@ &emmc { |
| ... | ... | @@ -34156,7 +34156,7 @@ index fac116acc12f..d3f6c8e0d206 100644 |
| 34156 | 34156 | 	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; |
| 34157 | 34157 | 	vmmc-supply = <&vcc_sd>; |
| 34158 | 34158 | diff --git a/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts b/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts |
| 34159 | | index ff48edd8e348..13a9e22f5d2d 100644 |
| 34159 | index ff48edd8e3482bcafcf4920ecdf1b93995bd5a5b..13a9e22f5d2d2caa3604a4315be98879ba069bbd 100644 |
| 34160 | 34160 | --- a/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts |
| 34161 | 34161 | +++ b/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts |
| 34162 | 34162 | @@ -86,12 +86,10 @@ &emmc { |
| ... | ... | @@ -34181,7 +34181,7 @@ index ff48edd8e348..13a9e22f5d2d 100644 |
| 34181 | 34181 | 	sd-uhs-sdr25; |
| 34182 | 34182 | 	pinctrl-names = "default"; |
| 34183 | 34183 | diff --git a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts |
| 34184 | | index 7134181f1dc2..b3510d56517a 100644 |
| 34184 | index 7134181f1dc27190ee2c3be5f1161288a864d3c8..b3510d56517a63a39506e3434ce7969cc708a2d7 100644 |
| 34185 | 34185 | --- a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts |
| 34186 | 34186 | +++ b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts |
| 34187 | 34187 | @@ -189,7 +189,6 @@ &emmc { |
| ... | ... | @@ -34201,7 +34201,7 @@ index 7134181f1dc2..b3510d56517a 100644 |
| 34201 | 34201 | 	pinctrl-0 = <&sdio0_clk &sdio0_cmd &sdio0_bus4>; |
| 34202 | 34202 | 	vmmc-supply = <&vcc_io>; |
| 34203 | 34203 | diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi |
| 34204 | | index 6d5dc0587e59..e0518b4bc6c2 100644 |
| 34204 | index 6d5dc0587e599dd768ed00d0df92145a862dce1b..e0518b4bc6c2a018963787d0096077ab540b78e8 100644 |
| 34205 | 34205 | --- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi |
| 34206 | 34206 | +++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi |
| 34207 | 34207 | @@ -113,7 +113,8 @@ cpu_l0: cpu@0 { |
| ... | ... | @@ -34422,7 +34422,7 @@ index 6d5dc0587e59..e0518b4bc6c2 100644 |
| 34422 | 34422 | 			spi0_clk: spi0-clk { |
| 34423 | 34423 | 				rockchip,pins = <1 29 RK_FUNC_2 &pcfg_pull_up>; |
| 34424 | 34424 | diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb.dts |
| 34425 | | index 42033bcc614c..56533c344ef2 100644 |
| 34425 | index 42033bcc614cbb05b9615538bb66728ca11416df..56533c344ef2caa5d237e61aff438caf068d96e3 100644 |
| 34426 | 34426 | --- a/arch/arm64/boot/dts/rockchip/rk3399-evb.dts |
| 34427 | 34427 | +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dts |
| 34428 | 34428 | @@ -199,7 +199,7 @@ &pcie0 { |
| ... | ... | @@ -34435,7 +34435,7 @@ index 42033bcc614c..56533c344ef2 100644 |
| 34435 | 34435 | }; |
| 34436 | 34436 | |
| 34437 | 34437 | diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts |
| 34438 | | index ba1d9810ad1e..7fd4bfcaa38e 100644 |
| 34438 | index ba1d9810ad1e29916809dc1075359c6d0244d4e7..7fd4bfcaa38e33c8b58ef60dc7adb99772b04cc1 100644 |
| 34439 | 34439 | --- a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts |
| 34440 | 34440 | +++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts |
| 34441 | 34441 | @@ -43,6 +43,7 @@ |
| ... | ... | @@ -34478,7 +34478,7 @@ index ba1d9810ad1e..7fd4bfcaa38e 100644 |
| 34478 | 34478 | 	mmc-hs400-enhanced-strobe; |
| 34479 | 34479 | 	non-removable; |
| 34480 | 34480 | diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts |
| 34481 | | index 7bd31066399b..a3d3cea7dc4f 100644 |
| 34481 | index 7bd31066399b5859a053570a35281cec23d1d888..a3d3cea7dc4f60578e5901e13546ad36fa497f41 100644 |
| 34482 | 34482 | --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts |
| 34483 | 34483 | +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts |
| 34484 | 34484 | @@ -264,6 +264,50 @@ touchscreen@4b { |
| ... | ... | @@ -34533,7 +34533,7 @@ index 7bd31066399b..a3d3cea7dc4f 100644 |
| 34533 | 34533 | 	status = "okay"; |
| 34534 | 34534 | 	vref-supply = <&pp1800_ap_io>; |
| 34535 | 34535 | diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi |
| 34536 | | index eb5059344023..199a5118b20d 100644 |
| 34536 | index eb505934402311f8b6b4621bb1d79b8965b0648e..199a5118b20dab39f744dfc21814b1a9dafb166f 100644 |
| 34537 | 34537 | --- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi |
| 34538 | 34538 | +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi |
| 34539 | 34539 | @@ -164,14 +164,9 @@ pp5000: pp5000 { |
| ... | ... | @@ -34744,7 +34744,7 @@ index eb5059344023..199a5118b20d 100644 |
| 34744 | 34744 | 				<0 7 RK_FUNC_1 &pcfg_pull_none>; |
| 34745 | 34745 | 		}; |
| 34746 | 34746 | diff --git a/arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi |
| 34747 | | index be7fe635f7c1..d8a120f945c8 100644 |
| 34747 | index be7fe635f7c15f0e1aac3e7e716305bfd1ee715a..d8a120f945c803ee91e4fdd5a7afa3a8b68ed28a 100644 |
| 34748 | 34748 | --- a/arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi |
| 34749 | 34749 | +++ b/arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi |
| 34750 | 34750 | @@ -118,6 +118,35 @@ opp08 { |
| ... | ... | @@ -34792,7 +34792,7 @@ index be7fe635f7c1..d8a120f945c8 100644 |
| 34792 | 34792 | +	operating-points-v2 = <&gpu_opp_table>; |
| 34793 | 34793 | +}; |
| 34794 | 34794 | diff --git a/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi |
| 34795 | | index c83460db130a..81617bcf2522 100644 |
| 34795 | index c83460db130ab35fcf4a37b9c9998de6be87f7d8..81617bcf252272313163f9dc48ef35c077981559 100644 |
| 34796 | 34796 | --- a/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi |
| 34797 | 34797 | +++ b/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi |
| 34798 | 34798 | @@ -110,6 +110,35 @@ opp07 { |
| ... | ... | @@ -34841,7 +34841,7 @@ index c83460db130a..81617bcf2522 100644 |
| 34841 | 34841 | +}; |
| 34842 | 34842 | diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts |
| 34843 | 34843 | new file mode 100644 |
| 34844 | | index 000000000000..9a7486058455 |
| 34844 | index 0000000000000000000000000000000000000000..9a7486058455fe3c4b39b1bf68cf5434ab444d0a |
| 34845 | 34845 | --- /dev/null |
| 34846 | 34846 | +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts |
| 34847 | 34847 | @@ -0,0 +1,228 @@ |
| ... | ... | @@ -35075,7 +35075,7 @@ index 000000000000..9a7486058455 |
| 35075 | 35075 | +}; |
| 35076 | 35076 | diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi |
| 35077 | 35077 | new file mode 100644 |
| 35078 | | index 000000000000..53ff3d191a1d |
| 35078 | index 0000000000000000000000000000000000000000..53ff3d191a1d176cc0d7c6d380894b48e42ec7da |
| 35079 | 35079 | --- /dev/null |
| 35080 | 35080 | +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi |
| 35081 | 35081 | @@ -0,0 +1,547 @@ |
| ... | ... | @@ -35628,7 +35628,7 @@ index 000000000000..53ff3d191a1d |
| 35628 | 35628 | +}; |
| 35629 | 35629 | diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts |
| 35630 | 35630 | new file mode 100644 |
| 35631 | | index 000000000000..b7bd88fb3ae3 |
| 35631 | index 0000000000000000000000000000000000000000..b7bd88fb3ae3bff4287f0df1d47593d4cfac316f |
| 35632 | 35632 | --- /dev/null |
| 35633 | 35633 | +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts |
| 35634 | 35634 | @@ -0,0 +1,240 @@ |
| ... | ... | @@ -35874,7 +35874,7 @@ index 000000000000..b7bd88fb3ae3 |
| 35874 | 35874 | +}; |
| 35875 | 35875 | diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi |
| 35876 | 35876 | new file mode 100644 |
| 35877 | | index 000000000000..6c30bb02210d |
| 35877 | index 0000000000000000000000000000000000000000..6c30bb02210d80a2d78843cccaca7a3d83f971cd |
| 35878 | 35878 | --- /dev/null |
| 35879 | 35879 | +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi |
| 35880 | 35880 | @@ -0,0 +1,644 @@ |
| ... | ... | @@ -36523,7 +36523,7 @@ index 000000000000..6c30bb02210d |
| 36523 | 36523 | +	status = "okay"; |
| 36524 | 36524 | +}; |
| 36525 | 36525 | diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi |
| 36526 | | index 5b78ce16a87e..d79e9b3265b9 100644 |
| 36526 | index 5b78ce16a87e75ad355895777e2de8a1e8f1e12b..d79e9b3265b98cbe0955c8139950627d2af09492 100644 |
| 36527 | 36527 | --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi |
| 36528 | 36528 | +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi |
| 36529 | 36529 | @@ -110,6 +110,7 @@ cpu_l0: cpu@0 { |
| ... | ... | @@ -36947,7 +36947,7 @@ index 5b78ce16a87e..d79e9b3265b9 100644 |
| 36947 | 36947 | 				rockchip,pins = |
| 36948 | 36948 | 					<2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; |
| 36949 | 36949 | diff --git a/arch/arm64/boot/dts/socionext/Makefile b/arch/arm64/boot/dts/socionext/Makefile |
| 36950 | | index 4a13a3a97101..4bc091b365fd 100644 |
| 36950 | index 4a13a3a971010e7c09f7919b6dacc796c1e3efa4..4bc091b365fd1563999c5dc4fd62f16e64acce80 100644 |
| 36951 | 36951 | --- a/arch/arm64/boot/dts/socionext/Makefile |
| 36952 | 36952 | +++ b/arch/arm64/boot/dts/socionext/Makefile |
| 36953 | 36953 | @@ -2,7 +2,8 @@ dtb-$(CONFIG_ARCH_UNIPHIER) += \ |
| ... | ... | @@ -36961,7 +36961,7 @@ index 4a13a3a97101..4bc091b365fd 100644 |
| 36961 | 36961 | always		:= $(dtb-y) |
| 36962 | 36962 | clean-files	:= *.dtb |
| 36963 | 36963 | diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts b/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts |
| 36964 | | index 115357018ef7..2452b2243f42 100644 |
| 36964 | index 115357018ef7c73b81c20901badfbab4da71b243..2452b2243f42465476b65891d6a0df6bc5ffda37 100644 |
| 36965 | 36965 | --- a/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts |
| 36966 | 36966 | +++ b/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts |
| 36967 | 36967 | @@ -9,7 +9,7 @@ |
| ... | ... | @@ -36982,7 +36982,7 @@ index 115357018ef7..2452b2243f42 100644 |
| 36982 | 36982 | +	status = "okay"; |
| 36983 | 36983 | +}; |
| 36984 | 36984 | diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts |
| 36985 | | index cc8ebe34c27c..ffb473ad2e0f 100644 |
| 36985 | index cc8ebe34c27cd35e131e7a05f66a5c5a63dca7e4..ffb473ad2e0fdbad76e43e50ddcaf3eb32f30c72 100644 |
| 36986 | 36986 | --- a/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts |
| 36987 | 36987 | +++ b/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts |
| 36988 | 36988 | @@ -8,9 +8,9 @@ |
| ... | ... | @@ -36999,7 +36999,7 @@ index cc8ebe34c27c..ffb473ad2e0f 100644 |
| 36999 | 36999 | / { |
| 37000 | 37000 | 	model = "UniPhier LD11 Reference Board"; |
| 37001 | 37001 | diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi |
| 37002 | | index bdce5b89baec..ee4aff53a5f5 100644 |
| 37002 | index bdce5b89baece0b53738deb8ff76c18f142f986b..ee4aff53a5f5dc8063bf0779e23da47fe5f4e522 100644 |
| 37003 | 37003 | --- a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi |
| 37004 | 37004 | +++ b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi |
| 37005 | 37005 | @@ -150,6 +150,17 @@ serial3: serial@54006b00 { |
| ... | ... | @@ -37060,7 +37060,7 @@ index bdce5b89baec..ee4aff53a5f5 100644 |
| 37060 | 37060 | -/include/ "uniphier-pinctrl.dtsi" |
| 37061 | 37061 | +#include "uniphier-pinctrl.dtsi" |
| 37062 | 37062 | diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts b/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts |
| 37063 | | index 9f620d4101b5..fc2bc9d75d35 100644 |
| 37063 | index 9f620d4101b54fa0a1d2aecee398813598891c41..fc2bc9d75d35e6f410a6f012b461cdcac03d6282 100644 |
| 37064 | 37064 | --- a/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts |
| 37065 | 37065 | +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts |
| 37066 | 37066 | @@ -9,7 +9,7 @@ |
| ... | ... | @@ -37081,7 +37081,7 @@ index 9f620d4101b5..fc2bc9d75d35 100644 |
| 37081 | 37081 | +	status = "okay"; |
| 37082 | 37082 | +}; |
| 37083 | 37083 | diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts |
| 37084 | | index 494166aee24c..1ca0c8620dc5 100644 |
| 37084 | index 494166aee24ce3c304045075c1a0938f6fdf43f2..1ca0c8620dc5ac33118a72beb5b586ab8ff0ce2f 100644 |
| 37085 | 37085 | --- a/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts |
| 37086 | 37086 | +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts |
| 37087 | 37087 | @@ -8,9 +8,9 @@ |
| ... | ... | @@ -37098,7 +37098,7 @@ index 494166aee24c..1ca0c8620dc5 100644 |
| 37098 | 37098 | / { |
| 37099 | 37099 | 	model = "UniPhier LD20 Reference Board"; |
| 37100 | 37100 | diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi |
| 37101 | | index de1e75362817..a29c279b6e8e 100644 |
| 37101 | index de1e7536281718f59617bc3b7be83c7e9ea53ace..a29c279b6e8e4c484b14c77047d1b8436103f6b3 100644 |
| 37102 | 37102 | --- a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi |
| 37103 | 37103 | +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi |
| 37104 | 37104 | @@ -219,6 +219,17 @@ serial3: serial@54006b00 { |
| ... | ... | @@ -37169,7 +37169,7 @@ index de1e75362817..a29c279b6e8e 100644 |
| 37169 | 37169 | +#include "uniphier-pinctrl.dtsi" |
| 37170 | 37170 | diff --git a/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi b/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi |
| 37171 | 37171 | deleted file mode 120000 |
| 37172 | | index f42fb6f38bd3..000000000000 |
| 37172 | index f42fb6f38bd35ae90d23fa1b10edabb0a6ef35df..0000000000000000000000000000000000000000 |
| 37173 | 37173 | --- a/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi |
| 37174 | 37174 | +++ /dev/null |
| 37175 | 37175 | @@ -1 +0,0 @@ |
| ... | ... | @@ -37177,14 +37177,14 @@ index f42fb6f38bd3..000000000000 |
| 37177 | 37177 | \ No newline at end of file |
| 37178 | 37178 | diff --git a/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi b/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi |
| 37179 | 37179 | new file mode 100644 |
| 37180 | | index 000000000000..9caabbb8bae3 |
| 37180 | index 0000000000000000000000000000000000000000..9caabbb8bae3fdd1d1e17ad8d63b99979aef971d |
| 37181 | 37181 | --- /dev/null |
| 37182 | 37182 | +++ b/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi |
| 37183 | 37183 | @@ -0,0 +1 @@ |
| 37184 | 37184 | +#include <arm/uniphier-pinctrl.dtsi> |
| 37185 | 37185 | diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dts |
| 37186 | 37186 | new file mode 100644 |
| 37187 | | index 000000000000..d65f746a3f9d |
| 37187 | index 0000000000000000000000000000000000000000..d65f746a3f9d7843761f057840786236fc8a3abd |
| 37188 | 37188 | --- /dev/null |
| 37189 | 37189 | +++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dts |
| 37190 | 37190 | @@ -0,0 +1,62 @@ |
| ... | ... | @@ -37252,7 +37252,7 @@ index 000000000000..d65f746a3f9d |
| 37252 | 37252 | +}; |
| 37253 | 37253 | diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi |
| 37254 | 37254 | new file mode 100644 |
| 37255 | | index 000000000000..384729fa740f |
| 37255 | index 0000000000000000000000000000000000000000..384729fa740f0b3b8863e1c7c47ddfe50fb9160c |
| 37256 | 37256 | --- /dev/null |
| 37257 | 37257 | +++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi |
| 37258 | 37258 | @@ -0,0 +1,367 @@ |
| ... | ... | @@ -37625,7 +37625,7 @@ index 000000000000..384729fa740f |
| 37625 | 37625 | +#include "uniphier-pinctrl.dtsi" |
| 37626 | 37626 | diff --git a/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi |
| 37627 | 37627 | deleted file mode 120000 |
| 37628 | | index 4685a8d89cba..000000000000 |
| 37628 | index 4685a8d89cba2b56bcdc24e399c79a850d799491..0000000000000000000000000000000000000000 |
| 37629 | 37629 | --- a/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi |
| 37630 | 37630 | +++ /dev/null |
| 37631 | 37631 | @@ -1 +0,0 @@ |
| ... | ... | @@ -37633,14 +37633,14 @@ index 4685a8d89cba..000000000000 |
| 37633 | 37633 | \ No newline at end of file |
| 37634 | 37634 | diff --git a/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi |
| 37635 | 37635 | new file mode 100644 |
| 37636 | | index 000000000000..e66d999d9f5d |
| 37636 | index 0000000000000000000000000000000000000000..e66d999d9f5d3a1ab87fc398ef611ef4cf048be2 |
| 37637 | 37637 | --- /dev/null |
| 37638 | 37638 | +++ b/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi |
| 37639 | 37639 | @@ -0,0 +1 @@ |
| 37640 | 37640 | +#include <arm/uniphier-ref-daughter.dtsi> |
| 37641 | 37641 | diff --git a/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi b/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi |
| 37642 | 37642 | deleted file mode 120000 |
| 37643 | | index 1246db9be2a1..000000000000 |
| 37643 | index 1246db9be2a1914221d74871b1e6f303884731c6..0000000000000000000000000000000000000000 |
| 37644 | 37644 | --- a/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi |
| 37645 | 37645 | +++ /dev/null |
| 37646 | 37646 | @@ -1 +0,0 @@ |
| ... | ... | @@ -37648,13 +37648,13 @@ index 1246db9be2a1..000000000000 |
| 37648 | 37648 | \ No newline at end of file |
| 37649 | 37649 | diff --git a/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi b/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi |
| 37650 | 37650 | new file mode 100644 |
| 37651 | | index 000000000000..28c5b4ed1d95 |
| 37651 | index 0000000000000000000000000000000000000000..28c5b4ed1d9500fb283876ba766d826a81c44a8d |
| 37652 | 37652 | --- /dev/null |
| 37653 | 37653 | +++ b/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi |
| 37654 | 37654 | @@ -0,0 +1 @@ |
| 37655 | 37655 | +#include <arm/uniphier-support-card.dtsi> |
| 37656 | 37656 | diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi |
| 37657 | | index cdc6a437dcc7..b87b8316f4ac 100644 |
| 37657 | index cdc6a437dcc73d33c0aaedb28df523cda333891a..b87b8316f4acaecab6e5a243f2cce8ae2f1c7d31 100644 |
| 37658 | 37658 | --- a/arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi |
| 37659 | 37659 | +++ b/arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi |
| 37660 | 37660 | @@ -11,7 +11,7 @@ |
| ... | ... | @@ -37728,7 +37728,7 @@ index cdc6a437dcc7..b87b8316f4ac 100644 |
| 37728 | 37728 | 	clocks = <&misc_clk>, <&misc_clk>, <&misc_clk>; |
| 37729 | 37729 | }; |
| 37730 | 37730 | diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts |
| 37731 | | index ef1b9e573af0..bf552674a834 100644 |
| 37731 | index ef1b9e573af0f5bd2ed6792ba5c9450a64ecaa45..bf552674a834140c0d574fe8b2fd3b0613c17798 100644 |
| 37732 | 37732 | --- a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts |
| 37733 | 37733 | +++ b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts |
| 37734 | 37734 | @@ -13,13 +13,15 @@ |
| ... | ... | @@ -37797,7 +37797,7 @@ index ef1b9e573af0..bf552674a834 100644 |
| 37797 | 37797 | 			reg = <0x0 0x100000>; |
| 37798 | 37798 | 		}; |
| 37799 | 37799 | diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi |
| 37800 | | index 54dc28351c8c..7665fbddff28 100644 |
| 37800 | index 54dc28351c8cb85a0abbd4bbad554d56dbcbac79..7665fbddff280fcb4be412470e551d9409d1575e 100644 |
| 37801 | 37801 | --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi |
| 37802 | 37802 | +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi |
| 37803 | 37803 | @@ -20,33 +20,84 @@ cpus { |
| ... | ... | @@ -38152,7 +38152,7 @@ index 54dc28351c8c..7665fbddff28 100644 |
| 38152 | 38152 | 			interrupt-parent = <&gic>; |
| 38153 | 38153 | 			interrupts = <0 22 4>; |
| 38154 | 38154 | diff --git a/arch/arm64/boot/dts/zte/Makefile b/arch/arm64/boot/dts/zte/Makefile |
| 38155 | | index 667806620f59..d86c4def6bc9 100644 |
| 38155 | index 667806620f59273bf0720e121cc033bc2fc235c7..d86c4def6bc98ebac49c49b23d7294b59cf9da07 100644 |
| 38156 | 38156 | --- a/arch/arm64/boot/dts/zte/Makefile |
| 38157 | 38157 | +++ b/arch/arm64/boot/dts/zte/Makefile |
| 38158 | 38158 | @@ -1,4 +1,5 @@ |
| ... | ... | @@ -38162,7 +38162,7 @@ index 667806620f59..d86c4def6bc9 100644 |
| 38162 | 38162 | always		:= $(dtb-y) |
| 38163 | 38163 | subdir-y	:= $(dts-dirs) |
| 38164 | 38164 | diff --git a/arch/arm64/boot/dts/zte/zx296718-evb.dts b/arch/arm64/boot/dts/zte/zx296718-evb.dts |
| 38165 | | index bb900d2bbcfb..cb2519ecd724 100644 |
| 38165 | index bb900d2bbcfb5e6b9ca88187fc491142f359ed31..cb2519ecd724b526ff7f342b385d026f4c5808c0 100644 |
| 38166 | 38166 | --- a/arch/arm64/boot/dts/zte/zx296718-evb.dts |
| 38167 | 38167 | +++ b/arch/arm64/boot/dts/zte/zx296718-evb.dts |
| 38168 | 38168 | @@ -57,16 +57,28 @@ memory@40000000 { |
| ... | ... | @@ -38258,7 +38258,7 @@ index bb900d2bbcfb..cb2519ecd724 100644 |
| 38258 | 38258 | &uart0 { |
| 38259 | 38259 | diff --git a/arch/arm64/boot/dts/zte/zx296718-pcbox.dts b/arch/arm64/boot/dts/zte/zx296718-pcbox.dts |
| 38260 | 38260 | new file mode 100644 |
| 38261 | | index 000000000000..e02509f7082b |
| 38261 | index 0000000000000000000000000000000000000000..e02509f7082b1d69ac918e4145b43c6dc598523d |
| 38262 | 38262 | --- /dev/null |
| 38263 | 38263 | +++ b/arch/arm64/boot/dts/zte/zx296718-pcbox.dts |
| 38264 | 38264 | @@ -0,0 +1,143 @@ |
| ... | ... | @@ -38406,7 +38406,7 @@ index 000000000000..e02509f7082b |
| 38406 | 38406 | +	status = "okay"; |
| 38407 | 38407 | +}; |
| 38408 | 38408 | diff --git a/arch/arm64/boot/dts/zte/zx296718.dtsi b/arch/arm64/boot/dts/zte/zx296718.dtsi |
| 38409 | | index d83bf789c864..6eef64761009 100644 |
| 38409 | index d83bf789c8641b73f9c973e7aa0e1bdb41a62017..6eef64761009491ba768fa69919497e24d14f384 100644 |
| 38410 | 38410 | --- a/arch/arm64/boot/dts/zte/zx296718.dtsi |
| 38411 | 38411 | +++ b/arch/arm64/boot/dts/zte/zx296718.dtsi |
| 38412 | 38412 | @@ -53,6 +53,13 @@ / { |
| ... | ... | @@ -38675,7 +38675,7 @@ index d83bf789c864..6eef64761009 100644 |
| 38675 | 38675 | 			compatible = "zte,zx296702-spdif"; |
| 38676 | 38676 | 			reg = <0x1488000 0x1000>; |
| 38677 | 38677 | diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c |
| 38678 | | index a7ea5f3da89d..964489b39f6a 100644 |
| 38678 | index a7ea5f3da89d5357c2332f8a7fe4afa609cb9997..964489b39f6a0ed6e1a98ed28f26c676db52d0d8 100644 |
| 38679 | 38679 | --- a/drivers/clk/meson/gxbb.c |
| 38680 | 38680 | +++ b/drivers/clk/meson/gxbb.c |
| 38681 | 38681 | @@ -1188,6 +1188,7 @@ static struct clk_hw_onecell_data gxbb_hw_onecell_data = { |
| ... | ... | @@ -38695,7 +38695,7 @@ index a7ea5f3da89d..964489b39f6a 100644 |
| 38695 | 38695 | 	.num = NR_CLKS, |
| 38696 | 38696 | }; |
| 38697 | 38697 | diff --git a/drivers/clk/meson/gxbb.h b/drivers/clk/meson/gxbb.h |
| 38698 | | index d63e77e8433d..5b1d4b374d1c 100644 |
| 38698 | index d63e77e8433d1f73fbcf52ce0122b6350c0dd15d..5b1d4b374d1c21dfa9ded8167b5e9d32bad95b77 100644 |
| 38699 | 38699 | --- a/drivers/clk/meson/gxbb.h |
| 38700 | 38700 | +++ b/drivers/clk/meson/gxbb.h |
| 38701 | 38701 | @@ -167,130 +167,33 @@ |
| ... | ... | @@ -38844,7 +38844,7 @@ index d63e77e8433d..5b1d4b374d1c 100644 |
| 38844 | 38844 | |
| 38845 | 38845 | #endif /* __GXBB_H */ |
| 38846 | 38846 | diff --git a/drivers/clk/meson/meson8b.c b/drivers/clk/meson/meson8b.c |
| 38847 | | index 6ec512ad2598..cb60a516ca82 100644 |
| 38847 | index 6ec512ad259805c34b57be3ee96eddef149599ee..cb60a516ca82bcf85d3b8334306696531ab6a597 100644 |
| 38848 | 38848 | --- a/drivers/clk/meson/meson8b.c |
| 38849 | 38849 | +++ b/drivers/clk/meson/meson8b.c |
| 38850 | 38850 | @@ -590,6 +590,7 @@ static struct clk_hw_onecell_data meson8b_hw_onecell_data = { |
| ... | ... | @@ -38856,7 +38856,7 @@ index 6ec512ad2598..cb60a516ca82 100644 |
| 38856 | 38856 | 	.num = CLK_NR_CLKS, |
| 38857 | 38857 | }; |
| 38858 | 38858 | diff --git a/drivers/clk/meson/meson8b.h b/drivers/clk/meson/meson8b.h |
| 38859 | | index a687e02547dc..c139bb3273ca 100644 |
| 38859 | index a687e02547dcc9280d7bdf3bee07efd2db110e8f..c139bb3273ca74a557605c987694e53980a5fb62 100644 |
| 38860 | 38860 | --- a/drivers/clk/meson/meson8b.h |
| 38861 | 38861 | +++ b/drivers/clk/meson/meson8b.h |
| 38862 | 38862 | @@ -60,107 +60,12 @@ |
| ... | ... | @@ -38972,7 +38972,7 @@ index a687e02547dc..c139bb3273ca 100644 |
| 38972 | 38972 | |
| 38973 | 38973 | /* include the CLKIDs that have been made part of the stable DT binding */ |
| 38974 | 38974 | diff --git a/include/dt-bindings/clock/gxbb-aoclkc.h b/include/dt-bindings/clock/gxbb-aoclkc.h |
| 38975 | | index 31751482d13c..9d15e2221fdb 100644 |
| 38975 | index 31751482d13cb498fb4989a41cb336e8c7e92e13..9d15e2221fdb7fd5f732eaa5a800f7b66112f8a5 100644 |
| 38976 | 38976 | --- a/include/dt-bindings/clock/gxbb-aoclkc.h |
| 38977 | 38977 | +++ b/include/dt-bindings/clock/gxbb-aoclkc.h |
| 38978 | 38978 | @@ -62,5 +62,6 @@ |
| ... | ... | @@ -38983,7 +38983,7 @@ index 31751482d13c..9d15e2221fdb 100644 |
| 38983 | 38983 | |
| 38984 | 38984 | #endif |
| 38985 | 38985 | diff --git a/include/dt-bindings/clock/gxbb-clkc.h b/include/dt-bindings/clock/gxbb-clkc.h |
| 38986 | | index e3e9f7919c31..c04a76d8facf 100644 |
| 38986 | index e3e9f7919c318baed4063fc7199def1a6d684018..c04a76d8facff42319d708830c985bf342427627 100644 |
| 38987 | 38987 | --- a/include/dt-bindings/clock/gxbb-clkc.h |
| 38988 | 38988 | +++ b/include/dt-bindings/clock/gxbb-clkc.h |
| 38989 | 38989 | @@ -5,37 +5,96 @@ |
| ... | ... | @@ -39094,7 +39094,7 @@ index e3e9f7919c31..c04a76d8facf 100644 |
| 39094 | 39094 | |
| 39095 | 39095 | #endif /* __GXBB_CLKC_H */ |
| 39096 | 39096 | diff --git a/include/dt-bindings/clock/meson8b-clkc.h b/include/dt-bindings/clock/meson8b-clkc.h |
| 39097 | | index e29227fb52a1..a9c0306330b6 100644 |
| 39097 | index e29227fb52a18c66b6aba5773f38fc0c872ea97d..a9c0306330b6a78e910fb5b1fb9fd3dfd107b01e 100644 |
| 39098 | 39098 | --- a/include/dt-bindings/clock/meson8b-clkc.h |
| 39099 | 39099 | +++ b/include/dt-bindings/clock/meson8b-clkc.h |
| 39100 | 39100 | @@ -21,15 +21,85 @@ |
| ... | ... | @@ -39184,7 +39184,7 @@ index e29227fb52a1..a9c0306330b6 100644 |
| 39184 | 39184 | |
| 39185 | 39185 | #endif /* __MESON8B_CLKC_H */ |
| 39186 | 39186 | diff --git a/include/dt-bindings/clock/rv1108-cru.h b/include/dt-bindings/clock/rv1108-cru.h |
| 39187 | | index ae26f8105914..f269d833e41a 100644 |
| 39187 | index ae26f81059142867a009197e1c37c8e00d3dbd21..f269d833e41a32851af31a81cf09a9ff8c2ae1b8 100644 |
| 39188 | 39188 | --- a/include/dt-bindings/clock/rv1108-cru.h |
| 39189 | 39189 | +++ b/include/dt-bindings/clock/rv1108-cru.h |
| 39190 | 39190 | @@ -43,12 +43,73 @@ |
| ... | ... | @@ -39389,7 +39389,7 @@ index ae26f8105914..f269d833e41a 100644 |
| 39389 | 39389 | #define PRST_PMU_GRF			179 |
| 39390 | 39390 | diff --git a/include/dt-bindings/genpd/k2g.h b/include/dt-bindings/genpd/k2g.h |
| 39391 | 39391 | deleted file mode 100644 |
| 39392 | | index 1f31f17e19eb..000000000000 |
| 39392 | index 1f31f17e19ebca5e528ad9498047ec9bd973d3c4..0000000000000000000000000000000000000000 |
| 39393 | 39393 | --- a/include/dt-bindings/genpd/k2g.h |
| 39394 | 39394 | +++ /dev/null |
| 39395 | 39395 | @@ -1,90 +0,0 @@ |
| ... | ... | @@ -39484,7 +39484,7 @@ index 1f31f17e19eb..000000000000 |
| 39484 | 39484 | - |
| 39485 | 39485 | -#endif |
| 39486 | 39486 | diff --git a/include/dt-bindings/pinctrl/dra.h b/include/dt-bindings/pinctrl/dra.h |
| 39487 | | index 5c75e80915fc..18ec5df5a581 100644 |
| 39487 | index 5c75e80915fcdc5b4411984cd57b8308eb388bfb..18ec5df5a5812a9f037247b6c95de1d15fba2546 100644 |
| 39488 | 39488 | --- a/include/dt-bindings/pinctrl/dra.h |
| 39489 | 39489 | +++ b/include/dt-bindings/pinctrl/dra.h |
| 39490 | 39490 | @@ -73,5 +73,8 @@ |
| ... | ... | @@ -39498,7 +39498,7 @@ index 5c75e80915fc..18ec5df5a581 100644 |
| 39498 | 39498 | |
| 39499 | 39499 | diff --git a/include/dt-bindings/reset/amlogic,meson8b-clkc-reset.h b/include/dt-bindings/reset/amlogic,meson8b-clkc-reset.h |
| 39500 | 39500 | new file mode 100644 |
| 39501 | | index 000000000000..1f1b56e57346 |
| 39501 | index 0000000000000000000000000000000000000000..1f1b56e57346e3b939a4597b9242d2aacbcbc33d |
| 39502 | 39502 | --- /dev/null |
| 39503 | 39503 | +++ b/include/dt-bindings/reset/amlogic,meson8b-clkc-reset.h |
| 39504 | 39504 | @@ -0,0 +1,27 @@ |