Skip to contentSkip to conversation

usb: ehci-mx5: Remove unneeded write to cscmr1 register

PATCH New Fabio Estevam 2 participants 3 messages Jul 26, 2013

Subsystems (3)
Arm (32-bit) USB USB ehci driver
lore
Share & tools
lore

Fabio Estevam

author
#0 lore raw

PATCH 1/2 usb: ehci-mx5: Remove unneeded write to cscmr1 register

From: Fabio Estevam <[email protected]>

Currently we have the following behavior in ehci_hcd_init()

- Read csmr1 register, clear bit 26 and then set bit 26.

However a little bit later we call set_usb_phy_clk() which clears bit 26, so let's get rid of the unnecessary code.

Signed-off-by Fabio Estevam <[email protected]>
---
 drivers/usb/host/ehci-mx5.c | 9 ---------
 1 file changed, 9 deletions(-)
drivers/usb/host/ehci-mx5.c +0 -9
index f43c38d..6178a1d 100644
@@ -229,15 +229,6 @@ void __weak board_ehci_hcd_postinit(struct usb_ehci *ehci, int port)
 int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
 {
 	struct usb_ehci *ehci;
-#ifdef CONFIG_MX53
-	struct clkctl *sc_regs = (struct clkctl *)CCM_BASE_ADDR;
-	u32 reg;
-
-	reg = __raw_readl(&sc_regs->cscmr1) & ~(1 << 26);
-	/* derive USB PHY clock multiplexer from PLL3 */
-	reg |= 1 << 26;
-	__raw_writel(reg, &sc_regs->cscmr1);
-#endif
 
 	set_usboh3_clk();
 	enable_usboh3_clk(1);
Signature · 1 line
1.8.1.2
author
#1 lore raw

PATCH 2/2 usb: ehci-mx5: Use 'bool' instead of 'unsigned char'

From: Fabio Estevam <[email protected]>

The 'enable' argument can be better expressed as boolean.

Signed-off-by Fabio Estevam <[email protected]>
---
 arch/arm/cpu/armv7/mx5/clock.c        | 10 +++++-----
 arch/arm/include/asm/arch-mx5/clock.h |  6 +++---
 drivers/usb/host/ehci-mx5.c           |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)
arch/arm/cpu/armv7/mx5/clock.c +5 -5
index 431756e..a76ceb0 100644
@@ -101,7 +101,7 @@ void set_usboh3_clk(void)
 			MXC_CCM_CSCDR1_USBOH3_CLK_PODF(1));
 }
 
-void enable_usboh3_clk(unsigned char enable)
+void enable_usboh3_clk(bool enable)
 {
 	unsigned int cg = enable ? MXC_CCM_CCGR_CG_ON : MXC_CCM_CCGR_CG_OFF;
 

@@ -138,7 +138,7 @@ void set_usb_phy_clk(void)
 }
 
 #if defined(CONFIG_MX51)
-void enable_usb_phy1_clk(unsigned char enable)
+void enable_usb_phy1_clk(bool enable)
 {
 	unsigned int cg = enable ? MXC_CCM_CCGR_CG_ON : MXC_CCM_CCGR_CG_OFF;
 

@@ -147,12 +147,12 @@ void enable_usb_phy1_clk(unsigned char enable)
 			MXC_CCM_CCGR2_USB_PHY(cg));
 }
 
-void enable_usb_phy2_clk(unsigned char enable)
+void enable_usb_phy2_clk(bool enable)
 {
 	/* i.MX51 has a single USB PHY clock, so do nothing here. */
 }
 #elif defined(CONFIG_MX53)
-void enable_usb_phy1_clk(unsigned char enable)
+void enable_usb_phy1_clk(bool enable)
 {
 	unsigned int cg = enable ? MXC_CCM_CCGR_CG_ON : MXC_CCM_CCGR_CG_OFF;
 

@@ -161,7 +161,7 @@ void enable_usb_phy1_clk(unsigned char enable)
 			MXC_CCM_CCGR4_USB_PHY1(cg));
 }
 
-void enable_usb_phy2_clk(unsigned char enable)
+void enable_usb_phy2_clk(bool enable)
 {
 	unsigned int cg = enable ? MXC_CCM_CCGR_CG_ON : MXC_CCM_CCGR_CG_OFF;
arch/arm/include/asm/arch-mx5/clock.h +3 -3
index 6910192..730f903 100644
@@ -62,10 +62,10 @@ u32 imx_get_fecclk(void);
 unsigned int mxc_get_clock(enum mxc_clock clk);
 int mxc_set_clock(u32 ref, u32 freq, u32 clk_type);
 void set_usb_phy_clk(void);
-void enable_usb_phy1_clk(unsigned char enable);
-void enable_usb_phy2_clk(unsigned char enable);
+void enable_usb_phy1_clk(bool enable);
+void enable_usb_phy2_clk(bool enable);
 void set_usboh3_clk(void);
-void enable_usboh3_clk(unsigned char enable);
+void enable_usboh3_clk(bool enable);
 void mxc_set_sata_internal_clock(void);
 int enable_i2c_clk(unsigned char enable, unsigned i2c_num);
 void enable_nfc_clk(unsigned char enable);
drivers/usb/host/ehci-mx5.c +3 -3
index 6178a1d..f1ebd58 100644
@@ -231,10 +231,10 @@ int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
 	struct usb_ehci *ehci;
 
 	set_usboh3_clk();
-	enable_usboh3_clk(1);
+	enable_usboh3_clk(true);
 	set_usb_phy_clk();
-	enable_usb_phy1_clk(1);
-	enable_usb_phy2_clk(1);
+	enable_usb_phy1_clk(true);
+	enable_usb_phy2_clk(true);
 	mdelay(1);
 
 	/* Do board specific initialization */
Signature · 1 line
1.8.1.2
#2 lore raw

PATCH 2/2 usb: ehci-mx5: Use 'bool' instead of 'unsigned char'

Quoted 5 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

The 'enable' argument can be better expressed as boolean.

Signed-off-by Fabio Estevam <[email protected]>
Reviewed-by Otavio Salvador <[email protected]>
Signature · 3 lines
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750