ARM: dts: imx6sx: Sync with kernel 5.4.16
Subsystems (5)
Fabio Estevam
reviewerPATCH 1/3 ARM: dts: imx6sx: Sync with kernel 5.4.16
Sync the imx6sx dts files with kernel 5.4.16.
--- arch/arm/dts/imx6sx-pinfunc.h | 6 +- arch/arm/dts/imx6sx.dtsi | 507 ++++++++++++++--------- include/dt-bindings/clock/imx6sx-clock.h | 13 +- 3 files changed, 309 insertions(+), 217 deletions(-)
arch/arm/dts/imx6sx-pinfunc.h +1 -5
@@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright 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. -* */ #ifndef __DTS_IMX6SX_PINFUNC_H
arch/arm/dts/imx6sx.dtsi +301 -206
1,178 lines not on this page · raw message
include/dt-bindings/clock/imx6sx-clock.h +7 -6
@@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * 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. -* */ #ifndef __DT_BINDINGS_CLOCK_IMX6SX_H
@@ -275,6 +271,11 @@#define IMX6SX_PLL6_BYPASS 262#define IMX6SX_PLL7_BYPASS 263#define IMX6SX_CLK_SPDIF_GCLK 264 -#define IMX6SX_CLK_CLK_END 265 +#define IMX6SX_CLK_LVDS2_SEL 265 +#define IMX6SX_CLK_LVDS2_OUT 266 +#define IMX6SX_CLK_LVDS2_IN 267 +#define IMX6SX_CLK_ANACLK2 268 +#define IMX6SX_CLK_MMDC_P1_IPG 269 +#define IMX6SX_CLK_CLK_END 270#endif /* __DT_BINDINGS_CLOCK_IMX6SX_H */
Signature · 1 line
2.17.1
Fabio Estevam
reviewerPATCH 2/3 ARM: dts: imx6sx-sdb: Sync with kernel 5.4.16
Sync the imx6sx-sdb dts files with kernel 5.4.16.
--- arch/arm/dts/imx6sx-sdb-u-boot.dtsi | 16 -- arch/arm/dts/imx6sx-sdb.dts | 35 +++- arch/arm/dts/imx6sx-sdb.dtsi | 284 +++++++++++++++++----------- 3 files changed, 200 insertions(+), 135 deletions(-) delete mode 100644 arch/arm/dts/imx6sx-sdb-u-boot.dtsi
arch/arm/dts/imx6sx-sdb-u-boot.dtsi deleted +0 -16
@@ -1,16 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright 2018 NXP - */ - -&qspi2 { - num-cs = <2>; - - flash0: n25q256a at 0 { - compatible = "jedec,spi-nor"; - }; - - flash1: n25q256a at 1 { - compatible = "jedec,spi-nor"; - }; -};
arch/arm/dts/imx6sx-sdb.dts +26 -9
@@ -1,10 +1,6 @@ -/* - * 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. - */ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright (C) 2015 Freescale Semiconductor, Inc. #include "imx6sx-sdb.dtsi"
@@ -117,15 +113,19 @@ #size-cells = <1>; compatible = "micron,n25q256a", "jedec,spi-nor"; spi-max-frequency = <29000000>; + spi-rx-bus-width = <4>; + spi-tx-bus-width = <4>; reg = <0>; }; - flash1: n25q256a at 1 { + flash1: n25q256a at 2 { #address-cells = <1>; #size-cells = <1>; compatible = "micron,n25q256a", "jedec,spi-nor"; spi-max-frequency = <29000000>; - reg = <1>; + spi-rx-bus-width = <4>; + spi-tx-bus-width = <4>; + reg = <2>; }; };
@@ -136,3 +136,20 @@ ®_soc { vin-supply = <&sw1a_reg>; }; + +®_vdd1p1 { + vin-supply = <&vgen6_reg>; +}; + +®_vdd2p5 { + vin-supply = <&vgen6_reg>; +}; + +®_can_stby { + /* Transceiver EN/STBY is active low on RevB board */ + gpio = <&gpio4 27 GPIO_ACTIVE_LOW>; +}; + +&snvs_pwrkey { + status = "okay"; +};
arch/arm/dts/imx6sx-sdb.dtsi +174 -110
362 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 2/3 ARM: dts: imx6sx-sdb: Sync with kernel 5.4.16
Quoted 2 lines
Sync the imx6sx-sdb dts files with kernel 5.4.16.
Signed-off-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
Fabio Estevam
reviewerPATCH 3/3 mx6sxsabresd: Enable DM_PCI
In reply to Fabio EstevamEnale DM_PCI support in order to avoid board removal from the project.
--- configs/mx6sxsabresd_defconfig | 1 + 1 file changed, 1 insertion(+)
configs/mx6sxsabresd_defconfig +1 -0
@@ -51,6 +51,7 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y CONFIG_MII=y CONFIG_PCI=y +CONFIG_DM_PCI=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y CONFIG_DM_PMIC=y
Signature · 1 line
2.17.1
PATCH 3/3 mx6sxsabresd: Enable DM_PCI
Quoted 3 lines
Enale
DM_PCIsupport in order to avoid board removal from the project.Signed-off-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 1/3 ARM: dts: imx6sx: Sync with kernel 5.4.16
In reply to Fabio EstevamQuoted 2 lines
Sync the imx6sx dts files with kernel 5.4.16.
Signed-off-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================