diff options
author | Olof Johansson <olof@lixom.net> | 2015-07-14 11:16:55 +0200 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2015-07-14 11:16:55 +0200 |
commit | a549608f5c8423eb25115785ad465c5a57cbe0de (patch) | |
tree | 408354b3cd06a83fcd855289e38ee7dc562e4148 /arch | |
parent | 1d8aca9df612f5751892fb2642d72536f2f48fd0 (diff) | |
parent | 93abc72bc7901cfc61a2871da7a565c9fdb26108 (diff) | |
download | linux-a549608f5c8423eb25115785ad465c5a57cbe0de.tar.gz linux-a549608f5c8423eb25115785ad465c5a57cbe0de.tar.bz2 linux-a549608f5c8423eb25115785ad465c5a57cbe0de.zip |
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
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts index 71468a7eb28f..5e17fd147728 100644 --- a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts +++ b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts @@ -60,27 +60,27 @@ rxc-skew-ps = <2000>; }; -&mmc0 { - vmmc-supply = <®ulator_3_3v>; - vqmmc-supply = <®ulator_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 = <®ulator_3_3v>; + vqmmc-supply = <®ulator_3_3v>; +}; + +&usb1 { + status = "okay"; +}; |