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

Commit 99f6e1f5 authored by Joonyoung Shim's avatar Joonyoung Shim Committed by Kukjin Kim
Browse files

ARM: S3C64XX: Add usb otg phy control 



This patch supports to control usb otg phy of S3C64XX. Currently, the
driver for usb otg controls usb otg phy but it can be removed by this
patch.

Signed-off-by: default avatarJoonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
[Rebased on the newest git/kgene/linux-samsung #for-next]
Signed-off-by: default avatarLukasz Majewski <l.majewski@samsung.com>
Acked-by: default avatarMark <Brown&lt;broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 6cdeddcc

arch/arm/mach-s3c64xx/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -83,6 +83,11 @@ config S3C64XX_SETUP_SPI 
	help

	 Common setup code for SPI GPIO configurations



config S3C64XX_SETUP_USB_PHY

	bool

	help

	  Common setup code for USB PHY controller



# S36400 Macchine support



config MACH_SMDK6400
@@ -157,6 +162,7 @@ config MACH_SMDK6410 
	select S3C64XX_SETUP_IDE

	select S3C64XX_SETUP_FB_24BPP

	select S3C64XX_SETUP_KEYPAD

	select S3C64XX_SETUP_USB_PHY

	help

	  Machine support for the Samsung SMDK6410
@@ -256,6 +262,7 @@ config MACH_SMARTQ 
	select S3C_DEV_USB_HOST

	select S3C64XX_SETUP_SDHCI

	select S3C64XX_SETUP_FB_24BPP

	select S3C64XX_SETUP_USB_PHY

	select SAMSUNG_DEV_ADC

	select SAMSUNG_DEV_PWM

	select SAMSUNG_DEV_TS
@@ -283,6 +290,7 @@ config MACH_WLF_CRAGG_6410 
	select S3C64XX_SETUP_FB_24BPP

	select S3C64XX_SETUP_KEYPAD

	select S3C64XX_SETUP_SPI

	select S3C64XX_SETUP_USB_PHY

	select SAMSUNG_DEV_ADC

	select SAMSUNG_DEV_KEYPAD

	select S3C_DEV_USB_HOST

arch/arm/mach-s3c64xx/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ obj-$(CONFIG_S3C64XX_SETUP_IDE) += setup-ide.o 
obj-$(CONFIG_S3C64XX_SETUP_KEYPAD)	+= setup-keypad.o

obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o

obj-$(CONFIG_S3C64XX_SETUP_SPI)		+= setup-spi.o

obj-$(CONFIG_S3C64XX_SETUP_USB_PHY) += setup-usb-phy.o



# Machine support

arch/arm/mach-s3c64xx/mach-crag6410.c

+4 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
#include <plat/sdhci.h>

#include <plat/gpio-cfg.h>

#include <plat/s3c64xx-spi.h>

#include <plat/udc-hs.h>



#include <plat/keypad.h>

#include <plat/clock.h>
@@ -698,6 +699,8 @@ static struct s3c_sdhci_platdata crag6410_hsmmc0_pdata = { 
	.cfg_gpio		= crag6410_cfg_sdhci0,

};



static struct s3c_hsotg_plat crag6410_hsotg_pdata;



static void __init crag6410_machine_init(void)

{

	/* Open drain IRQs need pullups */
@@ -722,6 +725,7 @@ static void __init crag6410_machine_init(void) 
	s3c_i2c0_set_platdata(&i2c0_pdata);

	s3c_i2c1_set_platdata(&i2c1_pdata);

	s3c_fb_set_platdata(&crag6410_lcd_pdata);

	s3c_hsotg_set_platdata(&crag6410_hsotg_pdata);



	i2c_register_board_info(0, i2c_devs0, ARRAY_SIZE(i2c_devs0));

	i2c_register_board_info(1, i2c_devs1, ARRAY_SIZE(i2c_devs1));

arch/arm/mach-s3c64xx/mach-smartq.c

+3 −0
Original line number Diff line number Diff line
@@ -187,6 +187,8 @@ static struct s3c_hwmon_pdata smartq_hwmon_pdata __initdata = { 
	},

};



static struct s3c_hsotg_plat smartq_hsotg_pdata;



static int __init smartq_lcd_setup_gpio(void)

{

	int ret;
@@ -383,6 +385,7 @@ void __init smartq_map_io(void) 
void __init smartq_machine_init(void)

{

	s3c_i2c0_set_platdata(NULL);

	s3c_hsotg_set_platdata(&smartq_hsotg_pdata);

	s3c_hwmon_set_platdata(&smartq_hwmon_pdata);

	s3c_sdhci1_set_platdata(&smartq_internal_hsmmc_pdata);

	s3c_sdhci2_set_platdata(&smartq_internal_hsmmc_pdata);

arch/arm/mach-s3c64xx/mach-smdk6410.c

+4 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ 
#include <plat/keypad.h>

#include <plat/backlight.h>

#include <plat/regs-fb-v4.h>

#include <plat/udc-hs.h>



#include "common.h"
@@ -631,6 +632,8 @@ static struct platform_pwm_backlight_data smdk6410_bl_data = { 
	.pwm_id = 1,

};



static struct s3c_hsotg_plat smdk6410_hsotg_pdata;



static void __init smdk6410_map_io(void)

{

	u32 tmp;
@@ -659,6 +662,7 @@ static void __init smdk6410_machine_init(void) 
	s3c_i2c0_set_platdata(NULL);

	s3c_i2c1_set_platdata(NULL);

	s3c_fb_set_platdata(&smdk6410_lcd_pdata);

	s3c_hsotg_set_platdata(&smdk6410_hsotg_pdata);



	samsung_keypad_set_platdata(&smdk6410_keypad_data);