tegra124: Add support for Avionic Design platform

From: Alban Bedel <[email protected]>

The init simply hardcoded the i2c bus and address to those used on jetson. Extend the init function to take the bus number and device address as parameter. As only jetson is using this code for now just fix this single use of the function.

Signed-off-by Alban Bedel <[email protected]>

Reviewed-by Julian Scheel <[email protected]>

board/avionic-design/common/meerkat.c +3 -0

 
+int tegra_pcie_board_init(void)
 
+	err = as3722_gpio_configure(pmic, 1, AS3722_GPIO_OUTPUT_VDDH |
+					     AS3722_GPIO_INVERT);

+#define CONFIG_CMD_PCI_ENUM

Quoted 8 lines · Julian Scheel

Add support for platforms based on the Meerkat COM module. Includes support
for the minimal reference platform called Kein Baseboard, which in fact is
sufficient to run most existing Meerkat carriers.

arch/arm/dts/tegra124-meerkat.dtsi line 14

Quoted 8 lines

arch/arm/dts/tegra124-meerkat.dtsi +7 -0

 
+    aliases {
+        i2c0 = "/i2c at 7000c000";
+        i2c1 = "/i2c at 7000c400";
+        i2c2 = "/i2c at 7000c500";
+        i2c3 = "/i2c at 7000c700";
+        i2c4 = "/i2c at 7000d000";
+        i2c5 = "/i2c at 7000d100";

/i2c at 7000d000 is alias i2c0 on all other Tegra boards that have I2C aliases.

Quoted 11 lines

arch/arm/mach-tegra/tegra124/Kconfig +6 -0

 
+config TARGET_KBB
+    bool "Avionic Design Kein Baseboard"
+    select CPU_V7_HAS_NONSEC if !SPL_BUILD
+    select CPU_V7_HAS_VIRT if !SPL_BUILD
+    help
+      Minimal baseboard for Avionic Design Meerkat COM. Should work

with most
+ baseboard that follow the reference design.

I hope "KBB" doesn't turn out to be too generic and cause conflicts. I might suggest TARGET_AD_KBB. However, I suppose we can just rename this if it becomes a problem later, so perhaps it isn't worth fixing.

Quoted 7 lines

board/avionic-design/common/meerkat.c +3 -0

 
+int tegra_pcie_board_init(void)
 
+    err = as3722_gpio_configure(pmic, 1, AS3722_GPIO_OUTPUT_VDDH |
+                         AS3722_GPIO_INVERT);

board/avionic-design/common/meerkat.c line 66

Quoted 10 lines

board/avionic-design/common/meerkat.c +10 -0

+    if (err < 0) {
+        error("failed to configure GPIO#1 as output: %d\n", err);
+        return err;
+    }
+
+    err = as3722_gpio_direction_output(pmic, 2, 1);
+    if (err < 0) {
+        error("failed to set GPIO#2 high: %d\n", err);
+        return err;
+    }

Those two GPIO manipulations should likely be removed; see the recent change to similar code in jetson-tk1.c.

board/avionic-design/common/pinmux-config-meerkat.h

Quoted 2 lines

board/avionic-design/common/pinmux-config-meerkat.h +0 -0

I'd like to see the pinmux config for this board added to
https://github.com/NVIDIA/tegra-pinmux-scripts

That way, if we want to support other SW stacks and/or e.g. change the structure of these pinmux tables, we can simply re-generate this file with no issue.

Was this file auto-generated using a downstream version of tegra-pinmux-scripts? There's no comment indicating it was, and the most recent tegra-pinmux-scripts does add such a comment...

board/avionic-design/kein-baseboard/Kconfig

Quoted 4 lines

board/avionic-design/kein-baseboard/Kconfig +1 -0

 
+if TARGET_KBB

It'd be nice if this directory name matched the Kconfig symbol.

include/configs/kein-baseboard.h

Quoted 7 lines

configs/kein-baseboard_defconfig +0 -0

include/configs/kein-baseboard.h +1 -0

 
+#define CONFIG_USB_MAX_CONTROLLER_COUNT    3

That define shouldn't be necessary any more, following the conversion of Tegra to DM USB.

Quoted 1 line

+#define CONFIG_CMD_PCI_ENUM

That define shouldn't be necessary any more, following the conversion of Tegra to DM PCI.

Quoted 8 lines · Julian Scheel

Add support for platforms based on the Meerkat COM module. Includes support
for the minimal reference platform called Kein Baseboard, which in fact is
sufficient to run most existing Meerkat carriers.

arch/arm/dts/tegra124-meerkat.dtsi line 14

Quoted 8 lines

arch/arm/dts/tegra124-meerkat.dtsi +7 -0

 
+    aliases {
+        i2c0 = "/i2c at 7000c000";
+        i2c1 = "/i2c at 7000c400";
+        i2c2 = "/i2c at 7000c500";
+        i2c3 = "/i2c at 7000c700";
+        i2c4 = "/i2c at 7000d000";
+        i2c5 = "/i2c at 7000d100";

/i2c at 7000d000 is alias i2c0 on all other Tegra boards that have I2C aliases.

Hi Stephen,

Quoted 18 lines · Stephen Warren

Quoted 8 lines · Julian Scheel

Add support for platforms based on the Meerkat COM module. Includes support
for the minimal reference platform called Kein Baseboard, which in fact is
sufficient to run most existing Meerkat carriers.

arch/arm/dts/tegra124-meerkat.dtsi line 14

Quoted 8 lines

arch/arm/dts/tegra124-meerkat.dtsi +7 -0

 
+    aliases {
+        i2c0 = "/i2c at 7000c000";
+        i2c1 = "/i2c at 7000c400";
+        i2c2 = "/i2c at 7000c500";
+        i2c3 = "/i2c at 7000c700";
+        i2c4 = "/i2c at 7000d000";
+        i2c5 = "/i2c at 7000d100";

Quoted 2 lines

/i2c at 7000d000 is alias i2c0 on all other Tegra boards that have I2C aliases.

we just had a quick discussion about this and actually we explicitly changed it in our tree to a linear mapping of the controller addresses to be in sync with what we have in the l4t kernel.
If it won't hurt you too much we'd like to keep it that way. Though if you feel really bad about it, we can change it to use the same mapping as Jetson uses.

Quoted 24 lines · Julian Scheel

Hi Stephen,

Quoted 18 lines · Stephen Warren

Quoted 8 lines · Julian Scheel

Add support for platforms based on the Meerkat COM module. Includes support
for the minimal reference platform called Kein Baseboard, which in fact is
sufficient to run most existing Meerkat carriers.

arch/arm/dts/tegra124-meerkat.dtsi line 14

Quoted 8 lines

arch/arm/dts/tegra124-meerkat.dtsi +7 -0

 
+    aliases {
+        i2c0 = "/i2c at 7000c000";
+        i2c1 = "/i2c at 7000c400";
+        i2c2 = "/i2c at 7000c500";
+        i2c3 = "/i2c at 7000c700";
+        i2c4 = "/i2c at 7000d000";
+        i2c5 = "/i2c at 7000d100";

Quoted 2 lines

/i2c at 7000d000 is alias i2c0 on all other Tegra boards that have I2C aliases.

Quoted 6 lines

we just had a quick discussion about this and actually we explicitly changed it in our tree to a linear mapping of the controller addresses to be in sync with what we have in the l4t kernel.
If it won't hurt you too much we'd like to keep it that way. Though if you feel really bad about it, we can change it to use the same mapping as Jetson uses.

That's probably fine; hopefully it won't be too confusing since aliases are supposed to be board-specific.

Let's make sure that the Linux kernel patches for this board have matching aliases and get Ack'd soon to make sure they don't diverge.

This adds support for the Avionic Design Tegra124 platform. It consists of the Meerkat SOM and a minimal baseboard Kein Baseboard.

The as3722 is placed on a different bus as compared to nvidia Jetson, which makes the as3722 required.

Quoted 3 lines · Julian Scheel

This adds support for the Avionic Design Tegra124 platform. It consists of the
Meerkat SOM and a minimal baseboard Kein Baseboard.

Quoted 3 lines

The as3722 is placed on a different bus as compared to nvidia Jetson, which
makes the as3722 required.

This doesn't appear to be quite true. It looks like the AS3722 is on the same physical bus, it's just that the I2C aliases in DT assign this bus a different number. Typically, all Tegra boards have the PMIC I2C bus as U-Boot I2C bus 0. Is there a good reason not to do that here?