diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-12-18 21:45:34 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-12-18 21:45:34 +0100 |
| commit | fe7f0810ddf41939bbdd22fe39b0b80fdfe0636b (patch) | |
| tree | 7ae945711f3b37183fef66e694cedd35f8e722e9 /arch/arm/include | |
| parent | f4e4aadeaddaf148f02f52b9e24ea19ab84f3475 (diff) | |
| parent | 766afc3dff35f8f257deb0373735a328c8206880 (diff) | |
| download | u-boot-imx-fe7f0810ddf41939bbdd22fe39b0b80fdfe0636b.zip u-boot-imx-fe7f0810ddf41939bbdd22fe39b0b80fdfe0636b.tar.gz u-boot-imx-fe7f0810ddf41939bbdd22fe39b0b80fdfe0636b.tar.bz2 | |
Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/arch-tegra/clock.h | 6 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-tegra/tegra.h | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/include/asm/arch-tegra/clock.h b/arch/arm/include/asm/arch-tegra/clock.h index c3174bd..e7d0fd4 100644 --- a/arch/arm/include/asm/arch-tegra/clock.h +++ b/arch/arm/include/asm/arch-tegra/clock.h @@ -113,9 +113,9 @@ void reset_set_enable(enum periph_id periph_id, int enable); enum crc_reset_id { /* Things we can hold in reset for each CPU */ crc_rst_cpu = 1, - crc_rst_de = 1 << 2, /* What is de? */ - crc_rst_watchdog = 1 << 3, - crc_rst_debug = 1 << 4, + crc_rst_de = 1 << 4, /* What is de? */ + crc_rst_watchdog = 1 << 8, + crc_rst_debug = 1 << 12, }; /** diff --git a/arch/arm/include/asm/arch-tegra/tegra.h b/arch/arm/include/asm/arch-tegra/tegra.h index 25d1fc4..e99f681 100644 --- a/arch/arm/include/asm/arch-tegra/tegra.h +++ b/arch/arm/include/asm/arch-tegra/tegra.h @@ -65,6 +65,7 @@ enum { SKU_ID_T25E = 0x1c, SKU_ID_T33 = 0x80, SKU_ID_T30 = 0x81, /* Cardhu value */ + SKU_ID_TM30MQS_P_A3 = 0xb1, SKU_ID_T114_ENG = 0x00, /* Dalmore value, unfused */ SKU_ID_T114_1 = 0x01, }; |