Skip to content

Commit f0289d0

Browse files
committed
kernel v4.19.94 rebase with rt: v4.19.94-rt39 wireguard/can_isotp/device-tree/etc
AUFS: sfjro/aufs4-standalone@ccb1589 BBDTBS: beagleboard/BeagleBoard-DeviceTrees@e44dc71 CAN-ISOTP: hartkopp/can-isotp@0cb92ae RT: patch-4.19.94-rt39.patch.xz TI_AMX3_CM3: http://git.ti.com/gitweb/?p=processor-firmware/ti-amx3-cm3-pm-firmware.git;a=commit;h=6a849767df85ce9399494f53fb5c753665396653 Signed-off-by: Robert Nelson <[email protected]>
1 parent 46d50c6 commit f0289d0

File tree

3 files changed

+64
-21
lines changed

3 files changed

+64
-21
lines changed

patches/git/BBDTBS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
BBDTBS: https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/3d0e7191e50f6d718cd6cc3a8de6b5f2f0727e79
1+
BBDTBS: https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/e44dc71f98636982e043a4815a404e203c14729f

patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-v4.19.x-ti-overlays.patch

Lines changed: 62 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
From 1a9454f385185bf03b101fb54070dfbc320eab89 Mon Sep 17 00:00:00 2001
1+
From c71a0fb7bc78d0d7491ca46719e988345d42de3c Mon Sep 17 00:00:00 2001
22
From: Robert Nelson <[email protected]>
3-
Date: Sun, 23 Aug 2020 14:58:52 -0500
3+
Date: Mon, 24 Aug 2020 17:48:53 -0500
44
Subject: [PATCH] Add BeagleBoard.org DTBS: v4.19.x-ti-overlays
55

66
https://github.com/beagleboard/BeagleBoard-DeviceTrees/tree/v4.19.x-ti-overlays
77

8-
https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/3d0e7191e50f6d718cd6cc3a8de6b5f2f0727e79
8+
https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/e44dc71f98636982e043a4815a404e203c14729f
99
Signed-off-by: Robert Nelson <[email protected]>
1010
---
1111
arch/arm/boot/dts/Makefile | 15 +
@@ -57,7 +57,7 @@ Signed-off-by: Robert Nelson <[email protected]>
5757
arch/arm/boot/dts/am335x-sancloud-bbe.dts | 76 +-
5858
arch/arm/boot/dts/am33xx.dtsi | 166 +-
5959
.../dts/am5729-beagleboneai-roboticscape.dts | 238 ++
60-
arch/arm/boot/dts/am5729-beagleboneai.dts | 439 ++-
60+
arch/arm/boot/dts/am5729-beagleboneai.dts | 444 ++-
6161
.../arm/boot/dts/am572x-bone-common-univ.dtsi | 2998 +++++++++++++++++
6262
.../boot/dts/am57xx-beagle-x15-common.dtsi | 5 +-
6363
arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 11 +-
@@ -88,6 +88,7 @@ Signed-off-by: Robert Nelson <[email protected]>
8888
arch/arm/boot/dts/overlays/BBB-eCAP0.dts | 42 +
8989
arch/arm/boot/dts/overlays/BBB-eCAP2.dts | 42 +
9090
.../boot/dts/overlays/BBORG_COMMS-00A2.dts | 71 +
91+
arch/arm/boot/dts/overlays/BBORG_FAN-A000.dts | 29 +
9192
.../arm/boot/dts/overlays/BBORG_LOAD-00A2.dts | 97 +
9293
.../boot/dts/overlays/BBORG_MOTOR-00A2.dts | 93 +
9394
.../boot/dts/overlays/BBORG_RELAY-00A2.dts | 79 +
@@ -123,7 +124,7 @@ Signed-off-by: Robert Nelson <[email protected]>
123124
arch/arm/boot/dts/overlays/BONE-eQEP1.dts | 76 +
124125
arch/arm/boot/dts/overlays/BONE-eQEP2.dts | 62 +
125126
arch/arm/boot/dts/overlays/BONE-eQEP2A.dts | 58 +
126-
arch/arm/boot/dts/overlays/Makefile | 65 +
127+
arch/arm/boot/dts/overlays/Makefile | 66 +
127128
.../dt-bindings/board/am335x-bbw-bbb-base.h | 103 +
128129
include/dt-bindings/board/am335x-bone-pins.h | 166 +
129130
include/dt-bindings/board/am572x-bone-pins.h | 182 +
@@ -140,7 +141,7 @@ Signed-off-by: Robert Nelson <[email protected]>
140141
include/dt-bindings/pinctrl/omap.h | 1 +
141142
include/dt-bindings/thermal/thermal.h | 3 +-
142143
include/uapi/linux/input-event-codes.h | 17 +-
143-
132 files changed, 22457 insertions(+), 552 deletions(-)
144+
133 files changed, 22492 insertions(+), 552 deletions(-)
144145
create mode 100644 arch/arm/boot/dts/am335x-abbbi.dts
145146
create mode 100644 arch/arm/boot/dts/am335x-bone-common-no-capemgr.dtsi
146147
create mode 100644 arch/arm/boot/dts/am335x-bone-common-univ.dtsi
@@ -200,6 +201,7 @@ Signed-off-by: Robert Nelson <[email protected]>
200201
create mode 100644 arch/arm/boot/dts/overlays/BBB-eCAP0.dts
201202
create mode 100644 arch/arm/boot/dts/overlays/BBB-eCAP2.dts
202203
create mode 100644 arch/arm/boot/dts/overlays/BBORG_COMMS-00A2.dts
204+
create mode 100644 arch/arm/boot/dts/overlays/BBORG_FAN-A000.dts
203205
create mode 100644 arch/arm/boot/dts/overlays/BBORG_LOAD-00A2.dts
204206
create mode 100644 arch/arm/boot/dts/overlays/BBORG_MOTOR-00A2.dts
205207
create mode 100644 arch/arm/boot/dts/overlays/BBORG_RELAY-00A2.dts
@@ -16014,7 +16016,7 @@ index 000000000000..a14da8727c2c
1601416016
+ };
1601516017
+};
1601616018
diff --git a/arch/arm/boot/dts/am5729-beagleboneai.dts b/arch/arm/boot/dts/am5729-beagleboneai.dts
16017-
index d0b377d2a507..65cb541cc4ce 100644
16019+
index d0b377d2a507..896f37fb1673 100644
1601816020
--- a/arch/arm/boot/dts/am5729-beagleboneai.dts
1601916021
+++ b/arch/arm/boot/dts/am5729-beagleboneai.dts
1602016022
@@ -6,11 +6,14 @@
@@ -16363,7 +16365,7 @@ index d0b377d2a507..65cb541cc4ce 100644
1636316365
#interrupt-cells = <2>;
1636416366
interrupt-controller;
1636516367

