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

Commit 0dddee7a authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

dma: mv_xor: change the driver name to 'mv_xor' 



Since we got rid of the per-XOR channel 'mv_xor' driver, now the
per-XOR engine driver that used to be called 'mv_xor_shared' can
simply be named 'mv_xor'.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 7dde453d

arch/arm/mach-dove/common.c

+5 −4
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/irq.h>

#include <plat/time.h>

#include <linux/platform_data/usb-ehci-orion.h>

#include <linux/platform_data/dma-mv_xor.h>

#include <plat/irq.h>

#include <plat/common.h>

#include <plat/addr-map.h>
@@ -124,8 +125,8 @@ static void __init dove_clk_init(void) 
	orion_clkdev_add(NULL, "mv_crypto", crypto);

	orion_clkdev_add(NULL, "dove-ac97", ac97);

	orion_clkdev_add(NULL, "dove-pdma", pdma);

	orion_clkdev_add(NULL, "mv_xor_shared.0", xor0);

	orion_clkdev_add(NULL, "mv_xor_shared.1", xor1);

	orion_clkdev_add(NULL, MV_XOR_NAME ".0", xor0);

	orion_clkdev_add(NULL, MV_XOR_NAME ".1", xor1);

}



/*****************************************************************************
@@ -410,11 +411,11 @@ static void __init dove_legacy_clk_init(void) 
			 of_clk_get_from_provider(&clkspec));



	clkspec.args[0] = CLOCK_GATING_BIT_XOR0;

	orion_clkdev_add(NULL, "mv_xor_shared.0",

	orion_clkdev_add(NULL, MV_XOR_NAME ".0",

			 of_clk_get_from_provider(&clkspec));



	clkspec.args[0] = CLOCK_GATING_BIT_XOR1;

	orion_clkdev_add(NULL, "mv_xor_shared.1",

	orion_clkdev_add(NULL, MV_XOR_NAME ".1",

			 of_clk_get_from_provider(&clkspec));

}

arch/arm/mach-kirkwood/board-dt.c

+3 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <asm/mach/map.h>

#include <mach/bridge-regs.h>

#include <linux/platform_data/usb-ehci-orion.h>

#include <linux/platform_data/dma-mv_xor.h>

#include <plat/irq.h>

#include <plat/common.h>

#include "common.h"
@@ -60,11 +61,11 @@ static void __init kirkwood_legacy_clk_init(void) 
			 of_clk_get_from_provider(&clkspec));



	clkspec.args[0] = CGC_BIT_XOR0;

	orion_clkdev_add(NULL, "mv_xor_shared.0",

	orion_clkdev_add(NULL, MV_XOR_NAME ".0",

			 of_clk_get_from_provider(&clkspec));



	clkspec.args[0] = CGC_BIT_XOR1;

	orion_clkdev_add(NULL, "mv_xor_shared.1",

	orion_clkdev_add(NULL, MV_XOR_NAME ".1",

			 of_clk_get_from_provider(&clkspec));



	clkspec.args[0] = CGC_BIT_PEX1;

arch/arm/mach-kirkwood/common.c

+2 −2
Original line number Diff line number Diff line
@@ -260,8 +260,8 @@ void __init kirkwood_clk_init(void) 
	orion_clkdev_add(NULL, "orion_nand", runit);

	orion_clkdev_add(NULL, "mvsdio", sdio);

	orion_clkdev_add(NULL, "mv_crypto", crypto);

	orion_clkdev_add(NULL, MV_XOR_SHARED_NAME ".0", xor0);

	orion_clkdev_add(NULL, MV_XOR_SHARED_NAME ".1", xor1);

	orion_clkdev_add(NULL, MV_XOR_NAME ".0", xor0);

	orion_clkdev_add(NULL, MV_XOR_NAME ".1", xor1);

	orion_clkdev_add("0", "pcie", pex0);

	orion_clkdev_add("1", "pcie", pex1);

	orion_clkdev_add(NULL, "kirkwood-i2s", audio);

arch/arm/plat-orion/common.c

+2 −2
Original line number Diff line number Diff line
@@ -641,7 +641,7 @@ static struct mv_xor_platform_data orion_xor0_pdata = { 
};



static struct platform_device orion_xor0_shared = {

	.name		= MV_XOR_SHARED_NAME,

	.name		= MV_XOR_NAME,

	.id		= 0,

	.num_resources	= ARRAY_SIZE(orion_xor0_shared_resources),

	.resource	= orion_xor0_shared_resources,
@@ -716,7 +716,7 @@ static struct mv_xor_platform_data orion_xor1_pdata = { 
};



static struct platform_device orion_xor1_shared = {

	.name		= MV_XOR_SHARED_NAME,

	.name		= MV_XOR_NAME,

	.id		= 1,

	.num_resources	= ARRAY_SIZE(orion_xor1_shared_resources),

	.resource	= orion_xor1_shared_resources,

drivers/dma/mv_xor.c

+1 −1
Original line number Diff line number Diff line
@@ -1361,7 +1361,7 @@ static struct platform_driver mv_xor_shared_driver = { 
	.remove		= mv_xor_shared_remove,

	.driver		= {

		.owner	= THIS_MODULE,

		.name	= MV_XOR_SHARED_NAME,

		.name	= MV_XOR_NAME,

	},

};