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

Commit 4814ced5 authored by Paul Walmsley's avatar Paul Walmsley
Browse files

OMAP: control: move plat-omap/control.h to mach-omap2/control.h 



Only OMAP2+ platforms have the System Control Module (SCM) IP block.
In the past, we've kept the SCM header file in plat-omap.  This has
led to abuse - device drivers including it; includes being added that
create implicit dependencies on OMAP2+ builds; etc.

In response, move the SCM headers into mach-omap2/.

As part of this, remove the direct SCM access from the OMAP UDC
driver.  It was clearly broken.  The UDC code needs an indepth review for
use on OMAP2+ chips.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Cc: Cory Maccarrone <darkstar6262@gmail.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
parent aa218daf

arch/arm/mach-omap2/board-3430sdp.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
#include <plat/gpmc.h>

#include <plat/display.h>



#include <plat/control.h>

#include <plat/gpmc-smc91x.h>



#include "board-flash.h"
@@ -47,6 +46,7 @@ 
#include "sdram-qimonda-hyb18m512160af-6.h"

#include "hsmmc.h"

#include "pm.h"

#include "control.h"



#define CONFIG_DISABLE_HFCLK 1

arch/arm/mach-omap2/board-4430sdp.c

+1 −1
Original line number Diff line number Diff line
@@ -32,12 +32,12 @@ 


#include <plat/board.h>

#include <plat/common.h>

#include <plat/control.h>

#include <plat/usb.h>

#include <plat/mmc.h>



#include "hsmmc.h"

#include "timer-gp.h"

#include "control.h"



#define ETH_KS8851_IRQ			34

#define ETH_KS8851_POWER_ON		48

arch/arm/mach-omap2/board-am3517evm.c

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


#include <plat/board.h>

#include <plat/common.h>

#include <plat/control.h>

#include <plat/usb.h>

#include <plat/display.h>



#include "mux.h"

#include "control.h"



#define AM35XX_EVM_PHY_MASK		(0xF)

#define AM35XX_EVM_MDIO_FREQUENCY	(1000000)

arch/arm/mach-omap2/board-apollon.c

+1 −1
Original line number Diff line number Diff line
@@ -39,9 +39,9 @@ 
#include <plat/board.h>

#include <plat/common.h>

#include <plat/gpmc.h>

#include <plat/control.h>



#include "mux.h"

#include "control.h"



/* LED & Switch macros */

#define LED0_GPIO13		13

arch/arm/mach-omap2/board-cm-t3517.c

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


#include <plat/board.h>

#include <plat/common.h>

#include <plat/control.h>

#include <plat/usb.h>

#include <plat/nand.h>

#include <plat/gpmc.h>
@@ -48,6 +47,7 @@ 
#include <mach/am35xx.h>



#include "mux.h"

#include "control.h"



#if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE)

static struct gpio_led cm_t3517_leds[] = {