Skip to content

Commit 9c8b0a9

Browse files
committed
Merge tag 'imx-fixes-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes
i.MX fixes for 5.9: - Fix QuadSPI-memory 'reg' for LS1021A and GPIO 'ranges' for i.MX7ULP pinctrl. - A couple of DTC warning fixes on imx6qdl-gw51xx and imx6q-prtwd2 boards. - Add missing imx8mm-beacon-kit.dtb to dtbs-y for build coverage. - Fix broken PWM settings on imx6q-logicpd board. - Add missing syscon compatible to OCOTP device, so that access to UID is possible. - Fix a network regression on imx7d-zii-rmu2 due to a phy-mode mismatch. * tag 'imx-fixes-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: dts: imx7d-zii-rmu2: fix rgmii phy-mode for ksz9031 phy ARM: dts: vfxxx: Add syscon compatible with OCOTP ARM: dts: imx6q-logicpd: Fix broken PWM arm64: dts: imx: Add missing imx8mm-beacon-kit.dtb to build ARM: dts: imx6q-prtwd2: Remove unneeded i2c unit name ARM: dts: imx6qdl-gw51xx: Remove unneeded #address-cells/#size-cells ARM: dts: imx7ulp: Correct gpio ranges ARM: dts: ls1021a: fix QuadSPI-memory reg range Link: https://lore.kernel.org/r/20200824130359.GF12776@dragon Signed-off-by: Olof Johansson <olof@lixom.net>
2 parents cabe3a1 + 5cbb80d commit 9c8b0a9

File tree

8 files changed

+10
-11
lines changed

8 files changed

+10
-11
lines changed

arch/arm/boot/dts/imx6q-logicpd.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
backlight: backlight-lvds {
1515
compatible = "pwm-backlight";
16-
pwms = <&pwm3 0 20000>;
16+
pwms = <&pwm3 0 20000 0>;
1717
brightness-levels = <0 4 8 16 32 64 128 255>;
1818
default-brightness-level = <6>;
1919
power-supply = <&reg_lcd>;

arch/arm/boot/dts/imx6q-prtwd2.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
};
3131

3232
/* PRTWD2 rev 1 bitbang I2C for Ethernet Switch */
33-
i2c@4 {
33+
i2c {
3434
compatible = "i2c-gpio";
3535
pinctrl-names = "default";
3636
pinctrl-0 = <&pinctrl_i2c4>;

arch/arm/boot/dts/imx6qdl-gw51xx.dtsi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222

2323
gpio-keys {
2424
compatible = "gpio-keys";
25-
#address-cells = <1>;
26-
#size-cells = <0>;
2725

2826
user-pb {
2927
label = "user_pb";

arch/arm/boot/dts/imx7d-zii-rmu2.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<&clks IMX7D_ENET1_TIME_ROOT_CLK>;
5959
assigned-clock-parents = <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>;
6060
assigned-clock-rates = <0>, <100000000>;
61-
phy-mode = "rgmii";
61+
phy-mode = "rgmii-id";
6262
phy-handle = <&fec1_phy>;
6363
status = "okay";
6464

arch/arm/boot/dts/imx7ulp.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@
394394
clocks = <&pcc2 IMX7ULP_CLK_RGPIO2P1>,
395395
<&pcc3 IMX7ULP_CLK_PCTLC>;
396396
clock-names = "gpio", "port";
397-
gpio-ranges = <&iomuxc1 0 0 32>;
397+
gpio-ranges = <&iomuxc1 0 0 20>;
398398
};
399399

400400
gpio_ptd: gpio@40af0000 {
@@ -408,7 +408,7 @@
408408
clocks = <&pcc2 IMX7ULP_CLK_RGPIO2P1>,
409409
<&pcc3 IMX7ULP_CLK_PCTLD>;
410410
clock-names = "gpio", "port";
411-
gpio-ranges = <&iomuxc1 0 32 32>;
411+
gpio-ranges = <&iomuxc1 0 32 12>;
412412
};
413413

414414
gpio_pte: gpio@40b00000 {
@@ -422,7 +422,7 @@
422422
clocks = <&pcc2 IMX7ULP_CLK_RGPIO2P1>,
423423
<&pcc3 IMX7ULP_CLK_PCTLE>;
424424
clock-names = "gpio", "port";
425-
gpio-ranges = <&iomuxc1 0 64 32>;
425+
gpio-ranges = <&iomuxc1 0 64 16>;
426426
};
427427

428428
gpio_ptf: gpio@40b10000 {
@@ -436,7 +436,7 @@
436436
clocks = <&pcc2 IMX7ULP_CLK_RGPIO2P1>,
437437
<&pcc3 IMX7ULP_CLK_PCTLF>;
438438
clock-names = "gpio", "port";
439-
gpio-ranges = <&iomuxc1 0 96 32>;
439+
gpio-ranges = <&iomuxc1 0 96 20>;
440440
};
441441
};
442442

arch/arm/boot/dts/ls1021a.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
#address-cells = <1>;
183183
#size-cells = <0>;
184184
reg = <0x0 0x1550000 0x0 0x10000>,
185-
<0x0 0x40000000 0x0 0x40000000>;
185+
<0x0 0x40000000 0x0 0x20000000>;
186186
reg-names = "QuadSPI", "QuadSPI-memory";
187187
interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;
188188
clock-names = "qspi_en", "qspi";

arch/arm/boot/dts/vfxxx.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@
495495
};
496496

497497
ocotp: ocotp@400a5000 {
498-
compatible = "fsl,vf610-ocotp";
498+
compatible = "fsl,vf610-ocotp", "syscon";
499499
reg = <0x400a5000 0x1000>;
500500
clocks = <&clks VF610_CLK_OCOTP>;
501501
};

arch/arm64/boot/dts/freescale/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-honeycomb.dtb
2828
dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-qds.dtb
2929
dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-rdb.dtb
3030

31+
dtb-$(CONFIG_ARCH_MXC) += imx8mm-beacon-kit.dtb
3132
dtb-$(CONFIG_ARCH_MXC) += imx8mm-evk.dtb
3233
dtb-$(CONFIG_ARCH_MXC) += imx8mn-evk.dtb
3334
dtb-$(CONFIG_ARCH_MXC) += imx8mn-ddr4-evk.dtb

0 commit comments

Comments
 (0)