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-6.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes

i.MX fixes for 6.1, part 3:

- Fix a small memory leak in mach-mxs code.
- Correct PCIe pad configuration for imx8mp-evk board.
- Fix ref/tcxo clock frequency property for imx6q-prti6q board.

* tag 'imx-fixes-6.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: dts: imx6q-prti6q: Fix ref/tcxo-clock-frequency properties
arm64: dts: imx8mp-evk: correct pcie pad settings
ARM: mxs: fix memory leak in mxs_machine_init()

Link: https://lore.kernel.org/r/20221119073812.GQ16229@T480
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann cafd3d34 e7135a28

+8 -6
+2 -2
arch/arm/boot/dts/imx6q-prti6q.dts
··· 364 364 pinctrl-names = "default"; 365 365 pinctrl-0 = <&pinctrl_wifi>; 366 366 interrupts-extended = <&gpio1 30 IRQ_TYPE_LEVEL_HIGH>; 367 - ref-clock-frequency = "38400000"; 368 - tcxo-clock-frequency = "19200000"; 367 + ref-clock-frequency = <38400000>; 368 + tcxo-clock-frequency = <19200000>; 369 369 }; 370 370 }; 371 371
+3 -1
arch/arm/mach-mxs/mach-mxs.c
··· 393 393 394 394 root = of_find_node_by_path("/"); 395 395 ret = of_property_read_string(root, "model", &soc_dev_attr->machine); 396 - if (ret) 396 + if (ret) { 397 + kfree(soc_dev_attr); 397 398 return; 399 + } 398 400 399 401 soc_dev_attr->family = "Freescale MXS Family"; 400 402 soc_dev_attr->soc_id = mxs_get_soc_id();
+3 -3
arch/arm64/boot/dts/freescale/imx8mp-evk.dts
··· 544 544 545 545 pinctrl_pcie0: pcie0grp { 546 546 fsl,pins = < 547 - MX8MP_IOMUXC_I2C4_SCL__PCIE_CLKREQ_B 0x61 /* open drain, pull up */ 548 - MX8MP_IOMUXC_SD1_DATA5__GPIO2_IO07 0x41 547 + MX8MP_IOMUXC_I2C4_SCL__PCIE_CLKREQ_B 0x60 /* open drain, pull up */ 548 + MX8MP_IOMUXC_SD1_DATA5__GPIO2_IO07 0x40 549 549 >; 550 550 }; 551 551 552 552 pinctrl_pcie0_reg: pcie0reggrp { 553 553 fsl,pins = < 554 - MX8MP_IOMUXC_SD1_DATA4__GPIO2_IO06 0x41 554 + MX8MP_IOMUXC_SD1_DATA4__GPIO2_IO06 0x40 555 555 >; 556 556 }; 557 557