Skip to contentSkip to conversation

arm: dts: Resync dts for BeagleBone and derivatives

PATCH In review Paul Barker 2 participants 6 messages Apr 11, 2022 – Apr 21, 2022 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 arm: dts: Resync dts for BeagleBone and derivatives

Sync BeagleBone dts files & TPS dtsi files with Linux v5.17 and include the SanCloud BBE Extended WiFi dts added in v5.18-rc1. Also pull in changes to am33xx-l4.dtsi needed to support the BeagleBone Blue.

The change to use the cpsw switch driver (commit c477358e66a3 in Linux) is excluded from the sync as u-boot does not recognise the new compatible string.

---
 arch/arm/dts/Makefile                         |   5 +
 arch/arm/dts/am335x-bone-common.dtsi          |   5 +
 arch/arm/dts/am335x-boneblack-common.dtsi     | 139 ----
 ...common.dtsi => am335x-boneblack-hdmi.dtsi} |  28 -
 arch/arm/dts/am335x-boneblack-wireless.dts    | 111 ++++
 arch/arm/dts/am335x-boneblack.dts             |   1 +
 arch/arm/dts/am335x-boneblue.dts              | 617 ++++++++++++++++++
 arch/arm/dts/am335x-bonegreen-wireless.dts    | 127 ++++
 ...be.dts => am335x-sancloud-bbe-common.dtsi} |  74 +--
 .../dts/am335x-sancloud-bbe-extended-wifi.dts | 113 ++++
 arch/arm/dts/am335x-sancloud-bbe-lite.dts     |  50 ++
 arch/arm/dts/am335x-sancloud-bbe.dts          |  96 +--
 arch/arm/dts/am33xx-l4.dtsi                   |  27 +
 arch/arm/dts/tps6507x.dtsi                    |   5 +-
 arch/arm/dts/tps65217.dtsi                    |  20 +-
 arch/arm/dts/tps65910.dtsi                    |   5 +-
 16 files changed, 1082 insertions(+), 341 deletions(-)
 copy arch/arm/dts/{am335x-boneblack-common.dtsi => am335x-boneblack-hdmi.dtsi} (90%)
 create mode 100644 arch/arm/dts/am335x-boneblack-wireless.dts
 create mode 100644 arch/arm/dts/am335x-boneblue.dts
 create mode 100644 arch/arm/dts/am335x-bonegreen-wireless.dts
 copy arch/arm/dts/{am335x-sancloud-bbe.dts => am335x-sancloud-bbe-common.dtsi} (60%)
 create mode 100644 arch/arm/dts/am335x-sancloud-bbe-extended-wifi.dts
 create mode 100644 arch/arm/dts/am335x-sancloud-bbe-lite.dts
arch/arm/dts/Makefile +5 -0
index cd9a820f9569..47a2b6e39f85 100644
@@ -375,6 +375,8 @@ dtb-$(CONFIG_AM33XX) += \
 	am335x-baltos.dtb \
 	am335x-bone.dtb \
 	am335x-boneblack.dtb \
+	am335x-boneblack-wireless.dtb \
+	am335x-boneblue.dtb \
 	am335x-brppt1-mmc.dtb \
 	am335x-brppt1-nand.dtb \
 	am335x-brppt1-spi.dtb \
@@ -384,11 +386,14 @@ dtb-$(CONFIG_AM33XX) += \
 	am335x-evm.dtb \
 	am335x-evmsk.dtb \
 	am335x-bonegreen.dtb \
+	am335x-bonegreen-wireless.dtb \
 	am335x-icev2.dtb \
 	am335x-pocketbeagle.dtb \
 	am335x-pxm50.dtb \
 	am335x-rut.dtb \
 	am335x-sancloud-bbe.dtb \
+	am335x-sancloud-bbe-lite.dtb \
+	am335x-sancloud-bbe-extended-wifi.dtb \
 	am335x-shc.dtb \
 	am335x-pdu001.dtb \
 	am335x-chiliboard.dtb \
arch/arm/dts/am335x-bone-common.dtsi +5 -0
index 35ec1a8df870..43fe03d096ac 100644
@@ -397,4 +397,9 @@
 &rtc {
 	clocks = <&clk_32768_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>;
 	clock-names = "ext-clk", "int-clk";
+	system-power-controller;
+};
+
+&pruss_tm {
+	status = "okay";
 };
arch/arm/dts/am335x-boneblack-common.dtsi +0 -139

154 lines not on this page · raw message

arch/arm/dts/am335x-boneblack-hdmi.dtsi renamed from arch/arm/dts/am335x-boneblack-common.dtsi +0 -28
similarity index 90%
copy from arch/arm/dts/am335x-boneblack-common.dtsi
copy to arch/arm/dts/am335x-boneblack-hdmi.dtsi
index 64c3e9269f40..7cfddada9348 100644
@@ -6,25 +6,6 @@
 #include <dt-bindings/display/tda998x.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 
