Skip to content

Commit 7d177ae

Browse files
arndbarndb
committed
Merge tag 'imx-fixes-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes
i.MX fixes for 6.9: - A couple of i.MX7 board fixes from Fabio Estevam that use correct 'no-mmc' property and pass 'link-frequencies' for OV2680. - A series from Frank Li to fix LPCG clock indices for i.MX8 subsystems. - A couple of changes from Tim Harvey that fix USB VBUS regulator for imx8mp-venice board. * tag 'imx-fixes-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: arm64: dts: imx8qm-ss-dma: fix can lpcg indices arm64: dts: imx8-ss-dma: fix can lpcg indices arm64: dts: imx8-ss-dma: fix adc lpcg indices arm64: dts: imx8-ss-dma: fix pwm lpcg indices arm64: dts: imx8-ss-dma: fix spi lpcg indices arm64: dts: imx8-ss-conn: fix usb lpcg indices arm64: dts: imx8-ss-lsio: fix pwm lpcg indices ARM: dts: imx7s-warp: Pass OV2680 link-frequencies ARM: dts: imx7-mba7: Use 'no-mmc' property arm64: dts: imx8-ss-conn: fix usdhc wrong lpcg clock order arm64: dts: freescale: imx8mp-venice-gw73xx-2x: fix USB vbus regulator arm64: dts: freescale: imx8mp-venice-gw72xx-2x: fix USB vbus regulator Link: https://lore.kernel.org/r/Zg5rfaVVvD9egoBK@dragon Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 06bd7e4 + 00b4361 commit 7d177ae

File tree

8 files changed

+44
-43
lines changed

8 files changed

+44
-43
lines changed

‎arch/arm/boot/dts/nxp/imx/imx7-mba7.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@
666666
bus-width = <4>;
667667
no-1-8-v;
668668
no-sdio;
669-
no-emmc;
669+
no-mmc;
670670
status = "okay";
671671
};
672672

‎arch/arm/boot/dts/nxp/imx/imx7s-warp.dts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@
210210
remote-endpoint = <&mipi_from_sensor>;
211211
clock-lanes = <0>;
212212
data-lanes = <1>;
213+
link-frequencies = /bits/ 64 <330000000>;
213214
};
214215
};
215216
};

