Commit 7b80bd29 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v4.17/soc-signed' of... 

Merge tag 'omap-for-v4.17/soc-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

Pull "SoC changes for omaps for v4.17" from Tony Lindgren:

This series is mostly a series from Suman Anna to remove now unused
platform data that is now coming from device tree. This also make it
a bit simpler to move the timer code to live under drivers in a
separate series of patches. There are also few minor clean-ups for
omap4 PM code.

* tag 'omap-for-v4.17/soc-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Fix typo for wakeup_ns_pa_addr
  ARM: OMAP2+: Use v7_invalidate_l1 in omap4_finish_suspend
  ARM: OMAP2+: Remove unused gpio header file references
  ARM: OMAP: Move plat/i2c.h into mach-omap1 folder
  ARM: OMAP2+: Cleanup omap_mcbsp_dev_attr and other legacy data
  ARM: OMAP2+: Cleanup omap2_spi_dev_attr and other legacy data
  ARM: OMAP2+: Cleanup omap_timer_capability_dev_attr usage
  ARM: OMAP2+: Cleanup omap_i2c_dev_attr usage
  ARM: OMAP2+: Cleanup omap_gpio_dev_attr usage
  ARM: OMAP2+: Include types.h directly for hwmod data
parents dbc78861 e33509c1

arch/arm/mach-omap1/common.h

+1 −2
Original line number Diff line number Diff line
@@ -32,11 +32,10 @@ 


#include <asm/exception.h>



#include <plat/i2c.h>



#include <mach/irqs.h>



#include "soc.h"

#include "i2c.h"



#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)

void omap7xx_map_io(void);

arch/arm/mach-omap1/i2c.c

+0 −2
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 
#include <mach/mux.h>

#include "soc.h"



#include <plat/i2c.h>



#define OMAP_I2C_SIZE		0x3f

#define OMAP1_I2C_BASE		0xfffb3800

arch/arm/plat-omap/include/plat/i2c.h→arch/arm/mach-omap1/i2c.h

+3 −6
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
 *

 */



#ifndef __PLAT_OMAP_I2C_H

#define __PLAT_OMAP_I2C_H

#ifndef __ARCH_ARM_MACH_OMAP1_I2C_H

#define __ARCH_ARM_MACH_OMAP1_I2C_H



struct i2c_board_info;

struct omap_i2c_bus_platform_data;
@@ -47,7 +47,4 @@ static inline int omap_register_i2c_bus_cmdline(void) 
}

#endif



struct omap_hwmod;

int omap_i2c_reset(struct omap_hwmod *oh);



#endif /* __PLAT_OMAP_I2C_H */
 
#endif /* __ARCH_ARM_MACH_OMAP1_I2C_H */

arch/arm/mach-omap2/devices.c

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 */

#include <linux/gpio.h>



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/platform_device.h>

arch/arm/mach-omap2/hsmmc.c

+0 −2
Original line number Diff line number Diff line
@@ -13,9 +13,7 @@ 
#include <linux/slab.h>

#include <linux/string.h>

#include <linux/delay.h>

#include <linux/gpio.h>

#include <linux/mmc/host.h>

#include <linux/platform_data/gpio-omap.h>

#include <linux/platform_data/hsmmc-omap.h>



#include "soc.h"