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

Commit 415e0fec authored by Manuel Lauss's avatar Manuel Lauss Committed by Ralf Baechle
Browse files

MIPS: Alchemy: db1x00: use clk framework 



Make use of the clk framework to set up and enable all PSC clocks.

Signed-off-by: default avatarManuel Lauss <manuel.lauss@gmail.com>
Cc: Linux-MIPS <linux-mips@linux-mips.org>
Patchwork: https://patchwork.linux-mips.org/patch/7469/


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

arch/mips/alchemy/devboards/db1200.c

+25 −25
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */



#include <linux/clk.h>

#include <linux/dma-mapping.h>

#include <linux/gpio.h>

#include <linux/i2c.h>
@@ -129,7 +130,6 @@ static int __init db1200_detect_board(void) 


int __init db1200_board_setup(void)

{

	unsigned long freq0, clksrc, div, pfc;

	unsigned short whoami;



	if (db1200_detect_board())
@@ -149,30 +149,6 @@ int __init db1200_board_setup(void) 
		"  Board-ID %d	Daughtercard ID %d\n", get_system_type(),

		(whoami >> 4) & 0xf, (whoami >> 8) & 0xf, whoami & 0xf);



	/* SMBus/SPI on PSC0, Audio on PSC1 */

	pfc = alchemy_rdsys(AU1000_SYS_PINFUNC);

	pfc &= ~(SYS_PINFUNC_P0A | SYS_PINFUNC_P0B);

	pfc &= ~(SYS_PINFUNC_P1A | SYS_PINFUNC_P1B | SYS_PINFUNC_FS3);

	pfc |= SYS_PINFUNC_P1C; /* SPI is configured later */

	alchemy_wrsys(pfc, AU1000_SYS_PINFUNC);



	/* Clock configurations: PSC0: ~50MHz via Clkgen0, derived from

	 * CPU clock; all other clock generators off/unused.

	 */

	div = (get_au1x00_speed() + 25000000) / 50000000;

	if (div & 1)

		div++;

	div = ((div >> 1) - 1) & 0xff;



	freq0 = div << SYS_FC_FRDIV0_BIT;

	alchemy_wrsys(freq0, AU1000_SYS_FREQCTRL0);

	freq0 |= SYS_FC_FE0;	/* enable F0 */

	alchemy_wrsys(freq0, AU1000_SYS_FREQCTRL0);



	/* psc0_intclk comes 1:1 from F0 */

	clksrc = SYS_CS_MUX_FQ0 << SYS_CS_ME0_BIT;

	alchemy_wrsys(clksrc, AU1000_SYS_CLKSRC);



	return 0;

}
@@ -843,6 +819,7 @@ int __init db1200_dev_setup(void) 
	unsigned long pfc;

	unsigned short sw;

	int swapped, bid;

	struct clk *c;



	bid = BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI));

	if ((bid == BCSR_WHOAMI_PB1200_DDR1) ||
@@ -855,6 +832,24 @@ int __init db1200_dev_setup(void) 
	irq_set_irq_type(AU1200_GPIO7_INT, IRQ_TYPE_LEVEL_LOW);

	bcsr_init_irq(DB1200_INT_BEGIN, DB1200_INT_END, AU1200_GPIO7_INT);



	/* SMBus/SPI on PSC0, Audio on PSC1 */

	pfc = alchemy_rdsys(AU1000_SYS_PINFUNC);

	pfc &= ~(SYS_PINFUNC_P0A | SYS_PINFUNC_P0B);

	pfc &= ~(SYS_PINFUNC_P1A | SYS_PINFUNC_P1B | SYS_PINFUNC_FS3);

	pfc |= SYS_PINFUNC_P1C; /* SPI is configured later */

	alchemy_wrsys(pfc, AU1000_SYS_PINFUNC);



	/* get 50MHz for I2C driver on PSC0 */

	c = clk_get(NULL, "psc0_intclk");

	if (!IS_ERR(c)) {

		pfc = clk_round_rate(c, 50000000);

		if ((pfc < 1) || (abs(50000000 - pfc) > 2500000))

			pr_warn("DB1200: cant get I2C close to 50MHz\n");

		else

			clk_set_rate(c, pfc);

		clk_put(c);

	}



	/* insert/eject pairs: one of both is always screaming.	 To avoid

	 * issues they must not be automatically enabled when initially

	 * requested.
@@ -927,6 +922,11 @@ int __init db1200_dev_setup(void) 
	}



	/* Audio PSC clock is supplied externally. (FIXME: platdata!!) */

	c = clk_get(NULL, "psc1_intclk");

	if (!IS_ERR(c)) {

		clk_prepare_enable(c);

		clk_put(c);

	}

	__raw_writel(PSC_SEL_CLK_SERCLK,

	    (void __iomem *)KSEG1ADDR(AU1550_PSC1_PHYS_ADDR) + PSC_SEL_OFFSET);

	wmb();

arch/mips/alchemy/devboards/db1300.c

+7 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 * (c) 2009 Manuel Lauss <manuel.lauss@googlemail.com>

 */



#include <linux/clk.h>

#include <linux/dma-mapping.h>

#include <linux/gpio.h>

#include <linux/gpio_keys.h>
@@ -731,6 +732,7 @@ static struct platform_device *db1300_dev[] __initdata = { 
int __init db1300_dev_setup(void)

{

	int swapped, cpldirq;

	struct clk *c;



	/* setup CPLD IRQ muxer */

	cpldirq = au1300_gpio_to_irq(AU1300_PIN_EXTCLK1);
@@ -761,6 +763,11 @@ int __init db1300_dev_setup(void) 
	    (void __iomem *)KSEG1ADDR(AU1300_PSC2_PHYS_ADDR) + PSC_SEL_OFFSET);

	wmb();

	/* I2C uses internal 48MHz EXTCLK1 */

	c = clk_get(NULL, "psc3_intclk");

	if (!IS_ERR(c)) {

		clk_prepare_enable(c);

		clk_put(c);

	}

	__raw_writel(PSC_SEL_CLK_INTCLK,

	    (void __iomem *)KSEG1ADDR(AU1300_PSC3_PHYS_ADDR) + PSC_SEL_OFFSET);

	wmb();

arch/mips/alchemy/devboards/db1550.c

+13 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 * (c) 2011 Manuel Lauss <manuel.lauss@googlemail.com>

 */



#include <linux/clk.h>

#include <linux/dma-mapping.h>

#include <linux/gpio.h>

#include <linux/i2c.h>
@@ -574,6 +575,7 @@ static void __init pb1550_devices(void) 
int __init db1550_dev_setup(void)

{

	int swapped, id;

	struct clk *c;



	id = (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI)) != BCSR_WHOAMI_DB1550);
@@ -582,6 +584,17 @@ int __init db1550_dev_setup(void) 
	spi_register_board_info(db1550_spi_devs,

				ARRAY_SIZE(db1550_i2c_devs));



	c = clk_get(NULL, "psc0_intclk");

	if (!IS_ERR(c)) {

		clk_prepare_enable(c);

		clk_put(c);

	}

	c = clk_get(NULL, "psc2_intclk");

	if (!IS_ERR(c)) {

		clk_prepare_enable(c);

		clk_put(c);

	}



	/* Audio PSC clock is supplied by codecs (PSC1, 3) FIXME: platdata!! */

	__raw_writel(PSC_SEL_CLK_SERCLK,

	    (void __iomem *)KSEG1ADDR(AU1550_PSC1_PHYS_ADDR) + PSC_SEL_OFFSET);