Re: [PATCH v8 2/3] ARM: S3C64XX: Enabling samsung-usbphy driver

On Thu, Nov 22, 2012 at 1:54 AM, Tomasz Figa [off-list ref] wrote:

Hi Praveen,

On Wednesday 14 of November 2012 16:15:37 Praveen Paneri wrote:

quoted

Adding platform device for samsung-usbphy driver. Enabling it for
s3c64xx based machines using s3c-hsotg.

Signed-off-by: Praveen Paneri <redacted>
---
 arch/arm/mach-s3c64xx/include/mach/map.h     |    2 +
 arch/arm/mach-s3c64xx/mach-crag6410.c        |    7 ++++++
 arch/arm/mach-s3c64xx/mach-smartq.c          |    8 +++++++
 arch/arm/mach-s3c64xx/mach-smdk6410.c        |    7 ++++++
 arch/arm/mach-s3c64xx/setup-usb-phy.c        |   14 +++++++++++++
 arch/arm/plat-samsung/devs.c                 |   28
++++++++++++++++++++++++++ arch/arm/plat-samsung/include/plat/devs.h
|    1 +
 arch/arm/plat-samsung/include/plat/usb-phy.h |    1 +
 8 files changed, 68 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-s3c64xx/include/mach/map.h

b/arch/arm/mach-s3c64xx/include/mach/map.h index 8e2097b..dc482bb
100644

--- a/arch/arm/mach-s3c64xx/include/mach/map.h
+++ b/arch/arm/mach-s3c64xx/include/mach/map.h

@@ -65,6 +65,7 @@

 #define S3C64XX_PA_NAND              (0x70200000)
 #define S3C64XX_PA_FB                (0x77100000)
+#define S3C64XX_PA_USB_HSPHY (0x7C100000)
 #define S3C64XX_PA_USB_HSOTG (0x7C000000)
 #define S3C64XX_PA_WATCHDOG  (0x7E004000)
 #define S3C64XX_PA_RTC               (0x7E005000)

@@ -113,6 +114,7 @@
 #define S3C_PA_FB            S3C64XX_PA_FB
 #define S3C_PA_USBHOST               S3C64XX_PA_USBHOST
 #define S3C_PA_USB_HSOTG     S3C64XX_PA_USB_HSOTG
+#define S3C_PA_USB_PHY               S3C64XX_PA_USB_HSPHY
 #define S3C_PA_RTC           S3C64XX_PA_RTC
 #define S3C_PA_WDT           S3C64XX_PA_WATCHDOG
 #define S3C_PA_SPI0          S3C64XX_PA_SPI0

diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c

b/arch/arm/mach-s3c64xx/mach-crag6410.c index 48f4a2d..c602379 100644

--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c

@@ -31,6 +31,7 @@
 #include <linux/spi/spi.h>

 #include <linux/i2c/pca953x.h>
+#include <linux/platform_data/samsung-usbphy.h>

 #include <video/platform_lcd.h>

@@ -69,6 +70,7 @@
 #include <plat/adc.h>
 #include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/pm.h>
+#include <plat/usb-phy.h>

 #include "common.h"

@@ -353,6 +355,7 @@ static struct platform_device wallvdd_device = {
 };

 static struct platform_device *crag6410_devices[] __initdata = {
+     &samsung_device_usbphy,
      &s3c_device_hsmmc0,
      &s3c_device_hsmmc2,
      &s3c_device_i2c0,

@@ -804,6 +807,9 @@ static const struct gpio_led_platform_data

gpio_leds_pdata = { .num_leds = ARRAY_SIZE(gpio_leds),
 };

+static struct samsung_usbphy_data crag6410_usbphy_pdata __initdata = {
+     .pmu_isolation = s5p_usb_phy_pmu_isolation,
+};

Why not define default platform data somewhere and always use it for
s3c64xx, without redefining the same structure in all boards?

quoted

 static void __init crag6410_machine_init(void)
 {

@@ -829,6 +835,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);
+     samsung_usbphy_set_pdata(&crag6410_usbphy_pdata);

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

diff --git a/arch/arm/mach-s3c64xx/mach-smartq.c

b/arch/arm/mach-s3c64xx/mach-smartq.c index 59bb34c..f18a0ab 100644

--- a/arch/arm/mach-s3c64xx/mach-smartq.c
+++ b/arch/arm/mach-s3c64xx/mach-smartq.c

@@ -18,6 +18,7 @@
 #include <linux/serial_core.h>
 #include <linux/spi/spi_gpio.h>
 #include <linux/usb/gpio_vbus.h>
+#include <linux/platform_data/samsung-usbphy.h>

 #include <asm/mach-types.h>
 #include <asm/mach/map.h>

@@ -36,6 +37,7 @@
 #include <linux/platform_data/usb-ohci-s3c2410.h>
 #include <plat/sdhci.h>
 #include <linux/platform_data/touchscreen-s3c2410.h>
+#include <plat/usb-phy.h>

 #include <video/platform_lcd.h>

@@ -234,6 +236,7 @@ static struct i2c_board_info smartq_i2c_devs[]

__initdata = { };

 static struct platform_device *smartq_devices[] __initdata = {
+     &samsung_device_usbphy,
      &s3c_device_hsmmc1,     /* Init iNAND first, ... */
      &s3c_device_hsmmc0,     /* ... then the external SD card */
      &s3c_device_hsmmc2,

@@ -380,9 +383,14 @@ void __init smartq_map_io(void)
      smartq_lcd_mode_set();
 }

+static struct samsung_usbphy_data smartq_usbphy_pdata __initdata = {
+     .pmu_isolation = s5p_usb_phy_pmu_isolation,
+};
+
 void __init smartq_machine_init(void)
 {
      s3c_i2c0_set_platdata(NULL);
+     samsung_usbphy_set_pdata(&smartq_usbphy_pdata);
      s3c_hwmon_set_platdata(&smartq_hwmon_pdata);
      s3c_sdhci1_set_platdata(&smartq_internal_hsmmc_pdata);
      s3c_sdhci2_set_platdata(&smartq_internal_hsmmc_pdata);

diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c

b/arch/arm/mach-s3c64xx/mach-smdk6410.c index 123f452..00e46a6 100644

--- a/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c

@@ -30,6 +30,7 @@
 #include <linux/regulator/fixed.h>
 #include <linux/regulator/machine.h>
 #include <linux/pwm_backlight.h>
+#include <linux/platform_data/samsung-usbphy.h>

 #ifdef CONFIG_SMDK6410_WM1190_EV1
 #include <linux/mfd/wm8350/core.h>

@@ -72,6 +73,7 @@
 #include <linux/platform_data/touchscreen-s3c2410.h>
 #include <plat/keypad.h>
 #include <plat/backlight.h>
+#include <plat/usb-phy.h>

 #include "common.h"

@@ -263,6 +265,7 @@ static struct samsung_keypad_platdata

smdk6410_keypad_data __initdata = { static struct map_desc
smdk6410_iodesc[] = {};

 static struct platform_device *smdk6410_devices[] __initdata = {
+     &samsung_device_usbphy,
 #ifdef CONFIG_SMDK6410_SD_CH0
      &s3c_device_hsmmc0,
 #endif

@@ -626,6 +629,9 @@ static struct platform_pwm_backlight_data

smdk6410_bl_data = { .pwm_id = 1,
 };

+static struct samsung_usbphy_data smdk6410_usbphy_pdata __initdata = {
+     .pmu_isolation = s5p_usb_phy_pmu_isolation,
+};

 static void __init smdk6410_map_io(void)
 {

@@ -655,6 +661,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);
+     samsung_usbphy_set_pdata(&smdk6410_usbphy_pdata);

      samsung_keypad_set_platdata(&smdk6410_keypad_data);

diff --git a/arch/arm/mach-s3c64xx/setup-usb-phy.c

b/arch/arm/mach-s3c64xx/setup-usb-phy.c index 7a09553..3aee778 100644

--- a/arch/arm/mach-s3c64xx/setup-usb-phy.c
+++ b/arch/arm/mach-s3c64xx/setup-usb-phy.c

@@ -9,3 +9,17 @@
  *
  */

+#include <linux/io.h>
+#include <mach/map.h>
+#include <mach/regs-sys.h>
+
+void s5p_usb_phy_pmu_isolation(int on)
+{
+     if (on) {
+             writel(readl(S3C64XX_OTHERS) & ~S3C64XX_OTHERS_USBMASK,
+                     S3C64XX_OTHERS);
+     } else {
+             writel(readl(S3C64XX_OTHERS) | S3C64XX_OTHERS_USBMASK,
+                     S3C64XX_OTHERS);
+     }

nitpick: Unnecessary braces for one line if/else.

quoted

+}

diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c
index bc50b20..4031c77 100644
--- a/arch/arm/plat-samsung/devs.c
+++ b/arch/arm/plat-samsung/devs.c

@@ -31,6 +31,7 @@
 #include <linux/ioport.h>
 #include <linux/platform_data/s3c-hsudc.h>
 #include <linux/platform_data/s3c-hsotg.h>
+#include <linux/platform_data/samsung-usbphy.h>

 #include <media/s5p_hdmi.h>

@@ -1367,6 +1368,30 @@ struct platform_device s5p_device_mixer = {

 /* USB */

+#ifdef CONFIG_ARCH_S3C64XX
+/* USB PHY*/
+static struct resource samsung_usbphy_resource[] = {
+     [0] = {
+             .start = S3C_PA_USB_PHY,
+             .end   = S3C_PA_USB_PHY + SZ_16 - 1,
+             .flags = IORESOURCE_MEM,
+     },
+};
+
+struct platform_device samsung_device_usbphy = {
+     .name           = "s3c64xx-usbphy",
+     .id             = -1,
+     .num_resources  = ARRAY_SIZE(samsung_usbphy_resource),
+     .resource       = samsung_usbphy_resource,
+};
+
+void __init samsung_usbphy_set_pdata(struct samsung_usbphy_data *pd)
+{
+     s3c_set_platdata(pd, sizeof(struct samsung_usbphy_data),
+                     &samsung_device_usbphy);
+}

This is strange. samsung_usbphy_set_pdata is declared unconditionally in
linux/platform_data/samsung-usbphy.h , but it's defined only for S3C64XX?

Maybe the condition should be CONFIG_SAMSUNG_USBPHY not
CONFIG_ARCH_S3C64XX and in case of CONFIG_SAMSUNG_USBPHY disabled a dummy
inline samsung_usphy_set_pdata should be defined in the header?

Will update accordingly
Thanks,
Praveen

Best regards,
Tomasz Figa

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html