Re: [PATCH 2/2] MIPS: BCM63XX: be consistent in clock bits enable naming

[Florian Fainelli <florian@openwrt.org>]

Hi Ralf,

On Tuesday 31 January 2012 15:08:08 Florian Fainelli wrote:
> Remove the _CLK suffix from the BCM6368 clock bits definitions to be
> consistent with what is already present.
> 
> Signed-off-by: Florian Fainelli <florian@openwrt.org>

This patch is a prerequisite for BCM63xx's SPI support, and should be applied 
to your master tree in order to fix the following build failure, the patch 
applies cleanly to your master tree.

arch/mips/bcm63xx/clk.c: In function 'spi_set':
arch/mips/bcm63xx/clk.c:188:10: error: 'CKCTL_6368_SPI_EN' undeclared (first 
use in this function)
arch/mips/bcm63xx/clk.c:188:10: note: each undeclared identifier is reported 
only once for each function it appears in
make[2]: *** [arch/mips/bcm63xx/clk.o] Error 1

Thanks!


> ---
>  arch/mips/bcm63xx/clk.c                           |    6 ++--
>  arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h |   36 
++++++++++----------
>  2 files changed, 21 insertions(+), 21 deletions(-)
> 
> diff --git a/arch/mips/bcm63xx/clk.c b/arch/mips/bcm63xx/clk.c
> index 9d57c71..8d2ea22 100644
> --- a/arch/mips/bcm63xx/clk.c
> +++ b/arch/mips/bcm63xx/clk.c
> @@ -120,7 +120,7 @@ static void enetsw_set(struct clk *clk, int enable)
>  {
>  	if (!BCMCPU_IS_6368())
>  		return;
> -	bcm_hwclock_set(CKCTL_6368_ROBOSW_CLK_EN |
> +	bcm_hwclock_set(CKCTL_6368_ROBOSW_EN |
>  			CKCTL_6368_SWPKT_USB_EN |
>  			CKCTL_6368_SWPKT_SAR_EN, enable);
>  	if (enable) {
> @@ -163,7 +163,7 @@ static void usbh_set(struct clk *clk, int enable)
>  	if (BCMCPU_IS_6348())
>  		bcm_hwclock_set(CKCTL_6348_USBH_EN, enable);
>  	else if (BCMCPU_IS_6368())
> -		bcm_hwclock_set(CKCTL_6368_USBH_CLK_EN, enable);
> +		bcm_hwclock_set(CKCTL_6368_USBH_EN, enable);
>  }
>  
>  static struct clk clk_usbh = {
> @@ -199,7 +199,7 @@ static void xtm_set(struct clk *clk, int enable)
>  	if (!BCMCPU_IS_6368())
>  		return;
>  
> -	bcm_hwclock_set(CKCTL_6368_SAR_CLK_EN |
> +	bcm_hwclock_set(CKCTL_6368_SAR_EN |
>  			CKCTL_6368_SWPKT_SAR_EN, enable);
>  
>  	if (enable) {
> diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h 
b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
> index 94d4faa..6ddd081 100644
> --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
> +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
> @@ -90,29 +90,29 @@
>  #define CKCTL_6368_PHYMIPS_EN		(1 << 6)
>  #define CKCTL_6368_SWPKT_USB_EN		(1 << 7)
>  #define CKCTL_6368_SWPKT_SAR_EN		(1 << 8)
> -#define CKCTL_6368_SPI_CLK_EN		(1 << 9)
> -#define CKCTL_6368_USBD_CLK_EN		(1 << 10)
> -#define CKCTL_6368_SAR_CLK_EN		(1 << 11)
> -#define CKCTL_6368_ROBOSW_CLK_EN	(1 << 12)
> -#define CKCTL_6368_UTOPIA_CLK_EN	(1 << 13)
> -#define CKCTL_6368_PCM_CLK_EN		(1 << 14)
> -#define CKCTL_6368_USBH_CLK_EN		(1 << 15)
> +#define CKCTL_6368_SPI_EN		(1 << 9)
> +#define CKCTL_6368_USBD_EN		(1 << 10)
> +#define CKCTL_6368_SAR_EN		(1 << 11)
> +#define CKCTL_6368_ROBOSW_EN		(1 << 12)
> +#define CKCTL_6368_UTOPIA_EN		(1 << 13)
> +#define CKCTL_6368_PCM_EN		(1 << 14)
> +#define CKCTL_6368_USBH_EN		(1 << 15)
>  #define CKCTL_6368_DISABLE_GLESS_EN	(1 << 16)
> -#define CKCTL_6368_NAND_CLK_EN		(1 << 17)
> -#define CKCTL_6368_IPSEC_CLK_EN		(1 << 17)
> +#define CKCTL_6368_NAND_EN		(1 << 17)
> +#define CKCTL_6368_IPSEC_EN		(1 << 17)
>  
>  #define CKCTL_6368_ALL_SAFE_EN		(CKCTL_6368_SWPKT_USB_EN |	\
>  					CKCTL_6368_SWPKT_SAR_EN |	\
> -					CKCTL_6368_SPI_CLK_EN |		\
> -					CKCTL_6368_USBD_CLK_EN |	\
> -					CKCTL_6368_SAR_CLK_EN |		\
> -					CKCTL_6368_ROBOSW_CLK_EN |	\
> -					CKCTL_6368_UTOPIA_CLK_EN |	\
> -					CKCTL_6368_PCM_CLK_EN |		\
> -					CKCTL_6368_USBH_CLK_EN |	\
> +					CKCTL_6368_SPI_EN |		\
> +					CKCTL_6368_USBD_EN |		\
> +					CKCTL_6368_SAR_EN |		\
> +					CKCTL_6368_ROBOSW_EN |		\
> +					CKCTL_6368_UTOPIA_EN |		\
> +					CKCTL_6368_PCM_EN |		\
> +					CKCTL_6368_USBH_EN |		\
>  					CKCTL_6368_DISABLE_GLESS_EN |	\
> -					CKCTL_6368_NAND_CLK_EN |	\
> -					CKCTL_6368_IPSEC_CLK_EN)
> +					CKCTL_6368_NAND_EN |		\
> +					CKCTL_6368_IPSEC_EN)
>  
>  /* System PLL Control register  */
>  #define PERF_SYS_PLL_CTL_REG		0x8
> -- 
> 1.7.5.4
>