mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-26 20:44:32 +08:00
c3fcab3af4
- 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.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJYjWLQAAoJEFBXWFqHsHzOGt0H/2WCsuRi6WU7i7Wyk/S0Xq5t
HzA/9m2f7z1vb1tzFknbpcWYa9bdofI7Dz+6KW2vp4fxhMyJn8SQxWwQjVNya2ba
z8XLdEMlIuozBebPcH84ovNzqoBIOEFahGm5smm40s/o7XL8ua9tOEFaUc+jY0Pd
n/3TPmoyBTlbrgiCZfLXCVsczHtEVW5JoQmXT7aDsxT0BQpnwLbgXKVOxgDvsWXM
WtAKjpGvdiApD3znbFjYmRKak+2uilkV5B4jrL4mZf8dxCliykP4XA/LbiMLKAMN
voMpTtTK7UYp59GrwKbqfJ+pPU7b6ndKK59f7FWrTDNgtDGe+J4ExjWwsDnuLfI=
=HAbg
-----END PGP SIGNATURE-----
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>
489 lines
10 KiB
Plaintext
489 lines
10 KiB
Plaintext
/*
|
|
* Copyright (C) 2015, 2016 Zodiac Inflight Innovations
|
|
*
|
|
* Based on an original 'vf610-twr.dts' which is Copyright 2015,
|
|
* Freescale Semiconductor, Inc.
|
|
*
|
|
* This file is dual-licensed: you can use it either under the terms
|
|
* of the GPL or the X11 license, at your option. Note that this dual
|
|
* licensing only applies to this file, and not this project as a
|
|
* whole.
|
|
*
|
|
* a) This file is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* version 2 as published by the Free Software Foundation.
|
|
*
|
|
* This file is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* Or, alternatively,
|
|
*
|
|
* b) Permission is hereby granted, free of charge, to any person
|
|
* obtaining a copy of this software and associated documentation
|
|
* files (the "Software"), to deal in the Software without
|
|
* restriction, including without limitation the rights to use,
|
|
* copy, modify, merge, publish, distribute, sublicense, and/or
|
|
* sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following
|
|
* conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be
|
|
* included in all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
|
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
|
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
|
|
/dts-v1/;
|
|
#include "vf610-zii-dev.dtsi"
|
|
|
|
/ {
|
|
model = "ZII VF610 Development Board, Rev B";
|
|
compatible = "zii,vf610dev-b", "zii,vf610dev", "fsl,vf610";
|
|
|
|
mdio-mux {
|
|
compatible = "mdio-mux-gpio";
|
|
pinctrl-0 = <&pinctrl_mdio_mux>;
|
|
pinctrl-names = "default";
|
|
gpios = <&gpio0 8 GPIO_ACTIVE_HIGH
|
|
&gpio0 9 GPIO_ACTIVE_HIGH
|
|
&gpio0 24 GPIO_ACTIVE_HIGH
|
|
&gpio0 25 GPIO_ACTIVE_HIGH>;
|
|
mdio-parent-bus = <&mdio1>;
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
|
|
mdio_mux_1: mdio@1 {
|
|
reg = <1>;
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
|
|
switch0: switch@0 {
|
|
compatible = "marvell,mv88e6085";
|
|
pinctrl-0 = <&pinctrl_gpio_switch0>;
|
|
pinctrl-names = "default";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
reg = <0>;
|
|
dsa,member = <0 0>;
|
|
interrupt-parent = <&gpio0>;
|
|
interrupts = <27 IRQ_TYPE_LEVEL_LOW>;
|
|
interrupt-controller;
|
|
#interrupt-cells = <2>;
|
|
|
|
ports {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
|
|
port@0 {
|
|
reg = <0>;
|
|
label = "lan0";
|
|
phy-handle = <&switch0phy0>;
|
|
};
|
|
|
|
port@1 {
|
|
reg = <1>;
|
|
label = "lan1";
|
|
phy-handle = <&switch0phy1>;
|
|
};
|
|
|
|
port@2 {
|
|
reg = <2>;
|
|
label = "lan2";
|
|
phy-handle = <&switch0phy2>;
|
|
};
|
|
|
|
switch0port5: port@5 {
|
|
reg = <5>;
|
|
label = "dsa";
|
|
phy-mode = "rgmii-txid";
|
|
link = <&switch1port6
|
|
&switch2port9>;
|
|
fixed-link {
|
|
speed = <1000>;
|
|
full-duplex;
|
|
};
|
|
};
|
|
|
|
port@6 {
|
|
reg = <6>;
|
|
label = "cpu";
|
|
ethernet = <&fec1>;
|
|
|
|
fixed-link {
|
|
speed = <100>;
|
|
full-duplex;
|
|
};
|
|
};
|
|
};
|
|
mdio {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
switch0phy0: switch0phy0@0 {
|
|
reg = <0>;
|
|
interrupt-parent = <&switch0>;
|
|
interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;
|
|
};
|
|
switch0phy1: switch1phy0@1 {
|
|
reg = <1>;
|
|
interrupt-parent = <&switch0>;
|
|
interrupts = <1 IRQ_TYPE_LEVEL_HIGH>;
|
|
};
|
|
switch0phy2: switch1phy0@2 {
|
|
reg = <2>;
|
|
interrupt-parent = <&switch0>;
|
|
interrupts = <2 IRQ_TYPE_LEVEL_HIGH>;
|
|
};
|
|
};
|
|
};
|
|
};
|
|
|
|
mdio_mux_2: mdio@2 {
|
|
reg = <2>;
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
|
|
switch1: switch@0 {
|
|
compatible = "marvell,mv88e6085";
|
|
pinctrl-0 = <&pinctrl_gpio_switch1>;
|
|
pinctrl-names = "default";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
reg = <0>;
|
|
dsa,member = <0 1>;
|
|
interrupt-parent = <&gpio0>;
|
|
interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
|
|
interrupt-controller;
|
|
#interrupt-cells = <2>;
|
|
|
|
ports {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
|
|
port@0 {
|
|
reg = <0>;
|
|
label = "lan3";
|
|
phy-handle = <&switch1phy0>;
|
|
};
|
|
|
|
port@1 {
|
|
reg = <1>;
|
|
label = "lan4";
|
|
phy-handle = <&switch1phy1>;
|
|
};
|
|
|
|
port@2 {
|
|
reg = <2>;
|
|
label = "lan5";
|
|
phy-handle = <&switch1phy2>;
|
|
};
|
|
|
|
switch1port5: port@5 {
|
|
reg = <5>;
|
|
label = "dsa";
|
|
link = <&switch2port9>;
|
|
phy-mode = "rgmii-txid";
|
|
|
|
fixed-link {
|
|
speed = <1000>;
|
|
full-duplex;
|
|
};
|
|
};
|
|
|
|
switch1port6: port@6 {
|
|
reg = <6>;
|
|
label = "dsa";
|
|
phy-mode = "rgmii-txid";
|
|
link = <&switch0port5>;
|
|
fixed-link {
|
|
speed = <1000>;
|
|
full-duplex;
|
|
};
|
|
};
|
|
};
|
|
mdio {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
|
|
switch1phy0: switch1phy0@0 {
|
|
reg = <0>;
|
|
interrupt-parent = <&switch1>;
|
|
interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;
|
|
};
|
|
|
|
switch1phy1: switch1phy0@1 {
|
|
reg = <1>;
|
|
interrupt-parent = <&switch1>;
|
|
interrupts = <1 IRQ_TYPE_LEVEL_HIGH>;
|
|
};
|
|
|
|
switch1phy2: switch1phy0@2 {
|
|
reg = <2>;
|
|
interrupt-parent = <&switch1>;
|
|
interrupts = <2 IRQ_TYPE_LEVEL_HIGH>;
|
|
};
|
|
};
|
|
};
|
|
};
|
|
|
|
mdio_mux_4: mdio@4 {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
reg = <4>;
|
|
|
|
switch2: switch2@0 {
|
|
compatible = "marvell,mv88e6085";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
reg = <0>;
|
|
dsa,member = <0 2>;
|
|
|
|
ports {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
|
|
port@0 {
|
|
reg = <0>;
|
|
label = "lan6";
|
|
};
|
|
|
|
port@1 {
|
|
reg = <1>;
|
|
label = "lan7";
|
|
};
|
|
|
|
port@2 {
|
|
reg = <2>;
|
|
label = "lan8";
|
|
};
|
|
|
|
port@3 {
|
|
reg = <3>;
|
|
label = "optical3";
|
|
|
|
fixed-link {
|
|
speed = <1000>;
|
|
full-duplex;
|
|
link-gpios = <&gpio6 2
|
|
GPIO_ACTIVE_HIGH>;
|
|
};
|
|
};
|
|
|
|
port@4 {
|
|
reg = <4>;
|
|
label = "optical4";
|
|
|
|
fixed-link {
|
|
speed = <1000>;
|
|
full-duplex;
|
|
link-gpios = <&gpio6 3
|
|
GPIO_ACTIVE_HIGH>;
|
|
};
|
|
};
|
|
|
|
switch2port9: port@9 {
|
|
reg = <9>;
|
|
label = "dsa";
|
|
phy-mode = "rgmii-txid";
|
|
link = <&switch1port5
|
|
&switch0port5>;
|
|
|
|
fixed-link {
|
|
speed = <1000>;
|
|
full-duplex;
|
|
};
|
|
};
|
|
};
|
|
};
|
|
};
|
|
|
|
mdio_mux_8: mdio@8 {
|
|
reg = <8>;
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
};
|
|
};
|
|
|
|
spi0 {
|
|
compatible = "spi-gpio";
|
|
pinctrl-0 = <&pinctrl_gpio_spi0>;
|
|
pinctrl-names = "default";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
gpio-sck = <&gpio1 12 GPIO_ACTIVE_HIGH>;
|
|
gpio-mosi = <&gpio1 11 GPIO_ACTIVE_HIGH>;
|
|
gpio-miso = <&gpio1 10 GPIO_ACTIVE_HIGH>;
|
|
cs-gpios = <&gpio1 9 GPIO_ACTIVE_HIGH
|
|
&gpio1 8 GPIO_ACTIVE_HIGH>;
|
|
num-chipselects = <2>;
|
|
|
|
m25p128@0 {
|
|
compatible = "m25p128", "jedec,spi-nor";
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
reg = <0>;
|
|
spi-max-frequency = <1000000>;
|
|
};
|
|
|
|
at93c46d@1 {
|
|
compatible = "atmel,at93c46d";
|
|
pinctrl-0 = <&pinctrl_gpio_e6185_eeprom_sel>;
|
|
pinctrl-names = "default";
|
|
#address-cells = <0>;
|
|
#size-cells = <0>;
|
|
reg = <1>;
|
|
spi-max-frequency = <500000>;
|
|
spi-cs-high;
|
|
data-size = <16>;
|
|
select-gpios = <&gpio4 4 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
};
|
|
};
|
|
|
|
&i2c0 {
|
|
clock-frequency = <100000>;
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&pinctrl_i2c0>;
|
|
status = "okay";
|
|
|
|
gpio5: pca9554@20 {
|
|
compatible = "nxp,pca9554";
|
|
reg = <0x20>;
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
|
|
};
|
|
|
|
gpio6: pca9554@22 {
|
|
compatible = "nxp,pca9554";
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&pinctrl_pca9554_22>;
|
|
reg = <0x22>;
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
interrupt-parent = <&gpio2>;
|
|
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
|
|
};
|
|
};
|
|
|
|
&i2c2 {
|
|
clock-frequency = <100000>;
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&pinctrl_i2c2>;
|
|
status = "okay";
|
|
|
|
tca9548@70 {
|
|
compatible = "nxp,pca9548";
|
|
pinctrl-0 = <&pinctrl_i2c_mux_reset>;
|
|
pinctrl-names = "default";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
reg = <0x70>;
|
|
reset-gpios = <&gpio3 23 GPIO_ACTIVE_LOW>;
|
|
|
|
i2c@0 {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
reg = <0>;
|
|
|
|
sfp1: at24c04@50 {
|
|
compatible = "atmel,24c02";
|
|
reg = <0x50>;
|
|
};
|
|
};
|
|
|
|
i2c@1 {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
reg = <1>;
|
|
|
|
sfp2: at24c04@50 {
|
|
compatible = "atmel,24c02";
|
|
reg = <0x50>;
|
|
};
|
|
};
|
|
|
|
i2c@2 {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
reg = <2>;
|
|
|
|
sfp3: at24c04@50 {
|
|
compatible = "atmel,24c02";
|
|
reg = <0x50>;
|
|
};
|
|
};
|
|
|
|
i2c@3 {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
reg = <3>;
|
|
|
|
sfp4: at24c04@50 {
|
|
compatible = "atmel,24c02";
|
|
reg = <0x50>;
|
|
};
|
|
};
|
|
|
|
i2c@4 {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
reg = <4>;
|
|
};
|
|
};
|
|
};
|
|
|
|
|
|
&iomuxc {
|
|
pinctrl_gpio_e6185_eeprom_sel: pinctrl-gpio-e6185-eeprom-spi0 {
|
|
fsl,pins = <
|
|
VF610_PAD_PTE27__GPIO_132 0x33e2
|
|
>;
|
|
};
|
|
|
|
pinctrl_gpio_spi0: pinctrl-gpio-spi0 {
|
|
fsl,pins = <
|
|
VF610_PAD_PTB22__GPIO_44 0x33e2
|
|
VF610_PAD_PTB21__GPIO_43 0x33e2
|
|
VF610_PAD_PTB20__GPIO_42 0x33e1
|
|
VF610_PAD_PTB19__GPIO_41 0x33e2
|
|
VF610_PAD_PTB18__GPIO_40 0x33e2
|
|
>;
|
|
};
|
|
|
|
pinctrl_gpio_switch0: pinctrl-gpio-switch0 {
|
|
fsl,pins = <
|
|
VF610_PAD_PTB5__GPIO_27 0x219d
|
|
>;
|
|
};
|
|
|
|
pinctrl_gpio_switch1: pinctrl-gpio-switch1 {
|
|
fsl,pins = <
|
|
VF610_PAD_PTB4__GPIO_26 0x219d
|
|
>;
|
|
};
|
|
|
|
pinctrl_mdio_mux: pinctrl-mdio-mux {
|
|
fsl,pins = <
|
|
VF610_PAD_PTA18__GPIO_8 0x31c2
|
|
VF610_PAD_PTA19__GPIO_9 0x31c2
|
|
VF610_PAD_PTB2__GPIO_24 0x31c2
|
|
VF610_PAD_PTB3__GPIO_25 0x31c2
|
|
>;
|
|
};
|
|
|
|
pinctrl_pca9554_22: pinctrl-pca95540-22 {
|
|
fsl,pins = <
|
|
VF610_PAD_PTB28__GPIO_98 0x219d
|
|
>;
|
|
};
|
|
};
|