Skip to contentSkip to conversation

Resync BeagleBone dtbs, add SanCloud BBE support & minor fixups

PATCH In review Paul Barker 2 participants 11 messages Jul 12, 2021 – Jul 26, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v2 cover Resync BeagleBone dtbs, add SanCloud BBE support & minor fixups

This updated patch series takes the approach of copying the device trees for the BeagleBone Black, BeagleBone Green & BeagleBone enhanced from the latest stable Linux kernel (v5.13.1). To support this we also need to port over a couple of changes to the relevant dt-bindings headers. I considered also copying the newer versions of am33xx*.dtsi but this resulted in significant churn and incompatibility with some of the other devicetrees in the u-boot tree.

With the new device trees in place we enable GbE phy support and fix the DTB ordering in the am335x evm defconfig. These two patches are unchanged from the v1 series previously sent to the list.

With these changes applied, Ethernet works on the SanCloud BBE in u-boot.

These changes have been tested on both a SanCloud BBE and on a BeagleBone Black. In both cases it was confirmed that Ethernet worked in u-boot and that we could successfully boot a Linux kernel & rootfs built with Yocto Project.

Paul Barker (5):
dt-bindings: Resync omap & am33xx pinctrl bindings
arm: dts: Resync BeagleBone device trees
arm: dts: Import am335x-sancloud-bbe devicetree
configs: am335x_evm: Support GbE PHYs
configs: am335x_evm: Fix BeagleBone Green DTB selection

 arch/arm/dts/Makefile                     |   1 +
 arch/arm/dts/am335x-bone-common.dtsi      | 185 +++++++++---------
 arch/arm/dts/am335x-bone.dts              |   7 +-
 arch/arm/dts/am335x-boneblack-common.dtsi | 169 +++++++++++++++++
 arch/arm/dts/am335x-boneblack.dts         | 217 +++++++++++++++-------
 arch/arm/dts/am335x-bonegreen-common.dtsi |  41 ++++
 arch/arm/dts/am335x-bonegreen.dts         |  49 +----
 arch/arm/dts/am335x-sancloud-bbe.dts      | 137 ++++++++++++++
 board/ti/am335x/board.c                   |   2 +
 configs/am335x_evm_defconfig              |   3 +-
 include/dt-bindings/pinctrl/am33xx.h      | 131 ++++++++++++-
 include/dt-bindings/pinctrl/omap.h        |  11 +-
 12 files changed, 730 insertions(+), 223 deletions(-)
 create mode 100644 arch/arm/dts/am335x-boneblack-common.dtsi
 create mode 100644 arch/arm/dts/am335x-bonegreen-common.dtsi
 create mode 100644 arch/arm/dts/am335x-sancloud-bbe.dts

base-commit: 490101a5e5df65238b900b21b81361bc4b13da2e

Signature · 1 line
2.26.2
#1 lore raw

PATCH v2 1/5 dt-bindings: Resync omap & am33xx pinctrl bindings

These headers are updated to match the versions in Linux 5.13.1.

---
 include/dt-bindings/pinctrl/am33xx.h | 131 ++++++++++++++++++++++++++-
 include/dt-bindings/pinctrl/omap.h   |  11 +--
 2 files changed, 135 insertions(+), 7 deletions(-)
include/dt-bindings/pinctrl/am33xx.h +130 -1
index 226f77246a..17877e8598 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants specific to AM33XX pinctrl bindings.
  */
@@ -39,5 +40,133 @@
 #undef PIN_OFF_INPUT_PULLDOWN
 #undef PIN_OFF_WAKEUPENABLE
 
