Skip to content

Commit 09c274e

Browse files
EvilOlafEvilOlaf
committed
rockchip64-7.2: rewrite patches against v7.2-rc1
1 parent f8e5645 commit 09c274e

44 files changed

Lines changed: 140 additions & 139 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎patch/kernel/archive/rockchip64-7.2/board-nanopi-m4v2-dts-add-sound-card.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
169169
index 111111111111..222222222222 100644
170170
--- a/sound/soc/codecs/Kconfig
171171
+++ b/sound/soc/codecs/Kconfig
172-
@@ -1843,7 +1843,7 @@ config SND_SOC_RT5645
172+
@@ -1860,7 +1860,7 @@ config SND_SOC_RT5645
173173
depends on I2C
174174

175175
config SND_SOC_RT5651

‎patch/kernel/archive/rockchip64-7.2/board-nanopi-m5-add-wifi-bt-and-misc.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ index 111111111111..222222222222 100644
9494
status = "okay";
9595
};
9696

97-
@@ -866,6 +890,22 @@ usb_otg0_pwren_h: usb-otg0-pwren-h {
97+
@@ -875,6 +899,22 @@ usb_otg0_pwren_h: usb-otg0-pwren-h {
9898
rockchip,pins = <0 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
9999
};
100100
};
@@ -117,7 +117,7 @@ index 111111111111..222222222222 100644
117117
};
118118

