From: Olof Johansson Date: Sat, 2 Jun 2018 08:19:38 +0000 (-0700) Subject: Merge tag 'pxa-for-4.18' of https://github.com/rjarzmik/linux into next/soc X-Git-Tag: v5.15~8629^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=30a04c1e32cad5723cb67926ce2926b85670cd4b;p=platform%2Fkernel%2Flinux-starfive.git 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: Olof Johansson --- 30a04c1e32cad5723cb67926ce2926b85670cd4b