-#endif
+#define AM335X_PIN_OFFSET_MIN			0x0800U
+
+#define AM335X_PIN_GPMC_AD0			0x800
+#define AM335X_PIN_GPMC_AD1			0x804
+#define AM335X_PIN_GPMC_AD2			0x808
+#define AM335X_PIN_GPMC_AD3			0x80c
+#define AM335X_PIN_GPMC_AD4			0x810
+#define AM335X_PIN_GPMC_AD5			0x814
+#define AM335X_PIN_GPMC_AD6			0x818
+#define AM335X_PIN_GPMC_AD7			0x81c
+#define AM335X_PIN_GPMC_AD8			0x820
+#define AM335X_PIN_GPMC_AD9			0x824
+#define AM335X_PIN_GPMC_AD10			0x828
+#define AM335X_PIN_GPMC_AD11			0x82c
+#define AM335X_PIN_GPMC_AD12			0x830
+#define AM335X_PIN_GPMC_AD13			0x834
+#define AM335X_PIN_GPMC_AD14			0x838
+#define AM335X_PIN_GPMC_AD15			0x83c
+#define AM335X_PIN_GPMC_A0			0x840
+#define AM335X_PIN_GPMC_A1			0x844
+#define AM335X_PIN_GPMC_A2			0x848
+#define AM335X_PIN_GPMC_A3			0x84c
+#define AM335X_PIN_GPMC_A4			0x850
+#define AM335X_PIN_GPMC_A5			0x854
+#define AM335X_PIN_GPMC_A6			0x858
+#define AM335X_PIN_GPMC_A7			0x85c
+#define AM335X_PIN_GPMC_A8			0x860
+#define AM335X_PIN_GPMC_A9			0x864
+#define AM335X_PIN_GPMC_A10			0x868
+#define AM335X_PIN_GPMC_A11			0x86c
+#define AM335X_PIN_GPMC_WAIT0			0x870
+#define AM335X_PIN_GPMC_WPN			0x874
+#define AM335X_PIN_GPMC_BEN1			0x878
+#define AM335X_PIN_GPMC_CSN0			0x87c
+#define AM335X_PIN_GPMC_CSN1			0x880
+#define AM335X_PIN_GPMC_CSN2			0x884
+#define AM335X_PIN_GPMC_CSN3			0x888
+#define AM335X_PIN_GPMC_CLK			0x88c
+#define AM335X_PIN_GPMC_ADVN_ALE		0x890
+#define AM335X_PIN_GPMC_OEN_REN			0x894
+#define AM335X_PIN_GPMC_WEN			0x898
+#define AM335X_PIN_GPMC_BEN0_CLE		0x89c
+#define AM335X_PIN_LCD_DATA0			0x8a0
+#define AM335X_PIN_LCD_DATA1			0x8a4
+#define AM335X_PIN_LCD_DATA2			0x8a8
+#define AM335X_PIN_LCD_DATA3			0x8ac
+#define AM335X_PIN_LCD_DATA4			0x8b0
+#define AM335X_PIN_LCD_DATA5			0x8b4
+#define AM335X_PIN_LCD_DATA6			0x8b8
+#define AM335X_PIN_LCD_DATA7			0x8bc
+#define AM335X_PIN_LCD_DATA8			0x8c0
+#define AM335X_PIN_LCD_DATA9			0x8c4
+#define AM335X_PIN_LCD_DATA10			0x8c8
+#define AM335X_PIN_LCD_DATA11			0x8cc
+#define AM335X_PIN_LCD_DATA12			0x8d0
+#define AM335X_PIN_LCD_DATA13			0x8d4
+#define AM335X_PIN_LCD_DATA14			0x8d8
+#define AM335X_PIN_LCD_DATA15			0x8dc
+#define AM335X_PIN_LCD_VSYNC			0x8e0
+#define AM335X_PIN_LCD_HSYNC			0x8e4
+#define AM335X_PIN_LCD_PCLK			0x8e8
+#define AM335X_PIN_LCD_AC_BIAS_EN		0x8ec
+#define AM335X_PIN_MMC0_DAT3			0x8f0
+#define AM335X_PIN_MMC0_DAT2			0x8f4
+#define AM335X_PIN_MMC0_DAT1			0x8f8
+#define AM335X_PIN_MMC0_DAT0			0x8fc
+#define AM335X_PIN_MMC0_CLK			0x900
+#define AM335X_PIN_MMC0_CMD			0x904
+#define AM335X_PIN_MII1_COL			0x908
+#define AM335X_PIN_MII1_CRS			0x90c
+#define AM335X_PIN_MII1_RX_ER			0x910
+#define AM335X_PIN_MII1_TX_EN			0x914
+#define AM335X_PIN_MII1_RX_DV			0x918
+#define AM335X_PIN_MII1_TXD3			0x91c
+#define AM335X_PIN_MII1_TXD2			0x920
+#define AM335X_PIN_MII1_TXD1			0x924
+#define AM335X_PIN_MII1_TXD0			0x928
+#define AM335X_PIN_MII1_TX_CLK			0x92c
+#define AM335X_PIN_MII1_RX_CLK			0x930
+#define AM335X_PIN_MII1_RXD3			0x934
+#define AM335X_PIN_MII1_RXD2			0x938
+#define AM335X_PIN_MII1_RXD1			0x93c
+#define AM335X_PIN_MII1_RXD0			0x940
+#define AM335X_PIN_RMII1_REF_CLK		0x944
+#define AM335X_PIN_MDIO				0x948
+#define AM335X_PIN_MDC				0x94c
+#define AM335X_PIN_SPI0_SCLK			0x950
+#define AM335X_PIN_SPI0_D0			0x954
+#define AM335X_PIN_SPI0_D1			0x958
+#define AM335X_PIN_SPI0_CS0			0x95c
+#define AM335X_PIN_SPI0_CS1			0x960
+#define AM335X_PIN_ECAP0_IN_PWM0_OUT		0x964
+#define AM335X_PIN_UART0_CTSN			0x968
+#define AM335X_PIN_UART0_RTSN			0x96c
+#define AM335X_PIN_UART0_RXD			0x970
+#define AM335X_PIN_UART0_TXD			0x974
+#define AM335X_PIN_UART1_CTSN			0x978
+#define AM335X_PIN_UART1_RTSN			0x97c
+#define AM335X_PIN_UART1_RXD			0x980
+#define AM335X_PIN_UART1_TXD			0x984
+#define AM335X_PIN_I2C0_SDA			0x988
+#define AM335X_PIN_I2C0_SCL			0x98c
+#define AM335X_PIN_MCASP0_ACLKX			0x990
+#define AM335X_PIN_MCASP0_FSX			0x994
+#define AM335X_PIN_MCASP0_AXR0			0x998
+#define AM335X_PIN_MCASP0_AHCLKR		0x99c
+#define AM335X_PIN_MCASP0_ACLKR			0x9a0
+#define AM335X_PIN_MCASP0_FSR			0x9a4
+#define AM335X_PIN_MCASP0_AXR1			0x9a8
+#define AM335X_PIN_MCASP0_AHCLKX		0x9ac
+#define AM335X_PIN_XDMA_EVENT_INTR0		0x9b0
+#define AM335X_PIN_XDMA_EVENT_INTR1		0x9b4
+#define AM335X_PIN_WARMRSTN			0x9b8
+#define AM335X_PIN_NNMI				0x9c0
+#define AM335X_PIN_TMS				0x9d0
+#define AM335X_PIN_TDI				0x9d4
+#define AM335X_PIN_TDO				0x9d8
+#define AM335X_PIN_TCK				0x9dc
+#define AM335X_PIN_TRSTN			0x9e0
+#define AM335X_PIN_EMU0				0x9e4
+#define AM335X_PIN_EMU1				0x9e8
+#define AM335X_PIN_RTC_PWRONRSTN		0x9f8
+#define AM335X_PIN_PMIC_POWER_EN		0x9fc
+#define AM335X_PIN_EXT_WAKEUP			0xa00
+#define AM335X_PIN_USB0_DRVVBUS			0xa1c
+#define AM335X_PIN_USB1_DRVVBUS			0xa34
 
