projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: dts: rockchip: add sdcard io-domain node for miniarm
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
boot
/
dts
/
rk3036-clocks.dtsi
diff --git
a/arch/arm/boot/dts/rk3036-clocks.dtsi
b/arch/arm/boot/dts/rk3036-clocks.dtsi
index 95e06abf31777aae6b63d94e20e7cd865f233733..b692f309d312b9f9d114fb5e63482fcc0a550dfb 100755
(executable)
--- a/
arch/arm/boot/dts/rk3036-clocks.dtsi
+++ b/
arch/arm/boot/dts/rk3036-clocks.dtsi
@@
-42,7
+42,7
@@
rmii_clkin: rmii_clkin {
compatible = "rockchip,rk-fixed-clock";
clock-output-names = "rmii_clkin";
rmii_clkin: rmii_clkin {
compatible = "rockchip,rk-fixed-clock";
clock-output-names = "rmii_clkin";
- clock-frequency = <0>;
+ clock-frequency = <
5000000
0>;
#clock-cells = <0>;
};
#clock-cells = <0>;
};
@@
-104,6
+104,14
@@
#clock-cells = <0>;
};
#clock-cells = <0>;
};
+ io_mac_mdclkout: io_mac_mdclkout {
+ compatible = "rockchip,rk-fixed-factor-clock";
+ clocks = <&aclk_peri_pre>;
+ clock-output-names = "io_mac_mdclkout";
+ clock-div = <2>;
+ clock-mult = <1>;
+ #clock-cells = <0>;
+ };
};
clock_regs {
};
clock_regs {
@@
-858,24
+866,25
@@
#clock-init-cells = <1>;
};
#clock-init-cells = <1>;
};
- clk_mac_
pll_div: clk_mac_pll
_div {
+ clk_mac_
ref_div: clk_mac_ref
_div {
compatible = "rockchip,rk3188-div-con";
rockchip,bits = <4 5>;
compatible = "rockchip,rk3188-div-con";
rockchip,bits = <4 5>;
- clocks = <&clk_mac_
pll
>;
- clock-output-names = "clk_mac
_pll
";
+ clocks = <&clk_mac_
ref
>;
+ clock-output-names = "clk_mac";
rockchip,div-type = <CLK_DIVIDER_PLUS_ONE>;
#clock-cells = <0>;
rockchip,div-type = <CLK_DIVIDER_PLUS_ONE>;
#clock-cells = <0>;
- rockchip,clkops-idx =
- <CLKOPS_RATE_MUX_DIV>;
+ #clock-init-cells = <1>;
};
};
- clk_mac_
ref_div: clk_mac_ref
_div {
+ clk_mac_
pll_div: clk_mac_pll
_div {
compatible = "rockchip,rk3188-div-con";
rockchip,bits = <9 5>;
compatible = "rockchip,rk3188-div-con";
rockchip,bits = <9 5>;
- clocks = <&clk_mac_
ref
>;
- clock-output-names = "clk_mac";
+ clocks = <&clk_mac_
pll
>;
+ clock-output-names = "clk_mac
_pll
";
rockchip,div-type = <CLK_DIVIDER_PLUS_ONE>;
#clock-cells = <0>;
rockchip,div-type = <CLK_DIVIDER_PLUS_ONE>;
#clock-cells = <0>;
+ rockchip,clkops-idx =
+ <CLKOPS_RATE_MUX_DIV>;
#clock-init-cells = <1>;
};
#clock-init-cells = <1>;
};
@@
-1100,11
+1109,11
@@
#address-cells = <1>;
#size-cells = <1>;
#address-cells = <1>;
#size-cells = <1>;
- clk_gpu_
pre_div: clk_gpu_pre
_div {
+ clk_gpu_
div: clk_gpu
_div {
compatible = "rockchip,rk3188-div-con";
rockchip,bits = <0 5>;
compatible = "rockchip,rk3188-div-con";
rockchip,bits = <0 5>;
- clocks = <&clk_gpu
_pre
>;
- clock-output-names = "clk_gpu
_pre
";
+ clocks = <&clk_gpu>;
+ clock-output-names = "clk_gpu";
rockchip,div-type = <CLK_DIVIDER_PLUS_ONE>;
#clock-cells = <0>;
rockchip,clkops-idx =
rockchip,div-type = <CLK_DIVIDER_PLUS_ONE>;
#clock-cells = <0>;
rockchip,clkops-idx =
@@
-1114,11
+1123,11
@@
/* reg[7:5]: reserved */
/* reg[7:5]: reserved */
- clk_gpu
_pre: clk_gpu_pre
_mux {
+ clk_gpu
: clk_gpu
_mux {
compatible = "rockchip,rk3188-mux-con";
rockchip,bits = <8 2>;
clocks = <&dummy>, <&dummy>, <&clk_gpll>;
compatible = "rockchip,rk3188-mux-con";
rockchip,bits = <8 2>;
clocks = <&dummy>, <&dummy>, <&clk_gpll>;
- clock-output-names = "clk_gpu
_pre
";
+ clock-output-names = "clk_gpu";
#clock-cells = <0>;
#clock-init-cells = <1>;
};
#clock-cells = <0>;
#clock-init-cells = <1>;
};
@@
-1165,7
+1174,7
@@
"clk_cryto", "clk_i2s_out",
"clk_i2s", "clk_testout";
"clk_cryto", "clk_i2s_out",
"clk_i2s", "clk_testout";
- rockchip,suspend-clkgating-setting=<0x
0 0x0
>;
+ rockchip,suspend-clkgating-setting=<0x
19ff 0x19ff
>;
#clock-cells = <1>;
};
#clock-cells = <1>;
};
@@
-1199,7
+1208,7
@@
"clk_uart2_div", "uart2_frac",
"reserved", "reserved";
"clk_uart2_div", "uart2_frac",
"reserved", "reserved";
- rockchip,suspend-clkgating-setting=<0x
0 0x0
>;
+ rockchip,suspend-clkgating-setting=<0x
c0af 0xc0af
>;
#clock-cells = <1>;
};
#clock-cells = <1>;
};
@@
-1231,7
+1240,7
@@
"spdif_frac", "clk_sdio",
"clk_emmc", "reserved";
"spdif_frac", "clk_sdio",
"clk_emmc", "reserved";
- rockchip,suspend-clkgating-setting=<0x
0 0x0
>;
+ rockchip,suspend-clkgating-setting=<0x
81bf 0x81bf
>;
#clock-cells = <1>;
};
#clock-cells = <1>;
};
@@
-1243,28
+1252,28
@@
<&dummy>, <&dummy>,
<&dclk_lcdc1>, <&dummy>,
<&dummy>, <&dummy>,
<&dclk_lcdc1>, <&dummy>,
- <&dummy>, <&
dummy
>,
+ <&dummy>, <&
hclk_peri_pre
>,
<&dummy>, <&dummy>,
<&pclk_cpu_pre>, <&dummy>,
<&dummy>, <&aclk_vcodec_pre>,
<&dummy>, <&dummy>,
<&pclk_cpu_pre>, <&dummy>,
<&dummy>, <&aclk_vcodec_pre>,
- <&aclk_vcodec_pre>, <&clk_gpu
_pre
>,
+ <&aclk_vcodec_pre>, <&clk_gpu>,
<&hclk_peri_pre>, <&dummy>;
clock-output-names =
"reserved", "reserved",
"dclk_lcdc1", "reserved",
<&hclk_peri_pre>, <&dummy>;
clock-output-names =
"reserved", "reserved",
"dclk_lcdc1", "reserved",
- "reserved", "
reserved
",
+ "reserved", "
g_hclk_mac
",
"reserved", "reserved",
"g_pclk_hdmi", "reserved",
"reserved", "aclk_vcodec_pre",
"reserved", "reserved",
"g_pclk_hdmi", "reserved",
"reserved", "aclk_vcodec_pre",
- "hclk_vcodec", "clk_gpu
_pre
",
+ "hclk_vcodec", "clk_gpu",
"g_hclk_sfc", "reserved";
"g_hclk_sfc", "reserved";
-
rockchip,suspend-clkgating-setting=<0x0000 0x0000
>;
+
rockchip,suspend-clkgating-setting=<0xa7fb 0xa7fb
>;
#clock-cells = <1>;
};
#clock-cells = <1>;
};
@@
-1289,7
+1298,7
@@
"g_hp_axi_matrix", "g_pp_axi_matrix",
"g_aclk_cpu_peri", "g_ap_axi_matrix",
"g_hp_axi_matrix", "g_pp_axi_matrix",
"g_aclk_cpu_peri", "g_ap_axi_matrix",
- "reserved", "
reserved
",
+ "reserved", "
g_hclk_mac
",
"reserved", "reserved",
"reserved", "reserved",
"reserved", "reserved",
"reserved", "reserved",
@@
-1299,7
+1308,7
@@
"g_aclk_intmem", "reserved",
"reserved", "reserved";
"g_aclk_intmem", "reserved",
"reserved", "reserved";
- rockchip,suspend-clkgating-setting = <0x
0000 0x0000
>;
+ rockchip,suspend-clkgating-setting = <0x
ffff 0xffff
>;
#clock-cells = <1>;
};
#clock-cells = <1>;
};
@@
-1332,7
+1341,7
@@
"reserved", "g_hclk_otg0",
"g_pclk_acodec", "reserved";
"reserved", "g_hclk_otg0",
"g_pclk_acodec", "reserved";
- rockchip,suspend-clkgating-setting = <0x
0000 0x0000
>;
+ rockchip,suspend-clkgating-setting = <0x
91fd 0x91fd
>;
#clock-cells = <1>;
};
#clock-cells = <1>;
};
@@
-1366,7
+1375,7
@@
"g_hclk_vio_bus", "g_aclk_vio",
"reserved", "reserved";
"g_hclk_vio_bus", "g_aclk_vio",
"reserved", "reserved";
- rockchip,suspend-clkgating-setting = <0x
0000 0x0000
>;
+ rockchip,suspend-clkgating-setting = <0x
ffff 0xffff
>;
#clock-cells = <1>;
};
#clock-cells = <1>;
};
@@
-1400,7
+1409,7
@@
"g_pclk_spi", "reserved",
"reserved", "g_pclk_wdt";
"g_pclk_spi", "reserved",
"reserved", "g_pclk_wdt";
- rockchip,suspend-clkgating-setting = <0x
0000 0x0000
>;
+ rockchip,suspend-clkgating-setting = <0x
6ff2 0x6ff2
>;
#clock-cells = <1>;
};
#clock-cells = <1>;
};
@@
-1434,7
+1443,7
@@
"reserved", "reserved",
"reserved", "reserved";
"reserved", "reserved",
"reserved", "reserved";
-
rockchip,suspend-clkgating-setting=<0x0000 0x0000
>;
+
rockchip,suspend-clkgating-setting=<0xf38c 0xf38c
>;
#clock-cells = <1>;
};
#clock-cells = <1>;
};
@@
-1467,7
+1476,7
@@
"reserved", "g_hclk_usb_peri",
"g_hclk_pe_arbi", "g_aclk_peri_niu";
"reserved", "g_hclk_usb_peri",
"g_hclk_pe_arbi", "g_aclk_peri_niu";
- rockchip,suspend-clkgating-setting=<0x
0 0x0
>;
+ rockchip,suspend-clkgating-setting=<0x
df9f 0xdf9f
>;
#clock-cells = <1>;
};
#clock-cells = <1>;
};
@@
-1501,7
+1510,7
@@
"reserved", "reserved",
"reserved", "reserved";
"reserved", "reserved",
"reserved", "reserved";
- rockchip,suspend-clkgating-setting = <0x0
0x0>;
/* pwm logic vol */
+ rockchip,suspend-clkgating-setting = <0x0
077 0x0077>;
/* pwm logic vol */
#clock-cells = <1>;
};
#clock-cells = <1>;
};