diff options
author | Olof Johansson | 2018-12-31 20:54:03 +0100 |
---|---|---|
committer | Olof Johansson | 2018-12-31 20:54:03 +0100 |
commit | cac1fc8fb561ac766468394d49c3dd11a2b8cb44 (patch) | |
tree | 5483f72b13b766cfbd6f025d2a828fef3d1d0203 /arch/mips/ralink | |
parent | ARM: omap2: avoid section mismatch warning (diff) | |
parent | Merge tag 'renesas-fixes2-for-v4.20' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
download | kernel-qcow2-linux-cac1fc8fb561ac766468394d49c3dd11a2b8cb44.tar.gz kernel-qcow2-linux-cac1fc8fb561ac766468394d49c3dd11a2b8cb44.tar.xz kernel-qcow2-linux-cac1fc8fb561ac766468394d49c3dd11a2b8cb44.zip |
Merge branch 'fixes' into next/soc
Merge in fixes here, since the last batch didn't make it in before the
release of 4.20, and we might as well group them with this set of
patches.
* fixes: (822 commits)
arm64: dts: renesas: draak: Fix CVBS input
ARM: dts: Fix OMAP4430 SDP Ethernet startup
ARM: dts: am335x-pdu001: Fix polarity of card detection input
ARM: OMAP1: ams-delta: Fix audio permanently muted
ARM: dts: omap5: Fix dual-role mode on Super-Speed port
arm64: dts: rockchip: fix rk3399-rockpro64 regulator gpios
ARM: dts: imx7d-nitrogen7: Fix the description of the Wifi clock
ARM: imx: update the cpu power up timing setting on i.mx6sx
Revert "arm64: dts: marvell: add CPU Idle power state support on Armada 7K/8K"
ARM: dts: imx7d-pico: Describe the Wifi clock
ARM: dts: realview: Fix some more duplicate regulator nodes
MAINTAINERS: update entry for MMP platform
ARM: mmp/mmp2: fix cpu_is_mmp2() on mmp2-dt
MAINTAINERS: mediatek: Update SoC entry
ARM: dts: bcm2837: Fix polarity of wifi reset GPIOs
+ Linux 4.20-rc5
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/mips/ralink')
-rw-r--r-- | arch/mips/ralink/mt7620.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c index 41b71c4352c2..c1ce6f43642b 100644 --- a/arch/mips/ralink/mt7620.c +++ b/arch/mips/ralink/mt7620.c @@ -84,7 +84,7 @@ static struct rt2880_pmx_func pcie_rst_grp[] = { }; static struct rt2880_pmx_func nd_sd_grp[] = { FUNC("nand", MT7620_GPIO_MODE_NAND, 45, 15), - FUNC("sd", MT7620_GPIO_MODE_SD, 45, 15) + FUNC("sd", MT7620_GPIO_MODE_SD, 47, 13) }; static struct rt2880_pmx_group mt7620a_pinmux_data[] = { |