Skip to content

Commit 8f6e17e

Browse files
rpardiniigorpecovnik
rpardini
authored and
igorpecovnik
committed
meson64-6.18: rewrite patches
1 parent 3381d25 commit 8f6e17e

13 files changed

+23
-23
lines changed

‎patch/kernel/archive/meson64-6.18/board-bananapim5-001-sd-use-270-mmc-clock-phase-via-dt.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ index 111111111111..222222222222 100644
2222

2323
/ {
2424
adc-keys {
25-
@@ -388,6 +389,8 @@ &sd_emmc_b {
25+
@@ -387,6 +388,8 @@ &sd_emmc_b {
2626
cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>;
2727
vmmc-supply = <&tflash_vdd>;
2828
vqmmc-supply = <&vddio_c>;
@@ -31,7 +31,7 @@ index 111111111111..222222222222 100644
3131
};
3232

3333
/* eMMC */
34-
@@ -407,6 +410,8 @@ &sd_emmc_c {
34+
@@ -406,6 +409,8 @@ &sd_emmc_c {
3535
mmc-pwrseq = <&emmc_pwrseq>;
3636
vmmc-supply = <&vddao_3v3>;
3737
vqmmc-supply = <&emmc_1v8>;

‎patch/kernel/archive/meson64-6.18/board-bananapism1-add-uart_A-and-AO_B.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ index 111111111111..222222222222 100644
6969
ethernet0 = &ethmac;
7070
};
7171

72-
@@ -420,6 +421,12 @@ &uart_AO {
72+
@@ -419,6 +420,12 @@ &uart_AO {
7373
pinctrl-names = "default";
7474
};
7575

‎patch/kernel/archive/meson64-6.18/board-odroidc2-add-uartA-uartC.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ index 111111111111..222222222222 100644
2626
ethernet0 = &ethmac;
2727
};
2828

29-
@@ -387,6 +389,18 @@ &uart_AO {
29+
@@ -383,6 +385,18 @@ &uart_AO {
3030
pinctrl-names = "default";
3131
};
3232

‎patch/kernel/archive/meson64-6.18/board-t95z-add-rc-remote-keymap.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentat
3434
index 111111111111..222222222222 100644
3535
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
3636
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
37-
@@ -1504,6 +1504,8 @@ patternProperties:
37+
@@ -1560,6 +1560,8 @@ patternProperties:
3838
description: Sundance DSP Inc.
3939
"^sunplus,.*":
4040
description: Sunplus Technology Co., Ltd.

‎patch/kernel/archive/meson64-6.18/general-add-overlay-compilation-support.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ diff --git a/scripts/Makefile.dtbs b/scripts/Makefile.dtbs
3636
index 111111111111..222222222222 100644
3737
--- a/scripts/Makefile.dtbs
3838
+++ b/scripts/Makefile.dtbs
39-
@@ -122,17 +122,23 @@ dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
39+
@@ -123,17 +123,23 @@ dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
4040
quiet_cmd_dtc = DTC $(quiet_dtb_check_tag) $@
4141
cmd_dtc = \
4242
$(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \

‎patch/kernel/archive/meson64-6.18/general-fix-Kodi-sysinfo-CPU-information.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c
1616
index 111111111111..222222222222 100644
1717
--- a/arch/arm64/kernel/cpuinfo.c
1818
+++ b/arch/arm64/kernel/cpuinfo.c
19-
@@ -223,9 +223,8 @@ static int c_show(struct seq_file *m, void *v)
19+
@@ -224,9 +224,8 @@ static int c_show(struct seq_file *m, void *v)
2020
* "processor". Give glibc what it expects.
2121
*/
2222
seq_printf(m, "processor\t: %d\n", cpu);

‎patch/kernel/archive/meson64-6.18/general-input-touchscreen-Add-D-WAV-Multitouch.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
1616
index 111111111111..222222222222 100644
1717
--- a/drivers/hid/hid-ids.h
1818
+++ b/drivers/hid/hid-ids.h
19-
@@ -1540,4 +1540,10 @@
19+
@@ -1542,4 +1542,10 @@
2020
#define USB_VENDOR_ID_SMARTLINKTECHNOLOGY 0x4c4a
2121
#define USB_DEVICE_ID_SMARTLINKTECHNOLOGY_4155 0x4155
2222

@@ -31,7 +31,7 @@ diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
3131
index 111111111111..222222222222 100644
3232
--- a/drivers/hid/hid-quirks.c
3333
+++ b/drivers/hid/hid-quirks.c
34-
@@ -912,6 +912,8 @@ static const struct hid_device_id hid_ignore_list[] = {
34+
@@ -914,6 +914,8 @@ static const struct hid_device_id hid_ignore_list[] = {
3535
{ HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },
3636
{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_HP_5MP_CAMERA_5473) },
3737
{ HID_USB_DEVICE(USB_VENDOR_ID_SMARTLINKTECHNOLOGY, USB_DEVICE_ID_SMARTLINKTECHNOLOGY_4155) },
@@ -44,7 +44,7 @@ diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconf
4444
index 111111111111..222222222222 100644
4545
--- a/drivers/input/touchscreen/Kconfig
4646
+++ b/drivers/input/touchscreen/Kconfig
47-
@@ -1402,4 +1402,14 @@ config TOUCHSCREEN_HIMAX_HX83112B
47+
@@ -1424,4 +1424,14 @@ config TOUCHSCREEN_HIMAX_HX83112B
4848
To compile this driver as a module, choose M here: the
4949
module will be called himax_hx83112b.
5050

@@ -63,7 +63,7 @@ diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Make
6363
index 111111111111..222222222222 100644
6464
--- a/drivers/input/touchscreen/Makefile
6565
+++ b/drivers/input/touchscreen/Makefile
66-
@@ -117,4 +117,5 @@ obj-$(CONFIG_TOUCHSCREEN_RASPBERRYPI_FW) += raspberrypi-ts.o
66+
@@ -119,4 +119,5 @@ obj-$(CONFIG_TOUCHSCREEN_RASPBERRYPI_FW) += raspberrypi-ts.o
6767
obj-$(CONFIG_TOUCHSCREEN_IQS5XX) += iqs5xx.o
6868
obj-$(CONFIG_TOUCHSCREEN_IQS7211) += iqs7211.o
6969
obj-$(CONFIG_TOUCHSCREEN_ZINITIX) += zinitix.o

‎patch/kernel/archive/meson64-6.18/general-meson-mmc-2-arm64-amlogic-dts-meson-update-meson-axg-device-tree.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ index 111111111111..222222222222 100644
2323

2424
/ {
2525
compatible = "amlogic,meson-axg";
26-
@@ -1938,6 +1939,7 @@ sd_emmc_b: mmc@5000 {
26+
@@ -1959,6 +1960,7 @@ sd_emmc_b: mmc@5000 {
2727
<&clkc CLKID_SD_EMMC_B_CLK0>,
2828
<&clkc CLKID_FCLK_DIV2>;
2929
clock-names = "core", "clkin0", "clkin1";
3030
+ amlogic,mmc-phase = <CLK_PHASE_270 CLK_PHASE_0 CLK_PHASE_0>;
3131
resets = <&reset RESET_SD_EMMC_B>;
3232
};
3333

34-
@@ -1951,6 +1953,7 @@ sd_emmc_c: mmc@7000 {
34+
@@ -1972,6 +1974,7 @@ sd_emmc_c: mmc@7000 {
3535
<&clkc CLKID_FCLK_DIV2>;
3636
clock-names = "core", "clkin0", "clkin1";
3737
resets = <&reset RESET_SD_EMMC_C>;

‎patch/kernel/archive/meson64-6.18/general-soc-0004-arm64-dts-meson-add-dts-links-to-secure-monitor-for-.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi b/arch/arm64/boot/dts/aml
1919
index 111111111111..222222222222 100644
2020
--- a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi
2121
+++ b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi
22-
@@ -626,6 +626,7 @@ hwrng: rng@5118 {
22+
@@ -641,6 +641,7 @@ hwrng: rng@5118 {
2323
sec_AO: ao-secure@5a20 {
2424
compatible = "amlogic,meson-gx-ao-secure", "syscon";
2525
reg = <0x0 0x5a20 0x0 0x140>;
@@ -31,7 +31,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/am
3131
index 111111111111..222222222222 100644
3232
--- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
3333
+++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
34-
@@ -1690,6 +1690,7 @@ mux {
34+
@@ -1711,6 +1711,7 @@ mux {
3535
sec_AO: ao-secure@140 {
3636
compatible = "amlogic,meson-gx-ao-secure", "syscon";
3737
reg = <0x0 0x140 0x0 0x140>;
@@ -55,7 +55,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/aml
5555
index 111111111111..222222222222 100644
5656
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
5757
+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
58-
@@ -471,6 +471,7 @@ cec_AO: cec@100 {
58+
@@ -498,6 +498,7 @@ cec_AO: cec@100 {
5959
sec_AO: ao-secure@140 {
6060
compatible = "amlogic,meson-gx-ao-secure", "syscon";
6161
reg = <0x0 0x140 0x0 0x140>;

‎patch/kernel/archive/meson64-6.18/meson-g12a-pinctrl-add-missing-ir-options.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ index 111111111111..222222222222 100644
5959
/* uart_a */
6060
static const unsigned int uart_a_tx_pins[] = { GPIOX_12 };
6161
static const unsigned int uart_a_rx_pins[] = { GPIOX_13 };
62-
@@ -753,6 +756,7 @@ static const struct meson_pmx_group meson_g12a_periphs_groups[] = {
62+
@@ -756,6 +759,7 @@ static const struct meson_pmx_group meson_g12a_periphs_groups[] = {
6363
/* bank GPIOA */
6464
GROUP(i2c3_sda_a, 2),
6565
GROUP(i2c3_sck_a, 2),
6666
+ GROUP(remote_input, 1),
6767
GROUP(pdm_din0_a, 1),
6868
GROUP(pdm_din1_a, 1),
6969
GROUP(pdm_din2_a, 1),
70-
@@ -1038,6 +1042,10 @@ static const char * const i2c3_groups[] = {
70+
@@ -1041,6 +1045,10 @@ static const char * const i2c3_groups[] = {
7171
"i2c3_sda_a", "i2c3_sck_a",
7272
};
7373

@@ -78,7 +78,7 @@ index 111111111111..222222222222 100644
7878
static const char * const uart_a_groups[] = {
7979
"uart_a_tx", "uart_a_rx", "uart_a_cts", "uart_a_rts",
8080
};
81-
@@ -1282,6 +1290,7 @@ static const struct meson_pmx_func meson_g12a_periphs_functions[] = {
81+
@@ -1289,6 +1297,7 @@ static const struct meson_pmx_func meson_g12a_periphs_functions[] = {
8282
FUNCTION(i2c1),
8383
FUNCTION(i2c2),
8484
FUNCTION(i2c3),

0 commit comments

Comments
 (0)