Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 626a0695 authored by Alban Bedel's avatar Alban Bedel Committed by Ralf Baechle
Browse files

MIPS: ath79: Correctly name the defines for the PLL_FB register 



This register is named PLL_FB and is not a divider but a multiplier.
To make things less confusing rename the ARxxxx_PLL_DIV_SHIFT and
ARxxxx_PLL_DIV_MASK macros to ARxxxx_PLL_FB_SHIFT and
ARxxxx_PLL_FB_MASK.

Signed-off-by: default avatarAlban Bedel <albeu@free.fr>
Cc: linux-mips@linux-mips.org
Cc: Andrew Bresticker <abrestic@chromium.org>
Cc: Qais Yousef <qais.yousef@imgtec.com>
Cc: Wolfram Sang <wsa@the-dreams.de>
Cc: Sergey Ryazanov <ryazanov.s.a@gmail.com>
Cc: Gabor Juhos <juhosg@openwrt.org>
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/9772/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent da628e8b

arch/mips/ath79/clock.c

+3 −3
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static void __init ar71xx_clocks_init(void) 


	pll = ath79_pll_rr(AR71XX_PLL_REG_CPU_CONFIG);



	div = ((pll >> AR71XX_PLL_DIV_SHIFT) & AR71XX_PLL_DIV_MASK) + 1;

	div = ((pll >> AR71XX_PLL_FB_SHIFT) & AR71XX_PLL_FB_MASK) + 1;

	freq = div * ref_rate;



	div = ((pll >> AR71XX_CPU_DIV_SHIFT) & AR71XX_CPU_DIV_MASK) + 1;
@@ -96,7 +96,7 @@ static void __init ar724x_clocks_init(void) 
	ref_rate = AR724X_BASE_FREQ;

	pll = ath79_pll_rr(AR724X_PLL_REG_CPU_CONFIG);



	div = ((pll >> AR724X_PLL_DIV_SHIFT) & AR724X_PLL_DIV_MASK);

	div = ((pll >> AR724X_PLL_FB_SHIFT) & AR724X_PLL_FB_MASK);

	freq = div * ref_rate;



	div = ((pll >> AR724X_PLL_REF_DIV_SHIFT) & AR724X_PLL_REF_DIV_MASK);
@@ -132,7 +132,7 @@ static void __init ar913x_clocks_init(void) 
	ref_rate = AR913X_BASE_FREQ;

	pll = ath79_pll_rr(AR913X_PLL_REG_CPU_CONFIG);



	div = ((pll >> AR913X_PLL_DIV_SHIFT) & AR913X_PLL_DIV_MASK);

	div = ((pll >> AR913X_PLL_FB_SHIFT) & AR913X_PLL_FB_MASK);

	freq = div * ref_rate;



	cpu_rate = freq;

arch/mips/include/asm/mach-ath79/ar71xx_regs.h

+6 −6
Original line number Diff line number Diff line
@@ -157,8 +157,8 @@ 
#define AR71XX_PLL_REG_ETH0_INT_CLOCK	0x10

#define AR71XX_PLL_REG_ETH1_INT_CLOCK	0x14



#define AR71XX_PLL_DIV_SHIFT		3

#define AR71XX_PLL_DIV_MASK		0x1f

#define AR71XX_PLL_FB_SHIFT		3

#define AR71XX_PLL_FB_MASK		0x1f

#define AR71XX_CPU_DIV_SHIFT		16

#define AR71XX_CPU_DIV_MASK		0x3

#define AR71XX_DDR_DIV_SHIFT		18
@@ -169,8 +169,8 @@ 
#define AR724X_PLL_REG_CPU_CONFIG	0x00

#define AR724X_PLL_REG_PCIE_CONFIG	0x18



#define AR724X_PLL_DIV_SHIFT		0

#define AR724X_PLL_DIV_MASK		0x3ff

#define AR724X_PLL_FB_SHIFT		0

#define AR724X_PLL_FB_MASK		0x3ff

#define AR724X_PLL_REF_DIV_SHIFT	10

#define AR724X_PLL_REF_DIV_MASK		0xf

#define AR724X_AHB_DIV_SHIFT		19
@@ -183,8 +183,8 @@ 
#define AR913X_PLL_REG_ETH0_INT_CLOCK	0x14

#define AR913X_PLL_REG_ETH1_INT_CLOCK	0x18



#define AR913X_PLL_DIV_SHIFT		0

#define AR913X_PLL_DIV_MASK		0x3ff

#define AR913X_PLL_FB_SHIFT		0

#define AR913X_PLL_FB_MASK		0x3ff

#define AR913X_DDR_DIV_SHIFT		22

#define AR913X_DDR_DIV_MASK		0x3

#define AR913X_AHB_DIV_SHIFT		19