ARM: dts: imx: imx53: Synchronize iMX53 DT with Linux
Subsystems (2)
PATCH 1/6 ARM: dts: imx: imx53: Synchronize iMX53 DT with Linux
Synchronize iMX53 device tree from Linux next-20190607 3f310e51ceb1 , this is needed to get NFC, UART, USBOTG DT nodes.
--- arch/arm/dts/imx53.dtsi | 745 +++++++++++++++++++++++++++++++--------- 1 file changed, 588 insertions(+), 157 deletions(-)
arch/arm/dts/imx53.dtsi +588 -157
@@ -1,17 +1,8 @@ -/* - * Copyright 2016 Beckhoff Automation - * Copyright 2011 Freescale Semiconductor, Inc. - * Copyright 2011 Linaro Ltd. - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 or later at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html - */ - -#include "skeleton.dtsi" +// SPDX-License-Identifier: GPL-2.0+ +// +// Copyright 2011 Freescale Semiconductor, Inc. +// Copyright 2011 Linaro Ltd. + #include "imx53-pinfunc.h" #include <dt-bindings/clock/imx5-clock.h> #include <dt-bindings/gpio/gpio.h>
@@ -19,8 +10,17 @@ #include <dt-bindings/interrupt-controller/irq.h> / { + #address-cells = <1>; + #size-cells = <1>; + /* + * The decompressor and also some bootloaders rely on a + * pre-existing /chosen node to be available to insert the + * command line and merge other ATAGS info. + */ + chosen {}; + aliases { - serial1 = &uart2; + ethernet0 = &fec; gpio0 = &gpio1; gpio1 = &gpio2; gpio2 = &gpio3;
@@ -36,7 +36,45 @@ mmc1 = &esdhc2; mmc2 = &esdhc3; mmc3 = &esdhc4; - usb1 = &usbh1; + serial0 = &uart1; + serial1 = &uart2; + serial2 = &uart3; + serial3 = &uart4; + serial4 = &uart5; + spi0 = &ecspi1; + spi1 = &ecspi2; + spi2 = &cspi; + }; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + cpu0: cpu at 0 { + device_type = "cpu"; + compatible = "arm,cortex-a8"; + reg = <0x0>; + clocks = <&clks IMX5_CLK_ARM>; + clock-latency = <61036>; + voltage-tolerance = <5>; + operating-points = < + /* kHz */ + 166666 850000 + 400000 900000 + 800000 1050000 + 1000000 1200000 + 1200000 1300000 + >; + }; + }; + + display-subsystem { + compatible = "fsl,imx-display-subsystem"; + ports = <&ipu_di0>, <&ipu_di1>; + }; + + capture_subsystem { + compatible = "fsl,imx-capture-subsystem"; + ports = <&ipu_csi0>, <&ipu_csi1>; }; tzic: tz-interrupt-controller at fffc000 {
@@ -46,13 +84,143 @@ reg = <0x0fffc000 0x4000>; }; + clocks { + ckil { + compatible = "fsl,imx-ckil", "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <32768>; + }; + + ckih1 { + compatible = "fsl,imx-ckih1", "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <22579200>; + }; + + ckih2 { + compatible = "fsl,imx-ckih2", "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <0>; + }; + + osc { + compatible = "fsl,imx-osc", "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <24000000>; + }; + }; + + pmu: pmu { + compatible = "arm,cortex-a8-pmu"; + interrupt-parent = <&tzic>; + interrupts = <77>; + }; + + usbphy0: usbphy-0 { + compatible = "usb-nop-xceiv"; + clocks = <&clks IMX5_CLK_USB_PHY1_GATE>; + clock-names = "main_clk"; + #phy-cells = <0>; + status = "okay"; + }; + + usbphy1: usbphy-1 { + compatible = "usb-nop-xceiv"; + clocks = <&clks IMX5_CLK_USB_PHY2_GATE>; + clock-names = "main_clk"; + #phy-cells = <0>; + status = "okay"; + }; + soc { #address-cells = <1>; #size-cells = <1>; compatible = "simple-bus"; interrupt-parent = <&tzic>; ranges; - u-boot,dm-pre-reloc; + + sata: sata at 10000000 { + compatible = "fsl,imx53-ahci"; + reg = <0x10000000 0x1000>; + interrupts = <28>; + clocks = <&clks IMX5_CLK_SATA_GATE>, + <&clks IMX5_CLK_SATA_REF>, + <&clks IMX5_CLK_AHB>; + clock-names = "sata", "sata_ref", "ahb"; + status = "disabled"; + }; + + ipu: ipu at 18000000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl,imx53-ipu"; + reg = <0x18000000 0x08000000>; + interrupts = <11 10>; + clocks = <&clks IMX5_CLK_IPU_GATE>, + <&clks IMX5_CLK_IPU_DI0_GATE>, + <&clks IMX5_CLK_IPU_DI1_GATE>; + clock-names = "bus", "di0", "di1"; + resets = <&src 2>; + + ipu_csi0: port at 0 { + reg = <0>; + + ipu_csi0_from_parallel_sensor: endpoint { + }; + }; + + ipu_csi1: port at 1 { + reg = <1>; + + ipu_csi1_from_parallel_sensor: endpoint { + }; + }; + + ipu_di0: port at 2 { + #address-cells = <1>; + #size-cells = <0>; + reg = <2>; + + ipu_di0_disp0: endpoint at 0 { + reg = <0>; + }; + + ipu_di0_lvds0: endpoint at 1 { + reg = <1>; + remote-endpoint = <&lvds0_in>; + }; + }; + + ipu_di1: port at 3 { + #address-cells = <1>; + #size-cells = <0>; + reg = <3>; + + ipu_di1_disp1: endpoint at 0 { + reg = <0>; + }; + + ipu_di1_lvds1: endpoint at 1 { + reg = <1>; + remote-endpoint = <&lvds1_in>; + }; + + ipu_di1_tve: endpoint at 2 { + reg = <2>; + remote-endpoint = <&tve_in>; + }; + }; + }; + + gpu: gpu at 30000000 { + compatible = "amd,imageon-200.0", "amd,imageon"; + reg = <0x30000000 0x20000>; + reg-names = "kgsl_3d0_reg_memory"; + interrupts = <12>; + interrupt-names = "kgsl_3d0_irq"; + clocks = <&clks IMX5_CLK_GPU3D_GATE>, <&clks IMX5_CLK_GARB_GATE>; + clock-names = "core_clk", "mem_iface_clk"; + }; aips at 50000000 { /* AIPS1 */ compatible = "fsl,aips-bus", "simple-bus";
@@ -92,6 +260,47 @@ status = "disabled"; }; + uart3: serial at 5000c000 { + compatible = "fsl,imx53-uart", "fsl,imx21-uart"; + reg = <0x5000c000 0x4000>; + interrupts = <33>; + clocks = <&clks IMX5_CLK_UART3_IPG_GATE>, + <&clks IMX5_CLK_UART3_PER_GATE>; + clock-names = "ipg", "per"; + dmas = <&sdma 42 4 0>, <&sdma 43 4 0>; + dma-names = "rx", "tx"; + status = "disabled"; + }; + + ecspi1: spi at 50010000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl,imx53-ecspi", "fsl,imx51-ecspi"; + reg = <0x50010000 0x4000>; + interrupts = <36>; + clocks = <&clks IMX5_CLK_ECSPI1_IPG_GATE>, + <&clks IMX5_CLK_ECSPI1_PER_GATE>; + clock-names = "ipg", "per"; + status = "disabled"; + }; + + ssi2: ssi at 50014000 { + #sound-dai-cells = <0>; + compatible = "fsl,imx53-ssi", + "fsl,imx51-ssi", + "fsl,imx21-ssi"; + reg = <0x50014000 0x4000>; + interrupts = <30>; + clocks = <&clks IMX5_CLK_SSI2_IPG_GATE>, + <&clks IMX5_CLK_SSI2_ROOT_GATE>; + clock-names = "ipg", "baud"; + dmas = <&sdma 24 1 0>, + <&sdma 25 1 0>; + dma-names = "rx", "tx"; + fsl,fifo-depth = <15>; + status = "disabled"; + }; + esdhc3: esdhc at 50020000 { compatible = "fsl,imx53-esdhc"; reg = <0x50020000 0x4000>;
@@ -117,25 +326,18 @@ }; }; - iomuxc: iomuxc at 53fa8000 { - compatible = "fsl,imx53-iomuxc"; - reg = <0x53fa8000 0x4000>; - }; - - gpr: iomuxc-gpr at 53fa8000 { - compatible = "fsl,imx53-iomuxc-gpr", "syscon"; - reg = <0x53fa8000 0xc>; + aipstz1: bridge at 53f00000 { + compatible = "fsl,imx53-aipstz"; + reg = <0x53f00000 0x60>; }; - uart2: serial at 53fc0000 { - compatible = "fsl,imx7d-uart", "fsl,imx53-uart", "fsl,imx21-uart"; - reg = <0x53fc0000 0x4000>; - interrupts = <32>; - clocks = <&clks IMX5_CLK_UART2_IPG_GATE>, - <&clks IMX5_CLK_UART2_PER_GATE>; - clock-names = "ipg", "per"; - dmas = <&sdma 12 4 0>, <&sdma 13 4 0>; - dma-names = "rx", "tx"; + usbotg: usb at 53f80000 { + compatible = "fsl,imx53-usb", "fsl,imx27-usb"; + reg = <0x53f80000 0x0200>; + interrupts = <18>; + clocks = <&clks IMX5_CLK_USBOH3_GATE>; + fsl,usbmisc = <&usbmisc 0>; + fsl,usbphy = <&usbphy0>; status = "disabled"; };
@@ -144,15 +346,37 @@ reg = <0x53f80200 0x0200>; interrupts = <14>; clocks = <&clks IMX5_CLK_USBOH3_GATE>; + fsl,usbmisc = <&usbmisc 1>; + fsl,usbphy = <&usbphy1>; dr_mode = "host"; status = "disabled"; }; - clks: ccm at 53fd4000{ - compatible = "fsl,imx53-ccm"; - reg = <0x53fd4000 0x4000>; - interrupts = <0 71 0x04 0 72 0x04>; - #clock-cells = <1>; + usbh2: usb at 53f80400 { + compatible = "fsl,imx53-usb", "fsl,imx27-usb"; + reg = <0x53f80400 0x0200>; + interrupts = <16>; + clocks = <&clks IMX5_CLK_USBOH3_GATE>; + fsl,usbmisc = <&usbmisc 2>; + dr_mode = "host"; + status = "disabled"; + }; + + usbh3: usb at 53f80600 { + compatible = "fsl,imx53-usb", "fsl,imx27-usb"; + reg = <0x53f80600 0x0200>; + interrupts = <17>; + clocks = <&clks IMX5_CLK_USBOH3_GATE>; + fsl,usbmisc = <&usbmisc 3>; + dr_mode = "host"; + status = "disabled"; + }; + + usbmisc: usbmisc at 53f80800 { + #index-cells = <1>; + compatible = "fsl,imx53-usbmisc"; + reg = <0x53f80800 0x200>; + clocks = <&clks IMX5_CLK_USBOH3_GATE>; }; gpio1: gpio at 53f84000 {
@@ -195,6 +419,188 @@ #interrupt-cells = <2>; }; + kpp: kpp at 53f94000 { + compatible = "fsl,imx53-kpp", "fsl,imx21-kpp"; + reg = <0x53f94000 0x4000>; + interrupts = <60>; + clocks = <&clks IMX5_CLK_DUMMY>; + status = "disabled"; + }; + + wdog1: wdog at 53f98000 { + compatible = "fsl,imx53-wdt", "fsl,imx21-wdt"; + reg = <0x53f98000 0x4000>; + interrupts = <58>; + clocks = <&clks IMX5_CLK_DUMMY>; + }; + + wdog2: wdog at 53f9c000 { + compatible = "fsl,imx53-wdt", "fsl,imx21-wdt"; + reg = <0x53f9c000 0x4000>; + interrupts = <59>; + clocks = <&clks IMX5_CLK_DUMMY>; + status = "disabled"; + }; + + gpt: timer at 53fa0000 { + compatible = "fsl,imx53-gpt", "fsl,imx31-gpt"; + reg = <0x53fa0000 0x4000>; + interrupts = <39>; + clocks = <&clks IMX5_CLK_GPT_IPG_GATE>, + <&clks IMX5_CLK_GPT_HF_GATE>; + clock-names = "ipg", "per"; + }; + + srtc: rtc at 53fa4000 { + compatible = "fsl,imx53-rtc"; + reg = <0x53fa4000 0x4000>; + interrupts = <24>; + clocks = <&clks IMX5_CLK_SRTC_GATE>; + }; + + iomuxc: iomuxc at 53fa8000 { + compatible = "fsl,imx53-iomuxc"; + reg = <0x53fa8000 0x4000>; + }; + + gpr: iomuxc-gpr at 53fa8000 { + compatible = "fsl,imx53-iomuxc-gpr", "syscon"; + reg = <0x53fa8000 0xc>; + }; + + ldb: ldb at 53fa8008 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl,imx53-ldb"; + reg = <0x53fa8008 0x4>; + gpr = <&gpr>; + clocks = <&clks IMX5_CLK_LDB_DI0_SEL>, + <&clks IMX5_CLK_LDB_DI1_SEL>, + <&clks IMX5_CLK_IPU_DI0_SEL>, + <&clks IMX5_CLK_IPU_DI1_SEL>, + <&clks IMX5_CLK_LDB_DI0_GATE>, + <&clks IMX5_CLK_LDB_DI1_GATE>; + clock-names = "di0_pll", "di1_pll", + "di0_sel", "di1_sel", + "di0", "di1"; + status = "disabled"; + + lvds-channel at 0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + status = "disabled"; + + port at 0 { + reg = <0>; + + lvds0_in: endpoint { + remote-endpoint = <&ipu_di0_lvds0>; + }; + }; + + port at 2 { + reg = <2>; + }; + }; + + lvds-channel at 1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + status = "disabled"; + + port at 1 { + reg = <1>; + + lvds1_in: endpoint { + remote-endpoint = <&ipu_di1_lvds1>; + }; + }; + + port at 2 { + reg = <2>; + }; + }; + }; + + pwm1: pwm at 53fb4000 { + #pwm-cells = <2>; + compatible = "fsl,imx53-pwm", "fsl,imx27-pwm"; + reg = <0x53fb4000 0x4000>; + clocks = <&clks IMX5_CLK_PWM1_IPG_GATE>, + <&clks IMX5_CLK_PWM1_HF_GATE>; + clock-names = "ipg", "per"; + interrupts = <61>; + }; + + pwm2: pwm at 53fb8000 { + #pwm-cells = <2>; + compatible = "fsl,imx53-pwm", "fsl,imx27-pwm"; + reg = <0x53fb8000 0x4000>; + clocks = <&clks IMX5_CLK_PWM2_IPG_GATE>, + <&clks IMX5_CLK_PWM2_HF_GATE>; + clock-names = "ipg", "per"; + interrupts = <94>; + }; + + uart1: serial at 53fbc000 { + compatible = "fsl,imx53-uart", "fsl,imx21-uart"; + reg = <0x53fbc000 0x4000>; + interrupts = <31>; + clocks = <&clks IMX5_CLK_UART1_IPG_GATE>, + <&clks IMX5_CLK_UART1_PER_GATE>; + clock-names = "ipg", "per"; + dmas = <&sdma 18 4 0>, <&sdma 19 4 0>; + dma-names = "rx", "tx"; + status = "disabled"; + }; + + uart2: serial at 53fc0000 { + compatible = "fsl,imx53-uart", "fsl,imx21-uart"; + reg = <0x53fc0000 0x4000>; + interrupts = <32>; + clocks = <&clks IMX5_CLK_UART2_IPG_GATE>, + <&clks IMX5_CLK_UART2_PER_GATE>; + clock-names = "ipg", "per"; + dmas = <&sdma 12 4 0>, <&sdma 13 4 0>; + dma-names = "rx", "tx"; + status = "disabled"; + }; + + can1: can at 53fc8000 { + compatible = "fsl,imx53-flexcan", "fsl,imx25-flexcan"; + reg = <0x53fc8000 0x4000>; + interrupts = <82>; + clocks = <&clks IMX5_CLK_CAN1_IPG_GATE>, + <&clks IMX5_CLK_CAN1_SERIAL_GATE>; + clock-names = "ipg", "per"; + status = "disabled"; + }; + + can2: can at 53fcc000 { + compatible = "fsl,imx53-flexcan", "fsl,imx25-flexcan"; + reg = <0x53fcc000 0x4000>; + interrupts = <83>; + clocks = <&clks IMX5_CLK_CAN2_IPG_GATE>, + <&clks IMX5_CLK_CAN2_SERIAL_GATE>; + clock-names = "ipg", "per"; + status = "disabled"; + }; + + src: src at 53fd0000 { + compatible = "fsl,imx53-src", "fsl,imx51-src"; + reg = <0x53fd0000 0x4000>; + #reset-cells = <1>; + }; + + clks: ccm at 53fd4000{ + compatible = "fsl,imx53-ccm"; + reg = <0x53fd4000 0x4000>; + interrupts = <0 71 0x04 0 72 0x04>; + #clock-cells = <1>; + }; + gpio5: gpio at 53fdc000 { compatible = "fsl,imx53-gpio", "fsl,imx35-gpio"; reg = <0x53fdc000 0x4000>;
@@ -234,6 +640,18 @@ clocks = <&clks IMX5_CLK_I2C3_GATE>; status = "disabled"; }; + + uart4: serial at 53ff0000 { + compatible = "fsl,imx53-uart", "fsl,imx21-uart"; + reg = <0x53ff0000 0x4000>; + interrupts = <13>; + clocks = <&clks IMX5_CLK_UART4_IPG_GATE>, + <&clks IMX5_CLK_UART4_PER_GATE>; + clock-names = "ipg", "per"; + dmas = <&sdma 2 4 0>, <&sdma 3 4 0>; + dma-names = "rx", "tx"; + status = "disabled"; + }; }; aips at 60000000 { /* AIPS2 */
@@ -243,25 +661,74 @@ reg = <0x60000000 0x10000000>; ranges; + aipstz2: bridge at 63f00000 { + compatible = "fsl,imx53-aipstz"; + reg = <0x63f00000 0x60>; + }; + + iim: iim at 63f98000 { + compatible = "fsl,imx53-iim", "fsl,imx27-iim"; + reg = <0x63f98000 0x4000>; + interrupts = <69>; + clocks = <&clks IMX5_CLK_IIM_GATE>; + }; + + uart5: serial at 63f90000 { + compatible = "fsl,imx53-uart", "fsl,imx21-uart"; + reg = <0x63f90000 0x4000>; + interrupts = <86>; + clocks = <&clks IMX5_CLK_UART5_IPG_GATE>, + <&clks IMX5_CLK_UART5_PER_GATE>; + clock-names = "ipg", "per"; + dmas = <&sdma 16 4 0>, <&sdma 17 4 0>; + dma-names = "rx", "tx"; + status = "disabled"; + }; + + tigerp: tigerp at 63fa0000 { + compatible = "fsl,imx53-tigerp", "fsl,imx51-tigerp"; + reg = <0x63fa0000 0x28>; + }; + + owire: owire at 63fa4000 { + compatible = "fsl,imx53-owire", "fsl,imx21-owire"; + reg = <0x63fa4000 0x4000>; + clocks = <&clks IMX5_CLK_OWIRE_GATE>; + status = "disabled"; + }; + + ecspi2: spi at 63fac000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl,imx53-ecspi", "fsl,imx51-ecspi"; + reg = <0x63fac000 0x4000>; + interrupts = <37>; + clocks = <&clks IMX5_CLK_ECSPI2_IPG_GATE>, + <&clks IMX5_CLK_ECSPI2_PER_GATE>; + clock-names = "ipg", "per"; + status = "disabled"; + }; + sdma: sdma at 63fb0000 { compatible = "fsl,imx53-sdma", "fsl,imx35-sdma"; reg = <0x63fb0000 0x4000>; interrupts = <6>; clocks = <&clks IMX5_CLK_SDMA_GATE>, - <&clks IMX5_CLK_SDMA_GATE>; + <&clks IMX5_CLK_AHB>; clock-names = "ipg", "ahb"; #dma-cells = <3>; fsl,sdma-ram-script-name = "imx/sdma/sdma-imx53.bin"; }; - fec: ethernet at 63fec000 { - compatible = "fsl,imx53-fec", "fsl,imx25-fec"; - reg = <0x63fec000 0x4000>; - interrupts = <87>; - clocks = <&clks IMX5_CLK_FEC_GATE>, - <&clks IMX5_CLK_FEC_GATE>, - <&clks IMX5_CLK_FEC_GATE>; - clock-names = "ipg", "ahb", "ptp"; + cspi: spi at 63fc0000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl,imx53-cspi", "fsl,imx35-cspi"; + reg = <0x63fc0000 0x4000>; + interrupts = <38>; + clocks = <&clks IMX5_CLK_CSPI_IPG_GATE>, + <&clks IMX5_CLK_CSPI_IPG_GATE>; + clock-names = "ipg", "per"; status = "disabled"; };
@@ -284,66 +751,65 @@ clocks = <&clks IMX5_CLK_I2C1_GATE>; status = "disabled"; }; - }; - - ipu: ipu at 18000000 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,imx53-ipu"; - reg = <0x18000000 0x08000000>; - interrupts = <11 10>; - clocks = <&clks IMX5_CLK_IPU_GATE>, - <&clks IMX5_CLK_IPU_DI0_GATE>, - <&clks IMX5_CLK_IPU_DI1_GATE>; - clock-names = "bus", "di0", "di1"; - resets = <&src 2>; - u-boot,dm-pre-reloc; - ipu_csi0: port at 0 { - reg = <0>; + ssi1: ssi at 63fcc000 { + #sound-dai-cells = <0>; + compatible = "fsl,imx53-ssi", "fsl,imx51-ssi", + "fsl,imx21-ssi"; + reg = <0x63fcc000 0x4000>; + interrupts = <29>; + clocks = <&clks IMX5_CLK_SSI1_IPG_GATE>, + <&clks IMX5_CLK_SSI1_ROOT_GATE>; + clock-names = "ipg", "baud"; + dmas = <&sdma 28 0 0>, + <&sdma 29 0 0>; + dma-names = "rx", "tx"; + fsl,fifo-depth = <15>; + status = "disabled"; }; - ipu_csi1: port at 1 { - reg = <1>; + audmux: audmux at 63fd0000 { + compatible = "fsl,imx53-audmux", "fsl,imx31-audmux"; + reg = <0x63fd0000 0x4000>; + status = "disabled"; }; - ipu_di0: port at 2 { - #address-cells = <1>; - #size-cells = <0>; - reg = <2>; - - ipu_di0_disp0: endpoint at 0 { - reg = <0>; - }; - - ipu_di0_lvds0: endpoint at 1 { - reg = <1>; - remote-endpoint = <&lvds0_in>; - }; + nfc: nand at 63fdb000 { + compatible = "fsl,imx53-nand"; + reg = <0x63fdb000 0x1000 0xf7ff0000 0x10000>; + interrupts = <8>; + clocks = <&clks IMX5_CLK_NFC_GATE>; + status = "disabled"; }; - ipu_di1: port at 3 { - #address-cells = <1>; - #size-cells = <0>; - reg = <3>; - - ipu_di1_disp1: endpoint at 0 { - reg = <0>; - }; - - ipu_di1_lvds1: endpoint at 1 { - reg = <1>; - remote-endpoint = <&lvds1_in>; - }; + ssi3: ssi at 63fe8000 { + #sound-dai-cells = <0>; + compatible = "fsl,imx53-ssi", "fsl,imx51-ssi", + "fsl,imx21-ssi"; + reg = <0x63fe8000 0x4000>; + interrupts = <96>; + clocks = <&clks IMX5_CLK_SSI3_IPG_GATE>, + <&clks IMX5_CLK_SSI3_ROOT_GATE>; + clock-names = "ipg", "baud"; + dmas = <&sdma 46 0 0>, + <&sdma 47 0 0>; + dma-names = "rx", "tx"; + fsl,fifo-depth = <15>; + status = "disabled"; + }; - ipu_di1_tve: endpoint at 2 { - reg = <2>; - remote-endpoint = <&tve_in>; - }; + fec: ethernet at 63fec000 { + compatible = "fsl,imx53-fec", "fsl,imx25-fec"; + reg = <0x63fec000 0x4000>; + interrupts = <87>; + clocks = <&clks IMX5_CLK_FEC_GATE>, + <&clks IMX5_CLK_FEC_GATE>, + <&clks IMX5_CLK_FEC_GATE>; + clock-names = "ipg", "ahb", "ptp"; + status = "disabled"; }; - }; - tve: tve at 63ff0000 { + tve: tve at 63ff0000 { compatible = "fsl,imx53-tve"; reg = <0x63ff0000 0x1000>; interrupts = <92>;
@@ -357,68 +823,33 @@ remote-endpoint = <&ipu_di1_tve>; }; }; - }; - - src: src at 53fd0000 { - compatible = "fsl,imx53-src", "fsl,imx51-src"; - reg = <0x53fd0000 0x4000>; - #reset-cells = <1>; - }; - - ldb: ldb at 53fa8008 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,imx53-ldb"; - reg = <0x53fa8008 0x4>; - gpr = <&gpr>; - clocks = <&clks IMX5_CLK_LDB_DI0_SEL>, - <&clks IMX5_CLK_LDB_DI1_SEL>, - <&clks IMX5_CLK_IPU_DI0_SEL>, - <&clks IMX5_CLK_IPU_DI1_SEL>, - <&clks IMX5_CLK_LDB_DI0_GATE>, - <&clks IMX5_CLK_LDB_DI1_GATE>; - clock-names = "di0_pll", "di1_pll", - "di0_sel", "di1_sel", - "di0", "di1"; - status = "disabled"; - - lvds-channel at 0 { - #address-cells = <1>; - #size-cells = <0>; - reg = <0>; - status = "disabled"; - - port at 0 { - reg = <0>; - - lvds0_in: endpoint { - remote-endpoint = <&ipu_di0_lvds0>; - }; - }; - - port at 2 { - reg = <2>; - }; - }; - - lvds-channel at 1 { - #address-cells = <1>; - #size-cells = <0>; - reg = <1>; - status = "disabled"; + }; - port at 1 { - reg = <1>; + vpu: vpu at 63ff4000 { + compatible = "fsl,imx53-vpu", "cnm,coda7541"; + reg = <0x63ff4000 0x1000>; + interrupts = <9>; + clocks = <&clks IMX5_CLK_VPU_REFERENCE_GATE>, + <&clks IMX5_CLK_VPU_GATE>; + clock-names = "per", "ahb"; + resets = <&src 1>; + iram = <&ocram>; + }; - lvds1_in: endpoint { - remote-endpoint = <&ipu_di1_lvds1>; - }; - }; + sahara: crypto at 63ff8000 { + compatible = "fsl,imx53-sahara"; + reg = <0x63ff8000 0x4000>; + interrupts = <19 20>; + clocks = <&clks IMX5_CLK_SAHARA_IPG_GATE>, + <&clks IMX5_CLK_SAHARA_IPG_GATE>; + clock-names = "ipg", "ahb"; + }; + }; - port at 2 { - reg = <2>; - }; - }; + ocram: sram at f8000000 { + compatible = "mmio-sram"; + reg = <0xf8000000 0x20000>; + clocks = <&clks IMX5_CLK_OCRAM>; }; }; };
Signature · 1 line
2.20.1
PATCH 2/6 ARM: dts: imx: m53menlo: Import M53Menlo DT from Linux
Import iMX53 M53Menlo device tree from Linux next-20190607 3f310e51ceb1 . Enable DT control in full U-Boot . Add U-Boot extras into separate DTSi, the GPIO controllers need to be inited early, otherwise m53_set_clock() won't be able to detect the correct CPU clock frequency by reading the GPIO.
--- arch/arm/dts/Makefile | 3 +- arch/arm/dts/imx53-m53.dtsi | 132 ++++++++++ arch/arm/dts/imx53-m53menlo-u-boot.dtsi | 42 ++++ arch/arm/dts/imx53-m53menlo.dts | 312 ++++++++++++++++++++++++ configs/m53menlo_defconfig | 3 +- 5 files changed, 490 insertions(+), 2 deletions(-) create mode 100644 arch/arm/dts/imx53-m53.dtsi create mode 100644 arch/arm/dts/imx53-m53menlo-u-boot.dtsi create mode 100644 arch/arm/dts/imx53-m53menlo.dts
arch/arm/dts/Makefile +2 -1
@@ -535,7 +535,8 @@ dtb-$(CONFIG_VF610) += vf500-colibri.dtb \ vf610-bk4r1.dtb dtb-$(CONFIG_MX53) += imx53-cx9020.dtb \ - imx53-kp.dtb + imx53-kp.dtb \ + imx53-m53menlo.dtb dtb-$(CONFIG_MX6Q) += \ imx6-apalis.dtb \
arch/arm/dts/imx53-m53.dtsi new file +132 -0
132 lines not on this page · raw message
arch/arm/dts/imx53-m53menlo-u-boot.dtsi new file +42 -0
42 lines not on this page · raw message
arch/arm/dts/imx53-m53menlo.dts new file +312 -0
312 lines not on this page · raw message
configs/m53menlo_defconfig +2 -1
@@ -48,6 +48,8 @@ CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=mxc_nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=mxc_nand:1m(u-boot),512k(env1),512k(env2),-(ubi)" CONFIG_CMD_UBI=y +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="imx53-m53menlo" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_BOOTCOUNT_BOOTLIMIT=3
@@ -71,4 +73,3 @@ CONFIG_VIDEO=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_IMX_WATCHDOG=y CONFIG_FAT_WRITE=y -CONFIG_OF_LIBFDT=y
Signature · 1 line
2.20.1
PATCH 3/6 ARM: imx: m53menlo: Enable DM GPIO
In reply to Marek VasutEnable DM GPIO support on iMX53 M53Menlo and fix up board code where applicable. Enable MALLOC_F to let the GPIO controllers bind early on.
--- board/menlo/m53menlo/m53menlo.c | 8 ++++++++ configs/m53menlo_defconfig | 4 ++++ 2 files changed, 12 insertions(+)
board/menlo/m53menlo/m53menlo.c +8 -0
@@ -88,6 +88,7 @@ int board_ehci_hcd_init(int port)imx_iomux_v3_setup_pad (NEW_PAD_CTRL (MX53_PAD_GPIO_4__GPIO1_4 ,PAD_CTL_PKE |PAD_CTL_DSE_HIGH )); +gpio_request (IMX_GPIO_NR (1 ,4 ),"USB_OTG_PWRON" );gpio_direction_output (IMX_GPIO_NR (1 ,4 ),0 );/* USB OTG Over Current */
@@ -97,6 +98,7 @@ int board_ehci_hcd_init(int port)imx_iomux_v3_setup_pad (NEW_PAD_CTRL (MX53_PAD_GPIO_2__GPIO1_2 ,PAD_CTL_PKE |PAD_CTL_DSE_HIGH )); +gpio_request (IMX_GPIO_NR (1 ,2 ),"USB_HOST_PWRON" );gpio_direction_output (IMX_GPIO_NR (1 ,2 ),0 );/* USB Host Over Current */
@@ -215,6 +217,8 @@ static void enable_lvds_clock(struct display_info_t const *dev, const u8 hclk)static void enable_lvds_etm0430g0dh6 (struct display_info_t const *dev) { +gpio_request (IMX_GPIO_NR (6 ,0 ),"LCD" ); +/* For ETM0430G0DH6 model, this must be enabled before the clock. */ gpio_direction_output (IMX_GPIO_NR (6 ,0 ),1 );
@@ -227,6 +231,8 @@ static void enable_lvds_etm0430g0dh6(struct display_info_t const *dev)static void enable_lvds_etm0700g0dh6 (struct display_info_t const *dev) { +gpio_request (IMX_GPIO_NR (6 ,0 ),"LCD" ); +/* * Set LVDS clock to 33.28 MHz for the display. The PLL4 is set to * 233 MHz, divided by 7 by setting CCM_CSCMR2 LDB_DI0_IPU_DIV=1 .
@@ -424,6 +430,8 @@ static void m53_set_clock(void)const u32 dramclk =400 ;u32 cpuclk; +gpio_request (IMX_GPIO_NR (4 ,0 ),"CPUCLK" ); +imx_iomux_v3_setup_pad (NEW_PAD_CTRL (MX53_PAD_GPIO_10__GPIO4_0 ,PAD_CTL_DSE_HIGH |PAD_CTL_PKE ));gpio_direction_input (IMX_GPIO_NR (4 ,0 ));
configs/m53menlo_defconfig +4 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x71000000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_TARGET_M53MENLO=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_NR_DRAM_BANKS=2
@@ -29,6 +30,7 @@ CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_FUSE=y +CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_NAND_TRIMFFS=y
@@ -51,9 +53,11 @@ CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx53-m53menlo" CONFIG_ENV_IS_IN_NAND=y +CONFIG_DM=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_BOOTCOUNT_BOOTLIMIT=3 CONFIG_SYS_BOOTCOUNT_MAGIC=0x0B01C041 +CONFIG_DM_GPIO=y CONFIG_FSL_ESDHC=y CONFIG_NAND=y CONFIG_NAND_MXC=y
Signature · 1 line
2.20.1
PATCH 4/6 ARM: imx: m53menlo: Convert MMC, USB and block to DM
In reply to Marek VasutEnable DM block and DM MMC and DM USB support on iMX53 M53Menlo . Convert board code to match the DM support. This also enables DM pincontrol to configure the SDHI pins.
--- board/menlo/m53menlo/m53menlo.c | 66 --------------------------------- configs/m53menlo_defconfig | 9 +++++ 2 files changed, 9 insertions(+), 66 deletions(-)
board/menlo/m53menlo/m53menlo.c +0 -66
@@ -80,35 +80,6 @@ static void setup_iomux_uart(void)imx_iomux_v3_setup_multiple_pads (uart_pads,ARRAY_SIZE (uart_pads)); } -#ifdef CONFIG_USB_EHCI_MX5 -int board_ehci_hcd_init (int port) -{ -if (port ==0 ) { -/* USB OTG PWRON */ -imx_iomux_v3_setup_pad (NEW_PAD_CTRL (MX53_PAD_GPIO_4__GPIO1_4 , -PAD_CTL_PKE | -PAD_CTL_DSE_HIGH )); -gpio_request (IMX_GPIO_NR (1 ,4 ),"USB_OTG_PWRON" ); -gpio_direction_output (IMX_GPIO_NR (1 ,4 ),0 ); - -/* USB OTG Over Current */ -imx_iomux_v3_setup_pad (MX53_PAD_GPIO_18__GPIO7_13 ); - }else if (port ==1 ) { -/* USB Host PWRON */ -imx_iomux_v3_setup_pad (NEW_PAD_CTRL (MX53_PAD_GPIO_2__GPIO1_2 , -PAD_CTL_PKE | -PAD_CTL_DSE_HIGH )); -gpio_request (IMX_GPIO_NR (1 ,2 ),"USB_HOST_PWRON" ); -gpio_direction_output (IMX_GPIO_NR (1 ,2 ),0 ); - -/* USB Host Over Current */ -imx_iomux_v3_setup_pad (MX53_PAD_GPIO_3__USBOH3_USBH1_OC ); - } - -return 0 ; -} -#endif -static void setup_iomux_fec (void ) {static const iomux_v3_cfg_t fec_pads[] = {
@@ -152,43 +123,6 @@ static void setup_iomux_fec(void)imx_iomux_v3_setup_multiple_pads (fec_pads,ARRAY_SIZE (fec_pads)); } -#ifdef CONFIG_FSL_ESDHC -struct fsl_esdhc_cfg esdhc_cfg = { -MMC_SDHC1_BASE_ADDR , -}; - -int board_mmc_getcd (struct mmc *mmc) -{ -imx_iomux_v3_setup_pad (MX53_PAD_GPIO_1__GPIO1_1 ); -gpio_direction_input (IMX_GPIO_NR (1 ,1 )); - -return !gpio_get_value (IMX_GPIO_NR (1 ,1 )); -} - -#define SD_CMD_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_DSE_HIGH | \ - PAD_CTL_PUS_100K_UP) -#define SD_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PUS_47K_UP | \ - PAD_CTL_DSE_HIGH) - -int board_mmc_init (bd_t *bis) -{ -static const iomux_v3_cfg_t sd1_pads[] = { -NEW_PAD_CTRL (MX53_PAD_SD1_CMD__ESDHC1_CMD ,SD_CMD_PAD_CTRL ), -NEW_PAD_CTRL (MX53_PAD_SD1_CLK__ESDHC1_CLK ,SD_PAD_CTRL ), -NEW_PAD_CTRL (MX53_PAD_SD1_DATA0__ESDHC1_DAT0 ,SD_PAD_CTRL ), -NEW_PAD_CTRL (MX53_PAD_SD1_DATA1__ESDHC1_DAT1 ,SD_PAD_CTRL ), -NEW_PAD_CTRL (MX53_PAD_SD1_DATA2__ESDHC1_DAT2 ,SD_PAD_CTRL ), -NEW_PAD_CTRL (MX53_PAD_SD1_DATA3__ESDHC1_DAT3 ,SD_PAD_CTRL ), - }; - - esdhc_cfg.sdhc_clk =mxc_get_clock (MXC_ESDHC_CLK ); - -imx_iomux_v3_setup_multiple_pads (sd1_pads,ARRAY_SIZE (sd1_pads)); - -return fsl_esdhc_initialize (bis, &esdhc_cfg); -} -#endif -#ifdef CONFIG_VIDEO static void enable_lvds_clock (struct display_info_t const *dev,const u8 hclk) {
configs/m53menlo_defconfig +9 -0
@@ -28,12 +28,14 @@ CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_DM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_FUSE=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_NAND_TRIMFFS=y +# CONFIG_CMD_PINMUX is not set CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y
@@ -58,14 +60,21 @@ CONFIG_BOOTCOUNT_LIMIT=y CONFIG_BOOTCOUNT_BOOTLIMIT=3 CONFIG_SYS_BOOTCOUNT_MAGIC=0x0B01C041 CONFIG_DM_GPIO=y +CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y CONFIG_NAND=y CONFIG_NAND_MXC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_IMX5=y +CONFIG_DM_REGULATOR=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y CONFIG_RTC_M41T62=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_MX5=y CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y
Signature · 1 line
2.20.1
PATCH 5/6 ARM: imx: m53menlo: Convert WDT support to DM
In reply to Marek VasutEnable DM Watchdog support on iMX53 M53Menlo.
--- arch/arm/dts/imx53-m53menlo-u-boot.dtsi | 5 +++++ configs/m53menlo_defconfig | 2 ++ include/configs/m53menlo.h | 5 +++++ 3 files changed, 12 insertions(+)
arch/arm/dts/imx53-m53menlo-u-boot.dtsi +5 -0
@@ -11,6 +11,11 @@ u-boot,dm-pre-reloc; }; }; + + wdt-reboot { + compatible = "wdt-reboot"; + wdt = <&wdog1>; + }; }; &gpio1 {
configs/m53menlo_defconfig +2 -0
@@ -73,6 +73,8 @@ CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_RTC_M41T62=y +CONFIG_SYSRESET=y +CONFIG_SYSRESET_WATCHDOG=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_MX5=y
include/configs/m53menlo.h +5 -0
@@ -242,4 +242,9 @@"fi ; " \ "fi\0" +#if defined(CONFIG_SPL_BUILD ) +#undef CONFIG_WATCHDOG +#define CONFIG_HW_WATCHDOG +#endif +#endif /* __M53MENLO_CONFIG_H__ */
Signature · 1 line
2.20.1
PATCH 5/6 ARM: imx: m53menlo: Convert WDT support to DM
Quoted 4 lines
Enable DM Watchdog support on iMX53 M53Menlo.
Signed-off-by Marek Vasut <[email protected]>Cc Fabio Estevam <[email protected]>Cc Stefano Babic <[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 6/6 ARM: imx: m53menlo: Convert to DM VIDEO
In reply to Marek VasutEnable DM Video support on iMX53 M53Menlo and fix minor details to restore previous behavior of the system.
--- board/menlo/m53menlo/m53menlo.c | 48 +++++++++++++++++++++++++++++++-- configs/m53menlo_defconfig | 7 +++-- include/configs/m53menlo.h | 4 +-- 3 files changed, 51 insertions(+), 8 deletions(-)
board/menlo/m53menlo/m53menlo.c +46 -2
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <dm.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> #include <asm/arch/sys_proto.h>
@@ -28,6 +29,7 @@#include <spl.h> #include <splash.h> #include <usb/ehci-ci.h> +#include <video_console.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -123,7 +125,6 @@ static void setup_iomux_fec(void)imx_iomux_v3_setup_multiple_pads (fec_pads,ARRAY_SIZE (fec_pads)); } -#ifdef CONFIG_VIDEO static void enable_lvds_clock (struct display_info_t const *dev,const u8 hclk) {static struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)MXC_CCM_BASE ;
@@ -270,7 +271,6 @@ struct display_info_t const displays[] = { };size_t display_count =ARRAY_SIZE (displays); -#endif #ifdef CONFIG_SPLASH_SCREEN static struct splash_location default_splash_locations[] = {
@@ -289,6 +289,50 @@ int splash_screen_prepare(void) }#endif +int board_late_init (void ) +{ +#if defined(CONFIG_VIDEO_IPUV3 ) +struct udevice *dev; +int xpos, ypos, ret; +char *s; +void *dst; +ulong addr, len; + +splash_get_pos (&xpos, &ypos); + + s =env_get ("splashimage" ); +if (!s) +return 0 ; + + addr =simple_strtoul (s,NULL ,16 ); + dst =malloc (CONFIG_SYS_VIDEO_LOGO_MAX_SIZE ); +if (!dst) +return -ENOMEM ; + + ret =splash_screen_prepare (); +if (ret <0 ) +return ret; + + len =CONFIG_SYS_VIDEO_LOGO_MAX_SIZE ; + ret =gunzip (dst +2 ,CONFIG_SYS_VIDEO_LOGO_MAX_SIZE -2 , + (uchar *)addr, &len); +if (ret) { +printf ("Error: no valid bmp or bmp.gz image@%lx\n" , addr); +free (dst); +return ret; + } + + ret =uclass_get_device (UCLASS_VIDEO ,0 , &dev); +if (ret) +return ret; + + ret =video_bmp_display (dev, (ulong )dst +2 , xpos, ypos, true); +if (ret) +return ret; +#endif +return 0 ; +} +#define I2C_PAD_CTRL (PAD_CTL_SRE_FAST | PAD_CTL_DSE_HIGH | \ PAD_CTL_PUS_100K_UP | PAD_CTL_ODE)
configs/m53menlo_defconfig +3 -4
@@ -18,9 +18,8 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/menlo/m53menlo/imximage.cfg" CONFIG_BOOTDELAY=1 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttymxc0,115200" -# CONFIG_CONSOLE_MUX is not set -CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_VERSION_VARIABLE=y +CONFIG_BOARD_LATE_INIT=y CONFIG_SPL_TEXT_BASE=0x70008000 CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_NAND_SUPPORT=y
@@ -83,8 +82,8 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_MCS7830=y CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_DM_VIDEO=y +CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_IPUV3=y -CONFIG_VIDEO=y -# CONFIG_VIDEO_SW_CURSOR is not set CONFIG_IMX_WATCHDOG=y CONFIG_FAT_WRITE=y
include/configs/m53menlo.h +2 -2
@@ -136,7 +136,6 @@/* * LCD */ -#ifdef CONFIG_VIDEO #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_GZIP #define CONFIG_SPLASH_SCREEN
@@ -145,7 +144,6 @@#define CONFIG_BMP_16BPP #define CONFIG_VIDEO_LOGO #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20) -#endif /* LVDS display */ #define CONFIG_SYS_LDB_CLOCK 33260000
@@ -205,6 +203,8 @@"splashfile=boot/usplash.bmp.gz\0" \"splashimage=0x88000000\0" \"splashpos=m,m\0" \ +"stdout=serial,vidconsole\0" \ +"stderr=serial,vidconsole\0" \"addcons=" \"setenv bootargs ${bootargs} " \"console=${consdev},${baudrate}\0" \
Signature · 1 line
2.20.1
PATCH 1/6 ARM: dts: imx: imx53: Synchronize iMX53 DT with Linux
In reply to Marek VasutHi Marek,
Quoted 3 lines
Synchronize iMX53 device tree from Linux next-20190607
3f310e51ceb1, this is needed to get NFC, UART, USBOTG DT nodes.
As fair as I remember, for the imx53 we only added the necessary nodes for imx53.dtsi Linux file as adding full DM/DTS caused some issues with the u-boot binary size (as it is not using SPL, but single binary).
However, I'm not sure if this is still the case.
Quoted 968 lines
Signed-off-by Marek Vasut <[email protected]>Cc Fabio Estevam <[email protected]>Cc Stefano Babic <[email protected]>--- arch/arm/dts/imx53.dtsi | 745+++++++++++++++++++++++++++++++--------- 1 file changed, 588 insertions(+), 157 deletions(-)
arch/arm/dts/imx53.dtsi +167
-17@@ -1,17 +1,8 @@ -/* - * Copyright 2016 Beckhoff Automation - * Copyright 2011 Freescale Semiconductor, Inc. - * Copyright 2011 Linaro Ltd. - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 or later at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html - */ - -#include "skeleton.dtsi" +// SPDX-License-Identifier: GPL-2.0+ +// +// Copyright 2011 Freescale Semiconductor, Inc. +// Copyright 2011 Linaro Ltd. + #include "imx53-pinfunc.h" #include <dt-bindings/clock/imx5-clock.h> #include <dt-bindings/gpio/gpio.h>@@ -19,8 +10,17 @@ #include <dt-bindings/interrupt-controller/irq.h> / { + #address-cells = <1>; + #size-cells = <1>; + /* + * The decompressor and also some bootloaders rely on a + * pre-existing /chosen node to be available to insert the + * command line and merge other ATAGS info. + */ + chosen {}; + aliases { - serial1 = &uart2; + ethernet0 = &fec; gpio0 = &gpio1; gpio1 = &gpio2; gpio2 = &gpio3;@@ -36,7 +36,45 @@ mmc1 = &esdhc2; mmc2 = &esdhc3; mmc3 = &esdhc4; - usb1 = &usbh1; + serial0 = &uart1; + serial1 = &uart2; + serial2 = &uart3; + serial3 = &uart4; + serial4 = &uart5; + spi0 = &ecspi1; + spi1 = &ecspi2; + spi2 = &cspi; + }; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + cpu0: cpu at 0 { + device_type = "cpu"; + compatible = "arm,cortex-a8"; + reg = <0x0>; + clocks = <&clks IMX5_CLK_ARM>; + clock-latency = <61036>; + voltage-tolerance = <5>; + operating-points = < + /* kHz */ + 166666 850000 + 400000 900000 + 800000 1050000 + 1000000 1200000 + 1200000 1300000 + >; + }; + }; + + display-subsystem { + compatible = "fsl,imx-display-subsystem"; + ports = <&ipu_di0>, <&ipu_di1>; + }; + + capture_subsystem { + compatible = "fsl,imx-capture-subsystem"; + ports = <&ipu_csi0>, <&ipu_csi1>; }; tzic: tz-interrupt-controller at fffc000 {@@ -46,13 +84,143 @@ reg = <0x0fffc000 0x4000>; }; + clocks { + ckil { + compatible = "fsl,imx-ckil", "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <32768>; + }; + + ckih1 { + compatible = "fsl,imx-ckih1", "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <22579200>; + }; + + ckih2 { + compatible = "fsl,imx-ckih2", "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <0>; + }; + + osc { + compatible = "fsl,imx-osc", "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <24000000>; + }; + }; + + pmu: pmu { + compatible = "arm,cortex-a8-pmu"; + interrupt-parent = <&tzic>; + interrupts = <77>; + }; + + usbphy0: usbphy-0 { + compatible = "usb-nop-xceiv"; + clocks = <&clks IMX5_CLK_USB_PHY1_GATE>; + clock-names = "main_clk"; + #phy-cells = <0>; + status = "okay"; + }; + + usbphy1: usbphy-1 { + compatible = "usb-nop-xceiv"; + clocks = <&clks IMX5_CLK_USB_PHY2_GATE>; + clock-names = "main_clk"; + #phy-cells = <0>; + status = "okay"; + }; + soc { #address-cells = <1>; #size-cells = <1>; compatible = "simple-bus"; interrupt-parent = <&tzic>; ranges; - u-boot,dm-pre-reloc; + + sata: sata at 10000000 { + compatible = "fsl,imx53-ahci"; + reg = <0x10000000 0x1000>; + interrupts = <28>; + clocks = <&clks IMX5_CLK_SATA_GATE>, + <&clks IMX5_CLK_SATA_REF>, + <&clks IMX5_CLK_AHB>; + clock-names = "sata", "sata_ref", "ahb"; + status = "disabled"; + }; + + ipu: ipu at 18000000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl,imx53-ipu"; + reg = <0x18000000 0x08000000>; + interrupts = <11 10>; + clocks = <&clks IMX5_CLK_IPU_GATE>, + <&clks IMX5_CLK_IPU_DI0_GATE>, + <&clks IMX5_CLK_IPU_DI1_GATE>; + clock-names = "bus", "di0", "di1"; + resets = <&src 2>; + + ipu_csi0: port at 0 { + reg = <0>; + + ipu_csi0_from_parallel_sensor: endpoint { + }; + }; + + ipu_csi1: port at 1 { + reg = <1>; + + ipu_csi1_from_parallel_sensor: endpoint { + }; + }; + + ipu_di0: port at 2 { + #address-cells = <1>; + #size-cells = <0>; + reg = <2>; + + ipu_di0_disp0: endpoint at 0 { + reg = <0>; + }; + + ipu_di0_lvds0: endpoint at 1 { + reg = <1>; + remote-endpoint = <&lvds0_in>; + }; + }; + + ipu_di1: port at 3 { + #address-cells = <1>; + #size-cells = <0>; + reg = <3>; + + ipu_di1_disp1: endpoint at 0 { + reg = <0>; + }; + + ipu_di1_lvds1: endpoint at 1 { + reg = <1>; + remote-endpoint =<
&lvds1_in>;arch/arm/dts/imx53.dtsi +11
-0+ }; + + ipu_di1_tve: endpoint at 2 { + reg = <2>; + remote-endpoint = <&tve_in>; + }; + }; + }; + + gpu: gpu at 30000000 { + compatible = "amd,imageon-200.0","amd,imageon";
arch/arm/dts/imx53.dtsi +5
-0+ reg = <0x30000000 0x20000>; + reg-names = "kgsl_3d0_reg_memory"; + interrupts = <12>; + interrupt-names = "kgsl_3d0_irq"; + clocks = <&clks IMX5_CLK_GPU3D_GATE>, <&clks
IMX5_CLK_GARB_GATE>;arch/arm/dts/imx53.dtsi +10
-0+ clock-names = "core_clk", "mem_iface_clk"; + }; aips at 50000000 { /* AIPS1 */ compatible = "fsl,aips-bus", "simple-bus";@@ -92,6 +260,47 @@ status = "disabled"; }; + uart3: serial at 5000c000 { + compatible = "fsl,imx53-uart", "fsl,imx21-uart"; + reg = <0x5000c000 0x4000>; + interrupts = <33>; + clocks = <&clks IMX5_CLK_UART3_IPG_GATE>, + <&clks IMX5_CLK_UART3_PER_GATE>; + clock-names = "ipg", "per"; + dmas = <&sdma 42 4 0>,<&sdma 43 4 0>;
arch/arm/dts/imx53.dtsi +8
-0+ dma-names = "rx", "tx"; + status = "disabled"; + }; + + ecspi1: spi at 50010000 { + #address-cells = <1>; + #size-cells = <0>; + compatible ="fsl,imx53-ecspi", "fsl,imx51-ecspi";
arch/arm/dts/imx53.dtsi +3
-0+ reg = <0x50010000 0x4000>; + interrupts = <36>; + clocks = <&clks
IMX5_CLK_ECSPI1_IPG_GATE>,arch/arm/dts/imx53.dtsi +1
-0+ <&clks
IMX5_CLK_ECSPI1_PER_GATE>;arch/arm/dts/imx53.dtsi +12
-0+ clock-names = "ipg", "per"; + status = "disabled"; + }; + + ssi2: ssi at 50014000 { + #sound-dai-cells = <0>; + compatible = "fsl,imx53-ssi", + "fsl,imx51-ssi", + "fsl,imx21-ssi"; + reg = <0x50014000 0x4000>; + interrupts = <30>; + clocks = <&clks
IMX5_CLK_SSI2_IPG_GATE>,arch/arm/dts/imx53.dtsi +1
-0+ <&clks
IMX5_CLK_SSI2_ROOT_GATE>;arch/arm/dts/imx53.dtsi +8
-0+ clock-names = "ipg", "baud"; + dmas = <&sdma 24 1 0>, + <&sdma 25 1 0>; + dma-names = "rx", "tx"; + fsl,fifo-depth = <15>; + status = "disabled"; + }; + esdhc3: esdhc at 50020000 { compatible ="fsl,imx53-esdhc"; reg = <
0x500200000x4000>;arch/arm/dts/imx53.dtsi +3
-16@@ -117,25 +326,18 @@ }; }; - iomuxc: iomuxc at 53fa8000 { - compatible = "fsl,imx53-iomuxc"; - reg = <0x53fa8000 0x4000>; - }; - - gpr: iomuxc-gpr at 53fa8000 { - compatible = "fsl,imx53-iomuxc-gpr", "syscon"; - reg = <0x53fa8000 0xc>; + aipstz1: bridge at 53f00000 { + compatible = "fsl,imx53-aipstz"; + reg = <0x53f00000 0x60>; }; - uart2: serial at 53fc0000 { - compatible = "fsl,imx7d-uart", "fsl,imx53-uart", "fsl,imx21-uart"; - reg = <0x53fc0000 0x4000>; - interrupts = <32>; - clocks = <&clks IMX5_CLK_UART2_IPG_GATE>, - <&clks IMX5_CLK_UART2_PER_GATE>; - clock-names = "ipg", "per"; - dmas = <&sdma 12 4 0>, <&sdma 13 40>;
arch/arm/dts/imx53.dtsi +2
-1- dma-names = "rx", "tx"; + usbotg: usb at 53f80000 { + compatible = "fsl,imx53-usb","fsl,imx27-usb";
arch/arm/dts/imx53.dtsi +3
-0+ reg = <0x53f80000 0x0200>; + interrupts = <18>; + clocks = <&clks
IMX5_CLK_USBOH3_GATE>;arch/arm/dts/imx53.dtsi +16
-5+ fsl,usbmisc = <&usbmisc 0>; + fsl,usbphy = <&usbphy0>; status = "disabled"; };@@ -144,15 +346,37 @@ reg = <0x53f80200 0x0200>; interrupts = <14>; clocks = <&clks IMX5_CLK_USBOH3_GATE>; + fsl,usbmisc = <&usbmisc 1>; + fsl,usbphy = <&usbphy1>; dr_mode = "host"; status = "disabled"; }; - clks: ccm at 53fd4000{ - compatible = "fsl,imx53-ccm"; - reg = <0x53fd4000 0x4000>; - interrupts = <0 71 0x04 0 72 0x04>; - #clock-cells = <1>; + usbh2: usb at 53f80400 { + compatible = "fsl,imx53-usb", "fsl,imx27-usb"; + reg = <0x53f80400 0x0200>; + interrupts = <16>; + clocks = <&clks IMX5_CLK_USBOH3_GATE>; + fsl,usbmisc = <&usbmisc 2>; + dr_mode = "host"; + status = "disabled"; + }; + + usbh3: usb at 53f80600 { + compatible = "fsl,imx53-usb","fsl,imx27-usb";
arch/arm/dts/imx53.dtsi +3
-0+ reg = <0x53f80600 0x0200>; + interrupts = <17>; + clocks = <&clks
IMX5_CLK_USBOH3_GATE>;arch/arm/dts/imx53.dtsi +10
-0+ fsl,usbmisc = <&usbmisc 3>; + dr_mode = "host"; + status = "disabled"; + }; + + usbmisc: usbmisc at 53f80800 { + #index-cells = <1>; + compatible = "fsl,imx53-usbmisc"; + reg = <0x53f80800 0x200>; + clocks = <&clks
IMX5_CLK_USBOH3_GATE>; };arch/arm/dts/imx53.dtsi +25
-0gpio1: gpio at 53f84000 {@@ -195,6 +419,188 @@ #interrupt-cells = <2>; }; + kpp: kpp at 53f94000 { + compatible = "fsl,imx53-kpp", "fsl,imx21-kpp"; + reg = <0x53f94000 0x4000>; + interrupts = <60>; + clocks = <&clks IMX5_CLK_DUMMY>; + status = "disabled"; + }; + + wdog1: wdog at 53f98000 { + compatible = "fsl,imx53-wdt", "fsl,imx21-wdt"; + reg = <0x53f98000 0x4000>; + interrupts = <58>; + clocks = <&clks IMX5_CLK_DUMMY>; + }; + + wdog2: wdog at 53f9c000 { + compatible = "fsl,imx53-wdt", "fsl,imx21-wdt"; + reg = <0x53f9c000 0x4000>; + interrupts = <59>; + clocks = <&clks IMX5_CLK_DUMMY>; + status = "disabled"; + }; + + gpt: timer at 53fa0000 { + compatible = "fsl,imx53-gpt","fsl,imx31-gpt";
arch/arm/dts/imx53.dtsi +3
-0+ reg = <0x53fa0000 0x4000>; + interrupts = <39>; + clocks = <&clks
IMX5_CLK_GPT_IPG_GATE>,arch/arm/dts/imx53.dtsi +1
-0+ <&clks
IMX5_CLK_GPT_HF_GATE>;arch/arm/dts/imx53.dtsi +17
-0+ clock-names = "ipg", "per"; + }; + + srtc: rtc at 53fa4000 { + compatible = "fsl,imx53-rtc"; + reg = <0x53fa4000 0x4000>; + interrupts = <24>; + clocks = <&clks IMX5_CLK_SRTC_GATE>; + }; + + iomuxc: iomuxc at 53fa8000 { + compatible = "fsl,imx53-iomuxc"; + reg = <0x53fa8000 0x4000>; + }; + + gpr: iomuxc-gpr at 53fa8000 { + compatible = "fsl,imx53-iomuxc-gpr","syscon";
arch/arm/dts/imx53.dtsi +10
-0+ reg = <0x53fa8000 0xc>; + }; + + ldb: ldb at 53fa8008 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl,imx53-ldb"; + reg = <0x53fa8008 0x4>; + gpr = <&gpr>; + clocks = <&clks
IMX5_CLK_LDB_DI0_SEL>,arch/arm/dts/imx53.dtsi +1
-0+ <&clks
IMX5_CLK_LDB_DI1_SEL>,arch/arm/dts/imx53.dtsi +1
-0+ <&clks
IMX5_CLK_IPU_DI0_SEL>,arch/arm/dts/imx53.dtsi +1
-0+ <&clks
IMX5_CLK_IPU_DI1_SEL>,arch/arm/dts/imx53.dtsi +1
-0+ <&clks
IMX5_CLK_LDB_DI0_GATE>,arch/arm/dts/imx53.dtsi +1
-0+ <&clks
IMX5_CLK_LDB_DI1_GATE>;arch/arm/dts/imx53.dtsi +16
-0+ clock-names = "di0_pll", "di1_pll", + "di0_sel", "di1_sel", + "di0", "di1"; + status = "disabled"; + + lvds-channel at 0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + status = "disabled"; + + port at 0 { + reg = <0>; + + lvds0_in: endpoint { +remote-endpoint = <
&ipu_di0_lvds0>;arch/arm/dts/imx53.dtsi +19
-0+ }; + }; + + port at 2 { + reg = <2>; + }; + }; + + lvds-channel at 1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + status = "disabled"; + + port at 1 { + reg = <1>; + + lvds1_in: endpoint { +remote-endpoint = <
&ipu_di1_lvds1>;arch/arm/dts/imx53.dtsi +12
-0+ }; + }; + + port at 2 { + reg = <2>; + }; + }; + }; + + pwm1: pwm at 53fb4000 { + #pwm-cells = <2>; + compatible = "fsl,imx53-pwm","fsl,imx27-pwm";
arch/arm/dts/imx53.dtsi +2
-0+ reg = <0x53fb4000 0x4000>; + clocks = <&clks
IMX5_CLK_PWM1_IPG_GATE>,arch/arm/dts/imx53.dtsi +1
-0+ <&clks
IMX5_CLK_PWM1_HF_GATE>;arch/arm/dts/imx53.dtsi +7
-0+ clock-names = "ipg", "per"; + interrupts = <61>; + }; + + pwm2: pwm at 53fb8000 { + #pwm-cells = <2>; + compatible = "fsl,imx53-pwm","fsl,imx27-pwm";
arch/arm/dts/imx53.dtsi +2
-0+ reg = <0x53fb8000 0x4000>; + clocks = <&clks
IMX5_CLK_PWM2_IPG_GATE>,arch/arm/dts/imx53.dtsi +1
-0+ <&clks
IMX5_CLK_PWM2_HF_GATE>;arch/arm/dts/imx53.dtsi +6
-0+ clock-names = "ipg", "per"; + interrupts = <94>; + }; + + uart1: serial at 53fbc000 { + compatible = "fsl,imx53-uart","fsl,imx21-uart";
arch/arm/dts/imx53.dtsi +3
-0+ reg = <0x53fbc000 0x4000>; + interrupts = <31>; + clocks = <&clks
IMX5_CLK_UART1_IPG_GATE>,arch/arm/dts/imx53.dtsi +1
-0+ <&clks
IMX5_CLK_UART1_PER_GATE>;arch/arm/dts/imx53.dtsi +2
-0+ clock-names = "ipg", "per"; + dmas = <&sdma 18 4 0>, <&sdma 19 40>;
arch/arm/dts/imx53.dtsi +6
-0+ dma-names = "rx", "tx"; + status = "disabled"; + }; + + uart2: serial at 53fc0000 { + compatible = "fsl,imx53-uart","fsl,imx21-uart";
arch/arm/dts/imx53.dtsi +3
-0+ reg = <0x53fc0000 0x4000>; + interrupts = <32>; + clocks = <&clks
IMX5_CLK_UART2_IPG_GATE>,arch/arm/dts/imx53.dtsi +1
-0+ <&clks
IMX5_CLK_UART2_PER_GATE>;arch/arm/dts/imx53.dtsi +2
-0+ clock-names = "ipg", "per"; + dmas = <&sdma 12 4 0>, <&sdma 13 40>;
arch/arm/dts/imx53.dtsi +6
-0+ dma-names = "rx", "tx"; + status = "disabled"; + }; + + can1: can at 53fc8000 { + compatible = "fsl,imx53-flexcan","fsl,imx25-flexcan";
arch/arm/dts/imx53.dtsi +3
-0+ reg = <0x53fc8000 0x4000>; + interrupts = <82>; + clocks = <&clks
IMX5_CLK_CAN1_IPG_GATE>,arch/arm/dts/imx53.dtsi +1
-0+ <&clks
IMX5_CLK_CAN1_SERIAL_GATE>;arch/arm/dts/imx53.dtsi +6
-0+ clock-names = "ipg", "per"; + status = "disabled"; + }; + + can2: can at 53fcc000 { + compatible = "fsl,imx53-flexcan","fsl,imx25-flexcan";
arch/arm/dts/imx53.dtsi +3
-0+ reg = <0x53fcc000 0x4000>; + interrupts = <83>; + clocks = <&clks
IMX5_CLK_CAN2_IPG_GATE>,arch/arm/dts/imx53.dtsi +1
-0+ <&clks
IMX5_CLK_CAN2_SERIAL_GATE>;arch/arm/dts/imx53.dtsi +6
-0+ clock-names = "ipg", "per"; + status = "disabled"; + }; + + src: src at 53fd0000 { + compatible = "fsl,imx53-src","fsl,imx51-src";
arch/arm/dts/imx53.dtsi +11
-0+ reg = <0x53fd0000 0x4000>; + #reset-cells = <1>; + }; + + clks: ccm at 53fd4000{ + compatible = "fsl,imx53-ccm"; + reg = <0x53fd4000 0x4000>; + interrupts = <0 71 0x04 0 72 0x04>; + #clock-cells = <1>; + }; + gpio5: gpio at 53fdc000 { compatible = "fsl,imx53-gpio","fsl,imx35-gpio"; reg = <
0x53fdc0000x4000>;arch/arm/dts/imx53.dtsi +12
-0@@ -234,6 +640,18 @@ clocks = <&clks IMX5_CLK_I2C3_GATE>; status = "disabled"; }; + + uart4: serial at 53ff0000 { + compatible = "fsl,imx53-uart", "fsl,imx21-uart"; + reg = <0x53ff0000 0x4000>; + interrupts = <13>; + clocks = <&clks IMX5_CLK_UART4_IPG_GATE>, + <&clks IMX5_CLK_UART4_PER_GATE>; + clock-names = "ipg", "per"; + dmas = <&sdma 2 4 0>, <&sdma 3 4 0>; + dma-names = "rx", "tx"; + status = "disabled"; + };arch/arm/dts/imx53.dtsi +49
-3}; aips at 60000000 { /* AIPS2 */@@ -243,25 +661,74 @@ reg = <0x60000000 0x10000000>; ranges; + aipstz2: bridge at 63f00000 { + compatible = "fsl,imx53-aipstz"; + reg = <0x63f00000 0x60>; + }; + + iim: iim at 63f98000 { + compatible = "fsl,imx53-iim", "fsl,imx27-iim"; + reg = <0x63f98000 0x4000>; + interrupts = <69>; + clocks = <&clks IMX5_CLK_IIM_GATE>; + }; + + uart5: serial at 63f90000 { + compatible = "fsl,imx53-uart", "fsl,imx21-uart"; + reg = <0x63f90000 0x4000>; + interrupts = <86>; + clocks = <&clks IMX5_CLK_UART5_IPG_GATE>, + <&clks IMX5_CLK_UART5_PER_GATE>; + clock-names = "ipg", "per"; + dmas = <&sdma 16 4 0>, <&sdma 17 4 0>; + dma-names = "rx", "tx"; + status = "disabled"; + }; + + tigerp: tigerp at 63fa0000 { + compatible = "fsl,imx53-tigerp", "fsl,imx51-tigerp"; + reg = <0x63fa0000 0x28>; + }; + + owire: owire at 63fa4000 { + compatible = "fsl,imx53-owire", "fsl,imx21-owire"; + reg = <0x63fa4000 0x4000>; + clocks = <&clks IMX5_CLK_OWIRE_GATE>; + status = "disabled"; + }; + + ecspi2: spi at 63fac000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl,imx53-ecspi", "fsl,imx51-ecspi"; + reg = <0x63fac000 0x4000>; + interrupts = <37>; + clocks = <&clks IMX5_CLK_ECSPI2_IPG_GATE>, + <&clks IMX5_CLK_ECSPI2_PER_GATE>; + clock-names = "ipg", "per"; + status = "disabled"; + }; + sdma: sdma at 63fb0000 { compatible = "fsl,imx53-sdma", "fsl,imx35-sdma"; reg = <0x63fb0000 0x4000>; interrupts = <6>; clocks = <&clks IMX5_CLK_SDMA_GATE>, - <&clks IMX5_CLK_SDMA_GATE>; + <&clks IMX5_CLK_AHB>; clock-names = "ipg", "ahb"; #dma-cells = <3>; fsl,sdma-ram-script-name = "imx/sdma/sdma-imx53.bin"; }; - fec: ethernet at 63fec000 { - compatible = "fsl,imx53-fec","fsl,imx25-fec";
arch/arm/dts/imx53.dtsi +4
-6- reg = <0x63fec000 0x4000>; - interrupts = <87>; - clocks = <&clks IMX5_CLK_FEC_GATE>, - <&clks IMX5_CLK_FEC_GATE>, - <&clks IMX5_CLK_FEC_GATE>; - clock-names = "ipg", "ahb", "ptp"; + cspi: spi at 63fc0000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl,imx53-cspi","fsl,imx35-cspi";
arch/arm/dts/imx53.dtsi +3
-0+ reg = <0x63fc0000 0x4000>; + interrupts = <38>; + clocks = <&clks
IMX5_CLK_CSPI_IPG_GATE>,arch/arm/dts/imx53.dtsi +1
-0+ <&clks
IMX5_CLK_CSPI_IPG_GATE>;arch/arm/dts/imx53.dtsi +42
-48+ clock-names = "ipg", "per"; status = "disabled"; };@@ -284,66 +751,65 @@ clocks = <&clks IMX5_CLK_I2C1_GATE>; status = "disabled"; }; - }; - - ipu: ipu at 18000000 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,imx53-ipu"; - reg = <0x18000000 0x08000000>; - interrupts = <11 10>; - clocks = <&clks IMX5_CLK_IPU_GATE>, - <&clks IMX5_CLK_IPU_DI0_GATE>, - <&clks IMX5_CLK_IPU_DI1_GATE>; - clock-names = "bus", "di0", "di1"; - resets = <&src 2>; - u-boot,dm-pre-reloc; - ipu_csi0: port at 0 { - reg = <0>; + ssi1: ssi at 63fcc000 { + #sound-dai-cells = <0>; + compatible = "fsl,imx53-ssi", "fsl,imx51-ssi", + "fsl,imx21-ssi"; + reg = <0x63fcc000 0x4000>; + interrupts = <29>; + clocks = <&clks IMX5_CLK_SSI1_IPG_GATE>, + <&clks IMX5_CLK_SSI1_ROOT_GATE>; + clock-names = "ipg", "baud"; + dmas = <&sdma 28 0 0>, + <&sdma 29 0 0>; + dma-names = "rx", "tx"; + fsl,fifo-depth = <15>; + status = "disabled"; }; - ipu_csi1: port at 1 { - reg = <1>; + audmux: audmux at 63fd0000 { + compatible = "fsl,imx53-audmux", "fsl,imx31-audmux"; + reg = <0x63fd0000 0x4000>; + status = "disabled"; }; - ipu_di0: port at 2 { - #address-cells = <1>; - #size-cells = <0>; - reg = <2>; - - ipu_di0_disp0: endpoint at 0 { - reg = <0>; - }; - - ipu_di0_lvds0: endpoint at 1 { - reg = <1>; - remote-endpoint = <&lvds0_in>; - }; + nfc: nand at 63fdb000 { + compatible = "fsl,imx53-nand"; + reg = <0x63fdb000 0x1000 0xf7ff0000 0x10000>; + interrupts = <8>; + clocks = <&clks IMX5_CLK_NFC_GATE>; + status = "disabled"; }; - ipu_di1: port at 3 { - #address-cells = <1>; - #size-cells = <0>; - reg = <3>; - - ipu_di1_disp1: endpoint at 0 { - reg = <0>; - }; - - ipu_di1_lvds1: endpoint at 1 { - reg = <1>; - remote-endpoint = <&lvds1_in>; - }; + ssi3: ssi at 63fe8000 { + #sound-dai-cells = <0>; + compatible = "fsl,imx53-ssi", "fsl,imx51-ssi", + "fsl,imx21-ssi"; + reg = <0x63fe8000 0x4000>; + interrupts = <96>; + clocks = <&clks IMX5_CLK_SSI3_IPG_GATE>, + <&clks IMX5_CLK_SSI3_ROOT_GATE>; + clock-names = "ipg", "baud"; + dmas = <&sdma 46 0 0>, + <&sdma 47 0 0>; + dma-names = "rx", "tx"; + fsl,fifo-depth = <15>; + status = "disabled"; + }; - ipu_di1_tve: endpoint at 2 { - reg = <2>; - remote-endpoint = <&tve_in>; - }; + fec: ethernet at 63fec000 { + compatible = "fsl,imx53-fec","fsl,imx25-fec";
arch/arm/dts/imx53.dtsi +19
-55+ reg = <0x63fec000 0x4000>; + interrupts = <87>; + clocks = <&clks IMX5_CLK_FEC_GATE>, + <&clks IMX5_CLK_FEC_GATE>, + <&clks IMX5_CLK_FEC_GATE>; + clock-names = "ipg", "ahb", "ptp"; + status = "disabled"; }; - }; - tve: tve at 63ff0000 { + tve: tve at 63ff0000 { compatible = "fsl,imx53-tve"; reg = <0x63ff0000 0x1000>; interrupts = <92>;@@ -357,68 +823,33 @@ remote-endpoint = <&ipu_di1_tve>; }; }; - }; - - src: src at 53fd0000 { - compatible = "fsl,imx53-src", "fsl,imx51-src"; - reg = <0x53fd0000 0x4000>; - #reset-cells = <1>; - }; - - ldb: ldb at 53fa8008 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,imx53-ldb"; - reg = <0x53fa8008 0x4>; - gpr = <&gpr>; - clocks = <&clks IMX5_CLK_LDB_DI0_SEL>, - <&clks IMX5_CLK_LDB_DI1_SEL>, - <&clks IMX5_CLK_IPU_DI0_SEL>, - <&clks IMX5_CLK_IPU_DI1_SEL>, - <&clks IMX5_CLK_LDB_DI0_GATE>, - <&clks IMX5_CLK_LDB_DI1_GATE>; - clock-names = "di0_pll", "di1_pll", - "di0_sel", "di1_sel", - "di0", "di1"; - status = "disabled"; - - lvds-channel at 0 { - #address-cells = <1>; - #size-cells = <0>; - reg = <0>; - status = "disabled"; - - port at 0 { - reg = <0>; - - lvds0_in: endpoint { - remote-endpoint = <&ipu_di0_lvds0>; - }; - }; - - port at 2 { - reg = <2>; - }; - }; - - lvds-channel at 1 { - #address-cells = <1>; - #size-cells = <0>; - reg = <1>; - status = "disabled"; + }; - port at 1 { - reg = <1>; + vpu: vpu at 63ff4000 { + compatible = "fsl,imx53-vpu", "cnm,coda7541"; + reg = <0x63ff4000 0x1000>; + interrupts = <9>; + clocks = <&clks IMX5_CLK_VPU_REFERENCE_GATE>, + <&clks IMX5_CLK_VPU_GATE>; + clock-names = "per", "ahb"; + resets = <&src 1>; + iram = <&ocram>; + }; - lvds1_in: endpoint { -remote-endpoint = <
&ipu_di1_lvds1>;arch/arm/dts/imx53.dtsi +5
-2- }; - }; + sahara: crypto at 63ff8000 { + compatible = "fsl,imx53-sahara"; + reg = <0x63ff8000 0x4000>; + interrupts = <19 20>; + clocks = <&clks
IMX5_CLK_SAHARA_IPG_GATE>,arch/arm/dts/imx53.dtsi +1
-0+ <&clks
IMX5_CLK_SAHARA_IPG_GATE>;arch/arm/dts/imx53.dtsi +3
-1+ clock-names = "ipg", "ahb"; + }; + }; - port at 2 {
arch/arm/dts/imx53.dtsi line 855
Quoted 10 lines
arch/arm/dts/imx53.dtsi +4
-3- reg = <2>; - }; - }; + ocram: sram at f8000000 { + compatible = "mmio-sram"; + reg = <0xf8000000 0x20000>; + clocks = <&clks IMX5_CLK_OCRAM>; }; }; };
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 484 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190609/8fe0abb4/attachment.sig>
PATCH 1/6 ARM: dts: imx: imx53: Synchronize iMX53 DT with Linux
Quoted 9 lines · Lukasz Majewski
Hi Marek,
Quoted 3 lines
Synchronize iMX53 device tree from Linux next-20190607
3f310e51ceb1, this is needed to get NFC, UART, USBOTG DT nodes.As fair as I remember, for the imx53 we only added the necessary nodes for
imx53.dtsiLinux file as adding full DM/DTS caused some issues with the u-boot binary size (as it is not using SPL, but single binary).
Shouldn't fdtgrep filter those unnecessary nodes out by u-boot,dm-* ?
Quoted 1 line
However, I'm not sure if this is still the case.
Seems it's not, build passed:
https://travis-ci.org/marex/u-boot-imx/builds/543433138
Signature · 2 lines
Best regards, Marek Vasut