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

Commit add49f78 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'pxa-for-4.16' of https://github.com/rjarzmik/linux into next/soc 

This is the pxa changes for v4.16 cycle.

It is :
 - the conversion to the new parser sharpslpart parser
   for the Sharp variants
 - an I2C platform data cleanup for PXA
 - a gpioreg switch of one register for lubbock

* tag 'pxa-for-4.16' of https://github.com/rjarzmik/linux

:
  ARM: pxa/lubbock: add GPIO driver for LUB_MISC_WR register
  ARM: pxa/poodle: Remove hardcoded partitioning, use sharpslpart parser
  ARM: pxa/spitz: Remove hardcoded partitioning, use sharpslpart parser
  ARM: pxa/tosa: Remove hardcoded partitioning, use sharpslpart parser
  ARM: pxa/corgi: Remove hardcoded partitioning, use sharpslpart parser
  ARM: pxa: move header file out of I2C realm
  ARM: pxa: move declarations to proper place

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 34c1baec 9c666384

arch/arm/mach-mmp/mmp2.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ extern void __init mmp2_init_irq(void); 
extern void mmp2_clear_pmic_int(void);



#include <linux/i2c.h>

#include <linux/i2c/pxa-i2c.h>

#include <linux/platform_data/i2c-pxa.h>

#include <linux/platform_data/dma-mmp_tdma.h>



#include "devices.h"

arch/arm/mach-mmp/pxa168.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ extern void pxa168_restart(enum reboot_mode, const char *); 
extern void pxa168_clear_keypad_wakeup(void);



#include <linux/i2c.h>

#include <linux/i2c/pxa-i2c.h>

#include <linux/platform_data/i2c-pxa.h>

#include <linux/platform_data/mtd-nand-pxa3xx.h>

#include <video/pxa168fb.h>

#include <linux/platform_data/keypad-pxa27x.h>

arch/arm/mach-mmp/pxa910.h

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ extern void __init icu_init_irq(void); 
extern void __init pxa910_init_irq(void);



#include <linux/i2c.h>

#include <linux/i2c/pxa-i2c.h>

#include <linux/platform_data/i2c-pxa.h>

#include <linux/platform_data/mtd-nand-pxa3xx.h>

#include <video/mmp_disp.h>

arch/arm/mach-pxa/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ config MACH_PXA3XX_DT 


config ARCH_LUBBOCK

	bool "Intel DBPXA250 Development Platform (aka Lubbock)"

	select GPIO_REG

	select PXA25x

	select SA1111

arch/arm/mach-pxa/balloon3.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <linux/mtd/partitions.h>

#include <linux/types.h>

#include <linux/platform_data/pcf857x.h>

#include <linux/i2c/pxa-i2c.h>

#include <linux/platform_data/i2c-pxa.h>

#include <linux/mtd/rawnand.h>

#include <linux/mtd/physmap.h>

#include <linux/regulator/max1586.h>