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

Commit 30a04c1e authored by Olof Johansson's avatar Olof Johansson
Browse files

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

This is is the pxa changes for v4.18 cycle :
 - change to phase out at24 eeprom platform data
 - add a missing wakeup pin on pxa320 SoCs

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

:
  ARM: pxa3xx: enable external wakeup pins
  ARM: pxa: stargate2: use device properties for at24 eeprom

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ffd831a3 c1c14f89

arch/arm/mach-pxa/pxa3xx.c

+4 −0
Original line number Diff line number Diff line
@@ -446,6 +446,10 @@ static int __init pxa3xx_init(void) 


		pxa3xx_init_pm();



		enable_irq_wake(IRQ_WAKEUP0);

		if (cpu_is_pxa320())

			enable_irq_wake(IRQ_WAKEUP1);



		register_syscore_ops(&pxa_irq_syscore_ops);

		register_syscore_ops(&pxa3xx_mfp_syscore_ops);

arch/arm/mach-pxa/stargate2.c

+5 −5
Original line number Diff line number Diff line
@@ -27,11 +27,11 @@ 


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

#include <linux/platform_data/pcf857x.h>

#include <linux/platform_data/at24.h>

#include <linux/smc91x.h>

#include <linux/gpio/machine.h>

#include <linux/gpio.h>

#include <linux/leds.h>

#include <linux/property.h>



#include <asm/types.h>

#include <asm/setup.h>
@@ -795,9 +795,9 @@ static struct pcf857x_platform_data platform_data_pcf857x = { 
	.context = NULL,

};



static struct at24_platform_data pca9500_eeprom_pdata = {

	.byte_len = 256,

	.page_size = 4,

static const struct property_entry pca9500_eeprom_properties[] = {

	PROPERTY_ENTRY_U32("pagesize", 4),

	{ }

};



/**
@@ -935,7 +935,7 @@ static struct i2c_board_info __initdata stargate2_i2c_board_info[] = { 
	}, {

		.type = "24c02",

		.addr = 0x57,

		.platform_data = &pca9500_eeprom_pdata,

		.properties = pca9500_eeprom_properties,

	}, {

		.type = "max1238",

		.addr = 0x35,