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

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

staging: sm750fb: remove PANEL_DISPLAY_CTRL_TFT_DISP defines 



The PANEL_DISPLAY_CTRL_TFT_DISP definitions artificially encode
PANEL_DISPLAY_CTRL_DUAL_DISPLAY and PANEL_DISPLAY_CTRL_DOUBLE_PIXEL bits
combinations. Replace the PANEL_DISPLAY_CTRL_TFT_DISP usage with direct use
of the bits defined in the datasheet.

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

drivers/staging/sm750fb/ddk750_reg.h

+0 −6
Original line number Diff line number Diff line
@@ -791,12 +791,6 @@ 
#define PANEL_DISPLAY_CTRL_VBIASEN                    BIT(26)

#define PANEL_DISPLAY_CTRL_DATA                       BIT(25)

#define PANEL_DISPLAY_CTRL_FPVDDEN                    BIT(24)



#define PANEL_DISPLAY_CTRL_TFT_DISP 19:18

#define PANEL_DISPLAY_CTRL_TFT_DISP_24 0

#define PANEL_DISPLAY_CTRL_TFT_DISP_36 1

#define PANEL_DISPLAY_CTRL_TFT_DISP_18 2



#define PANEL_DISPLAY_CTRL_DUAL_DISPLAY               BIT(19)

#define PANEL_DISPLAY_CTRL_DOUBLE_PIXEL               BIT(18)

#define PANEL_DISPLAY_CTRL_FIFO                       17:16

drivers/staging/sm750fb/sm750_hw.c

+10 −7
Original line number Diff line number Diff line
@@ -130,17 +130,20 @@ int hw_sm750_inithw(struct sm750_dev *sm750_dev, struct pci_dev *pdev) 
			POKE32(SYSTEM_CTRL, val);

		}



		val = PEEK32(PANEL_DISPLAY_CTRL) &

			~(PANEL_DISPLAY_CTRL_DUAL_DISPLAY |

			  PANEL_DISPLAY_CTRL_DOUBLE_PIXEL);

		switch (sm750_dev->pnltype) {

		case sm750_doubleTFT:

		case sm750_24TFT:

			break;

		case sm750_doubleTFT:

			val |= PANEL_DISPLAY_CTRL_DOUBLE_PIXEL;

			break;

		case sm750_dualTFT:

		POKE32(PANEL_DISPLAY_CTRL,

			FIELD_VALUE(PEEK32(PANEL_DISPLAY_CTRL),

						PANEL_DISPLAY_CTRL,

						TFT_DISP,

						sm750_dev->pnltype));

			val |= PANEL_DISPLAY_CTRL_DUAL_DISPLAY;

			break;

		}

		POKE32(PANEL_DISPLAY_CTRL, val);

	} else {

		/* for 750LE ,no DVI chip initialization makes Monitor no signal */

		/* Set up GPIO for software I2C to program DVI chip in the