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

Commit d272f428 authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

fbdev: sh_mobile_meram: Add _cfg suffix to struct sh_mobile_meram_icb 



The structure describe ICB configuration, no ICB objects themselves.
Rename it to sh_mobile_meram_icb_cfg in preparation for the addition of
an ICB structure.

All the structure fields are unsigned integers, make them so.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
parent e1d1144e

drivers/video/sh_mobile_meram.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -156,7 +156,7 @@ static inline unsigned long meram_read_reg(void __iomem *base, int off) 
 */

 */





static inline int meram_check_overlap(struct sh_mobile_meram_priv *priv,

static inline int meram_check_overlap(struct sh_mobile_meram_priv *priv,

				      struct sh_mobile_meram_icb *new)

				      struct sh_mobile_meram_icb_cfg *new)

{

{

	int i;

	int i;

	int used_start, used_end, meram_start, meram_end;

	int used_start, used_end, meram_start, meram_end;
@@ -188,7 +188,7 @@ static inline int meram_check_overlap(struct sh_mobile_meram_priv *priv, 
 */

 */





static inline void meram_mark(struct sh_mobile_meram_priv *priv,

static inline void meram_mark(struct sh_mobile_meram_priv *priv,

			      struct sh_mobile_meram_icb *new)

			      struct sh_mobile_meram_icb_cfg *new)

{

{

	int n;

	int n;
@@ -211,7 +211,7 @@ static inline void meram_mark(struct sh_mobile_meram_priv *priv, 
 */

 */





static inline void meram_unmark(struct sh_mobile_meram_priv *priv,

static inline void meram_unmark(struct sh_mobile_meram_priv *priv,

				struct sh_mobile_meram_icb *icb)

				struct sh_mobile_meram_icb_cfg *icb)

{

{

	int i;

	int i;

	unsigned long pattern;

	unsigned long pattern;
@@ -303,7 +303,7 @@ static inline void meram_get_next_icb_addr(struct sh_mobile_meram_info *pdata, 
 */

 */





static int meram_init(struct sh_mobile_meram_priv *priv,

static int meram_init(struct sh_mobile_meram_priv *priv,

		      struct sh_mobile_meram_icb *icb,

		      struct sh_mobile_meram_icb_cfg *icb,

		      int xres, int yres, int *out_pitch)

		      int xres, int yres, int *out_pitch)

{

{

	unsigned long total_byte_count = MERAM_CALC_BYTECOUNT(xres, yres);

	unsigned long total_byte_count = MERAM_CALC_BYTECOUNT(xres, yres);
@@ -370,7 +370,7 @@ static int meram_init(struct sh_mobile_meram_priv *priv, 
}

}





static void meram_deinit(struct sh_mobile_meram_priv *priv,

static void meram_deinit(struct sh_mobile_meram_priv *priv,

			struct sh_mobile_meram_icb *icb)

			 struct sh_mobile_meram_icb_cfg *icb)

{

{

	/* disable ICB */

	/* disable ICB */

	meram_write_icb(priv->base, icb->cache_icb,  MExxCTL,

	meram_write_icb(priv->base, icb->cache_icb,  MExxCTL,

include/video/sh_mobile_meram.h

+7 −7
Original line number Original line Diff line number Diff line
@@ -25,17 +25,17 @@ struct sh_mobile_meram_info { 
};

};





/* icb config */

/* icb config */

struct sh_mobile_meram_icb {

struct sh_mobile_meram_icb_cfg {

	int marker_icb;		/* ICB # for Marker ICB */

	unsigned int marker_icb;	/* ICB # for Marker ICB */

	int cache_icb;		/* ICB # for Cache ICB */

	unsigned int cache_icb;		/* ICB # for Cache ICB */

	int meram_offset;	/* MERAM Buffer Offset to use */

	unsigned int meram_offset;	/* MERAM Buffer Offset to use */

	int meram_size;		/* MERAM Buffer Size to use */

	unsigned int meram_size;	/* MERAM Buffer Size to use */





	int cache_unit;		/* bytes to cache per ICB */

	unsigned int cache_unit;	/* bytes to cache per ICB */

};

};





struct sh_mobile_meram_cfg {

struct sh_mobile_meram_cfg {

	struct sh_mobile_meram_icb	icb[2];

	struct sh_mobile_meram_icb_cfg	icb[2];

	int				pixelformat;

	int				pixelformat;

	int				current_reg;

	int				current_reg;

};

};