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

Commit 58c3e3ac authored by Max Filippov's avatar Max Filippov
Browse files

xtensa: xtfpga: use clock provider, don't update DT 



Instead of querying hardcoded FPGA frequency register and then updating
clock-frequency property in specificly named DT nodes in machine setup
code register a clock provider that returns fixed-rate clock, configured
by register specified in DT. This way we have less magic/hardcoded names
and use more existing common clock framework code.

Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
Tested-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent bebbc4bc

arch/xtensa/boot/dts/xtfpga.dtsi

+6 −5
Original line number Diff line number Diff line
@@ -36,11 +36,6 @@ 
	};



	clocks {

		osc: main-oscillator {

			#clock-cells = <0>;

			compatible = "fixed-clock";

		};



		clk54: clk54 {

			#clock-cells = <0>;

			compatible = "fixed-clock";
@@ -54,6 +49,12 @@ 
		compatible = "simple-bus";

		ranges = <0x00000000 0xf0000000 0x10000000>;



		osc: main-oscillator {

			#clock-cells = <0>;

			compatible = "cdns,xtfpga-clock";

			reg = <0x0d020004 0x4>;

		};



		serial0: serial@0d050020 {

			device_type = "serial";

			compatible = "ns16550a";

arch/xtensa/platforms/xtfpga/setup.c

+29 −4
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#include <linux/console.h>

#include <linux/delay.h>

#include <linux/of.h>

#include <linux/clk-provider.h>

#include <linux/of_address.h>



#include <asm/timex.h>

#include <asm/processor.h>
@@ -87,6 +89,33 @@ static void __init update_clock_frequency(struct device_node *node) 
	of_update_property(node, newfreq);

}



static void __init xtfpga_clk_setup(struct device_node *np)

{

	void __iomem *base = of_iomap(np, 0);

	struct clk *clk;

	u32 freq;



	if (!base) {

		pr_err("%s: invalid address\n", np->name);

		return;

	}



	freq = __raw_readl(base);

	iounmap(base);

	clk = clk_register_fixed_rate(NULL, np->name, NULL, 0, freq);



	if (IS_ERR(clk)) {

		pr_err("%s: clk registration failed\n", np->name);

		return;

	}



	if (of_clk_add_provider(np, of_clk_src_simple_get, clk)) {

		pr_err("%s: clk provider registration failed\n", np->name);

		return;

	}

}

CLK_OF_DECLARE(xtfpga_clk, "cdns,xtfpga-clock", xtfpga_clk_setup);



#define MAC_LEN 6

static void __init update_local_mac(struct device_node *node)

{
@@ -117,12 +146,8 @@ static void __init update_local_mac(struct device_node *node) 


static int __init machine_setup(void)

{

	struct device_node *clock;

	struct device_node *eth = NULL;



	for_each_node_by_name(clock, "main-oscillator")

		update_clock_frequency(clock);



	if ((eth = of_find_compatible_node(eth, NULL, "opencores,ethoc")))

		update_local_mac(eth);

	return 0;