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

Commit 83465324 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-gma500-alanc' into drm-core-next 

* drm-gma500-alanc: (47 commits)
  gma500: psb_irq: mark mid_{enable, disable}_pipe_event() as static
  gma500: mark psb_intel_sdvo_hdmi_sink_detect() as static
  gma500: psb_intel_display: drop unused variables
  gma500: mark psb_intel_pipe_set_base() as static
  gma500: drop unused psb_intel_modeset_cleanup()
  gma500: oaktrail_lvds_init() drop unused variable
  gma500: oaktrail_hdmi_i2c_access() drop unused variable
  gma500: mark oaktrail_backlight_init() as static
  gma500: oaktrail_hdmi: fix -Wmissing-field-initializers warning
  gma500: oaktrail_hdmi: drop dead code
  gma500: oaktrail_crtc: drop unused variables
  gma500: oaktrail_crtc: mark few functions as static
  gma500: mdfld_intel_display: drop unused variables
  gma500: mdfld_dsi_pkg_sender: fix -Wtype-limits warning
  gma500: mdfld_dsi_dpi: drop unused variables
  gma500: mdfld_device: mark few functions as static
  gma500: cdv_intel_lvds: #if 0 currently unused functions
  gma500: cdv_intel_lvds: mark few functions as static
  gma500: cdv_intel_hdmi: add missing include
  gma500: cdv_intel_crt: mark few functions as static
  ...
parents b19c19af 8e18db81

arch/x86/platform/mrst/mrst.c

+16 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
#include <linux/module.h>

#include <linux/notifier.h>

#include <linux/mfd/intel_msic.h>

#include <linux/gpio.h>

#include <linux/i2c/tc35876x.h>



#include <asm/setup.h>

#include <asm/mpspec_def.h>
@@ -686,6 +688,19 @@ static void *msic_ocd_platform_data(void *info) 
	return msic_generic_platform_data(info, INTEL_MSIC_BLOCK_OCD);

}



/* tc35876x DSI-LVDS bridge chip and panel platform data */

static void *tc35876x_platform_data(void *data)

{

       static struct tc35876x_platform_data pdata;



       /* gpio pins set to -1 will not be used by the driver */

       pdata.gpio_bridge_reset = get_gpio_by_name("LCMB_RXEN");

       pdata.gpio_panel_bl_en = get_gpio_by_name("6S6P_BL_EN");

       pdata.gpio_panel_vadd = get_gpio_by_name("EN_VREG_LCD_V3P3");



       return &pdata;

}



static const struct devs_id __initconst device_ids[] = {

	{"bma023", SFI_DEV_TYPE_I2C, 1, &no_platform_data},

	{"pmic_gpio", SFI_DEV_TYPE_SPI, 1, &pmic_gpio_platform_data},
@@ -698,6 +713,7 @@ static const struct devs_id __initconst device_ids[] = { 
	{"i2c_accel", SFI_DEV_TYPE_I2C, 0, &lis331dl_platform_data},

	{"pmic_audio", SFI_DEV_TYPE_IPC, 1, &no_platform_data},

	{"mpu3050", SFI_DEV_TYPE_I2C, 1, &mpu3050_platform_data},

	{"i2c_disp_brig", SFI_DEV_TYPE_I2C, 0, &tc35876x_platform_data},



	/* MSIC subdevices */

	{"msic_battery", SFI_DEV_TYPE_IPC, 1, &msic_battery_platform_data},

drivers/gpu/drm/gma500/Kconfig

+8 −2
Original line number Diff line number Diff line
@@ -16,8 +16,7 @@ config DRM_GMA600 
	depends on DRM_GMA500

	help

	  Say yes to include support for GMA600 (Intel Moorestown/Oaktrail)

	  platforms with LVDS ports. HDMI and MIPI are not currently

	  supported.

	  platforms with LVDS ports. MIPI is not currently supported.



config DRM_GMA3600

	bool "Intel GMA3600/3650 support (Experimental)"
@@ -25,3 +24,10 @@ config DRM_GMA3600 
	help

	  Say yes to include basic support for Intel GMA3600/3650 (Intel

	  Cedar Trail) platforms.



config DRM_MEDFIELD

	bool "Intel Medfield support (Experimental)"

	depends on DRM_GMA500 && X86_INTEL_MID

	help

	  Say yes to include support for the Intel Medfield platform.

drivers/gpu/drm/gma500/Makefile

+10 −0
Original line number Diff line number Diff line
@@ -37,4 +37,14 @@ gma500_gfx-$(CONFIG_DRM_GMA600) += oaktrail_device.o \ 
	  oaktrail_hdmi.o \

	  oaktrail_hdmi_i2c.o



gma500_gfx-$(CONFIG_DRM_MEDFIELD) += mdfld_device.o \

	  mdfld_output.o \

	  mdfld_intel_display.o \

	  mdfld_dsi_output.o \

	  mdfld_dsi_dpi.o \

	  mdfld_dsi_pkg_sender.o \

	  mdfld_tpo_vid.o \

	  mdfld_tmd_vid.o \

	  tc35876x-dsi-lvds.o



obj-$(CONFIG_DRM_GMA500) += gma500_gfx.o

drivers/gpu/drm/gma500/cdv_device.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ extern void cdv_hdmi_init(struct drm_device *dev, struct psb_intel_mode_device * 
extern struct drm_display_mode *cdv_intel_crtc_mode_get(struct drm_device *dev,

					     struct drm_crtc *crtc);



extern inline void cdv_intel_wait_for_vblank(struct drm_device *dev)

static inline void cdv_intel_wait_for_vblank(struct drm_device *dev)

{

	/* Wait for 20ms, i.e. one cycle at 50hz. */

        /* FIXME: msleep ?? */

drivers/gpu/drm/gma500/cdv_intel_crt.c

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include "psb_intel_drv.h"

#include "psb_intel_reg.h"

#include "power.h"

#include "cdv_device.h"

#include <linux/pm_runtime.h>