Skip to content

Commit

Permalink
Merge tag 'socfpga_fixes_for_v4.2-rc1' of git://git.kernel.org/pub/sc…
Browse files Browse the repository at this point in the history
…m/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
  • Loading branch information
Olof Johansson committed Jul 14, 2015
2 parents 1d8aca9 + 93abc72 commit a549608
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
Original file line number Diff line number Diff line change
Expand Up @@ -60,27 +60,27 @@
rxc-skew-ps = <2000>;
};

&mmc0 {
vmmc-supply = <&regulator_3_3v>;
vqmmc-supply = <&regulator_3_3v>;
};

&usb1 {
status = "okay";
};

&gpio2 {
status = "okay";
};

&i2c1{
&i2c1 {
status = "okay";

accel1: accel1@53{
compatible = "adxl34x";
accel1: accelerometer@53 {
compatible = "adi,adxl345";
reg = <0x53>;

interrupt-parent = < &portc >;
interrupt-parent = <&portc>;
interrupts = <3 2>;
};
};

&mmc0 {
vmmc-supply = <&regulator_3_3v>;
vqmmc-supply = <&regulator_3_3v>;
};

&usb1 {
status = "okay";
};

0 comments on commit a549608

Please sign in to comment.