Commit 5557eb17 authored by Mike Rapoport's avatar Mike Rapoport Committed by Greg Kroah-Hartman
Browse files

staging: sm750fb: use BIT macro for PLL_CTRL single-bit fields 



Replace complex defintion of PLL_CTRL fields with BIT() macro and use
open-coded implementation for PLL register manipulations.

Signed-off-by: default avatarMike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 79254c60

drivers/staging/sm750fb/ddk750_chip.c

+1 −4
Original line number Diff line number Diff line
@@ -363,10 +363,7 @@ unsigned int formatPllReg(pll_value_t *pPLL) 
	 * register. On returning a 32 bit number, the value can be

	 * applied to any PLL in the calling function.

	 */

	reg =

	FIELD_SET(0, PLL_CTRL, BYPASS, OFF)

	| FIELD_SET(0, PLL_CTRL, POWER,  ON)

	| FIELD_SET(0, PLL_CTRL, INPUT,  OSC)

	reg = PLL_CTRL_POWER

#ifndef VALIDATION_CHIP

	| FIELD_VALUE(0, PLL_CTRL, POD,    pPLL->POD)

#endif

drivers/staging/sm750fb/ddk750_display.c

+2 −4
Original line number Diff line number Diff line
@@ -126,8 +126,7 @@ static void waitNextVerticalSync(int ctrl, int delay) 


		/* Do not wait when the Primary PLL is off or display control is already off.

		   This will prevent the software to wait forever. */

		if ((FIELD_GET(PEEK32(PANEL_PLL_CTRL), PLL_CTRL, POWER) ==

			 PLL_CTRL_POWER_OFF) ||

		if (!(PEEK32(PANEL_PLL_CTRL) & PLL_CTRL_POWER) ||

			(FIELD_GET(PEEK32(PANEL_DISPLAY_CTRL), PANEL_DISPLAY_CTRL, TIMING) ==

			 PANEL_DISPLAY_CTRL_TIMING_DISABLE)) {

			return;
@@ -149,8 +148,7 @@ static void waitNextVerticalSync(int ctrl, int delay) 


		/* Do not wait when the Primary PLL is off or display control is already off.

			   This will prevent the software to wait forever. */

		if ((FIELD_GET(PEEK32(CRT_PLL_CTRL), PLL_CTRL, POWER) ==

			 PLL_CTRL_POWER_OFF) ||

		if (!(PEEK32(CRT_PLL_CTRL) & PLL_CTRL_POWER) ||

			(FIELD_GET(PEEK32(CRT_DISPLAY_CTRL), CRT_DISPLAY_CTRL, TIMING) ==

			 CRT_DISPLAY_CTRL_TIMING_DISABLE)) {

			return;

drivers/staging/sm750fb/ddk750_reg.h

+3 −9
Original line number Diff line number Diff line
@@ -517,15 +517,9 @@ 
#define PLL_CLK_COUNT_COUNTER                         15:0



#define PANEL_PLL_CTRL                                0x00005C

#define PLL_CTRL_BYPASS                               18:18

#define PLL_CTRL_BYPASS_OFF                           0

#define PLL_CTRL_BYPASS_ON                            1

#define PLL_CTRL_POWER                                17:17

#define PLL_CTRL_POWER_OFF                            0

#define PLL_CTRL_POWER_ON                             1

#define PLL_CTRL_INPUT                                16:16

#define PLL_CTRL_INPUT_OSC                            0

#define PLL_CTRL_INPUT_TESTCLK                        1

#define PLL_CTRL_BYPASS                               BIT(18)

#define PLL_CTRL_POWER                                BIT(17)

#define PLL_CTRL_INPUT                                BIT(16)

#ifdef VALIDATION_CHIP

    #define PLL_CTRL_OD                               15:14

#else

CRA Git | Maintained and supported by SUSTech CRA and CCSE