UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
 -----BEGIN PGP SIGNATURE-----
 
 iQFIBAABCgAyFiEEFmJXigPl4LoGSz08UFdYWoewfM4FAmQuKr0UHHNoYXduZ3Vv
 QGtlcm5lbC5vcmcACgkQUFdYWoewfM65nQgAgp0xA4VOc/4zgazrhIhzYru/E2Q/
 Acd4Rthp7aUATWXjQH1bGM0nNdgp+SLHAarpxysVY0DTXlE92h0eYY+mUohAeX7p
 X/aXY3OlcmXwq8VqZvUsgmgjIugDpp+T86yH7yEWR2/cdqRtX8A7E4NBCEvQa4PC
 YkyDMc+Vn9JUxry+oKVdbQ9GKG7UEhFmoyuN0kq1wuua8iKBqsq3CSkH74aRHxbF
 EpHVSLMUGflAHILofqcZoix+UGR7bV5xBypVh6APCLJhlx9vjk5R+rPVzvpvWUJz
 N8+R8iS9YCSAx8BSYIPM1vqGq3dDB0wjrjpdAhCmc2lwOOIvtkB2516VkA==
 =XK6g
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmQugGEACgkQmmx57+YA
 GNm01w/+I7uc4gGa72VFhDA9TPCIw0Yz47qSHE+Up2UHg3GOEuNaxLER6kCFdxHE
 ZCEHxvl+u6rM99GU2bPeCbcHa8Ig0wksGTbAG2EmsfAjoZfpCyNYGQP02hPIOYhV
 dPs57iol6KLOExWejdLvLM73viY9gJa+rAlS27aOxAtwgaWtlK2ZbjUCBV8EQ1Db
 UFAu3R4Rd517ohNmn9e1x9QJcW03KnNO34wVZNV0siNLLYdVg7FAvsTvNX7JMwCi
 QmWYZFaEKtXbWsZM3QgSjQvqx98/KY3JGIxhhYD9nq00hd6VRLeMETHPvO/6v9mw
 OtEFXvTLmAUxXGYdP8eZ4vQEe7QaBLD1WTRD/iAGf0EPuV6lws5tNf9RsziCmcdB
 8bw7lBJByqIqA2OCVwhFBUq4ZvBChN9ftxpkGsxE+2FBKkYgn0ki6Tyw+iZAhWyV
 /Nku/cQePyE/4kPe/9Jpt4MlGdsISvL9ZReLY60fe5z433m6vA5p7G2ajENI0RjC
 EsM/I8b7hGCFmEGKbsS+xHa36FwJpCSIQisZWvS8SGrB6sNnhQOg+MVjyKo/bTz9
 1Amq4R4CQQDF76ocHM0pYbUr6cc/hL8oirqzjg74ISivOHxixULMElivpOycCb9x
 pf1AUzlgmXexN92WX0CdhG7AHhBTRPP/UcvUlTabKbimXzB112o=
 =or6G
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Arnd Bergmann 2023-04-06 10:18:39 +02:00
parent a3c40af4a7 86d5b27b37
commit a425efcb6e
8 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/boot/dts/imx6ull-colibri.dtsi
View File

@ -33,15 +33,9 @@
self-powered;
type = "micro";
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
usb_dr_connector: endpoint {
remote-endpoint = <&usb1_drd_sw>;
};
port {
usb_dr_connector: endpoint {
remote-endpoint = <&usb1_drd_sw>;
};
};
};

2
arch/arm/boot/dts/imx7d-remarkable2.dts
View File

@ -118,8 +118,6 @@
reg = <0x62>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_epdpmic>;
#address-cells = <1>;
#size-cells = <0>;
#thermal-sensor-cells = <0>;
epd-pwr-good-gpios = <&gpio6 21 GPIO_ACTIVE_HIGH>;

2
arch/arm/configs/imx_v6_v7_defconfig
View File

@ -76,7 +76,7 @@ CONFIG_RFKILL=y
CONFIG_RFKILL_INPUT=y
CONFIG_PCI=y
CONFIG_PCI_MSI=y
CONFIG_PCI_IMX6=y
CONFIG_PCI_IMX6_HOST=y
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_STANDALONE is not set

2
arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi
View File

@ -194,7 +194,7 @@
rohm,reset-snvs-powered;
#clock-cells = <0>;
clocks = <&osc_32k 0>;
clocks = <&osc_32k>;
clock-output-names = "clk-32k-out";
regulators {

4
arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi
View File

@ -99,7 +99,7 @@
compatible = "regulator-fixed";
enable-active-high;
gpio = <&gpio2 20 GPIO_ACTIVE_HIGH>; /* PMIC_EN_ETH */
off-on-delay = <500000>;
off-on-delay-us = <500000>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_reg_eth>;
regulator-always-on;
@ -139,7 +139,7 @@
enable-active-high;
/* Verdin SD_1_PWR_EN (SODIMM 76) */
gpio = <&gpio3 5 GPIO_ACTIVE_HIGH>;
off-on-delay = <100000>;
off-on-delay-us = <100000>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc2_pwr_en>;
regulator-max-microvolt = <3300000>;

2
arch/arm64/boot/dts/freescale/imx8mp-verdin-dev.dtsi
View File

@ -10,7 +10,7 @@
compatible = "regulator-fixed";
enable-active-high;
gpio = <&gpio_expander_21 4 GPIO_ACTIVE_HIGH>; /* ETH_PWR_EN */
off-on-delay = <500000>;
off-on-delay-us = <500000>;
regulator-max-microvolt = <3300000>;
regulator-min-microvolt = <3300000>;
regulator-name = "+V3.3_ETH";

4
arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi
View File

@ -87,7 +87,7 @@
compatible = "regulator-fixed";
enable-active-high;
gpio = <&gpio2 20 GPIO_ACTIVE_HIGH>; /* PMIC_EN_ETH */
off-on-delay = <500000>;
off-on-delay-us = <500000>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_reg_eth>;
regulator-always-on;
@ -128,7 +128,7 @@
enable-active-high;
/* Verdin SD_1_PWR_EN (SODIMM 76) */
gpio = <&gpio4 22 GPIO_ACTIVE_HIGH>;
off-on-delay = <100000>;
off-on-delay-us = <100000>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc2_pwr_en>;
regulator-max-microvolt = <3300000>;

2
arch/arm64/boot/dts/freescale/imx8mp.dtsi
View File

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