From: Olof Johansson Date: Sun, 9 Dec 2018 18:26:36 +0000 (-0800) Subject: Merge tag 'imx-fixes-4.20-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawngu... X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=69dcddecaa78a8765705cdf3eefc1b56f383dedc;p=openwrt%2Fstaging%2Fblogic.git Merge tag 'imx-fixes-4.20-3' of git://git./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: Olof Johansson --- 69dcddecaa78a8765705cdf3eefc1b56f383dedc