diff options
| author | Tom Rini <[email protected]> | 2023-12-19 15:16:13 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-12-20 08:12:56 -0500 |
| commit | 1f115bdeb804b34a6456fd1f5907ffc98a2977ba (patch) | |
| tree | e155297a5e4ce7b08c7a0d9802bb032ab2427c34 /include/configs | |
| parent | 936d0f9dd713a913fe952eae576c893e1d5ecbd1 (diff) | |
| parent | 4989628c1d2b6ea19a38aae34b1c08b12141c64b (diff) | |
Merge branch 'staging' of https://source.denx.de/u-boot/custodians/u-boot-tegra into next
This PR contains 4 patchsets:
1. PMIC GPIO cells bringup. Created drivers for MAX7663 and Palmas
PMICs and gpio-uclass patch isolated behind configs for these 2
drivers. No unintentional size increase on any board. (proposed
2023-11-06 without any reaction)
2. Simple PLL clocks support in common tegra clock code which allows
use of simple PLL the same way main PLLs are used (before only
clock_start_pll was available). PLLD2 is an example of simple PLL, it
is used as a video subsystem parent clock and was used to test this
code. So far everything worked as expected. (proposed 2023-11-16
without any reaction)
3. A small patch for tegra emmc to allow pass max frequency from
device tree since some devices may not support full speed.
4. Pinmux DM conversion. Patchset consists of commit with DM wrapper
for existing pinmux code for t20/t30/t114, pinmux and funcmux files
relocation into a dedicated folder inside pinctrl, conversion of some
tegra boards to device tree pinmux setup.
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/x3-t30.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/include/configs/x3-t30.h b/include/configs/x3-t30.h index d29ea700b2e..14532542ea6 100644 --- a/include/configs/x3-t30.h +++ b/include/configs/x3-t30.h @@ -14,19 +14,8 @@ #include "tegra30-common.h" -#define CFG_TEGRA_BOARD_STRING "LG X3 Board" - -#ifdef CONFIG_DEVICE_P880 /* High-level configuration options */ -#undef CFG_TEGRA_BOARD_STRING -#define CFG_TEGRA_BOARD_STRING "LG Optimus 4X HD" -#endif - -#ifdef CONFIG_DEVICE_P895 -/* High-level configuration options */ -#undef CFG_TEGRA_BOARD_STRING -#define CFG_TEGRA_BOARD_STRING "LG Optimus Vu" -#endif +#define CFG_TEGRA_BOARD_STRING "LG X3 Board" #define X3_FLASH_UBOOT \ "flash_uboot=echo Preparing RAM;" \ |