Skip to content

Commit c05cfd7

Browse files
committed
Merge tag 'imx-fixes-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes
i.MX fixes for 6.5: - A couple of ARM DTS fixes for i.MX6SLL usbphy and supported CPU frequency of sk-imx53 board - Add missing pull-up for imx8mn-var-som onboard PHY reset pinmux - A couple of imx8mm-venice fixes from Tim Harvey to diable disp_blk_ctrl - A couple of phycore-imx8mm fixes from Yashwanth Varakala to correct VPU label and gpio-line-names - Fix imx8mp-blk-ctrl driver to register HSIO PLL clock as bus_power_dev child, so that runtime PM can translate into the necessary GPC power domain action * tag 'imx-fixes-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: soc: imx: imx8mp-blk-ctrl: register HSIO PLL clock as bus_power_dev child ARM: dts: nxp/imx: limit sk-imx53 supported frequencies arm64: dts: freescale: Fix VPU G2 clock arm64: dts: imx8mn-var-som: add missing pull-up for onboard PHY reset pinmux arm64: dts: phycore-imx8mm: Correction in gpio-line-names arm64: dts: phycore-imx8mm: Label typo-fix of VPU ARM: dts: nxp/imx6sll: fix wrong property name in usbphy node arm64: dts: imx8mm-venice-gw7904: disable disp_blk_ctrl arm64: dts: imx8mm-venice-gw7903: disable disp_blk_ctrl Link: https://lore.kernel.org/r/20230725075837.GR151430@dragon Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 09eadda + 53cab4d commit c05cfd7

File tree

9 files changed

+25
-7
lines changed

9 files changed

+25
-7
lines changed

arch/arm/boot/dts/nxp/imx/imx53-sk-imx53.dts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,16 @@
6060
status = "okay";
6161
};
6262

63+
&cpu0 {
64+
/* CPU rated to 800 MHz, not the default 1.2GHz. */
65+
operating-points = <
66+
/* kHz uV */
67+
166666 850000
68+
400000 900000
69+
800000 1050000
70+
>;
71+
};
72+
6373
&ecspi1 {
6474
pinctrl-names = "default";
6575
pinctrl-0 = <&pinctrl_ecspi1>;

arch/arm/boot/dts/nxp/imx/imx6sll.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@
552552
reg = <0x020ca000 0x1000>;
553553
interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
554554
clocks = <&clks IMX6SLL_CLK_USBPHY2>;
555-
phy-reg_3p0-supply = <&reg_3p0>;
555+
phy-3p0-supply = <&reg_3p0>;
556556
fsl,anatop = <&anatop>;
557557
};
558558

arch/arm64/boot/dts/freescale/imx8mm-phyboard-polis-rdk.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
};
142142

143143
&gpio1 {
144-
gpio-line-names = "nINT_ETHPHY", "LED_RED", "WDOG_INT", "X_RTC_INT",
144+
gpio-line-names = "", "LED_RED", "WDOG_INT", "X_RTC_INT",
145145
"", "", "", "RESET_ETHPHY",
146146
"CAN_nINT", "CAN_EN", "nENABLE_FLATLINK", "",
147147
"USB_OTG_VBUS_EN", "", "LED_GREEN", "LED_BLUE";

arch/arm64/boot/dts/freescale/imx8mm-phycore-som.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
};
112112

113113
&gpio1 {
114-
gpio-line-names = "nINT_ETHPHY", "", "WDOG_INT", "X_RTC_INT",
114+
gpio-line-names = "", "", "WDOG_INT", "X_RTC_INT",
115115
"", "", "", "RESET_ETHPHY",
116116
"", "", "nENABLE_FLATLINK";
117117
};
@@ -210,7 +210,7 @@
210210
};
211211
};
212212

213-
reg_vdd_gpu: buck3 {
213+
reg_vdd_vpu: buck3 {
214214
regulator-always-on;
215215
regulator-boot-on;
216216
regulator-max-microvolt = <1000000>;

arch/arm64/boot/dts/freescale/imx8mm-venice-gw7903.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,10 @@
567567
status = "okay";
568568
};
569569

570+
&disp_blk_ctrl {
571+
status = "disabled";
572+
};
573+
570574
&pgc_mipi {
571575
status = "disabled";
572576
};

arch/arm64/boot/dts/freescale/imx8mm-venice-gw7904.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -628,6 +628,10 @@
628628
status = "okay";
629629
};
630630

631+
&disp_blk_ctrl {
632+
status = "disabled";
633+
};
634+
631635
&pgc_mipi {
632636
status = "disabled";
633637
};

arch/arm64/boot/dts/freescale/imx8mn-var-som.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@
358358
MX8MN_IOMUXC_ENET_RXC_ENET1_RGMII_RXC 0x91
359359
MX8MN_IOMUXC_ENET_RX_CTL_ENET1_RGMII_RX_CTL 0x91
360360
MX8MN_IOMUXC_ENET_TX_CTL_ENET1_RGMII_TX_CTL 0x1f
361-
MX8MN_IOMUXC_GPIO1_IO09_GPIO1_IO9 0x19
361+
MX8MN_IOMUXC_GPIO1_IO09_GPIO1_IO9 0x159
362362
>;
363363
};
364364

arch/arm64/boot/dts/freescale/imx8mq.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@
772772
<&clk IMX8MQ_SYS1_PLL_800M>,
773773
<&clk IMX8MQ_VPU_PLL>;
774774
assigned-clock-rates = <600000000>,
775-
<600000000>,
775+
<300000000>,
776776
<800000000>,
777777
<0>;
778778
};

drivers/soc/imx/imx8mp-blk-ctrl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ static int imx8mp_hsio_blk_ctrl_probe(struct imx8mp_blk_ctrl *bc)
164164
clk_hsio_pll->hw.init = &init;
165165

166166
hw = &clk_hsio_pll->hw;
167-
ret = devm_clk_hw_register(bc->dev, hw);
167+
ret = devm_clk_hw_register(bc->bus_power_dev, hw);
168168
if (ret)
169169
return ret;
170170

0 commit comments

Comments
 (0)