Commit 2e856610 authored by Shawn Guo's avatar Shawn Guo
Browse files

Merge tag 'imx-fixes-4.20-3' into imx7d/pico 

i.MX fixes for 4.20, round 3:
 - A couple of fixes on imx7d-pico and imx7d-nitrogen7 boards to correct
   the description of the Wifi clock.
 - Change SW2ISO count to get a safer ARM LDO ramp-up time, so that
   different boards can be covered. This fixes the ARM LDO failure seen
   on some customer boards.
parents 79da07de f15096f1

arch/arm/boot/dts/imx51-zii-rdu1.dts

+0 −6
Original line number Diff line number Diff line
@@ -502,12 +502,6 @@ 
	pinctrl-0 = <&pinctrl_i2c2>;

	status = "okay";



	eeprom@50 {

		compatible = "atmel,24c04";

		pagesize = <16>;

		reg = <0x50>;

	};



	hpa1: amp@60 {

		compatible = "ti,tpa6130a2";

		reg = <0x60>;

arch/arm/boot/dts/imx53-ppd.dts

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
	};



	chosen {

		stdout-path = "&uart1:115200n8";

		stdout-path = "serial0:115200n8";

	};



	memory@70000000 {

arch/arm/boot/dts/imx6sll.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -739,7 +739,7 @@ 
			i2c1: i2c@21a0000 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "fs,imx6sll-i2c", "fsl,imx21-i2c";

				compatible = "fsl,imx6sll-i2c", "fsl,imx21-i2c";

				reg = <0x021a0000 0x4000>;

				interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX6SLL_CLK_I2C1>;

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

+6 −1
Original line number Diff line number Diff line
@@ -114,7 +114,9 @@ 
		regulator-name = "enet_3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;

		gpio = <&gpio2 6 GPIO_ACTIVE_LOW>;

		regulator-boot-on;

		regulator-always-on;

	};



	reg_pcie_gpio: regulator-pcie-gpio {
@@ -191,6 +193,7 @@ 
	phy-supply = <&reg_enet_3v3>;

	phy-mode = "rgmii";

	phy-handle = <&ethphy1>;

	phy-reset-gpios = <&gpio2 7 GPIO_ACTIVE_LOW>;

	status = "okay";



	mdio {
@@ -398,6 +401,8 @@ 
				MX6SX_PAD_RGMII1_RD3__ENET1_RX_DATA_3	0x3081

				MX6SX_PAD_RGMII1_RX_CTL__ENET1_RX_EN	0x3081

				MX6SX_PAD_ENET2_RX_CLK__ENET2_REF_CLK_25M	0x91

				/* phy reset */

				MX6SX_PAD_ENET2_CRS__GPIO2_IO_7		0x10b0

			>;

		};

arch/arm/boot/dts/imx7d-nitrogen7.dts

+7 −2
Original line number Diff line number Diff line
@@ -87,13 +87,17 @@ 
		compatible = "regulator-fixed";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		clocks = <&clks IMX7D_CLKO2_ROOT_DIV>;

		clock-names = "slow";

		regulator-name = "reg_wlan";

		startup-delay-us = <70000>;

		gpio = <&gpio4 21 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};



	usdhc2_pwrseq: usdhc2_pwrseq {

		compatible = "mmc-pwrseq-simple";

		clocks = <&clks IMX7D_CLKO2_ROOT_DIV>;

		clock-names = "ext_clock";

	};

};



&adc1 {
@@ -376,6 +380,7 @@ 
	bus-width = <4>;

	non-removable;

	vmmc-supply = <&reg_wlan>;

	mmc-pwrseq = <&usdhc2_pwrseq>;

	cap-power-off-card;

	keep-power-in-suspend;

	status = "okay";

CRA Git | Maintained and supported by SUSTech CRA and CCSE