diff --git a/Documentation/devicetree/bindings/board/fsl,fpga-qixis.yaml b/Documentation/devicetree/bindings/board/fsl,fpga-qixis.yaml index 2eacb581b9fd..ea1e3fbca202 100644 --- a/Documentation/devicetree/bindings/board/fsl,fpga-qixis.yaml +++ b/Documentation/devicetree/bindings/board/fsl,fpga-qixis.yaml @@ -24,6 +24,7 @@ properties: - const: fsl,fpga-qixis - items: - enum: + - fsl,ls1021aqds-fpga - fsl,ls1043aqds-fpga - fsl,ls1043ardb-fpga - fsl,ls1046aqds-fpga diff --git a/Documentation/devicetree/bindings/bus/fsl,spba-bus.yaml b/Documentation/devicetree/bindings/bus/fsl,spba-bus.yaml index 4808065fc911..5e872ddacaab 100644 --- a/Documentation/devicetree/bindings/bus/fsl,spba-bus.yaml +++ b/Documentation/devicetree/bindings/bus/fsl,spba-bus.yaml @@ -28,6 +28,7 @@ select: enum: - fsl,aipi-bus - fsl,aips + - fsl,eim-bus - fsl,emi - fsl,emi-bus - fsl,spba-bus @@ -36,13 +37,14 @@ select: properties: $nodename: - pattern: "^((spba|emi)-bus|bus)(@[0-9a-f]+)?$" + pattern: "^((spba|emi|eim)-bus|bus)(@[0-9a-f]+)?$" compatible: items: - enum: - fsl,aipi-bus - fsl,aips + - fsl,eim-bus - fsl,emi - fsl,emi-bus - fsl,spba-bus diff --git a/Documentation/devicetree/bindings/display/fsl,ls1021a-dcu.yaml b/Documentation/devicetree/bindings/display/fsl,ls1021a-dcu.yaml index 72d14babe993..6ac5ababbe00 100644 --- a/Documentation/devicetree/bindings/display/fsl,ls1021a-dcu.yaml +++ b/Documentation/devicetree/bindings/display/fsl,ls1021a-dcu.yaml @@ -45,6 +45,15 @@ properties: $ref: /schemas/types.yaml#/definitions/phandle description: The phandle to the timing controller node. + display: + $ref: /schemas/types.yaml#/definitions/phandle + description: phandle to display panel + deprecated: true + + display0: + $ref: panel/panel-common.yaml# + deprecated: true + required: - compatible - reg @@ -53,6 +62,19 @@ required: additionalProperties: false +allOf: + - if: + not: + properties: + compatible: + contains: + enum: + - fsl,ls1021a-dcu + then: + properties: + display: false + display0: false + examples: - | display-controller@2ce0000 { diff --git a/arch/arm/boot/dts/nxp/imx/imx53-ard.dts b/arch/arm/boot/dts/nxp/imx/imx53-ard.dts index e580427660b1..c19ac3bb0a19 100644 --- a/arch/arm/boot/dts/nxp/imx/imx53-ard.dts +++ b/arch/arm/boot/dts/nxp/imx/imx53-ard.dts @@ -17,7 +17,7 @@ memory@70000000 { reg = <0x70000000 0x40000000>; }; - eim-cs1@f4000000 { + eim-bus@f4000000 { #address-cells = <1>; #size-cells = <1>; compatible = "fsl,eim-bus", "simple-bus"; diff --git a/arch/arm/boot/dts/nxp/imx/imx53-smd.dts b/arch/arm/boot/dts/nxp/imx/imx53-smd.dts index 8c02731c7ba9..29d38484cd38 100644 --- a/arch/arm/boot/dts/nxp/imx/imx53-smd.dts +++ b/arch/arm/boot/dts/nxp/imx/imx53-smd.dts @@ -306,7 +306,6 @@ camera: ov5642@3c { <&clks IMX5_CLK_SSI_EXT1_PODF>; assigned-clock-rates = <0>, <24000000>; clocks = <&clks IMX5_CLK_SSI_EXT1_GATE>; - clock-names = "xclk"; DVDD-supply = <&ldo9_reg>; AVDD-supply = <&ldo7_reg>; reset-gpios = <&gpio6 9 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/nxp/imx/imx6dl-plym2m.dts b/arch/arm/boot/dts/nxp/imx/imx6dl-plym2m.dts index fbff77944ce3..635c5a1e1fc7 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6dl-plym2m.dts +++ b/arch/arm/boot/dts/nxp/imx/imx6dl-plym2m.dts @@ -52,7 +52,7 @@ display_out: endpoint { iio-hwmon { compatible = "iio-hwmon"; - io-channels = <&vdiv_vaccu>; + io-channels = <&vdiv_vaccu 0>; }; leds { @@ -187,7 +187,7 @@ vdiv_vaccu: voltage-divider-vaccu { io-channels = <&adc_ts 2>; output-ohms = <2500>; full-ohms = <64000>; - #io-channel-cells = <0>; + #io-channel-cells = <1>; }; }; diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-sabresd.dtsi index fe9046c03ddd..60fe0f973668 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-sabresd.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-sabresd.dtsi @@ -756,12 +756,14 @@ &pcie { pinctrl-0 = <&pinctrl_pcie>; /* This property is deprecated, use reset-gpios from the Root Port node. */ reset-gpio = <&gpio7 12 GPIO_ACTIVE_LOW>; + /* This property is deprecated, use power supply from the Root Port node. */ vpcie-supply = <®_pcie>; status = "okay"; }; &pcie_port0 { reset-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>; + vpcie3v3-supply = <®_pcie>; }; &pwm1 { diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6a.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6a.dtsi index 67f8f59aff5a..2fa116e1ca9a 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6a.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6a.dtsi @@ -39,6 +39,16 @@ m24c64_50: eeprom@50 { reg = <0x50>; pagesize = <32>; vcc-supply = <&sw4_reg>; + + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + module_info: module-info@20 { + reg = <0x20 0x60>; + }; + }; }; }; diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6b.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6b.dtsi index db552802554d..4361c7efb9d7 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6b.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6b.dtsi @@ -32,6 +32,16 @@ m24c64_50: eeprom@50 { reg = <0x50>; pagesize = <32>; vcc-supply = <&sw4_reg>; + + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + module_info: module-info@20 { + reg = <0x20 0x60>; + }; + }; }; }; diff --git a/arch/arm/boot/dts/nxp/imx/imx6sx-sdb.dtsi b/arch/arm/boot/dts/nxp/imx/imx6sx-sdb.dtsi index 338de4d144b2..2d3521ea0caa 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6sx-sdb.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6sx-sdb.dtsi @@ -284,12 +284,14 @@ &pcie { pinctrl-0 = <&pinctrl_pcie>; /* This property is deprecated, use reset-gpios from the Root Port node. */ reset-gpio = <&gpio2 0 GPIO_ACTIVE_LOW>; + /* This property is deprecated, use power supply from the Root Port node. */ vpcie-supply = <®_pcie_gpio>; status = "okay"; }; &pcie_port0 { reset-gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; + vpcie3v3-supply = <®_pcie_gpio>; }; &lcdif1 { diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-isiot.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ul-isiot.dtsi index e34c8cbe36ae..2e3a71f94f31 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6ul-isiot.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6ul-isiot.dtsi @@ -116,7 +116,6 @@ sgtl5000: codec@a { reg = <0x0a>; #sound-dai-cells = <0>; clocks = <&clks IMX6UL_CLK_OSC>; - clock-names = "mclk"; VDDA-supply = <®_3p3v>; VDDIO-supply = <®_3p3v>; VDDD-supply = <®_1p8v>; diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul-common.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul-common.dtsi index 4fa98e6a66d7..9b70e58868b0 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul-common.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul-common.dtsi @@ -126,6 +126,16 @@ m24c64_50: eeprom@50 { compatible = "atmel,24c64"; reg = <0x50>; pagesize = <32>; + + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + module_info: module-info@20 { + reg = <0x20 0x60>; + }; + }; }; m24c02_52: eeprom@52 { diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-engicam-microgea.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ull-engicam-microgea.dtsi index 43518bf07602..2c36c248f6bd 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6ull-engicam-microgea.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6ull-engicam-microgea.dtsi @@ -44,8 +44,6 @@ &gpmi { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpmi_nand>; nand-ecc-mode = "hw"; - nand-ecc-strength = <0>; - nand-ecc-step-size = <0>; nand-on-flash-bbt; status = "okay"; }; diff --git a/arch/arm/boot/dts/nxp/imx/imx7d-pico.dtsi b/arch/arm/boot/dts/nxp/imx/imx7d-pico.dtsi index a1574ccec89c..6d4e8087192c 100644 --- a/arch/arm/boot/dts/nxp/imx/imx7d-pico.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx7d-pico.dtsi @@ -339,6 +339,20 @@ &uart7 { /* Bluetooth */ assigned-clock-parents = <&clks IMX7D_PLL_SYS_MAIN_240M_CLK>; uart-has-rtscts; status = "okay"; + + bluetooth { + compatible = "brcm,bcm4329-bt"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_bluetooth>; + + max-speed = <3000000>; + + reset-gpios = <&gpio4 18 GPIO_ACTIVE_LOW>; + device-wakeup-gpios = <&gpio4 17 GPIO_ACTIVE_HIGH>; + interrupt-parent = <&gpio5>; + interrupts = <11 IRQ_TYPE_EDGE_FALLING>; + interrupt-names = "host-wakeup"; + }; }; &usbotg1 { @@ -401,6 +415,15 @@ &wdog1 { }; &iomuxc { + pinctrl_bluetooth: bluetoothgrp { + fsl,pins = < + MX7D_PAD_ECSPI1_MOSI__GPIO4_IO17 0x14 + MX7D_PAD_ECSPI1_MISO__GPIO4_IO18 0x14 + MX7D_PAD_SD2_RESET_B__GPIO5_IO11 0x14 + >; + + }; + pinctrl_ecspi3: ecspi3grp { fsl,pins = < MX7D_PAD_I2C1_SCL__ECSPI3_MISO 0x2 diff --git a/arch/arm/boot/dts/nxp/ls/ls1021a-iot.dts b/arch/arm/boot/dts/nxp/ls/ls1021a-iot.dts index e13ccae629a7..07b01434fc04 100644 --- a/arch/arm/boot/dts/nxp/ls/ls1021a-iot.dts +++ b/arch/arm/boot/dts/nxp/ls/ls1021a-iot.dts @@ -82,13 +82,13 @@ &dcu { display = <&display>; status = "okay"; - display: display@0 { + display: display0 { bits-per-pixel = <24>; display-timings { native-mode = <&timing0>; - timing0: mode0 { + timing0: timing0 { clock-frequency = <25000000>; hactive = <640>; vactive = <480>; diff --git a/arch/arm/boot/dts/nxp/ls/ls1021a-moxa-uc-8410a.dts b/arch/arm/boot/dts/nxp/ls/ls1021a-moxa-uc-8410a.dts index d2cae8c7d7a6..ad83d8814fbb 100644 --- a/arch/arm/boot/dts/nxp/ls/ls1021a-moxa-uc-8410a.dts +++ b/arch/arm/boot/dts/nxp/ls/ls1021a-moxa-uc-8410a.dts @@ -40,13 +40,13 @@ reg_3p3v: regulator-3p3v { leds { compatible = "gpio-leds"; - cel-pwr { + cel-pwr-led { label = "UC8410A:CEL-PWR"; gpios = <&gpio3 27 GPIO_ACTIVE_LOW>; default-state = "off"; }; - cel-reset { + cel-reset-led { label = "UC8410A:CEL-RESET"; gpios = <&gpio3 28 GPIO_ACTIVE_LOW>; default-state = "off"; @@ -58,13 +58,13 @@ str-led { linux,default-trigger = "mmc0"; }; - sw-ready { + sw-ready-led { label = "UC8410A:GREEN:SWRDY"; gpios = <&gpio0 18 GPIO_ACTIVE_HIGH>; default-state = "on"; }; - beeper { + beeper-led { label = "UC8410A:BEEP"; gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>; default-state = "off"; @@ -88,37 +88,37 @@ prog-led2 { default-state = "off"; }; - wifi-signal0 { + wifi-signal0-led { label = "UC8410A:GREEN:CEL2"; gpios = <&gpio3 17 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - wifi-signal1 { + wifi-signal1-led { label = "UC8410A:GREEN:CEL1"; gpios = <&gpio3 18 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - wifi-signal2 { + wifi-signal2-led { label = "UC8410A:GREEN:CEL0"; gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - cpu-diag-red { + cpu-diag-red-led { label = "UC8410A:RED:DIA"; gpios = <&gpio3 20 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - cpu-diag-green { + cpu-diag-green-led { label = "UC8410A:GREEN:DIA"; gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - cpu-diag-yellow { + cpu-diag-yellow-led { label = "UC8410A:YELLOW:DIA"; gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>; default-state = "off"; @@ -132,7 +132,6 @@ pushbtn-key { label = "push button key"; gpios = <&gpio1 21 GPIO_ACTIVE_LOW>; linux,code = ; - default-state = "on"; }; }; }; @@ -176,7 +175,7 @@ &lpuart0 { &mdio0 { rgmii_phy0: ethernet-phy@0 { - compatible = "marvell,88e1118"; + compatible = "ethernet-phy-ieee802.3-c22"; reg = <0x0>; marvell,reg-init = <3 0x11 0 0x4415>, /* Reg 3,17 */ @@ -184,7 +183,7 @@ rgmii_phy0: ethernet-phy@0 { }; rgmii_phy1: ethernet-phy@1 { - compatible = "marvell,88e1118"; + compatible = "ethernet-phy-ieee802.3-c22"; reg = <0x1>; marvell,reg-init = <3 0x11 0 0x4415>, /* Reg 3,17 */ @@ -192,7 +191,7 @@ rgmii_phy1: ethernet-phy@1 { }; rgmii_phy2: ethernet-phy@2 { - compatible = "marvell,88e1118"; + compatible = "ethernet-phy-ieee802.3-c22"; reg = <0x2>; marvell,reg-init = <3 0x11 0 0x4415>, /* Reg 3,17 */ @@ -204,7 +203,7 @@ &qspi { status = "okay"; flash: flash@0 { - compatible = "spansion,s25fl064l", "spansion,s25fl164k"; + compatible = "jedec,spi-nor"; #address-cells = <1>; #size-cells = <1>; spi-max-frequency = <20000000>; diff --git a/arch/arm/boot/dts/nxp/ls/ls1021a-qds.dts b/arch/arm/boot/dts/nxp/ls/ls1021a-qds.dts index a880875ced83..34c88650c828 100644 --- a/arch/arm/boot/dts/nxp/ls/ls1021a-qds.dts +++ b/arch/arm/boot/dts/nxp/ls/ls1021a-qds.dts @@ -205,10 +205,8 @@ nand@2,0 { fpga: board-control@3,0 { #address-cells = <1>; #size-cells = <1>; - compatible = "simple-mfd"; + compatible = "fsl,ls1021aqds-fpga", "fsl,fpga-qixis", "simple-mfd"; reg = <0x3 0x0 0x0000100>; - bank-width = <1>; - device-width = <1>; ranges = <0 3 0 0x100>; mdio-mux@54 { diff --git a/arch/arm/boot/dts/nxp/ls/ls1021a-twr.dts b/arch/arm/boot/dts/nxp/ls/ls1021a-twr.dts index 38281b904301..ca5c66c066db 100644 --- a/arch/arm/boot/dts/nxp/ls/ls1021a-twr.dts +++ b/arch/arm/boot/dts/nxp/ls/ls1021a-twr.dts @@ -61,6 +61,7 @@ simple-audio-card,codec { panel: panel { compatible = "nec,nl4827hc19-05b"; + power-supply = <®_3p3v>; port { panel_in: endpoint { @@ -190,7 +191,7 @@ tbi1: tbi-phy@1f { }; &esdhc { - status = "okay"; + status = "okay"; }; &qspi {