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

Commit be2d6284 authored by Victor Kamensky's avatar Victor Kamensky Committed by Tony Lindgren
Browse files

ARM: OMAP: debug-leds: raw read and write endian fix



All OMAP IP blocks expect LE data, but CPU may operate in BE mode.
Need to use endian neutral functions to read/write h/w registers.
I.e instead of __raw_read[lw] and __raw_write[lw] functions code
need to use read[lw]_relaxed and write[lw]_relaxed functions.
If the first simply reads/writes register, the second will byteswap
it if host operates in BE mode.

Changes are trivial sed like replacement of __raw_xxx functions
with xxx_relaxed variant.

Signed-off-by: default avatarVictor Kamensky <victor.kamensky@linaro.org>
Signed-off-by: default avatarTaras Kondratiuk <taras.kondratiuk@linaro.org>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent f6f3b50f
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -85,12 +85,12 @@ static void dbg_led_set(struct led_classdev *cdev,
	struct dbg_led *led = container_of(cdev, struct dbg_led, cdev);
	u16 reg;

	reg = __raw_readw(&fpga->leds);
	reg = readw_relaxed(&fpga->leds);
	if (b != LED_OFF)
		reg |= led->mask;
	else
		reg &= ~led->mask;
	__raw_writew(reg, &fpga->leds);
	writew_relaxed(reg, &fpga->leds);
}

static enum led_brightness dbg_led_get(struct led_classdev *cdev)
@@ -98,7 +98,7 @@ static enum led_brightness dbg_led_get(struct led_classdev *cdev)
	struct dbg_led *led = container_of(cdev, struct dbg_led, cdev);
	u16 reg;

	reg = __raw_readw(&fpga->leds);
	reg = readw_relaxed(&fpga->leds);
	return (reg & led->mask) ? LED_FULL : LED_OFF;
}

@@ -112,7 +112,7 @@ static int fpga_probe(struct platform_device *pdev)
		return -ENODEV;

	fpga = ioremap(iomem->start, resource_size(iomem));
	__raw_writew(0xff, &fpga->leds);
	writew_relaxed(0xff, &fpga->leds);

	for (i = 0; i < ARRAY_SIZE(dbg_leds); i++) {
		struct dbg_led *led;
@@ -138,15 +138,15 @@ static int fpga_probe(struct platform_device *pdev)

static int fpga_suspend_noirq(struct device *dev)
{
	fpga_led_state = __raw_readw(&fpga->leds);
	__raw_writew(0xff, &fpga->leds);
	fpga_led_state = readw_relaxed(&fpga->leds);
	writew_relaxed(0xff, &fpga->leds);

	return 0;
}

static int fpga_resume_noirq(struct device *dev)
{
	__raw_writew(~fpga_led_state, &fpga->leds);
	writew_relaxed(~fpga_led_state, &fpga->leds);
	return 0;
}