16366-
@@ -411,6 +689,64 @@
16368+
@@ -411,6 +689,69 @@
1636716369
#gpio-cells = <2>;
1636816370
};
1636916371
};
@@ -16424,11 +16426,16 @@ index d0b377d2a507..65cb541cc4ce 100644
1642416426
+ compatible = "st,stmpe-pwm";
1642516427
+ #pwm-cells = <2>;
1642616428
+ };
16429+
+ };
16430+
+
16431+
+ eeprom: eeprom@50 {
16432+
+ compatible = "atmel,24c32";
16433+
+ reg = <0x50>;
1642716434
+ };
1642816435
};
1642916436

1643016437
&mcspi3 {
16431-
@@ -434,7 +770,7 @@
16438+
@@ -434,7 +775,7 @@
1643216439
};
1643316440

1643416441
&gpu {
@@ -16437,7 +16444,7 @@ index d0b377d2a507..65cb541cc4ce 100644
1643716444
};
1643816445

1643916446
&pruss_soc_bus1 {
16440-
@@ -463,6 +799,8 @@
16447+
@@ -463,6 +804,8 @@
1644116448

1644216449
phy0: ethernet-phy@1 {
1644316450
reg = <4>;
@@ -16446,7 +16453,7 @@ index d0b377d2a507..65cb541cc4ce 100644
1644616453
eee-broken-100tx;
1644716454
eee-broken-1000t;
1644816455
};
16449-
@@ -505,8 +843,27 @@
16456+
@@ -505,8 +848,27 @@
1645016457
bus-width = <4>;
1645116458
cd-gpios = <&gpio6 27 GPIO_ACTIVE_LOW>; /* gpio 219 */
1645216459

@@ -16476,7 +16483,7 @@ index d0b377d2a507..65cb541cc4ce 100644
1647616483
};
1647716484

1647816485
&mmc2 {
16479-
@@ -538,6 +895,10 @@
16486+
@@ -538,6 +900,10 @@
1648016487
/* DDR50: DDR up to 50 MHz (1.8 V signaling). */
1648116488
status = "okay";
1648216489

@@ -16487,7 +16494,7 @@ index d0b377d2a507..65cb541cc4ce 100644
1648716494
ti,needs-special-reset;
1648816495
vmmc-supply = <&vdd_3v3>;
1648916496
cap-power-off-card;
16490-
@@ -557,6 +918,9 @@
16497+
@@ -557,6 +923,9 @@
1649116498
reg = <1>;
1649216499
compatible = "brcm,bcm4329-fmac";
1649316500

@@ -16497,7 +16504,7 @@ index d0b377d2a507..65cb541cc4ce 100644
1649716504
brcm,sd-head-align = <4>;
1649816505
brcm,sd_head_align = <4>;
1649916506
brcm,sd_sgentry_align = <512>;
16500-
@@ -589,6 +953,10 @@
16507+
@@ -589,6 +958,10 @@
1650116508
dr_mode = "host";
1650216509
};
1650316510

