Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1320439

[PATCH v4 3/9] clk: rockchip: rk3036: fix and add node id for emac clock

Show all headers | View raw

From: zhengxing <zhengxing@rock-chips.com>

In the emac driver, we need to refer HCLK_MAC since there are
only 3PLLs (APLL/GPLL/DPLL) on the rk3036, most clock are under the
GPLL, and it is unable to provide the accurate rate for mac_ref which
need to 50MHz probability, we should let it under the DPLL and are
able to set the freq which integer multiples of 50MHz, so we add these
emac node for reference.

Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>

---

Changes in v4:
- fix the commit, pick up from the
  https://patchwork.kernel.org/patch/7976631/.
- The emac parent shouldn't depend on the APLL. instead of DPLL.

 drivers/clk/rockchip/clk-rk3036.c      | 9 ++++++---
 include/dt-bindings/clock/rk3036-cru.h | 2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/clk/rockchip/clk-rk3036.c b/drivers/clk/rockchip/clk-rk3036.c
index be71a41..701f702 100644
--- a/drivers/clk/rockchip/clk-rk3036.c
+++ b/drivers/clk/rockchip/clk-rk3036.c
@@ -343,8 +343,11 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = {
 			RK2928_CLKSEL_CON(16), 0, 2, MFLAGS, 2, 5, DFLAGS,
 			RK2928_CLKGATE_CON(10), 5, GFLAGS),
 
-	COMPOSITE_NOGATE(0, "mac_pll_src", mux_pll_src_3plls_p, 0,
-			RK2928_CLKSEL_CON(21), 0, 2, MFLAGS, 9, 5, DFLAGS),
+	MUX(SCLK_MACPLL, "mac_pll_pre", mux_pll_src_3plls_p, 0,
+			RK2928_CLKSEL_CON(21), 0, 2, MFLAGS),
+	DIV(0, "mac_pll_src", "mac_pll_pre", 0,
+			RK2928_CLKSEL_CON(21), 9, 5, DFLAGS),
+
 	MUX(SCLK_MACREF, "mac_clk_ref", mux_mac_p, CLK_SET_RATE_PARENT,
 			RK2928_CLKSEL_CON(21), 3, 1, MFLAGS),
 
@@ -404,7 +407,7 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = {
 	GATE(HCLK_OTG1, "hclk_otg1", "hclk_peri", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(7), 3, GFLAGS),
 	GATE(HCLK_I2S, "hclk_i2s", "hclk_peri", 0, RK2928_CLKGATE_CON(7), 2, GFLAGS),
 	GATE(0, "hclk_sfc", "hclk_peri", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(3), 14, GFLAGS),
-	GATE(0, "hclk_mac", "hclk_peri", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(3), 15, GFLAGS),
+	GATE(HCLK_MAC, "hclk_mac", "hclk_peri", 0, RK2928_CLKGATE_CON(3), 5, GFLAGS),
 
 	/* pclk_peri gates */
 	GATE(0, "pclk_peri_matrix", "pclk_peri", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(4), 1, GFLAGS),
diff --git a/include/dt-bindings/clock/rk3036-cru.h b/include/dt-bindings/clock/rk3036-cru.h
index ebc7a7b..de44109 100644
--- a/include/dt-bindings/clock/rk3036-cru.h
+++ b/include/dt-bindings/clock/rk3036-cru.h
@@ -54,6 +54,7 @@
 #define SCLK_PVTM_VIDEO		125
 #define SCLK_MAC		151
 #define SCLK_MACREF		152
+#define SCLK_MACPLL		153
 #define SCLK_SFC		160
 
 /* aclk gates */
@@ -92,6 +93,7 @@
 #define HCLK_SDMMC		456
 #define HCLK_SDIO		457
 #define HCLK_EMMC		459
+#define HCLK_MAC		460
 #define HCLK_I2S		462
 #define HCLK_LCDC		465
 #define HCLK_ROM		467
-- 
1.9.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v4 0/9] Add the family patches to support for kylin board Caesar Wang <wxt@rock-chips.com> - 2016-01-28 09:50 +0100
  [PATCH v4 2/9] ARM: dts: rockchip: add hdmi/vop device node for rk3036 Caesar Wang <wxt@rock-chips.com> - 2016-01-28 09:50 +0100
  [PATCH v4 6/9] ASoC: rt5616: add mclk property for rt5616 document Caesar Wang <wxt@rock-chips.com> - 2016-01-28 09:50 +0100
    Re: [PATCH v4 6/9] ASoC: rt5616: add mclk property for rt5616  document Rob Herring <robh@kernel.org> - 2016-01-29 17:30 +0100
      Re: [PATCH v4 6/9] ASoC: rt5616: add mclk property for rt5616  document Caesar Wang <caesar.upstream@gmail.com> - 2016-01-31 10:20 +0100
  [PATCH v4 9/9] ARM: dts: rockchip: support the spi for rk3036 Caesar Wang <wxt@rock-chips.com> - 2016-01-28 09:50 +0100
    Re: [PATCH v4 9/9] ARM: dts: rockchip: support the spi for rk3036 Heiko Stuebner <heiko@sntech.de> - 2016-01-31 12:10 +0100
      Re: [PATCH v4 9/9] ARM: dts: rockchip: support the spi for rk3036 Caesar Wang <caesar.upstream@gmail.com> - 2016-02-01 07:40 +0100
  [PATCH v4 7/9] ASoC: rt5616: trivial: fix the typo Caesar Wang <wxt@rock-chips.com> - 2016-01-28 09:50 +0100
  [PATCH v4 5/9] ARM: dts: rockchip: add mclk for rt5616 on kylin board Caesar Wang <wxt@rock-chips.com> - 2016-01-28 09:50 +0100
  [PATCH v4 8/9] ASoC: rt5616: add the mclk for the codec driver Caesar Wang <wxt@rock-chips.com> - 2016-01-28 09:50 +0100
  [PATCH v4 1/9] ARM: dts: rockchip: add the leds control for kylin board Caesar Wang <wxt@rock-chips.com> - 2016-01-28 09:50 +0100
    Re: [PATCH v4 1/9] ARM: dts: rockchip: add the leds control for kylin board Heiko Stuebner <heiko@sntech.de> - 2016-01-31 11:50 +0100
      Re: [PATCH v4 1/9] ARM: dts: rockchip: add the leds control for kylin  board Caesar Wang <caesar.upstream@gmail.com> - 2016-02-01 07:50 +0100
  [PATCH v4 3/9] clk: rockchip: rk3036: fix and add node id for emac clock Caesar Wang <wxt@rock-chips.com> - 2016-01-28 09:50 +0100
  [PATCH v4 4/9] ARM: dts: rockchip: add support emac for RK3036 Caesar Wang <wxt@rock-chips.com> - 2016-01-28 09:50 +0100
  [PATCH v4.1 6/9] ASoC: rt5616: add mclk property for rt5616 document Caesar Wang <wxt@rock-chips.com> - 2016-01-31 10:20 +0100
    Re: [PATCH v4.1 6/9] ASoC: rt5616: add mclk property for rt5616  document Rob Herring <robh@kernel.org> - 2016-02-01 15:50 +0100
  [PATCH v4.1 9/9] ARM: dts: rockchip: support the spi for rk3036 Caesar Wang <wxt@rock-chips.com> - 2016-02-01 08:40 +0100

csiph-web