dm: treewide: Rename ..._platdata variables to just ..._plat

Try to maintain some consistency between these variables by using _plat as
a suffix for them.

Signed-off-by: Simon Glass <sjg@chromium.org>

10 files changed, 45 insertions, 45 deletions

diff --git a/drivers/misc/altera_sysid.c b/drivers/misc/altera_sysid.c
index 091f055..057b431 100644
--- a/drivers/misc/altera_sysid.c
+++ b/drivers/misc/altera_sysid.c
@@ -17,7 +17,7 @@ struct altera_sysid_regs {
 	u32	timestamp;	/* Timestamp */
 };
 
-struct altera_sysid_platdata {
+struct altera_sysid_plat {
 	struct altera_sysid_regs *regs;
 };
 
@@ -59,7 +59,7 @@ U_BOOT_CMD(
 static int altera_sysid_read(struct udevice *dev,
 			     int offset, void *buf, int size)
 {
-	struct altera_sysid_platdata *plat = dev->plat;
+	struct altera_sysid_plat *plat = dev->plat;
 	struct altera_sysid_regs *const regs = plat->regs;
 	u32 *sysid = buf;
 
@@ -71,7 +71,7 @@ static int altera_sysid_read(struct udevice *dev,
 
 static int altera_sysid_of_to_plat(struct udevice *dev)
 {
-	struct altera_sysid_platdata *plat = dev_get_plat(dev);
+	struct altera_sysid_plat *plat = dev_get_plat(dev);
 
 	plat->regs = map_physmem(dev_read_addr(dev),
 				 sizeof(struct altera_sysid_regs),
@@ -94,6 +94,6 @@ U_BOOT_DRIVER(altera_sysid) = {
 	.id	= UCLASS_MISC,
 	.of_match = altera_sysid_ids,
 	.of_to_plat = altera_sysid_of_to_plat,
-	.plat_auto	= sizeof(struct altera_sysid_platdata),
+	.plat_auto	= sizeof(struct altera_sysid_plat),
 	.ops	= &altera_sysid_ops,
 };
diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c
index c228e84..5ed8ab6 100644
--- a/drivers/misc/fs_loader.c
+++ b/drivers/misc/fs_loader.c
@@ -61,7 +61,7 @@ static int mount_ubifs(char *mtdpart, char *ubivol)
 }
 #endif
 
-static int select_fs_dev(struct device_platdata *plat)
+static int select_fs_dev(struct device_plat *plat)
 {
 	int ret;
 
@@ -226,7 +226,7 @@ static int fs_loader_of_to_plat(struct udevice *dev)
 	ofnode fs_loader_node = dev_ofnode(dev);
 
 	if (ofnode_valid(fs_loader_node)) {
-		struct device_platdata *plat;
+		struct device_plat *plat;
 
 		plat = dev->plat;
 		if (!ofnode_read_u32_array(fs_loader_node,
@@ -250,7 +250,7 @@ static int fs_loader_probe(struct udevice *dev)
 {
 #if CONFIG_IS_ENABLED(DM) && CONFIG_IS_ENABLED(BLK)
 	int ret;
-	struct device_platdata *plat = dev->plat;
+	struct device_plat *plat = dev->plat;
 
 	if (plat->phandlepart.phandle) {
 		ofnode node = ofnode_get_by_phandle(plat->phandlepart.phandle);
@@ -285,7 +285,7 @@ U_BOOT_DRIVER(fs_loader) = {
 	.of_match		= fs_loader_ids,
 	.probe			= fs_loader_probe,
 	.of_to_plat	= fs_loader_of_to_plat,
-	.plat_auto	= sizeof(struct device_platdata),
+	.plat_auto	= sizeof(struct device_plat),
 	.priv_auto	= sizeof(struct firmware),
 };
 
diff --git a/drivers/misc/microchip_flexcom.c b/drivers/misc/microchip_flexcom.c
index d0ef2ef..e0a6f2d 100644
--- a/drivers/misc/microchip_flexcom.c
+++ b/drivers/misc/microchip_flexcom.c
@@ -16,14 +16,14 @@ struct microchip_flexcom_regs {
 	u32 cr;
 };
 
-struct microchip_flexcom_platdata {
+struct microchip_flexcom_plat {
 	struct microchip_flexcom_regs *regs;
 	u32 flexcom_mode;
 };
 
 static int microchip_flexcom_of_to_plat(struct udevice *dev)
 {
-	struct microchip_flexcom_platdata *plat = dev_get_plat(dev);
+	struct microchip_flexcom_plat *plat = dev_get_plat(dev);
 	int ret;
 
 	plat->regs = map_physmem(dev_read_addr(dev),
@@ -62,5 +62,5 @@ U_BOOT_DRIVER(microchip_flexcom) = {
 	.id	= UCLASS_MISC,
 	.of_match = microchip_flexcom_ids,
 	.of_to_plat = microchip_flexcom_of_to_plat,
-	.plat_auto	= sizeof(struct microchip_flexcom_platdata),
+	.plat_auto	= sizeof(struct microchip_flexcom_plat),
 };
diff --git a/drivers/misc/p2sb-uclass.c b/drivers/misc/p2sb-uclass.c
index 3267e50..8f9ec02 100644
--- a/drivers/misc/p2sb-uclass.c
+++ b/drivers/misc/p2sb-uclass.c
@@ -30,7 +30,7 @@ int p2sb_set_hide(struct udevice *dev, bool hide)
 
 void *pcr_reg_address(struct udevice *dev, uint offset)
 {
-	struct p2sb_child_platdata *pplat = dev_get_parent_plat(dev);
+	struct p2sb_child_plat *pplat = dev_get_parent_plat(dev);
 	struct udevice *p2sb = dev_get_parent(dev);
 	struct p2sb_uc_priv *upriv = dev_get_uclass_priv(p2sb);
 	uintptr_t reg_addr;
@@ -161,7 +161,7 @@ void pcr_clrsetbits8(struct udevice *dev, uint offset, uint clr, uint set)
 
 int p2sb_get_port_id(struct udevice *dev)
 {
-	struct p2sb_child_platdata *pplat = dev_get_parent_plat(dev);
+	struct p2sb_child_plat *pplat = dev_get_parent_plat(dev);
 
 	return pplat->pid;
 }
@@ -169,7 +169,7 @@ int p2sb_get_port_id(struct udevice *dev)
 int p2sb_set_port_id(struct udevice *dev, int portid)
 {
 	struct udevice *ps2b;
-	struct p2sb_child_platdata *pplat;
+	struct p2sb_child_plat *pplat;
 
 	if (!CONFIG_IS_ENABLED(OF_PLATDATA))
 		return -ENOSYS;
@@ -197,7 +197,7 @@ int p2sb_set_port_id(struct udevice *dev, int portid)
 static int p2sb_child_post_bind(struct udevice *dev)
 {
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
-	struct p2sb_child_platdata *pplat = dev_get_parent_plat(dev);
+	struct p2sb_child_plat *pplat = dev_get_parent_plat(dev);
 	int ret;
 	u32 pid;
 
@@ -224,5 +224,5 @@ UCLASS_DRIVER(p2sb) = {
 	.per_device_auto	= sizeof(struct p2sb_uc_priv),
 	.post_bind	= p2sb_post_bind,
 	.child_post_bind = p2sb_child_post_bind,
-	.per_child_plat_auto = sizeof(struct p2sb_child_platdata),
+	.per_child_plat_auto = sizeof(struct p2sb_child_plat),
 };
diff --git a/drivers/misc/p2sb_emul.c b/drivers/misc/p2sb_emul.c
index 5c70ca8..973d02d 100644
--- a/drivers/misc/p2sb_emul.c
+++ b/drivers/misc/p2sb_emul.c
@@ -18,12 +18,12 @@
 #include <p2sb.h>
 
 /**
- * struct p2sb_emul_platdata - platform data for this device
+ * struct p2sb_emul_plat - platform data for this device
  *
  * @command:	Current PCI command value
  * @bar:	Current base address values
  */
-struct p2sb_emul_platdata {
+struct p2sb_emul_plat {
 	u16 command;
 	u32 bar[6];
 };
@@ -53,7 +53,7 @@ static int sandbox_p2sb_emul_read_config(const struct udevice *emul,
 					 uint offset, ulong *valuep,
 					 enum pci_size_t size)
 {
-	struct p2sb_emul_platdata *plat = dev_get_plat(emul);
+	struct p2sb_emul_plat *plat = dev_get_plat(emul);
 
 	switch (offset) {
 	case PCI_COMMAND:
@@ -106,7 +106,7 @@ static int sandbox_p2sb_emul_read_config(const struct udevice *emul,
 static int sandbox_p2sb_emul_write_config(struct udevice *emul, uint offset,
 					  ulong value, enum pci_size_t size)
 {
-	struct p2sb_emul_platdata *plat = dev_get_plat(emul);
+	struct p2sb_emul_plat *plat = dev_get_plat(emul);
 
 	switch (offset) {
 	case PCI_COMMAND:
@@ -134,7 +134,7 @@ static int sandbox_p2sb_emul_write_config(struct udevice *emul, uint offset,
 static int sandbox_p2sb_emul_find_bar(struct udevice *emul, unsigned int addr,
 				      int *barnump, unsigned int *offsetp)
 {
-	struct p2sb_emul_platdata *plat = dev_get_plat(emul);
+	struct p2sb_emul_plat *plat = dev_get_plat(emul);
 	int barnum;
 
 	for (barnum = 0; barnum < ARRAY_SIZE(barinfo); barnum++) {
@@ -197,7 +197,7 @@ static int find_p2sb_channel(struct udevice *emul, uint offset,
 		return log_msg_ret("No client", ret);
 
 	device_foreach_child(dev, p2sb) {
-		struct p2sb_child_platdata *pplat =
+		struct p2sb_child_plat *pplat =
 			 dev_get_parent_plat(dev);
 
 		log_debug("   - child %s, pid %d, want %d\n", dev->name,
@@ -263,7 +263,7 @@ U_BOOT_DRIVER(sandbox_p2sb_emul_emul) = {
 	.of_match	= sandbox_p2sb_emul_ids,
 	.ops		= &sandbox_p2sb_emul_emul_ops,
 	.priv_auto	= sizeof(struct p2sb_emul_priv),
-	.plat_auto	= sizeof(struct p2sb_emul_platdata),
+	.plat_auto	= sizeof(struct p2sb_emul_plat),
 };
 
 static struct pci_device_id sandbox_p2sb_emul_supported[] = {
diff --git a/drivers/misc/rockchip-efuse.c b/drivers/misc/rockchip-efuse.c
index 08e30ba..be25389 100644
--- a/drivers/misc/rockchip-efuse.c
+++ b/drivers/misc/rockchip-efuse.c
@@ -37,7 +37,7 @@ struct rockchip_efuse_regs {
 		       /* 0x14	efuse strobe finish control register */
 };
 
-struct rockchip_efuse_platdata {
+struct rockchip_efuse_plat {
 	void __iomem *base;
 	struct clk *clk;
 };
@@ -86,7 +86,7 @@ U_BOOT_CMD(
 static int rockchip_rk3399_efuse_read(struct udevice *dev, int offset,
 				      void *buf, int size)
 {
-	struct rockchip_efuse_platdata *plat = dev_get_plat(dev);
+	struct rockchip_efuse_plat *plat = dev_get_plat(dev);
 	struct rockchip_efuse_regs *efuse =
 		(struct rockchip_efuse_regs *)plat->base;
 
@@ -139,7 +139,7 @@ static const struct misc_ops rockchip_efuse_ops = {
 
 static int rockchip_efuse_of_to_plat(struct udevice *dev)
 {
-	struct rockchip_efuse_platdata *plat = dev_get_plat(dev);
+	struct rockchip_efuse_plat *plat = dev_get_plat(dev);
 
 	plat->base = dev_read_addr_ptr(dev);
 	return 0;
@@ -155,6 +155,6 @@ U_BOOT_DRIVER(rockchip_efuse) = {
 	.id = UCLASS_MISC,
 	.of_match = rockchip_efuse_ids,
 	.of_to_plat = rockchip_efuse_of_to_plat,
-	.plat_auto	= sizeof(struct rockchip_efuse_platdata),
+	.plat_auto	= sizeof(struct rockchip_efuse_plat),
 	.ops = &rockchip_efuse_ops,
 };
diff --git a/drivers/misc/rockchip-otp.c b/drivers/misc/rockchip-otp.c
index 9707750..cc9a545 100644
--- a/drivers/misc/rockchip-otp.c
+++ b/drivers/misc/rockchip-otp.c
@@ -47,13 +47,13 @@
 
 #define OTPC_TIMEOUT			10000
 
-struct rockchip_otp_platdata {
+struct rockchip_otp_plat {
 	void __iomem *base;
 	unsigned long secure_conf_base;
 	unsigned long otp_mask_base;
 };
 
-static int rockchip_otp_wait_status(struct rockchip_otp_platdata *otp,
+static int rockchip_otp_wait_status(struct rockchip_otp_plat *otp,
 				    u32 flag)
 {
 	int delay = OTPC_TIMEOUT;
@@ -73,7 +73,7 @@ static int rockchip_otp_wait_status(struct rockchip_otp_platdata *otp,
 	return 0;
 }
 
-static int rockchip_otp_ecc_enable(struct rockchip_otp_platdata *otp,
+static int rockchip_otp_ecc_enable(struct rockchip_otp_plat *otp,
 				   bool enable)
 {
 	int ret = 0;
@@ -102,7 +102,7 @@ static int rockchip_otp_ecc_enable(struct rockchip_otp_platdata *otp,
 static int rockchip_px30_otp_read(struct udevice *dev, int offset,
 				  void *buf, int size)
 {
-	struct rockchip_otp_platdata *otp = dev_get_plat(dev);
+	struct rockchip_otp_plat *otp = dev_get_plat(dev);
 	u8 *buffer = buf;
 	int ret = 0;
 
@@ -147,7 +147,7 @@ static const struct misc_ops rockchip_otp_ops = {
 
 static int rockchip_otp_of_to_plat(struct udevice *dev)
 {
-	struct rockchip_otp_platdata *otp = dev_get_plat(dev);
+	struct rockchip_otp_plat *otp = dev_get_plat(dev);
 
 	otp->base = dev_read_addr_ptr(dev);
 
@@ -172,5 +172,5 @@ U_BOOT_DRIVER(rockchip_otp) = {
 	.of_match = rockchip_otp_ids,
 	.ops = &rockchip_otp_ops,
 	.of_to_plat = rockchip_otp_of_to_plat,
-	.plat_auto	= sizeof(struct rockchip_otp_platdata),
+	.plat_auto	= sizeof(struct rockchip_otp_plat),
 };
diff --git a/drivers/misc/sandbox_adder.c b/drivers/misc/sandbox_adder.c
index 94eaf23..3ea33e4 100644
--- a/drivers/misc/sandbox_adder.c
+++ b/drivers/misc/sandbox_adder.c
@@ -21,7 +21,7 @@ struct sandbox_adder_priv {
 int sandbox_adder_read(struct udevice *dev, ulong address, void *data,
 		       enum axi_size_t size)
 {
-	struct p2sb_child_platdata *pplat = dev_get_parent_plat(dev);
+	struct p2sb_child_plat *pplat = dev_get_parent_plat(dev);
 	u32 *val = data;
 
 	*val = pplat->pid << 24 | address;
diff --git a/drivers/misc/sifive-otp.c b/drivers/misc/sifive-otp.c
index e1f5971..3e658b3 100644
--- a/drivers/misc/sifive-otp.c
+++ b/drivers/misc/sifive-otp.c
@@ -89,7 +89,7 @@ struct sifive_otp_regs {
 	u32 pwe;    /* Write enable input (defines program cycle) */
 };
 
-struct sifive_otp_platdata {
+struct sifive_otp_plat {
 	struct sifive_otp_regs __iomem *regs;
 	u32 total_fuses;
 };
@@ -100,7 +100,7 @@ struct sifive_otp_platdata {
 static int sifive_otp_read(struct udevice *dev, int offset,
 			   void *buf, int size)
 {
-	struct sifive_otp_platdata *plat = dev_get_plat(dev);
+	struct sifive_otp_plat *plat = dev_get_plat(dev);
 	struct sifive_otp_regs *regs = (struct sifive_otp_regs *)plat->regs;
 
 	/* Check if offset and size are multiple of BYTES_PER_FUSE */
@@ -162,7 +162,7 @@ static int sifive_otp_read(struct udevice *dev, int offset,
 static int sifive_otp_write(struct udevice *dev, int offset,
 			    const void *buf, int size)
 {
-	struct sifive_otp_platdata *plat = dev_get_plat(dev);
+	struct sifive_otp_plat *plat = dev_get_plat(dev);
 	struct sifive_otp_regs *regs = (struct sifive_otp_regs *)plat->regs;
 
 	/* Check if offset and size are multiple of BYTES_PER_FUSE */
@@ -241,7 +241,7 @@ static int sifive_otp_write(struct udevice *dev, int offset,
 
 static int sifive_otp_of_to_plat(struct udevice *dev)
 {
-	struct sifive_otp_platdata *plat = dev_get_plat(dev);
+	struct sifive_otp_plat *plat = dev_get_plat(dev);
 	int ret;
 
 	plat->regs = dev_read_addr_ptr(dev);
@@ -270,6 +270,6 @@ U_BOOT_DRIVER(sifive_otp) = {
 	.id = UCLASS_MISC,
 	.of_match = sifive_otp_ids,
 	.of_to_plat = sifive_otp_of_to_plat,
-	.plat_auto	= sizeof(struct sifive_otp_platdata),
+	.plat_auto	= sizeof(struct sifive_otp_plat),
 	.ops = &sifive_otp_ops,
 };
diff --git a/drivers/misc/swap_case.c b/drivers/misc/swap_case.c
index 9dd3b06..abea0e7 100644
--- a/drivers/misc/swap_case.c
+++ b/drivers/misc/swap_case.c
@@ -15,12 +15,12 @@
 #include <linux/ctype.h>
 
 /**
- * struct swap_case_platdata - platform data for this device
+ * struct swap_case_plat - platform data for this device
  *
  * @command:	Current PCI command value
  * @bar:	Current base address values
  */
-struct swap_case_platdata {
+struct swap_case_plat {
 	u16 command;
 	u32 bar[6];
 };
@@ -100,7 +100,7 @@ static int sandbox_swap_case_read_config(const struct udevice *emul,
 					 uint offset, ulong *valuep,
 					 enum pci_size_t size)
 {
-	struct swap_case_platdata *plat = dev_get_plat(emul);
+	struct swap_case_plat *plat = dev_get_plat(emul);
 
 	/*
 	 * The content of the EA capability structure is handled elsewhere to
@@ -200,7 +200,7 @@ static int sandbox_swap_case_read_config(const struct udevice *emul,
 static int sandbox_swap_case_write_config(struct udevice *emul, uint offset,
 					  ulong value, enum pci_size_t size)
 {
-	struct swap_case_platdata *plat = dev_get_plat(emul);
+	struct swap_case_plat *plat = dev_get_plat(emul);
 
 	switch (offset) {
 	case PCI_COMMAND:
@@ -228,7 +228,7 @@ static int sandbox_swap_case_write_config(struct udevice *emul, uint offset,
 static int sandbox_swap_case_find_bar(struct udevice *emul, unsigned int addr,
 				      int *barnump, unsigned int *offsetp)
 {
-	struct swap_case_platdata *plat = dev_get_plat(emul);
+	struct swap_case_plat *plat = dev_get_plat(emul);
 	int barnum;
 
 	for (barnum = 0; barnum < ARRAY_SIZE(barinfo); barnum++) {
@@ -392,7 +392,7 @@ U_BOOT_DRIVER(sandbox_swap_case_emul) = {
 	.of_match	= sandbox_swap_case_ids,
 	.ops		= &sandbox_swap_case_emul_ops,
 	.priv_auto	= sizeof(struct swap_case_priv),
-	.plat_auto	= sizeof(struct swap_case_platdata),
+	.plat_auto	= sizeof(struct swap_case_plat),
 };
 
 static struct pci_device_id sandbox_swap_case_supported[] = {