Commit afcc00b9 authored by Xiubo Li's avatar Xiubo Li Committed by Mark Brown
Browse files

regmap: add 64-bit mode support 



Since the mmio has support the 64-bit has been supported for the
64-bit platform, so should the regmap core too.

Signed-off-by: default avatarXiubo Li <lixiubo@cmss.chinamobile.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8005c49d

drivers/base/regmap/regmap.c

+99 −0
Original line number Diff line number Diff line
@@ -245,6 +245,28 @@ static void regmap_format_32_native(void *buf, unsigned int val, 
	*(u32 *)buf = val << shift;

}



#ifdef CONFIG_64BIT

static void regmap_format_64_be(void *buf, unsigned int val, unsigned int shift)

{

	__be64 *b = buf;



	b[0] = cpu_to_be64(val << shift);

}



static void regmap_format_64_le(void *buf, unsigned int val, unsigned int shift)

{

	__le64 *b = buf;



	b[0] = cpu_to_le64(val << shift);

}



static void regmap_format_64_native(void *buf, unsigned int val,

				    unsigned int shift)

{

	*(u64 *)buf = val << shift;

}

#endif



static void regmap_parse_inplace_noop(void *buf)

{

}
@@ -332,6 +354,41 @@ static unsigned int regmap_parse_32_native(const void *buf) 
	return *(u32 *)buf;

}



#ifdef CONFIG_64BIT

static unsigned int regmap_parse_64_be(const void *buf)

{

	const __be64 *b = buf;



	return be64_to_cpu(b[0]);

}



static unsigned int regmap_parse_64_le(const void *buf)

{

	const __le64 *b = buf;



	return le64_to_cpu(b[0]);

}



static void regmap_parse_64_be_inplace(void *buf)

{

	__be64 *b = buf;



	b[0] = be64_to_cpu(b[0]);

}



static void regmap_parse_64_le_inplace(void *buf)

{

	__le64 *b = buf;



	b[0] = le64_to_cpu(b[0]);

}



static unsigned int regmap_parse_64_native(const void *buf)

{

	return *(u64 *)buf;

}

#endif



static void regmap_lock_mutex(void *__map)

{

	struct regmap *map = __map;
@@ -712,6 +769,21 @@ struct regmap *__regmap_init(struct device *dev, 
		}

		break;



#ifdef CONFIG_64BIT

	case 64:

		switch (reg_endian) {

		case REGMAP_ENDIAN_BIG:

			map->format.format_reg = regmap_format_64_be;

			break;

		case REGMAP_ENDIAN_NATIVE:

			map->format.format_reg = regmap_format_64_native;

			break;

		default:

			goto err_map;

		}

		break;

#endif



	default:

		goto err_map;

	}
@@ -771,6 +843,27 @@ struct regmap *__regmap_init(struct device *dev, 
			goto err_map;

		}

		break;

#ifdef CONFIG_64BIT

		switch (val_endian) {

		case REGMAP_ENDIAN_BIG:

			map->format.format_val = regmap_format_64_be;

			map->format.parse_val = regmap_parse_64_be;

			map->format.parse_inplace = regmap_parse_64_be_inplace;

			break;

		case REGMAP_ENDIAN_LITTLE:

			map->format.format_val = regmap_format_64_le;

			map->format.parse_val = regmap_parse_64_le;

			map->format.parse_inplace = regmap_parse_64_le_inplace;

			break;

		case REGMAP_ENDIAN_NATIVE:

			map->format.format_val = regmap_format_64_native;

			map->format.parse_val = regmap_parse_64_native;

			break;

		default:

			goto err_map;

		}

		break;

#endif

	}



	if (map->format.format_write) {
@@ -2488,11 +2581,17 @@ int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val, 
				 * we assume that the values are native

				 * endian.

				 */

				u64 *u64 = val;

				u32 *u32 = val;

				u16 *u16 = val;

				u8 *u8 = val;



				switch (map->format.val_bytes) {

#ifdef CONFIG_64BIT

				case 8:

					u64[i] = ival;

					break;

#endif

				case 4:

					u32[i] = ival;

					break;