Skip to content

L
linux
Commit 1fc7210c authored by Olof Johansson's avatar Olof Johansson
Browse files
Options

Merge tag 'imx-dt-4.10' of... 

Merge tag 'imx-dt-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt

i.MX device tree updates for 4.10:
 - New boards support: i.MX6SX UDOO Neo, Boundary Devices Nitrogen6_SOM2,
   Engicam i.CoreM6, Grinn i.MX6UL liteSOM/liteBoard, Toradex Colibri
   iMX6 module, i.MX6ULL and EVK board.
 - Remove skeleton.dtsi inclusion from all i.MX SoC dts files, as it's
   been deprecated, since commit 9c0da3cc ("ARM: dts: explicitly
   mark skeleton.dtsi as deprecated").
 - Misc device addition and enabling: OCOTP for Vybrid, MMDC for i.MX6QP,
   TMU for LS1021A, FEC for imx6qdl-icore, DMA for Vybrid DSPI.
 - A few cleanups: use hyphens for node names, fix white spaces, move
   imx-weim parameters into SoC dtsi, replace gpio-key,wakeup with
   wakeup-source, remove pwm-leds from imx6q-apalis-ixora, remove I2C3
   from vf610-zii-dev-rev-b.
 - Other small random changes: calibrate USB PHY for b650v3 board,
   update TX D_CAL for USBPHY, use enable-gpios for backlight on
   imx6qdl-apalis, etc.

* tag 'imx-dt-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (38 commits)
  ARM: dts: imx6ull: add imx6ull support
  ARM: dts: imx6q: replace gpio-key,wakeup with wakeup-source for Utilite Pro
  ARM: dts: vfxxx: Enable DMA for DSPI2 and DSPI3
  ARM: dts: imx: Remove skeleton.dtsi
  ARM: dts: imx6q-utilite-pro: i2c1 is muxed
  ARM: dts: add new compatible string for i.MX6QP mmdc
  ARM: dts: imx6sx-udoo: Add board specific compatible strings
  ARM: dts: mx5: Add new M53EVK manufacturer compat
  ARM: dts: mxs: Add new M28EVK manufacturer compat
  ARM: dts: imx6ul-14x14-evk: update TX D_CAL for USBPHY
  ARM: dts: imx6sx-sdb: update TX D_CAL for USBPHY
  ARM: dts: imx6: Add imx-weim parameters to dtsi's
  ARM: dts: imx: Fix "ERROR: code indent should use tabs where possible"
  ARM: dts: imx6qdl-nitrogen6_max: use hyphens for nodes name
  ARM: dts: imx6qdl-nit6xlite: use hyphens for nodes name
  ARM: dts: imx6qdl-nitrogen6x: use hyphens for nodes name
  ARM: dts: imx6qdl-sabrelite: use hyphens for nodes name
  ARM: dts: imx: add Boundary Devices Nitrogen6_SOM2 support
  ARM: dts: imx6qdl-icore: Add FEC support
  ARM: dts: imx6q: Add Engicam i.CoreM6 DualLite/Solo initial support
  ...
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f05646c9 c201369d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3638 additions and 268 deletions
arch/arm/boot/dts/Makefile
View file @ 1fc7210c
...@@ -331,6 +331,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ ...@@ -331,6 +331,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
imx6dl-aristainetos_7.dtb \ imx6dl-aristainetos_7.dtb \
imx6dl-aristainetos2_4.dtb \ imx6dl-aristainetos2_4.dtb \
imx6dl-aristainetos2_7.dtb \ imx6dl-aristainetos2_7.dtb \
imx6dl-colibri-eval-v3.dtb \
imx6dl-cubox-i.dtb \ imx6dl-cubox-i.dtb \
imx6dl-dfi-fs700-m60.dtb \ imx6dl-dfi-fs700-m60.dtb \
imx6dl-gw51xx.dtb \ imx6dl-gw51xx.dtb \
...@@ -341,6 +342,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ ...@@ -341,6 +342,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
imx6dl-gw552x.dtb \ imx6dl-gw552x.dtb \
imx6dl-gw553x.dtb \ imx6dl-gw553x.dtb \
imx6dl-hummingboard.dtb \ imx6dl-hummingboard.dtb \
imx6dl-icore.dtb \
imx6dl-nit6xlite.dtb \ imx6dl-nit6xlite.dtb \
imx6dl-nitrogen6x.dtb \ imx6dl-nitrogen6x.dtb \
imx6dl-phytec-pbab01.dtb \ imx6dl-phytec-pbab01.dtb \
...@@ -382,10 +384,12 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ ...@@ -382,10 +384,12 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
imx6q-gw553x.dtb \ imx6q-gw553x.dtb \
imx6q-h100.dtb \ imx6q-h100.dtb \
imx6q-hummingboard.dtb \ imx6q-hummingboard.dtb \
imx6q-icore.dtb \
imx6q-icore-rqs.dtb \ imx6q-icore-rqs.dtb \
imx6q-marsboard.dtb \ imx6q-marsboard.dtb \
imx6q-nitrogen6x.dtb \ imx6q-nitrogen6x.dtb \
imx6q-nitrogen6_max.dtb \ imx6q-nitrogen6_max.dtb \
imx6q-nitrogen6_som2.dtb \
imx6q-novena.dtb \ imx6q-novena.dtb \
imx6q-phytec-pbab01.dtb \ imx6q-phytec-pbab01.dtb \
imx6q-rex-pro.dtb \ imx6q-rex-pro.dtb \
...@@ -417,14 +421,19 @@ dtb-$(CONFIG_SOC_IMX6SX) += \ ...@@ -417,14 +421,19 @@ dtb-$(CONFIG_SOC_IMX6SX) += \
imx6sx-sabreauto.dtb \ imx6sx-sabreauto.dtb \
imx6sx-sdb-reva.dtb \ imx6sx-sdb-reva.dtb \
imx6sx-sdb-sai.dtb \ imx6sx-sdb-sai.dtb \
imx6sx-sdb.dtb imx6sx-sdb.dtb \
imx6sx-udoo-neo-basic.dtb \
imx6sx-udoo-neo-extended.dtb \
imx6sx-udoo-neo-full.dtb
dtb-$(CONFIG_SOC_IMX6UL) += \ dtb-$(CONFIG_SOC_IMX6UL) += \
imx6ul-14x14-evk.dtb \ imx6ul-14x14-evk.dtb \
imx6ul-geam-kit.dtb \ imx6ul-geam-kit.dtb \
imx6ul-liteboard.dtb \
imx6ul-pico-hobbit.dtb \ imx6ul-pico-hobbit.dtb \
imx6ul-tx6ul-0010.dtb \ imx6ul-tx6ul-0010.dtb \
imx6ul-tx6ul-0011.dtb \ imx6ul-tx6ul-0011.dtb \
imx6ul-tx6ul-mainboard.dtb imx6ul-tx6ul-mainboard.dtb \
imx6ull-14x14-evk.dtb
dtb-$(CONFIG_SOC_IMX7D) += \ dtb-$(CONFIG_SOC_IMX7D) += \
imx7d-cl-som-imx7.dtb \ imx7d-cl-som-imx7.dtb \
imx7d-colibri-eval-v3.dtb \ imx7d-colibri-eval-v3.dtb \
......
arch/arm/boot/dts/imx1.dtsi
View file @ 1fc7210c
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
* http://www.gnu.org/copyleft/gpl.html * http://www.gnu.org/copyleft/gpl.html
*/ */
#include "skeleton.dtsi"
#include "imx1-pinfunc.h" #include "imx1-pinfunc.h"
#include <dt-bindings/clock/imx1-clock.h> #include <dt-bindings/clock/imx1-clock.h>
...@@ -17,6 +16,9 @@ ...@@ -17,6 +16,9 @@
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
aliases { aliases {
gpio0 = &gpio1; gpio0 = &gpio1;
gpio1 = &gpio2; gpio1 = &gpio2;
......
arch/arm/boot/dts/imx23.dtsi
View file @ 1fc7210c
...@@ -9,10 +9,12 @@ ...@@ -9,10 +9,12 @@
* http://www.gnu.org/copyleft/gpl.html * http://www.gnu.org/copyleft/gpl.html
*/ */
#include "skeleton.dtsi"
#include "imx23-pinfunc.h" #include "imx23-pinfunc.h"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
interrupt-parent = <&icoll>; interrupt-parent = <&icoll>;
aliases { aliases {
......
arch/arm/boot/dts/imx25.dtsi
View file @ 1fc7210c
...@@ -9,10 +9,12 @@ ...@@ -9,10 +9,12 @@
* http://www.gnu.org/copyleft/gpl.html * http://www.gnu.org/copyleft/gpl.html
*/ */
#include "skeleton.dtsi"
#include "imx25-pinfunc.h" #include "imx25-pinfunc.h"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
aliases { aliases {
ethernet0 = &fec; ethernet0 = &fec;
gpio0 = &gpio1; gpio0 = &gpio1;
......
arch/arm/boot/dts/imx27.dtsi
View file @ 1fc7210c
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
* http://www.gnu.org/copyleft/gpl.html * http://www.gnu.org/copyleft/gpl.html
*/ */
#include "skeleton.dtsi"
#include "imx27-pinfunc.h" #include "imx27-pinfunc.h"
#include <dt-bindings/clock/imx27-clock.h> #include <dt-bindings/clock/imx27-clock.h>
...@@ -18,6 +17,9 @@ ...@@ -18,6 +17,9 @@
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
aliases { aliases {
ethernet0 = &fec; ethernet0 = &fec;
gpio0 = &gpio1; gpio0 = &gpio1;
......
arch/arm/boot/dts/imx28-m28.dtsi
View file @ 1fc7210c
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
#include "imx28.dtsi" #include "imx28.dtsi"
/ { / {
model = "DENX M28"; model = "Aries/DENX M28";
compatible = "denx,m28", "fsl,imx28"; compatible = "aries,m28", "denx,m28", "fsl,imx28";
memory { memory {
reg = <0x40000000 0x08000000>; reg = <0x40000000 0x08000000>;
......
arch/arm/boot/dts/imx28-m28evk.dts
View file @ 1fc7210c
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
#include "imx28-m28.dtsi" #include "imx28-m28.dtsi"
/ { / {
model = "DENX M28EVK"; model = "Aries/DENX M28EVK";
compatible = "denx,m28evk", "fsl,imx28"; compatible = "aries,m28evk", "denx,m28evk", "fsl,imx28";
apb@80000000 { apb@80000000 {
apbh@80000000 { apbh@80000000 {
......
arch/arm/boot/dts/imx28.dtsi
View file @ 1fc7210c
...@@ -10,10 +10,12 @@ ...@@ -10,10 +10,12 @@
*/ */
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include "skeleton.dtsi"
#include "imx28-pinfunc.h" #include "imx28-pinfunc.h"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
interrupt-parent = <&icoll>; interrupt-parent = <&icoll>;
aliases { aliases {
......
arch/arm/boot/dts/imx31.dtsi
View file @ 1fc7210c
...@@ -9,9 +9,10 @@ ...@@ -9,9 +9,10 @@
* http://www.gnu.org/copyleft/gpl.html * http://www.gnu.org/copyleft/gpl.html
*/ */
#include "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
aliases { aliases {
serial0 = &uart1; serial0 = &uart1;
serial1 = &uart2; serial1 = &uart2;
......
arch/arm/boot/dts/imx35.dtsi
View file @ 1fc7210c
...@@ -8,10 +8,12 @@ ...@@ -8,10 +8,12 @@
* Free Software Foundation. * Free Software Foundation.
*/ */
#include "skeleton.dtsi"
#include "imx35-pinfunc.h" #include "imx35-pinfunc.h"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
aliases { aliases {
ethernet0 = &fec; ethernet0 = &fec;
gpio0 = &gpio1; gpio0 = &gpio1;
......
arch/arm/boot/dts/imx50.dtsi
View file @ 1fc7210c
...@@ -11,11 +11,13 @@ ...@@ -11,11 +11,13 @@
* http://www.gnu.org/copyleft/gpl.html * http://www.gnu.org/copyleft/gpl.html
*/ */
#include "skeleton.dtsi"
#include "imx50-pinfunc.h" #include "imx50-pinfunc.h"
#include <dt-bindings/clock/imx5-clock.h> #include <dt-bindings/clock/imx5-clock.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
aliases { aliases {
ethernet0 = &fec; ethernet0 = &fec;
gpio0 = &gpio1; gpio0 = &gpio1;
......
arch/arm/boot/dts/imx51.dtsi
View file @ 1fc7210c
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
* http://www.gnu.org/copyleft/gpl.html * http://www.gnu.org/copyleft/gpl.html
*/ */
#include "skeleton.dtsi"
#include "imx51-pinfunc.h" #include "imx51-pinfunc.h"
#include <dt-bindings/clock/imx5-clock.h> #include <dt-bindings/clock/imx5-clock.h>
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
...@@ -18,6 +17,9 @@ ...@@ -18,6 +17,9 @@
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
aliases { aliases {
ethernet0 = &fec; ethernet0 = &fec;
gpio0 = &gpio1; gpio0 = &gpio1;
......
arch/arm/boot/dts/imx53-m53.dtsi
View file @ 1fc7210c
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
#include "imx53.dtsi" #include "imx53.dtsi"
/ { / {
model = "DENX M53"; model = "Aries/DENX M53";
compatible = "denx,imx53-m53", "fsl,imx53"; compatible = "aries,imx53-m53", "denx,imx53-m53", "fsl,imx53";
memory { memory {
reg = <0x70000000 0x20000000>, reg = <0x70000000 0x20000000>,
......
arch/arm/boot/dts/imx53-m53evk.dts
View file @ 1fc7210c
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
#include "imx53-m53.dtsi" #include "imx53-m53.dtsi"
/ { / {
model = "DENX M53EVK"; model = "Aries/DENX M53EVK";
compatible = "denx,imx53-m53evk", "fsl,imx53"; compatible = "aries,imx53-m53evk", "denx,imx53-m53evk", "fsl,imx53";
display1: display@di1 { display1: display@di1 {
compatible = "fsl,imx-parallel-display"; compatible = "fsl,imx-parallel-display";
......
arch/arm/boot/dts/imx53.dtsi
View file @ 1fc7210c
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
* http://www.gnu.org/copyleft/gpl.html * http://www.gnu.org/copyleft/gpl.html
*/ */
#include "skeleton.dtsi"
#include "imx53-pinfunc.h" #include "imx53-pinfunc.h"
#include <dt-bindings/clock/imx5-clock.h> #include <dt-bindings/clock/imx5-clock.h>
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
...@@ -18,6 +17,9 @@ ...@@ -18,6 +17,9 @@
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
aliases { aliases {
ethernet0 = &fec; ethernet0 = &fec;
gpio0 = &gpio1; gpio0 = &gpio1;
......
arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts 0 → 100644
View file @ 1fc7210c
/*
* Copyright 2014-2016 Toradex AG
* Copyright 2012 Freescale Semiconductor, Inc.
* Copyright 2011 Linaro Ltd.
*
* 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 , 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 <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include "imx6dl.dtsi"
#include "imx6qdl-colibri.dtsi"
/ {
model = "Toradex Colibri iMX6DL/S on Colibri Evaluation Board V3";
compatible = "toradex,colibri_imx6dl-eval-v3", "toradex,colibri_imx6dl",
"fsl,imx6dl";
aliases {
i2c0 = &i2c2;
i2c1 = &i2c3;
};
aliases {
rtc0 = &rtc_i2c;
rtc1 = &snvs_rtc;
};
clocks {
/* Fixed crystal dedicated to mcp251x */
clk16m: clk@1 {
compatible = "fixed-clock";
reg = <1>;
#clock-cells = <0>;
clock-frequency = <16000000>;
clock-output-names = "clk16m";
};
};
gpio-keys {
compatible = "gpio-keys";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpio_keys>;
wakeup {
label = "Wake-Up";
gpios = <&gpio2 22 GPIO_ACTIVE_HIGH>; /* SODIMM 45 */
linux,code = <KEY_WAKEUP>;
debounce-interval = <10>;
wakeup-source;
};
};
lcd_display: display@di0 {
compatible = "fsl,imx-parallel-display";
#address-cells = <1>;
#size-cells = <0>;
interface-pix-fmt = "bgr666";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ipu1_lcdif>;
status = "okay";
port@0 {
reg = <0>;
lcd_display_in: endpoint {
remote-endpoint = <&ipu1_di0_disp0>;
};
};
port@1 {
reg = <1>;
lcd_display_out: endpoint {
remote-endpoint = <&lcd_panel_in>;
};
};
};
panel: panel {
/*
* edt,et057090dhu: EDT 5.7" LCD TFT
* edt,et070080dh6: EDT 7.0" LCD TFT
*/
compatible = "edt,et057090dhu";
backlight = <&backlight>;
port {
lcd_panel_in: endpoint {
remote-endpoint = <&lcd_display_out>;
};
};
};
};
&backlight {
brightness-levels = <0 127 191 223 239 247 251 255>;
default-brightness-level = <1>;
status = "okay";
};
/* Colibri SSP */
&ecspi4 {
status = "okay";
mcp251x0: mcp251x@1 {
compatible = "microchip,mcp2515";
reg = <0>;
clocks = <&clk16m>;
interrupt-parent = <&gpio3>;
interrupts = <27 0x2>;
spi-max-frequency = <10000000>;
status = "okay";
};
};
&hdmi {
status = "okay";
};
/*
* Colibri I2C: I2C3_SDA/SCL on SODIMM 194/196 (e.g. RTC on carrier board)
*/
&i2c3 {
status = "okay";
/* M41T0M6 real time clock on carrier board */
rtc_i2c: rtc@68 {
compatible = "st,m41t00";
reg = <0x68>;
};
};
&ipu1_di0_disp0 {
remote-endpoint = <&lcd_display_in>;
};
&pwm1 {
status = "okay";
};
&pwm2 {
status = "okay";
};
&pwm3 {
status = "okay";
};
&pwm4 {
status = "okay";
};
&reg_usb_host_vbus {
status = "okay";
};
&uart1 {
status = "okay";
};
&uart2 {
status = "okay";
};
&uart3 {
status = "okay";
};
&usbh1 {
vbus-supply = <&reg_usb_host_vbus>;
status = "okay";
};
&usbotg {
status = "okay";
};
/* Colibri MMC */
&usdhc1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_mmc_cd>;
cd-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>; /* MMCD */
status = "okay";
};
&weim {
status = "okay";
/* weim memory map: 32MB on CS0, 32MB on CS1, 32MB on CS2 */
ranges = <0 0 0x08000000 0x02000000
1 0 0x0a000000 0x02000000
2 0 0x0c000000 0x02000000>;
/* SRAM on Colibri nEXT_CS0 */
sram@0,0 {
compatible = "cypress,cy7c1019dv33-10zsxi, mtd-ram";
reg = <0 0 0x00010000>;
#address-cells = <1>;
#size-cells = <1>;
bank-width = <2>;
fsl,weim-cs-timing = <0x00010081 0x00000000 0x04000000
0x00000000 0x04000040 0x00000000>;
};
/* SRAM on Colibri nEXT_CS1 */
sram@1,0 {
compatible = "cypress,cy7c1019dv33-10zsxi, mtd-ram";
reg = <1 0 0x00010000>;
#address-cells = <1>;
#size-cells = <1>;
bank-width = <2>;
fsl,weim-cs-timing = <0x00010081 0x00000000 0x04000000
0x00000000 0x04000040 0x00000000>;
};
};
arch/arm/boot/dts/imx6dl-icore.dts 0 → 100644
View file @ 1fc7210c
/*
* Copyright (C) 2016 Amarula Solutions B.V.
* Copyright (C) 2016 Engicam S.r.l.
*
* 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 , 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 "imx6dl.dtsi"
#include "imx6qdl-icore.dtsi"
/ {
model = "Engicam i.CoreM6 DualLite/Solo Starter Kit";
compatible = "engicam,imx6-icore", "fsl,imx6dl";
};
&can1 {
status = "okay";
};
&can2 {
status = "okay";
};
arch/arm/boot/dts/imx6q-apalis-ixora.dts
View file @ 1fc7210c
...@@ -147,28 +147,6 @@ led5-red { ...@@ -147,28 +147,6 @@ led5-red {
gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>; gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
}; };
}; };
pwmleds {
compatible = "pwm-leds";
ledpwm1 {
label = "PWM1";
pwms = <&pwm1 0 50000>;
max-brightness = <255>;
};
ledpwm2 {
label = "PWM2";
pwms = <&pwm2 0 50000>;
max-brightness = <255>;
};
ledpwm3 {
label = "PWM3";
pwms = <&pwm3 0 50000>;
max-brightness = <255>;
};
};
}; };
&backlight { &backlight {
......
arch/arm/boot/dts/imx6q-b650v3.dts
View file @ 1fc7210c
...@@ -98,3 +98,9 @@ P05 { ...@@ -98,3 +98,9 @@ P05 {
line-name = "PCA9539-P05"; line-name = "PCA9539-P05";
}; };
}; };
&usbphy1 {
fsl,tx-cal-45-dn-ohms = <55>;
fsl,tx-cal-45-dp-ohms = <55>;
fsl,tx-d-cal = <100>;
};
arch/arm/boot/dts/imx6q-evi.dts
View file @ 1fc7210c
...@@ -232,10 +232,7 @@ &usdhc1 { ...@@ -232,10 +232,7 @@ &usdhc1 {
}; };
&weim { &weim {
#address-cells = <2>;
#size-cells = <1>;
ranges = <0 0 0x08000000 0x08000000>; ranges = <0 0 0x08000000 0x08000000>;
fsl,weim-cs-gpr = <&gpr>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_weimfpga &pinctrl_weimcs>; pinctrl-0 = <&pinctrl_weimfpga &pinctrl_weimcs>;
status = "okay"; status = "okay";
......
arch/arm/boot/dts/imx6q-icore.dts 0 → 100644
View file @ 1fc7210c
/*
* Copyright (C) 2016 Amarula Solutions B.V.
* Copyright (C) 2016 Engicam S.r.l.
*
* 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 , 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 "imx6q.dtsi"
#include "imx6qdl-icore.dtsi"
/ {
model = "Engicam i.CoreM6 Quad/Dual Starter Kit";
compatible = "engicam,imx6-icore", "fsl,imx6q";
};
&can1 {
status = "okay";
};
&can2 {
status = "okay";
};
arch/arm/boot/dts/imx6q-nitrogen6_som2.dts 0 → 100644
View file @ 1fc7210c
/*
* Copyright 2016 Boundary Devices, 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 , 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 "imx6q.dtsi"
#include "imx6qdl-nitrogen6_som2.dtsi"
/ {
model = "Boundary Devices i.MX6 Quad Nitrogen6_SOM2 Board";
compatible = "boundary,imx6q-nitrogen6_som2", "fsl,imx6q";
};
&sata {
status = "okay";
};
arch/arm/boot/dts/imx6q-novena.dts
View file @ 1fc7210c
...@@ -451,6 +451,10 @@ &pcie { ...@@ -451,6 +451,10 @@ &pcie {
status = "okay"; status = "okay";
}; };
&pwm1 {
status = "okay";
};
&sata { &sata {
target-supply = <&reg_sata>; target-supply = <&reg_sata>;
fsl,transmit-level-mV = <1025>; fsl,transmit-level-mV = <1025>;
......
arch/arm/boot/dts/imx6q-utilite-pro.dts
View file @ 1fc7210c
...@@ -68,20 +68,24 @@ power { ...@@ -68,20 +68,24 @@ power {
label = "Power Button"; label = "Power Button";
gpios = <&gpio1 29 GPIO_ACTIVE_LOW>; gpios = <&gpio1 29 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
gpio-key,wakeup; wakeup-source;
}; };
}; };
};
&hdmi {
ddc-i2c-bus = <&i2c2>;
status = "okay";
};
&i2c1 { i2cmux {
compatible = "i2c-mux-gpio";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c1>; pinctrl-0 = <&pinctrl_i2c1mux>;
status = "okay"; #address-cells = <1>;
#size-cells = <0>;
mux-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
i2c-parent = <&i2c1>;
i2c@0 {
reg = <0>;
#address-cells = <1>;
#size-cells = <0>;
eeprom@50 { eeprom@50 {
compatible = "at24,24c02"; compatible = "at24,24c02";
...@@ -93,6 +97,25 @@ em3027: rtc@56 { ...@@ -93,6 +97,25 @@ em3027: rtc@56 {
compatible = "emmicro,em3027"; compatible = "emmicro,em3027";
reg = <0x56>; reg = <0x56>;
}; };
};
i2c_dvi_ddc: i2c@1 {
reg = <1>;
#address-cells = <1>;
#size-cells = <0>;
};
};
};
&hdmi {
ddc-i2c-bus = <&i2c2>;
status = "okay";
};
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c1>;
status = "okay";
}; };
&i2c2 { &i2c2 {
...@@ -115,6 +138,12 @@ MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1 ...@@ -115,6 +138,12 @@ MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1
>; >;
}; };
pinctrl_i2c1mux: i2c1muxgrp {
fsl,pins = <
MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x1b0b0
>;
};
pinctrl_i2c2: i2c2grp { pinctrl_i2c2: i2c2grp {
fsl,pins = < fsl,pins = <
MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1 MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
......
arch/arm/boot/dts/imx6qdl-apalis.dtsi
View file @ 1fc7210c
...@@ -49,7 +49,10 @@ / { ...@@ -49,7 +49,10 @@ / {
backlight: backlight { backlight: backlight {
compatible = "pwm-backlight"; compatible = "pwm-backlight";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpio_bl_on>;
pwms = <&pwm4 0 5000000>; pwms = <&pwm4 0 5000000>;
enable-gpios = <&gpio3 13 GPIO_ACTIVE_HIGH>;
status = "disabled"; status = "disabled";
}; };
...@@ -620,6 +623,12 @@ MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX 0x1b0b0 ...@@ -620,6 +623,12 @@ MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX 0x1b0b0
>; >;
}; };
pinctrl_gpio_bl_on: gpioblon {
fsl,pins = <
MX6QDL_PAD_EIM_DA13__GPIO3_IO13 0x1b0b0
>;
};
pinctrl_gpio_keys: gpio1io04grp { pinctrl_gpio_keys: gpio1io04grp {
fsl,pins = < fsl,pins = <
/* Power button */ /* Power button */
......
arch/arm/boot/dts/imx6qdl-colibri.dtsi 0 → 100644
View file @ 1fc7210c
This diff is collapsed.
arch/arm/boot/dts/imx6qdl-icore.dtsi 0 → 100644
View file @ 1fc7210c
/*
* Copyright (C) 2016 Amarula Solutions B.V.
* Copyright (C) 2016 Engicam S.r.l.
*
* 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 , 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.
*/
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
/ {
memory {
reg = <0x10000000 0x80000000>;
};
reg_3p3v: regulator-3p3v {
compatible = "regulator-fixed";
regulator-name = "3P3V";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-boot-on;
regulator-always-on;
};
reg_usb_h1_vbus: regulator-usb-h1-vbus {
compatible = "regulator-fixed";
regulator-name = "usb_h1_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
regulator-boot-on;
regulator-always-on;
};
reg_usb_otg_vbus: regulator-usb-otg-vbus {
compatible = "regulator-fixed";
regulator-name = "usb_otg_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
regulator-boot-on;
regulator-always-on;
};
rmii_clk: clock-rmii-clk {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <25000000>; /* 25MHz for example */
};
};
&can1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_flexcan1>;
xceiver-supply = <&reg_3p3v>;
};
&can2 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_flexcan2>;
xceiver-supply = <&reg_3p3v>;
};
&clks {
assigned-clocks = <&clks IMX6QDL_CLK_LVDS2_SEL>;
assigned-clock-parents = <&clks IMX6QDL_CLK_OSC>;
};
&fec {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet>;
phy-reset-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>;
clocks = <&clks IMX6QDL_CLK_ENET>, <&clks IMX6QDL_CLK_ENET>, <&rmii_clk>;
phy-mode = "rmii";
status = "okay";
};
&gpmi {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpmi_nand>;
nand-on-flash-bbt;
status = "okay";
};
&i2c1 {
clock-frequency = <100000>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c1>;
status = "okay";
};
&i2c2 {
clock-frequency = <100000>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c2>;
status = "okay";
};
&i2c3 {
clock-frequency = <100000>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c3>;
status = "okay";
};
&uart4 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart4>;
status = "okay";
};
&usbh1 {
vbus-supply = <&reg_usb_h1_vbus>;
disable-over-current;
status = "okay";
};
&usbotg {
vbus-supply = <&reg_usb_otg_vbus>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usbotg>;
disable-over-current;
status = "okay";
};
&usdhc1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc1>;
cd-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
no-1-8-v;
status = "okay";
};
&iomuxc {
pinctrl_enet: enetgrp {
fsl,pins = <
MX6QDL_PAD_ENET_CRS_DV__ENET_RX_EN 0x1b0b0
MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x1b0b1
MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN 0x1b0b0
MX6QDL_PAD_ENET_RXD1__ENET_RX_DATA1 0x1b0b0
MX6QDL_PAD_ENET_RXD0__ENET_RX_DATA0 0x1b0b0
MX6QDL_PAD_ENET_TXD1__ENET_TX_DATA1 0x1b0b0
MX6QDL_PAD_ENET_TXD0__ENET_TX_DATA0 0x1b0b0
MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
MX6QDL_PAD_ENET_REF_CLK__GPIO1_IO23 0x1b0b0
MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x1b0b0
>;
};
pinctrl_flexcan1: flexcan1grp {
fsl,pins = <
MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX 0x1b020
MX6QDL_PAD_KEY_COL2__FLEXCAN1_TX 0x1b020
>;
};
pinctrl_flexcan2: flexcan2grp {
fsl,pins = <
MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX 0x1b020
MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX 0x1b020
>;
};
pinctrl_gpmi_nand: gpmi-nand {
fsl,pins = <
MX6QDL_PAD_NANDF_CLE__NAND_CLE 0xb0b1
MX6QDL_PAD_NANDF_ALE__NAND_ALE 0xb0b1
MX6QDL_PAD_NANDF_WP_B__NAND_WP_B 0xb0b1
MX6QDL_PAD_NANDF_RB0__NAND_READY_B 0xb000
MX6QDL_PAD_NANDF_CS0__NAND_CE0_B 0xb0b1
MX6QDL_PAD_NANDF_CS1__NAND_CE1_B 0xb0b1
MX6QDL_PAD_SD4_CMD__NAND_RE_B 0xb0b1
MX6QDL_PAD_SD4_CLK__NAND_WE_B 0xb0b1
MX6QDL_PAD_NANDF_D0__NAND_DATA00 0xb0b1
MX6QDL_PAD_NANDF_D1__NAND_DATA01 0xb0b1
MX6QDL_PAD_NANDF_D2__NAND_DATA02 0xb0b1
MX6QDL_PAD_NANDF_D3__NAND_DATA03 0xb0b1
MX6QDL_PAD_NANDF_D4__NAND_DATA04 0xb0b1
MX6QDL_PAD_NANDF_D5__NAND_DATA05 0xb0b1
MX6QDL_PAD_NANDF_D6__NAND_DATA06 0xb0b1
MX6QDL_PAD_NANDF_D7__NAND_DATA07 0xb0b1
MX6QDL_PAD_SD4_DAT0__NAND_DQS 0x00b1
>;
};
pinctrl_i2c1: i2c1grp {
fsl,pins = <
MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1
MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1
>;
};
pinctrl_i2c2: i2c2grp {
fsl,pins = <
MX6QDL_PAD_EIM_EB2__I2C2_SCL 0x4001b8b1
MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
>;
};
pinctrl_i2c3: i2c3grp {
fsl,pins = <
MX6QDL_PAD_GPIO_5__I2C3_SCL 0x4001b8b1
MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1
MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x130b0
>;
};
pinctrl_uart4: uart4grp {
fsl,pins = <
MX6QDL_PAD_KEY_COL0__UART4_TX_DATA 0x1b0b1
MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA 0x1b0b1
>;
};
pinctrl_usbotg: usbotggrp {
fsl,pins = <
MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059
>;
};
pinctrl_usdhc1: usdhc1grp {
fsl,pins = <
MX6QDL_PAD_SD1_CMD__SD1_CMD 0x17070
MX6QDL_PAD_SD1_CLK__SD1_CLK 0x10070
MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x17070
MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17070
MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17070
MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17070
>;
};
};
arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi
View file @ 1fc7210c
...@@ -97,15 +97,6 @@ reg_wlan_vmmc: regulator@3 { ...@@ -97,15 +97,6 @@ reg_wlan_vmmc: regulator@3 {
}; };
}; };
bt_rfkill {
compatible = "rfkill-gpio";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_bt_rfkill>;
gpios = <&gpio6 8 GPIO_ACTIVE_HIGH>;
name = "bt_rfkill";
type = <2>;
};
gpio-keys { gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
pinctrl-names = "default"; pinctrl-names = "default";
...@@ -160,7 +151,7 @@ j46-pin3 { ...@@ -160,7 +151,7 @@ j46-pin3 {
}; };
}; };
backlight_lcd { backlight-lcd {
compatible = "pwm-backlight"; compatible = "pwm-backlight";
pwms = <&pwm1 0 5000000>; pwms = <&pwm1 0 5000000>;
brightness-levels = <0 4 8 16 32 64 128 255>; brightness-levels = <0 4 8 16 32 64 128 255>;
...@@ -169,7 +160,7 @@ backlight_lcd { ...@@ -169,7 +160,7 @@ backlight_lcd {
status = "okay"; status = "okay";
}; };
backlight_lvds0: backlight_lvds0 { backlight_lvds0: backlight-lvds0 {
compatible = "pwm-backlight"; compatible = "pwm-backlight";
pwms = <&pwm4 0 5000000>; pwms = <&pwm4 0 5000000>;
brightness-levels = <0 4 8 16 32 64 128 255>; brightness-levels = <0 4 8 16 32 64 128 255>;
...@@ -178,7 +169,7 @@ backlight_lvds0: backlight_lvds0 { ...@@ -178,7 +169,7 @@ backlight_lvds0: backlight_lvds0 {
status = "okay"; status = "okay";
}; };
panel_lvds0 { panel-lvds0 {
compatible = "hannstar,hsd100pxn1"; compatible = "hannstar,hsd100pxn1";
backlight = <&backlight_lvds0>; backlight = <&backlight_lvds0>;
...@@ -328,19 +319,6 @@ MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS 0x130b0 ...@@ -328,19 +319,6 @@ MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS 0x130b0
>; >;
}; };
pinctrl_bt_rfkill: bt_rfkillgrp {
fsl,pins = <
/* BT wake */
MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x1b0b0
/* BT reset */
MX6QDL_PAD_NANDF_ALE__GPIO6_IO08 0x0b0b0
/* BT reg en */
MX6QDL_PAD_NANDF_CS2__GPIO6_IO15 0x1b0b0
/* BT host wake irq */
MX6QDL_PAD_NANDF_CS3__GPIO6_IO16 0x100b0
>;
};
pinctrl_ecspi1: ecspi1grp { pinctrl_ecspi1: ecspi1grp {
fsl,pins = < fsl,pins = <
MX6QDL_PAD_EIM_D17__ECSPI1_MISO 0x100b1 MX6QDL_PAD_EIM_D17__ECSPI1_MISO 0x100b1
...@@ -374,7 +352,7 @@ MX6QDL_PAD_GPIO_6__ENET_IRQ 0x000b1 ...@@ -374,7 +352,7 @@ MX6QDL_PAD_GPIO_6__ENET_IRQ 0x000b1
>; >;
}; };
pinctrl_gpio_keys: gpio_keysgrp { pinctrl_gpio_keys: gpio-keysgrp {
fsl,pins = < fsl,pins = <
/* Home Button: J14 pin 5 */ /* Home Button: J14 pin 5 */
MX6QDL_PAD_GPIO_18__GPIO7_IO13 0x1b0b0 MX6QDL_PAD_GPIO_18__GPIO7_IO13 0x1b0b0
...@@ -457,7 +435,7 @@ MX6QDL_PAD_SD1_CMD__PWM4_OUT 0x1b0b1 ...@@ -457,7 +435,7 @@ MX6QDL_PAD_SD1_CMD__PWM4_OUT 0x1b0b1
>; >;
}; };
pinctrl_wlan_vmmc: wlan_vmmcgrp { pinctrl_wlan_vmmc: wlan-vmmcgrp {
fsl,pins = < fsl,pins = <
MX6QDL_PAD_NANDF_CLE__GPIO6_IO07 0x030b0 MX6QDL_PAD_NANDF_CLE__GPIO6_IO07 0x030b0
>; >;
......
arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
View file @ 1fc7210c
...@@ -229,7 +229,7 @@ ttymxc4-rs232 { ...@@ -229,7 +229,7 @@ ttymxc4-rs232 {
}; };
}; };
backlight_lcd: backlight_lcd { backlight_lcd: backlight-lcd {
compatible = "pwm-backlight"; compatible = "pwm-backlight";
pwms = <&pwm1 0 5000000>; pwms = <&pwm1 0 5000000>;
brightness-levels = <0 4 8 16 32 64 128 255>; brightness-levels = <0 4 8 16 32 64 128 255>;
...@@ -238,7 +238,7 @@ backlight_lcd: backlight_lcd { ...@@ -238,7 +238,7 @@ backlight_lcd: backlight_lcd {
status = "okay"; status = "okay";
}; };
backlight_lvds0: backlight_lvds0 { backlight_lvds0: backlight-lvds0 {
compatible = "pwm-backlight"; compatible = "pwm-backlight";
pwms = <&pwm4 0 5000000>; pwms = <&pwm4 0 5000000>;
brightness-levels = <0 4 8 16 32 64 128 255>; brightness-levels = <0 4 8 16 32 64 128 255>;
...@@ -247,7 +247,7 @@ backlight_lvds0: backlight_lvds0 { ...@@ -247,7 +247,7 @@ backlight_lvds0: backlight_lvds0 {
status = "okay"; status = "okay";
}; };
backlight_lvds1: backlight_lvds1 { backlight_lvds1: backlight-lvds1 {
compatible = "pwm-backlight"; compatible = "pwm-backlight";
pwms = <&pwm2 0 5000000>; pwms = <&pwm2 0 5000000>;
brightness-levels = <0 4 8 16 32 64 128 255>; brightness-levels = <0 4 8 16 32 64 128 255>;
...@@ -282,7 +282,7 @@ lcd_display_out: endpoint { ...@@ -282,7 +282,7 @@ lcd_display_out: endpoint {
}; };
}; };
panel_lcd { panel-lcd {
compatible = "okaya,rs800480t-7x0gp"; compatible = "okaya,rs800480t-7x0gp";
backlight = <&backlight_lcd>; backlight = <&backlight_lcd>;
...@@ -293,7 +293,7 @@ lcd_panel_in: endpoint { ...@@ -293,7 +293,7 @@ lcd_panel_in: endpoint {
}; };
}; };
panel_lvds0 { panel-lvds0 {
compatible = "hannstar,hsd100pxn1"; compatible = "hannstar,hsd100pxn1";
backlight = <&backlight_lvds0>; backlight = <&backlight_lvds0>;
...@@ -304,7 +304,7 @@ panel_in_lvds0: endpoint { ...@@ -304,7 +304,7 @@ panel_in_lvds0: endpoint {
}; };
}; };
panel_lvds1 { panel-lvds1 {
compatible = "hannstar,hsd100pxn1"; compatible = "hannstar,hsd100pxn1";
backlight = <&backlight_lvds1>; backlight = <&backlight_lvds1>;
...@@ -447,7 +447,7 @@ touchscreen@38 { ...@@ -447,7 +447,7 @@ touchscreen@38 {
}; };
&iomuxc { &iomuxc {
imx6q-nitrogen6_max { imx6q-nitrogen6-max {
pinctrl_audmux: audmuxgrp { pinctrl_audmux: audmuxgrp {
fsl,pins = < fsl,pins = <
MX6QDL_PAD_CSI0_DAT7__AUD3_RXD 0x130b0 MX6QDL_PAD_CSI0_DAT7__AUD3_RXD 0x130b0
...@@ -504,7 +504,7 @@ MX6QDL_PAD_GPIO_6__ENET_IRQ 0x000b1 ...@@ -504,7 +504,7 @@ MX6QDL_PAD_GPIO_6__ENET_IRQ 0x000b1
>; >;
}; };
pinctrl_gpio_keys: gpio_keysgrp { pinctrl_gpio_keys: gpio-keysgrp {
fsl,pins = < fsl,pins = <
/* Power Button */ /* Power Button */
MX6QDL_PAD_NANDF_D3__GPIO2_IO03 0x1b0b0 MX6QDL_PAD_NANDF_D3__GPIO2_IO03 0x1b0b0
...@@ -720,7 +720,7 @@ MX6QDL_PAD_SD4_DAT7__SD4_DATA7 0x17059 ...@@ -720,7 +720,7 @@ MX6QDL_PAD_SD4_DAT7__SD4_DATA7 0x17059
>; >;
}; };
pinctrl_wlan_vmmc: wlan_vmmcgrp { pinctrl_wlan_vmmc: wlan-vmmcgrp {
fsl,pins = < fsl,pins = <
MX6QDL_PAD_NANDF_CS0__GPIO6_IO11 0x100b0 MX6QDL_PAD_NANDF_CS0__GPIO6_IO11 0x100b0
MX6QDL_PAD_NANDF_CS2__GPIO6_IO15 0x000b0 MX6QDL_PAD_NANDF_CS2__GPIO6_IO15 0x000b0
......
arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi 0 → 100644
View file @ 1fc7210c
This diff is collapsed.
arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
View file @ 1fc7210c
...@@ -167,7 +167,7 @@ sound { ...@@ -167,7 +167,7 @@ sound {
mux-ext-port = <3>; mux-ext-port = <3>;
}; };
backlight_lcd: backlight_lcd { backlight_lcd: backlight-lcd {
compatible = "pwm-backlight"; compatible = "pwm-backlight";
pwms = <&pwm1 0 5000000>; pwms = <&pwm1 0 5000000>;
brightness-levels = <0 4 8 16 32 64 128 255>; brightness-levels = <0 4 8 16 32 64 128 255>;
...@@ -176,7 +176,7 @@ backlight_lcd: backlight_lcd { ...@@ -176,7 +176,7 @@ backlight_lcd: backlight_lcd {
status = "okay"; status = "okay";
}; };
backlight_lvds: backlight_lvds { backlight_lvds: backlight-lvds {
compatible = "pwm-backlight"; compatible = "pwm-backlight";
pwms = <&pwm4 0 5000000>; pwms = <&pwm4 0 5000000>;
brightness-levels = <0 4 8 16 32 64 128 255>; brightness-levels = <0 4 8 16 32 64 128 255>;
...@@ -211,7 +211,7 @@ lcd_display_out: endpoint { ...@@ -211,7 +211,7 @@ lcd_display_out: endpoint {
}; };
}; };
lcd_panel { panel-lcd {
compatible = "okaya,rs800480t-7x0gp"; compatible = "okaya,rs800480t-7x0gp";
backlight = <&backlight_lcd>; backlight = <&backlight_lcd>;
...@@ -222,7 +222,7 @@ lcd_panel_in: endpoint { ...@@ -222,7 +222,7 @@ lcd_panel_in: endpoint {
}; };
}; };
panel { panel-lvds0 {
compatible = "hannstar,hsd100pxn1"; compatible = "hannstar,hsd100pxn1";
backlight = <&backlight_lvds>; backlight = <&backlight_lvds>;
...@@ -413,7 +413,7 @@ MX6QDL_PAD_GPIO_6__ENET_IRQ 0x000b1 ...@@ -413,7 +413,7 @@ MX6QDL_PAD_GPIO_6__ENET_IRQ 0x000b1
>; >;
}; };
pinctrl_gpio_keys: gpio_keysgrp { pinctrl_gpio_keys: gpio-keysgrp {
fsl,pins = < fsl,pins = <
/* Power Button */ /* Power Button */
MX6QDL_PAD_NANDF_D3__GPIO2_IO03 0x1b0b0 MX6QDL_PAD_NANDF_D3__GPIO2_IO03 0x1b0b0
...@@ -561,7 +561,7 @@ MX6QDL_PAD_NANDF_D6__GPIO2_IO06 0x1b0b0 /* CD */ ...@@ -561,7 +561,7 @@ MX6QDL_PAD_NANDF_D6__GPIO2_IO06 0x1b0b0 /* CD */
>; >;
}; };
pinctrl_wlan_vmmc: wlan_vmmcgrp { pinctrl_wlan_vmmc: wlan-vmmcgrp {
fsl,pins = < fsl,pins = <
MX6QDL_PAD_NANDF_CS0__GPIO6_IO11 0x100b0 MX6QDL_PAD_NANDF_CS0__GPIO6_IO11 0x100b0
MX6QDL_PAD_NANDF_CS2__GPIO6_IO15 0x000b0 MX6QDL_PAD_NANDF_CS2__GPIO6_IO15 0x000b0
......
arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
View file @ 1fc7210c
...@@ -613,8 +613,6 @@ &usdhc3 { ...@@ -613,8 +613,6 @@ &usdhc3 {
&weim { &weim {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_weim_nor &pinctrl_weim_cs0>; pinctrl-0 = <&pinctrl_weim_nor &pinctrl_weim_cs0>;
#address-cells = <2>;
#size-cells = <1>;
ranges = <0 0 0x08000000 0x08000000>; ranges = <0 0 0x08000000 0x08000000>;
status = "disabled"; /* pin conflict with SPI NOR */ status = "disabled"; /* pin conflict with SPI NOR */
......
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
View file @ 1fc7210c
...@@ -153,7 +153,7 @@ sound { ...@@ -153,7 +153,7 @@ sound {
mux-ext-port = <4>; mux-ext-port = <4>;
}; };
backlight_lcd: backlight_lcd { backlight_lcd: backlight-lcd {
compatible = "pwm-backlight"; compatible = "pwm-backlight";
pwms = <&pwm1 0 5000000>; pwms = <&pwm1 0 5000000>;
brightness-levels = <0 4 8 16 32 64 128 255>; brightness-levels = <0 4 8 16 32 64 128 255>;
...@@ -162,7 +162,7 @@ backlight_lcd: backlight_lcd { ...@@ -162,7 +162,7 @@ backlight_lcd: backlight_lcd {
status = "okay"; status = "okay";
}; };
backlight_lvds: backlight_lvds { backlight_lvds: backlight-lvds {
compatible = "pwm-backlight"; compatible = "pwm-backlight";
pwms = <&pwm4 0 5000000>; pwms = <&pwm4 0 5000000>;
brightness-levels = <0 4 8 16 32 64 128 255>; brightness-levels = <0 4 8 16 32 64 128 255>;
...@@ -197,7 +197,7 @@ lcd_display_out: endpoint { ...@@ -197,7 +197,7 @@ lcd_display_out: endpoint {
}; };
}; };
lcd_panel { panel-lcd {
compatible = "okaya,rs800480t-7x0gp"; compatible = "okaya,rs800480t-7x0gp";
backlight = <&backlight_lcd>; backlight = <&backlight_lcd>;
...@@ -208,7 +208,7 @@ lcd_panel_in: endpoint { ...@@ -208,7 +208,7 @@ lcd_panel_in: endpoint {
}; };
}; };
panel { panel-lvds0 {
compatible = "hannstar,hsd100pxn1"; compatible = "hannstar,hsd100pxn1";
backlight = <&backlight_lvds>; backlight = <&backlight_lvds>;
...@@ -378,7 +378,7 @@ MX6QDL_PAD_GPIO_6__ENET_IRQ 0x000b1 ...@@ -378,7 +378,7 @@ MX6QDL_PAD_GPIO_6__ENET_IRQ 0x000b1
>; >;
}; };
pinctrl_gpio_keys: gpio_keysgrp { pinctrl_gpio_keys: gpio-keysgrp {
fsl,pins = < fsl,pins = <
/* Power Button */ /* Power Button */
MX6QDL_PAD_NANDF_D3__GPIO2_IO03 0x1b0b0 MX6QDL_PAD_NANDF_D3__GPIO2_IO03 0x1b0b0
......
arch/arm/boot/dts/imx6qdl.dtsi
View file @ 1fc7210c
...@@ -13,9 +13,10 @@ ...@@ -13,9 +13,10 @@
#include <dt-bindings/clock/imx6qdl-clock.h> #include <dt-bindings/clock/imx6qdl-clock.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
aliases { aliases {
ethernet0 = &fec; ethernet0 = &fec;
can0 = &can1; can0 = &can1;
...@@ -1092,10 +1093,13 @@ mmdc1: mmdc@021b4000 { /* MMDC1 */ ...@@ -1092,10 +1093,13 @@ mmdc1: mmdc@021b4000 { /* MMDC1 */
}; };
weim: weim@021b8000 { weim: weim@021b8000 {
#address-cells = <2>;
#size-cells = <1>;
compatible = "fsl,imx6q-weim"; compatible = "fsl,imx6q-weim";
reg = <0x021b8000 0x4000>; reg = <0x021b8000 0x4000>;
interrupts = <0 14 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 14 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6QDL_CLK_EIM_SLOW>; clocks = <&clks IMX6QDL_CLK_EIM_SLOW>;
fsl,weim-cs-gpr = <&gpr>;
}; };
ocotp: ocotp@021bc000 { ocotp: ocotp@021bc000 {
......
arch/arm/boot/dts/imx6qp.dtsi
View file @ 1fc7210c
...@@ -85,5 +85,12 @@ ipu2: ipu@02800000 { ...@@ -85,5 +85,12 @@ ipu2: ipu@02800000 {
pcie: pcie@0x01000000 { pcie: pcie@0x01000000 {
compatible = "fsl,imx6qp-pcie", "snps,dw-pcie"; compatible = "fsl,imx6qp-pcie", "snps,dw-pcie";
}; };
aips-bus@02100000 {
mmdc0: mmdc@021b0000 { /* MMDC0 */
compatible = "fsl,imx6qp-mmdc", "fsl,imx6q-mmdc";
reg = <0x021b0000 0x4000>;
};
};
}; };
}; };
arch/arm/boot/dts/imx6sl.dtsi
View file @ 1fc7210c
...@@ -8,11 +8,13 @@ ...@@ -8,11 +8,13 @@
*/ */
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include "skeleton.dtsi"
#include "imx6sl-pinfunc.h" #include "imx6sl-pinfunc.h"
#include <dt-bindings/clock/imx6sl-clock.h> #include <dt-bindings/clock/imx6sl-clock.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
aliases { aliases {
ethernet0 = &fec; ethernet0 = &fec;
gpio0 = &gpio1; gpio0 = &gpio1;
...@@ -893,8 +895,11 @@ rngb: rngb@021b4000 { ...@@ -893,8 +895,11 @@ rngb: rngb@021b4000 {
}; };
weim: weim@021b8000 { weim: weim@021b8000 {
#address-cells = <2>;
#size-cells = <1>;
reg = <0x021b8000 0x4000>; reg = <0x021b8000 0x4000>;
interrupts = <0 14 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 14 IRQ_TYPE_LEVEL_HIGH>;
fsl,weim-cs-gpr = <&gpr>;
}; };
ocotp: ocotp@021bc000 { ocotp: ocotp@021bc000 {
......
arch/arm/boot/dts/imx6sx-sdb.dtsi
View file @ 1fc7210c
...@@ -290,6 +290,14 @@ &usbotg2 { ...@@ -290,6 +290,14 @@ &usbotg2 {
status = "okay"; status = "okay";
}; };
&usbphy1 {
fsl,tx-d-cal = <106>;
};
&usbphy2 {
fsl,tx-d-cal = <106>;
};
&usdhc2 { &usdhc2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc2>; pinctrl-0 = <&pinctrl_usdhc2>;
......
arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts 0 → 100644
View file @ 1fc7210c
/*
* Copyright (c) 2016 Andreas Färber
*
* 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 library is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This library 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 "imx6sx-udoo-neo.dtsi"
/ {
model = "UDOO Neo Basic";
compatible = "udoo,neobasic", "fsl,imx6sx";
memory {
reg = <0x80000000 0x20000000>;
};
};
&fec1 {
phy-handle = <&ethphy1>;
status = "okay";
mdio {
#address-cells = <1>;
#size-cells = <0>;
ethphy1: ethernet-phy@0 {
compatible = "ethernet-phy-ieee802.3-c22";
reg = <0>;
};
};
};
arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts 0 → 100644
View file @ 1fc7210c
/*
* Copyright (c) 2016 Andreas Färber
*
* 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 library is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This library 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 "imx6sx-udoo-neo.dtsi"
/ {
model = "UDOO Neo Extended";
compatible = "udoo,neoextended", "fsl,imx6sx";
memory {
reg = <0x80000000 0x40000000>;
};
};
arch/arm/boot/dts/imx6sx-udoo-neo-full.dts 0 → 100644
View file @ 1fc7210c
/*
* Copyright (c) 2016 Andreas Färber
*
* 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 library is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This library 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 "imx6sx-udoo-neo.dtsi"
/ {
model = "UDOO Neo Full";
compatible = "udoo,neofull", "fsl,imx6sx";
memory {
reg = <0x80000000 0x40000000>;
};
};
&fec1 {
phy-handle = <&ethphy1>;
status = "okay";
mdio {
#address-cells = <1>;
#size-cells = <0>;
ethphy1: ethernet-phy@0 {
compatible = "ethernet-phy-ieee802.3-c22";
reg = <0>;
};
};
};
arch/arm/boot/dts/imx6sx-udoo-neo.dtsi 0 → 100644
View file @ 1fc7210c
/*
* Copyright (c) 2016 Andreas Färber
*
* 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 library is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This library 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.
*/
#include "imx6sx.dtsi"
/ {
compatible = "fsl,imx6sx";
chosen {
stdout-path = "serial0:115200n8";
};
leds {
compatible = "gpio-leds";
red {
label = "udoo-neo:red:mmc";
gpios = <&gpio6 0 GPIO_ACTIVE_HIGH>;
default-state = "off";
linux,default-trigger = "mmc0";
};
orange {
label = "udoo-neo:orange:user";
gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>;
default-state = "keep";
};
};
reg_sdio_pwr: regulator-sdio-pwr {
compatible = "regulator-fixed";
gpio = <&gpio6 1 GPIO_ACTIVE_HIGH>;
enable-active-high;
regulator-name = "SDIO_PWR";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-boot-on;
};
};
&cpu0 {
arm-supply = <&sw1a_reg>;
soc-supply = <&sw1c_reg>;
};
&fec1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet1>;
phy-mode = "rmii";
phy-reset-gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
};
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c1>;
clock-frequency = <100000>;
status = "okay";
pmic: pmic@08 {
compatible = "fsl,pfuze3000";
reg = <0x08>;
regulators {
sw1a_reg: sw1a {
regulator-min-microvolt = <700000>;
regulator-max-microvolt = <1475000>;
regulator-boot-on;
regulator-always-on;
regulator-ramp-delay = <6250>;
};
sw1c_reg: sw1b {
regulator-min-microvolt = <700000>;
regulator-max-microvolt = <1475000>;
regulator-boot-on;
regulator-always-on;
regulator-ramp-delay = <6250>;
};
sw2_reg: sw2 {
regulator-min-microvolt = <1500000>;
regulator-max-microvolt = <1850000>;
regulator-boot-on;
regulator-always-on;
};
sw3a_reg: sw3 {
regulator-min-microvolt = <900000>;
regulator-max-microvolt = <1650000>;
regulator-boot-on;
regulator-always-on;
};
swbst_reg: swbst {
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5150000>;
};
snvs_reg: vsnvs {
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <3000000>;
regulator-boot-on;
regulator-always-on;
};
vref_reg: vrefddr {
regulator-boot-on;
regulator-always-on;
};
vgen1_reg: vldo1 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
vgen2_reg: vldo2 {
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <1550000>;
};
vgen3_reg: vccsd {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
vgen4_reg: v33 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
vgen5_reg: vldo3 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
vgen6_reg: vldo4 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
};
};
};
&iomuxc {
pinctrl_enet1: enet1grp {
fsl,pins =
<MX6SX_PAD_ENET1_CRS__GPIO2_IO_1 0xa0b1>,
<MX6SX_PAD_ENET1_MDC__ENET1_MDC 0xa0b1>,
<MX6SX_PAD_ENET1_MDIO__ENET1_MDIO 0xa0b1>,
<MX6SX_PAD_RGMII1_TD0__ENET1_TX_DATA_0 0xa0b1>,
<MX6SX_PAD_RGMII1_TD1__ENET1_TX_DATA_1 0xa0b1>,
<MX6SX_PAD_RGMII1_TX_CTL__ENET1_TX_EN 0xa0b1>,
<MX6SX_PAD_ENET1_TX_CLK__ENET1_REF_CLK1 0x3081>,
<MX6SX_PAD_ENET2_TX_CLK__GPIO2_IO_9 0x3081>,
<MX6SX_PAD_RGMII1_RD0__ENET1_RX_DATA_0 0x3081>,
<MX6SX_PAD_RGMII1_RD1__ENET1_RX_DATA_1 0x3081>,
<MX6SX_PAD_RGMII1_RX_CTL__ENET1_RX_EN 0x3081>,
<MX6SX_PAD_RGMII1_RXC__ENET1_RX_ER 0x3081>,
<MX6SX_PAD_ENET2_RX_CLK__ENET2_REF_CLK_25M 0x91>;
};
pinctrl_i2c1: i2c1grp {
fsl,pins =
<MX6SX_PAD_GPIO1_IO00__I2C1_SCL 0x4001b8b1>,
<MX6SX_PAD_GPIO1_IO01__I2C1_SDA 0x4001b8b1>;
};
pinctrl_uart1: uart1grp {
fsl,pins =
<MX6SX_PAD_GPIO1_IO04__UART1_TX 0x1b0b1>,
<MX6SX_PAD_GPIO1_IO05__UART1_RX 0x1b0b1>;
};
pinctrl_uart2: uart2grp {
fsl,pins =
<MX6SX_PAD_GPIO1_IO06__UART2_TX 0x1b0b1>,
<MX6SX_PAD_GPIO1_IO07__UART2_RX 0x1b0b1>;
};
pinctrl_uart5: uart5grp {
fsl,pins =
<MX6SX_PAD_SD4_DATA4__UART5_RX 0x1b0b1>,
<MX6SX_PAD_SD4_DATA5__UART5_TX 0x1b0b1>;
};
pinctrl_uart6: uart6grp {
fsl,pins =
<MX6SX_PAD_CSI_DATA00__UART6_RI_B 0x1b0b1>,
<MX6SX_PAD_CSI_DATA01__UART6_DSR_B 0x1b0b1>,
<MX6SX_PAD_CSI_DATA02__UART6_DTR_B 0x1b0b1>,
<MX6SX_PAD_CSI_DATA03__UART6_DCD_B 0x1b0b1>,
<MX6SX_PAD_CSI_DATA04__UART6_RX 0x1b0b1>,
<MX6SX_PAD_CSI_DATA05__UART6_TX 0x1b0b1>,
<MX6SX_PAD_CSI_DATA06__UART6_RTS_B 0x1b0b1>,
<MX6SX_PAD_CSI_DATA07__UART6_CTS_B 0x1b0b1>;
};
pinctrl_usdhc2: usdhc2grp {
fsl,pins =
<MX6SX_PAD_SD2_CMD__USDHC2_CMD 0x17059>,
<MX6SX_PAD_SD2_CLK__USDHC2_CLK 0x10059>,
<MX6SX_PAD_SD2_DATA0__USDHC2_DATA0 0x17059>,
<MX6SX_PAD_SD2_DATA1__USDHC2_DATA1 0x17059>,
<MX6SX_PAD_SD2_DATA2__USDHC2_DATA2 0x17059>,
<MX6SX_PAD_SD2_DATA3__USDHC2_DATA3 0x17059>,
<MX6SX_PAD_SD1_DATA0__GPIO6_IO_2 0x17059>; /* CD */
};
};
&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart1>;
status = "okay";
};
/* Cortex-M4 serial */
&uart2 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart2>;
status = "disabled";
};
/* Arduino serial */
&uart5 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart5>;
status = "disabled";
};
&uart6 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart6>;
uart-has-rtscts;
status = "disabled";
};
&usdhc2 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc2>;
vmmc-supply = <&reg_sdio_pwr>;
bus-width = <4>;
cd-gpios = <&gpio6 2 GPIO_ACTIVE_LOW>;
no-1-8-v;
keep-power-in-suspend;
wakeup-source;
status = "okay";
};
arch/arm/boot/dts/imx6sx.dtsi
View file @ 1fc7210c
...@@ -11,9 +11,11 @@ ...@@ -11,9 +11,11 @@
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include "imx6sx-pinfunc.h" #include "imx6sx-pinfunc.h"
#include "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
aliases { aliases {
can0 = &flexcan1; can0 = &flexcan1;
can1 = &flexcan2; can1 = &flexcan2;
...@@ -968,10 +970,13 @@ fec2: ethernet@021b4000 { ...@@ -968,10 +970,13 @@ fec2: ethernet@021b4000 {
}; };
weim: weim@021b8000 { weim: weim@021b8000 {
#address-cells = <2>;
#size-cells = <1>;
compatible = "fsl,imx6sx-weim", "fsl,imx6q-weim"; compatible = "fsl,imx6sx-weim", "fsl,imx6q-weim";
reg = <0x021b8000 0x4000>; reg = <0x021b8000 0x4000>;
interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SX_CLK_EIM_SLOW>; clocks = <&clks IMX6SX_CLK_EIM_SLOW>;
fsl,weim-cs-gpr = <&gpr>;
}; };
ocotp: ocotp@021bc000 { ocotp: ocotp@021bc000 {
...@@ -1143,7 +1148,7 @@ csi2: csi@0221c000 { ...@@ -1143,7 +1148,7 @@ csi2: csi@0221c000 {
lcdif1: lcdif@02220000 { lcdif1: lcdif@02220000 {
compatible = "fsl,imx6sx-lcdif", "fsl,imx28-lcdif"; compatible = "fsl,imx6sx-lcdif", "fsl,imx28-lcdif";
reg = <0x02220000 0x4000>; reg = <0x02220000 0x4000>;
interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 5 IRQ_TYPE_EDGE_RISING>;
clocks = <&clks IMX6SX_CLK_LCDIF1_PIX>, clocks = <&clks IMX6SX_CLK_LCDIF1_PIX>,
<&clks IMX6SX_CLK_LCDIF_APB>, <&clks IMX6SX_CLK_LCDIF_APB>,
<&clks IMX6SX_CLK_DISPLAY_AXI>; <&clks IMX6SX_CLK_DISPLAY_AXI>;
...@@ -1154,7 +1159,7 @@ lcdif1: lcdif@02220000 { ...@@ -1154,7 +1159,7 @@ lcdif1: lcdif@02220000 {
lcdif2: lcdif@02224000 { lcdif2: lcdif@02224000 {
compatible = "fsl,imx6sx-lcdif", "fsl,imx28-lcdif"; compatible = "fsl,imx6sx-lcdif", "fsl,imx28-lcdif";
reg = <0x02224000 0x4000>; reg = <0x02224000 0x4000>;
interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 6 IRQ_TYPE_EDGE_RISING>;
clocks = <&clks IMX6SX_CLK_LCDIF2_PIX>, clocks = <&clks IMX6SX_CLK_LCDIF2_PIX>,
<&clks IMX6SX_CLK_LCDIF_APB>, <&clks IMX6SX_CLK_LCDIF_APB>,
<&clks IMX6SX_CLK_DISPLAY_AXI>; <&clks IMX6SX_CLK_DISPLAY_AXI>;
......
arch/arm/boot/dts/imx6ul-14x14-evk.dts
View file @ 1fc7210c
...@@ -225,7 +225,7 @@ &uart2 { ...@@ -225,7 +225,7 @@ &uart2 {
}; };
&usbotg1 { &usbotg1 {
dr_mode = "peripheral"; dr_mode = "otg";
status = "okay"; status = "okay";
}; };
...@@ -235,6 +235,14 @@ &usbotg2 { ...@@ -235,6 +235,14 @@ &usbotg2 {
status = "okay"; status = "okay";
}; };
&usbphy1 {
fsl,tx-d-cal = <106>;
};
&usbphy2 {
fsl,tx-d-cal = <106>;
};
&usdhc1 { &usdhc1 {
pinctrl-names = "default", "state_100mhz", "state_200mhz"; pinctrl-names = "default", "state_100mhz", "state_200mhz";
pinctrl-0 = <&pinctrl_usdhc1>; pinctrl-0 = <&pinctrl_usdhc1>;
......
arch/arm/boot/dts/imx6ul-liteboard.dts 0 → 100644
View file @ 1fc7210c
/*
* Copyright 2016 Grinn
*
* Author: Marcin Niestroj <m.niestroj@grinn-global.com>
*
* 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 , 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 "imx6ul-litesom.dtsi"
/ {
model = "Grinn i.MX6UL liteBoard";
compatible = "grinn,imx6ul-liteboard", "grinn,imx6ul-litesom",
"fsl,imx6ul";
chosen {
stdout-path = &uart1;
};
reg_usb_otg1_vbus: regulator-usb-otg1-vbus {
compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usb_otg1_vbus>;
regulator-name = "usb_otg1_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio2 8 GPIO_ACTIVE_LOW>;
};
};
&iomuxc {
pinctrl_enet1: enet1grp {
fsl,pins = <
MX6UL_PAD_GPIO1_IO07__ENET1_MDC 0x1b0b0
MX6UL_PAD_GPIO1_IO06__ENET1_MDIO 0x1b0b0
MX6UL_PAD_ENET1_RX_EN__ENET1_RX_EN 0x1b0b0
MX6UL_PAD_ENET1_RX_ER__ENET1_RX_ER 0x1b0b0
MX6UL_PAD_ENET1_RX_DATA0__ENET1_RDATA00 0x1b0b0
MX6UL_PAD_ENET1_RX_DATA1__ENET1_RDATA01 0x1b0b0
MX6UL_PAD_ENET1_TX_EN__ENET1_TX_EN 0x1b0b0
MX6UL_PAD_ENET1_TX_DATA0__ENET1_TDATA00 0x1b0b0
MX6UL_PAD_ENET1_TX_DATA1__ENET1_TDATA01 0x1b0b0
MX6UL_PAD_ENET1_TX_CLK__ENET1_REF_CLK1 0x4001b031
>;
};
pinctrl_uart1: uart1grp {
fsl,pins = <
MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b1
MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX 0x1b0b1
>;
};
pinctrl_usdhc1: usdhc1grp {
fsl,pins = <
MX6UL_PAD_UART1_RTS_B__GPIO1_IO19 0x17059
MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x17059
MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x10071
MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x17059
MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x17059
MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x17059
MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x17059
>;
};
pinctrl_usb_otg1_vbus: usb-otg1-vbus {
fsl,pins = <
MX6UL_PAD_ENET2_RX_DATA0__GPIO2_IO08 0x79
>;
};
};
&fec1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet1>;
phy-mode = "rmii";
phy-handle = <&ethphy0>;
status = "okay";
mdio {
#address-cells = <1>;
#size-cells = <0>;
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
};
&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart1>;
status = "okay";
};
&usbotg1 {
vbus-supply = <&reg_usb_otg1_vbus>;
dr_mode = "host";
status = "okay";
};
&usdhc1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc1>;
cd-gpios = <&gpio1 19 GPIO_ACTIVE_LOW>;
no-1-8-v;
keep-power-in-suspend;
wakeup-source;
status = "okay";
};
arch/arm/boot/dts/imx6ul-litesom.dtsi 0 → 100644
View file @ 1fc7210c
/*
* Copyright 2016 Grinn
*
* Author: Marcin Niestroj <m.niestroj@grinn-global.com>
*
* 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 , 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.
*/
#include "imx6ul.dtsi"
/ {
model = "Grinn i.MX6UL liteSOM";
compatible = "grinn,imx6ul-litesom", "fsl,imx6ul";
memory {
reg = <0x80000000 0x20000000>;
};
};
&iomuxc {
pinctrl_usdhc2: usdhc2grp {
fsl,pins = <
MX6UL_PAD_NAND_RE_B__USDHC2_CLK 0x10069
MX6UL_PAD_NAND_WE_B__USDHC2_CMD 0x17059
MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x17059
MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x17059
MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x17059
MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x17059
MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x17059
MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x17059
MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x17059
MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x17059
MX6UL_PAD_NAND_ALE__USDHC2_RESET_B 0x17059
>;
};
};
&usdhc2 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc2>;
no-1-8-v;
non-removable;
keep-power-in-suspend;
wakeup-source;
bus-width = <8>;
status = "okay";
};
arch/arm/boot/dts/imx6ul.dtsi
View file @ 1fc7210c
...@@ -11,9 +11,11 @@ ...@@ -11,9 +11,11 @@
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include "imx6ul-pinfunc.h" #include "imx6ul-pinfunc.h"
#include "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
aliases { aliases {
ethernet0 = &fec1; ethernet0 = &fec1;
ethernet1 = &fec2; ethernet1 = &fec2;
......
arch/arm/boot/dts/imx6ull-14x14-evk.dts 0 → 100644
View file @ 1fc7210c
/*
* Copyright (C) 2016 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 , 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.
*/
#include "imx6ul-14x14-evk.dts"
/ {
model = "Freescale i.MX6 UlltraLite 14x14 EVK Board";
compatible = "fsl,imx6ull-14x14-evk", "fsl,imx6ull";
};
&clks {
assigned-clocks = <&clks IMX6UL_CLK_PLL3_PFD2>;
assigned-clock-rates = <320000000>;
};
arch/arm/boot/dts/imx6ull-pinfunc.h 0 → 100644
View file @ 1fc7210c
/*
* Copyright (C) 2016 Freescale Semiconductor, Inc.
*
* This program 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.
*/
#ifndef __DTS_IMX6ULL_PINFUNC_H
#define __DTS_IMX6ULL_PINFUNC_H
#include "imx6ul-pinfunc.h"
/*
* The pin function ID is a tuple of
* <mux_reg conf_reg input_reg mux_mode input_val>
*/
#define MX6ULL_PAD_ENET2_RX_DATA0__EPDC_SDDO08 0x00E4 0x0370 0x0000 0x9 0x0
#define MX6ULL_PAD_ENET2_RX_DATA1__EPDC_SDDO09 0x00E8 0x0374 0x0000 0x9 0x0
#define MX6ULL_PAD_ENET2_RX_EN__EPDC_SDDO10 0x00EC 0x0378 0x0000 0x9 0x0
#define MX6ULL_PAD_ENET2_TX_DATA0__EPDC_SDDO11 0x00F0 0x037C 0x0000 0x9 0x0
#define MX6ULL_PAD_ENET2_TX_DATA1__EPDC_SDDO12 0x00F4 0x0380 0x0000 0x9 0x0
#define MX6ULL_PAD_ENET2_TX_EN__EPDC_SDDO13 0x00F8 0x0384 0x0000 0x9 0x0
#define MX6ULL_PAD_ENET2_TX_CLK__EPDC_SDDO14 0x00FC 0x0388 0x0000 0x9 0x0
#define MX6ULL_PAD_ENET2_RX_ER__EPDC_SDDO15 0x0100 0x038C 0x0000 0x9 0x0
#define MX6ULL_PAD_LCD_CLK__EPDC_SDCLK 0x0104 0x0390 0x0000 0x9 0x0
#define MX6ULL_PAD_LCD_ENABLE__EPDC_SDLE 0x0108 0x0394 0x0000 0x9 0x0
#define MX6ULL_PAD_LCD_HSYNC__EPDC_SDOE 0x010C 0x0398 0x0000 0x9 0x0
#define MX6ULL_PAD_LCD_VSYNC__EPDC_SDCE0 0x0110 0x039C 0x0000 0x9 0x0
#define MX6ULL_PAD_LCD_RESET__EPDC_GDOE 0x0114 0x03A0 0x0000 0x9 0x0
#define MX6ULL_PAD_LCD_DATA00__EPDC_SDDO00 0x0118 0x03A4 0x0000 0x9 0x0
#define MX6ULL_PAD_LCD_DATA01__EPDC_SDDO01 0x011C 0x03A8 0x0000 0x9 0x0
#define MX6ULL_PAD_LCD_DATA02__EPDC_SDDO02 0x0120 0x03AC 0x0000 0x9 0x0
#define MX6ULL_PAD_LCD_DATA03__EPDC_SDDO03 0x0124 0x03B0 0x0000 0x9 0x0
#define MX6ULL_PAD_LCD_DATA04__EPDC_SDDO04 0x0128 0x03B4 0x0000 0x9 0x0
#define MX6ULL_PAD_LCD_DATA05__EPDC_SDDO05 0x012C 0x03B8 0x0000 0x9 0x0
#define MX6ULL_PAD_LCD_DATA06__EPDC_SDDO06 0x0130 0x03BC 0x0000 0x9 0x0
#define MX6ULL_PAD_LCD_DATA07__EPDC_SDDO07 0x0134 0x03C0 0x0000 0x9 0x0
#define MX6ULL_PAD_LCD_DATA14__EPDC_SDSHR 0x0150 0x03DC 0x0000 0x9 0x0
#define MX6ULL_PAD_LCD_DATA15__EPDC_GDRL 0x0154 0x03E0 0x0000 0x9 0x0
#define MX6ULL_PAD_LCD_DATA16__EPDC_GDCLK 0x0158 0x03E4 0x0000 0x9 0x0
#define MX6ULL_PAD_LCD_DATA17__EPDC_GDSP 0x015C 0x03E8 0x0000 0x9 0x0
#define MX6ULL_PAD_LCD_DATA21__EPDC_SDCE1 0x016C 0x03F8 0x0000 0x9 0x0
#define MX6ULL_PAD_CSI_MCLK__ESAI_TX3_RX2 0x01D4 0x0460 0x0000 0x9 0x0
#define MX6ULL_PAD_CSI_PIXCLK__ESAI_TX2_RX3 0x01D8 0x0464 0x0000 0x9 0x0
#define MX6ULL_PAD_CSI_VSYNC__ESAI_TX4_RX1 0x01DC 0x0468 0x0000 0x9 0x0
#define MX6ULL_PAD_CSI_HSYNC__ESAI_TX1 0x01E0 0x046C 0x0000 0x9 0x0
#define MX6ULL_PAD_CSI_DATA00__ESAI_TX_HF_CLK 0x01E4 0x0470 0x0000 0x9 0x0
#define MX6ULL_PAD_CSI_DATA01__ESAI_RX_HF_CLK 0x01E8 0x0474 0x0000 0x9 0x0
#define MX6ULL_PAD_CSI_DATA02__ESAI_RX_FS 0x01EC 0x0478 0x0000 0x9 0x0
#define MX6ULL_PAD_CSI_DATA03__ESAI_RX_CLK 0x01F0 0x047C 0x0000 0x9 0x0
#define MX6ULL_PAD_CSI_DATA04__ESAI_TX_FS 0x01F4 0x0480 0x0000 0x9 0x0
#define MX6ULL_PAD_CSI_DATA05__ESAI_TX_CLK 0x01F8 0x0484 0x0000 0x9 0x0
#define MX6ULL_PAD_CSI_DATA06__ESAI_TX5_RX0 0x01FC 0x0488 0x0000 0x9 0x0
#define MX6ULL_PAD_CSI_DATA07__ESAI_T0 0x0200 0x048C 0x0000 0x9 0x0
#endif /* __DTS_IMX6ULL_PINFUNC_H */
arch/arm/boot/dts/imx6ull.dtsi 0 → 100644
View file @ 1fc7210c
/*
* Copyright 2016 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 , 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.
*/
#include "imx6ul.dtsi"
#include "imx6ull-pinfunc.h"
arch/arm/boot/dts/imx7s.dtsi
View file @ 1fc7210c
...@@ -46,9 +46,11 @@ ...@@ -46,9 +46,11 @@
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include "imx7d-pinfunc.h" #include "imx7d-pinfunc.h"
#include "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
aliases { aliases {
gpio0 = &gpio1; gpio0 = &gpio1;
gpio1 = &gpio2; gpio1 = &gpio2;
......
arch/arm/boot/dts/ls1021a.dtsi
View file @ 1fc7210c
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
#include "skeleton64.dtsi" #include "skeleton64.dtsi"
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/thermal/thermal.h>
/ { / {
compatible = "fsl,ls1021a"; compatible = "fsl,ls1021a";
...@@ -70,14 +71,15 @@ cpus { ...@@ -70,14 +71,15 @@ cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
cpu@f00 { cpu0: cpu@f00 {
compatible = "arm,cortex-a7"; compatible = "arm,cortex-a7";
device_type = "cpu"; device_type = "cpu";
reg = <0xf00>; reg = <0xf00>;
clocks = <&cluster1_clk>; clocks = <&cluster1_clk>;
#cooling-cells = <2>;
}; };
cpu@f01 { cpu1: cpu@f01 {
compatible = "arm,cortex-a7"; compatible = "arm,cortex-a7";
device_type = "cpu"; device_type = "cpu";
reg = <0xf01>; reg = <0xf01>;
...@@ -251,6 +253,84 @@ cluster1_clk: clk0c0@0 { ...@@ -251,6 +253,84 @@ cluster1_clk: clk0c0@0 {
}; };
}; };
tmu: tmu@1f00000 {
compatible = "fsl,qoriq-tmu";
reg = <0x0 0x1f00000 0x0 0x10000>;
interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
fsl,tmu-range = <0xb0000 0xa0026 0x80048 0x30061>;
fsl,tmu-calibration = <0x00000000 0x0000000f
0x00000001 0x00000017
0x00000002 0x0000001e
0x00000003 0x00000026
0x00000004 0x0000002e
0x00000005 0x00000035
0x00000006 0x0000003d
0x00000007 0x00000044
0x00000008 0x0000004c
0x00000009 0x00000053
0x0000000a 0x0000005b
0x0000000b 0x00000064
0x00010000 0x00000011
0x00010001 0x0000001c
0x00010002 0x00000024
0x00010003 0x0000002b
0x00010004 0x00000034
0x00010005 0x00000039
0x00010006 0x00000042
0x00010007 0x0000004c
0x00010008 0x00000051
0x00010009 0x0000005a
0x0001000a 0x00000063
0x00020000 0x00000013
0x00020001 0x00000019
0x00020002 0x00000024
0x00020003 0x0000002c
0x00020004 0x00000035
0x00020005 0x0000003d
0x00020006 0x00000046
0x00020007 0x00000050
0x00020008 0x00000059
0x00030000 0x00000002
0x00030001 0x0000000d
0x00030002 0x00000019
0x00030003 0x00000024>;
#thermal-sensor-cells = <1>;
};
thermal-zones {
cpu_thermal: cpu-thermal {
polling-delay-passive = <1000>;
polling-delay = <5000>;
thermal-sensors = <&tmu 0>;
trips {
cpu_alert: cpu-alert {
temperature = <85000>;
hysteresis = <2000>;
type = "passive";
};
cpu_crit: cpu-crit {
temperature = <95000>;
hysteresis = <2000>;
type = "critical";
};
};
cooling-maps {
map0 {
trip = <&cpu_alert>;
cooling-device =
<&cpu0 THERMAL_NO_LIMIT
THERMAL_NO_LIMIT>;
};
};
};
};
dspi0: dspi@2100000 { dspi0: dspi@2100000 {
compatible = "fsl,ls1021a-v1.0-dspi"; compatible = "fsl,ls1021a-v1.0-dspi";
#address-cells = <1>; #address-cells = <1>;
......
arch/arm/boot/dts/vf-colibri.dtsi
View file @ 1fc7210c
...@@ -108,6 +108,10 @@ &edma0 { ...@@ -108,6 +108,10 @@ &edma0 {
status = "okay"; status = "okay";
}; };
&edma1 {
status = "okay";
};
&esdhc1 { &esdhc1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_esdhc1>; pinctrl-0 = <&pinctrl_esdhc1>;
......
arch/arm/boot/dts/vf610-zii-dev-rev-b.dts
View file @ 1fc7210c
...@@ -499,13 +499,6 @@ i2c@4 { ...@@ -499,13 +499,6 @@ i2c@4 {
}; };
}; };
&i2c3 {
clock-frequency = <100000>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c3>;
status = "okay";
};
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart0>; pinctrl-0 = <&pinctrl_uart0>;
...@@ -663,13 +656,6 @@ VF610_PAD_PTA23__I2C2_SDA 0x37ff ...@@ -663,13 +656,6 @@ VF610_PAD_PTA23__I2C2_SDA 0x37ff
>; >;
}; };
pinctrl_i2c3: i2c3grp {
fsl,pins = <
VF610_PAD_PTA30__I2C3_SCL 0x37ff
VF610_PAD_PTA31__I2C3_SDA 0x37ff
>;
};
pinctrl_leds_debug: pinctrl-leds-debug { pinctrl_leds_debug: pinctrl-leds-debug {
fsl,pins = < fsl,pins = <
VF610_PAD_PTD20__GPIO_74 0x31c2 VF610_PAD_PTD20__GPIO_74 0x31c2
......
arch/arm/boot/dts/vfxxx.dtsi
View file @ 1fc7210c
...@@ -194,6 +194,9 @@ dspi0: dspi0@4002c000 { ...@@ -194,6 +194,9 @@ dspi0: dspi0@4002c000 {
clocks = <&clks VF610_CLK_DSPI0>; clocks = <&clks VF610_CLK_DSPI0>;
clock-names = "dspi"; clock-names = "dspi";
spi-num-chipselects = <6>; spi-num-chipselects = <6>;
dmas = <&edma1 1 12>,
<&edma1 1 13>;
dma-names = "rx", "tx";
status = "disabled"; status = "disabled";
}; };
...@@ -206,6 +209,9 @@ dspi1: dspi1@4002d000 { ...@@ -206,6 +209,9 @@ dspi1: dspi1@4002d000 {
clocks = <&clks VF610_CLK_DSPI1>; clocks = <&clks VF610_CLK_DSPI1>;
clock-names = "dspi"; clock-names = "dspi";
spi-num-chipselects = <4>; spi-num-chipselects = <4>;
dmas = <&edma1 1 14>,
<&edma1 1 15>;
dma-names = "rx", "tx";
status = "disabled"; status = "disabled";
}; };
...@@ -520,6 +526,12 @@ edma1: dma-controller@40098000 { ...@@ -520,6 +526,12 @@ edma1: dma-controller@40098000 {
status = "disabled"; status = "disabled";
}; };
ocotp: ocotp@400a5000 {
compatible = "fsl,vf610-ocotp";
reg = <0x400a5000 0x1000>;
clocks = <&clks VF610_CLK_OCOTP>;
};
snvs0: snvs@400a7000 { snvs0: snvs@400a7000 {
compatible = "fsl,sec-v4.0-mon", "syscon", "simple-mfd"; compatible = "fsl,sec-v4.0-mon", "syscon", "simple-mfd";
reg = <0x400a7000 0x2000>; reg = <0x400a7000 0x2000>;
...@@ -561,6 +573,9 @@ dspi2: dspi2@400ac000 { ...@@ -561,6 +573,9 @@ dspi2: dspi2@400ac000 {
clocks = <&clks VF610_CLK_DSPI2>; clocks = <&clks VF610_CLK_DSPI2>;
clock-names = "dspi"; clock-names = "dspi";
spi-num-chipselects = <2>; spi-num-chipselects = <2>;
dmas = <&edma1 0 10>,
<&edma1 0 11>;
dma-names = "rx", "tx";
status = "disabled"; status = "disabled";
}; };
...@@ -573,6 +588,9 @@ dspi3: dspi3@400ad000 { ...@@ -573,6 +588,9 @@ dspi3: dspi3@400ad000 {
clocks = <&clks VF610_CLK_DSPI3>; clocks = <&clks VF610_CLK_DSPI3>;
clock-names = "dspi"; clock-names = "dspi";
spi-num-chipselects = <2>; spi-num-chipselects = <2>;
dmas = <&edma1 0 12>,
<&edma1 0 13>;
dma-names = "rx", "tx";
status = "disabled"; status = "disabled";
}; };
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7