mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-09 12:17:12 +09:00
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>
This commit is contained in:
committed by
Dinh Nguyen
parent
f2906aa863
commit
7e0ed53b07
@@ -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 \
|
||||
|
||||
@@ -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";
|
||||
};
|
||||
Reference in New Issue
Block a user