tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'imx-fixes-5.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes

i.MX fixes for 5.10, 3rd round:

- A series from Krzysztof Kozlowski to fix missing PMIC's interrupt
line pull-up for i.MX8MM and i.MX8MN boards.
- Set Bluetooth chip max-speed to 4000000 on imx8mm-beacon-som board
to fix the choppy Bluetooth audio sound.
- Remove non-existent OTG2, usbphynop2, and the usbmisc2 from i.MX8MN
device tree.
- Fix the endianness setting of RCPM node on Layerscape SoCs.
- Add the missing dma-coherent property for qoriq-fman device to improve
the performance.
- Fix the Ethernet PHY address on imx6q-prti6q board.

* tag 'imx-fixes-5.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: dts: imx6q-prti6q: fix PHY address
arm64: dts imx8mn: Remove non-existent USB OTG2
arm64: dts: imx8mm-beacon-som: Fix Choppy BT audio
arm64: dts: fsl: DPAA FMan DMA operations are coherent
arm64: dts: fsl: fix endianness issue of rcpm
arm64: dts: imx8mn-evk: fix missing PMIC's interrupt line pull-up
arm64: dts: imx8mn-ddr4-evk: fix missing PMIC's interrupt line pull-up
arm64: dts: imx8mn-var-som: fix missing PMIC's interrupt line pull-up
arm64: dts: imx8mm-evk: fix missing PMIC's interrupt line pull-up
arm64: dts: imx8mm-beacon-som: fix missing PMIC's interrupt line pull-up
arm64: dts: imx8mm-var-som: fix missing PMIC's interrupt line pull-up

Link: https://lore.kernel.org/r/20201030151821.GA28266@dragon
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann 47cd1eac f8394f23