+#define AM335X_PIN_OFFSET_MAX			0x0a34U
+
+#endif
include/dt-bindings/pinctrl/omap.h +5 -6
index 58fe28f159..f48245ff87 100644
@@ -24,7 +24,7 @@
 #define PULL_UP			(1 << 4)
 #define ALTELECTRICALSEL	(1 << 5)
 
-/* 34xx specific mux bit defines */
+/* omap3/4/5 specific mux bit defines */
 #define INPUT_EN		(1 << 8)
 #define OFF_EN			(1 << 9)
 #define OFFOUT_EN		(1 << 10)
@@ -32,8 +32,6 @@
 #define OFF_PULL_EN		(1 << 12)
 #define OFF_PULL_UP		(1 << 13)
 #define WAKEUP_EN		(1 << 14)
-
-/* 44xx specific mux bit defines */
 #define WAKEUP_EVENT		(1 << 15)
 
 /* Active pin states */
@@ -48,8 +46,8 @@
 #define PIN_OFF_NONE		0
 #define PIN_OFF_OUTPUT_HIGH	(OFF_EN | OFFOUT_EN | OFFOUT_VAL)
 #define PIN_OFF_OUTPUT_LOW	(OFF_EN | OFFOUT_EN)
-#define PIN_OFF_INPUT_PULLUP	(OFF_EN | OFF_PULL_EN | OFF_PULL_UP)
-#define PIN_OFF_INPUT_PULLDOWN	(OFF_EN | OFF_PULL_EN)
+#define PIN_OFF_INPUT_PULLUP	(OFF_EN | OFFOUT_EN | OFF_PULL_EN | OFF_PULL_UP)
+#define PIN_OFF_INPUT_PULLDOWN	(OFF_EN | OFFOUT_EN | OFF_PULL_EN)
 #define PIN_OFF_WAKEUPENABLE	WAKEUP_EN
 
 /*
@@ -66,7 +64,8 @@
 #define OMAP3_WKUP_IOPAD(pa, val)	OMAP_IOPAD_OFFSET((pa), 0x2a00) (val)
 #define DM814X_IOPAD(pa, val)		OMAP_IOPAD_OFFSET((pa), 0x0800) (val)
 #define DM816X_IOPAD(pa, val)		OMAP_IOPAD_OFFSET((pa), 0x0800) (val)
-#define AM33XX_IOPAD(pa, val)		OMAP_IOPAD_OFFSET((pa), 0x0800) (val)
+#define AM33XX_IOPAD(pa, val)		OMAP_IOPAD_OFFSET((pa), 0x0800) (val) (0)
+#define AM33XX_PADCONF(pa, conf, mux)	OMAP_IOPAD_OFFSET((pa), 0x0800) (conf) (mux)
 
 /*
  * Macros to allow using the offset from the padconf physical address
Signature · 1 line
2.26.2
#2 lore raw

PATCH v2 2/5 arm: dts: Resync BeagleBone device trees

In reply to Paul Barker

These device trees are updated to match the versions in Linux 5.13.1. The tick-timer entry in am335x-bone-common.dtsi is preserved.

---
 arch/arm/dts/am335x-bone-common.dtsi      | 185 +++++++++---------
 arch/arm/dts/am335x-bone.dts              |   7 +-
 arch/arm/dts/am335x-boneblack-common.dtsi | 169 +++++++++++++++++
 arch/arm/dts/am335x-boneblack.dts         | 217 +++++++++++++++-------
 arch/arm/dts/am335x-bonegreen-common.dtsi |  41 ++++
 arch/arm/dts/am335x-bonegreen.dts         |  49 +----
 6 files changed, 453 insertions(+), 215 deletions(-)
 create mode 100644 arch/arm/dts/am335x-boneblack-common.dtsi
 create mode 100644 arch/arm/dts/am335x-bonegreen-common.dtsi
arch/arm/dts/am335x-bone-common.dtsi +90 -95
index 8dcfac3a5b..35ec1a8df8 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.
+ * Copyright (C) 2012 Texas Instruments Incorporated - https://www.ti.com/
  */
 
 / {
@@ -13,44 +10,44 @@
 		};
 	};
 
+	memory@80000000 {
+		device_type = "memory";
+		reg = <0x80000000 0x10000000>; /* 256 MB */
+	};
+
 	chosen {
 		stdout-path = &uart0;
 		tick-timer = &timer2;
 	};
 
