From eeb21f8deafd7b115056efbc7d1137546d1dae1a Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> Date: Fri, 28 May 2021 14:43:09 -0500 Subject: [PATCH] pru: add pruss_cfg: node Signed-off-by: Robert Nelson <robertcnelson@gmail.com> --- patches/git/BBDTBS | 2 +- ...001-Add-BeagleBoard.org-DTBS-v5.13.x.patch | 66 ++++++++++++------- version.sh | 2 +- 3 files changed, 45 insertions(+), 25 deletions(-) diff --git a/patches/git/BBDTBS b/patches/git/BBDTBS index 5b8101fc3..f66885645 100644 --- a/patches/git/BBDTBS +++ b/patches/git/BBDTBS @@ -1 +1 @@ -BBDTBS: https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/68aea0792284d7b3c58741c62738287762a5cc0c +BBDTBS: https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/d6d8efea9bda89ce3fda561caf21918bae753ad9 diff --git a/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-v5.13.x.patch b/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-v5.13.x.patch index 04c4bb0cd..3cadfb993 100644 --- a/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-v5.13.x.patch +++ b/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-v5.13.x.patch @@ -1,35 +1,35 @@ -From 58121197ce369ab8f9a3b57af9de54e796279a36 Mon Sep 17 00:00:00 2001 +From f29688e45fae00227396220afd9bd1dc690b9468 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Fri, 28 May 2021 14:10:32 -0500 +Date: Fri, 28 May 2021 14:42:43 -0500 Subject: [PATCH] Add BeagleBoard.org DTBS: v5.13.x https://github.com/beagleboard/BeagleBoard-DeviceTrees/tree/v5.13.x -https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/68aea0792284d7b3c58741c62738287762a5cc0c +https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/d6d8efea9bda89ce3fda561caf21918bae753ad9 Signed-off-by: Robert Nelson <robertcnelson@gmail.com> --- - arch/arm/boot/dts/am335x-bone-common.dtsi | 20 ++++----- - arch/arm/boot/dts/am335x-bone.dts | 5 +++ - .../arm/boot/dts/am335x-boneblack-common.dtsi | 10 +---- - .../boot/dts/am335x-boneblack-wireless.dts | 5 +++ - arch/arm/boot/dts/am335x-boneblack.dts | 5 +++ + arch/arm/boot/dts/am335x-bone-common.dtsi | 20 +++--- + arch/arm/boot/dts/am335x-bone.dts | 5 ++ + .../arm/boot/dts/am335x-boneblack-common.dtsi | 10 +-- + .../boot/dts/am335x-boneblack-wireless.dts | 5 ++ + arch/arm/boot/dts/am335x-boneblack.dts | 5 ++ arch/arm/boot/dts/am335x-boneblue.dts | 3 +- .../arm/boot/dts/am335x-bonegreen-common.dtsi | 1 + - .../boot/dts/am335x-bonegreen-wireless.dts | 5 +++ - arch/arm/boot/dts/am335x-bonegreen.dts | 5 +++ - arch/arm/boot/dts/am335x-osd3358-sm-red.dts | 27 ++++------- + .../boot/dts/am335x-bonegreen-wireless.dts | 5 ++ + arch/arm/boot/dts/am335x-bonegreen.dts | 5 ++ + arch/arm/boot/dts/am335x-osd3358-sm-red.dts | 27 +++----- arch/arm/boot/dts/am335x-osd335x-common.dtsi | 1 + arch/arm/boot/dts/am335x-pocketbeagle.dts | 2 + - arch/arm/boot/dts/am335x-sancloud-bbe.dts | 5 +++ - arch/arm/boot/dts/am33xx-l4.dtsi | 45 +++++++++++++++++++ - arch/arm/boot/dts/am33xx.dtsi | 7 +++ - arch/arm/boot/dts/am5729-beagleboneai.dts | 5 +++ - arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 5 +++ - arch/arm/boot/dts/am57xx-beagle-x15-revc.dts | 5 +++ - arch/arm/boot/dts/am57xx-beagle-x15.dts | 5 +++ - arch/arm/boot/dts/dra7.dtsi | 12 +++++ - arch/arm/boot/dts/twl6030.dtsi | 5 +++ - 21 files changed, 144 insertions(+), 39 deletions(-) + arch/arm/boot/dts/am335x-sancloud-bbe.dts | 5 ++ + arch/arm/boot/dts/am33xx-l4.dtsi | 65 +++++++++++++++++++ + arch/arm/boot/dts/am33xx.dtsi | 7 ++ + arch/arm/boot/dts/am5729-beagleboneai.dts | 5 ++ + arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 5 ++ + arch/arm/boot/dts/am57xx-beagle-x15-revc.dts | 5 ++ + arch/arm/boot/dts/am57xx-beagle-x15.dts | 5 ++ + arch/arm/boot/dts/dra7.dtsi | 12 ++++ + arch/arm/boot/dts/twl6030.dtsi | 5 ++ + 21 files changed, 164 insertions(+), 39 deletions(-) diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi index 2d51d4bba6d4..9c7dc082277e 100644 @@ -389,10 +389,10 @@ index 275ba339adf4..0a80f58489d9 100644 &am33xx_pinmux { diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi -index 039a9ab4c7ea..ca68cf8f4b4d 100644 +index 039a9ab4c7ea..cf3d17c08fe0 100644 --- a/arch/arm/boot/dts/am33xx-l4.dtsi +++ b/arch/arm/boot/dts/am33xx-l4.dtsi -@@ -853,6 +853,51 @@ pruss_tm: target-module@300000 { /* 0x4a300000, ap 9 04.0 */ +@@ -853,6 +853,71 @@ pruss_tm: target-module@300000 { /* 0x4a300000, ap 9 04.0 */ #size-cells = <1>; ranges = <0x0 0x300000 0x80000>; status = "disabled"; @@ -411,6 +411,26 @@ index 039a9ab4c7ea..ca68cf8f4b4d 100644 + reg-names = "dram0", "dram1", "shrdram2"; + }; + ++ pruss_cfg: cfg@26000 { ++ compatible = "ti,pruss-cfg", "syscon"; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ reg = <0x26000 0x2000>; ++ ranges = <0x00 0x26000 0x2000>; ++ ++ clocks { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ pruss_iepclk_mux: iepclk-mux@30 { ++ reg = <0x30>; ++ #clock-cells = <0>; ++ clocks = <&l3_gclk>, /* icss_iep */ ++ <&pruss_ocp_gclk>; /* icss_ocp */ ++ }; ++ }; ++ }; ++ + pruss_intc: interrupt-controller@20000 { + compatible = "ti,pruss-intc"; + reg = <0x20000 0x2000>; diff --git a/version.sh b/version.sh index e3f7210cf..ba9e74d63 100644 --- a/version.sh +++ b/version.sh @@ -38,7 +38,7 @@ KERNEL_REL=5.13 KERNEL_TAG=${KERNEL_REL}-rc3 kernel_rt=".X-rtY" #Kernel Build -BUILD=${build_prefix}2.1 +BUILD=${build_prefix}2.2 #v5.X-rcX + upto SHA #prev_KERNEL_SHA="" -- GitLab