‎arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ conn_subsys: bus@5b000000 {
4141
interrupts = <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;
4242
fsl,usbphy = <&usbphy1>;
4343
fsl,usbmisc = <&usbmisc1 0>;
44-
clocks = <&usb2_lpcg 0>;
44+
clocks = <&usb2_lpcg IMX_LPCG_CLK_6>;
4545
ahb-burst-config = <0x0>;
4646
tx-burst-size-dword = <0x10>;
4747
rx-burst-size-dword = <0x10>;
@@ -58,7 +58,7 @@ conn_subsys: bus@5b000000 {
5858
usbphy1: usbphy@5b100000 {
5959
compatible = "fsl,imx7ulp-usbphy";
6060
reg = <0x5b100000 0x1000>;
61-
clocks = <&usb2_lpcg 1>;
61+
clocks = <&usb2_lpcg IMX_LPCG_CLK_7>;
6262
power-domains = <&pd IMX_SC_R_USB_0_PHY>;
6363
status = "disabled";
6464
};
@@ -67,8 +67,8 @@ conn_subsys: bus@5b000000 {
6767
interrupts = <GIC_SPI 232 IRQ_TYPE_LEVEL_HIGH>;
6868
reg = <0x5b010000 0x10000>;
6969
clocks = <&sdhc0_lpcg IMX_LPCG_CLK_4>,
70-
<&sdhc0_lpcg IMX_LPCG_CLK_0>,
71-
<&sdhc0_lpcg IMX_LPCG_CLK_5>;
70+
<&sdhc0_lpcg IMX_LPCG_CLK_5>,
71+
<&sdhc0_lpcg IMX_LPCG_CLK_0>;
7272
clock-names = "ipg", "ahb", "per";
7373
power-domains = <&pd IMX_SC_R_SDHC_0>;
7474
status = "disabled";
@@ -78,8 +78,8 @@ conn_subsys: bus@5b000000 {
7878
interrupts = <GIC_SPI 233 IRQ_TYPE_LEVEL_HIGH>;
7979
reg = <0x5b020000 0x10000>;
8080
clocks = <&sdhc1_lpcg IMX_LPCG_CLK_4>,
81-
<&sdhc1_lpcg IMX_LPCG_CLK_0>,
82-
<&sdhc1_lpcg IMX_LPCG_CLK_5>;
81+
<&sdhc1_lpcg IMX_LPCG_CLK_5>,
82+
<&sdhc1_lpcg IMX_LPCG_CLK_0>;
8383
clock-names = "ipg", "ahb", "per";
8484
power-domains = <&pd IMX_SC_R_SDHC_1>;
8585
fsl,tuning-start-tap = <20>;
@@ -91,8 +91,8 @@ conn_subsys: bus@5b000000 {
9191
interrupts = <GIC_SPI 234 IRQ_TYPE_LEVEL_HIGH>;
9292
reg = <0x5b030000 0x10000>;
9393
clocks = <&sdhc2_lpcg IMX_LPCG_CLK_4>,
94-
<&sdhc2_lpcg IMX_LPCG_CLK_0>,
95-
<&sdhc2_lpcg IMX_LPCG_CLK_5>;
94+
<&sdhc2_lpcg IMX_LPCG_CLK_5>,
95+
<&sdhc2_lpcg IMX_LPCG_CLK_0>;
9696
clock-names = "ipg", "ahb", "per";
9797
power-domains = <&pd IMX_SC_R_SDHC_2>;
9898
status = "disabled";

‎arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ dma_subsys: bus@5a000000 {
2828
#size-cells = <0>;
2929
interrupts = <GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH>;
3030
interrupt-parent = <&gic>;
31-
clocks = <&spi0_lpcg 0>,
32-
<&spi0_lpcg 1>;
31+
clocks = <&spi0_lpcg IMX_LPCG_CLK_0>,
32+
<&spi0_lpcg IMX_LPCG_CLK_4>;
3333
clock-names = "per", "ipg";
3434
assigned-clocks = <&clk IMX_SC_R_SPI_0 IMX_SC_PM_CLK_PER>;
3535
assigned-clock-rates = <60000000>;
@@ -44,8 +44,8 @@ dma_subsys: bus@5a000000 {
4444
#size-cells = <0>;
4545
interrupts = <GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>;
4646
interrupt-parent = <&gic>;
47-
clocks = <&spi1_lpcg 0>,
48-
<&spi1_lpcg 1>;
47+
clocks = <&spi1_lpcg IMX_LPCG_CLK_0>,
48+
<&spi1_lpcg IMX_LPCG_CLK_4>;
4949
clock-names = "per", "ipg";
5050
assigned-clocks = <&clk IMX_SC_R_SPI_1 IMX_SC_PM_CLK_PER>;
5151
assigned-clock-rates = <60000000>;
@@ -60,8 +60,8 @@ dma_subsys: bus@5a000000 {
6060
#size-cells = <0>;
6161
interrupts = <GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH>;
6262
interrupt-parent = <&gic>;
63-
clocks = <&spi2_lpcg 0>,
64-
<&spi2_lpcg 1>;
63+
clocks = <&spi2_lpcg IMX_LPCG_CLK_0>,
64+
<&spi2_lpcg IMX_LPCG_CLK_4>;
6565
clock-names = "per", "ipg";
6666
assigned-clocks = <&clk IMX_SC_R_SPI_2 IMX_SC_PM_CLK_PER>;
6767
assigned-clock-rates = <60000000>;
@@ -76,8 +76,8 @@ dma_subsys: bus@5a000000 {
7676
#size-cells = <0>;
7777
interrupts = <GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH>;
7878
interrupt-parent = <&gic>;
79-
clocks = <&spi3_lpcg 0>,
80-
<&spi3_lpcg 1>;
79+
clocks = <&spi3_lpcg IMX_LPCG_CLK_0>,
80+
<&spi3_lpcg IMX_LPCG_CLK_4>;
8181
clock-names = "per", "ipg";
8282
assigned-clocks = <&clk IMX_SC_R_SPI_3 IMX_SC_PM_CLK_PER>;
8383
assigned-clock-rates = <60000000>;
@@ -145,8 +145,8 @@ dma_subsys: bus@5a000000 {
145145
compatible = "fsl,imx8qxp-pwm", "fsl,imx27-pwm";
146146
reg = <0x5a190000 0x1000>;
147147
interrupts = <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
148-
clocks = <&adma_pwm_lpcg 1>,
149-
<&adma_pwm_lpcg 0>;
148+
clocks = <&adma_pwm_lpcg IMX_LPCG_CLK_4>,
149+
<&adma_pwm_lpcg IMX_LPCG_CLK_0>;
150150
clock-names = "ipg", "per";
151151
assigned-clocks = <&clk IMX_SC_R_LCD_0_PWM_0 IMX_SC_PM_CLK_PER>;
152152
assigned-clock-rates = <24000000>;
@@ -355,8 +355,8 @@ dma_subsys: bus@5a000000 {
355355
reg = <0x5a880000 0x10000>;
356356
interrupts = <GIC_SPI 240 IRQ_TYPE_LEVEL_HIGH>;
357357
interrupt-parent = <&gic>;
358-
clocks = <&adc0_lpcg 0>,
359-
<&adc0_lpcg 1>;
358+
clocks = <&adc0_lpcg IMX_LPCG_CLK_0>,
359+
<&adc0_lpcg IMX_LPCG_CLK_4>;
360360
clock-names = "per", "ipg";
361361
assigned-clocks = <&clk IMX_SC_R_ADC_0 IMX_SC_PM_CLK_PER>;
362362
assigned-clock-rates = <24000000>;
@@ -370,8 +370,8 @@ dma_subsys: bus@5a000000 {
370370
reg = <0x5a890000 0x10000>;
371371
interrupts = <GIC_SPI 241 IRQ_TYPE_LEVEL_HIGH>;
372372
interrupt-parent = <&gic>;
373-
clocks = <&adc1_lpcg 0>,
374-
<&adc1_lpcg 1>;
373+
clocks = <&adc1_lpcg IMX_LPCG_CLK_0>,
374+
<&adc1_lpcg IMX_LPCG_CLK_4>;
375375
clock-names = "per", "ipg";
376376
assigned-clocks = <&clk IMX_SC_R_ADC_1 IMX_SC_PM_CLK_PER>;
377377
assigned-clock-rates = <24000000>;
@@ -384,8 +384,8 @@ dma_subsys: bus@5a000000 {
384384
reg = <0x5a8d0000 0x10000>;
385385
interrupts = <GIC_SPI 235 IRQ_TYPE_LEVEL_HIGH>;
386386
interrupt-parent = <&gic>;
387-
clocks = <&can0_lpcg 1>,
388-
<&can0_lpcg 0>;
387+
clocks = <&can0_lpcg IMX_LPCG_CLK_4>,
388+
<&can0_lpcg IMX_LPCG_CLK_0>;
389389
clock-names = "ipg", "per";
390390
assigned-clocks = <&clk IMX_SC_R_CAN_0 IMX_SC_PM_CLK_PER>;
391391
assigned-clock-rates = <40000000>;
@@ -405,8 +405,8 @@ dma_subsys: bus@5a000000 {
405405
* CAN1 shares CAN0's clock and to enable CAN0's clock it
406406
* has to be powered on.
407407
*/
408-
clocks = <&can0_lpcg 1>,
409-
<&can0_lpcg 0>;
408+
clocks = <&can0_lpcg IMX_LPCG_CLK_4>,
409+
<&can0_lpcg IMX_LPCG_CLK_0>;
410410
clock-names = "ipg", "per";
411411
assigned-clocks = <&clk IMX_SC_R_CAN_0 IMX_SC_PM_CLK_PER>;
412412
assigned-clock-rates = <40000000>;
@@ -426,8 +426,8 @@ dma_subsys: bus@5a000000 {
426426
* CAN2 shares CAN0's clock and to enable CAN0's clock it
427427
* has to be powered on.
428428
*/
429-
clocks = <&can0_lpcg 1>,
430-
<&can0_lpcg 0>;
429+
clocks = <&can0_lpcg IMX_LPCG_CLK_4>,
430+
<&can0_lpcg IMX_LPCG_CLK_0>;
431431
clock-names = "ipg", "per";
432432
assigned-clocks = <&clk IMX_SC_R_CAN_0 IMX_SC_PM_CLK_PER>;
433433
assigned-clock-rates = <40000000>;

‎arch/arm64/boot/dts/freescale/imx8-ss-lsio.dtsi‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ lsio_subsys: bus@5d000000 {
2525
compatible = "fsl,imx27-pwm";
2626
reg = <0x5d000000 0x10000>;
2727
clock-names = "ipg", "per";
28-
clocks = <&pwm0_lpcg 4>,
29-
<&pwm0_lpcg 1>;
28+
clocks = <&pwm0_lpcg IMX_LPCG_CLK_6>,
29+
<&pwm0_lpcg IMX_LPCG_CLK_1>;
3030
assigned-clocks = <&clk IMX_SC_R_PWM_0 IMX_SC_PM_CLK_PER>;
3131
assigned-clock-rates = <24000000>;
3232
#pwm-cells = <3>;
@@ -38,8 +38,8 @@ lsio_subsys: bus@5d000000 {
3838
compatible = "fsl,imx27-pwm";
3939
reg = <0x5d010000 0x10000>;
4040
clock-names = "ipg", "per";
41-
clocks = <&pwm1_lpcg 4>,
42-
<&pwm1_lpcg 1>;
41+
clocks = <&pwm1_lpcg IMX_LPCG_CLK_6>,
42+
<&pwm1_lpcg IMX_LPCG_CLK_1>;
4343
assigned-clocks = <&clk IMX_SC_R_PWM_1 IMX_SC_PM_CLK_PER>;
4444
assigned-clock-rates = <24000000>;
4545
#pwm-cells = <3>;
@@ -51,8 +51,8 @@ lsio_subsys: bus@5d000000 {
5151
compatible = "fsl,imx27-pwm";
5252
reg = <0x5d020000 0x10000>;
5353
clock-names = "ipg", "per";
54-
clocks = <&pwm2_lpcg 4>,
55-
<&pwm2_lpcg 1>;
54+
clocks = <&pwm2_lpcg IMX_LPCG_CLK_6>,
55+
<&pwm2_lpcg IMX_LPCG_CLK_1>;
5656
assigned-clocks = <&clk IMX_SC_R_PWM_2 IMX_SC_PM_CLK_PER>;
5757
assigned-clock-rates = <24000000>;
5858
#pwm-cells = <3>;
@@ -64,8 +64,8 @@ lsio_subsys: bus@5d000000 {
6464
compatible = "fsl,imx27-pwm";
6565
reg = <0x5d030000 0x10000>;
6666
clock-names = "ipg", "per";
67-
clocks = <&pwm3_lpcg 4>,
68-
<&pwm3_lpcg 1>;
67+
clocks = <&pwm3_lpcg IMX_LPCG_CLK_6>,
68+
<&pwm3_lpcg IMX_LPCG_CLK_1>;
6969
assigned-clocks = <&clk IMX_SC_R_PWM_3 IMX_SC_PM_CLK_PER>;
7070
assigned-clock-rates = <24000000>;
7171
#pwm-cells = <3>;

‎arch/arm64/boot/dts/freescale/imx8mp-venice-gw72xx.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
pinctrl-0 = <&pinctrl_usbcon1>;
1515
type = "micro";
1616
label = "otg";
17+
vbus-supply = <&reg_usb1_vbus>;
1718
id-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;
1819

1920
port {
@@ -183,7 +184,6 @@
183184
};
184185

185186
&usb3_phy0 {
186-
vbus-supply = <&reg_usb1_vbus>;
187187
status = "okay";
188188
};
189189

‎arch/arm64/boot/dts/freescale/imx8mp-venice-gw73xx.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
pinctrl-0 = <&pinctrl_usbcon1>;
1515
type = "micro";
1616
label = "otg";
17+
vbus-supply = <&reg_usb1_vbus>;
1718
id-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;
1819

1920
port {
@@ -202,7 +203,6 @@
202203
};
203204

204205
&usb3_phy0 {
205-
vbus-supply = <&reg_usb1_vbus>;
206206
status = "okay";
207207
};
208208

‎arch/arm64/boot/dts/freescale/imx8qm-ss-dma.dtsi‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,15 +153,15 @@
153153
};
154154

155155
&flexcan2 {
156-
clocks = <&can1_lpcg 1>,
157-
<&can1_lpcg 0>;
156+
clocks = <&can1_lpcg IMX_LPCG_CLK_4>,
157+
<&can1_lpcg IMX_LPCG_CLK_0>;
158158
assigned-clocks = <&clk IMX_SC_R_CAN_1 IMX_SC_PM_CLK_PER>;
159159
fsl,clk-source = /bits/ 8 <1>;
160160
};
161161

162162
&flexcan3 {
163-
clocks = <&can2_lpcg 1>,
164-
<&can2_lpcg 0>;
163+
clocks = <&can2_lpcg IMX_LPCG_CLK_4>,
164+
<&can2_lpcg IMX_LPCG_CLK_0>;
165165
assigned-clocks = <&clk IMX_SC_R_CAN_2 IMX_SC_PM_CLK_PER>;
166166
fsl,clk-source = /bits/ 8 <1>;
167167
};

0 commit comments

Comments
 (0)