diff options
| author | Wolfgang Denk <[email protected]> | 2014-03-25 14:49:48 +0100 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2014-04-17 14:39:54 -0400 |
| commit | e7300f463d0c5f414d4cb717cad925554564a92e (patch) | |
| tree | 7311fc2837cf1e3d577af94e8766dd38263a7284 | |
| parent | 1b82491ee6ee1e986e5521b33692a00e1f38fe75 (diff) | |
ARM: OMAP: remove sr32() from OMAP board code
Replace the custom sr32() bit manipulation function in
arch/arm/cpu/armv7/omap3/board.c and board/ti/panda/panda.c
by standard I/O accessors.
Signed-off-by: Wolfgang Denk <[email protected]>
Cc: Tom Rini <[email protected]>
Cc: Albert ARIBAUD <[email protected]>
| -rw-r--r-- | arch/arm/cpu/armv7/omap3/board.c | 4 | ||||
| -rw-r--r-- | board/ti/panda/panda.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c index 29228160c32..9bb1a1c8f9a 100644 --- a/arch/arm/cpu/armv7/omap3/board.c +++ b/arch/arm/cpu/armv7/omap3/board.c @@ -290,8 +290,8 @@ void watchdog_init(void) * should not be running and does not generate a PRCM reset. */ - sr32(&prcm_base->fclken_wkup, 5, 1, 1); - sr32(&prcm_base->iclken_wkup, 5, 1, 1); + setbits_le32(&prcm_base->fclken_wkup, 0x20); + setbits_le32(&prcm_base->iclken_wkup, 0x20); wait_on_value(ST_WDT2, 0x20, &prcm_base->idlest_wkup, 5); writel(WD_UNLOCK1, &wd2_base->wspr); diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c index 5ab6db98acb..0dfb4ad5e09 100644 --- a/board/ti/panda/panda.c +++ b/board/ti/panda/panda.c @@ -308,7 +308,7 @@ int ehci_hcd_init(int index, enum usb_init_type init, /* Now we can enable our port clocks */ utmi_clk = readl((void *)CM_L3INIT_HSUSBHOST_CLKCTRL); utmi_clk |= HSUSBHOST_CLKCTRL_CLKSEL_UTMI_P1_MASK; - sr32((void *)CM_L3INIT_HSUSBHOST_CLKCTRL, 0, 32, utmi_clk); + setbits_le32((void *)CM_L3INIT_HSUSBHOST_CLKCTRL, utmi_clk); ret = omap_ehci_hcd_init(index, &usbhs_bdata, hccr, hcor); if (ret < 0) |