@@ -16508,7 +16515,7 @@ index d0b377d2a507..65cb541cc4ce 100644
1650816515
&dss {
1650916516
status = "okay";
1651016517
vdda_video-supply = <&vdd_1v8_pll>;
16511-
@@ -597,6 +965,8 @@
16518+
@@ -597,6 +970,8 @@
1651216519
&hdmi {
1651316520
status = "okay";
1651416521
vdda-supply = <&vdd_1v8_phy_ldo4>;
@@ -16517,7 +16524,7 @@ index d0b377d2a507..65cb541cc4ce 100644
1651716524

1651816525
port {
1651916526
hdmi_out: endpoint {
16520-
@@ -609,6 +979,58 @@
16527+
@@ -609,6 +984,58 @@
1652116528
status = "okay";
1652216529
};
1652316530

@@ -16576,7 +16583,7 @@ index d0b377d2a507..65cb541cc4ce 100644
1657616583
&cpu_alert0 {
1657716584
temperature = <55000>; /* milliCelsius */
1657816585
};
16579-
@@ -652,4 +1074,15 @@
16586+
@@ -652,4 +1079,15 @@
1658016587
clock-frequency = <100000>;
1658116588
};
1658216589

@@ -22195,6 +22202,41 @@ index 000000000000..b951156edb9c
2219522202
+ };
2219622203
+ };
2219722204
+};
22205+
diff --git a/arch/arm/boot/dts/overlays/BBORG_FAN-A000.dts b/arch/arm/boot/dts/overlays/BBORG_FAN-A000.dts
22206+
new file mode 100644
22207+
index 000000000000..1b46782a7662
22208+
--- /dev/null
22209+
+++ b/arch/arm/boot/dts/overlays/BBORG_FAN-A000.dts
22210+
@@ -0,0 +1,29 @@
22211+
+/*
22212+
+ * Copyright (C) 2020 Robert Nelson <[email protected]>
22213+
+ *
22214+
+ * This program is free software; you can redistribute it and/or modify
22215+
+ * it under the terms of the GNU General Public License version 2 as
22216+
+ * published by the Free Software Foundation.
22217+
+ */
22218+
+
22219+
+/dts-v1/;
22220+
+/plugin/;
22221+
+
22222+
+/*
22223+
+* Helper to show loaded overlays under: /proc/device-tree/chosen/overlays/
22224+
+*/
22225+
+&{/chosen} {
22226+
+ overlays {
22227+
+ BBORG_FAN-A000 = __TIMESTAMP__;
22228+
+ };
22229+
+};
22230+
+
22231+
+&cpu0_opp_table {
22232+
+ opp_slow-400000000 {
22233+
+ opp-hz = /bits/ 64 <1000000000>;
22234+
+ opp-microvolt = <1060000 850000 1150000>,
22235+
+ <1060000 850000 1150000>;
22236+
+ opp-supported-hw = <0xFF 0x01>;
22237+
+ opp-suspend;
22238+
+ };
22239+
+};
2219822240
diff --git a/arch/arm/boot/dts/overlays/BBORG_LOAD-00A2.dts b/arch/arm/boot/dts/overlays/BBORG_LOAD-00A2.dts
2219922241
new file mode 100644
2220022242
index 000000000000..be0ce9cb6825
@@ -24290,10 +24332,10 @@ index 000000000000..a8970fc044cf
2429024332
\ No newline at end of file
2429124333
diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
2429224334
new file mode 100644
24293-
index 000000000000..d50aadaae2c6
24335+
index 000000000000..4cf97a6a2027
2429424336
--- /dev/null
2429524337
+++ b/arch/arm/boot/dts/overlays/Makefile
24296-
@@ -0,0 +1,65 @@
24338+
@@ -0,0 +1,66 @@
2429724339
+# Overlays for the BeagleBone platform
2429824340
+
2429924341
+dtbo-$(CONFIG_SOC_AM33XX) += \
@@ -24318,6 +24360,7 @@ index 000000000000..d50aadaae2c6
2431824360
+ BBB-eCAP2.dtbo \
2431924361
+ BBB-PRU_eCAP.dtbo \
2432024362
+ BBORG_COMMS-00A2.dtbo \
24363+
+ BBORG_FAN-A000.dtbo \
2432124364
+ BBORG_LOAD-00A2.dtbo \
2432224365
+ BBORG_MOTOR-00A2.dtbo \
2432324366
+ BBORG_RELAY-00A2.dtbo \

version.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ KERNEL_REL=4.19
3939
KERNEL_TAG=${KERNEL_REL}.94
4040
kernel_rt=".94-rt39"
4141
#Kernel Build
42-
BUILD=${build_prefix}49.1
42+
BUILD=${build_prefix}49.2
4343

4444
#v5.X-rcX + upto SHA
4545
#prev_KERNEL_SHA=""

0 commit comments

Comments
 (0)