Skip to content

Commit 72cd4e3

Browse files
committed
Merge tag 'imx-fixes-5.15-4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes
i.MX fixes for 5.15, round 4: - A series from Frieder Schrempf to fix i.MX8MM Kontron N801x board on various aspects, voltage settings, GPIO polarity, SPI clock frequency and Ethernet PHY type. * tag 'imx-fixes-5.15-4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: arm64: dts: imx8mm-kontron: Fix connection type for VSC8531 RGMII PHY arm64: dts: imx8mm-kontron: Fix CAN SPI clock frequency arm64: dts: imx8mm-kontron: Fix polarity of reg_rst_eth2 arm64: dts: imx8mm-kontron: Set lower limit of VDD_SNVS to 800 mV arm64: dts: imx8mm-kontron: Make sure SOC and DRAM supply voltages are correct Link: https://lore.kernel.org/r/20211018000958.GC25810@dragon Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 519d819 + 0b28c41 commit 72cd4e3

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-s.dts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@
7070
regulator-name = "rst-usb-eth2";
7171
pinctrl-names = "default";
7272
pinctrl-0 = <&pinctrl_usb_eth2>;
73-
gpio = <&gpio3 2 GPIO_ACTIVE_LOW>;
73+
gpio = <&gpio3 2 GPIO_ACTIVE_HIGH>;
74+
enable-active-high;
75+
regulator-always-on;
7476
};
7577

7678
reg_vdd_5v: regulator-5v {
@@ -95,7 +97,7 @@
9597
clocks = <&osc_can>;
9698
interrupt-parent = <&gpio4>;
9799
interrupts = <28 IRQ_TYPE_EDGE_FALLING>;
98-
spi-max-frequency = <100000>;
100+
spi-max-frequency = <10000000>;
99101
vdd-supply = <&reg_vdd_3v3>;
100102
xceiver-supply = <&reg_vdd_5v>;
101103
};
@@ -111,7 +113,7 @@
111113
&fec1 {
112114
pinctrl-names = "default";
113115
pinctrl-0 = <&pinctrl_enet>;
114-
phy-connection-type = "rgmii";
116+
phy-connection-type = "rgmii-rxid";
115117
phy-handle = <&ethphy>;
116118
status = "okay";
117119

arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-som.dtsi

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,12 @@
9191
reg_vdd_soc: BUCK1 {
9292
regulator-name = "buck1";
9393
regulator-min-microvolt = <800000>;
94-
regulator-max-microvolt = <900000>;
94+
regulator-max-microvolt = <850000>;
9595
regulator-boot-on;
9696
regulator-always-on;
9797
regulator-ramp-delay = <3125>;
98+
nxp,dvs-run-voltage = <850000>;
99+
nxp,dvs-standby-voltage = <800000>;
98100
};
99101

100102
reg_vdd_arm: BUCK2 {
@@ -111,7 +113,7 @@
111113
reg_vdd_dram: BUCK3 {
112114
regulator-name = "buck3";
113115
regulator-min-microvolt = <850000>;
114-
regulator-max-microvolt = <900000>;
116+
regulator-max-microvolt = <950000>;
115117
regulator-boot-on;
116118
regulator-always-on;
117119
};
@@ -150,7 +152,7 @@
150152

151153
reg_vdd_snvs: LDO2 {
152154
regulator-name = "ldo2";
153-
regulator-min-microvolt = <850000>;
155+
regulator-min-microvolt = <800000>;
154156
regulator-max-microvolt = <900000>;
155157
regulator-boot-on;
156158
regulator-always-on;

0 commit comments

Comments
 (0)