Commit 1bf4b15b authored by Tony Lindgren's avatar Tony Lindgren
Browse files

clk: ti: Fix dm814x clkctrl for ethernet 



We are missing alwon ethernet clock for dm814x and this prevents us
from probing the CPSW with device tree only data. Looks like Ethernet
currently only works if it has been enabled in the bootloader.

Looks like relying on the bootloader clocks is not an issue with the
mainline kernel currently, but it will be an issue when configuring
CPSW Ethernet to probe with device tree data only as we will be managing
the clocks.

Fixes: 26ca2e97 ("clk: ti: dm814: add clkctrl clock data")
Cc: linux-clk@vger.kernel.org
Cc: Graeme Smecher <gsmecher@threespeedlogic.com>
Cc: Grygorii Strashko <grygorii.strashko@ti.com>
Cc: Michael Turquette <mturquette@baylibre.com>
Cc: Stephen Boyd <sboyd@kernel.org>
Cc: Tero Kristo <t-kristo@ti.com>
Acked-by: default avatarStephen Boyd <sboyd@kernel.org>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent bb6d3fb3

arch/arm/boot/dts/dm814x-clocks.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -362,4 +362,18 @@ 
			#clock-cells = <2>;

		};

	};



	alwon_ethernet_cm: alwon_ethernet_cm@15d4 {

		compatible = "ti,omap4-cm";

		reg = <0x15d4 0x4>;

		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0 0x15d4 0x4>;



		alwon_ethernet_clkctrl: clk@0 {

			compatible = "ti,clkctrl";

			reg = <0 0x4>;

			#clock-cells = <2>;

		};

	};

};

drivers/clk/ti/clk-814x.c

+6 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ static const struct omap_clkctrl_reg_data dm814_alwon_clkctrl_regs[] __initconst 
	{ DM814_WD_TIMER_CLKCTRL, NULL, CLKF_SW_SUP | CLKF_NO_IDLEST, "sysclk18_ck" },

	{ DM814_MCSPI1_CLKCTRL, NULL, CLKF_SW_SUP, "sysclk10_ck" },

	{ DM814_GPMC_CLKCTRL, NULL, CLKF_SW_SUP, "sysclk6_ck" },

	{ DM814_CPGMAC0_CLKCTRL, NULL, CLKF_SW_SUP, "cpsw_125mhz_gclk" },

	{ DM814_MPU_CLKCTRL, NULL, CLKF_SW_SUP, "mpu_ck" },

	{ DM814_RTC_CLKCTRL, NULL, CLKF_SW_SUP | CLKF_NO_IDLEST, "sysclk18_ck" },

	{ DM814_TPCC_CLKCTRL, NULL, CLKF_SW_SUP, "sysclk4_ck" },
@@ -39,9 +38,15 @@ static const struct omap_clkctrl_reg_data dm814_alwon_clkctrl_regs[] __initconst 
	{ 0 },

};



static const struct

omap_clkctrl_reg_data dm814_alwon_ethernet_clkctrl_regs[] __initconst = {

	{ 0, NULL, CLKF_SW_SUP, "cpsw_125mhz_gclk" },

};



const struct omap_clkctrl_data dm814_clkctrl_data[] __initconst = {

	{ 0x48180500, dm814_default_clkctrl_regs },

	{ 0x48181400, dm814_alwon_clkctrl_regs },

	{ 0x481815d4, dm814_alwon_ethernet_clkctrl_regs },

	{ 0 },

};

include/dt-bindings/clock/dm814.h

+5 −0
Original line number Diff line number Diff line
@@ -34,4 +34,9 @@ 
#define DM814_MMC2_CLKCTRL	DM814_CLKCTRL_INDEX(0x220)

#define DM814_MMC3_CLKCTRL	DM814_CLKCTRL_INDEX(0x224)



/* alwon_ethernet clocks */

#define DM814_ETHERNET_CLKCTRL_OFFSET	0x1d4

#define DM814_ETHERNET_CLKCTRL_INDEX(offset)	((offset) - DM814_ETHERNET_CLKCTRL_OFFSET)

#define DM814_ETHERNET_CPGMAC0_CLKCTRL	DM814_ETHERNET_CLKCTRL_INDEX(0x1d4)



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE