Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 679bfef0 authored by Valentin Longchamp's avatar Valentin Longchamp Committed by Sascha Hauer
Browse files

MXC: fix reset for mx31, mx35 and mx27 SoCs 



The clock name for the watchdog devices was not set consistently
with mx21 on these platforms, resulting in the reset not to work.

Signed-off-by: default avatarValentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent d9e8b884

arch/arm/mach-mx2/clock_imx27.c

+1 −1
Original line number Diff line number Diff line
@@ -665,7 +665,7 @@ static struct clk_lookup lookups[] = { 
	_REGISTER_CLOCK(NULL, "sahara2", sahara2_clk)

	_REGISTER_CLOCK(NULL, "ata", ata_clk)

	_REGISTER_CLOCK(NULL, "mstick", mstick_clk)

	_REGISTER_CLOCK(NULL, "wdog", wdog_clk)

	_REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk)

	_REGISTER_CLOCK(NULL, "gpio", gpio_clk)

	_REGISTER_CLOCK("imx-i2c.0", NULL, i2c1_clk)

	_REGISTER_CLOCK("imx-i2c.1", NULL, i2c2_clk)

arch/arm/mach-mx3/clock-imx35.c

+1 −1
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ static struct clk_lookup lookups[] = { 
	_REGISTER_CLOCK("mxc-ehci.1", "usb", usbotg_clk)

	_REGISTER_CLOCK("mxc-ehci.2", "usb", usbotg_clk)

	_REGISTER_CLOCK("fsl-usb2-udc", "usb", usbotg_clk)

	_REGISTER_CLOCK("mxc_wdt.0", NULL, wdog_clk)

	_REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk)

	_REGISTER_CLOCK(NULL, "max", max_clk)

	_REGISTER_CLOCK(NULL, "admux", admux_clk)

	_REGISTER_CLOCK(NULL, "csi", csi_clk)

arch/arm/mach-mx3/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -530,7 +530,7 @@ static struct clk_lookup lookups[] = { 
	_REGISTER_CLOCK("spi_imx.2", NULL, cspi3_clk)

	_REGISTER_CLOCK(NULL, "gpt", gpt_clk)

	_REGISTER_CLOCK(NULL, "pwm", pwm_clk)

	_REGISTER_CLOCK(NULL, "wdog", wdog_clk)

	_REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk)

	_REGISTER_CLOCK(NULL, "rtc", rtc_clk)

	_REGISTER_CLOCK(NULL, "epit", epit1_clk)

	_REGISTER_CLOCK(NULL, "epit", epit2_clk)