Commit a549608f authored by Olof Johansson's avatar Olof Johansson

Merge tag 'socfpga_fixes_for_v4.2-rc1' of...

Merge tag 'socfpga_fixes_for_v4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into fixes

Merge "SoCFPGA fixes for v4.2-rc1" from Dinh Nguyen:

SoCFPGA fixes against v4.2-rc1
- Update compatible "adxl345x" compatible string
- Alphabetize the DTS nodes for the C5 sockit board file

* tag 'socfpga_fixes_for_v4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: socfpga: dts: Fix entries order
  ARM: socfpga: dts: Fix adxl34x formating and compatible string
parents 1d8aca9d 93abc72b
...@@ -60,27 +60,27 @@ &gmac1 { ...@@ -60,27 +60,27 @@ &gmac1 {
rxc-skew-ps = <2000>; rxc-skew-ps = <2000>;
}; };
&mmc0 {
vmmc-supply = <&regulator_3_3v>;
vqmmc-supply = <&regulator_3_3v>;
};
&usb1 {
status = "okay";
};
&gpio2 { &gpio2 {
status = "okay"; status = "okay";
}; };
&i2c1{ &i2c1 {
status = "okay"; status = "okay";
accel1: accel1@53{ accel1: accelerometer@53 {
compatible = "adxl34x"; compatible = "adi,adxl345";
reg = <0x53>; reg = <0x53>;
interrupt-parent = < &portc >; interrupt-parent = <&portc>;
interrupts = <3 2>; interrupts = <3 2>;
}; };
}; };
&mmc0 {
vmmc-supply = <&regulator_3_3v>;
vqmmc-supply = <&regulator_3_3v>;
};
&usb1 {
status = "okay";
};
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment