Skip to contentSkip to conversation

fsl/usb: Move USB internal phy definitions to fsl_usb.h

PATCH New Ramneek Mehresh 2 participants 2 messages Aug 5, 2013 – Aug 14, 2013 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fsl/usb: Move USB internal phy definitions to fsl_usb.h

fsl_usb.h file created to share data bewteen usb platform code and usb ip driver. Internal phy structure definitions moved to this file

---
Applies on git://git.denx.de/u-boot.git
(branch master)

 arch/powerpc/cpu/mpc85xx/cpu_init.c   |  7 +--
 arch/powerpc/include/asm/immap_85xx.h | 48 ---------------------
 include/fsl_usb.h                     | 80 +++++++++++++++++++++++++++++++++++
 3 files changed, 84 insertions(+), 51 deletions(-)
 create mode 100644 include/fsl_usb.h
arch/powerpc/cpu/mpc85xx/cpu_init.c +4 -3
index 25beda2..5aa09c1 100644
@@ -22,6 +22,7 @@
 #include <asm/fsl_law.h>
 #include <asm/fsl_serdes.h>
 #include <asm/fsl_srio.h>
+#include <fsl_usb.h>
 #include <hwconfig.h>
 #include <linux/compiler.h>
 #include "mp.h"
@@ -595,7 +596,7 @@ skip_l2:
 
 #ifdef CONFIG_SYS_FSL_USB1_PHY_ENABLE
 	{
-		ccsr_usb_phy_t *usb_phy1 =
+		struct ccsr_usb_phy __iomem *usb_phy1 =
 			(void *)CONFIG_SYS_MPC85xx_USB1_PHY_ADDR;
 		out_be32(&usb_phy1->usb_enable_override,
 				CONFIG_SYS_FSL_USB_ENABLE_OVERRIDE);
@@ -603,7 +604,7 @@ skip_l2:
 #endif
 #ifdef CONFIG_SYS_FSL_USB2_PHY_ENABLE
 	{
-		ccsr_usb_phy_t *usb_phy2 =
+		struct ccsr_usb_phy __iomem *usb_phy2 =
 			(void *)CONFIG_SYS_MPC85xx_USB2_PHY_ADDR;
 		out_be32(&usb_phy2->usb_enable_override,
 				CONFIG_SYS_FSL_USB_ENABLE_OVERRIDE);
@@ -625,7 +626,7 @@ skip_l2:
 #endif
 
 #if defined(CONFIG_SYS_FSL_USB_DUAL_PHY_ENABLE)
-		ccsr_usb_phy_t *usb_phy =
+		struct ccsr_usb_phy __iomem *usb_phy =
 			(void *)CONFIG_SYS_MPC85xx_USB1_PHY_ADDR;
 		setbits_be32(&usb_phy->pllprg[1],
 			     CONFIG_SYS_FSL_USB_PLLPRG2_PHY2_CLK_EN |
arch/powerpc/include/asm/immap_85xx.h +0 -48

54 lines not on this page · raw message

include/fsl_usb.h new file +80 -0

80 lines not on this page · raw message

Signature · 1 line
1.7.11.7
#1 lore raw

PATCH 1/1 fsl/usb: Move USB internal phy definitions to fsl_usb.h

On 08/05/2013 03:30 AM, Ramneek Mehresh wrote:

<snip>

Quoted 20 lines
include/fsl_usb.h new file +14 -0
new file mode 100644
index 0000000..88d6a1f
@@ -0,0 +1,80 @@
+/*
+ * Freescale USB Controller
+ *
+ * Copyright 2013 Freescale Semiconductor, Inc.
+ *
+ * This software may be used and distributed according to the
+ * terms of the GNU Public License, Version 2, incorporated
+ * herein by reference.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * Version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,

include/fsl_usb.h line 24

Quoted 10 lines
include/fsl_usb.h new file +10 -0
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+

Mehresh,

I am trying to apply this patch and clean up the license header with SPDX license identifier. I noticed you are using GPL v2. As most of u-boot code uses GPL v2+ (with very few files under GPL v2), do you have a specific reason to stay with v2? If not, I am going to replace it with GPL v2.0+.

Regards,

York