diff options
| author | Olof Johansson <olof@lixom.net> | 2017-01-29 21:07:40 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-01-29 21:07:40 -0800 |
| commit | c3fcab3af4a35959af175f421b758bc2f328fa79 (patch) | |
| tree | 6f6d691c5d5a74cc569ee326a3a32a5ce0015751 /arch/arm/boot/dts/imx7d-sdb.dts | |
| parent | 0ff3758bc349e8675b859f314e8a65457e22d3ab (diff) | |
| parent | 18ba386826f143dc4177830cc7c24c7abf4de4be (diff) | |
Merge tag 'imx-dt-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt
i.MX device tree updates for 4.11:
- New board support: vf610-zii-dev-rev-c, imx6ul-opos6uldev,
imx6ul-isiot, imx6qdl-savageboard, imx6q-mccmon6.
- A patch from Alexandre to correct the mangled license text which
has been copied & pasted all over the i.MX device tree files.
- Update cpu nodes of some i.MX SoCs to make them consistent and match
ePAPR spec.
- Add OCOTP device for i.MX6UL SoC.
- Add security violation interrupt for i.MX25 DryIce.
- Enable USB OTG, WIFI and Bluetooth support for i.MX6SX Udoo Neo
board.
- Enable S/PDIF and 2nd display pipeline support for CompuLab board..
- Add SPI and LTC3676 PMIC support for Gateworks Ventana boards.
- A few random device addition for various boards: TVE DAC regulators
for imx53-qsb, EEPROM for vf610-zii-dev, eMMC and NAND support for
i.MX6UL Engicam boards.
- Cleanups on obsoleted or unused properties.
* tag 'imx-dt-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (32 commits)
ARM: dts: udoo_neo: Add Bluetooth support
ARM: dts: udoo_neo: Add Wifi support
ARM: dts: udoo_neo: Add UDOO Neo USB OTG1 and OTG2 support
ARM: dts: imx6ul: Add Engicam Is.IoT MX6UL NAND initial support
ARM: dts: imx6ul: Add Engicam Is.IoT MX6UL eMMC initial support
ARM: dts: imx6qdl: Fix "ERROR: code indent should use tabs where possible"
ARM: dts: vf610-zii-dev: add EEPROM entry to Rev C
ARM: dts: add Armadeus Systems OPOS6UL and OPOS6ULDEV support
ARM: dts: imx6q-utilite-pro: enable 2nd display pipeline
ARM: dts: vf610-zii-dev: Add .dts file for rev. C
ARM: dts: vf610-zii-dev-rev-b: Remove leftover PWM pingroup
ARM: dts: imx6: Support Savageboard quad
ARM: dts: imx6: Support Savageboard dual
ARM: dts: imx6: Add Savageboard common file
ARM: dts: imx53-qsb: Provide the TVE DAC regulators
ARM: dts: imx6q: Add mccmon6 board support
Doc: devicetree: bindings: Add vendor prefix entry - lwn
ARM: dts: imx/vf: Correct license text
ARM: dts: imx25.dtsi: DryIce security violation interrupt
ARM: dts: imx: Add ocotp node for imx6ul
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/imx7d-sdb.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx7d-sdb.dts | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts index 94edf8e01c00..5be01a1bf840 100644 --- a/arch/arm/boot/dts/imx7d-sdb.dts +++ b/arch/arm/boot/dts/imx7d-sdb.dts @@ -111,7 +111,6 @@ }; &ecspi3 { - fsl,spi-num-chipselects = <1>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_ecspi3>; cs-gpios = <&gpio5 9 GPIO_ACTIVE_HIGH>; |