Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PM / devfreq: rockchip_dmc: the ddr frequency is set to 1066MHz for r… #33

Closed
wants to merge 17 commits into from
Closed

PM / devfreq: rockchip_dmc: the ddr frequency is set to 1066MHz for r… #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7b26b6c
arm: dts: rk3288-miniarm: update dts
Kwiboo Aug 13, 2017
b550971
arm: dts: rk3288-miqi: update dts
Kwiboo Nov 2, 2017
ccb6c00
arm64: dts: rockchip: rk3328: update dtsi
Kwiboo Jan 17, 2018
db792f3
arm64: dts: rockchip: rk3328-rock64: update dts
Kwiboo Jan 17, 2018
5f81039
arm64: dts: rockchip: add rk3328-box board
Kwiboo Jan 17, 2018
29ab3ef
arm64: dts: rockchip: add rk3328-rockbox board
Kwiboo Jan 17, 2018
72dadc9
arm64: dts: rockchip: add rk3328-roc-cc board
Kwiboo Jan 17, 2018
37a995d
arm64: dts: rockchip: rk3328-rock64: use two dai-link for i2s sound
Kwiboo Sep 3, 2017
1f23d67
arm64: dts: rockchip: rk3328-roc-cc: disable sd-card voltage select
Kwiboo Jan 25, 2018
e9dc16e
arm64: dts: rockchip: add rk3399-sapphire board
Kwiboo Jan 28, 2018
7e61af4
arm64: dts: rockchip: add rk3399-rock960 board
Kwiboo Jan 28, 2018
eae2191
arm: dts: rk3288: add cec clock and pinctrl
Kwiboo Jan 28, 2018
d3f46f1
arm64: dts: rockchip: add rk3399-odroidn1 board
Kwiboo Feb 14, 2018
7675bf3
arm64: dts: rockchip: add rk3399-rockpro64 board
Kwiboo Feb 26, 2018
7a0c343
arm64: dts: rockchip: add rk3328-box-trn9 board
Kwiboo Mar 4, 2018
429966f
arm64: dts: rockchip: add rk3328-box-z28 board
Kwiboo Mar 4, 2018
9037a9d
PM / devfreq: rockchip_dmc: the ddr frequency is set to 1066MHz for r…
T-Firefly Mar 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions arch/arm/boot/dts/rk3288-miniarm.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
wireless-wlan {
compatible = "wlan-platdata";
rockchip,grf = <&grf>;
wifi_chip_type = "ap6212";
wifi_chip_type = "rtl8723bs";
sdio_vref = <1800>;
WIFI,host_wake_irq = <&gpio4 30 GPIO_ACTIVE_HIGH>;
status = "okay";
Expand Down Expand Up @@ -130,14 +130,14 @@

led1-led {
gpios=<&gpio1 25 GPIO_ACTIVE_HIGH>;
linux,default-trigger="default-off";
linux,default-trigger="heartbeat";
};
};