-	memory {
-		device_type = "memory";
-		reg = <0x80000000 0x10000000>; /* 256 MB */
-	};
-
 	leds {
 		pinctrl-names = "default";
 		pinctrl-0 = <&user_leds_s0>;
 
 		compatible = "gpio-leds";
 
-		led@2 {
+		led2 {
 			label = "beaglebone:green:heartbeat";
 			gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "heartbeat";
 			default-state = "off";
 		};
 
-		led@3 {
+		led3 {
 			label = "beaglebone:green:mmc0";
 			gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "mmc0";
 			default-state = "off";
 		};
 
-		led@4 {
+		led4 {
 			label = "beaglebone:green:usr2";
 			gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "cpu0";
 			default-state = "off";
 		};
 
-		led@5 {
+		led5 {
 			label = "beaglebone:green:usr3";
 			gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "mmc1";
@@ -58,7 +55,7 @@
 		};
 	};
 
-	vmmcsd_fixed: fixedregulator@0 {
+	vmmcsd_fixed: fixedregulator0 {
 		compatible = "regulator-fixed";
 		regulator-name = "vmmcsd_fixed";
 		regulator-min-microvolt = <3300000>;
@@ -72,112 +69,118 @@
 
 	user_leds_s0: user_leds_s0 {
 		pinctrl-single,pins = <
-			0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a5.gpio1_21 */
-			0x58 (PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gpmc_a6.gpio1_22 */
-			0x5c (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a7.gpio1_23 */
-			0x60 (PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gpmc_a8.gpio1_24 */
+			AM33XX_PADCONF(AM335X_PIN_GPMC_A5, PIN_OUTPUT_PULLDOWN, MUX_MODE7)	/* gpmc_a5.gpio1_21 */
+			AM33XX_PADCONF(AM335X_PIN_GPMC_A6, PIN_OUTPUT_PULLUP, MUX_MODE7)	/* gpmc_a6.gpio1_22 */
+			AM33XX_PADCONF(AM335X_PIN_GPMC_A7, PIN_OUTPUT_PULLDOWN, MUX_MODE7)	/* gpmc_a7.gpio1_23 */
+			AM33XX_PADCONF(AM335X_PIN_GPMC_A8, PIN_OUTPUT_PULLUP, MUX_MODE7)	/* gpmc_a8.gpio1_24 */
 		>;
 	};
 
 	i2c0_pins: pinmux_i2c0_pins {
 		pinctrl-single,pins = <
-			0x188 (PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c0_sda.i2c0_sda */
-			0x18c (PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c0_scl.i2c0_scl */
+			AM33XX_PADCONF(AM335X_PIN_I2C0_SDA, PIN_INPUT_PULLUP, MUX_MODE0)	/* i2c0_sda.i2c0_sda */
+			AM33XX_PADCONF(AM335X_PIN_I2C0_SCL, PIN_INPUT_PULLUP, MUX_MODE0)	/* i2c0_scl.i2c0_scl */
 		>;
 	};
 
 	i2c2_pins: pinmux_i2c2_pins {
 		pinctrl-single,pins = <
-			0x178 (PIN_INPUT_PULLUP | MUX_MODE3)	/* uart1_ctsn.i2c2_sda */
-			0x17c (PIN_INPUT_PULLUP | MUX_MODE3)	/* uart1_rtsn.i2c2_scl */
+			AM33XX_PADCONF(AM335X_PIN_UART1_CTSN, PIN_INPUT_PULLUP, MUX_MODE3)	/* uart1_ctsn.i2c2_sda */
+			AM33XX_PADCONF(AM335X_PIN_UART1_RTSN, PIN_INPUT_PULLUP, MUX_MODE3)	/* uart1_rtsn.i2c2_scl */
 		>;
 	};
 
 	uart0_pins: pinmux_uart0_pins {
 		pinctrl-single,pins = <
-			0x170 (PIN_INPUT_PULLUP | MUX_MODE0)	/* uart0_rxd.uart0_rxd */
-			0x174 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* uart0_txd.uart0_txd */
+			AM33XX_PADCONF(AM335X_PIN_UART0_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
+			AM33XX_PADCONF(AM335X_PIN_UART0_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
 		>;
 	};
 
 	clkout2_pin: pinmux_clkout2_pin {
 		pinctrl-single,pins = <
-			0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr1.clkout2 */
+			AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR1, PIN_OUTPUT_PULLDOWN, MUX_MODE3)	/* xdma_event_intr1.clkout2 */
 		>;
 	};
 
 	cpsw_default: cpsw_default {
 		pinctrl-single,pins = <
 			/* Slave 1 */
-			0x110 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxerr.mii1_rxerr */
-			0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txen.mii1_txen */
-			0x118 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxdv.mii1_rxdv */
-			0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd3.mii1_txd3 */
-			0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd2.mii1_txd2 */
-			0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd1.mii1_txd1 */
-			0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd0.mii1_txd0 */
-			0x12c (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_txclk.mii1_txclk */
-			0x130 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxclk.mii1_rxclk */
-			0x134 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd3.mii1_rxd3 */
-			0x138 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd2.mii1_rxd2 */
-			0x13c (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd1.mii1_rxd1 */
-			0x140 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd0.mii1_rxd0 */
+			AM33XX_PADCONF(AM335X_PIN_MII1_RX_ER, PIN_INPUT_PULLUP, MUX_MODE0)
+			AM33XX_PADCONF(AM335X_PIN_MII1_TX_EN, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
+			AM33XX_PADCONF(AM335X_PIN_MII1_RX_DV, PIN_INPUT_PULLUP, MUX_MODE0)
+			AM33XX_PADCONF(AM335X_PIN_MII1_TXD3, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
+			AM33XX_PADCONF(AM335X_PIN_MII1_TXD2, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
+			AM33XX_PADCONF(AM335X_PIN_MII1_TXD1, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
+			AM33XX_PADCONF(AM335X_PIN_MII1_TXD0, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
+			AM33XX_PADCONF(AM335X_PIN_MII1_TX_CLK, PIN_INPUT_PULLUP, MUX_MODE0)
+			AM33XX_PADCONF(AM335X_PIN_MII1_RX_CLK, PIN_INPUT_PULLUP, MUX_MODE0)
+			AM33XX_PADCONF(AM335X_PIN_MII1_RXD3, PIN_INPUT_PULLUP, MUX_MODE0)
+			AM33XX_PADCONF(AM335X_PIN_MII1_RXD2, PIN_INPUT_PULLUP, MUX_MODE0)
+			AM33XX_PADCONF(AM335X_PIN_MII1_RXD1, PIN_INPUT_PULLUP, MUX_MODE0)
+			AM33XX_PADCONF(AM335X_PIN_MII1_RXD0, PIN_INPUT_PULLUP, MUX_MODE0)
 		>;
 	};
 
 	cpsw_sleep: cpsw_sleep {
 		pinctrl-single,pins = <
 			/* Slave 1 reset value */
-			0x110 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-			0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-			0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-			0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7)
-			0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-			0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-			0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-			0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7)
-			0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-			0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-			0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-			0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)
-			0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+			AM33XX_PADCONF(AM335X_PIN_MII1_RX_ER, PIN_INPUT_PULLDOWN, MUX_MODE7)
+			AM33XX_PADCONF(AM335X_PIN_MII1_TX_EN, PIN_INPUT_PULLDOWN, MUX_MODE7)
+			AM33XX_PADCONF(AM335X_PIN_MII1_RX_DV, PIN_INPUT_PULLDOWN, MUX_MODE7)
+			AM33XX_PADCONF(AM335X_PIN_MII1_TXD3, PIN_INPUT_PULLDOWN, MUX_MODE7)
+			AM33XX_PADCONF(AM335X_PIN_MII1_TXD2, PIN_INPUT_PULLDOWN, MUX_MODE7)
+			AM33XX_PADCONF(AM335X_PIN_MII1_TXD1, PIN_INPUT_PULLDOWN, MUX_MODE7)
+			AM33XX_PADCONF(AM335X_PIN_MII1_TXD0, PIN_INPUT_PULLDOWN, MUX_MODE7)
+			AM33XX_PADCONF(AM335X_PIN_MII1_TX_CLK, PIN_INPUT_PULLDOWN, MUX_MODE7)
+			AM33XX_PADCONF(AM335X_PIN_MII1_RX_CLK, PIN_INPUT_PULLDOWN, MUX_MODE7)
+			AM33XX_PADCONF(AM335X_PIN_MII1_RXD3, PIN_INPUT_PULLDOWN, MUX_MODE7)
+			AM33XX_PADCONF(AM335X_PIN_MII1_RXD2, PIN_INPUT_PULLDOWN, MUX_MODE7)
+			AM33XX_PADCONF(AM335X_PIN_MII1_RXD1, PIN_INPUT_PULLDOWN, MUX_MODE7)
+			AM33XX_PADCONF(AM335X_PIN_MII1_RXD0, PIN_INPUT_PULLDOWN, MUX_MODE7)
 		>;
 	};
 
 	davinci_mdio_default: davinci_mdio_default {
 		pinctrl-single,pins = <
 			/* MDIO */
-			0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0)	/* mdio_data.mdio_data */
-			0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0)			/* mdio_clk.mdio_clk */
+			AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLUP | SLEWCTRL_FAST, MUX_MODE0)
+			AM33XX_PADCONF(AM335X_PIN_MDC, PIN_OUTPUT_PULLUP, MUX_MODE0)
 		>;
 	};
 
 	davinci_mdio_sleep: davinci_mdio_sleep {
 		pinctrl-single,pins = <
 			/* MDIO reset value */
-			0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-			0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)
+			AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLDOWN, MUX_MODE7)
+			AM33XX_PADCONF(AM335X_PIN_MDC, PIN_INPUT_PULLDOWN, MUX_MODE7)
 		>;
 	};
 
 	mmc1_pins: pinmux_mmc1_pins {
 		pinctrl-single,pins = <
-			0x160 (PIN_INPUT | MUX_MODE7) /* GPIO0_6 */
+			AM33XX_PADCONF(AM335X_PIN_SPI0_CS1, PIN_INPUT, MUX_MODE7)		/* spio0_cs1.gpio0_6 */
+			AM33XX_PADCONF(AM335X_PIN_MMC0_DAT0, PIN_INPUT_PULLUP, MUX_MODE0)
+			AM33XX_PADCONF(AM335X_PIN_MMC0_DAT1, PIN_INPUT_PULLUP, MUX_MODE0)
+			AM33XX_PADCONF(AM335X_PIN_MMC0_DAT2, PIN_INPUT_PULLUP, MUX_MODE0)
+			AM33XX_PADCONF(AM335X_PIN_MMC0_DAT3, PIN_INPUT_PULLUP, MUX_MODE0)
+			AM33XX_PADCONF(AM335X_PIN_MMC0_CMD, PIN_INPUT_PULLUP, MUX_MODE0)
+			AM33XX_PADCONF(AM335X_PIN_MMC0_CLK, PIN_INPUT_PULLUP, MUX_MODE0)
 		>;
 	};
 
 	emmc_pins: pinmux_emmc_pins {
 		pinctrl-single,pins = <
-			0x80 (PIN_INPUT_PULLUP | MUX_MODE2) /* gpmc_csn1.mmc1_clk */
-			0x84 (PIN_INPUT_PULLUP | MUX_MODE2) /* gpmc_csn2.mmc1_cmd */
-			0x00 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad0.mmc1_dat0 */
-			0x04 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad1.mmc1_dat1 */
-			0x08 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad2.mmc1_dat2 */
-			0x0c (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad3.mmc1_dat3 */
-			0x10 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad4.mmc1_dat4 */
-			0x14 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad5.mmc1_dat5 */
-			0x18 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad6.mmc1_dat6 */
-			0x1c (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad7.mmc1_dat7 */
+			AM33XX_PADCONF(AM335X_PIN_GPMC_CSN1, PIN_INPUT_PULLUP, MUX_MODE2) /* gpmc_csn1.mmc1_clk */
+			AM33XX_PADCONF(AM335X_PIN_GPMC_CSN2, PIN_INPUT_PULLUP, MUX_MODE2) /* gpmc_csn2.mmc1_cmd */
+			AM33XX_PADCONF(AM335X_PIN_GPMC_AD0, PIN_INPUT_PULLUP, MUX_MODE1) /* gpmc_ad0.mmc1_dat0 */
+			AM33XX_PADCONF(AM335X_PIN_GPMC_AD1, PIN_INPUT_PULLUP, MUX_MODE1) /* gpmc_ad1.mmc1_dat1 */
+			AM33XX_PADCONF(AM335X_PIN_GPMC_AD2, PIN_INPUT_PULLUP, MUX_MODE1) /* gpmc_ad2.mmc1_dat2 */
+			AM33XX_PADCONF(AM335X_PIN_GPMC_AD3, PIN_INPUT_PULLUP, MUX_MODE1) /* gpmc_ad3.mmc1_dat3 */
+			AM33XX_PADCONF(AM335X_PIN_GPMC_AD4, PIN_INPUT_PULLUP, MUX_MODE1) /* gpmc_ad4.mmc1_dat4 */
+			AM33XX_PADCONF(AM335X_PIN_GPMC_AD5, PIN_INPUT_PULLUP, MUX_MODE1) /* gpmc_ad5.mmc1_dat5 */
+			AM33XX_PADCONF(AM335X_PIN_GPMC_AD6, PIN_INPUT_PULLUP, MUX_MODE1) /* gpmc_ad6.mmc1_dat6 */
+			AM33XX_PADCONF(AM335X_PIN_GPMC_AD7, PIN_INPUT_PULLUP, MUX_MODE1) /* gpmc_ad7.mmc1_dat7 */
 		>;
 	};
 };
@@ -189,36 +192,16 @@
 	status = "okay";
 };
 
-&usb {
-	status = "okay";
-};
-
-&usb_ctrl_mod {
-	status = "okay";
-};
-
-&usb0_phy {
-	status = "okay";
-};
-
-&usb1_phy {
-	status = "okay";
-};
-
 &usb0 {
-	status = "okay";
 	dr_mode = "peripheral";
+	interrupts-extended = <&intc 18 &tps 0>;
+	interrupt-names = "mc", "vbus";
 };
 
 &usb1 {
-	status = "okay";
 	dr_mode = "host";
 };
 
-&cppi41dma  {
-	status = "okay";
-};
-
 &i2c0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c0_pins>;
@@ -231,7 +214,7 @@
 	};
 
 	baseboard_eeprom: baseboard_eeprom@50 {
-		compatible = "at,24c256";
+		compatible = "atmel,24c256";
 		reg = <0x50>;
 
 		#address-cells = <1>;
@@ -250,7 +233,7 @@
 	clock-frequency = <100000>;
 
 	cape_eeprom0: cape_eeprom0@54 {
-		compatible = "at,24c256";
+		compatible = "atmel,24c256";
 		reg = <0x54>;
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -260,7 +243,7 @@
 	};
 
 	cape_eeprom1: cape_eeprom1@55 {
-		compatible = "at,24c256";
+		compatible = "atmel,24c256";
 		reg = <0x55>;
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -270,7 +253,7 @@
 	};
 
 	cape_eeprom2: cape_eeprom2@56 {
-		compatible = "at,24c256";
+		compatible = "atmel,24c256";
 		reg = <0x56>;
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -280,7 +263,7 @@
 	};
 
 	cape_eeprom3: cape_eeprom3@57 {
-		compatible = "at,24c256";
+		compatible = "atmel,24c256";
 		reg = <0x57>;
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -311,8 +294,20 @@
 	 * by the hardware problems. (Tip: double-check by performing a current
 	 * measurement after shutdown: it should be less than 1 mA.)
 	 */
+
+	interrupts = <7>; /* NMI */
+	interrupt-parent = <&intc>;
+
 	ti,pmic-shutdown-controller;
 
+	charger {
+		status = "okay";
+	};
+
+	pwrbutton {
+		status = "okay";
+	};
+
 	regulators {
 		dcdc1_reg: regulator@0 {
 			regulator-name = "vdds_dpr";
@@ -323,7 +318,7 @@
 			/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
 			regulator-name = "vdd_mpu";
 			regulator-min-microvolt = <925000>;
-			regulator-max-microvolt = <1325000>;
+			regulator-max-microvolt = <1351500>;
 			regulator-boot-on;
 			regulator-always-on;
 		};
arch/arm/dts/am335x-bone.dts +2 -5
index 6b84937204..b5d85ef51a 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.
+ * Copyright (C) 2012 Texas Instruments Incorporated - https://www.ti.com/
  */
 /dts-v1/;
 
arch/arm/dts/am335x-boneblack-common.dtsi new file +169 -0

169 lines not on this page · raw message

arch/arm/dts/am335x-boneblack.dts +148 -69

238 lines not on this page · raw message

arch/arm/dts/am335x-bonegreen-common.dtsi new file +41 -0

41 lines not on this page · raw message

arch/arm/dts/am335x-bonegreen.dts +3 -46

60 lines not on this page · raw message

Signature · 1 line
2.26.2
#3 lore raw

PATCH v2 3/5 arm: dts: Import am335x-sancloud-bbe devicetree

In reply to Paul Barker

This device tree is imported from Linux 5.13.1 and enabled via the am335x board file and the am335x evm defconfig.

---
 arch/arm/dts/Makefile                |   1 +
 arch/arm/dts/am335x-sancloud-bbe.dts | 137 +++++++++++++++++++++++++++
 board/ti/am335x/board.c              |   2 +
 configs/am335x_evm_defconfig         |   2 +-
 4 files changed, 141 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/dts/am335x-sancloud-bbe.dts
arch/arm/dts/Makefile +1 -0
index 7ce3ae6caa..23a55e8b19 100644
@@ -364,6 +364,7 @@ dtb-$(CONFIG_AM33XX) += \
 	am335x-pocketbeagle.dtb \
 	am335x-pxm50.dtb \
 	am335x-rut.dtb \
+	am335x-sancloud-bbe.dtb \
 	am335x-shc.dtb \
 	am335x-pdu001.dtb \
 	am335x-chiliboard.dtb \
arch/arm/dts/am335x-sancloud-bbe.dts new file +137 -0

137 lines not on this page · raw message

board/ti/am335x/board.c +2 -0
index 5c156a5d1d..57e16fe59d 100644
@@ -954,6 +954,8 @@ int board_fit_config_name_match(const char *name)
 		return 0;
 	else if (board_is_icev2() && !strcmp(name, "am335x-icev2"))
 		return 0;
+	else if (board_is_bben() && !strcmp(name, "am335x-sancloud-bbe"))
+		return 0;
 	else
 		return -1;
 }
configs/am335x_evm_defconfig +1 -1
index 79fb8b3f8f..dcda15e6bf 100644
@@ -37,7 +37,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)"
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_OF_CONTROL=y
-CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2 am335x-pocketbeagle"
+CONFIG_OF_LIST="am335x-evm am335x-bone am335x-sancloud-bbe am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2 am335x-pocketbeagle"
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
Signature · 1 line
2.26.2
#4 lore raw

PATCH v2 4/5 configs: am335x_evm: Support GbE PHYs

In reply to Paul Barker

The SanCloud BeagleBone Enhanced (BBE) includes a Gigabit Ethernet PHY.

---
 configs/am335x_evm_defconfig | 1 +
 1 file changed, 1 insertion(+)
configs/am335x_evm_defconfig +1 -0
index dcda15e6bf..1c8093ae6a 100644
@@ -67,6 +67,7 @@ CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_ATHEROS=y
 CONFIG_PHY_SMSC=y
 CONFIG_DM_ETH=y
+CONFIG_PHY_GIGE=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
 CONFIG_SPI=y
Signature · 1 line
2.26.2
#5 lore raw

PATCH v2 5/5 configs: am335x_evm: Fix BeagleBone Green DTB selection

In reply to Paul Barker

The function board_is_bone_lt() returns true for the BeagleBone Green, the BeagleBone Enhanced and the BeagleBone Black. Therefore when selecting which devicetree to use we must ensure that the more specific functions board_is_bbg1() and board_is_bben() are checked first otherwise all three devices would end up using the am335x-boneblack devicetree. This can be achieved by placing the relevant devicetree names (am335x-sancloud-bbe and am335x-bonegreen) before am335x-boneblack in CONFIG_OF_LIST.

The new am335x-sancloud-bbe name is already in an appropriate place in the list so we just need to move am335x-bonegreen.

---
 configs/am335x_evm_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configs/am335x_evm_defconfig +1 -1
index 1c8093ae6a..647e199608 100644
@@ -37,7 +37,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)"
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_OF_CONTROL=y
-CONFIG_OF_LIST="am335x-evm am335x-bone am335x-sancloud-bbe am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2 am335x-pocketbeagle"
+CONFIG_OF_LIST="am335x-evm am335x-bone am335x-sancloud-bbe am335x-bonegreen am335x-boneblack am335x-evmsk am335x-icev2 am335x-pocketbeagle"
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
Signature · 1 line
2.26.2
#6 lore raw

Re: [PATCH v2 5/5] configs: am335x_evm: Fix BeagleBone Green DTB selection

Quoted 8 lines · Paul Barker

The function board_is_bone_lt() returns true for the BeagleBone Green, the BeagleBone Enhanced and the BeagleBone Black. Therefore when selecting which devicetree to use we must ensure that the more specific functions board_is_bbg1() and board_is_bben() are checked first otherwise all three devices would end up using the am335x-boneblack devicetree. This can be achieved by placing the relevant devicetree names (am335x-sancloud-bbe and am335x-bonegreen) before am335x-boneblack in CONFIG_OF_LIST.

Such restrictions should be handled inside board_fit_config_name_match() and hiden from user configuration. Can you update the board_fit_config_name_match() instead of updating defconfig?

Thanks and regards,
Lokesh

#7 lore raw

Re: [PATCH v2 5/5] configs: am335x_evm: Fix BeagleBone Green DTB selection

Quoted 10 lines · On Tue, 13 Jul 2021 11:59:06 +0530 Lokesh Vutla <[email protected]> wrote:
Quoted 8 lines · Paul Barker

The function board_is_bone_lt() returns true for the BeagleBone Green, the BeagleBone Enhanced and the BeagleBone Black. Therefore when selecting which devicetree to use we must ensure that the more specific functions board_is_bbg1() and board_is_bben() are checked first otherwise all three devices would end up using the am335x-boneblack devicetree. This can be achieved by placing the relevant devicetree names (am335x-sancloud-bbe and am335x-bonegreen) before am335x-boneblack in CONFIG_OF_LIST.

Quoted 3 lines

Such restrictions should be handled inside board_fit_config_name_match() and hiden from user configuration. Can you update the board_fit_config_name_match() instead of updating defconfig?

Hi Lokesh,

Apologies for the late reply, I lost most of last week due to illness.

I first attempted to fix this by changing the order of things in board_fit_config_name_match but it had no effect. Looking at fit_find_config_node in common/common_fit.c, we loop through the list of dtbs and check each one in turn for a match. So to move am335x-bonegreen ahead of am335x-boneblack we need to change the order in which the dtbs are checked in fit_find_config_node. The simplest way I could find to do that is to change the order of the names in CONFIG_OF_LIST.

Thanks,

Signature · 3 lines
Paul Barker
Principal Software Engineer
SanCloud Ltd
#8 lore raw

Re: [PATCH v2 5/5] configs: am335x_evm: Fix BeagleBone Green DTB selection

Quoted 21 lines · Paul Barker
Quoted 10 lines · On Tue, 13 Jul 2021 11:59:06 +0530 Lokesh Vutla <[email protected]> wrote:
Quoted 8 lines · Paul Barker

The function board_is_bone_lt() returns true for the BeagleBone Green, the BeagleBone Enhanced and the BeagleBone Black. Therefore when selecting which devicetree to use we must ensure that the more specific functions board_is_bbg1() and board_is_bben() are checked first otherwise all three devices would end up using the am335x-boneblack devicetree. This can be achieved by placing the relevant devicetree names (am335x-sancloud-bbe and am335x-bonegreen) before am335x-boneblack in CONFIG_OF_LIST.

Quoted 3 lines

Such restrictions should be handled inside board_fit_config_name_match() and hiden from user configuration. Can you update the board_fit_config_name_match() instead of updating defconfig?

Hi Lokesh,

Apologies for the late reply, I lost most of last week due to illness.

Quoted 8 lines

I first attempted to fix this by changing the order of things in board_fit_config_name_match but it had no effect. Looking at fit_find_config_node in common/common_fit.c, we loop through the list of dtbs and check each one in turn for a match. So to move am335x-bonegreen ahead of am335x-boneblack we need to change the order in which the dtbs are checked in fit_find_config_node. The simplest way I could find to do that is to change the order of the names in CONFIG_OF_LIST.

ahh..ok got it. But still such constraints in config file is most likely will not be maintained in future when someone touching the config. Because not everyone knows this.

Is it possible to create a new macro which is true only for bbb and use it instead in board_fit_config_name_match?

Thanks and reagrds,
Lokesh

Quoted 3 lines

Thanks,

#9 lore raw

Re: [PATCH v2 5/5] configs: am335x_evm: Fix BeagleBone Green DTB selection

Quoted 31 lines · On Wed, 21 Jul 2021 11:29:04 +0530 Lokesh Vutla <[email protected]> wrote:
Quoted 21 lines · Paul Barker
Quoted 10 lines · On Tue, 13 Jul 2021 11:59:06 +0530 Lokesh Vutla <[email protected]> wrote:
Quoted 8 lines · Paul Barker

The function board_is_bone_lt() returns true for the BeagleBone Green, the BeagleBone Enhanced and the BeagleBone Black. Therefore when selecting which devicetree to use we must ensure that the more specific functions board_is_bbg1() and board_is_bben() are checked first otherwise all three devices would end up using the am335x-boneblack devicetree. This can be achieved by placing the relevant devicetree names (am335x-sancloud-bbe and am335x-bonegreen) before am335x-boneblack in CONFIG_OF_LIST.

Quoted 3 lines

Such restrictions should be handled inside board_fit_config_name_match() and hiden from user configuration. Can you update the board_fit_config_name_match() instead of updating defconfig?

Hi Lokesh,

Apologies for the late reply, I lost most of last week due to illness.

Quoted 8 lines

I first attempted to fix this by changing the order of things in board_fit_config_name_match but it had no effect. Looking at fit_find_config_node in common/common_fit.c, we loop through the list of dtbs and check each one in turn for a match. So to move am335x-bonegreen ahead of am335x-boneblack we need to change the order in which the dtbs are checked in fit_find_config_node. The simplest way I could find to do that is to change the order of the names in CONFIG_OF_LIST.

Quoted 6 lines

ahh..ok got it. But still such constraints in config file is most likely will not be maintained in future when someone touching the config. Because not everyone knows this.

Is it possible to create a new macro which is true only for bbb and use it instead in board_fit_config_name_match?

I'm happy to have a look for an alternative solution like that. The patch here is a quick fix though that can be applied as-is. Perhaps we should apply this and also look for an alternative implementation of board_is_bone_lt.

If you want to leave this patch out for now, can we move ahead and merge the other patches in this series?

Thanks,

Signature · 3 lines
Paul Barker
Principal Software Engineer
SanCloud Ltd
#10 lore raw

Re: [PATCH v2 5/5] configs: am335x_evm: Fix BeagleBone Green DTB selection

Quoted 41 lines · Paul Barker
Quoted 31 lines · On Wed, 21 Jul 2021 11:29:04 +0530 Lokesh Vutla <[email protected]> wrote:
Quoted 21 lines · Paul Barker
Quoted 10 lines · On Tue, 13 Jul 2021 11:59:06 +0530 Lokesh Vutla <[email protected]> wrote:
Quoted 8 lines · Paul Barker

The function board_is_bone_lt() returns true for the BeagleBone Green, the BeagleBone Enhanced and the BeagleBone Black. Therefore when selecting which devicetree to use we must ensure that the more specific functions board_is_bbg1() and board_is_bben() are checked first otherwise all three devices would end up using the am335x-boneblack devicetree. This can be achieved by placing the relevant devicetree names (am335x-sancloud-bbe and am335x-bonegreen) before am335x-boneblack in CONFIG_OF_LIST.

Quoted 3 lines

Such restrictions should be handled inside board_fit_config_name_match() and hiden from user configuration. Can you update the board_fit_config_name_match() instead of updating defconfig?

Hi Lokesh,

Apologies for the late reply, I lost most of last week due to illness.

Quoted 8 lines

I first attempted to fix this by changing the order of things in board_fit_config_name_match but it had no effect. Looking at fit_find_config_node in common/common_fit.c, we loop through the list of dtbs and check each one in turn for a match. So to move am335x-bonegreen ahead of am335x-boneblack we need to change the order in which the dtbs are checked in fit_find_config_node. The simplest way I could find to do that is to change the order of the names in CONFIG_OF_LIST.

Quoted 6 lines

ahh..ok got it. But still such constraints in config file is most likely will not be maintained in future when someone touching the config. Because not everyone knows this.

Is it possible to create a new macro which is true only for bbb and use it instead in board_fit_config_name_match?

Quoted 7 lines

I'm happy to have a look for an alternative solution like that. The patch here is a quick fix though that can be applied as-is. Perhaps we should apply this and also look for an alternative implementation of board_is_bone_lt.

If you want to leave this patch out for now, can we move ahead and merge the other patches in this series?

You are right. Applied the first 4 patches to for-rc branch.

Thanks and regards,
Lokesh