Skip to content

Commit a970828

Browse files
olofjolofj
committed
Merge tag 'v5.1-rockchip-dtfixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes
Fixes for dtc warnings, fixes for ethernet transfers on rk3328, sd-card related fixes on both rk3328 ans rk3288-tinker and a regulator fix on rock64 and making ddc actually work on the Rock PI 4 due to missing the ddc bus. * tag 'v5.1-rockchip-dtfixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: Remove #address/#size-cells from rk3288-veyron gpio-keys ARM: dts: rockchip: Remove #address/#size-cells from rk3288 mipi_dsi ARM: dts: rockchip: Fix gpu opp node names for rk3288 arm64: dts: rockchip: fix rk3328 sdmmc0 write errors arm64: dts: rockchip: fix rk3328 rgmii high tx error rate ARM: dts: rockchip: Fix SD card detection on rk3288-tinker arm64: dts: rockchip: Fix vcc_host1_5v GPIO polarity on rk3328-rock64 ARM: dts: rockchip: fix rk3288 cpu opp node reference arm64: dts: rockchip: add DDC bus on Rock Pi 4 arm64: dts: rockchip: fix rk3328-roc-cc gmac2io tx/rx_delay Signed-off-by: Olof Johansson <olof@lixom.net>
2 parents 3e37208 + 1a96665 commit a970828

File tree

7 files changed

+44
-47
lines changed

7 files changed

+44
-47
lines changed

‎arch/arm/boot/dts/rk3288-tinker.dtsi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@
254254
};
255255