-&ldo3_reg {
-	regulator-min-microvolt = <1800000>;
-	regulator-max-microvolt = <1800000>;
-	regulator-always-on;
-};
-
-&mmc1 {
-	vmmc-supply = <&vmmcsd_fixed>;
-};
-
-&mmc2 {
-	vmmc-supply = <&vmmcsd_fixed>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&emmc_pins>;
-	bus-width = <8>;
-	status = "okay";
-	non-removable;
-};
-
 &am33xx_pinmux {
 	nxp_hdmi_bonelt_pins: nxp_hdmi_bonelt_pins {
 		pinctrl-single,pins = <
@@ -113,10 +94,6 @@
 	};
 };
 
-&rtc {
-	system-power-controller;
-};
-
 &mcasp0	{
 	#sound-dai-cells = <0>;
 	pinctrl-names = "default";
@@ -132,11 +109,6 @@
 };
 
 / {
-	memory@80000000 {
-		device_type = "memory";
-		reg = <0x80000000 0x20000000>; /* 512 MB */
-	};
-
 	clk_mcasp0_fixed: clk_mcasp0_fixed {
 		#clock-cells = <0>;
 		compatible = "fixed-clock";
arch/arm/dts/am335x-boneblack-wireless.dts new file +111 -0

111 lines not on this page · raw message

arch/arm/dts/am335x-boneblack.dts +1 -0
index e2ee8b8c07bc..9312197316f0 100644
@@ -7,6 +7,7 @@
 #include "am33xx.dtsi"
 #include "am335x-bone-common.dtsi"
 #include "am335x-boneblack-common.dtsi"
+#include "am335x-boneblack-hdmi.dtsi"
 
 / {
 	model = "TI AM335x BeagleBone Black";
arch/arm/dts/am335x-boneblue.dts new file +617 -0

617 lines not on this page · raw message

arch/arm/dts/am335x-bonegreen-wireless.dts new file +127 -0

127 lines not on this page · raw message

arch/arm/dts/am335x-sancloud-bbe-common.dtsi renamed from arch/arm/dts/am335x-sancloud-bbe.dts +2 -72

108 lines not on this page · raw message

arch/arm/dts/am335x-sancloud-bbe-extended-wifi.dts new file +113 -0

113 lines not on this page · raw message

arch/arm/dts/am335x-sancloud-bbe-lite.dts new file +50 -0

50 lines not on this page · raw message

arch/arm/dts/am335x-sancloud-bbe.dts +6 -90

126 lines not on this page · raw message

arch/arm/dts/am33xx-l4.dtsi +27 -0
index e678673317af..5892612efa80 100644
@@ -1810,6 +1810,15 @@
 					status = "disabled";
 				};
 
+				eqep0: counter@180 {
+					compatible = "ti,am3352-eqep";
+					reg = <0x180 0x80>;
+					clocks = <&l4ls_gclk>;
+					clock-names = "sysclkout";
+					interrupts = <79>;
+					status = "disabled";
+				};
+
 				ehrpwm0: pwm@200 {
 					compatible = "ti,am3352-ehrpwm",
 						     "ti,am33xx-ehrpwm";
@@ -1862,6 +1871,15 @@
 					status = "disabled";
 				};
 
+				eqep1: counter@180 {
+					compatible = "ti,am3352-eqep";
+					reg = <0x180 0x80>;
+					clocks = <&l4ls_gclk>;
+					clock-names = "sysclkout";
+					interrupts = <88>;
+					status = "disabled";
+				};
+
 				ehrpwm1: pwm@200 {
 					compatible = "ti,am3352-ehrpwm",
 						     "ti,am33xx-ehrpwm";
@@ -1914,6 +1932,15 @@
 					status = "disabled";
 				};
 
+				eqep2: counter@180 {
+					compatible = "ti,am3352-eqep";
+					reg = <0x180 0x80>;
+					clocks = <&l4ls_gclk>;
+					clock-names = "sysclkout";
+					interrupts = <89>;
+					status = "disabled";
+				};
+
 				ehrpwm2: pwm@200 {
 					compatible = "ti,am3352-ehrpwm",
 						     "ti,am33xx-ehrpwm";
arch/arm/dts/tps6507x.dtsi +1 -4
index 4c326e591e5a..db4809d308f9 100644
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 /*
arch/arm/dts/tps65217.dtsi +16 -4
index a63272422d76..0d463de5650f 100644
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 /*
@@ -13,6 +10,21 @@
 
 &tps {
 	compatible = "ti,tps65217";
+	interrupt-controller;
+	#interrupt-cells = <1>;
+
+	charger {
+		compatible = "ti,tps65217-charger";
+		interrupts = <0>, <1>;
+		interrupt-names = "USB", "AC";
+		status = "disabled";
+	};
+
+	pwrbutton {
+		compatible = "ti,tps65217-pwrbutton";
+		interrupts = <2>;
+		status = "disabled";
+	};
 
 	regulators {
 		#address-cells = <1>;
arch/arm/dts/tps65910.dtsi +1 -4
index b0ac6657a170..a941d1e62328 100644
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 /*
Signature · 1 line
2.32.0
#1 lore raw

PATCH 2/3 board: ti: am335x: Add BBE Lite support

The Sancloud BeagleBone Enhanced Lite (BBE Lite) has its own devicetree file and the board can be identified by the 2nd letter of the config string within the common EEPROM.

---
 board/ti/am335x/board.c      | 10 ++++++++--
 include/configs/am335x_evm.h |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)
board/ti/am335x/board.c +8 -2
index 9b7067040a68..dd54f4d457a6 100644
@@ -825,8 +825,14 @@ int board_late_init(void)
 
 	if (board_is_bbg1())
 		name = "BBG1";
-	if (board_is_bben())
-		name = "BBEN";
+	if (board_is_bben()) {
+		char subtype_id = board_ti_get_config()[1];
+
+		if (subtype_id == 'L')
+			name = "BBELITE";
+		else
+			name = "BBEN";
+	}
 	set_board_info_env(name);
 
 	/*
include/configs/am335x_evm.h +2 -0
index cbb7b91139d0..746d11b0a9b2 100644
@@ -134,6 +134,8 @@
 			"setenv fdtfile am335x-boneblue.dtb; fi; " \
 		"if test $board_name = BBEN; then " \
 			"setenv fdtfile am335x-sancloud-bbe.dtb; fi; " \
+		"if test $board_name = BBELITE; then " \
+			"setenv fdtfile am335x-sancloud-bbe-lite.dtb; fi; " \
 		"if test $board_name = A33515BB; then " \
 			"setenv fdtfile am335x-evm.dtb; fi; " \
 		"if test $board_name = A335X_SK; then " \
Signature · 1 line
2.32.0
#2 lore raw

Re: [PATCH 2/3] board: ti: am335x: Add BBE Lite support

Quoted 5 lines · Paul Barker

The Sancloud BeagleBone Enhanced Lite (BBE Lite) has its own devicetree file and the board can be identified by the 2nd letter of the config string within the common EEPROM.

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
#3 lore raw

PATCH 3/3 board: ti: am335x: Add support for BBE Extended WiFi

In reply to Paul Barker

The Sancloud BeagleBone Enhanced Extended WiFi (BBE Extended WiFi) has its own devicetree file and the board can be identified by the 2nd letter of the config string within the common EEPROM.

---
 board/ti/am335x/board.c      | 10 ++++++++--
 include/configs/am335x_evm.h |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)
board/ti/am335x/board.c +8 -2
index dd54f4d457a6..7c0545892c95 100644
@@ -828,10 +828,16 @@ int board_late_init(void)
 	if (board_is_bben()) {
 		char subtype_id = board_ti_get_config()[1];
 
-		if (subtype_id == 'L')
+		switch (subtype_id) {
+		case 'L':
 			name = "BBELITE";
-		else
+			break;
+		case 'I':
+			name = "BBE_EX_WIFI";
+			break;
+		default:
 			name = "BBEN";
+		}
 	}
 	set_board_info_env(name);
 
include/configs/am335x_evm.h +2 -0
index 746d11b0a9b2..fd5b209a52db 100644
@@ -136,6 +136,8 @@
 			"setenv fdtfile am335x-sancloud-bbe.dtb; fi; " \
 		"if test $board_name = BBELITE; then " \
 			"setenv fdtfile am335x-sancloud-bbe-lite.dtb; fi; " \
+		"if test $board_name = BBE_EX_WIFI; then " \
+			"setenv fdtfile am335x-sancloud-bbe-extended-wifi.dtb; fi; " \
 		"if test $board_name = A33515BB; then " \
 			"setenv fdtfile am335x-evm.dtb; fi; " \
 		"if test $board_name = A335X_SK; then " \
Signature · 1 line
2.32.0
#4 lore raw

Re: [PATCH 3/3] board: ti: am335x: Add support for BBE Extended WiFi

Quoted 5 lines · Paul Barker

The Sancloud BeagleBone Enhanced Extended WiFi (BBE Extended WiFi) has its own devicetree file and the board can be identified by the 2nd letter of the config string within the common EEPROM.

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
#5 lore raw
In reply to Paul Barker
Quoted 9 lines · Paul Barker

Sync BeagleBone dts files & TPS dtsi files with Linux v5.17 and include the SanCloud BBE Extended WiFi dts added in v5.18-rc1. Also pull in changes to am33xx-l4.dtsi needed to support the BeagleBone Blue.

The change to use the cpsw switch driver (commit c477358e66a3 in Linux) is excluded from the sync as u-boot does not recognise the new compatible string.

Applied to u-boot/master, thanks!

Signature · 1 line
Tom