Commit 69dcddec authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-fixes-4.20-3' of... 

Merge tag 'imx-fixes-4.20-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes

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.

* tag 'imx-fixes-4.20-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

:
  ARM: dts: imx7d-nitrogen7: Fix the description of the Wifi clock
  ARM: imx: update the cpu power up timing setting on i.mx6sx
  ARM: dts: imx7d-pico: Describe the Wifi clock

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents d9536e80 f15096f1

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

+7 −2
Original line number Diff line number Diff line
@@ -86,13 +86,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 {
@@ -375,6 +379,7 @@ 
	bus-width = <4>;

	non-removable;

	vmmc-supply = <&reg_wlan>;

	mmc-pwrseq = <&usdhc2_pwrseq>;

	cap-power-off-card;

	keep-power-in-suspend;

	status = "okay";

arch/arm/boot/dts/imx7d-pico.dtsi

+21 −1
Original line number Diff line number Diff line
@@ -100,6 +100,19 @@ 
		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};



	usdhc2_pwrseq: usdhc2_pwrseq {

		compatible = "mmc-pwrseq-simple";

		clocks = <&clks IMX7D_CLKO2_ROOT_DIV>;

		clock-names = "ext_clock";

	};

};



&clks {

	assigned-clocks = <&clks IMX7D_CLKO2_ROOT_SRC>,

			  <&clks IMX7D_CLKO2_ROOT_DIV>;

	assigned-clock-parents = <&clks IMX7D_CKIL>;

	assigned-clock-rates = <0>, <32768>;

};



&i2c4 {
@@ -199,12 +212,13 @@ 


&usdhc2 { /* Wifi SDIO */

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usdhc2>;

	pinctrl-0 = <&pinctrl_usdhc2 &pinctrl_wifi_clk>;

	no-1-8-v;

	non-removable;

	keep-power-in-suspend;

	wakeup-source;

	vmmc-supply = <&reg_ap6212>;

	mmc-pwrseq = <&usdhc2_pwrseq>;

	status = "okay";

};
@@ -301,6 +315,12 @@ 
};



&iomuxc_lpsr {

	pinctrl_wifi_clk: wificlkgrp {

		fsl,pins = <

			MX7D_PAD_LPSR_GPIO1_IO03__CCM_CLKO2	0x7d

		>;

	};



	pinctrl_wdog: wdoggrp {

		fsl,pins = <

			MX7D_PAD_LPSR_GPIO1_IO00__WDOG1_WDOG_B	0x74

arch/arm/mach-imx/cpuidle-imx6sx.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ int __init imx6sx_cpuidle_init(void) 
	 * except for power up sw2iso which need to be

	 * larger than LDO ramp up time.

	 */

	imx_gpc_set_arm_power_up_timing(2, 1);

	imx_gpc_set_arm_power_up_timing(0xf, 1);

	imx_gpc_set_arm_power_down_timing(1, 1);



	return cpuidle_register(&imx6sx_cpuidle_driver, NULL);

CRA Git | Maintained and supported by SUSTech CRA and CCSE