Skip to content

Commit 3f2b594

Browse files
committed
Merge tag 'imx-fixes-5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes
i.MX fixes for 5.5, round 2: - Fix i.MX8MM SDMA1 AHB clock setting to remove a "Timeout waiting for CH0" error seen with UART1. - Correct compatible of RV3029 RTC device on imx6q-dhcom board. - Correct interrupt trigger type for magnetometer on board imx8mq-librem5-devkit. - A series from Anson Huang to fix vdd3p0 power supplier for a few NXP development board. - Fix imx6q-icore-mipi board to use 1.5 version of i.Core MX6DL, so that Ethernet interface on the board works properly. - Fix Toradex Colibri board to get NAND flash support back. - Fix SGTL5000 VDDIO regulator connection for imx6q-dhcom, which is connected to PMIC SW2 output rather than a fixed 3V3 rail. - Fix 'reg' of CPU node on imx7ulp to get rid of a warning given by kernel. - Fix endian setting for DCFG on LS1028A SoC, so that register access of DCFG becomes correct. * tag 'imx-fixes-5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: dts: imx7: Fix Toradex Colibri iMX7S 256MB NAND flash support ARM: dts: imx6sll-evk: Remove incorrect power supply assignment ARM: dts: imx6sl-evk: Remove incorrect power supply assignment ARM: dts: imx6sx-sdb: Remove incorrect power supply assignment ARM: dts: imx6qdl-sabresd: Remove incorrect power supply assignment ARM: dts: imx6q-icore-mipi: Use 1.5 version of i.Core MX6DL arm64: dts: imx8mq-librem5-devkit: use correct interrupt for the magnetometer ARM: dts: imx6q-dhcom: Fix SGTL5000 VDDIO regulator connection ARM: dts: imx7ulp: fix reg of cpu node arm64: dts: imx8mm: Change SDMA1 ahb clock for imx8mm arm64: dts: ls1028a: fix endian setting for dcfg ARM: dts: imx6q-dhcom: fix rtc compatible Link: https://lore.kernel.org/r/20200110011836.GW4456@T480 Signed-off-by: Olof Johansson <[email protected]>
2 parents dc64f48 + 4b0b97e commit 3f2b594

13 files changed

+12
-28
lines changed

arch/arm/boot/dts/imx6dl-icore-mipi.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/dts-v1/;
99

1010
#include "imx6dl.dtsi"
11-
#include "imx6qdl-icore.dtsi"
11+
#include "imx6qdl-icore-1.5.dtsi"
1212

1313
/ {
1414
model = "Engicam i.CoreM6 DualLite/Solo MIPI Starter Kit";

arch/arm/boot/dts/imx6q-dhcom-pdk2.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
#sound-dai-cells = <0>;
6464
clocks = <&clk_ext_audio_codec>;
6565
VDDA-supply = <&reg_3p3v>;
66-
VDDIO-supply = <&reg_3p3v>;
66+
VDDIO-supply = <&sw2_reg>;
6767
};
6868
};
6969

arch/arm/boot/dts/imx6q-dhcom-som.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@
204204
};
205205

206206
rtc@56 {
207-
compatible = "rv3029c2";
207+
compatible = "microcrystal,rv3029";
208208
pinctrl-names = "default";
209209
pinctrl-0 = <&pinctrl_rtc_hw300>;
210210
reg = <0x56>;

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -749,10 +749,6 @@
749749
vin-supply = <&vgen5_reg>;
750750
};
751751

752-
&reg_vdd3p0 {
753-
vin-supply = <&sw2_reg>;
754-
};
755-
756752
&reg_vdd2p5 {
757753
vin-supply = <&vgen5_reg>;
758754
};

arch/arm/boot/dts/imx6sl-evk.dts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -584,10 +584,6 @@
584584
vin-supply = <&sw2_reg>;
585585
};
586586

587-
&reg_vdd3p0 {
588-
vin-supply = <&sw2_reg>;
589-
};
590-
591587
&reg_vdd2p5 {
592588
vin-supply = <&sw2_reg>;
593589
};

arch/arm/boot/dts/imx6sll-evk.dts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,10 +265,6 @@
265265
status = "okay";
266266
};
267267

268-
&reg_3p0 {
269-
vin-supply = <&sw2_reg>;
270-
};
271-
272268
&snvs_poweroff {
273269
status = "okay";
274270
};

arch/arm/boot/dts/imx6sx-sdb-reva.dts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,6 @@
159159
vin-supply = <&vgen6_reg>;
160160
};
161161

162-
&reg_vdd3p0 {
163-
vin-supply = <&sw2_reg>;
164-
};
165-
166162
&reg_vdd2p5 {
167163
vin-supply = <&vgen6_reg>;
168164
};

arch/arm/boot/dts/imx6sx-sdb.dts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,6 @@
141141
vin-supply = <&vgen6_reg>;
142142
};
143143

144-
&reg_vdd3p0 {
145-
vin-supply = <&sw2_reg>;
146-
};
147-
148144
&reg_vdd2p5 {
149145
vin-supply = <&vgen6_reg>;
150146
};

arch/arm/boot/dts/imx7s-colibri.dtsi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,7 @@
4949
reg = <0x80000000 0x10000000>;
5050
};
5151
};
52+
53+
&gpmi {
54+
status = "okay";
55+
};

arch/arm/boot/dts/imx7ulp.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
#address-cells = <1>;
3838
#size-cells = <0>;
3939

40-
cpu0: cpu@0 {
40+
cpu0: cpu@f00 {
4141
compatible = "arm,cortex-a7";
4242
device_type = "cpu";
43-
reg = <0>;
43+
reg = <0xf00>;
4444
};
4545
};
4646

0 commit comments

Comments
 (0)