dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-10-31 02:15:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

ARM: dts: imx6sx-sdb: Sync with kernel 5.4.16

Browse Source 
Sync the imx6sx-sdb dts files with kernel 5.4.16.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
This commit is contained in:
Fabio Estevam
2020-02-19 09:56:27 -03:00
committed by Stefano Babic
parent 47c2eae1b8
commit a29d79da43
3 changed files with 196 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/dts/imx6sx-sdb-u-boot.dtsi
View File

@@ -1,16 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright 2018 NXP
*/
&qspi2 {
num-cs = <2>;
flash0: n25q256a@0 {
compatible = "jedec,spi-nor";
};
flash1: n25q256a@1 {
compatible = "jedec,spi-nor";
};
};

35
arch/arm/dts/imx6sx-sdb.dts
View File

@@ -1,10 +1,6 @@
/* // SPDX-License-Identifier: GPL-2.0
* Copyright (C) 2015 Freescale Semiconductor, Inc. //
* // Copyright (C) 2015 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.
*/
#include "imx6sx-sdb.dtsi" #include "imx6sx-sdb.dtsi"
@@ -117,15 +113,19 @@
#size-cells = <1>; #size-cells = <1>;
compatible = "micron,n25q256a", "jedec,spi-nor"; compatible = "micron,n25q256a", "jedec,spi-nor";
spi-max-frequency = <29000000>; spi-max-frequency = <29000000>;
spi-rx-bus-width = <4>;
spi-tx-bus-width = <4>;
reg = <0>; reg = <0>;
}; };
flash1: n25q256a@1 { flash1: n25q256a@2 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "micron,n25q256a", "jedec,spi-nor"; compatible = "micron,n25q256a", "jedec,spi-nor";
spi-max-frequency = <29000000>; spi-max-frequency = <29000000>;
reg = <1>; spi-rx-bus-width = <4>;
spi-tx-bus-width = <4>;
reg = <2>;
}; };
}; };
@@ -136,3 +136,20 @@
&reg_soc { &reg_soc {
vin-supply = <&sw1a_reg>; vin-supply = <&sw1a_reg>;
}; };
&reg_vdd1p1 {
vin-supply = <&vgen6_reg>;
};
&reg_vdd2p5 {
vin-supply = <&vgen6_reg>;
};
&reg_can_stby {
/* Transceiver EN/STBY is active low on RevB board */
gpio = <&gpio4 27 GPIO_ACTIVE_LOW>;
};
&snvs_pwrkey {
status = "okay";
};

276
arch/arm/dts/imx6sx-sdb.dtsi
View File

