Skip to content

Commit a425efc

Browse files
arndbarndb
committed
Merge tag 'imx-fixes-6.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes
i.MX fixes for 6.3, 2nd round: - Fix 'reg' address length for i.MX8MP LCDIF2 device. - A couple of changes from Fabio Estevam to fix DTC warnings caused unnecessary address/size cells. - Re-enable PCI driver support in imx_v6_v7_defconfig. - Fix PMIC clock source property for imx8mm-evk board. - A couple of fixes from Peng Fan to correct off-on delay property for i.MX8 Verdin boards. * tag 'imx-fixes-6.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx_v6_v7_defconfig: Fix unintentional disablement of PCI ARM: dts: imx6ull-colibri: Remove unnecessary #address-cells/#size-cells ARM: dts: imx7d-remarkable2: Remove unnecessary #address-cells/#size-cells arm64: dts: imx8mp-verdin: correct off-on-delay arm64: dts: imx8mm-verdin: correct off-on-delay arm64: dts: imx8mm-evk: correct pmic clock source arm64: dts: imx8mp: fix address length for LCDIF2 Link: https://lore.kernel.org/r/20230406021602.GP11367@dragon Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents a3c40af + 86d5b27 commit a425efc

8 files changed

Lines changed: 11 additions & 19 deletions

File tree

‎arch/arm/boot/dts/imx6ull-colibri.dtsi‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,9 @@
3333
self-powered;
3434
type = "micro";
3535

36-
ports {
37-
#address-cells = <1>;
38-
#size-cells = <0>;
39-
40-
port@0 {
41-
reg = <0>;
42-
usb_dr_connector: endpoint {
43-
remote-endpoint = <&usb1_drd_sw>;
44-
};
36+
port {
37+
usb_dr_connector: endpoint {
38+
remote-endpoint = <&usb1_drd_sw>;
4539
};
4640
};
4741
};

‎arch/arm/boot/dts/imx7d-remarkable2.dts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,6 @@
118118
reg = <0x62>;
119119
pinctrl-names = "default";
120120
pinctrl-0 = <&pinctrl_epdpmic>;
121-
#address-cells = <1>;
122-
#size-cells = <0>;
123121
#thermal-sensor-cells = <0>;
124122
epd-pwr-good-gpios = <&gpio6 21 GPIO_ACTIVE_HIGH>;
125123

‎arch/arm/configs/imx_v6_v7_defconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ CONFIG_RFKILL=y
7676
CONFIG_RFKILL_INPUT=y
7777
CONFIG_PCI=y
7878
CONFIG_PCI_MSI=y
79-
CONFIG_PCI_IMX6=y
79+
CONFIG_PCI_IMX6_HOST=y
8080
CONFIG_DEVTMPFS=y
8181
CONFIG_DEVTMPFS_MOUNT=y
8282
# CONFIG_STANDALONE is not set

‎arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@
194194
rohm,reset-snvs-powered;
195195

196196
#clock-cells = <0>;
197-
clocks = <&osc_32k 0>;
197+
clocks = <&osc_32k>;
198198
clock-output-names = "clk-32k-out";
199199

200200
regulators {

‎arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
compatible = "regulator-fixed";
100100
enable-active-high;
101101
gpio = <&gpio2 20 GPIO_ACTIVE_HIGH>; /* PMIC_EN_ETH */
102-
off-on-delay = <500000>;
102+
off-on-delay-us = <500000>;
103103
pinctrl-names = "default";
104104
pinctrl-0 = <&pinctrl_reg_eth>;
105105
regulator-always-on;
@@ -139,7 +139,7 @@
139139
enable-active-high;
140140
/* Verdin SD_1_PWR_EN (SODIMM 76) */
141141
gpio = <&gpio3 5 GPIO_ACTIVE_HIGH>;
142-
off-on-delay = <100000>;
142+
off-on-delay-us = <100000>;
143143
pinctrl-names = "default";
144144
pinctrl-0 = <&pinctrl_usdhc2_pwr_en>;
145145
regulator-max-microvolt = <3300000>;

‎arch/arm64/boot/dts/freescale/imx8mp-verdin-dev.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
compatible = "regulator-fixed";
1111
enable-active-high;
1212
gpio = <&gpio_expander_21 4 GPIO_ACTIVE_HIGH>; /* ETH_PWR_EN */
13-
off-on-delay = <500000>;
13+
off-on-delay-us = <500000>;
1414
regulator-max-microvolt = <3300000>;
1515
regulator-min-microvolt = <3300000>;
1616
regulator-name = "+V3.3_ETH";

‎arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
compatible = "regulator-fixed";
8888
enable-active-high;
8989
gpio = <&gpio2 20 GPIO_ACTIVE_HIGH>; /* PMIC_EN_ETH */
90-
off-on-delay = <500000>;
90+
off-on-delay-us = <500000>;
9191
pinctrl-names = "default";
9292
pinctrl-0 = <&pinctrl_reg_eth>;
9393
regulator-always-on;
@@ -128,7 +128,7 @@
128128
enable-active-high;
129129
/* Verdin SD_1_PWR_EN (SODIMM 76) */
130130
gpio = <&gpio4 22 GPIO_ACTIVE_HIGH>;
131-
off-on-delay = <100000>;
131+
off-on-delay-us = <100000>;
132132
pinctrl-names = "default";
133133
pinctrl-0 = <&pinctrl_usdhc2_pwr_en>;
134134
regulator-max-microvolt = <3300000>;

‎arch/arm64/boot/dts/freescale/imx8mp.dtsi‎

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

11291129
lcdif2: display-controller@32e90000 {
11301130
compatible = "fsl,imx8mp-lcdif";
1131-
reg = <0x32e90000 0x238>;
1131+
reg = <0x32e90000 0x10000>;
11321132
interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
11331133
clocks = <&clk IMX8MP_CLK_MEDIA_DISP2_PIX_ROOT>,
11341134
<&clk IMX8MP_CLK_MEDIA_APB_ROOT>,

0 commit comments

Comments
 (0)