diff options
| author | Tom Rini <trini@konsulko.com> | 2018-05-11 15:22:36 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-05-11 15:22:36 -0400 |
| commit | 9a66328a37e3b31dbe646ef3668b60466e8abd9a (patch) | |
| tree | 0ece22b0187232017e0930aa88fa4664772edba9 /include | |
| parent | 57a72d0560eb7693a35a891f43587bcd6786dc04 (diff) | |
| parent | 71cb3d7c7897cd02ca731f4c510fff49705b84b7 (diff) | |
| download | u-boot-9a66328a37e3b31dbe646ef3668b60466e8abd9a.tar.gz | |
Merge git://git.denx.de/u-boot-tegra
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/apalis-tk1.h | 4 | ||||
| -rw-r--r-- | include/configs/harmony.h | 4 | ||||
| -rw-r--r-- | include/pci_tegra.h | 10 | ||||
| -rw-r--r-- | include/power/as3722.h | 4 |
4 files changed, 19 insertions, 3 deletions
diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index fe8168458f..667d084611 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -80,7 +80,7 @@ "&& setenv dtbparam ${fdt_addr_r}\0" #define SD_BOOTCMD \ - "sdargs=ip=off root=/dev/mmcblk1p2 rw rootfstype=ext3 rootwait\0" \ + "sdargs=ip=off root=/dev/mmcblk1p2 rw rootfstype=ext4 rootwait\0" \ "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ "${vidargs}; echo Booting from SD card in 8bit slot...; " \ "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \ @@ -91,7 +91,7 @@ "&& setenv dtbparam ${fdt_addr_r}\0" #define USB_BOOTCMD \ - "usbargs=ip=off root=/dev/sda2 rw rootfstype=ext3 rootwait\0" \ + "usbargs=ip=off root=/dev/sda2 rw rootfstype=ext4 rootwait\0" \ "usbboot=run setup; setenv bootargs ${defargs} ${setupargs} " \ "${usbargs} ${vidargs}; echo Booting from USB stick...; " \ "usb start && run usbdtbload; load usb 0:1 ${kernel_addr_r} " \ diff --git a/include/configs/harmony.h b/include/configs/harmony.h index 3ec9e87fb0..51e284e2e9 100644 --- a/include/configs/harmony.h +++ b/include/configs/harmony.h @@ -29,6 +29,10 @@ #define CONFIG_TEGRA_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1 +/* Dynamic MTD partition support */ +#define CONFIG_MTD_PARTITIONS +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ + /* Environment in NAND (which is 512M), aligned to start of last sector */ #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sector size */ diff --git a/include/pci_tegra.h b/include/pci_tegra.h new file mode 100644 index 0000000000..11e92fc26d --- /dev/null +++ b/include/pci_tegra.h @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (c) 2018 Toradex, Inc. + */ + +struct tegra_pcie_port; + +int tegra_pcie_port_index_of_port(struct tegra_pcie_port *port); + +void tegra_pcie_port_reset(struct tegra_pcie_port *port); diff --git a/include/power/as3722.h b/include/power/as3722.h index 9f045d5ab6..2782857055 100644 --- a/include/power/as3722.h +++ b/include/power/as3722.h @@ -13,7 +13,8 @@ #define AS3722_SD_VOLTAGE(n) (0x00 + (n)) #define AS3722_LDO_VOLTAGE(n) (0x10 + (n)) #define AS3722_SD_CONTROL 0x4d -#define AS3722_LDO_CONTROL 0x4e +#define AS3722_LDO_CONTROL0 0x4e +#define AS3722_LDO_CONTROL1 0x4f #define AS3722_ASIC_ID1 0x90 #define AS3722_ASIC_ID2 0x91 @@ -24,5 +25,6 @@ #define AS3722_GPIO_CONTROL_INVERT (1 << 7) int as3722_sd_set_voltage(struct udevice *dev, unsigned int sd, u8 value); +int as3722_ldo_set_voltage(struct udevice *dev, unsigned int ldo, u8 value); #endif /* __POWER_AS3722_H__ */ |