256256
vccio_sd: LDO_REG5 {
257+
regulator-boot-on;
257258
regulator-min-microvolt = <1800000>;
258259
regulator-max-microvolt = <3300000>;
259260
regulator-name = "vccio_sd";
@@ -430,7 +431,7 @@
430431
bus-width = <4>;
431432
cap-mmc-highspeed;
432433
cap-sd-highspeed;
433-
card-detect-delay = <200>;
434+
broken-cd;
434435
disable-wp; /* wp not hooked up */
435436
pinctrl-names = "default";
436437
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;

‎arch/arm/boot/dts/rk3288-veyron.dtsi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525

2626
gpio_keys: gpio-keys {
2727
compatible = "gpio-keys";
28-
#address-cells = <1>;
29-
#size-cells = <0>;
3028

3129
pinctrl-names = "default";
3230
pinctrl-0 = <&pwr_key_l>;

‎arch/arm/boot/dts/rk3288.dtsi

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
compatible = "arm,cortex-a12";
7171
reg = <0x501>;
7272
resets = <&cru SRST_CORE1>;
73-
operating-points = <&cpu_opp_table>;
73+
operating-points-v2 = <&cpu_opp_table>;
7474
#cooling-cells = <2>; /* min followed by max */
7575
clock-latency = <40000>;
7676
clocks = <&cru ARMCLK>;
@@ -80,7 +80,7 @@
8080
compatible = "arm,cortex-a12";
8181
reg = <0x502>;
8282
resets = <&cru SRST_CORE2>;
83-
operating-points = <&cpu_opp_table>;
83+
operating-points-v2 = <&cpu_opp_table>;
8484
#cooling-cells = <2>; /* min followed by max */
8585
clock-latency = <40000>;
8686
clocks = <&cru ARMCLK>;
@@ -90,7 +90,7 @@
9090
compatible = "arm,cortex-a12";
9191
reg = <0x503>;
9292
resets = <&cru SRST_CORE3>;
93-
operating-points = <&cpu_opp_table>;
93+
operating-points-v2 = <&cpu_opp_table>;
9494
#cooling-cells = <2>; /* min followed by max */
9595
clock-latency = <40000>;
9696
clocks = <&cru ARMCLK>;
@@ -1119,8 +1119,6 @@
11191119
clock-names = "ref", "pclk";
11201120
power-domains = <&power RK3288_PD_VIO>;
11211121
rockchip,grf = <&grf>;
1122-
#address-cells = <1>;
1123-
#size-cells = <0>;
11241122
status = "disabled";
11251123

11261124
ports {
@@ -1282,27 +1280,27 @@
12821280
gpu_opp_table: gpu-opp-table {
12831281
compatible = "operating-points-v2";
12841282

1285-
opp@100000000 {
1283+
opp-100000000 {
12861284
opp-hz = /bits/ 64 <100000000>;
12871285
opp-microvolt = <950000>;
12881286
};
1289-
opp@200000000 {
1287+
opp-200000000 {
12901288
opp-hz = /bits/ 64 <200000000>;
12911289
opp-microvolt = <950000>;
12921290
};
1293-
opp@300000000 {
1291+
opp-300000000 {
12941292
opp-hz = /bits/ 64 <300000000>;
12951293
opp-microvolt = <1000000>;
12961294
};
1297-
opp@400000000 {
1295+
opp-400000000 {
12981296
opp-hz = /bits/ 64 <400000000>;
12991297
opp-microvolt = <1100000>;
13001298
};
1301-
opp@500000000 {
1299+
opp-500000000 {
13021300
opp-hz = /bits/ 64 <500000000>;
13031301
opp-microvolt = <1200000>;
13041302
};
1305-
opp@600000000 {
1303+
opp-600000000 {
13061304
opp-hz = /bits/ 64 <600000000>;
13071305
opp-microvolt = <1250000>;
13081306
};

‎arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@
108108
snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
109109
snps,reset-active-low;
110110
snps,reset-delays-us = <0 10000 50000>;
111-
tx_delay = <0x25>;
112-
rx_delay = <0x11>;
111+
tx_delay = <0x24>;
112+
rx_delay = <0x18>;
113113
status = "okay";
114114
};
115115

‎arch/arm64/boot/dts/rockchip/rk3328-rock64.dts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@
4646

4747
vcc_host1_5v: vcc_otg_5v: vcc-host1-5v-regulator {
4848
compatible = "regulator-fixed";
49-
enable-active-high;
50-
gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
49+
gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;
5150
pinctrl-names = "default";
5251
pinctrl-0 = <&usb20_host_drv>;
5352
regulator-name = "vcc_host1_5v";

‎arch/arm64/boot/dts/rockchip/rk3328.dtsi

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1445,11 +1445,11 @@
14451445

14461446
sdmmc0 {
14471447
sdmmc0_clk: sdmmc0-clk {
1448-
rockchip,pins = <1 RK_PA6 1 &pcfg_pull_none_4ma>;
1448+
rockchip,pins = <1 RK_PA6 1 &pcfg_pull_none_8ma>;
14491449
};
14501450

14511451
sdmmc0_cmd: sdmmc0-cmd {
1452-
rockchip,pins = <1 RK_PA4 1 &pcfg_pull_up_4ma>;
1452+
rockchip,pins = <1 RK_PA4 1 &pcfg_pull_up_8ma>;
14531453
};
14541454

14551455
sdmmc0_dectn: sdmmc0-dectn {
@@ -1461,14 +1461,14 @@
14611461
};
14621462

14631463
sdmmc0_bus1: sdmmc0-bus1 {
1464-
rockchip,pins = <1 RK_PA0 1 &pcfg_pull_up_4ma>;
1464+
rockchip,pins = <1 RK_PA0 1 &pcfg_pull_up_8ma>;
14651465
};
14661466

14671467
sdmmc0_bus4: sdmmc0-bus4 {
1468-
rockchip,pins = <1 RK_PA0 1 &pcfg_pull_up_4ma>,
1469-
<1 RK_PA1 1 &pcfg_pull_up_4ma>,
1470-
<1 RK_PA2 1 &pcfg_pull_up_4ma>,
1471-
<1 RK_PA3 1 &pcfg_pull_up_4ma>;
1468+
rockchip,pins = <1 RK_PA0 1 &pcfg_pull_up_8ma>,
1469+
<1 RK_PA1 1 &pcfg_pull_up_8ma>,
1470+
<1 RK_PA2 1 &pcfg_pull_up_8ma>,
1471+
<1 RK_PA3 1 &pcfg_pull_up_8ma>;
14721472
};
14731473

14741474
sdmmc0_gpio: sdmmc0-gpio {
@@ -1642,50 +1642,50 @@
16421642
rgmiim1_pins: rgmiim1-pins {
16431643
rockchip,pins =
16441644
/* mac_txclk */
1645-
<1 RK_PB4 2 &pcfg_pull_none_12ma>,
1645+
<1 RK_PB4 2 &pcfg_pull_none_8ma>,
16461646
/* mac_rxclk */
1647-
<1 RK_PB5 2 &pcfg_pull_none_2ma>,
1647+
<1 RK_PB5 2 &pcfg_pull_none_4ma>,
16481648
/* mac_mdio */
1649-
<1 RK_PC3 2 &pcfg_pull_none_2ma>,
1649+
<1 RK_PC3 2 &pcfg_pull_none_4ma>,
16501650
/* mac_txen */
1651-
<1 RK_PD1 2 &pcfg_pull_none_12ma>,
1651+
<1 RK_PD1 2 &pcfg_pull_none_8ma>,
16521652
/* mac_clk */
1653-
<1 RK_PC5 2 &pcfg_pull_none_2ma>,
1653+
<1 RK_PC5 2 &pcfg_pull_none_4ma>,
16541654
/* mac_rxdv */
1655-
<1 RK_PC6 2 &pcfg_pull_none_2ma>,
1655+
<1 RK_PC6 2 &pcfg_pull_none_4ma>,
16561656
/* mac_mdc */
1657-
<1 RK_PC7 2 &pcfg_pull_none_2ma>,
1657+
<1 RK_PC7 2 &pcfg_pull_none_4ma>,
16581658
/* mac_rxd1 */
1659-
<1 RK_PB2 2 &pcfg_pull_none_2ma>,
1659+
<1 RK_PB2 2 &pcfg_pull_none_4ma>,
16601660
/* mac_rxd0 */
1661-
<1 RK_PB3 2 &pcfg_pull_none_2ma>,
1661+
<1 RK_PB3 2 &pcfg_pull_none_4ma>,
16621662
/* mac_txd1 */
1663-
<1 RK_PB0 2 &pcfg_pull_none_12ma>,
1663+
<1 RK_PB0 2 &pcfg_pull_none_8ma>,
16641664
/* mac_txd0 */
1665-
<1 RK_PB1 2 &pcfg_pull_none_12ma>,
1665+
<1 RK_PB1 2 &pcfg_pull_none_8ma>,
16661666
/* mac_rxd3 */
1667-
<1 RK_PB6 2 &pcfg_pull_none_2ma>,
1667+
<1 RK_PB6 2 &pcfg_pull_none_4ma>,
16681668
/* mac_rxd2 */
1669-
<1 RK_PB7 2 &pcfg_pull_none_2ma>,
1669+
<1 RK_PB7 2 &pcfg_pull_none_4ma>,
16701670
/* mac_txd3 */
1671-
<1 RK_PC0 2 &pcfg_pull_none_12ma>,
1671+
<1 RK_PC0 2 &pcfg_pull_none_8ma>,
16721672
/* mac_txd2 */
1673-
<1 RK_PC1 2 &pcfg_pull_none_12ma>,
1673+
<1 RK_PC1 2 &pcfg_pull_none_8ma>,
16741674

16751675
/* mac_txclk */
1676-
<0 RK_PB0 1 &pcfg_pull_none>,
1676+
<0 RK_PB0 1 &pcfg_pull_none_8ma>,
16771677
/* mac_txen */
1678-
<0 RK_PB4 1 &pcfg_pull_none>,
1678+
<0 RK_PB4 1 &pcfg_pull_none_8ma>,
16791679
/* mac_clk */
1680-
<0 RK_PD0 1 &pcfg_pull_none>,
1680+
<0 RK_PD0 1 &pcfg_pull_none_4ma>,
16811681
/* mac_txd1 */
1682-
<0 RK_PC0 1 &pcfg_pull_none>,
1682+
<0 RK_PC0 1 &pcfg_pull_none_8ma>,
16831683
/* mac_txd0 */
1684-
<0 RK_PC1 1 &pcfg_pull_none>,
1684+
<0 RK_PC1 1 &pcfg_pull_none_8ma>,
16851685
/* mac_txd3 */
1686-
<0 RK_PC7 1 &pcfg_pull_none>,
1686+
<0 RK_PC7 1 &pcfg_pull_none_8ma>,
16871687
/* mac_txd2 */
1688-
<0 RK_PC6 1 &pcfg_pull_none>;
1688+
<0 RK_PC6 1 &pcfg_pull_none_8ma>;
16891689
};
16901690

16911691
rmiim1_pins: rmiim1-pins {

‎arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@
158158
};
159159

160160
&hdmi {
161+
ddc-i2c-bus = <&i2c3>;
161162
pinctrl-names = "default";
162163
pinctrl-0 = <&hdmi_cec>;
163164
status = "okay";

0 commit comments

Comments
 (0)