Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Paweł Anikiel and committed by
Dinh Nguyen
7e0ed53b f2906aa8

-29
-1
arch/arm/boot/dts/Makefile
··· 1148 1148 s5pv210-torbreck.dtb 1149 1149 dtb-$(CONFIG_ARCH_INTEL_SOCFPGA) += \ 1150 1150 socfpga_arria5_socdk.dtb \ 1151 - socfpga_arria10_mercury_aa1.dtb \ 1152 1151 socfpga_arria10_socdk_nand.dtb \ 1153 1152 socfpga_arria10_socdk_qspi.dtb \ 1154 1153 socfpga_arria10_socdk_sdmmc.dtb \
-28
arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dtsi
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 - /dts-v1/; 3 2 4 3 #include "socfpga_arria10.dtsi" 5 4 ··· 10 11 aliases { 11 12 ethernet0 = &gmac0; 12 13 serial1 = &uart1; 13 - i2c0 = &i2c0; 14 - i2c1 = &i2c1; 15 14 }; 16 15 17 16 memory@0 { ··· 40 43 phy-addr = <0xffffffff>; /* probe for phy addr */ 41 44 42 45 max-frame-size = <3800>; 43 - status = "okay"; 44 46 45 47 phy-handle = <&phy3>; 46 48 ··· 65 69 }; 66 70 }; 67 71 68 - &gpio0 { 69 - status = "okay"; 70 - }; 71 - 72 - &gpio1 { 73 - status = "okay"; 74 - }; 75 - 76 - &gpio2 { 77 - status = "okay"; 78 - }; 79 - 80 72 &i2c1 { 81 - status = "okay"; 82 73 isl12022: isl12022@6f { 83 - status = "okay"; 84 74 compatible = "isil,isl12022"; 85 75 reg = <0x6f>; 86 76 }; ··· 74 92 75 93 /* Following mappings are taken from arria10 socdk dts */ 76 94 &mmc { 77 - status = "okay"; 78 95 cap-sd-highspeed; 79 96 broken-cd; 80 97 bus-width = <4>; ··· 81 100 82 101 &osc1 { 83 102 clock-frequency = <33330000>; 84 - }; 85 - 86 - &uart1 { 87 - status = "okay"; 88 - }; 89 - 90 - &usb0 { 91 - status = "okay"; 92 - dr_mode = "host"; 93 103 };