ARM: dts: socfpga: Change Mercury+ AA1 dts to dtsi

The Mercury+ AA1 is not a standalone board, rather it's a module
with an Arria 10 SoC. Remove status = "okay" and i2c aliases, as they
are routed to the base board and should be enabled from there.

Signed-off-by: Paweł Anikiel <pan@semihalf.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 184899808ee73795a6081e31370a4eb6c3d829cb..b0dccad58a1d7b80d236e7596812fe9d9ced79c1 100644 (file)
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1148,7 +1148,6 @@ dtb-$(CONFIG_ARCH_S5PV210) += \
        s5pv210-torbreck.dtb
 dtb-$(CONFIG_ARCH_INTEL_SOCFPGA) += \
        socfpga_arria5_socdk.dtb \
-       socfpga_arria10_mercury_aa1.dtb \
        socfpga_arria10_socdk_nand.dtb \
        socfpga_arria10_socdk_qspi.dtb \
        socfpga_arria10_socdk_sdmmc.dtb \

diff --git a/arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts b/arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dtsi
similarity index 84%
rename from arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts
rename to arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dtsi
index a75c059b6727d9e54b83ee4966cc7931deb8576a..4b21351f2694bcbc455771eec938816e520d872b 100644 (file)
--- a/arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts
+++ b/arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dtsi
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0
-/dts-v1/;
 
 #include "socfpga_arria10.dtsi"
 
@@ -11,8 +10,6 @@
        aliases {
                ethernet0 = &gmac0;
                serial1 = &uart1;
-               i2c0 = &i2c0;
-               i2c1 = &i2c1;
        };
 
        memory@0 {
@@ -43,7 +40,6 @@
        phy-addr = <0xffffffff>; /* probe for phy addr */
 
        max-frame-size = <3800>;
-       status = "okay";
 
        phy-handle = <&phy3>;
 
@@ -69,22 +65,8 @@
        };
 };
 
-&gpio0 {
-       status = "okay";
-};
-
-&gpio1 {
-       status = "okay";
-};
-
-&gpio2 {
-       status = "okay";
-};
-
 &i2c1 {
-       status = "okay";
        isl12022: isl12022@6f {
-               status = "okay";
                compatible = "isil,isl12022";
                reg = <0x6f>;
        };
@@ -92,7 +74,6 @@
 
 /* Following mappings are taken from arria10 socdk dts */
 &mmc {
-       status = "okay";
        cap-sd-highspeed;
        broken-cd;
        bus-width = <4>;
@@ -101,12 +82,3 @@
 &osc1 {
        clock-frequency = <33330000>;
 };
-
-&uart1 {
-       status = "okay";
-};
-
-&usb0 {
-       status = "okay";
-       dr_mode = "host";
-};