sound {
compatible = "simple-audio-card";
simple-audio-card,format = "i2s";
simple-audio-card,name = "rockchip,miniarm-codec";
simple-audio-card,name = "HDMI";
simple-audio-card,mclk-fs = <512>;
simple-audio-card,cpu {
sound-dai = <&i2s>;
Expand Down Expand Up @@ -196,20 +196,33 @@
cpu0-supply = <&vdd_cpu>;
};

&cpu0_opp_table {
opp-1704000000 {
opp-hz = /bits/ 64 <1704000000>;
opp-microvolt = <1350000>;
clock-latency-ns = <40000>;
};
opp-1800000000 {
opp-hz = /bits/ 64 <1800000000>;
opp-microvolt = <1400000>;
clock-latency-ns = <40000>;
};
};

&gmac {
phy-supply = <&vcc33_lan>;
phy-mode = "rgmii";
clock_in_out = "input";
snps,reset-gpio = <&gpio4 7 0>;
snps,reset-active-low;
snps,reset-delays-us = <0 10000 1000000>;
snps,reset-delays-us = <0 10000 50000>;
assigned-clocks = <&cru SCLK_MAC>;
assigned-clock-parents = <&ext_gmac>;
pinctrl-names = "default";
pinctrl-0 = <&rgmii_pins>;
tx_delay = <0x30>;
rx_delay = <0x10>;
status = "ok";
status = "okay";
};

&dsi0 {
Expand Down Expand Up @@ -537,6 +550,7 @@

&i2s {
#sound-dai-cells = <0>;
rockchip,bclk-fs = <128>;
status = "okay";
};

Expand All @@ -560,7 +574,7 @@
non-removable;
num-slots = <1>;
pinctrl-names = "default";
pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk &sdio0_int>;
sd-uhs-sdr104;
supports-sdio;
};
Expand Down
56 changes: 33 additions & 23 deletions arch/arm/boot/dts/rk3288-miqi.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,29 +55,14 @@
sound {
compatible = "simple-audio-card";
simple-audio-card,format = "i2s";
simple-audio-card,name = "DW-HDMI";
simple-audio-card,name = "HDMI";
simple-audio-card,mclk-fs = <512>;

simple-audio-card,dai-link@0 { /* I2S - S/PDIF */
format = "i2s";
cpu {
sound-dai = <&i2s>;
};
codec {
sound-dai = <&hdmi>;
};
simple-audio-card,cpu {
sound-dai = <&i2s>;
};
simple-audio-card,codec {
sound-dai = <&hdmi>;
};

/*
* If you want to support more cards,
* you can add more dai-link node,
* such as
*
* simple-audio-card,dai-link@1 {
* ......
* }
*/

};

ext_gmac: external-gmac-clock {
Expand Down Expand Up @@ -181,9 +166,23 @@
cpu0-supply = <&vdd_cpu>;
};

&cpu0_opp_table {
opp-1704000000 {
opp-hz = /bits/ 64 <1704000000>;
opp-microvolt = <1350000>;
clock-latency-ns = <40000>;
};
opp-1800000000 {
opp-hz = /bits/ 64 <1800000000>;
opp-microvolt = <1400000>;
clock-latency-ns = <40000>;
};
};

&gpu {
status = "okay";
mali-supply = <&vdd_gpu>;
power-off-delay-ms = <200>;
};

&emmc {
Expand All @@ -203,6 +202,12 @@
#size-cells = <0>;
#sound-dai-cells = <0>;
status = "okay";
/* Don't use vopl for HDMI */
ports {
hdmi_in: port {
/delete-node/ endpoint@1;
};
};
};

&hevc_service {
Expand Down Expand Up @@ -234,14 +239,14 @@
clock_in_out = "input";
snps,reset-gpio = <&gpio4 7 0>;
snps,reset-active-low;
snps,reset-delays-us = <0 10000 1000000>;
snps,reset-delays-us = <0 10000 50000>;
assigned-clocks = <&cru SCLK_MAC>;
assigned-clock-parents = <&ext_gmac>;
pinctrl-names = "default";
pinctrl-0 = <&rgmii_pins>;
tx_delay = <0x30>;
rx_delay = <0x10>;
status = "ok";
status = "okay";
};

/* ----------------------------------------------------------------------------------
Expand Down Expand Up @@ -413,6 +418,7 @@ I2C

&i2s {
#sound-dai-cells = <0>;
rockchip,bclk-fs = <128>;
status = "okay";
};

Expand Down Expand Up @@ -471,6 +477,10 @@ I2C

&vopl {
status = "okay";
/* Don't use vopl for HDMI */
vopl_out: port {
/delete-node/ endpoint@0;
};
};

&vopl_mmu {
Expand Down
16 changes: 13 additions & 3 deletions arch/arm/boot/dts/rk3288.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -947,6 +947,8 @@
<&cru PCLK_MIPI_DSI1>,
<&cru SCLK_EDP_24M>,
<&cru SCLK_EDP>,
<&cru SCLK_HDMI_CEC>,
<&cru SCLK_HDMI_HDCP>,
<&cru SCLK_ISP_JPE>,
<&cru SCLK_ISP>,
<&cru SCLK_RGA>;
Expand Down Expand Up @@ -1531,10 +1533,10 @@
reg-io-width = <4>;
rockchip,grf = <&grf>;
interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cru PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_HDCP>;
clock-names = "iahb", "isfr";
clocks = <&cru PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_HDCP>, <&cru SCLK_HDMI_CEC>;
clock-names = "iahb", "isfr", "cec";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&hdmi_ddc>;
pinctrl-0 = <&hdmi_ddc>, <&hdmi_cec_c0>;
pinctrl-1 = <&hdmi_gpio>;
power-domains = <&power RK3288_PD_VIO>;
status = "disabled";
Expand Down Expand Up @@ -1903,6 +1905,14 @@
&pcfg_pull_none>;
};

hdmi_cec_c0: hdmi-cec-c0 {
rockchip,pins = <7 16 RK_FUNC_2 &pcfg_pull_none>;
};

hdmi_cec_c7: hdmi-cec-c7 {
rockchip,pins = <7 23 RK_FUNC_4 &pcfg_pull_none>;
};

hdmi_ddc: hdmi-ddc {
rockchip,pins = <7 19 RK_FUNC_2 &pcfg_pull_none>,
<7 20 RK_FUNC_2 &pcfg_pull_none>;
Expand Down
Loading