119119
&sai2 {
120-
@@ -881,6 +921,24 @@ &saradc {
120+
@@ -890,6 +930,24 @@ &saradc {
121121
status = "okay";
122122
};
123123

@@ -142,7 +142,7 @@ index 111111111111..222222222222 100644
142142
&sdmmc {
143143
bus-width = <4>;
144144
cap-mmc-highspeed;
145-
@@ -934,6 +992,31 @@ &uart0 {
145+
@@ -943,6 +1001,31 @@ &uart0 {
146146
status = "okay";
147147
};
148148

@@ -174,7 +174,7 @@ index 111111111111..222222222222 100644
174174
&ufshc {
175175
vcc-supply = <&vcc_3v3_s3>;
176176
vccq-supply = <&vcc1v2_ufs_vccq>;
177-
@@ -947,8 +1030,7 @@ &usbdp_phy {
177+
@@ -956,8 +1039,7 @@ &usbdp_phy {
178178
};
179179

180180
&usb_drd0_dwc3 {

‎patch/kernel/archive/rockchip64-7.2/board-odroidm2-enable-hdmi-audio.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts b/arch/arm64/boo
2222
index 111111111111..222222222222 100644
2323
--- a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts
2424
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts
25-
@@ -264,6 +264,10 @@ hdmi0_out_con: endpoint {
25+
@@ -268,6 +268,10 @@ hdmi0_out_con: endpoint {
2626
};
2727
};
2828

@@ -33,7 +33,7 @@ index 111111111111..222222222222 100644
3333
&hdptxphy0 {
3434
status = "okay";
3535
};
36-
@@ -396,6 +400,10 @@ pcf8563: rtc@51 {
36+
@@ -400,6 +404,10 @@ pcf8563: rtc@51 {
3737
};
3838
};
3939

‎patch/kernel/archive/rockchip64-7.2/board-odroidm2-fix-for-ethernet.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ index 111111111111..222222222222 100644
3737
};
3838

3939
&gpu {
40-
@@ -408,6 +410,8 @@ &mdio1 {
40+
@@ -412,6 +414,8 @@ &mdio1 {
4141
rgmii_phy1: ethernet-phy@1 {
4242
compatible = "ethernet-phy-id001c.c916";
4343
reg = <1>;
@@ -46,7 +46,7 @@ index 111111111111..222222222222 100644
4646
reset-assert-us = <20000>;
4747
reset-deassert-us = <100000>;
4848
reset-gpios = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
49-
@@ -487,6 +491,12 @@ pcf8563_int: pcf8563-int {
49+
@@ -497,6 +501,12 @@ pcf8563_int: pcf8563-int {
5050
};
5151
};
5252

‎patch/kernel/archive/rockchip64-7.2/board-odroidm2-fix-usbc-in-otg-mode.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts b/arch/arm64/boo
1212
index 111111111111..222222222222 100644
1313
--- a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts
1414
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts
15-
@@ -352,13 +352,15 @@ usbc0: usb-typec@22 {
15+
@@ -356,13 +356,15 @@ usbc0: usb-typec@22 {
1616

1717
connector {
1818
compatible = "usb-c-connector";

‎patch/kernel/archive/rockchip64-7.2/board-odroidm2-support-for-vu8s-panel.patch‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ index 111111111111..222222222222 100644
117117
&gmac1 {
118118
clock_in_out = "input";
119119
phy-handle = <&rgmii_phy1>;
120-
@@ -341,6 +431,20 @@ &i2c8 {
120+
@@ -345,6 +435,20 @@ &i2c8 {
121121
pinctrl-0 = <&i2c8m2_xfer>;
122122
status = "okay";
123123

@@ -138,7 +138,7 @@ index 111111111111..222222222222 100644
138138
usbc0: usb-typec@22 {
139139
compatible = "fcs,fusb302";
140140
reg = <0x22>;
141-
@@ -456,6 +560,10 @@ lcd {
141+
@@ -466,6 +570,10 @@ lcd {
142142
lcd_pwren: lcd-pwren {
143143
rockchip,pins = <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
144144
};
@@ -149,7 +149,7 @@ index 111111111111..222222222222 100644
149149
};
150150

151151
leds {
152-
@@ -499,6 +607,16 @@ rtl8211f_rst: rtl8211f-rst {
152+
@@ -509,6 +617,16 @@ rtl8211f_rst: rtl8211f-rst {
153153
};
154154
};
155155

@@ -166,7 +166,7 @@ index 111111111111..222222222222 100644
166166
usb {
167167
usb2_host_pwren: usb2-host-pwren {
168168
rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
169-
@@ -524,6 +642,11 @@ &pwm0 {
169+
@@ -534,6 +652,11 @@ &pwm0 {
170170
status = "okay";
171171
};
172172

@@ -178,7 +178,7 @@ index 111111111111..222222222222 100644
178178
&saradc {
179179
vref-supply = <&vcca_1v8_s0>;
180180
status = "okay";
181-
@@ -972,3 +1095,15 @@ vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
181+
@@ -982,3 +1105,15 @@ vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
182182
remote-endpoint = <&hdmi0_in_vp0>;
183183
};
184184
};
@@ -198,8 +198,8 @@ diff --git a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c b/drivers/gpu/drm/pan
198198
index 111111111111..222222222222 100644
199199
--- a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
200200
+++ b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
201-
@@ -1997,6 +1997,207 @@ static const struct ili9881c_instr bsd1218_a101kl68_init[] = {
202-
ILI9881C_COMMAND_INSTR(0xd3, 0x3f),
201+
@@ -2197,6 +2197,207 @@ static const struct ili9881c_instr waveshare_7inch_a_init[] = {
202+
ILI9881C_COMMAND_INSTR(0x36, 0x00),
203203
};
204204

205205
+static const struct ili9881c_instr odroid_vu8s_init[] = {
@@ -406,8 +406,8 @@ index 111111111111..222222222222 100644
406406
static inline struct ili9881c *panel_to_ili9881c(struct drm_panel *panel)
407407
{
408408
return container_of(panel, struct ili9881c, panel);
409-
@@ -2260,6 +2461,23 @@ static const struct drm_display_mode bsd1218_a101kl68_default_mode = {
410-
.height_mm = 170,
409+
@@ -2492,6 +2693,23 @@ static const struct drm_display_mode waveshare_7inch_a_mode = {
410+
.height_mm = 154,
411411
};
412412

413413
+static const struct drm_display_mode odroid_hj080be31ia1_default_mode = {
@@ -430,8 +430,8 @@ index 111111111111..222222222222 100644
430430
static int ili9881c_get_modes(struct drm_panel *panel,
431431
struct drm_connector *connector)
432432
{
433-
@@ -2454,6 +2672,15 @@ static const struct ili9881c_desc bsd1218_a101kl68_desc = {
434-
.lanes = 4,
433+
@@ -2700,6 +2918,15 @@ static const struct ili9881c_desc waveshare_7inch_a_desc = {
434+
.lanes = 2,
435435
};
436436

437437
+static const struct ili9881c_desc odroid_vu8s_desc = {
@@ -446,7 +446,7 @@ index 111111111111..222222222222 100644
446446
static const struct of_device_id ili9881c_of_match[] = {
447447
{ .compatible = "bananapi,lhr050h41", .data = &lhr050h41_desc },
448448
{ .compatible = "bestar,bsd1218-a101kl68", .data = &bsd1218_a101kl68_desc },
449-
@@ -2465,6 +2692,7 @@ static const struct of_device_id ili9881c_of_match[] = {
449+
@@ -2712,6 +2939,7 @@ static const struct of_device_id ili9881c_of_match[] = {
450450
{ .compatible = "ampire,am8001280g", .data = &am8001280g_desc },
451451
{ .compatible = "raspberrypi,dsi-5inch", &rpi_5inch_desc },
452452
{ .compatible = "raspberrypi,dsi-7inch", &rpi_7inch_desc },

‎patch/kernel/archive/rockchip64-7.2/board-radxa-e25-sdmmc0-fix.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts b/arch/arm64/boot
2121
index 111111111111..222222222222 100644
2222
--- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
2323
+++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
24-
@@ -203,7 +203,7 @@ &sdmmc0 {
24+
@@ -217,7 +217,7 @@ &sdmmc0 {
2525
disable-wp;
2626
pinctrl-names = "default";
2727
pinctrl-0 = <&sdmmc0_bus4 &sdmmc0_clk &sdmmc0_cmd>;

‎patch/kernel/archive/rockchip64-7.2/board-radxa-e25-usb3-and-emmc-fix.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts b/arch/arm64/boot
5050
index 111111111111..222222222222 100644
5151
--- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
5252
+++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
53-
@@ -218,6 +218,8 @@ &usb_host0_ohci {
53+
@@ -232,6 +232,8 @@ &usb_host0_ohci {
5454
};
5555

5656
&usb_host0_xhci {

‎patch/kernel/archive/rockchip64-7.2/board-rgds-01-asoc-aw87391.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ index 111111111111..222222222222 100644
2121
imply SND_SOC_AW88395
2222
imply SND_SOC_AW88081
2323
imply SND_SOC_AW88166
24-
@@ -722,6 +723,17 @@ config SND_SOC_AW87390
24+
@@ -726,6 +727,17 @@ config SND_SOC_AW87390
2525
sound quality, which is a new high efficiency, low
2626
noise, constant large volume, 6th Smart K audio amplifier.
2727

@@ -51,7 +51,7 @@ index 111111111111..222222222222 100644
5151
snd-soc-aw88081-y := aw88081.o
5252
snd-soc-aw88395-lib-y := aw88395/aw88395_lib.o \
5353
aw88395/aw88395_device.o
54-
@@ -486,6 +487,7 @@ obj-$(CONFIG_SND_SOC_ARIZONA) += snd-soc-arizona.o
54+
@@ -490,6 +491,7 @@ obj-$(CONFIG_SND_SOC_ARIZONA) += snd-soc-arizona.o
5555
obj-$(CONFIG_SND_SOC_AUDIO_IIO_AUX) += snd-soc-audio-iio-aux.o
5656
obj-$(CONFIG_SND_SOC_AW8738) += snd-soc-aw8738.o
5757
obj-$(CONFIG_SND_SOC_AW87390) += snd-soc-aw87390.o

‎patch/kernel/archive/rockchip64-7.2/board-rock5c-add-gpio-names.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ index 111111111111..222222222222 100644
8989
+};
9090
+
9191
&hdmi0 {
92-
pinctrl-names = "default";
92+
frl-enable-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_LOW>;
9393
pinctrl-0 = <&hdmim0_tx0_cec
9494
--
9595
Armbian

0 commit comments

Comments
 (0)