+17 -44
+2 -2
arch/arm/boot/dts/imx6q-prti6q.dts
··· 213 213 #size-cells = <0>; 214 214 215 215 /* Microchip KSZ9031RNX PHY */ 216 - rgmii_phy: ethernet-phy@4 { 217 - reg = <4>; 216 + rgmii_phy: ethernet-phy@0 { 217 + reg = <0>; 218 218 interrupts-extended = <&gpio1 28 IRQ_TYPE_LEVEL_LOW>; 219 219 reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>; 220 220 reset-assert-us = <10000>;
+1
arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
··· 1012 1012 compatible = "fsl,ls1028a-rcpm", "fsl,qoriq-rcpm-2.1+"; 1013 1013 reg = <0x0 0x1e34040 0x0 0x1c>; 1014 1014 #fsl,rcpm-wakeup-cells = <7>; 1015 + little-endian; 1015 1016 }; 1016 1017 1017 1018 ftm_alarm0: timer@2800000 {
+1
arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
··· 805 805 compatible = "fsl,ls1088a-rcpm", "fsl,qoriq-rcpm-2.1+"; 806 806 reg = <0x0 0x1e34040 0x0 0x18>; 807 807 #fsl,rcpm-wakeup-cells = <6>; 808 + little-endian; 808 809 }; 809 810 810 811 ftm_alarm0: timer@2800000 {
+1
arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
··· 892 892 compatible = "fsl,ls208xa-rcpm", "fsl,qoriq-rcpm-2.1+"; 893 893 reg = <0x0 0x1e34040 0x0 0x18>; 894 894 #fsl,rcpm-wakeup-cells = <6>; 895 + little-endian; 895 896 }; 896 897 897 898 ftm_alarm0: timer@2800000 {
+2
arch/arm64/boot/dts/freescale/imx8mm-beacon-som.dtsi
··· 72 72 pmic@4b { 73 73 compatible = "rohm,bd71847"; 74 74 reg = <0x4b>; 75 + pinctrl-names = "default"; 75 76 pinctrl-0 = <&pinctrl_pmic>; 76 77 interrupt-parent = <&gpio1>; 77 78 interrupts = <3 IRQ_TYPE_LEVEL_LOW>; ··· 211 210 host-wakeup-gpios = <&gpio2 8 GPIO_ACTIVE_HIGH>; 212 211 device-wakeup-gpios = <&gpio2 7 GPIO_ACTIVE_HIGH>; 213 212 clocks = <&osc_32k>; 213 + max-speed = <4000000>; 214 214 clock-names = "extclk"; 215 215 }; 216 216 };
+1
arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi
··· 121 121 pmic@4b { 122 122 compatible = "rohm,bd71847"; 123 123 reg = <0x4b>; 124 + pinctrl-names = "default"; 124 125 pinctrl-0 = <&pinctrl_pmic>; 125 126 interrupt-parent = <&gpio1>; 126 127 interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
+3 -6
arch/arm64/boot/dts/freescale/imx8mm-var-som.dtsi
··· 135 135 pmic@4b { 136 136 compatible = "rohm,bd71847"; 137 137 reg = <0x4b>; 138 + pinctrl-names = "default"; 138 139 pinctrl-0 = <&pinctrl_pmic>; 139 140 interrupt-parent = <&gpio2>; 140 - /* 141 - * The interrupt is not correct. It should be level low, 142 - * however with internal pull up this causes IRQ storm. 143 - */ 144 - interrupts = <8 IRQ_TYPE_EDGE_RISING>; 141 + interrupts = <8 IRQ_TYPE_LEVEL_LOW>; 145 142 rohm,reset-snvs-powered; 146 143 147 144 #clock-cells = <0>; ··· 395 398 396 399 pinctrl_pmic: pmicirqgrp { 397 400 fsl,pins = < 398 - MX8MM_IOMUXC_SD1_DATA6_GPIO2_IO8 0x41 401 + MX8MM_IOMUXC_SD1_DATA6_GPIO2_IO8 0x141 399 402 >; 400 403 }; 401 404
+1
arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts
··· 53 53 pmic@4b { 54 54 compatible = "rohm,bd71847"; 55 55 reg = <0x4b>; 56 + pinctrl-names = "default"; 56 57 pinctrl-0 = <&pinctrl_pmic>; 57 58 interrupt-parent = <&gpio1>; 58 59 interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
+1
arch/arm64/boot/dts/freescale/imx8mn-evk.dts
··· 18 18 pmic: pmic@25 { 19 19 compatible = "nxp,pca9450b"; 20 20 reg = <0x25>; 21 + pinctrl-names = "default"; 21 22 pinctrl-0 = <&pinctrl_pmic>; 22 23 interrupt-parent = <&gpio1>; 23 24 interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
+3 -6
arch/arm64/boot/dts/freescale/imx8mn-var-som.dtsi
··· 116 116 pmic@4b { 117 117 compatible = "rohm,bd71847"; 118 118 reg = <0x4b>; 119 + pinctrl-names = "default"; 119 120 pinctrl-0 = <&pinctrl_pmic>; 120 121 interrupt-parent = <&gpio2>; 121 - /* 122 - * The interrupt is not correct. It should be level low, 123 - * however with internal pull up this causes IRQ storm. 124 - */ 125 - interrupts = <8 IRQ_TYPE_EDGE_RISING>; 122 + interrupts = <8 IRQ_TYPE_LEVEL_LOW>; 126 123 rohm,reset-snvs-powered; 127 124 128 125 regulators { ··· 385 388 386 389 pinctrl_pmic: pmicirqgrp { 387 390 fsl,pins = < 388 - MX8MN_IOMUXC_SD1_DATA6_GPIO2_IO8 0x101 391 + MX8MN_IOMUXC_SD1_DATA6_GPIO2_IO8 0x141 389 392 >; 390 393 }; 391 394
-30
arch/arm64/boot/dts/freescale/imx8mn.dtsi
··· 790 790 #index-cells = <1>; 791 791 reg = <0x32e40200 0x200>; 792 792 }; 793 - 794 - usbotg2: usb@32e50000 { 795 - compatible = "fsl,imx8mn-usb", "fsl,imx7d-usb"; 796 - reg = <0x32e50000 0x200>; 797 - interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>; 798 - clocks = <&clk IMX8MN_CLK_USB1_CTRL_ROOT>; 799 - clock-names = "usb1_ctrl_root_clk"; 800 - assigned-clocks = <&clk IMX8MN_CLK_USB_BUS>, 801 - <&clk IMX8MN_CLK_USB_CORE_REF>; 802 - assigned-clock-parents = <&clk IMX8MN_SYS_PLL2_500M>, 803 - <&clk IMX8MN_SYS_PLL1_100M>; 804 - fsl,usbphy = <&usbphynop2>; 805 - fsl,usbmisc = <&usbmisc2 0>; 806 - status = "disabled"; 807 - }; 808 - 809 - usbmisc2: usbmisc@32e50200 { 810 - compatible = "fsl,imx8mn-usbmisc", "fsl,imx7d-usbmisc"; 811 - #index-cells = <1>; 812 - reg = <0x32e50200 0x200>; 813 - }; 814 - 815 793 }; 816 794 817 795 dma_apbh: dma-controller@33000000 { ··· 848 870 }; 849 871 850 872 usbphynop1: usbphynop1 { 851 - compatible = "usb-nop-xceiv"; 852 - clocks = <&clk IMX8MN_CLK_USB_PHY_REF>; 853 - assigned-clocks = <&clk IMX8MN_CLK_USB_PHY_REF>; 854 - assigned-clock-parents = <&clk IMX8MN_SYS_PLL1_100M>; 855 - clock-names = "main_clk"; 856 - }; 857 - 858 - usbphynop2: usbphynop2 { 859 873 compatible = "usb-nop-xceiv"; 860 874 clocks = <&clk IMX8MN_CLK_USB_PHY_REF>; 861 875 assigned-clocks = <&clk IMX8MN_CLK_USB_PHY_REF>;
+1
arch/arm64/boot/dts/freescale/qoriq-fman3-0.dtsi
··· 19 19 clock-names = "fmanclk"; 20 20 fsl,qman-channel-range = <0x800 0x10>; 21 21 ptimer-handle = <&ptp_timer0>; 22 + dma-coherent; 22 23 23 24 muram@0 { 24 25 compatible = "fsl,fman-muram";