diff --git a/arch/arm/boot/dts/imx7s-smarcfimx7.dts b/arch/arm/boot/dts/imx7s-smarcfimx7.dts index b7a26c6..ef3c4ff 100644 --- a/arch/arm/boot/dts/imx7s-smarcfimx7.dts +++ b/arch/arm/boot/dts/imx7s-smarcfimx7.dts @@ -215,21 +215,6 @@ assigned-clock-rates = <884736000>; }; -&csi1 { - csi-mux-mipi = <&gpr 0x14 4>; - status = "okay"; - - port { - csi_ep: endpoint { - remote-endpoint = <&csi_mipi_ep>; - }; - }; -}; - -&epxp { - status = "okay"; -}; - &fec1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet1>; @@ -255,28 +240,9 @@ compatible = "ethernet-phy-ieee802.3-c22"; reg = <0x6>; }; - - ethphy1: ethernet-phy@7 { - compatible = "ethernet-phy-ieee802.3-c22"; - reg = <0x7>; - }; }; }; -&mipi_csi { - clock-frequency = <240000000>; - status = "okay"; - port { - csi_mipi_ep: endpoint1 { - remote-endpoint = <&csi_ep>; - data-lanes = <2>; - csis-hs-settle = <13>; - csis-clk-settle = <2>; - csis-wclk; - }; - }; -}; - &flexcan1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_flexcan1>; diff --git a/arch/arm/boot/dts/imx7solo.dtsi b/arch/arm/boot/dts/imx7solo.dtsi index cfd98ea..f3866dc 100644 --- a/arch/arm/boot/dts/imx7solo.dtsi +++ b/arch/arm/boot/dts/imx7solo.dtsi @@ -1,7 +1,7 @@ /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2016 Toradex AG - * Copyright 2017 NXP. + * Copyright 2017-2018 NXP * * 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 @@ -49,6 +49,7 @@ cpu0: cpu@0 { operating-points = < /* KHz uV */ + 1200000 1225000 996000 1075000 792000 975000 >; @@ -65,7 +66,7 @@ linux,cma { compatible = "shared-dma-pool"; reusable; - size = <0x14000000>; + size = <0x6400000>; linux,cma-default; }; }; @@ -131,6 +132,15 @@ clocks = <&clks IMX7D_OCRAM_CLK>; }; + ocram_optee { + compatible = "fsl,optee-lpm-sram"; + reg = <0x00180000 0x8000>; + overw_reg = <&ocrams_ddr 0x00904000 0x1000>, + <&ocram 0x00905000 0x1b000>, + <&ocrams 0x00900000 0x4000>; + overw_clock = <&ocrams &clks IMX7D_OCRAM_CLK>; + }; + dma_apbh: dma-apbh@33000000 { compatible = "fsl,imx7d-dma-apbh", "fsl,imx28-dma-apbh"; reg = <0x33000000 0x2000>; @@ -141,9 +151,7 @@ interrupt-names = "gpmi0", "gpmi1", "gpmi2", "gpmi3"; #dma-cells = <1>; dma-channels = <4>; - clocks = <&clks IMX7D_NAND_USDHC_BUS_ROOT_CLK>, - <&clks IMX7D_NAND_ROOT_CLK>; - clock-names = "dma_apbh_bch", "dma_apbh_io"; + clocks = <&clks IMX7D_NAND_USDHC_BUS_RAWNAND_CLK>; }; gpmi: gpmi-nand@33002000{ @@ -154,40 +162,13 @@ reg-names = "gpmi-nand", "bch"; interrupts = ; interrupt-names = "bch"; - clocks = <&clks IMX7D_NAND_ROOT_CLK>, - <&clks IMX7D_NAND_USDHC_BUS_ROOT_CLK>; + clocks = <&clks IMX7D_NAND_RAWNAND_CLK>, + <&clks IMX7D_NAND_USDHC_BUS_RAWNAND_CLK>; clock-names = "gpmi_io", "gpmi_bch_apb"; dmas = <&dma_apbh 0>; dma-names = "rx-tx"; status = "disabled"; }; - - pcie: pcie@0x33800000 { - compatible = "fsl,imx7d-pcie", "snps,dw-pcie"; - reg = <0x33800000 0x4000>, <0x4ff00000 0x80000>; - reg-names = "dbi", "config"; - #address-cells = <3>; - #size-cells = <2>; - device_type = "pci"; - ranges = <0x81000000 0 0 0x4ff80000 0 0x00010000 /* downstream I/O 64KB */ - 0x82000000 0 0x40000000 0x40000000 0 0x0ff00000>; /* non-prefetchable memory */ - num-lanes = <1>; - interrupts = ; - interrupt-names = "msi"; - #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 0x7>; - interrupt-map = <0 0 0 1 &intc GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 2 &intc GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 3 &intc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 4 &intc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&clks IMX7D_PCIE_CTRL_ROOT_CLK>, - <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>, - <&clks IMX7D_PCIE_PHY_ROOT_CLK>; - clock-names = "pcie", "pcie_bus", "pcie_phy"; - pcie-phy-supply = <®_1p0d>; - fsl,max-link-speed = <2>; - status = "disabled"; - }; }; }; @@ -266,12 +247,6 @@ status = "disabled"; }; - pcie_phy: pcie-phy@306d0000 { - compatible = "fsl,imx-pcie-phy"; - reg = <0x306d0000 0x10000>; - status = "disabled"; - }; - epdc: epdc@306f0000 { compatible = "fsl,imx7d-epdc"; interrupts = ; @@ -282,40 +257,6 @@ status = "disabled"; }; - epxp: epxp@30700000 { - compatible = "fsl,imx7d-pxp-dma"; - interrupts = , - ; - reg = <0x30700000 0x10000>; - clocks = <&clks IMX7D_PXP_IPG_CLK>, <&clks IMX7D_PXP_AXI_CLK>; - clock-names = "pxp_ipg", "pxp_axi"; - status = "disabled"; - }; - - csi1: csi@30710000 { - compatible = "fsl,imx7d-csi", "fsl,imx6s-csi"; - reg = <0x30710000 0x10000>; - interrupts = ; - clocks = <&clks IMX7D_CLK_DUMMY>, - <&clks IMX7D_CSI_MCLK_ROOT_CLK>, - <&clks IMX7D_CLK_DUMMY>; - clock-names = "disp-axi", "csi_mclk", "disp_dcic"; - status = "disabled"; - }; - - mipi_csi: mipi-csi@30750000 { - compatible = "fsl,imx7d-mipi-csi"; - reg = <0x30750000 0x10000>; - interrupts = ; - clocks = <&clks IMX7D_MIPI_CSI_ROOT_CLK>, - <&clks IMX7D_MIPI_DPHY_ROOT_CLK>; - clock-names = "mipi_clk", "phy_clk"; - mipi-phy-supply = <®_1p0d>; - csis-phy-reset = <&src 0x28 2>; - bus-width = <4>; - status = "disabled"; - }; - mipi_dsi: mipi-dsi@30760000 { compatible = "fsl,imx7d-mipi-dsi"; reg = <0x30760000 0x10000>; @@ -334,24 +275,6 @@ }; &aips3 { - fec2: ethernet@30bf0000 { - compatible = "fsl,imx7d-fec", "fsl,imx6sx-fec"; - reg = <0x30bf0000 0x10000>; - interrupts = , - , - ; - clocks = <&clks IMX7D_ENET2_IPG_ROOT_CLK>, - <&clks IMX7D_ENET_AXI_ROOT_CLK>, - <&clks IMX7D_ENET2_TIME_ROOT_CLK>, - <&clks IMX7D_PLL_ENET_MAIN_125M_CLK>, - <&clks IMX7D_ENET_PHY_REF_ROOT_DIV>; - clock-names = "ipg", "ahb", "ptp", - "enet_clk_ref", "enet_out"; - fsl,num-tx-queues=<3>; - fsl,num-rx-queues=<3>; - status = "disabled"; - }; - crypto: caam@30900000 { compatible = "fsl,imx7d-caam", "fsl,sec-v4.0"; #address-cells = <1>; @@ -362,6 +285,16 @@ clocks = <&clks IMX7D_CAAM_CLK>, <&clks IMX7D_AHB_CHANNEL_ROOT_CLK>; clock-names = "ipg", "aclk"; + + sec_ctrl: ctrl@0 { + /* CAAM Page 0 only accessible */ + /* by secure world */ + compatible = "fsl,sec-v4.0-ctrl"; + reg = <0x30900000 0x1000>; + secure-status = "okay"; + status = "disabled"; + }; + sec_jr0: jr0@1000 { compatible = "fsl,sec-v4.0-job-ring"; reg = <0x1000 0x1000>; @@ -442,8 +375,3 @@ }; }; - -&usbphynop3 { - vcc-supply = <®_1p2>; -}; -