@@ -1,10 +1,6 @@
/* // SPDX-License-Identifier: GPL-2.0
* Copyright (C) 2014 Freescale Semiconductor, Inc. //
* // Copyright (C) 2014 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.
*/
/dts-v1/; /dts-v1/;
@@ -20,11 +16,12 @@
stdout-path = &uart1; stdout-path = &uart1;
}; };
memory { memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x40000000>; reg = <0x80000000 0x40000000>;
}; };
backlight { backlight_display: backlight-display {
compatible = "pwm-backlight"; compatible = "pwm-backlight";
pwms = <&pwm3 0 5000000>; pwms = <&pwm3 0 5000000>;
brightness-levels = <0 4 8 16 32 64 128 255>; brightness-levels = <0 4 8 16 32 64 128 255>;
@@ -40,95 +37,118 @@
label = "Volume Up"; label = "Volume Up";
gpios = <&gpio1 18 GPIO_ACTIVE_LOW>; gpios = <&gpio1 18 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>; linux,code = <KEY_VOLUMEUP>;
wakeup-source;
}; };
volume-down { volume-down {
label = "Volume Down"; label = "Volume Down";
gpios = <&gpio1 19 GPIO_ACTIVE_LOW>; gpios = <&gpio1 19 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEDOWN>; linux,code = <KEY_VOLUMEDOWN>;
wakeup-source;
}; };
}; };
regulators { vcc_sd3: regulator-vcc-sd3 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; pinctrl-names = "default";
#size-cells = <0>; pinctrl-0 = <&pinctrl_vcc_sd3>;
regulator-name = "VCC_SD3";
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
gpio = <&gpio2 11 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
vcc_sd3: regulator@0 { reg_usb_otg1_vbus: regulator-usb-otg1-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>; pinctrl-names = "default";
pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb_otg1>;
pinctrl-0 = <&pinctrl_vcc_sd3>; regulator-name = "usb_otg1_vbus";
regulator-name = "VCC_SD3"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <3000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <3000000>; gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
gpio = <&gpio2 11 GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; };
};
reg_usb_otg1_vbus: regulator@1 { reg_usb_otg2_vbus: regulator-usb-otg2-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; pinctrl-names = "default";
pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb_otg2>;
pinctrl-0 = <&pinctrl_usb_otg1>; regulator-name = "usb_otg2_vbus";
regulator-name = "usb_otg1_vbus"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>;
gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; };
};
reg_usb_otg2_vbus: regulator@2 { reg_psu_5v: regulator-psu-5v {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>; regulator-name = "PSU-5V0";
pinctrl-names = "default"; regulator-min-microvolt = <5000000>;
pinctrl-0 = <&pinctrl_usb_otg2>; regulator-max-microvolt = <5000000>;
regulator-name = "usb_otg2_vbus"; };
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
reg_psu_5v: regulator@3 { reg_lcd_3v3: regulator-lcd-3v3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <3>; regulator-name = "lcd-3v3";
regulator-name = "PSU-5V0"; gpio = <&gpio3 27 0>;
regulator-min-microvolt = <5000000>; enable-active-high;
regulator-max-microvolt = <5000000>; };
};
reg_lcd_3v3: regulator@4 { reg_peri_3v3: regulator-peri-3v3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <4>; pinctrl-names = "default";
regulator-name = "lcd-3v3"; pinctrl-0 = <&pinctrl_peri_3v3>;
gpio = <&gpio3 27 0>; regulator-name = "peri_3v3";
enable-active-high; regulator-min-microvolt = <3300000>;
}; regulator-max-microvolt = <3300000>;
gpio = <&gpio4 16 GPIO_ACTIVE_HIGH>;
enable-active-high;
regulator-always-on;
};
reg_peri_3v3: regulator@5 { reg_enet_3v3: regulator-enet-3v3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <5>; pinctrl-names = "default";
pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet_3v3>;
pinctrl-0 = <&pinctrl_peri_3v3>; regulator-name = "enet_3v3";
regulator-name = "peri_3v3"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; gpio = <&gpio2 6 GPIO_ACTIVE_LOW>;
gpio = <&gpio4 16 GPIO_ACTIVE_HIGH>; regulator-boot-on;
enable-active-high; regulator-always-on;
regulator-always-on; };
};
reg_enet_3v3: regulator@6 { reg_pcie_gpio: regulator-pcie-gpio {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <6>; pinctrl-names = "default";
pinctrl-names = "default"; pinctrl-0 = <&pinctrl_pcie_reg>;
pinctrl-0 = <&pinctrl_enet_3v3>; regulator-name = "MPCIE_3V3";
regulator-name = "enet_3v3"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; gpio = <&gpio2 1 GPIO_ACTIVE_HIGH>;
gpios = <&gpio2 6 GPIO_ACTIVE_LOW>; enable-active-high;
}; };
reg_lcd_5v: regulator-lcd-5v {
compatible = "regulator-fixed";
regulator-name = "lcd-5v0";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
};
reg_can_en: regulator-can-en {
compatible = "regulator-fixed";
regulator-name = "can-en";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
reg_can_stby: regulator-can-stby {
compatible = "regulator-fixed";
regulator-name = "can-stby";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
}; };
sound { sound {
@@ -146,6 +166,19 @@
mux-int-port = <2>; mux-int-port = <2>;
mux-ext-port = <6>; mux-ext-port = <6>;
}; };
panel {
compatible = "sii,43wvf1g";
backlight = <&backlight_display>;
dvdd-supply = <&reg_lcd_3v3>;
avdd-supply = <&reg_lcd_5v>;
port {
panel_in: endpoint {
remote-endpoint = <&display_out>;
};
};
};
}; };
&audmux { &audmux {
@@ -158,8 +191,9 @@
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet1>; pinctrl-0 = <&pinctrl_enet1>;
phy-supply = <&reg_enet_3v3>; phy-supply = <&reg_enet_3v3>;
phy-mode = "rgmii"; phy-mode = "rgmii-id";
phy-handle = <&ethphy1>; phy-handle = <&ethphy1>;
phy-reset-gpios = <&gpio2 7 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
mdio { mdio {
@@ -184,6 +218,20 @@
status = "okay"; status = "okay";
}; };
&flexcan1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_flexcan1>;
xceiver-supply = <&reg_can_stby>;
status = "okay";
};
&flexcan2 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_flexcan2>;
xceiver-supply = <&reg_can_stby>;
status = "okay";
};
&i2c3 { &i2c3 {
clock-frequency = <100000>; clock-frequency = <100000>;
pinctrl-names = "default"; pinctrl-names = "default";
@@ -212,34 +260,22 @@
}; };
}; };
&pcie {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pcie>;
reset-gpio = <&gpio2 0 GPIO_ACTIVE_LOW>;
vpcie-supply = <&reg_pcie_gpio>;
status = "okay";
};
&lcdif1 { &lcdif1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_lcd>; pinctrl-0 = <&pinctrl_lcd>;
lcd-supply = <&reg_lcd_3v3>;
display = <&display0>;
status = "okay"; status = "okay";
display0: display0 { port {
bits-per-pixel = <16>; display_out: endpoint {
bus-width = <24>; remote-endpoint = <&panel_in>;
display-timings {
native-mode = <&timing0>;
timing0: timing0 {
clock-frequency = <33500000>;
hactive = <800>;
vactive = <480>;
hback-porch = <89>;
hfront-porch = <164>;
vback-porch = <23>;
vfront-porch = <10>;
hsync-len = <10>;
vsync-len = <10>;
hsync-active = <0>;
vsync-active = <0>;
de-active = <1>;
pixelclk-active = <0>;
};
}; };
}; };
}; };
@@ -365,6 +401,8 @@
MX6SX_PAD_RGMII1_RD3__ENET1_RX_DATA_3 0x3081 MX6SX_PAD_RGMII1_RD3__ENET1_RX_DATA_3 0x3081
MX6SX_PAD_RGMII1_RX_CTL__ENET1_RX_EN 0x3081 MX6SX_PAD_RGMII1_RX_CTL__ENET1_RX_EN 0x3081
MX6SX_PAD_ENET2_RX_CLK__ENET2_REF_CLK_25M 0x91 MX6SX_PAD_ENET2_RX_CLK__ENET2_REF_CLK_25M 0x91
/* phy reset */
MX6SX_PAD_ENET2_CRS__GPIO2_IO_7 0x10b0
>; >;
}; };
@@ -391,6 +429,20 @@
>; >;
}; };
pinctrl_flexcan1: flexcan1grp {
fsl,pins = <
MX6SX_PAD_QSPI1B_DQS__CAN1_TX 0x1b020
MX6SX_PAD_QSPI1A_SS1_B__CAN1_RX 0x1b020
>;
};
pinctrl_flexcan2: flexcan2grp {
fsl,pins = <
MX6SX_PAD_QSPI1B_SS1_B__CAN2_RX 0x1b020
MX6SX_PAD_QSPI1A_DQS__CAN2_TX 0x1b020
>;
};
pinctrl_gpio_keys: gpio_keysgrp { pinctrl_gpio_keys: gpio_keysgrp {
fsl,pins = < fsl,pins = <
MX6SX_PAD_CSI_DATA04__GPIO1_IO_18 0x17059 MX6SX_PAD_CSI_DATA04__GPIO1_IO_18 0x17059
@@ -453,6 +505,18 @@
>; >;
}; };
pinctrl_pcie: pciegrp {
fsl,pins = <
MX6SX_PAD_ENET1_COL__GPIO2_IO_0 0x10b0
>;
};
pinctrl_pcie_reg: pciereggrp {
fsl,pins = <
MX6SX_PAD_ENET1_CRS__GPIO2_IO_1 0x10b0
>;
};
pinctrl_peri_3v3: peri3v3grp { pinctrl_peri_3v3: peri3v3grp {
fsl,pins = < fsl,pins = <
MX6SX_PAD_QSPI1A_DATA0__GPIO4_IO_16 0x80000000 MX6SX_PAD_QSPI1A_DATA0__GPIO4_IO_16 0x80000000