mirror of
https://github.com/armbian/build
synced 2025-09-24 19:47:06 +07:00
rewrite kernel patches
This commit is contained in:
@@ -1,16 +1,16 @@
|
||||
From 5fb77258c07ec1cbad6f21d66bafde7c64a4f89a Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Patrick Yavitz <pyavitz@xxxxx.com>
|
||||
Date: Tue, 25 Jul 2023 13:31:54 -0400
|
||||
Subject: [PATCH] arch: arm64: dts: amlogic: meson g12b bananapi cm4
|
||||
Subject: arch: arm64: dts: amlogic: meson g12b bananapi cm4
|
||||
|
||||
Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
|
||||
---
|
||||
.../dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 9 +++++++--
|
||||
.../boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 12 ++++++++++--
|
||||
arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 9 +++++--
|
||||
arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 12 ++++++++--
|
||||
2 files changed, 17 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts
|
||||
index 1b0c3881c6a1..027422f7a21b 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts
|
||||
@@ -50,14 +50,15 @@ leds {
|
||||
@@ -43,7 +43,7 @@ index 1b0c3881c6a1..027422f7a21b 100644
|
||||
status = "okay";
|
||||
};
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
|
||||
index 97e522921b06..b90097f07be9 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
|
||||
@@ -12,6 +12,15 @@ aliases {
|
||||
@@ -73,5 +73,5 @@ index 97e522921b06..b90097f07be9 100644
|
||||
};
|
||||
};
|
||||
--
|
||||
2.39.2
|
||||
Armbian
|
||||
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
From d1d8e18b9d0a923ad1bc2dee601b4034ff3cebd1 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Patrick Yavitz <pyavitz@xxxxx.com>
|
||||
Date: Tue, 25 Jul 2023 13:34:18 -0400
|
||||
Subject: [PATCH] arch: arm64: dts: amlogic: meson g12b bananapi m2s
|
||||
Subject: arch: arm64: dts: amlogic: meson g12b bananapi m2s
|
||||
|
||||
Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
|
||||
---
|
||||
.../boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts | 4 ++++
|
||||
arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi | 9 +++++++++
|
||||
.../boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts | 4 ++++
|
||||
arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts | 4 ++++
|
||||
arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi | 9 +++++++++
|
||||
arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts | 4 ++++
|
||||
3 files changed, 17 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts
|
||||
index ac6f7ae1d103..55b691368598 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts
|
||||
@@ -18,6 +18,10 @@ aliases {
|
||||
@@ -26,7 +26,7 @@ index ac6f7ae1d103..55b691368598 100644
|
||||
&i2c1 {
|
||||
status = "okay";
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
|
||||
index 83709787eb91..af102061d1d7 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
|
||||
@@ -17,6 +17,15 @@ aliases {
|
||||
@@ -46,7 +46,7 @@ index 83709787eb91..af102061d1d7 100644
|
||||
stdout-path = "serial0:115200n8";
|
||||
};
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts
|
||||
index 7f66f263a2ce..3295649664d7 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts
|
||||
@@ -12,3 +12,7 @@ / {
|
||||
@@ -58,13 +58,12 @@ index 7f66f263a2ce..3295649664d7 100644
|
||||
+ sd-vqen = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>;
|
||||
+};
|
||||
--
|
||||
2.39.2
|
||||
Armbian
|
||||
|
||||
From f30ce9d85c25cb404d51aad1636d6f9b455b13e6 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Patrick Yavitz <pyavitz@xxxxx.com>
|
||||
Date: Mon, 6 Nov 2023 08:53:24 -0500
|
||||
Subject: [PATCH] v2: arch: arm64: dts: amlogic: meson-g12b-bananapi-m2s: fan
|
||||
control
|
||||
Subject: v2: arch: arm64: dts: amlogic: meson-g12b-bananapi-m2s: fan control
|
||||
|
||||
The fan on the unit is constantly running. So lets set thermal
|
||||
trip points and add the ability to control when we want it to
|
||||
@@ -72,14 +71,14 @@ kick on. By default it is set to power on at 60*C.
|
||||
|
||||
Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
|
||||
---
|
||||
.../boot/dts/amlogic/meson-g12b-bananapi.dtsi | 17 +++++++++++++++++
|
||||
arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi | 17 ++++++++++
|
||||
1 file changed, 17 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
|
||||
index af102061d1d7..5f0272269e4c 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
|
||||
@@ -315,6 +315,23 @@ &cpu103 {
|
||||
@@ -313,6 +313,23 @@ &cpu103 {
|
||||
clock-latency = <50000>;
|
||||
};
|
||||
|
||||
@@ -104,5 +103,5 @@ index af102061d1d7..5f0272269e4c 100644
|
||||
pinctrl-0 = <ð_pins>, <ð_rgmii_pins>;
|
||||
pinctrl-names = "default";
|
||||
--
|
||||
2.39.2
|
||||
Armbian
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi
|
||||
index 62404743e62d..875886137900 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi
|
||||
@@ -8,6 +8,7 @@
|
||||
|
||||
@@ -13,7 +13,7 @@ Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
|
||||
1 file changed, 65 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts
|
||||
index f045bf851638..5f6071ee84a6 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts
|
||||
@@ -25,6 +25,20 @@ cvbs_connector_in: endpoint {
|
||||
|
||||
@@ -11,10 +11,10 @@ Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
|
||||
3 files changed, 26 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
index ff68b911b729..abc0483ff3b4 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
@@ -1900,6 +1900,15 @@ mux {
|
||||
@@ -1919,6 +1919,15 @@ mux {
|
||||
};
|
||||
};
|
||||
|
||||
@@ -31,7 +31,7 @@ index ff68b911b729..abc0483ff3b4 100644
|
||||
mux {
|
||||
groups = "uart_ao_a_cts",
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts
|
||||
index 586034316ec3..5ccdc91ac276 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts
|
||||
@@ -13,6 +13,10 @@ / {
|
||||
@@ -56,7 +56,7 @@ index 586034316ec3..5ccdc91ac276 100644
|
||||
+ pinctrl-0 = <&uart_a_pins>;
|
||||
+};
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi
|
||||
index 875886137900..e6e0cb67fb39 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi
|
||||
@@ -26,6 +26,7 @@ button-sw3 {
|
||||
|
||||
@@ -15,7 +15,7 @@ Signed-off-by: Christian Hewittt <christianshewitt@gmail.com>
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
|
||||
index 514a6dd4b124..5717e078783e 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
|
||||
@@ -332,6 +332,13 @@ hdmi_tx_tmds_out: endpoint {
|
||||
|
||||
@@ -12,7 +12,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
|
||||
index fea65f20523a..dacbca73279c 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
|
||||
@@ -29,6 +29,8 @@ button-function {
|
||||
@@ -41,7 +41,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
|
||||
index 860f307494c5..cee27e7222c8 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
|
||||
@@ -18,6 +18,8 @@ / {
|
||||
|
||||
@@ -10,7 +10,7 @@ add uartC alias for nanopi-k2
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
|
||||
index 1fd2e56e6b08..636a814bd5d5 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
|
||||
@@ -15,6 +15,7 @@ / {
|
||||
|
||||
@@ -9,7 +9,7 @@ Subject: nanopik2 - enable eMMC
|
||||
1 file changed, 1 insertion(+), 3 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
|
||||
index 636a814bd5d5..14885e489241 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
|
||||
@@ -358,7 +358,7 @@ &sd_emmc_b {
|
||||
|
||||
@@ -14,7 +14,7 @@ add uartA and uartC for Odroid-C2
|
||||
1 file changed, 14 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
||||
index e6d2de7c45a9..c6a38d890db5 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
||||
@@ -17,6 +17,8 @@ / {
|
||||
|
||||
@@ -11,7 +11,7 @@ Odroid C2 enable SPI
|
||||
1 file changed, 26 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
||||
index c6a38d890db5..73ad65fad0d7 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
||||
@@ -176,6 +176,32 @@ hdmi_connector_in: endpoint {
|
||||
|
||||
@@ -9,7 +9,7 @@ Enable odroidc2-dev DVFS (#763)
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
||||
index 73ad65fad0d7..f99f8414d8e0 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
||||
@@ -360,7 +360,8 @@ &saradc {
|
||||
|
||||
@@ -16,10 +16,10 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
|
||||
index e38a4124f610..2b2932b9b1c5 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/usb/core/hub.c
|
||||
+++ b/drivers/usb/core/hub.c
|
||||
@@ -5927,7 +5927,7 @@ static const struct usb_device_id hub_id_table[] = {
|
||||
@@ -5965,7 +5965,7 @@ static const struct usb_device_id hub_id_table[] = {
|
||||
| USB_DEVICE_ID_MATCH_INT_CLASS,
|
||||
.idVendor = USB_VENDOR_GENESYS_LOGIC,
|
||||
.bInterfaceClass = USB_CLASS_HUB,
|
||||
|
||||
@@ -10,7 +10,7 @@ bring back fixed version of `odroid-reboot` driver (Fix reboot on odroid C4 when
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts
|
||||
index d04768a66bfe..e0b7aca25d21 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts
|
||||
@@ -11,6 +11,16 @@ / {
|
||||
|
||||
@@ -10,7 +10,7 @@ Subject: ODROID-HC4: add DT attributes to enable fan1_input
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
|
||||
index 846a2d6c20e5..e54832142690 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
|
||||
@@ -21,6 +21,10 @@ fan0: pwm-fan {
|
||||
|
||||
@@ -9,7 +9,7 @@ Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
|
||||
1 file changed, 16 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi
|
||||
index 8e9ad1e51d66..adc4cca55d7d 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi
|
||||
@@ -45,6 +45,14 @@ opp-1800000000 {
|
||||
|
||||
@@ -9,7 +9,7 @@ Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
|
||||
index fcd7e1d8e16f..2e4646e255ad 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
|
||||
@@ -15,6 +15,18 @@ / {
|
||||
|
||||
@@ -23,7 +23,7 @@ Signed-off-by: Yuntian Zhang <yt@radxa.com>
|
||||
1 file changed, 48 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
|
||||
index 2e4646e255ad..9dd5e6c2583d 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
|
||||
@@ -72,6 +72,14 @@ sdio_pwrseq: sdio-pwrseq {
|
||||
|
||||
@@ -12,7 +12,7 @@ Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
|
||||
index 9dd5e6c2583d..65a49891466f 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
|
||||
@@ -361,7 +361,7 @@ &sd_emmc_a {
|
||||
|
||||
@@ -19,7 +19,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
||||
5 files changed, 80 insertions(+)
|
||||
|
||||
diff --git a/Documentation/devicetree/bindings/media/rc.yaml b/Documentation/devicetree/bindings/media/rc.yaml
|
||||
index 7bbe580c80f7..dc53a1cbf6fd 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/Documentation/devicetree/bindings/media/rc.yaml
|
||||
+++ b/Documentation/devicetree/bindings/media/rc.yaml
|
||||
@@ -127,6 +127,7 @@ properties:
|
||||
@@ -31,10 +31,10 @@ index 7bbe580c80f7..dc53a1cbf6fd 100644
|
||||
- rc-tanix-tx3mini
|
||||
- rc-tanix-tx5max
|
||||
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml
|
||||
index 1a0dc04f1db4..3dc50d49e54d 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
|
||||
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
|
||||
@@ -1366,6 +1366,8 @@ patternProperties:
|
||||
@@ -1411,6 +1411,8 @@ patternProperties:
|
||||
description: Sundance DSP Inc.
|
||||
"^sunplus,.*":
|
||||
description: Sunplus Technology Co., Ltd.
|
||||
@@ -44,7 +44,7 @@ index 1a0dc04f1db4..3dc50d49e54d 100644
|
||||
description: Sun Microsystems, Inc
|
||||
"^supermicro,.*":
|
||||
diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile
|
||||
index f19558fdab0c..8f8466ea9dad 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/media/rc/keymaps/Makefile
|
||||
+++ b/drivers/media/rc/keymaps/Makefile
|
||||
@@ -107,6 +107,7 @@ obj-$(CONFIG_RC_MAP) += \
|
||||
@@ -57,7 +57,7 @@ index f19558fdab0c..8f8466ea9dad 100644
|
||||
rc-tanix-tx5max.o \
|
||||
diff --git a/drivers/media/rc/keymaps/rc-sunvell-t95z-plus.c b/drivers/media/rc/keymaps/rc-sunvell-t95z-plus.c
|
||||
new file mode 100644
|
||||
index 000000000000..aaaf6b1c0045
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/media/rc/keymaps/rc-sunvell-t95z-plus.c
|
||||
@@ -0,0 +1,75 @@
|
||||
@@ -137,7 +137,7 @@ index 000000000000..aaaf6b1c0045
|
||||
+MODULE_LICENSE("GPL");
|
||||
+MODULE_AUTHOR("Christian Hewitt <christianshewitt@gmail.com>");
|
||||
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
|
||||
index 4676545ffd8f..770527edee1d 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/include/media/rc-map.h
|
||||
+++ b/include/media/rc-map.h
|
||||
@@ -314,6 +314,7 @@ struct rc_map *rc_map_get(const char *name);
|
||||
|
||||
@@ -10,7 +10,7 @@ Subject: pyavitz meson64-generalized `odroid-reboot` driver
|
||||
3 files changed, 194 insertions(+)
|
||||
|
||||
diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig
|
||||
index fece990af4a7..3b924b23b05c 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/power/reset/Kconfig
|
||||
+++ b/drivers/power/reset/Kconfig
|
||||
@@ -148,6 +148,13 @@ config POWER_RESET_ODROID_GO_ULTRA_POWEROFF
|
||||
@@ -28,7 +28,7 @@ index fece990af4a7..3b924b23b05c 100644
|
||||
tristate "Intel PIIX4 power-off driver"
|
||||
depends on PCI
|
||||
diff --git a/drivers/power/reset/Makefile b/drivers/power/reset/Makefile
|
||||
index a95d1bd275d1..c51d43d85ba0 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/power/reset/Makefile
|
||||
+++ b/drivers/power/reset/Makefile
|
||||
@@ -14,6 +14,7 @@ obj-$(CONFIG_POWER_RESET_HISI) += hisi-reboot.o
|
||||
@@ -41,7 +41,7 @@ index a95d1bd275d1..c51d43d85ba0 100644
|
||||
obj-$(CONFIG_POWER_RESET_ODROID_GO_ULTRA_POWEROFF) += odroid-go-ultra-poweroff.o
|
||||
diff --git a/drivers/power/reset/meson64-reboot.c b/drivers/power/reset/meson64-reboot.c
|
||||
new file mode 100644
|
||||
index 000000000000..5dafbf117deb
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/power/reset/meson64-reboot.c
|
||||
@@ -0,0 +1,186 @@
|
||||
|
||||
@@ -13,7 +13,7 @@ Remove SPIdev warnings
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
|
||||
index 655f2c959cd4..d80d474a606e 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/spi/spidev.c
|
||||
+++ b/drivers/spi/spidev.c
|
||||
@@ -700,6 +700,7 @@ static const struct class spidev_class = {
|
||||
|
||||
@@ -16,7 +16,7 @@ Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
|
||||
3 files changed, 93 insertions(+)
|
||||
|
||||
diff --git a/drivers/firmware/meson/Kconfig b/drivers/firmware/meson/Kconfig
|
||||
index f2fdd3756648..d3ead92ac61b 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/firmware/meson/Kconfig
|
||||
+++ b/drivers/firmware/meson/Kconfig
|
||||
@@ -9,3 +9,9 @@ config MESON_SM
|
||||
@@ -30,7 +30,7 @@ index f2fdd3756648..d3ead92ac61b 100644
|
||||
+ help
|
||||
+ Say y here to enable the Amlogic GX SoC Power Management
|
||||
diff --git a/drivers/firmware/meson/Makefile b/drivers/firmware/meson/Makefile
|
||||
index c6c09483b622..0193cdfee32f 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/firmware/meson/Makefile
|
||||
+++ b/drivers/firmware/meson/Makefile
|
||||
@@ -1,2 +1,3 @@
|
||||
@@ -39,7 +39,7 @@ index c6c09483b622..0193cdfee32f 100644
|
||||
+obj-$(CONFIG_MESON_GX_PM) += meson_gx_pm.o
|
||||
diff --git a/drivers/firmware/meson/meson_gx_pm.c b/drivers/firmware/meson/meson_gx_pm.c
|
||||
new file mode 100644
|
||||
index 000000000000..c104c2e4c77f
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/firmware/meson/meson_gx_pm.c
|
||||
@@ -0,0 +1,86 @@
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
From a8f9689004d59f0a454ce8cb06bf1556971c1bad Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Paolo Sabatino <paolo.sabatino@gmail.com>
|
||||
Date: Sat, 20 Jul 2024 13:58:49 +0200
|
||||
Subject: [PATCH] compile .scr and install overlays in right path
|
||||
Subject: compile .scr and install overlays in right path
|
||||
|
||||
---
|
||||
scripts/Makefile.dtbinst | 13 ++++++++++++-
|
||||
scripts/Makefile.lib | 8 +++++++-
|
||||
scripts/Makefile.dtbinst | 13 +++++++++-
|
||||
scripts/Makefile.lib | 8 +++++-
|
||||
2 files changed, 19 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
|
||||
index 9d920419a62c..9144a1b7c909 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/scripts/Makefile.dtbinst
|
||||
+++ b/scripts/Makefile.dtbinst
|
||||
@@ -33,7 +33,18 @@ endef
|
||||
@@ -33,7 +33,7 @@ index 9d920419a62c..9144a1b7c909 100644
|
||||
endif # CONFIG_ARCH_WANT_FLAT_DTB_INSTALL
|
||||
|
||||
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
|
||||
index 9f06f6aaf7fc..67a7b73b6688 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/scripts/Makefile.lib
|
||||
+++ b/scripts/Makefile.lib
|
||||
@@ -394,15 +394,21 @@ quiet_cmd_wrap_S_dtb = WRAP $@
|
||||
@@ -60,5 +60,5 @@ index 9f06f6aaf7fc..67a7b73b6688 100644
|
||||
-d $(depfile).dtc.tmp $(dtc-tmp) ; \
|
||||
cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)
|
||||
--
|
||||
2.34.1
|
||||
Armbian
|
||||
|
||||
|
||||
@@ -68,7 +68,7 @@ Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
|
||||
|
||||
diff --git a/Documentation/ABI/testing/sysfs-devices-auxdisplay-tm1628 b/Documentation/ABI/testing/sysfs-devices-auxdisplay-tm1628
|
||||
new file mode 100644
|
||||
index 000000000000..382757e721af
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/Documentation/ABI/testing/sysfs-devices-auxdisplay-tm1628
|
||||
@@ -0,0 +1,7 @@
|
||||
@@ -81,7 +81,7 @@ index 000000000000..382757e721af
|
||||
+ can not be displayed in a readable way with 7 segments.
|
||||
diff --git a/Documentation/devicetree/bindings/auxdisplay/titanmec,tm1628.yaml b/Documentation/devicetree/bindings/auxdisplay/titanmec,tm1628.yaml
|
||||
new file mode 100644
|
||||
index 000000000000..d9cbbc950aab
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/Documentation/devicetree/bindings/auxdisplay/titanmec,tm1628.yaml
|
||||
@@ -0,0 +1,82 @@
|
||||
@@ -168,12 +168,12 @@ index 000000000000..d9cbbc950aab
|
||||
+ };
|
||||
+...
|
||||
diff --git a/drivers/auxdisplay/Kconfig b/drivers/auxdisplay/Kconfig
|
||||
index d944d5298eca..f3d513139e5c 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/auxdisplay/Kconfig
|
||||
+++ b/drivers/auxdisplay/Kconfig
|
||||
@@ -197,6 +197,17 @@ config ARM_CHARLCD
|
||||
line and the Linux version on the second line, but that's
|
||||
still useful.
|
||||
@@ -59,6 +59,17 @@ config LCD2S
|
||||
is a simple single color character display. You have to connect it
|
||||
to an I2C bus.
|
||||
|
||||
+config TM1628
|
||||
+ tristate "TM1628 driver for LED 7/11 segment displays"
|
||||
@@ -190,17 +190,17 @@ index d944d5298eca..f3d513139e5c 100644
|
||||
tristate "Parallel port LCD/Keypad Panel support"
|
||||
depends on PARPORT
|
||||
diff --git a/drivers/auxdisplay/Makefile b/drivers/auxdisplay/Makefile
|
||||
index 6968ed4d3f0a..7728e17e1c5a 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/auxdisplay/Makefile
|
||||
+++ b/drivers/auxdisplay/Makefile
|
||||
@@ -14,3 +14,4 @@ obj-$(CONFIG_HT16K33) += ht16k33.o
|
||||
@@ -16,3 +16,4 @@ obj-$(CONFIG_LINEDISP) += line-display.o
|
||||
obj-$(CONFIG_MAX6959) += max6959.o
|
||||
obj-$(CONFIG_PARPORT_PANEL) += panel.o
|
||||
obj-$(CONFIG_SEG_LED_GPIO) += seg-led-gpio.o
|
||||
+obj-$(CONFIG_TM1628) += tm1628.o
|
||||
diff --git a/drivers/auxdisplay/tm1628.c b/drivers/auxdisplay/tm1628.c
|
||||
new file mode 100644
|
||||
index 000000000000..4d99a7aa077b
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/auxdisplay/tm1628.c
|
||||
@@ -0,0 +1,376 @@
|
||||
|
||||
@@ -10,10 +10,10 @@ Unknown patch. Archeology:
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
|
||||
index aca5bb0866f8..2b9c2041034b 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
|
||||
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
|
||||
@@ -767,6 +767,11 @@ static void hdmi_enable_audio_clk(struct dw_hdmi *hdmi, bool enable)
|
||||
@@ -768,6 +768,11 @@ static void hdmi_enable_audio_clk(struct dw_hdmi *hdmi, bool enable)
|
||||
else
|
||||
hdmi->mc_clkdis |= HDMI_MC_CLKDIS_AUDCLK_DISABLE;
|
||||
hdmi_writeb(hdmi, hdmi->mc_clkdis, HDMI_MC_CLKDIS);
|
||||
|
||||
@@ -21,7 +21,7 @@ Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c
|
||||
index 0c2dbf6ef2a5..40eb2911d649 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/gpu/drm/panfrost/panfrost_job.c
|
||||
+++ b/drivers/gpu/drm/panfrost/panfrost_job.c
|
||||
@@ -204,7 +204,7 @@ static void panfrost_job_hw_submit(struct panfrost_job *job, int js)
|
||||
|
||||
@@ -13,10 +13,10 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c
|
||||
index 47043c0d95ec..03410a9fac77 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/kernel/cpuinfo.c
|
||||
+++ b/arch/arm64/kernel/cpuinfo.c
|
||||
@@ -190,8 +190,7 @@ static int c_show(struct seq_file *m, void *v)
|
||||
@@ -205,8 +205,7 @@ static int c_show(struct seq_file *m, void *v)
|
||||
* "processor". Give glibc what it expects.
|
||||
*/
|
||||
seq_printf(m, "processor\t: %d\n", i);
|
||||
|
||||
@@ -12,7 +12,7 @@ Signed-off-by: Dongjin Kim <tobetter@gmail.com>
|
||||
2 files changed, 19 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/meson/meson_vclk.c b/drivers/gpu/drm/meson/meson_vclk.c
|
||||
index 2a82119eb58e..eb4c251d79b7 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/gpu/drm/meson/meson_vclk.c
|
||||
+++ b/drivers/gpu/drm/meson/meson_vclk.c
|
||||
@@ -357,6 +357,8 @@ enum {
|
||||
@@ -55,7 +55,7 @@ index 2a82119eb58e..eb4c251d79b7 100644
|
||||
|
||||
meson_hdmi_pll_set_params(priv, m, frac, od1, od2, od3);
|
||||
diff --git a/drivers/gpu/drm/meson/meson_venc.c b/drivers/gpu/drm/meson/meson_venc.c
|
||||
index 3bf0d6e4fc30..c981d708240f 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/gpu/drm/meson/meson_venc.c
|
||||
+++ b/drivers/gpu/drm/meson/meson_venc.c
|
||||
@@ -868,7 +868,7 @@ meson_venc_hdmi_supported_mode(const struct drm_display_mode *mode)
|
||||
|
||||
@@ -24,7 +24,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
|
||||
1 file changed, 77 insertions(+), 63 deletions(-)
|
||||
|
||||
diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c
|
||||
index d3abb7ce2153..63e063fb02de 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/sound/soc/codecs/hdmi-codec.c
|
||||
+++ b/sound/soc/codecs/hdmi-codec.c
|
||||
@@ -185,84 +185,97 @@ static const struct snd_pcm_chmap_elem hdmi_codec_8ch_chmaps[] = {
|
||||
|
||||
@@ -13,10 +13,10 @@ Change-Id: Ia1c8c29d3f69c6ba5d630279c4cc98119b68ab71
|
||||
5 files changed, 574 insertions(+)
|
||||
|
||||
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
|
||||
index 828a5c022c64..3bb5816af1e0 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hid/hid-ids.h
|
||||
+++ b/drivers/hid/hid-ids.h
|
||||
@@ -1468,4 +1468,10 @@
|
||||
@@ -1481,4 +1481,10 @@
|
||||
#define USB_VENDOR_ID_SIGNOTEC 0x2133
|
||||
#define USB_DEVICE_ID_SIGNOTEC_VIEWSONIC_PD1011 0x0018
|
||||
|
||||
@@ -28,7 +28,7 @@ index 828a5c022c64..3bb5816af1e0 100644
|
||||
+
|
||||
#endif
|
||||
diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
|
||||
index e0bbf0c6345d..c2d0f8d9ef3b 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hid/hid-quirks.c
|
||||
+++ b/drivers/hid/hid-quirks.c
|
||||
@@ -891,6 +891,9 @@ static const struct hid_device_id hid_ignore_list[] = {
|
||||
@@ -42,10 +42,10 @@ index e0bbf0c6345d..c2d0f8d9ef3b 100644
|
||||
};
|
||||
|
||||
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
|
||||
index e3e2324547b9..2e829e2552d3 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/input/touchscreen/Kconfig
|
||||
+++ b/drivers/input/touchscreen/Kconfig
|
||||
@@ -1399,4 +1399,14 @@ config TOUCHSCREEN_HIMAX_HX83112B
|
||||
@@ -1430,4 +1430,14 @@ config TOUCHSCREEN_HIMAX_HX83112B
|
||||
To compile this driver as a module, choose M here: the
|
||||
module will be called himax_hx83112b.
|
||||
|
||||
@@ -61,10 +61,10 @@ index e3e2324547b9..2e829e2552d3 100644
|
||||
+
|
||||
endif
|
||||
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
|
||||
index 62bd24f3ac8e..51ddd5304d79 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/input/touchscreen/Makefile
|
||||
+++ b/drivers/input/touchscreen/Makefile
|
||||
@@ -117,4 +117,5 @@ obj-$(CONFIG_TOUCHSCREEN_RASPBERRYPI_FW) += raspberrypi-ts.o
|
||||
@@ -120,4 +120,5 @@ obj-$(CONFIG_TOUCHSCREEN_RASPBERRYPI_FW) += raspberrypi-ts.o
|
||||
obj-$(CONFIG_TOUCHSCREEN_IQS5XX) += iqs5xx.o
|
||||
obj-$(CONFIG_TOUCHSCREEN_IQS7211) += iqs7211.o
|
||||
obj-$(CONFIG_TOUCHSCREEN_ZINITIX) += zinitix.o
|
||||
@@ -72,7 +72,7 @@ index 62bd24f3ac8e..51ddd5304d79 100644
|
||||
obj-$(CONFIG_TOUCHSCREEN_HIMAX_HX83112B) += himax_hx83112b.o
|
||||
diff --git a/drivers/input/touchscreen/dwav-usb-mt.c b/drivers/input/touchscreen/dwav-usb-mt.c
|
||||
new file mode 100644
|
||||
index 000000000000..918bdea3cb60
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/input/touchscreen/dwav-usb-mt.c
|
||||
@@ -0,0 +1,554 @@
|
||||
|
||||
@@ -19,10 +19,10 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/media/cec/core/cec-adap.c b/drivers/media/cec/core/cec-adap.c
|
||||
index 5741adf09a2e..696e347d97f9 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/media/cec/core/cec-adap.c
|
||||
+++ b/drivers/media/cec/core/cec-adap.c
|
||||
@@ -501,9 +501,9 @@ int cec_thread_func(void *_adap)
|
||||
@@ -510,9 +510,9 @@ int cec_thread_func(void *_adap)
|
||||
* default).
|
||||
*/
|
||||
if (adap->transmitting) {
|
||||
|
||||
@@ -14,12 +14,10 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
||||
1 file changed, 9 deletions(-)
|
||||
|
||||
diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c
|
||||
index 8236ecae2953..82e5cee9dc5c 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/of/of_reserved_mem.c
|
||||
+++ b/drivers/of/of_reserved_mem.c
|
||||
@@ -80,19 +80,10 @@ static void __init fdt_reserved_mem_save_node(unsigned long node, const char *un
|
||||
|
||||
static int __init early_init_dt_reserve_memory(phys_addr_t base,
|
||||
@@ -82,15 +82,6 @@ static int __init early_init_dt_reserve_memory(phys_addr_t base,
|
||||
phys_addr_t size, bool nomap)
|
||||
{
|
||||
if (nomap) {
|
||||
@@ -35,8 +33,6 @@ index 8236ecae2953..82e5cee9dc5c 100644
|
||||
return memblock_mark_nomap(base, size);
|
||||
}
|
||||
return memblock_reserve(base, size);
|
||||
}
|
||||
|
||||
--
|
||||
--
|
||||
Armbian
|
||||
|
||||
|
||||
@@ -59,7 +59,7 @@ Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
2 files changed, 80 insertions(+), 34 deletions(-)
|
||||
|
||||
diff --git a/sound/soc/meson/aiu-codec-ctrl.c b/sound/soc/meson/aiu-codec-ctrl.c
|
||||
index ee0ef6301010..d074e29f6d0b 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/sound/soc/meson/aiu-codec-ctrl.c
|
||||
+++ b/sound/soc/meson/aiu-codec-ctrl.c
|
||||
@@ -12,14 +12,60 @@
|
||||
@@ -204,7 +204,7 @@ index ee0ef6301010..d074e29f6d0b 100644
|
||||
|
||||
static const struct snd_soc_dapm_widget aiu_hdmi_ctrl_widgets[] = {
|
||||
diff --git a/sound/soc/meson/aiu-encoder-i2s.c b/sound/soc/meson/aiu-encoder-i2s.c
|
||||
index a0dd914c8ed1..21916034a46d 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/sound/soc/meson/aiu-encoder-i2s.c
|
||||
+++ b/sound/soc/meson/aiu-encoder-i2s.c
|
||||
@@ -23,7 +23,6 @@
|
||||
|
||||
@@ -16,7 +16,7 @@ Signed-off-by: Vyacheslav Bocharov <adeep@lexina.in>
|
||||
2 files changed, 48 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
|
||||
index c7c067b9415a..7268946d3894 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/mmc/host/meson-gx-mmc.c
|
||||
+++ b/drivers/mmc/host/meson-gx-mmc.c
|
||||
@@ -27,6 +27,7 @@
|
||||
@@ -64,7 +64,7 @@ index c7c067b9415a..7268946d3894 100644
|
||||
writel(clk_reg, host->regs + SD_EMMC_CLOCK);
|
||||
diff --git a/include/dt-bindings/mmc/meson-gx-mmc.h b/include/dt-bindings/mmc/meson-gx-mmc.h
|
||||
new file mode 100644
|
||||
index 000000000000..cfc4a9d75b2b
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/include/dt-bindings/mmc/meson-gx-mmc.h
|
||||
@@ -0,0 +1,35 @@
|
||||
|
||||
@@ -12,7 +12,7 @@ Signed-off-by: Vyacheslav Bocharov <adeep@lexina.in>
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
|
||||
index 7e5ac9db93f8..1d5e10a6f617 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
|
||||
@@ -13,6 +13,7 @@
|
||||
@@ -23,7 +23,7 @@ index 7e5ac9db93f8..1d5e10a6f617 100644
|
||||
|
||||
/ {
|
||||
compatible = "amlogic,meson-axg";
|
||||
@@ -1914,6 +1915,7 @@ sd_emmc_b: mmc@5000 {
|
||||
@@ -1922,6 +1923,7 @@ sd_emmc_b: mmc@5000 {
|
||||
<&clkc CLKID_SD_EMMC_B_CLK0>,
|
||||
<&clkc CLKID_FCLK_DIV2>;
|
||||
clock-names = "core", "clkin0", "clkin1";
|
||||
@@ -31,7 +31,7 @@ index 7e5ac9db93f8..1d5e10a6f617 100644
|
||||
resets = <&reset RESET_SD_EMMC_B>;
|
||||
};
|
||||
|
||||
@@ -1927,6 +1929,7 @@ sd_emmc_c: mmc@7000 {
|
||||
@@ -1935,6 +1937,7 @@ sd_emmc_c: mmc@7000 {
|
||||
<&clkc CLKID_FCLK_DIV2>;
|
||||
clock-names = "core", "clkin0", "clkin1";
|
||||
resets = <&reset RESET_SD_EMMC_C>;
|
||||
|
||||
@@ -20,7 +20,7 @@ Signed-off-by: Vyacheslav Bocharov <adeep@lexina.in>
|
||||
1 file changed, 11 insertions(+)
|
||||
|
||||
diff --git a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml
|
||||
index bc403ae9e5d9..176c8854f613 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml
|
||||
+++ b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml
|
||||
@@ -51,6 +51,16 @@ properties:
|
||||
|
||||
@@ -14,7 +14,7 @@ Unknown patch. From LibreELEC?
|
||||
6 files changed, 1505 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/staging/media/meson/vdec/Makefile b/drivers/staging/media/meson/vdec/Makefile
|
||||
index 6e726af84ac9..16f848e456b9 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/staging/media/meson/vdec/Makefile
|
||||
+++ b/drivers/staging/media/meson/vdec/Makefile
|
||||
@@ -3,6 +3,6 @@
|
||||
@@ -27,7 +27,7 @@ index 6e726af84ac9..16f848e456b9 100644
|
||||
obj-$(CONFIG_VIDEO_MESON_VDEC) += meson-vdec.o
|
||||
diff --git a/drivers/staging/media/meson/vdec/codec_hevc.c b/drivers/staging/media/meson/vdec/codec_hevc.c
|
||||
new file mode 100644
|
||||
index 000000000000..3a6fd04a2d33
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/staging/media/meson/vdec/codec_hevc.c
|
||||
@@ -0,0 +1,1440 @@
|
||||
@@ -1473,7 +1473,7 @@ index 000000000000..3a6fd04a2d33
|
||||
+};
|
||||
diff --git a/drivers/staging/media/meson/vdec/codec_hevc.h b/drivers/staging/media/meson/vdec/codec_hevc.h
|
||||
new file mode 100644
|
||||
index 000000000000..f2f9b2464df1
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/staging/media/meson/vdec/codec_hevc.h
|
||||
@@ -0,0 +1,13 @@
|
||||
@@ -1491,7 +1491,7 @@ index 000000000000..f2f9b2464df1
|
||||
+
|
||||
+#endif
|
||||
diff --git a/drivers/staging/media/meson/vdec/esparser.c b/drivers/staging/media/meson/vdec/esparser.c
|
||||
index 4632346f04a9..6e0500bb807d 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/staging/media/meson/vdec/esparser.c
|
||||
+++ b/drivers/staging/media/meson/vdec/esparser.c
|
||||
@@ -308,7 +308,7 @@ esparser_queue(struct amvdec_session *sess, struct vb2_v4l2_buffer *vbuf)
|
||||
@@ -1504,7 +1504,7 @@ index 4632346f04a9..6e0500bb807d 100644
|
||||
num_dst_bufs = codec_ops->num_pending_bufs(sess);
|
||||
|
||||
diff --git a/drivers/staging/media/meson/vdec/hevc_regs.h b/drivers/staging/media/meson/vdec/hevc_regs.h
|
||||
index 0392f41a1eed..e7eabdd2b119 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/staging/media/meson/vdec/hevc_regs.h
|
||||
+++ b/drivers/staging/media/meson/vdec/hevc_regs.h
|
||||
@@ -205,6 +205,7 @@
|
||||
@@ -1516,7 +1516,7 @@ index 0392f41a1eed..e7eabdd2b119 100644
|
||||
#define HEVC_SAO_MMU_VH1_ADDR 0xd8ec
|
||||
|
||||
diff --git a/drivers/staging/media/meson/vdec/vdec_platform.c b/drivers/staging/media/meson/vdec/vdec_platform.c
|
||||
index 70c9fd7c8bc5..04ed5c2d6fd9 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/staging/media/meson/vdec/vdec_platform.c
|
||||
+++ b/drivers/staging/media/meson/vdec/vdec_platform.c
|
||||
@@ -11,6 +11,7 @@
|
||||
|
||||
@@ -15,7 +15,7 @@ playback as no new frames could be placed in the decoded picture buffer.
|
||||
1 file changed, 34 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/drivers/staging/media/meson/vdec/codec_hevc.c b/drivers/staging/media/meson/vdec/codec_hevc.c
|
||||
index 3a6fd04a2d33..01218efde99b 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/staging/media/meson/vdec/codec_hevc.c
|
||||
+++ b/drivers/staging/media/meson/vdec/codec_hevc.c
|
||||
@@ -223,6 +223,7 @@ struct hevc_frame {
|
||||
|
||||
@@ -10,7 +10,7 @@ Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
|
||||
1 file changed, 10 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/drivers/staging/media/meson/vdec/esparser.c b/drivers/staging/media/meson/vdec/esparser.c
|
||||
index 6e0500bb807d..43a489162035 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/staging/media/meson/vdec/esparser.c
|
||||
+++ b/drivers/staging/media/meson/vdec/esparser.c
|
||||
@@ -299,6 +299,7 @@ esparser_queue(struct amvdec_session *sess, struct vb2_v4l2_buffer *vbuf)
|
||||
|
||||
@@ -17,7 +17,7 @@ Unknown patch. From LibreELEC?
|
||||
8 files changed, 163 insertions(+), 101 deletions(-)
|
||||
|
||||
diff --git a/drivers/staging/media/meson/vdec/codec_h264.c b/drivers/staging/media/meson/vdec/codec_h264.c
|
||||
index c61128fc4bb9..d53c9a464bde 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/staging/media/meson/vdec/codec_h264.c
|
||||
+++ b/drivers/staging/media/meson/vdec/codec_h264.c
|
||||
@@ -353,7 +353,8 @@ static void codec_h264_src_change(struct amvdec_session *sess)
|
||||
@@ -31,7 +31,7 @@ index c61128fc4bb9..d53c9a464bde 100644
|
||||
|
||||
/*
|
||||
diff --git a/drivers/staging/media/meson/vdec/codec_hevc_common.c b/drivers/staging/media/meson/vdec/codec_hevc_common.c
|
||||
index 0315cc0911cd..d6ed82dc93ca 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/staging/media/meson/vdec/codec_hevc_common.c
|
||||
+++ b/drivers/staging/media/meson/vdec/codec_hevc_common.c
|
||||
@@ -30,8 +30,11 @@ const u16 vdec_hevc_parser_cmd[] = {
|
||||
@@ -325,7 +325,7 @@ index 0315cc0911cd..d6ed82dc93ca 100644
|
||||
mmu_map[i] = first_page + i;
|
||||
}
|
||||
diff --git a/drivers/staging/media/meson/vdec/codec_hevc_common.h b/drivers/staging/media/meson/vdec/codec_hevc_common.h
|
||||
index cf072b8a9da2..13f9f1d90a94 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/staging/media/meson/vdec/codec_hevc_common.h
|
||||
+++ b/drivers/staging/media/meson/vdec/codec_hevc_common.h
|
||||
@@ -64,6 +64,7 @@ int codec_hevc_setup_buffers(struct amvdec_session *sess,
|
||||
@@ -338,7 +338,7 @@ index cf072b8a9da2..13f9f1d90a94 100644
|
||||
|
||||
#endif
|
||||
diff --git a/drivers/staging/media/meson/vdec/codec_vp9.c b/drivers/staging/media/meson/vdec/codec_vp9.c
|
||||
index 394df5761556..c2fec7a89fea 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/staging/media/meson/vdec/codec_vp9.c
|
||||
+++ b/drivers/staging/media/meson/vdec/codec_vp9.c
|
||||
@@ -458,12 +458,6 @@ struct codec_vp9 {
|
||||
@@ -430,7 +430,7 @@ index 394df5761556..c2fec7a89fea 100644
|
||||
/* No frame is actually processed */
|
||||
vp9->cur_frame = NULL;
|
||||
diff --git a/drivers/staging/media/meson/vdec/esparser.c b/drivers/staging/media/meson/vdec/esparser.c
|
||||
index 43a489162035..96e14cdaf863 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/staging/media/meson/vdec/esparser.c
|
||||
+++ b/drivers/staging/media/meson/vdec/esparser.c
|
||||
@@ -319,6 +319,7 @@ esparser_queue(struct amvdec_session *sess, struct vb2_v4l2_buffer *vbuf)
|
||||
@@ -442,10 +442,10 @@ index 43a489162035..96e14cdaf863 100644
|
||||
return -EAGAIN;
|
||||
}
|
||||
diff --git a/drivers/staging/media/meson/vdec/vdec.h b/drivers/staging/media/meson/vdec/vdec.h
|
||||
index 0906b8fb5cc6..a48170fe4cff 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/staging/media/meson/vdec/vdec.h
|
||||
+++ b/drivers/staging/media/meson/vdec/vdec.h
|
||||
@@ -244,6 +244,7 @@ struct amvdec_session {
|
||||
@@ -243,6 +243,7 @@ struct amvdec_session {
|
||||
u32 width;
|
||||
u32 height;
|
||||
u32 colorspace;
|
||||
@@ -454,7 +454,7 @@ index 0906b8fb5cc6..a48170fe4cff 100644
|
||||
u8 quantization;
|
||||
u8 xfer_func;
|
||||
diff --git a/drivers/staging/media/meson/vdec/vdec_helpers.c b/drivers/staging/media/meson/vdec/vdec_helpers.c
|
||||
index 7d2a75653250..d684057509bf 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/staging/media/meson/vdec/vdec_helpers.c
|
||||
+++ b/drivers/staging/media/meson/vdec/vdec_helpers.c
|
||||
@@ -50,32 +50,40 @@ void amvdec_write_parser(struct amvdec_core *core, u32 reg, u32 val)
|
||||
@@ -553,7 +553,7 @@ index 7d2a75653250..d684057509bf 100644
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(amvdec_src_change);
|
||||
diff --git a/drivers/staging/media/meson/vdec/vdec_helpers.h b/drivers/staging/media/meson/vdec/vdec_helpers.h
|
||||
index 4bf3e61d081b..1a711679d26a 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/staging/media/meson/vdec/vdec_helpers.h
|
||||
+++ b/drivers/staging/media/meson/vdec/vdec_helpers.h
|
||||
@@ -27,9 +27,10 @@ void amvdec_clear_dos_bits(struct amvdec_core *core, u32 reg, u32 val);
|
||||
|
||||
@@ -9,10 +9,10 @@ Signed-off-by: Zhang Ning <832666+zhangn1985@users.noreply.github.com>
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
|
||||
index 75008c9921f6..6ddb83df5177 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/scripts/Makefile.lib
|
||||
+++ b/scripts/Makefile.lib
|
||||
@@ -88,6 +88,9 @@ base-dtb-y := $(filter %.dtb, $(call real-search, $(multi-dtb-y), .dtb, -dtbs))
|
||||
@@ -93,6 +93,9 @@ base-dtb-y := $(filter %.dtb, $(call real-search, $(multi-dtb-y), .dtb, -dtbs))
|
||||
|
||||
always-y += $(dtb-y)
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ Details: https://github.com/CoreELEC/CoreELEC/pull/208
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c
|
||||
index dae1f2153e8b..cd44523f46a8 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/media/dvb-frontends/si2168.c
|
||||
+++ b/drivers/media/dvb-frontends/si2168.c
|
||||
@@ -40,7 +40,7 @@ static int si2168_cmd_execute(struct i2c_client *client, struct si2168_cmd *cmd)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 0120fd45f5c58571ab609497e6f968f7251d8d45 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Tue, 4 Jun 2024 05:07:52 +0000
|
||||
Subject: [PATCH 1/6] soc: amlogic: meson-gx-socinfo: Add S905L ID
|
||||
Subject: soc: amlogic: meson-gx-socinfo: Add S905L ID
|
||||
|
||||
Add the S905L SoC ID observed in several P271 boards:
|
||||
|
||||
@@ -14,7 +14,7 @@ Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c b/drivers/soc/amlogic/meson-gx-socinfo.c
|
||||
index 6abb730344ab..7e255acf5430 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/soc/amlogic/meson-gx-socinfo.c
|
||||
+++ b/drivers/soc/amlogic/meson-gx-socinfo.c
|
||||
@@ -64,6 +64,7 @@ static const struct meson_gx_package_id {
|
||||
@@ -26,5 +26,5 @@ index 6abb730344ab..7e255acf5430 100644
|
||||
{ "S905Y2", 0x28, 0x30, 0xf0 },
|
||||
{ "S905X2", 0x28, 0x40, 0xf0 },
|
||||
--
|
||||
2.45.2
|
||||
Armbian
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 90b6ee09d8c950ec5ec1062ccafe7815bb033199 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Viacheslav Bocharov <adeep@lexina.in>
|
||||
Date: Tue, 4 Jun 2024 17:04:51 +0300
|
||||
Subject: [PATCH 2/6] soc: amlogic: meson-gx-socinfo: add new A113X SoC id
|
||||
Subject: soc: amlogic: meson-gx-socinfo: add new A113X SoC id
|
||||
|
||||
Add new definition for Amlogix A113X SoC found in JetHub D1/D1+ devices:
|
||||
|
||||
@@ -13,7 +13,7 @@ Signed-off-by: Viacheslav Bocharov <adeep@lexina.in>
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c b/drivers/soc/amlogic/meson-gx-socinfo.c
|
||||
index 7e255acf5430..8809a948201a 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/soc/amlogic/meson-gx-socinfo.c
|
||||
+++ b/drivers/soc/amlogic/meson-gx-socinfo.c
|
||||
@@ -63,6 +63,7 @@ static const struct meson_gx_package_id {
|
||||
@@ -25,5 +25,5 @@ index 7e255acf5430..8809a948201a 100644
|
||||
{ "S905L", 0x26, 0, 0x0 },
|
||||
{ "S905D2", 0x28, 0x10, 0xf0 },
|
||||
--
|
||||
2.45.2
|
||||
Armbian
|
||||
|
||||
|
||||
@@ -1,22 +1,20 @@
|
||||
From c4d792a1bc40b7265b2cbf23b5f5605e42e21928 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Viacheslav Bocharov <adeep@lexina.in>
|
||||
Date: Tue, 4 Jun 2024 17:18:08 +0300
|
||||
Subject: [PATCH 3/6] soc: amlogic: meson-gx-socinfo: move common code to
|
||||
header file
|
||||
Subject: soc: amlogic: meson-gx-socinfo: move common code to header file
|
||||
|
||||
Move common constants and inline functions from meson-gx-socinfo driver
|
||||
to header file. Create new structures for store meson64 cpu_id and chip_id.
|
||||
|
||||
Signed-off-by: Viacheslav Bocharov <adeep@lexina.in>
|
||||
---
|
||||
.../soc/amlogic/meson-gx-socinfo-internal.h | 122 +++++++++++++++
|
||||
drivers/soc/amlogic/meson-gx-socinfo.c | 140 ++----------------
|
||||
drivers/soc/amlogic/meson-gx-socinfo-internal.h | 122 ++++++++
|
||||
drivers/soc/amlogic/meson-gx-socinfo.c | 140 +---------
|
||||
2 files changed, 137 insertions(+), 125 deletions(-)
|
||||
create mode 100644 drivers/soc/amlogic/meson-gx-socinfo-internal.h
|
||||
|
||||
diff --git a/drivers/soc/amlogic/meson-gx-socinfo-internal.h b/drivers/soc/amlogic/meson-gx-socinfo-internal.h
|
||||
new file mode 100644
|
||||
index 000000000000..42cd57e67390
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/soc/amlogic/meson-gx-socinfo-internal.h
|
||||
@@ -0,0 +1,122 @@
|
||||
@@ -143,7 +141,7 @@ index 000000000000..42cd57e67390
|
||||
+
|
||||
+#endif /* _MESON_GX_SOCINFO_INTERNAL_H_ */
|
||||
diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c b/drivers/soc/amlogic/meson-gx-socinfo.c
|
||||
index 8809a948201a..ca7b82c07083 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/soc/amlogic/meson-gx-socinfo.c
|
||||
+++ b/drivers/soc/amlogic/meson-gx-socinfo.c
|
||||
@@ -1,8 +1,8 @@
|
||||
@@ -337,5 +335,5 @@ index 8809a948201a..ca7b82c07083 100644
|
||||
return 0;
|
||||
}
|
||||
--
|
||||
2.45.2
|
||||
Armbian
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
From 4fc80646e728133378fb44abe1bffa72655104c6 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Viacheslav Bocharov <adeep@lexina.in>
|
||||
Date: Wed, 21 Feb 2024 16:41:30 +0300
|
||||
Subject: [PATCH 4/6] soc: amlogic: meson-gx-socinfo-sm: Add Amlogic
|
||||
secure-monitor SoC Information driver
|
||||
Subject: soc: amlogic: meson-gx-socinfo-sm: Add Amlogic secure-monitor SoC
|
||||
Information driver
|
||||
|
||||
Amlogic SoCs have a SoC information secure-monitor call for SoC type,
|
||||
package type, revision information and chipid.
|
||||
@@ -12,15 +12,14 @@ Information driver.
|
||||
|
||||
Signed-off-by: Viacheslav Bocharov <adeep@lexina.in>
|
||||
---
|
||||
drivers/soc/amlogic/Kconfig | 10 +
|
||||
drivers/soc/amlogic/Makefile | 1 +
|
||||
.../soc/amlogic/meson-gx-socinfo-internal.h | 14 +-
|
||||
drivers/soc/amlogic/meson-gx-socinfo-sm.c | 190 ++++++++++++++++++
|
||||
drivers/soc/amlogic/Kconfig | 10 +
|
||||
drivers/soc/amlogic/Makefile | 1 +
|
||||
drivers/soc/amlogic/meson-gx-socinfo-internal.h | 14 +-
|
||||
drivers/soc/amlogic/meson-gx-socinfo-sm.c | 190 ++++++++++
|
||||
4 files changed, 211 insertions(+), 4 deletions(-)
|
||||
create mode 100644 drivers/soc/amlogic/meson-gx-socinfo-sm.c
|
||||
|
||||
diff --git a/drivers/soc/amlogic/Kconfig b/drivers/soc/amlogic/Kconfig
|
||||
index d08e398bdad4..82fc77ca3b4b 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/soc/amlogic/Kconfig
|
||||
+++ b/drivers/soc/amlogic/Kconfig
|
||||
@@ -26,6 +26,16 @@ config MESON_GX_SOCINFO
|
||||
@@ -41,7 +40,7 @@ index d08e398bdad4..82fc77ca3b4b 100644
|
||||
bool "Amlogic Meson MX SoC Information driver"
|
||||
depends on (ARM && ARCH_MESON) || COMPILE_TEST
|
||||
diff --git a/drivers/soc/amlogic/Makefile b/drivers/soc/amlogic/Makefile
|
||||
index c25f835e6a26..45d9d6f5904c 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/soc/amlogic/Makefile
|
||||
+++ b/drivers/soc/amlogic/Makefile
|
||||
@@ -2,4 +2,5 @@
|
||||
@@ -51,7 +50,7 @@ index c25f835e6a26..45d9d6f5904c 100644
|
||||
+obj-$(CONFIG_MESON_GX_SOCINFO_SM) += meson-gx-socinfo-sm.o
|
||||
obj-$(CONFIG_MESON_MX_SOCINFO) += meson-mx-socinfo.o
|
||||
diff --git a/drivers/soc/amlogic/meson-gx-socinfo-internal.h b/drivers/soc/amlogic/meson-gx-socinfo-internal.h
|
||||
index 42cd57e67390..f032f4c9cc83 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/soc/amlogic/meson-gx-socinfo-internal.h
|
||||
+++ b/drivers/soc/amlogic/meson-gx-socinfo-internal.h
|
||||
@@ -33,10 +33,16 @@ union meson_cpu_id {
|
||||
@@ -77,7 +76,7 @@ index 42cd57e67390..f032f4c9cc83 100644
|
||||
static const struct meson_gx_soc_id {
|
||||
diff --git a/drivers/soc/amlogic/meson-gx-socinfo-sm.c b/drivers/soc/amlogic/meson-gx-socinfo-sm.c
|
||||
new file mode 100644
|
||||
index 000000000000..e12f45cd8de2
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/soc/amlogic/meson-gx-socinfo-sm.c
|
||||
@@ -0,0 +1,190 @@
|
||||
@@ -272,5 +271,5 @@ index 000000000000..e12f45cd8de2
|
||||
+MODULE_DESCRIPTION("Amlogic Meson GX SOC SM driver");
|
||||
+MODULE_LICENSE("GPL");
|
||||
--
|
||||
2.45.2
|
||||
Armbian
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
From ee45df40ba6acbecf5ea4b976ec72688fbb1dd19 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Viacheslav Bocharov <adeep@lexina.in>
|
||||
Date: Thu, 14 Mar 2024 09:59:54 +0300
|
||||
Subject: [PATCH 5/6] arm64: dts: meson: add dts links to secure-monitor for
|
||||
soc driver in a1, axg, gx, g12
|
||||
Subject: arm64: dts: meson: add dts links to secure-monitor for soc driver in
|
||||
a1, axg, gx, g12
|
||||
|
||||
Add links to secure-monitor in soc driver section for A1, AXG, GX, G12
|
||||
Amlogic family for use with meson-socinfo-sm driver.
|
||||
@@ -16,7 +16,7 @@ Signed-off-by: Viacheslav Bocharov <adeep@lexina.in>
|
||||
4 files changed, 4 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi
|
||||
index c03e207ea6c5..d47f056117fc 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi
|
||||
@@ -407,6 +407,7 @@ hwrng: rng@5118 {
|
||||
@@ -28,10 +28,10 @@ index c03e207ea6c5..d47f056117fc 100644
|
||||
};
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
|
||||
index 6d12b760b90f..45791ec6694a 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
|
||||
@@ -1689,6 +1689,7 @@ mux {
|
||||
@@ -1690,6 +1690,7 @@ mux {
|
||||
sec_AO: ao-secure@140 {
|
||||
compatible = "amlogic,meson-gx-ao-secure", "syscon";
|
||||
reg = <0x0 0x140 0x0 0x140>;
|
||||
@@ -40,10 +40,10 @@ index 6d12b760b90f..45791ec6694a 100644
|
||||
};
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
index 9d5eab6595d0..a8c1c72543b7 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
@@ -2026,6 +2026,7 @@ cec_AO: cec@100 {
|
||||
@@ -2054,6 +2054,7 @@ cec_AO: cec@100 {
|
||||
sec_AO: ao-secure@140 {
|
||||
compatible = "amlogic,meson-gx-ao-secure", "syscon";
|
||||
reg = <0x0 0x140 0x0 0x140>;
|
||||
@@ -52,7 +52,7 @@ index 9d5eab6595d0..a8c1c72543b7 100644
|
||||
};
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
|
||||
index 2673f0dbafe7..656e08b3d872 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
|
||||
@@ -471,6 +471,7 @@ cec_AO: cec@100 {
|
||||
@@ -64,5 +64,5 @@ index 2673f0dbafe7..656e08b3d872 100644
|
||||
};
|
||||
|
||||
--
|
||||
2.45.2
|
||||
Armbian
|
||||
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
From 562c95035406acfee1f6c941dc4017a4e5b305f6 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Viacheslav Bocharov <adeep@lexina.in>
|
||||
Date: Tue, 4 Jun 2024 17:54:53 +0300
|
||||
Subject: [PATCH 6/6] dt-bindings: arm: amlogic: amlogic,meson-gx-ao-secure:
|
||||
add secure-monitor property
|
||||
Subject: dt-bindings: arm: amlogic: amlogic,meson-gx-ao-secure: add
|
||||
secure-monitor property
|
||||
|
||||
Add secure-monitor property to schema for meson-gx-socinfo-sm driver.
|
||||
|
||||
Signed-off-by: Viacheslav Bocharov <adeep@lexina.in>
|
||||
---
|
||||
.../bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml | 4 ++++
|
||||
Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml b/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml
|
||||
index 7dff32f373cb..1128a794ec89 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml
|
||||
+++ b/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml
|
||||
@@ -32,6 +32,10 @@ properties:
|
||||
@@ -27,5 +27,5 @@ index 7dff32f373cb..1128a794ec89 100644
|
||||
description: |
|
||||
A firmware register encodes the SoC type, package and revision
|
||||
--
|
||||
2.45.2
|
||||
Armbian
|
||||
|
||||
|
||||
@@ -11,27 +11,27 @@ Signed-off-by: ckkim <changkon12@gmail.com>
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/sound/soc/meson/axg-frddr.c b/sound/soc/meson/axg-frddr.c
|
||||
index 8c166a5f338c..89afec8b49f7 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/sound/soc/meson/axg-frddr.c
|
||||
+++ b/sound/soc/meson/axg-frddr.c
|
||||
@@ -107,7 +107,7 @@ static struct snd_soc_dai_driver axg_frddr_dai_drv = {
|
||||
@@ -108,7 +108,7 @@ static struct snd_soc_dai_driver axg_frddr_dai_drv = {
|
||||
.name = "FRDDR",
|
||||
.playback = {
|
||||
.stream_name = "Playback",
|
||||
- .channels_min = 1,
|
||||
+ .channels_min = 2,
|
||||
.channels_max = AXG_FIFO_CH_MAX,
|
||||
.rates = AXG_FIFO_RATES,
|
||||
.formats = AXG_FIFO_FORMATS,
|
||||
@@ -182,7 +182,7 @@ static struct snd_soc_dai_driver g12a_frddr_dai_drv = {
|
||||
.rates = SNDRV_PCM_RATE_CONTINUOUS,
|
||||
.rate_min = 5515,
|
||||
@@ -185,7 +185,7 @@ static struct snd_soc_dai_driver g12a_frddr_dai_drv = {
|
||||
.name = "FRDDR",
|
||||
.playback = {
|
||||
.stream_name = "Playback",
|
||||
- .channels_min = 1,
|
||||
+ .channels_min = 2,
|
||||
.channels_max = AXG_FIFO_CH_MAX,
|
||||
.rates = AXG_FIFO_RATES,
|
||||
.formats = AXG_FIFO_FORMATS,
|
||||
.rates = SNDRV_PCM_RATE_CONTINUOUS,
|
||||
.rate_min = 5515,
|
||||
--
|
||||
Armbian
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ in the core.{c,h} files.
|
||||
4 files changed, 22 insertions(+)
|
||||
|
||||
diff --git a/drivers/mtd/spi-nor/Makefile b/drivers/mtd/spi-nor/Makefile
|
||||
index 5e68468b72fc..4463d161aa5b 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/mtd/spi-nor/Makefile
|
||||
+++ b/drivers/mtd/spi-nor/Makefile
|
||||
@@ -15,6 +15,7 @@ spi-nor-objs += sst.o
|
||||
@@ -43,10 +43,10 @@ index 5e68468b72fc..4463d161aa5b 100644
|
||||
obj-$(CONFIG_MTD_SPI_NOR) += spi-nor.o
|
||||
|
||||
diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
|
||||
index 4129764fad8c..7fd85ed0095c 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/mtd/spi-nor/core.c
|
||||
+++ b/drivers/mtd/spi-nor/core.c
|
||||
@@ -2051,6 +2051,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = {
|
||||
@@ -1988,6 +1988,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = {
|
||||
&spi_nor_winbond,
|
||||
&spi_nor_xilinx,
|
||||
&spi_nor_xmc,
|
||||
@@ -55,10 +55,10 @@ index 4129764fad8c..7fd85ed0095c 100644
|
||||
|
||||
static const struct flash_info spi_nor_generic_flash = {
|
||||
diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h
|
||||
index d36c0e072954..5de9fb289170 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/mtd/spi-nor/core.h
|
||||
+++ b/drivers/mtd/spi-nor/core.h
|
||||
@@ -615,6 +615,7 @@ extern const struct spi_nor_manufacturer spi_nor_sst;
|
||||
@@ -605,6 +605,7 @@ extern const struct spi_nor_manufacturer spi_nor_sst;
|
||||
extern const struct spi_nor_manufacturer spi_nor_winbond;
|
||||
extern const struct spi_nor_manufacturer spi_nor_xilinx;
|
||||
extern const struct spi_nor_manufacturer spi_nor_xmc;
|
||||
@@ -68,7 +68,7 @@ index d36c0e072954..5de9fb289170 100644
|
||||
|
||||
diff --git a/drivers/mtd/spi-nor/xtx.c b/drivers/mtd/spi-nor/xtx.c
|
||||
new file mode 100644
|
||||
index 000000000000..eec9be2d9667
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/mtd/spi-nor/xtx.c
|
||||
@@ -0,0 +1,19 @@
|
||||
|
||||
@@ -33,10 +33,10 @@ Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
|
||||
index 2b2932b9b1c5..08b30a306d6b 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/usb/core/hub.c
|
||||
+++ b/drivers/usb/core/hub.c
|
||||
@@ -1447,9 +1447,8 @@ static int hub_configure(struct usb_hub *hub,
|
||||
@@ -1475,9 +1475,8 @@ static int hub_configure(struct usb_hub *hub,
|
||||
ret = -ENODEV;
|
||||
goto fail;
|
||||
} else if (hub->descriptor->bNbrPorts == 0) {
|
||||
|
||||
@@ -21,12 +21,12 @@ Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
|
||||
1 file changed, 88 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/drivers/hwmon/emc2305.c b/drivers/hwmon/emc2305.c
|
||||
index 29f0e4945f19..2581166cb978 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hwmon/emc2305.c
|
||||
+++ b/drivers/hwmon/emc2305.c
|
||||
@@ -15,12 +15,13 @@
|
||||
static const unsigned short
|
||||
emc2305_normal_i2c[] = { 0x27, 0x2c, 0x2d, 0x2e, 0x2f, 0x4c, 0x4d, I2C_CLIENT_END };
|
||||
@@ -12,12 +12,13 @@
|
||||
#include <linux/platform_data/emc2305.h>
|
||||
#include <linux/thermal.h>
|
||||
|
||||
+#define EMC2305_REG_FAN_STATUS 0x24
|
||||
+#define EMC2305_REG_FAN_STALL_STATUS 0x25
|
||||
@@ -39,7 +39,7 @@ index 29f0e4945f19..2581166cb978 100644
|
||||
#define EMC2305_VENDOR 0x5d
|
||||
#define EMC2305_REG_PRODUCT_ID 0xfd
|
||||
#define EMC2305_TACH_REGS_UNUSE_BITS 3
|
||||
@@ -39,6 +40,7 @@ emc2305_normal_i2c[] = { 0x27, 0x2c, 0x2d, 0x2e, 0x2f, 0x4c, 0x4d, I2C_CLIENT_EN
|
||||
@@ -36,6 +37,7 @@
|
||||
#define EMC2305_RPM_FACTOR 3932160
|
||||
|
||||
#define EMC2305_REG_FAN_DRIVE(n) (0x30 + 0x10 * (n))
|
||||
@@ -47,7 +47,7 @@ index 29f0e4945f19..2581166cb978 100644
|
||||
#define EMC2305_REG_FAN_MIN_DRIVE(n) (0x38 + 0x10 * (n))
|
||||
#define EMC2305_REG_FAN_TACH(n) (0x3e + 0x10 * (n))
|
||||
|
||||
@@ -58,6 +60,16 @@ static const struct i2c_device_id emc2305_ids[] = {
|
||||
@@ -55,6 +57,16 @@ static const struct i2c_device_id emc2305_ids[] = {
|
||||
};
|
||||
MODULE_DEVICE_TABLE(i2c, emc2305_ids);
|
||||
|
||||
@@ -64,7 +64,7 @@ index 29f0e4945f19..2581166cb978 100644
|
||||
/**
|
||||
* struct emc2305_cdev_data - device-specific cooling device state
|
||||
* @cdev: cooling device
|
||||
@@ -103,6 +115,7 @@ struct emc2305_data {
|
||||
@@ -100,6 +112,7 @@ struct emc2305_data {
|
||||
u8 pwm_num;
|
||||
bool pwm_separate;
|
||||
u8 pwm_min[EMC2305_PWM_MAX];
|
||||
@@ -72,7 +72,7 @@ index 29f0e4945f19..2581166cb978 100644
|
||||
struct emc2305_cdev_data cdev_data[EMC2305_PWM_MAX];
|
||||
};
|
||||
|
||||
@@ -275,7 +288,7 @@ static int emc2305_set_pwm(struct device *dev, long val, int channel)
|
||||
@@ -272,7 +285,7 @@ static int emc2305_set_pwm(struct device *dev, long val, int channel)
|
||||
struct i2c_client *client = data->client;
|
||||
int ret;
|
||||
|
||||
@@ -81,7 +81,7 @@ index 29f0e4945f19..2581166cb978 100644
|
||||
return -EINVAL;
|
||||
|
||||
ret = i2c_smbus_write_byte_data(client, EMC2305_REG_FAN_DRIVE(channel), val);
|
||||
@@ -286,6 +299,49 @@ static int emc2305_set_pwm(struct device *dev, long val, int channel)
|
||||
@@ -283,6 +296,49 @@ static int emc2305_set_pwm(struct device *dev, long val, int channel)
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -131,7 +131,7 @@ index 29f0e4945f19..2581166cb978 100644
|
||||
static int emc2305_set_single_tz(struct device *dev, int idx)
|
||||
{
|
||||
struct emc2305_data *data = dev_get_drvdata(dev);
|
||||
@@ -295,9 +351,17 @@ static int emc2305_set_single_tz(struct device *dev, int idx)
|
||||
@@ -292,9 +348,17 @@ static int emc2305_set_single_tz(struct device *dev, int idx)
|
||||
cdev_idx = (idx) ? idx - 1 : 0;
|
||||
pwm = data->pwm_min[cdev_idx];
|
||||
|
||||
@@ -152,7 +152,7 @@ index 29f0e4945f19..2581166cb978 100644
|
||||
|
||||
if (IS_ERR(data->cdev_data[cdev_idx].cdev)) {
|
||||
dev_err(dev, "Failed to register cooling device %s\n", emc2305_fan_name[idx]);
|
||||
@@ -350,9 +414,11 @@ static void emc2305_unset_tz(struct device *dev)
|
||||
@@ -347,9 +411,11 @@ static void emc2305_unset_tz(struct device *dev)
|
||||
int i;
|
||||
|
||||
/* Unregister cooling device. */
|
||||
@@ -167,7 +167,7 @@ index 29f0e4945f19..2581166cb978 100644
|
||||
}
|
||||
|
||||
static umode_t
|
||||
@@ -574,11 +640,18 @@ static int emc2305_probe(struct i2c_client *client)
|
||||
@@ -571,11 +637,18 @@ static int emc2305_probe(struct i2c_client *client)
|
||||
data->pwm_separate = pdata->pwm_separate;
|
||||
for (i = 0; i < EMC2305_PWM_MAX; i++)
|
||||
data->pwm_min[i] = pdata->pwm_min[i];
|
||||
@@ -186,7 +186,7 @@ index 29f0e4945f19..2581166cb978 100644
|
||||
}
|
||||
|
||||
data->hwmon_dev = devm_hwmon_device_register_with_info(dev, "emc2305", data,
|
||||
@@ -599,6 +672,12 @@ static int emc2305_probe(struct i2c_client *client)
|
||||
@@ -596,6 +669,12 @@ static int emc2305_probe(struct i2c_client *client)
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -199,8 +199,8 @@ index 29f0e4945f19..2581166cb978 100644
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -614,6 +693,7 @@ static struct i2c_driver emc2305_driver = {
|
||||
.class = I2C_CLASS_HWMON,
|
||||
@@ -610,6 +689,7 @@ static void emc2305_remove(struct i2c_client *client)
|
||||
static struct i2c_driver emc2305_driver = {
|
||||
.driver = {
|
||||
.name = "emc2305",
|
||||
+ .of_match_table = emc2305_dt_ids,
|
||||
|
||||
@@ -11,7 +11,7 @@ Signed-off-by: Vyacheslav Bocharov <devel@lexina.in>
|
||||
2 files changed, 42 insertions(+)
|
||||
|
||||
diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c
|
||||
index 524424ee6c4e..77b9222a53c8 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/pinctrl/meson/pinctrl-meson.c
|
||||
+++ b/drivers/pinctrl/meson/pinctrl-meson.c
|
||||
@@ -51,6 +51,7 @@
|
||||
@@ -84,7 +84,7 @@ index 524424ee6c4e..77b9222a53c8 100644
|
||||
if (IS_ERR_OR_NULL(pc->reg_mux)) {
|
||||
dev_err(pc->dev, "mux registers not found\n");
|
||||
diff --git a/drivers/pinctrl/meson/pinctrl-meson.h b/drivers/pinctrl/meson/pinctrl-meson.h
|
||||
index 34fc4e8612e4..0f9fa04513ea 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/pinctrl/meson/pinctrl-meson.h
|
||||
+++ b/drivers/pinctrl/meson/pinctrl-meson.h
|
||||
@@ -134,6 +134,7 @@ struct meson_pinctrl {
|
||||
|
||||
@@ -10,7 +10,7 @@ Add node for eeprom on baseboard in JetHub D1+ device
|
||||
2 files changed, 24 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-2.dts b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-2.dts
|
||||
index 8a18ce948450..e02f7b1cb0c1 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-2.dts
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-2.dts
|
||||
@@ -47,3 +47,15 @@ eeprompd: eeprom@56 {
|
||||
@@ -30,7 +30,7 @@ index 8a18ce948450..e02f7b1cb0c1 100644
|
||||
+ };
|
||||
+};
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-3.dts b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-3.dts
|
||||
index c356bd2cc63a..1f894a429534 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-3.dts
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-3.dts
|
||||
@@ -37,3 +37,15 @@ eeprompd: eeprom@56 {
|
||||
|
||||
@@ -21,7 +21,7 @@ Subject: [ARCHEOLOGY] meson-s4t7: Fix custom_kernel_config: hash modification
|
||||
|
||||
diff --git a/tools/cgroup/Makefile b/tools/cgroup/Makefile
|
||||
new file mode 100644
|
||||
index 000000000000..ffca068e4a76
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/tools/cgroup/Makefile
|
||||
@@ -0,0 +1,11 @@
|
||||
|
||||
@@ -12,7 +12,7 @@ Signed-off-by: Yuntian Zhang <yt@radxa.com>
|
||||
2 files changed, 25 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
index a33deaee557e..c7e78ae7933d 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
@@ -563,6 +563,14 @@ mux {
|
||||
@@ -30,7 +30,7 @@ index a33deaee557e..c7e78ae7933d 100644
|
||||
mclk0_a_pins: mclk0-a {
|
||||
mux {
|
||||
groups = "mclk0_a";
|
||||
@@ -2015,6 +2023,14 @@ mux {
|
||||
@@ -2034,6 +2042,14 @@ mux {
|
||||
bias-disable;
|
||||
};
|
||||
};
|
||||
@@ -46,7 +46,7 @@ index a33deaee557e..c7e78ae7933d 100644
|
||||
};
|
||||
|
||||
diff --git a/drivers/pinctrl/meson/pinctrl-meson-g12a.c b/drivers/pinctrl/meson/pinctrl-meson-g12a.c
|
||||
index 2c17891ba6a9..e80a5897d9f2 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/pinctrl/meson/pinctrl-meson-g12a.c
|
||||
+++ b/drivers/pinctrl/meson/pinctrl-meson-g12a.c
|
||||
@@ -216,6 +216,9 @@ static const unsigned int i2c3_sck_h_pins[] = { GPIOH_1 };
|
||||
|
||||
@@ -16,7 +16,7 @@ Signed-off-by: Yuntian Zhang <yt@radxa.com>
|
||||
2 files changed, 45 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
|
||||
index 86e6ceb31d5e..256416943fa0 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
|
||||
@@ -149,3 +149,37 @@ &pmu {
|
||||
@@ -58,7 +58,7 @@ index 86e6ceb31d5e..256416943fa0 100644
|
||||
+ };
|
||||
+};
|
||||
diff --git a/drivers/pinctrl/meson/pinctrl-meson-g12a.c b/drivers/pinctrl/meson/pinctrl-meson-g12a.c
|
||||
index e80a5897d9f2..086310a998e0 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/pinctrl/meson/pinctrl-meson-g12a.c
|
||||
+++ b/drivers/pinctrl/meson/pinctrl-meson-g12a.c
|
||||
@@ -271,17 +271,21 @@ static const unsigned int eth_act_led_pins[] = { GPIOZ_15 };
|
||||
|
||||
@@ -9,7 +9,7 @@ Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
|
||||
index 656e08b3d872..87b1890d2ab1 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
|
||||
@@ -223,6 +223,10 @@ sm: secure-monitor {
|
||||
|
||||
@@ -9,7 +9,7 @@ Subject: fix i2cA and i2cB miossing pins
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
|
||||
index 12ef6e81c8bd..90ae81493de2 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
|
||||
@@ -333,6 +333,8 @@ &hwrng {
|
||||
|
||||
@@ -12,7 +12,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/drivers/staging/media/meson/vdec/vdec_platform.c b/drivers/staging/media/meson/vdec/vdec_platform.c
|
||||
index 04ed5c2d6fd9..c2ac6010992e 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/staging/media/meson/vdec/vdec_platform.c
|
||||
+++ b/drivers/staging/media/meson/vdec/vdec_platform.c
|
||||
@@ -16,6 +16,18 @@
|
||||
|
||||
@@ -87,7 +87,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
||||
2 files changed, 10 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
|
||||
index e59c3c92b1e7..135142a991e5 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
|
||||
@@ -256,7 +256,11 @@ &sd_emmc_a {
|
||||
@@ -104,7 +104,7 @@ index e59c3c92b1e7..135142a991e5 100644
|
||||
non-removable;
|
||||
disable-wp;
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
|
||||
index a150cc0e18ff..6eec4e81592b 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
|
||||
@@ -121,7 +121,11 @@ &sd_emmc_a {
|
||||
|
||||
@@ -14,7 +14,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
||||
1 file changed, 13 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/staging/media/meson/vdec/vdec_platform.c b/drivers/staging/media/meson/vdec/vdec_platform.c
|
||||
index c2ac6010992e..ac5cfaf66493 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/staging/media/meson/vdec/vdec_platform.c
|
||||
+++ b/drivers/staging/media/meson/vdec/vdec_platform.c
|
||||
@@ -27,7 +27,19 @@ static const struct amvdec_format vdec_formats_gxbb[] = {
|
||||
|
||||
@@ -9,7 +9,7 @@ Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
|
||||
index 643f94d9d08e..c0fe046216fc 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
|
||||
@@ -136,6 +136,16 @@ opp-1908000000 {
|
||||
|
||||
Reference in New Issue
Block a user