tegra124/nyan: rougly stable code base

nyan: Clock setup.
Reviewed-on: https://chromium-review.googlesource.com/172106
(cherry picked from commit 3697b6454c0aceebcf735436de90ba2441c9b7b1)

tegra124: Call into the mainboard bootblock init if one exists.
Reviewed-on: https://chromium-review.googlesource.com/172581
(cherry picked from commit 3a0cd48a0d1a9ce6b32ed614cd81fb81f5f82aec)

nyan: Add a mainboard specific bootblock.
Reviewed-on: https://chromium-review.googlesource.com/172582
(cherry picked from commit a83d065d660a26fe71ed79879c25f84a1b669f69)

nyan: tegra124: Redestribute the clock code between the mainboard and soc.
Reviewed-on: https://chromium-review.googlesource.com/172583
(cherry picked from commit ea703137fc37befa7d5a65afc982e298a0daca1b)

nyan: Initialize the i2c pins and controllers.
Reviewed-on: https://chromium-review.googlesource.com/172584
(cherry picked from commit 9c10a3074ef834688fea46c03551c2e3e54e44a8)

nyan: Initialize the PMIC.
Reviewed-on: https://chromium-review.googlesource.com/172585
(cherry picked from commit f6be8b0e607e05b73b5e4a84afcf04c879eee88a)

tegra124: add a chip.h and use it in NYAN
Reviewed-on: https://chromium-review.googlesource.com/172773
(cherry picked from commit 4dd5f1f091f2dcae5ce38203bb86c62994609f8f)

tegra: Reorder GPIO register accesses to avoid glitching
Reviewed-on: https://chromium-review.googlesource.com/172730
(cherry picked from commit 61bedbf0f839e19b284d21af2ad10f2ff15e17d5)

tegra: Turn GPIO wrappers into macros to make them easier to write
Reviewed-on: https://chromium-review.googlesource.com/172731
(cherry picked from commit 94550fdfa5a8005d2e6a313041de212ab7ac470c)

tegra: Change GPIO functions to allow variable arguments
Reviewed-on: https://chromium-review.googlesource.com/172916
(cherry picked from commit e95ccd984f718a04b6067ff6ad5049a2cd74466d)

tegra124: Implement starting up the main CPUs.
Reviewed-on: https://chromium-review.googlesource.com/172917
(cherry picked from commit 7c5169a197310e18a3df0f176c499669e3c2bda3)

tegra: Simplify the I2C constants.
Reviewed-on: https://chromium-review.googlesource.com/172953
(cherry picked from commit 130a07c86dfa5ba5ac4580f29db927c91f045c76)

tegra124: Fix SPI base addresses
Reviewed-on: https://chromium-review.googlesource.com/173322
(cherry picked from commit da808e46919ebd3b9f2377a5889f0d5f10b92357)

tegra124: Scrub the clock constants.
Reviewed-on: https://chromium-review.googlesource.com/172954
(cherry picked from commit 9305ff0696a6d556a97f928b8683770833a309a4)

tegra124: add DMA support
Reviewed-on: https://chromium-review.googlesource.com/172951
(cherry picked from commit 4d2a5a56b922ac37d2326d7b139697567aac37b8)

tegra124: add basic SPI driver
Reviewed-on: https://chromium-review.googlesource.com/172952
(cherry picked from commit 5f861f13c7fd2dd881f3cbd0f1b4d4a9994ce429)

tegra124: Add an assembly stub which is run first on the main CPUs.
Reviewed-on: https://chromium-review.googlesource.com/173541
(cherry picked from commit e142b9572a89f43fe984c4fc87e3203f380ff4de)

nyan: tegra124: Set up dynamic cbmem.
Reviewed-on: https://chromium-review.googlesource.com/173542
(cherry picked from commit b6e1a70103446abb5c3440f145617e6566879c6f)

tegra124: Add an soc.c which sets up the chip operations and memory resource.
Reviewed-on: https://chromium-review.googlesource.com/173543
(cherry picked from commit af49a5bd1f589cf053c4808510138aae26e20db4)

tegra124: extend chip.h to include video settings
Reviewed-on: https://chromium-review.googlesource.com/173600
(cherry picked from commit 87687633a2116f58fad7333b3b639cee9089ad29)

tegra124 and nyan: fill in the devicetree a bit more, add defines
Reviewed-on: https://chromium-review.googlesource.com/173684
(cherry picked from commit c107eaca3dea42be89f61690d0d6cb2181acb147)

tegra124: clean-ups for SPI driver
Reviewed-on: https://chromium-review.googlesource.com/173599
(cherry picked from commit 1e2f9fd442ea336bf0663c3c8ea51f771e21beb7)

tegra124: add a #define for DMA alignment size
Reviewed-on: https://chromium-review.googlesource.com/173638
(cherry picked from commit f9dc2a8d8016fa7db974fb6cb01c3275e26832af)

tegra124: Add FIFO transmit functions to SPI driver
Reviewed-on: https://chromium-review.googlesource.com/173639
(cherry picked from commit 97e61f36ad96ce2f9b12a7ef765ee73d3f4285f7)

tegra124: clean-ups for DMA driver
Reviewed-on: https://chromium-review.googlesource.com/173598
(cherry picked from commit 750c0a5d6942748dd21f3a3f884ad94a561e86e0)

tegra124: early display and display code.
Reviewed-on: https://chromium-review.googlesource.com/173622
(cherry picked from commit 651c7ab96b1f136865e4673a120de7afc1218558)

tegra124: Move transfer size handling to spi_xfer()
Reviewed-on: https://chromium-review.googlesource.com/173680
(cherry picked from commit 4a9b7b47b3c09d70063ea843054ffef98f554621)

tegra124: strict error detection and reporting for SPI
Reviewed-on: https://chromium-review.googlesource.com/173681
(cherry picked from commit c056fa954e1dab40a56faec6c50385763a2eb010)

tegra124: add thread-friendly delays to SPI driver
Reviewed-on: https://chromium-review.googlesource.com/173648
(cherry picked from commit c1a321c8f61942801627f895c5db74c518e2aa8e)

Tegra124: Take the SPI1 controller out of reset and enable its clock.
Reviewed-on: https://chromium-review.googlesource.com/173787
(cherry picked from commit c026a3fb861e157f1e17a121fc2ef70b903f36f2)

tegra124: add two more clock setting values
Reviewed-on: https://chromium-review.googlesource.com/173772
(cherry picked from commit 7d79d7dd9f0c1fd7127a7ba41652d809ccff7a57)

nyan: Set up the ChromeOS related GPIOs and SPI bus 1 which goes to the EC.
Reviewed-on: https://chromium-review.googlesource.com/173788
(cherry picked from commit ff172bfe30f75983a1e8efa2ead0a4519583d0a8)

tegra124: Add some stub functions to the Tegra SPI driver.
Reviewed-on: https://chromium-review.googlesource.com/173789
(cherry picked from commit 8bc527aa4afd301c046b0e844c7fa400630af0d2)

tegra124: Build source files into the various stges needed by CONFIG_CHROMEOS.
Reviewed-on: https://chromium-review.googlesource.com/173790
(cherry picked from commit 86a6423b668ca912295c47d8c6e3ef6c6f8c6084)

nyan: Implement the code which reads GPIOs for ChromeOS.
Reviewed-on: https://chromium-review.googlesource.com/173791
(cherry picked from commit 4c394dfbce762574fc79edcb6e4ac6bf346e48a3)

nyan: Enable the CHROMEOS and ChromeOS EC related kconfig options.
Reviewed-on: https://chromium-review.googlesource.com/173792
(cherry picked from commit 2845a4487159aa4b1dba58d977f52c449574fc8e)

Tegra124: SDMMC: Take the SDMMC 3 and 4 out of reset and ungate their clocks.
Reviewed-on: https://chromium-review.googlesource.com/173793
(cherry picked from commit c238b87bcd9d35afd828476d6ee88322ac5d0f88)

tegra124: fix clear_fifo_status() in SPI driver
Reviewed-on: https://chromium-review.googlesource.com/173738
(cherry picked from commit f415d2c0aaffc0f1a3592551a2db782d538f8f4f)

ARM: Include stdint.h in cpu.h.
Reviewed-on: https://chromium-review.googlesource.com/173774
(cherry picked from commit f1930faea3f14b2a2560a6c4058ef38532b6f1a6)

tegra124: When setting up the main CPU, set its CPSR appropriately.
Reviewed-on: https://chromium-review.googlesource.com/173775
(cherry picked from commit bc2ba9c15cfd22aeaca4f80b1d13a8b5e0178ead)

tegra124: fix wrong names in clk_rst.h
Reviewed-on: https://chromium-review.googlesource.com/173955
(cherry picked from commit 19dd9c85e4a3d1f77b23828bcbdd4bd8c2688b8d)

tegra124: Fix up the PLLX divider table.
Reviewed-on: https://chromium-review.googlesource.com/173778
(cherry picked from commit 3362cf3a7d6f5eaec879dda42323345922f6df17)

tegra124: clock: Get rid of cpcon and dccon.
Reviewed-on: https://chromium-review.googlesource.com/173779
(cherry picked from commit 08626ffac4a7e9ea3d4738af87e9e4cced7be2c7)

Tegra124: SPI: Set and unset CS in spi_claim_bus and spi_release_bus.
Reviewed-on: https://chromium-review.googlesource.com/173953
(cherry picked from commit a2df8f3a9c9c54c62d6ff37d3baff1d30ee6d355)

armv7: expose dcache_line_bytes() in cache API
Reviewed-on: https://chromium-review.googlesource.com/173975
(cherry picked from commit 6727f65702c7668fcb33848b4113bc3d3cc04e12)

libpayload: expose dcache_line_bytes() in ARM cache API
Reviewed-on: https://chromium-review.googlesource.com/174099
(cherry picked from commit 9387b02dff85b42944d95c3bccf59059c93fb4a9)

armv4: add a stub for dcache_line_bytes()
Reviewed-on: https://chromium-review.googlesource.com/173976
(cherry picked from commit 924f61ea895b9268c716791466637009bbac6469)

tegra124: Base early UART on CLK_M to enable debugging of PLL init code
Reviewed-on: https://chromium-review.googlesource.com/174339
(cherry picked from commit 8d9387432f0a0d9b257b040304238e543cced1aa)

tegra124: Add additional PLLs and redesign the divisor table
Reviewed-on: https://chromium-review.googlesource.com/174380
(cherry picked from commit f6a5f5c4562f1ca733505717c175be00413f2384)

Squashed 49 commits for tegra124/nyan that included a lot of churn on
different pieces.

Change-Id: I00e8f5b74e835e01b28ca2e9c4af3709c9363d56
Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com>
Reviewed-on: http://review.coreboot.org/6869
Tested-by: build bot (Jenkins)
Reviewed-by: David Hendricks <dhendrix@chromium.org>

5 files changed, 792 insertions, 267 deletions

diff --git a/src/soc/nvidia/tegra/dc.h b/src/soc/nvidia/tegra/dc.h
new file mode 100644
index 0000000000..33dbe53ff1
--- /dev/null
+++ b/src/soc/nvidia/tegra/dc.h
@@ -0,0 +1,564 @@
+/*
+ *  Copyright 2013 Google Inc.
+ *  (C) Copyright 2010
+ *  NVIDIA Corporation <www.nvidia.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef __SOC_NVIDIA_TEGRA_DC_H
+#define __SOC_NVIDIA_TEGRA_DC_H
+
+/* Register definitions for the Tegra display controller */
+
+/* CMD register 0x000 ~ 0x43 */
+struct dc_cmd_reg {
+	/* Address 0x000 ~ 0x002 */
+	u32 gen_incr_syncpt;		/* _CMD_GENERAL_INCR_SYNCPT_0 */
+	u32 gen_incr_syncpt_ctrl;	/* _CMD_GENERAL_INCR_SYNCPT_CNTRL_0 */
+	u32 gen_incr_syncpt_err;	/* _CMD_GENERAL_INCR_SYNCPT_ERROR_0 */
+
+	u32 reserved0[5];		/* reserved_0[5] */
+
+	/* Address 0x008 ~ 0x00a */
+	u32 win_a_incr_syncpt;		/* _CMD_WIN_A_INCR_SYNCPT_0 */
+	u32 win_a_incr_syncpt_ctrl;	/* _CMD_WIN_A_INCR_SYNCPT_CNTRL_0 */
+	u32 win_a_incr_syncpt_err;	/* _CMD_WIN_A_INCR_SYNCPT_ERROR_0 */
+
+	u32 reserved1[5];		/* reserved_1[5] */
+
+	/* Address 0x010 ~ 0x012 */
+	u32 win_b_incr_syncpt;		/* _CMD_WIN_B_INCR_SYNCPT_0 */
+	u32 win_b_incr_syncpt_ctrl;	/* _CMD_WIN_B_INCR_SYNCPT_CNTRL_0 */
+	u32 win_b_incr_syncpt_err;	/* _CMD_WIN_B_INCR_SYNCPT_ERROR_0 */
+
+	u32 reserved2[5];		/* reserved_2[5] */
+
+	/* Address 0x018 ~ 0x01a */
+	u32 win_c_incr_syncpt;		/* _CMD_WIN_C_INCR_SYNCPT_0 */
+	u32 win_c_incr_syncpt_ctrl;	/* _CMD_WIN_C_INCR_SYNCPT_CNTRL_0 */
+	u32 win_c_incr_syncpt_err;	/* _CMD_WIN_C_INCR_SYNCPT_ERROR_0 */
+
+	u32 reserved3[13];		/* reserved_3[13] */
+
+	/* Address 0x028 */
+	u32 cont_syncpt_vsync;		/* _CMD_CONT_SYNCPT_VSYNC_0 */
+
+	u32 reserved4[7];		/* reserved_4[7] */
+
+	/* Address 0x030 ~ 0x033 */
+	u32 ctxsw;			/* _CMD_CTXSW_0 */
+	u32 disp_cmd_opt0;		/* _CMD_DISPLAY_COMMAND_OPTION0_0 */
+	u32 disp_cmd;			/* _CMD_DISPLAY_COMMAND_0 */
+	u32 sig_raise;			/* _CMD_SIGNAL_RAISE_0 */
+
+	u32 reserved5[2];		/* reserved_0[2] */
+
+	/* Address 0x036 ~ 0x03e */
+	u32 disp_pow_ctrl;		/* _CMD_DISPLAY_POWER_CONTROL_0 */
+	u32 int_stat;			/* _CMD_INT_STATUS_0 */
+	u32 int_mask;			/* _CMD_INT_MASK_0 */
+	u32 int_enb;			/* _CMD_INT_ENABLE_0 */
+	u32 int_type;			/* _CMD_INT_TYPE_0 */
+	u32 int_polarity;		/* _CMD_INT_POLARITY_0 */
+	u32 sig_raise1;		/* _CMD_SIGNAL_RAISE1_0 */
+	u32 sig_raise2;		/* _CMD_SIGNAL_RAISE2_0 */
+	u32 sig_raise3;		/* _CMD_SIGNAL_RAISE3_0 */
+
+	u32 reserved6;			/* reserved_6 */
+
+	/* Address 0x040 ~ 0x043 */
+	u32 state_access;		/* _CMD_STATE_ACCESS_0 */
+	u32 state_ctrl;		/* _CMD_STATE_CONTROL_0 */
+	u32 disp_win_header;		/* _CMD_DISPLAY_WINDOW_HEADER_0 */
+	u32 reg_act_ctrl;		/* _CMD_REG_ACT_CONTROL_0 */
+};
+
+enum {
+	PIN_REG_COUNT		= 4,
+	PIN_OUTPUT_SEL_COUNT	= 7,
+};
+
+/* COM register 0x300 ~ 0x329 */
+struct dc_com_reg {
+	/* Address 0x300 ~ 0x301 */
+	u32 crc_ctrl;			/* _COM_CRC_CONTROL_0 */
+	u32 crc_checksum;		/* _COM_CRC_CHECKSUM_0 */
+
+	/* _COM_PIN_OUTPUT_ENABLE0/1/2/3_0: Address 0x302 ~ 0x305 */
+	u32 pin_output_enb[PIN_REG_COUNT];
+
+	/* _COM_PIN_OUTPUT_POLARITY0/1/2/3_0: Address 0x306 ~ 0x309 */
+	u32 pin_output_polarity[PIN_REG_COUNT];
+
+	/* _COM_PIN_OUTPUT_DATA0/1/2/3_0: Address 0x30a ~ 0x30d */
+	u32 pin_output_data[PIN_REG_COUNT];
+
+	/* _COM_PIN_INPUT_ENABLE0_0: Address 0x30e ~ 0x311 */
+	u32 pin_input_enb[PIN_REG_COUNT];
+
+	/* Address 0x312 ~ 0x313 */
+	u32 pin_input_data0;		/* _COM_PIN_INPUT_DATA0_0 */
+	u32 pin_input_data1;		/* _COM_PIN_INPUT_DATA1_0 */
+
+	/* _COM_PIN_OUTPUT_SELECT0/1/2/3/4/5/6_0: Address 0x314 ~ 0x31a */
+	u32 pin_output_sel[PIN_OUTPUT_SEL_COUNT];
+
+	/* Address 0x31b ~ 0x329 */
+	u32 pin_misc_ctrl;		/* _COM_PIN_MISC_CONTROL_0 */
+	u32 pm0_ctrl;			/* _COM_PM0_CONTROL_0 */
+	u32 pm0_duty_cycle;		/* _COM_PM0_DUTY_CYCLE_0 */
+	u32 pm1_ctrl;			/* _COM_PM1_CONTROL_0 */
+	u32 pm1_duty_cycle;		/* _COM_PM1_DUTY_CYCLE_0 */
+	u32 spi_ctrl;			/* _COM_SPI_CONTROL_0 */
+	u32 spi_start_byte;		/* _COM_SPI_START_BYTE_0 */
+	u32 hspi_wr_data_ab;		/* _COM_HSPI_WRITE_DATA_AB_0 */
+	u32 hspi_wr_data_cd;		/* _COM_HSPI_WRITE_DATA_CD */
+	u32 hspi_cs_dc;		/* _COM_HSPI_CS_DC_0 */
+	u32 scratch_reg_a;		/* _COM_SCRATCH_REGISTER_A_0 */
+	u32 scratch_reg_b;		/* _COM_SCRATCH_REGISTER_B_0 */
+	u32 gpio_ctrl;			/* _COM_GPIO_CTRL_0 */
+	u32 gpio_debounce_cnt;		/* _COM_GPIO_DEBOUNCE_COUNTER_0 */
+	u32 crc_checksum_latched;	/* _COM_CRC_CHECKSUM_LATCHED_0 */
+};
+
+enum dc_disp_h_pulse_pos {
+	H_PULSE0_POSITION_A,
+	H_PULSE0_POSITION_B,
+	H_PULSE0_POSITION_C,
+	H_PULSE0_POSITION_D,
+	H_PULSE0_POSITION_COUNT,
+};
+
+struct _disp_h_pulse {
+	/* _DISP_H_PULSE0/1/2_CONTROL_0 */
+	u32 h_pulse_ctrl;
+	/* _DISP_H_PULSE0/1/2_POSITION_A/B/C/D_0 */
+	u32 h_pulse_pos[H_PULSE0_POSITION_COUNT];
+};
+
+enum dc_disp_v_pulse_pos {
+	V_PULSE0_POSITION_A,
+	V_PULSE0_POSITION_B,
+	V_PULSE0_POSITION_C,
+	V_PULSE0_POSITION_COUNT,
+};
+
+struct _disp_v_pulse0 {
+	/* _DISP_H_PULSE0/1_CONTROL_0 */
+	u32 v_pulse_ctrl;
+	/* _DISP_H_PULSE0/1_POSITION_A/B/C_0 */
+	u32 v_pulse_pos[V_PULSE0_POSITION_COUNT];
+};
+
+struct _disp_v_pulse2 {
+	/* _DISP_H_PULSE2/3_CONTROL_0 */
+	u32 v_pulse_ctrl;
+	/* _DISP_H_PULSE2/3_POSITION_A_0 */
+	u32 v_pulse_pos_a;
+};
+
+enum dc_disp_h_pulse_reg {
+	H_PULSE0,
+	H_PULSE1,
+	H_PULSE2,
+	H_PULSE_COUNT,
+};
+
+enum dc_disp_pp_select {
+	PP_SELECT_A,
+	PP_SELECT_B,
+	PP_SELECT_C,
+	PP_SELECT_D,
+	PP_SELECT_COUNT,
+};
+
+/* DISP register 0x400 ~ 0x4c1 */
+struct dc_disp_reg {
+	/* Address 0x400 ~ 0x40a */
+	u32 disp_signal_opt0;		/* _DISP_DISP_SIGNAL_OPTIONS0_0 */
+	u32 disp_signal_opt1;		/* _DISP_DISP_SIGNAL_OPTIONS1_0 */
+	u32 disp_win_opt;		/* _DISP_DISP_WIN_OPTIONS_0 */
+	u32 mem_high_pri;		/* _DISP_MEM_HIGH_PRIORITY_0 */
+	u32 mem_high_pri_timer;	/* _DISP_MEM_HIGH_PRIORITY_TIMER_0 */
+	u32 disp_timing_opt;		/* _DISP_DISP_TIMING_OPTIONS_0 */
+	u32 ref_to_sync;		/* _DISP_REF_TO_SYNC_0 */
+	u32 sync_width;		/* _DISP_SYNC_WIDTH_0 */
+	u32 back_porch;		/* _DISP_BACK_PORCH_0 */
+	u32 disp_active;		/* _DISP_DISP_ACTIVE_0 */
+	u32 front_porch;		/* _DISP_FRONT_PORCH_0 */
+
+	/* Address 0x40b ~ 0x419: _DISP_H_PULSE0/1/2_  */
+	struct _disp_h_pulse h_pulse[H_PULSE_COUNT];
+
+	/* Address 0x41a ~ 0x421 */
+	struct _disp_v_pulse0 v_pulse0;	/* _DISP_V_PULSE0_ */
+	struct _disp_v_pulse0 v_pulse1;	/* _DISP_V_PULSE1_ */
+
+	/* Address 0x422 ~ 0x425 */
+	struct _disp_v_pulse2 v_pulse3;	/* _DISP_V_PULSE2_ */
+	struct _disp_v_pulse2 v_pulse4;	/* _DISP_V_PULSE3_ */
+
+	/* Address 0x426 ~ 0x429 */
+	u32 m0_ctrl;			/* _DISP_M0_CONTROL_0 */
+	u32 m1_ctrl;			/* _DISP_M1_CONTROL_0 */
+	u32 di_ctrl;			/* _DISP_DI_CONTROL_0 */
+	u32 pp_ctrl;			/* _DISP_PP_CONTROL_0 */
+
+	/* Address 0x42a ~ 0x42d: _DISP_PP_SELECT_A/B/C/D_0 */
+	u32 pp_select[PP_SELECT_COUNT];
+
+	/* Address 0x42e ~ 0x435 */
+	u32 disp_clk_ctrl;		/* _DISP_DISP_CLOCK_CONTROL_0 */
+	u32 disp_interface_ctrl;	/* _DISP_DISP_INTERFACE_CONTROL_0 */
+	u32 disp_color_ctrl;		/* _DISP_DISP_COLOR_CONTROL_0 */
+	u32 shift_clk_opt;		/* _DISP_SHIFT_CLOCK_OPTIONS_0 */
+	u32 data_enable_opt;		/* _DISP_DATA_ENABLE_OPTIONS_0 */
+	u32 serial_interface_opt;	/* _DISP_SERIAL_INTERFACE_OPTIONS_0 */
+	u32 lcd_spi_opt;		/* _DISP_LCD_SPI_OPTIONS_0 */
+	u32 border_color;		/* _DISP_BORDER_COLOR_0 */
+
+	/* Address 0x436 ~ 0x439 */
+	u32 color_key0_lower;		/* _DISP_COLOR_KEY0_LOWER_0 */
+	u32 color_key0_upper;		/* _DISP_COLOR_KEY0_UPPER_0 */
+	u32 color_key1_lower;		/* _DISP_COLOR_KEY1_LOWER_0 */
+	u32 color_key1_upper;		/* _DISP_COLOR_KEY1_UPPER_0 */
+
+	u32 reserved0[2];		/* reserved_0[2] */
+
+	/* Address 0x43c ~ 0x442 */
+	u32 cursor_foreground;		/* _DISP_CURSOR_FOREGROUND_0 */
+	u32 cursor_background;		/* _DISP_CURSOR_BACKGROUND_0 */
+	u32 cursor_start_addr;		/* _DISP_CURSOR_START_ADDR_0 */
+	u32 cursor_start_addr_ns;	/* _DISP_CURSOR_START_ADDR_NS_0 */
+	u32 cursor_pos;		/* _DISP_CURSOR_POSITION_0 */
+	u32 cursor_pos_ns;		/* _DISP_CURSOR_POSITION_NS_0 */
+	u32 seq_ctrl;			/* _DISP_INIT_SEQ_CONTROL_0 */
+
+	/* Address 0x442 ~ 0x446 */
+	u32 spi_init_seq_data_a;	/* _DISP_SPI_INIT_SEQ_DATA_A_0 */
+	u32 spi_init_seq_data_b;	/* _DISP_SPI_INIT_SEQ_DATA_B_0 */
+	u32 spi_init_seq_data_c;	/* _DISP_SPI_INIT_SEQ_DATA_C_0 */
+	u32 spi_init_seq_data_d;	/* _DISP_SPI_INIT_SEQ_DATA_D_0 */
+
+	u32 reserved1[0x39];		/* reserved1[0x39], */
+
+	/* Address 0x480 ~ 0x484 */
+	u32 dc_mccif_fifoctrl;		/* _DISP_DC_MCCIF_FIFOCTRL_0 */
+	u32 mccif_disp0a_hyst;		/* _DISP_MCCIF_DISPLAY0A_HYST_0 */
+	u32 mccif_disp0b_hyst;		/* _DISP_MCCIF_DISPLAY0B_HYST_0 */
+	u32 mccif_disp0c_hyst;		/* _DISP_MCCIF_DISPLAY0C_HYST_0 */
+	u32 mccif_disp1b_hyst;		/* _DISP_MCCIF_DISPLAY1B_HYST_0 */
+
+	u32 reserved2[0x3b];		/* reserved2[0x3b] */
+
+	/* Address 0x4c0 ~ 0x4c1 */
+	u32 dac_crt_ctrl;		/* _DISP_DAC_CRT_CTRL_0 */
+	u32 disp_misc_ctrl;		/* _DISP_DISP_MISC_CONTROL_0 */
+};
+
+enum dc_winc_filter_p {
+	WINC_FILTER_COUNT	= 0x10,
+};
+
+/* Window A/B/C register 0x500 ~ 0x628 */
+struct dc_winc_reg {
+
+	/* Address 0x500 */
+	u32 color_palette;		/* _WINC_COLOR_PALETTE_0 */
+
+	u32 reserved0[0xff];		/* reserved_0[0xff] */
+
+	/* Address 0x600 */
+	u32 palette_color_ext;		/* _WINC_PALETTE_COLOR_EXT_0 */
+
+	/* _WINC_H_FILTER_P00~0F_0 */
+	/* Address 0x601 ~ 0x610 */
+	u32 h_filter_p[WINC_FILTER_COUNT];
+
+	/* Address 0x611 ~ 0x618 */
+	u32 csc_yof;			/* _WINC_CSC_YOF_0 */
+	u32 csc_kyrgb;			/* _WINC_CSC_KYRGB_0 */
+	u32 csc_kur;			/* _WINC_CSC_KUR_0 */
+	u32 csc_kvr;			/* _WINC_CSC_KVR_0 */
+	u32 csc_kug;			/* _WINC_CSC_KUG_0 */
+	u32 csc_kvg;			/* _WINC_CSC_KVG_0 */
+	u32 csc_kub;			/* _WINC_CSC_KUB_0 */
+	u32 csc_kvb;			/* _WINC_CSC_KVB_0 */
+
+	/* Address 0x619 ~ 0x628: _WINC_V_FILTER_P00~0F_0 */
+	u32 v_filter_p[WINC_FILTER_COUNT];
+};
+
+/* WIN A/B/C Register 0x700 ~ 0x714*/
+struct dc_win_reg {
+	/* Address 0x700 ~ 0x714 */
+	u32 win_opt;			/* _WIN_WIN_OPTIONS_0 */
+	u32 byte_swap;			/* _WIN_BYTE_SWAP_0 */
+	u32 buffer_ctrl;		/* _WIN_BUFFER_CONTROL_0 */
+	u32 color_depth;		/* _WIN_COLOR_DEPTH_0 */
+	u32 pos;			/* _WIN_POSITION_0 */
+	u32 size;			/* _WIN_SIZE_0 */
+	u32 prescaled_size;		/* _WIN_PRESCALED_SIZE_0 */
+	u32 h_initial_dda;		/* _WIN_H_INITIAL_DDA_0 */
+	u32 v_initial_dda;		/* _WIN_V_INITIAL_DDA_0 */
+	u32 dda_increment;		/* _WIN_DDA_INCREMENT_0 */
+	u32 line_stride;		/* _WIN_LINE_STRIDE_0 */
+	u32 buf_stride;		/* _WIN_BUF_STRIDE_0 */
+	u32 uv_buf_stride;		/* _WIN_UV_BUF_STRIDE_0 */
+	u32 buffer_addr_mode;		/* _WIN_BUFFER_ADDR_MODE_0 */
+	u32 dv_ctrl;			/* _WIN_DV_CONTROL_0 */
+	u32 blend_nokey;		/* _WIN_BLEND_NOKEY_0 */
+	u32 blend_1win;		/* _WIN_BLEND_1WIN_0 */
+	u32 blend_2win_x;		/* _WIN_BLEND_2WIN_X_0 */
+	u32 blend_2win_y;		/* _WIN_BLEND_2WIN_Y_0 */
+	u32 blend_3win_xy;		/* _WIN_BLEND_3WIN_XY_0 */
+	u32 hp_fetch_ctrl;		/* _WIN_HP_FETCH_CONTROL_0 */
+};
+
+/* WINBUF A/B/C Register 0x800 ~ 0x80a */
+struct dc_winbuf_reg {
+	/* Address 0x800 ~ 0x80a */
+	u32 start_addr;		/* _WINBUF_START_ADDR_0 */
+	u32 start_addr_ns;		/* _WINBUF_START_ADDR_NS_0 */
+	u32 start_addr_u;		/* _WINBUF_START_ADDR_U_0 */
+	u32 start_addr_u_ns;		/* _WINBUF_START_ADDR_U_NS_0 */
+	u32 start_addr_v;		/* _WINBUF_START_ADDR_V_0 */
+	u32 start_addr_v_ns;		/* _WINBUF_START_ADDR_V_NS_0 */
+	u32 addr_h_offset;		/* _WINBUF_ADDR_H_OFFSET_0 */
+	u32 addr_h_offset_ns;		/* _WINBUF_ADDR_H_OFFSET_NS_0 */
+	u32 addr_v_offset;		/* _WINBUF_ADDR_V_OFFSET_0 */
+	u32 addr_v_offset_ns;		/* _WINBUF_ADDR_V_OFFSET_NS_0 */
+	u32 uflow_status;		/* _WINBUF_UFLOW_STATUS_0 */
+};
+
+/* Display Controller (DC_) regs */
+struct display_controller {
+	struct dc_cmd_reg cmd;		/* CMD register 0x000 ~ 0x43 */
+	u32 reserved0[0x2bc];
+
+	struct dc_com_reg com;		/* COM register 0x300 ~ 0x329 */
+	u32 reserved1[0xd6];
+
+	struct dc_disp_reg disp;	/* DISP register 0x400 ~ 0x4c1 */
+	u32 reserved2[0x3e];
+
+	struct dc_winc_reg winc;	/* Window A/B/C 0x500 ~ 0x628 */
+	u32 reserved3[0xd7];
+
+	struct dc_win_reg win;		/* WIN A/B/C 0x700 ~ 0x714*/
+	u32 reserved4[0xeb];
+
+	struct dc_winbuf_reg winbuf;	/* WINBUF A/B/C 0x800 ~ 0x80a */
+};
+
+#define BIT(pos)	(1U << pos)
+
+/* DC_CMD_DISPLAY_COMMAND 0x032 */
+#define CTRL_MODE_SHIFT		5
+#define CTRL_MODE_MASK		(0x3 << CTRL_MODE_SHIFT)
+enum {
+	CTRL_MODE_STOP,
+	CTRL_MODE_C_DISPLAY,
+	CTRL_MODE_NC_DISPLAY,
+};
+
+/* _WIN_COLOR_DEPTH_0 */
+enum win_color_depth_id {
+	COLOR_DEPTH_P1,
+	COLOR_DEPTH_P2,
+	COLOR_DEPTH_P4,
+	COLOR_DEPTH_P8,
+	COLOR_DEPTH_B4G4R4A4,
+	COLOR_DEPTH_B5G5R5A,
+	COLOR_DEPTH_B5G6R5,
+	COLOR_DEPTH_AB5G5R5,
+	COLOR_DEPTH_B8G8R8A8 = 12,
+	COLOR_DEPTH_R8G8B8A8,
+	COLOR_DEPTH_B6x2G6x2R6x2A8,
+	COLOR_DEPTH_R6x2G6x2B6x2A8,
+	COLOR_DEPTH_YCbCr422,
+	COLOR_DEPTH_YUV422,
+	COLOR_DEPTH_YCbCr420P,
+	COLOR_DEPTH_YUV420P,
+	COLOR_DEPTH_YCbCr422P,
+	COLOR_DEPTH_YUV422P,
+	COLOR_DEPTH_YCbCr422R,
+	COLOR_DEPTH_YUV422R,
+	COLOR_DEPTH_YCbCr422RA,
+	COLOR_DEPTH_YUV422RA,
+};
+
+/* DC_CMD_DISPLAY_POWER_CONTROL 0x036 */
+#define PW0_ENABLE		BIT(0)
+#define PW1_ENABLE		BIT(2)
+#define PW2_ENABLE		BIT(4)
+#define PW3_ENABLE		BIT(6)
+#define PW4_ENABLE		BIT(8)
+#define PM0_ENABLE		BIT(16)
+#define PM1_ENABLE		BIT(18)
+#define SPI_ENABLE		BIT(24)
+#define HSPI_ENABLE		BIT(25)
+
+/* DC_CMD_STATE_CONTROL 0x041 */
+#define GENERAL_ACT_REQ		BIT(0)
+#define WIN_A_ACT_REQ		BIT(1)
+#define WIN_B_ACT_REQ		BIT(2)
+#define WIN_C_ACT_REQ		BIT(3)
+#define GENERAL_UPDATE		BIT(8)
+#define WIN_A_UPDATE		BIT(9)
+#define WIN_B_UPDATE		BIT(10)
+#define WIN_C_UPDATE		BIT(11)
+
+/* DC_CMD_DISPLAY_WINDOW_HEADER 0x042 */
+#define WINDOW_A_SELECT		BIT(4)
+#define WINDOW_B_SELECT		BIT(5)
+#define WINDOW_C_SELECT		BIT(6)
+
+/* DC_DISP_DISP_CLOCK_CONTROL 0x42e */
+#define SHIFT_CLK_DIVIDER_SHIFT	0
+#define SHIFT_CLK_DIVIDER_MASK	(0xff << SHIFT_CLK_DIVIDER_SHIFT)
+#define	PIXEL_CLK_DIVIDER_SHIFT	8
+#define	PIXEL_CLK_DIVIDER_MSK	(0xf << PIXEL_CLK_DIVIDER_SHIFT)
+enum {
+	PIXEL_CLK_DIVIDER_PCD1,
+	PIXEL_CLK_DIVIDER_PCD1H,
+	PIXEL_CLK_DIVIDER_PCD2,
+	PIXEL_CLK_DIVIDER_PCD3,
+	PIXEL_CLK_DIVIDER_PCD4,
+	PIXEL_CLK_DIVIDER_PCD6,
+	PIXEL_CLK_DIVIDER_PCD8,
+	PIXEL_CLK_DIVIDER_PCD9,
+	PIXEL_CLK_DIVIDER_PCD12,
+	PIXEL_CLK_DIVIDER_PCD16,
+	PIXEL_CLK_DIVIDER_PCD18,
+	PIXEL_CLK_DIVIDER_PCD24,
+	PIXEL_CLK_DIVIDER_PCD13,
+};
+
+/* DC_DISP_DISP_INTERFACE_CONTROL 0x42f */
+#define DATA_FORMAT_SHIFT	0
+#define DATA_FORMAT_MASK	(0xf << DATA_FORMAT_SHIFT)
+enum {
+	DATA_FORMAT_DF1P1C,
+	DATA_FORMAT_DF1P2C24B,
+	DATA_FORMAT_DF1P2C18B,
+	DATA_FORMAT_DF1P2C16B,
+	DATA_FORMAT_DF2S,
+	DATA_FORMAT_DF3S,
+	DATA_FORMAT_DFSPI,
+	DATA_FORMAT_DF1P3C24B,
+	DATA_FORMAT_DF1P3C18B,
+};
+#define DATA_ALIGNMENT_SHIFT	8
+enum {
+	DATA_ALIGNMENT_MSB,
+	DATA_ALIGNMENT_LSB,
+};
+#define DATA_ORDER_SHIFT	9
+enum {
+	DATA_ORDER_RED_BLUE,
+	DATA_ORDER_BLUE_RED,
+};
+
+/* DC_DISP_DATA_ENABLE_OPTIONS 0x432 */
+#define DE_SELECT_SHIFT		0
+#define DE_SELECT_MASK		(0x3 << DE_SELECT_SHIFT)
+#define DE_SELECT_ACTIVE_BLANK	0x0
+#define DE_SELECT_ACTIVE	0x1
+#define DE_SELECT_ACTIVE_IS	0x2
+#define DE_CONTROL_SHIFT	2
+#define DE_CONTROL_MASK		(0x7 << DE_CONTROL_SHIFT)
+enum {
+	DE_CONTROL_ONECLK,
+	DE_CONTROL_NORMAL,
+	DE_CONTROL_EARLY_EXT,
+	DE_CONTROL_EARLY,
+	DE_CONTROL_ACTIVE_BLANK,
+};
+
+/* DC_WIN_WIN_OPTIONS 0x700 */
+#define H_DIRECTION		BIT(0)
+enum {
+	H_DIRECTION_INCREMENT,
+	H_DIRECTION_DECREMENT,
+};
+#define V_DIRECTION		BIT(2)
+enum {
+	V_DIRECTION_INCREMENT,
+	V_DIRECTION_DECREMENT,
+};
+#define COLOR_EXPAND		BIT(6)
+#define CP_ENABLE		BIT(16)
+#define DV_ENABLE		BIT(20)
+#define WIN_ENABLE		BIT(30)
+
+/* DC_WIN_BYTE_SWAP 0x701 */
+#define BYTE_SWAP_SHIFT		0
+#define BYTE_SWAP_MASK		(3 << BYTE_SWAP_SHIFT)
+enum {
+	BYTE_SWAP_NOSWAP,
+	BYTE_SWAP_SWAP2,
+	BYTE_SWAP_SWAP4,
+	BYTE_SWAP_SWAP4HW
+};
+
+/* DC_WIN_POSITION 0x704 */
+#define H_POSITION_SHIFT	0
+#define H_POSITION_MASK		(0x1FFF << H_POSITION_SHIFT)
+#define V_POSITION_SHIFT	16
+#define V_POSITION_MASK		(0x1FFF << V_POSITION_SHIFT)
+
+/* DC_WIN_SIZE 0x705 */
+#define H_SIZE_SHIFT		0
+#define H_SIZE_MASK		(0x1FFF << H_SIZE_SHIFT)
+#define V_SIZE_SHIFT		16
+#define V_SIZE_MASK		(0x1FFF << V_SIZE_SHIFT)
+
+/* DC_WIN_PRESCALED_SIZE 0x706 */
+#define H_PRESCALED_SIZE_SHIFT	0
+#define H_PRESCALED_SIZE_MASK	(0x7FFF << H_PRESCALED_SIZE)
+#define V_PRESCALED_SIZE_SHIFT	16
+#define V_PRESCALED_SIZE_MASK	(0x1FFF << V_PRESCALED_SIZE)
+
+/* DC_WIN_DDA_INCREMENT 0x709 */
+#define H_DDA_INC_SHIFT		0
+#define H_DDA_INC_MASK		(0xFFFF << H_DDA_INC_SHIFT)
+#define V_DDA_INC_SHIFT		16
+#define V_DDA_INC_MASK		(0xFFFF << V_DDA_INC_SHIFT)
+
+/* This holds information about a window which can be displayed */
+/* TODO: do we really need this for basic setup? Not sure yet. */
+struct disp_ctl_win {
+	enum win_color_depth_id fmt;	/* Color depth/format */
+	u32	bpp;		/* Bits per pixel */
+	u32	phys_addr;	/* Physical address in memory */
+	u32	x;		/* Horizontal address offset (bytes) */
+	u32	y;		/* Veritical address offset (bytes) */
+	u32	w;		/* Width of source window */
+	u32	h;		/* Height of source window */
+	u32	stride;		/* Number of bytes per line */
+	u32	out_x;		/* Left edge of output window (col) */
+	u32	out_y;		/* Top edge of output window (row) */
+	u32	out_w;		/* Width of output window in pixels */
+	u32	out_h;		/* Height of output window in pixels */
+};
+
+void display_startup(device_t dev);
+#endif /* __SOC_NVIDIA_TEGRA_DC_H */
diff --git a/src/soc/nvidia/tegra/gpio.c b/src/soc/nvidia/tegra/gpio.c
index d4b5bddd49..06153203b7 100644
--- a/src/soc/nvidia/tegra/gpio.c
+++ b/src/soc/nvidia/tegra/gpio.c
@@ -26,41 +26,25 @@
 #include "gpio.h"
 #include "pinmux.h"
 
-static void gpio_input_common(int gpio_index, int pinmux_index,
-			      uint32_t pconfig)
+void __gpio_input(gpio_t gpio, u32 pull)
 {
-	pconfig |= PINMUX_INPUT_ENABLE;
-	gpio_set_int_enable(gpio_index, 0);
-	gpio_set_mode(gpio_index, GPIO_MODE_GPIO);
-	gpio_set_out_enable(gpio_index, 0);
-	pinmux_set_config(pinmux_index, pconfig);
-}
-
-void gpio_input(int gpio_index, int pinmux_index)
-{
-	gpio_input_common(gpio_index, pinmux_index, PINMUX_PULL_NONE);
-}
+	u32 pinmux_config = PINMUX_INPUT_ENABLE | PINMUX_TRISTATE | pull;
 
-void gpio_input_pullup(int gpio_index, int pinmux_index)
-{
-	gpio_input_common(gpio_index, pinmux_index, PINMUX_PULL_UP);
-}
-
-void gpio_input_pulldown(int gpio_index, int pinmux_index)
-{
-	gpio_input_common(gpio_index, pinmux_index, PINMUX_PULL_DOWN);
+	gpio_set_int_enable(gpio, 0);
+	gpio_set_out_enable(gpio, 0);
+	gpio_set_mode(gpio, GPIO_MODE_GPIO);
+	pinmux_set_config(gpio >> GPIO_PINMUX_SHIFT, pinmux_config);
 }
 
-void gpio_output(int gpio_index, int pinmux_index, int value)
+void gpio_output(gpio_t gpio, int value)
 {
-	uint32_t pconfig = PINMUX_PULL_NONE;
+	/* TODO: Set OPEN_DRAIN based on what pin it is? */
 
-	pinmux_set_config(pinmux_index, pconfig | PINMUX_TRISTATE);
-	gpio_set_int_enable(gpio_index, 0);
-	gpio_set_mode(gpio_index, GPIO_MODE_GPIO);
-	gpio_set_out_enable(gpio_index, 1);
-	gpio_set_out_value(gpio_index, value);
-	pinmux_set_config(pinmux_index, pconfig);
+	gpio_set_int_enable(gpio, 0);
+	gpio_set_out_value(gpio, value);
+	gpio_set_out_enable(gpio, 1);
+	gpio_set_mode(gpio, GPIO_MODE_GPIO);
+	pinmux_set_config(gpio >> GPIO_PINMUX_SHIFT, PINMUX_PULL_NONE);
 }
 
 enum {
@@ -74,167 +58,173 @@ enum {
 
 struct gpio_bank {
 	// Values
-	uint32_t config[GPIO_PORTS_PER_BANK];
-	uint32_t out_enable[GPIO_PORTS_PER_BANK];
-	uint32_t out_value[GPIO_PORTS_PER_BANK];
-	uint32_t in_value[GPIO_PORTS_PER_BANK];
-	uint32_t int_status[GPIO_PORTS_PER_BANK];
-	uint32_t int_enable[GPIO_PORTS_PER_BANK];
-	uint32_t int_level[GPIO_PORTS_PER_BANK];
-	uint32_t int_clear[GPIO_PORTS_PER_BANK];
+	u32 config[GPIO_PORTS_PER_BANK];
+	u32 out_enable[GPIO_PORTS_PER_BANK];
+	u32 out_value[GPIO_PORTS_PER_BANK];
+	u32 in_value[GPIO_PORTS_PER_BANK];
+	u32 int_status[GPIO_PORTS_PER_BANK];
+	u32 int_enable[GPIO_PORTS_PER_BANK];
+	u32 int_level[GPIO_PORTS_PER_BANK];
+	u32 int_clear[GPIO_PORTS_PER_BANK];
 
 	// Masks
-	uint32_t config_mask[GPIO_PORTS_PER_BANK];
-	uint32_t out_enable_mask[GPIO_PORTS_PER_BANK];
-	uint32_t out_value_mask[GPIO_PORTS_PER_BANK];
-	uint32_t in_value_mask[GPIO_PORTS_PER_BANK];
-	uint32_t int_status_mask[GPIO_PORTS_PER_BANK];
-	uint32_t int_enable_mask[GPIO_PORTS_PER_BANK];
-	uint32_t int_level_mask[GPIO_PORTS_PER_BANK];
-	uint32_t int_clear_mask[GPIO_PORTS_PER_BANK];
+	u32 config_mask[GPIO_PORTS_PER_BANK];
+	u32 out_enable_mask[GPIO_PORTS_PER_BANK];
+	u32 out_value_mask[GPIO_PORTS_PER_BANK];
+	u32 in_value_mask[GPIO_PORTS_PER_BANK];
+	u32 int_status_mask[GPIO_PORTS_PER_BANK];
+	u32 int_enable_mask[GPIO_PORTS_PER_BANK];
+	u32 int_level_mask[GPIO_PORTS_PER_BANK];
+	u32 int_clear_mask[GPIO_PORTS_PER_BANK];
 };
 
 static const struct gpio_bank *gpio_banks = (void *)TEGRA_GPIO_BASE;
 
-static uint32_t gpio_read_port(int index, size_t offset)
+static u32 gpio_read_port(int index, size_t offset)
 {
 	int bank = index / GPIO_GPIOS_PER_BANK;
 	int port = (index - bank * GPIO_GPIOS_PER_BANK) / GPIO_GPIOS_PER_PORT;
 
-	return read32((uint8_t *)&gpio_banks[bank] + offset +
-		      port * sizeof(uint32_t));
+	return read32((u8 *)&gpio_banks[bank] + offset +
+		      port * sizeof(u32));
 }
 
-static void gpio_write_port(int index, size_t offset,
-			    uint32_t mask, uint32_t value)
+static void gpio_write_port(int index, size_t offset, u32 mask, u32 value)
 {
 	int bank = index / GPIO_GPIOS_PER_BANK;
 	int port = (index - bank * GPIO_GPIOS_PER_BANK) / GPIO_GPIOS_PER_PORT;
 
-	uint32_t reg = read32((uint8_t *)&gpio_banks[bank] + offset +
-			      port * sizeof(uint32_t));
-	uint32_t new_reg = (reg & ~mask) | (value & mask);
+	u32 reg = read32((u8 *)&gpio_banks[bank] + offset +
+			      port * sizeof(u32));
+	u32 new_reg = (reg & ~mask) | (value & mask);
 
 	if (new_reg != reg) {
-		write32(new_reg, (uint8_t *)&gpio_banks[bank] + offset +
-			port * sizeof(uint32_t));
+		write32(new_reg, (u8 *)&gpio_banks[bank] + offset +
+			port * sizeof(u32));
 	}
 }
 
-void gpio_set_mode(int gpio_index, enum gpio_mode mode)
+void gpio_set_mode(gpio_t gpio, enum gpio_mode mode)
 {
-	int bit = gpio_index % GPIO_GPIOS_PER_PORT;
-	gpio_write_port(gpio_index, offsetof(struct gpio_bank, config),
+	int bit = gpio % GPIO_GPIOS_PER_PORT;
+	gpio_write_port(gpio & ((1 << GPIO_PINMUX_SHIFT) - 1),
+			offsetof(struct gpio_bank, config),
 			1 << bit, mode ? (1 << bit) : 0);
 }
 
-int gpio_get_mode(int gpio_index)
+int gpio_get_mode(gpio_t gpio)
 {
-	int bit = gpio_index % GPIO_GPIOS_PER_PORT;
-	uint32_t port = gpio_read_port(gpio_index,
-				       offsetof(struct gpio_bank, config));
+	int bit = gpio % GPIO_GPIOS_PER_PORT;
+	u32 port = gpio_read_port(gpio & ((1 << GPIO_PINMUX_SHIFT) - 1),
+				  offsetof(struct gpio_bank, config));
 	return (port & (1 << bit)) != 0;
 }
 
-void gpio_set_lock(int gpio_index)
+void gpio_set_lock(gpio_t gpio)
 {
-	int bit = gpio_index % GPIO_GPIOS_PER_PORT + GPIO_GPIOS_PER_PORT;
-	gpio_write_port(gpio_index, offsetof(struct gpio_bank, config),
+	int bit = gpio % GPIO_GPIOS_PER_PORT + GPIO_GPIOS_PER_PORT;
+	gpio_write_port(gpio & ((1 << GPIO_PINMUX_SHIFT) - 1),
+			offsetof(struct gpio_bank, config),
 			1 << bit, 1 << bit);
 }
 
-int gpio_get_lock(int gpio_index)
+int gpio_get_lock(gpio_t gpio)
 {
-	int bit = gpio_index % GPIO_GPIOS_PER_PORT + GPIO_GPIOS_PER_PORT;
-	uint32_t port = gpio_read_port(gpio_index,
-				       offsetof(struct gpio_bank, config));
+	int bit = gpio % GPIO_GPIOS_PER_PORT + GPIO_GPIOS_PER_PORT;
+	u32 port = gpio_read_port(gpio & ((1 << GPIO_PINMUX_SHIFT) - 1),
+				  offsetof(struct gpio_bank, config));
 	return (port & (1 << bit)) != 0;
 }
 
-void gpio_set_out_enable(int gpio_index, int enable)
+void gpio_set_out_enable(gpio_t gpio, int enable)
 {
-	int bit = gpio_index % GPIO_GPIOS_PER_PORT;
-	gpio_write_port(gpio_index, offsetof(struct gpio_bank, out_enable),
+	int bit = gpio % GPIO_GPIOS_PER_PORT;
+	gpio_write_port(gpio & ((1 << GPIO_PINMUX_SHIFT) - 1),
+			offsetof(struct gpio_bank, out_enable),
 			1 << bit, enable ? (1 << bit) : 0);
 }
 
-int gpio_get_out_enable(int gpio_index)
+int gpio_get_out_enable(gpio_t gpio)
 {
-	int bit = gpio_index % GPIO_GPIOS_PER_PORT;
-	uint32_t port = gpio_read_port(gpio_index,
-				       offsetof(struct gpio_bank, out_enable));
+	int bit = gpio % GPIO_GPIOS_PER_PORT;
+	u32 port = gpio_read_port(gpio & ((1 << GPIO_PINMUX_SHIFT) - 1),
+				  offsetof(struct gpio_bank, out_enable));
 	return (port & (1 << bit)) != 0;
 }
 
-void gpio_set_out_value(int gpio_index, int value)
+void gpio_set_out_value(gpio_t gpio, int value)
 {
-	int bit = gpio_index % GPIO_GPIOS_PER_PORT;
-	gpio_write_port(gpio_index, offsetof(struct gpio_bank, out_value),
+	int bit = gpio % GPIO_GPIOS_PER_PORT;
+	gpio_write_port(gpio & ((1 << GPIO_PINMUX_SHIFT) - 1),
+			offsetof(struct gpio_bank, out_value),
 			1 << bit, value ? (1 << bit) : 0);
 }
 
-int gpio_get_out_value(int gpio_index)
+int gpio_get_out_value(gpio_t gpio)
 {
-	int bit = gpio_index % GPIO_GPIOS_PER_PORT;
-	uint32_t port = gpio_read_port(gpio_index,
-				       offsetof(struct gpio_bank, out_value));
+	int bit = gpio % GPIO_GPIOS_PER_PORT;
+	u32 port = gpio_read_port(gpio & ((1 << GPIO_PINMUX_SHIFT) - 1),
+				  offsetof(struct gpio_bank, out_value));
 	return (port & (1 << bit)) != 0;
 }
 
-int gpio_get_in_value(int gpio_index)
+int gpio_get_in_value(gpio_t gpio)
 {
-	int bit = gpio_index % GPIO_GPIOS_PER_PORT;
-	uint32_t port = gpio_read_port(gpio_index,
-				       offsetof(struct gpio_bank, in_value));
+	int bit = gpio % GPIO_GPIOS_PER_PORT;
+	u32 port = gpio_read_port(gpio & ((1 << GPIO_PINMUX_SHIFT) - 1),
+				  offsetof(struct gpio_bank, in_value));
 	return (port & (1 << bit)) != 0;
 }
 
-int gpio_get_int_status(int gpio_index)
+int gpio_get_int_status(gpio_t gpio)
 {
-	int bit = gpio_index % GPIO_GPIOS_PER_PORT;
-	uint32_t port = gpio_read_port(gpio_index,
-				       offsetof(struct gpio_bank, int_status));
+	int bit = gpio % GPIO_GPIOS_PER_PORT;
+	u32 port = gpio_read_port(gpio & ((1 << GPIO_PINMUX_SHIFT) - 1),
+				  offsetof(struct gpio_bank, int_status));
 	return (port & (1 << bit)) != 0;
 }
 
-void gpio_set_int_enable(int gpio_index, int enable)
+void gpio_set_int_enable(gpio_t gpio, int enable)
 {
-	int bit = gpio_index % GPIO_GPIOS_PER_PORT;
-	gpio_write_port(gpio_index, offsetof(struct gpio_bank, int_enable),
+	int bit = gpio % GPIO_GPIOS_PER_PORT;
+	gpio_write_port(gpio & ((1 << GPIO_PINMUX_SHIFT) - 1),
+			offsetof(struct gpio_bank, int_enable),
 			1 << bit, enable ? (1 << bit) : 0);
 }
 
-int gpio_get_int_enable(int gpio_index)
+int gpio_get_int_enable(gpio_t gpio)
 {
-	int bit = gpio_index % GPIO_GPIOS_PER_PORT;
-	uint32_t port = gpio_read_port(gpio_index,
-				       offsetof(struct gpio_bank, int_enable));
+	int bit = gpio % GPIO_GPIOS_PER_PORT;
+	u32 port = gpio_read_port(gpio & ((1 << GPIO_PINMUX_SHIFT) - 1),
+				  offsetof(struct gpio_bank, int_enable));
 	return (port & (1 << bit)) != 0;
 }
 
-void gpio_set_int_level(int gpio_index, int high_rise, int edge, int delta)
+void gpio_set_int_level(gpio_t gpio, int high_rise, int edge, int delta)
 {
-	int bit = gpio_index % GPIO_GPIOS_PER_PORT;
-	uint32_t value = (high_rise ? (0x000001 << bit) : 0) |
+	int bit = gpio % GPIO_GPIOS_PER_PORT;
+	u32 value = (high_rise ? (0x000001 << bit) : 0) |
 			 (edge ? (0x000100 << bit) : 0) |
-			 (delta ? (0x010000 << bit) : 0);
-	gpio_write_port(gpio_index, offsetof(struct gpio_bank, config),
+			(delta ? (0x010000 << bit) : 0);
+	gpio_write_port(gpio & ((1 << GPIO_PINMUX_SHIFT) - 1),
+			offsetof(struct gpio_bank, config),
 			0x010101 << bit, value);
 }
 
-void gpio_get_int_level(int gpio_index, int *high_rise, int *edge, int *delta)
+void gpio_get_int_level(gpio_t gpio, int *high_rise, int *edge, int *delta)
 {
-	int bit = gpio_index % GPIO_GPIOS_PER_PORT;
-	uint32_t port = gpio_read_port(gpio_index,
-				       offsetof(struct gpio_bank, int_level));
+	int bit = gpio % GPIO_GPIOS_PER_PORT;
+	u32 port = gpio_read_port(gpio & ((1 << GPIO_PINMUX_SHIFT) - 1),
+				  offsetof(struct gpio_bank, int_level));
 	*high_rise = ((port & (0x000001 << bit)) != 0);
 	*edge = ((port & (0x000100 << bit)) != 0);
 	*delta = ((port & (0x010000 << bit)) != 0);
 }
 
-void gpio_set_int_clear(int gpio_index)
+void gpio_set_int_clear(gpio_t gpio)
 {
-	int bit = gpio_index % GPIO_GPIOS_PER_PORT;
-	gpio_write_port(gpio_index, offsetof(struct gpio_bank, int_clear),
+	int bit = gpio % GPIO_GPIOS_PER_PORT;
+	gpio_write_port(gpio & ((1 << GPIO_PINMUX_SHIFT) - 1),
+			offsetof(struct gpio_bank, int_clear),
 			1 << bit, 1 << bit);
 }
diff --git a/src/soc/nvidia/tegra/gpio.h b/src/soc/nvidia/tegra/gpio.h
index b62dc90906..546ea05030 100644
--- a/src/soc/nvidia/tegra/gpio.h
+++ b/src/soc/nvidia/tegra/gpio.h
@@ -22,12 +22,34 @@
 
 #include <stdint.h>
 
-/* Higher level functions for common GPIO configurations. */
+#include "pinmux.h"
 
-void gpio_input(int gpio_index, int pinmux_index);
-void gpio_input_pullup(int gpio_index, int pinmux_index);
-void gpio_input_pulldown(int gpio_index, int pinmux_index);
-void gpio_output(int gpio_index, int pinmux_index, int value);
+/* Wrapper type for GPIOs. Always use GPIO() macro to generate. */
+typedef u32 gpio_t;
+
+#define GPIO_PINMUX_SHIFT 16
+#define GPIO(name) ((gpio_t)(GPIO_##name##_INDEX | \
+			     (PINMUX_GPIO_##name << GPIO_PINMUX_SHIFT)))
+
+/* Higher level function wrappers for common GPIO configurations. */
+
+void gpio_output(gpio_t gpio, int value);
+void __gpio_input(gpio_t gpio, u32 pull);
+
+static inline void gpio_input(gpio_t gpio)
+{
+	__gpio_input(gpio, PINMUX_PULL_NONE);
+}
+
+static inline void gpio_input_pulldown(gpio_t gpio)
+{
+	__gpio_input(gpio, PINMUX_PULL_DOWN);
+}
+
+static inline void gpio_input_pullup(gpio_t gpio)
+{
+	__gpio_input(gpio, PINMUX_PULL_UP);
+}
 
 /* Functions to modify specific GPIO control values. */
 
@@ -35,29 +57,29 @@ enum gpio_mode {
 	GPIO_MODE_SPIO = 0,
 	GPIO_MODE_GPIO = 1
 };
-void gpio_set_mode(int gpio_index, enum gpio_mode);
-int gpio_get_mode(int gpio_index);
+void gpio_set_mode(gpio_t gpio, enum gpio_mode);
+int gpio_get_mode(gpio_t gpio);
 
 // Lock a GPIO with extreme caution since they can't be unlocked.
-void gpio_set_lock(int gpio_index);
-int gpio_get_lock(int gpio_index);
+void gpio_set_lock(gpio_t gpio);
+int gpio_get_lock(gpio_t gpio);
 
-void gpio_set_out_enable(int gpio_index, int enable);
-int gpio_get_out_enable(int gpio_index);
+void gpio_set_out_enable(gpio_t gpio, int enable);
+int gpio_get_out_enable(gpio_t gpio);
 
-void gpio_set_out_value(int gpio_index, int value);
-int gpio_get_out_value(int gpio_index);
+void gpio_set_out_value(gpio_t gpio, int value);
+int gpio_get_out_value(gpio_t gpio);
 
-int gpio_get_in_value(int gpio_index);
+int gpio_get_in_value(gpio_t gpio);
 
-int gpio_get_int_status(int gpio_index);
+int gpio_get_int_status(gpio_t gpio);
 
-void gpio_set_int_enable(int gpio_index, int enable);
-int gpio_get_int_enable(int gpio_index);
+void gpio_set_int_enable(gpio_t gpio, int enable);
+int gpio_get_int_enable(gpio_t gpio);
 
-void gpio_set_int_level(int gpio_index, int high_rise, int edge, int delta);
-void gpio_get_int_level(int gpio_index, int *high_rise, int *edge, int *delta);
+void gpio_set_int_level(gpio_t gpio, int high_rise, int edge, int delta);
+void gpio_get_int_level(gpio_t gpio, int *high_rise, int *edge, int *delta);
 
-void gpio_set_int_clear(int gpio_index);
+void gpio_set_int_clear(gpio_t gpio);
 
 #endif	/* __SOC_NVIDIA_TEGRA_GPIO_H__ */
diff --git a/src/soc/nvidia/tegra/i2c.c b/src/soc/nvidia/tegra/i2c.c
index ddb54a56c0..e9001f09b2 100644
--- a/src/soc/nvidia/tegra/i2c.c
+++ b/src/soc/nvidia/tegra/i2c.c
@@ -32,12 +32,10 @@ static int tegra_i2c_send_recv(struct tegra_i2c_regs *regs, int read,
 {
 	while (data_len) {
 		uint32_t status = read32(&regs->fifo_status);
-		int tx_empty =
-			status & TEGRA_I2C_FIFO_STATUS_TX_FIFO_EMPTY_CNT_MASK;
-		tx_empty >>= TEGRA_I2C_FIFO_STATUS_TX_FIFO_EMPTY_CNT_SHIFT;
-		int rx_full =
-			status & TEGRA_I2C_FIFO_STATUS_RX_FIFO_FULL_CNT_MASK;
-		rx_full >>= TEGRA_I2C_FIFO_STATUS_RX_FIFO_FULL_CNT_SHIFT;
+		int tx_empty = status & I2C_FIFO_STATUS_TX_FIFO_EMPTY_CNT_MASK;
+		tx_empty >>= I2C_FIFO_STATUS_TX_FIFO_EMPTY_CNT_SHIFT;
+		int rx_full = status & I2C_FIFO_STATUS_RX_FIFO_FULL_CNT_MASK;
+		rx_full >>= I2C_FIFO_STATUS_RX_FIFO_FULL_CNT_SHIFT;
 
 		while (header_words && tx_empty) {
 			write32(*headers++, &regs->tx_packet_fifo);
@@ -73,19 +71,17 @@ static int tegra_i2c_send_recv(struct tegra_i2c_regs *regs, int read,
 		uint32_t transfer_status =
 			read32(&regs->packet_transfer_status);
 
-		if (transfer_status & TEGRA_I2C_PKT_STATUS_NOACK_ADDR_MASK) {
+		if (transfer_status & I2C_PKT_STATUS_NOACK_ADDR) {
 			printk(BIOS_ERR,
 			       "%s: The address was not acknowledged.\n",
 			       __func__);
 			return -1;
-		} else if (transfer_status &
-			   TEGRA_I2C_PKT_STATUS_NOACK_DATA_MASK) {
+		} else if (transfer_status & I2C_PKT_STATUS_NOACK_DATA) {
 			printk(BIOS_ERR,
 			       "%s: The data was not acknowledged.\n",
 			       __func__);
 			return -1;
-		} else if (transfer_status &
-			   TEGRA_I2C_PKT_STATUS_ARB_LOST_MASK) {
+		} else if (transfer_status & I2C_PKT_STATUS_ARB_LOST) {
 			printk(BIOS_ERR,
 			       "%s: Lost arbitration.\n",
 			       __func__);
@@ -108,25 +104,22 @@ static int tegra_i2c_request(int bus, unsigned chip, int cont, int restart,
 		return -1;
 	}
 
-	headers[0] = (0 << IOHEADER_WORD0_PROTHDRSZ_SHIFT) |
-		     (1 << IOHEADER_WORD0_PKTID_SHIFT) |
-		     (bus << IOHEADER_WORD0_CONTROLLER_ID_SHIFT) |
-		     IOHEADER_WORD0_PROTOCOL_I2C |
-		     IOHEADER_WORD0_PKTTYPE_REQUEST;
+	headers[0] = (0 << IOHEADER_PROTHDRSZ_SHIFT) |
+		     (1 << IOHEADER_PKTID_SHIFT) |
+		     (bus << IOHEADER_CONTROLLER_ID_SHIFT) |
+		     IOHEADER_PROTOCOL_I2C | IOHEADER_PKTTYPE_REQUEST;
 
-	headers[1] = (data_len - 1) << IOHEADER_WORD1_PAYLOADSIZE_SHIFT;
+	headers[1] = (data_len - 1) << IOHEADER_PAYLOADSIZE_SHIFT;
 
 	uint32_t slave_addr = (chip << 1) | (read ? 1 : 0);
-	headers[2] = IOHEADER_I2C_REQ_ADDRESS_MODE_7BIT |
+	headers[2] = IOHEADER_I2C_REQ_ADDR_MODE_7BIT |
 		     (slave_addr << IOHEADER_I2C_REQ_SLAVE_ADDR_SHIFT);
 	if (read)
-		headers[2] |= IOHEADER_I2C_REQ_READ_WRITE_READ;
-	else
-		headers[2] |= IOHEADER_I2C_REQ_READ_WRITE_WRITE;
+		headers[2] |= IOHEADER_I2C_REQ_READ;
 	if (restart)
-		headers[2] |= IOHEADER_I2C_REQ_REPEAT_START_STOP_START;
+		headers[2] |= IOHEADER_I2C_REQ_REPEAT_START;
 	if (cont)
-		headers[2] |= IOHEADER_I2C_REQ_CONTINUE_XFER_MASK;
+		headers[2] |= IOHEADER_I2C_REQ_CONTINUE_XFER;
 
 	return tegra_i2c_send_recv(regs, read, headers, ARRAY_SIZE(headers),
 				   data, data_len);
@@ -136,8 +129,7 @@ static int i2c_readwrite(unsigned bus, unsigned chip, unsigned addr,
 			 unsigned alen, uint8_t *buf, unsigned len, int read)
 {
 	const uint32_t max_payload =
-		(IOHEADER_WORD1_PAYLOADSIZE_MASK + 1) >>
-		IOHEADER_WORD1_PAYLOADSIZE_SHIFT;
+		(IOHEADER_PAYLOADSIZE_MASK + 1) >> IOHEADER_PAYLOADSIZE_SHIFT;
 	uint8_t abuf[sizeof(addr)];
 
 	int i;
@@ -176,5 +168,5 @@ void i2c_init(unsigned bus)
 {
 	struct tegra_i2c_regs * const regs = tegra_i2c_bases[bus];
 
-	write32(TEGRA_I2C_CNFG_PACKET_MODE_EN_MASK, &regs->cnfg);
+	write32(I2C_CNFG_PACKET_MODE_EN, &regs->cnfg);
 }
diff --git a/src/soc/nvidia/tegra/i2c.h b/src/soc/nvidia/tegra/i2c.h
index 630d890c38..997ec9c18f 100644
--- a/src/soc/nvidia/tegra/i2c.h
+++ b/src/soc/nvidia/tegra/i2c.h
@@ -24,133 +24,90 @@
 
 void i2c_init(unsigned bus);
 
-#define IOHEADER_BITFIELD(name, shift, mask) \
-	IOHEADER_##name##_SHIFT = shift, \
-	IOHEADER_##name##_MASK = \
-		mask << IOHEADER_##name##_SHIFT
-
-#define IOHEADER_BITFIELD_VAL(field, name, val) \
-	IOHEADER_##field##_##name = \
-		val << IOHEADER_##field##_SHIFT
-
 enum {
 	/* Word 0 */
-	IOHEADER_BITFIELD(WORD0_PROTHDRSZ, 28, 0x3),
-
-	IOHEADER_BITFIELD(WORD0_PKTID, 16, 0xff),
-
-	IOHEADER_BITFIELD(WORD0_CONTROLLER_ID, 12, 0xf),
-
-	IOHEADER_BITFIELD(WORD0_PROTOCOL, 4, 0xf),
-	IOHEADER_BITFIELD_VAL(WORD0_PROTOCOL, I2C, 1),
-
-	IOHEADER_BITFIELD(WORD0_PKTTYPE, 0, 0x7),
-	IOHEADER_BITFIELD_VAL(WORD0_PKTTYPE, REQUEST, 0),
-	IOHEADER_BITFIELD_VAL(WORD0_PKTTYPE, RESPONSE, 1),
-	IOHEADER_BITFIELD_VAL(WORD0_PKTTYPE, INTERRUPT, 2),
-	IOHEADER_BITFIELD_VAL(WORD0_PKTTYPE, STOP, 3),
+	IOHEADER_PROTHDRSZ_SHIFT = 28,
+	IOHEADER_PROTHDRSZ_MASK = 0x3 << IOHEADER_PROTHDRSZ_SHIFT,
+	IOHEADER_PKTID_SHIFT = 16,
+	IOHEADER_PKTID_MASK = 0xff << IOHEADER_PKTID_SHIFT,
+	IOHEADER_CONTROLLER_ID_SHIFT = 12,
+	IOHEADER_CONTROLLER_ID_MASK = 0xf << IOHEADER_CONTROLLER_ID_SHIFT,
+	IOHEADER_PROTOCOL_SHIFT = 4,
+	IOHEADER_PROTOCOL_MASK = 0xf << IOHEADER_PROTOCOL_SHIFT,
+	IOHEADER_PROTOCOL_I2C = 1 << IOHEADER_PROTOCOL_SHIFT,
+	IOHEADER_PKTTYPE_SHIFT = 0,
+	IOHEADER_PKTTYPE_MASK = 0x7 << IOHEADER_PKTTYPE_SHIFT,
+	IOHEADER_PKTTYPE_REQUEST = 0 << IOHEADER_PKTTYPE_SHIFT,
+	IOHEADER_PKTTYPE_RESPONSE = 1 << IOHEADER_PKTTYPE_SHIFT,
+	IOHEADER_PKTTYPE_INTERRUPT = 2 << IOHEADER_PKTTYPE_SHIFT,
+	IOHEADER_PKTTYPE_STOP = 3 << IOHEADER_PKTTYPE_SHIFT,
 
 	/* Word 1 */
-	IOHEADER_BITFIELD(WORD1_PAYLOADSIZE, 0, 0xfff)
+	IOHEADER_PAYLOADSIZE_SHIFT = 0,
+	IOHEADER_PAYLOADSIZE_MASK = 0xfff << IOHEADER_PAYLOADSIZE_SHIFT
 };
 
 enum {
-	IOHEADER_BITFIELD(I2C_REQ_RESP_PKT_FREQ_SHIFT, 25, 0x1),
-	IOHEADER_BITFIELD_VAL(I2C_REQ_RESP_PKT_FREQ_SHIFT, END, 0),
-	IOHEADER_BITFIELD_VAL(I2C_REQ_RESP_PKT_FREQ_SHIFT, EACH, 1),
-
-	IOHEADER_BITFIELD(I2C_REQ_RESP_PKT_ENABLE, 24, 0x1),
-
-	IOHEADER_BITFIELD(I2C_REQ_HS_MODE, 22, 0x1),
-
-	IOHEADER_BITFIELD(I2C_REQ_CONTINUE_ON_NACK, 21, 0x1),
-
-	IOHEADER_BITFIELD(I2C_REQ_SEND_START_BYTE, 20, 0x1),
-
-	IOHEADER_BITFIELD(I2C_REQ_READ_WRITE, 19, 0x1),
-	IOHEADER_BITFIELD_VAL(I2C_REQ_READ_WRITE, WRITE, 0),
-	IOHEADER_BITFIELD_VAL(I2C_REQ_READ_WRITE, READ, 1),
-
-	IOHEADER_BITFIELD(I2C_REQ_ADDRESS_MODE, 18, 0x1),
-	IOHEADER_BITFIELD_VAL(I2C_REQ_ADDRESS_MODE, 7BIT, 0),
-	IOHEADER_BITFIELD_VAL(I2C_REQ_ADDRESS_MODE, 10BIT, 1),
-
-	IOHEADER_BITFIELD(I2C_REQ_IE, 17, 0x1),
-
-	IOHEADER_BITFIELD(I2C_REQ_REPEAT_START_STOP, 16, 0x1),
-	IOHEADER_BITFIELD_VAL(I2C_REQ_REPEAT_START_STOP, STOP, 0),
-	IOHEADER_BITFIELD_VAL(I2C_REQ_REPEAT_START_STOP, START, 1),
-
-	IOHEADER_BITFIELD(I2C_REQ_CONTINUE_XFER, 15, 0x1),
-
-	IOHEADER_BITFIELD(I2C_REQ_HS_MASTER_ADDR, 12, 0x7),
-
-	IOHEADER_BITFIELD(I2C_REQ_SLAVE_ADDR, 0, 0x3ff)
+	IOHEADER_I2C_REQ_RESP_FREQ_MASK = 0x1 << 25,
+	IOHEADER_I2C_REQ_RESP_FREQ_END = 0 << 25,
+	IOHEADER_I2C_REQ_RESP_FREQ_EACH = 1 << 25,
+	IOHEADER_I2C_REQ_RESP_ENABLE = 0x1 << 24,
+	IOHEADER_I2C_REQ_HS_MODE = 0x1 << 22,
+	IOHEADER_I2C_REQ_CONTINUE_ON_NACK = 0x1 << 21,
+	IOHEADER_I2C_REQ_SEND_START_BYTE = 0x1 << 20,
+	IOHEADER_I2C_REQ_READ = 0x1 << 19,
+	IOHEADER_I2C_REQ_ADDR_MODE_MASK = 0x1 << 18,
+	IOHEADER_I2C_REQ_ADDR_MODE_7BIT = 0 << 18,
+	IOHEADER_I2C_REQ_ADDR_MODE_10BIT = 1 << 18,
+	IOHEADER_I2C_REQ_IE = 0x1 << 17,
+	IOHEADER_I2C_REQ_REPEAT_START = 0x1 << 16,
+	IOHEADER_I2C_REQ_STOP = 0x0 << 16,
+	IOHEADER_I2C_REQ_CONTINUE_XFER = 0x1 << 15,
+	IOHEADER_I2C_REQ_HS_MASTER_ADDR_SHIFT = 12,
+	IOHEADER_I2C_REQ_HS_MASTER_ADDR_MASK =
+		0x7 << IOHEADER_I2C_REQ_HS_MASTER_ADDR_SHIFT,
+	IOHEADER_I2C_REQ_SLAVE_ADDR_SHIFT = 0,
+	IOHEADER_I2C_REQ_SLAVE_ADDR_MASK =
+		0x3ff << IOHEADER_I2C_REQ_SLAVE_ADDR_SHIFT
 };
 
 enum {
-	TEGRA_I2C_CNFG_MSTR_CLR_BUS_ON_TIMEOUT_SHIFT = 15,
-	TEGRA_I2C_CNFG_MSTR_CLR_BUS_ON_TIMEOUT_MASK =
-		0x1 << TEGRA_I2C_CNFG_MSTR_CLR_BUS_ON_TIMEOUT_SHIFT,
-	TEGRA_I2C_CNFG_DEBOUNCE_CNT_SHIFT = 12,
-	TEGRA_I2C_CNFG_DEBOUNCE_CNT_MASK =
-		0x7 << TEGRA_I2C_CNFG_DEBOUNCE_CNT_SHIFT,
-	TEGRA_I2C_CNFG_NEW_MASTER_FSM_SHIFT = 11,
-	TEGRA_I2C_CNFG_NEW_MASTER_FSM_MASK =
-		0x1 << TEGRA_I2C_CNFG_NEW_MASTER_FSM_SHIFT,
-	TEGRA_I2C_CNFG_PACKET_MODE_EN_SHIFT = 10,
-	TEGRA_I2C_CNFG_PACKET_MODE_EN_MASK =
-		0x1 << TEGRA_I2C_CNFG_PACKET_MODE_EN_SHIFT,
-	TEGRA_I2C_CNFG_SEND_SHIFT = 9,
-	TEGRA_I2C_CNFG_SEND_MASK = 0x1 << TEGRA_I2C_CNFG_SEND_SHIFT,
-	TEGRA_I2C_CNFG_NOACK_SHIFT = 8,
-	TEGRA_I2C_CNFG_NOACK_MASK = 0x1 << TEGRA_I2C_CNFG_NOACK_SHIFT,
-	TEGRA_I2C_CNFG_CMD2_SHIFT = 7,
-	TEGRA_I2C_CNFG_CMD2_MASK = 0x1 << TEGRA_I2C_CNFG_CMD2_SHIFT,
-	TEGRA_I2C_CNFG_CMD1_SHIFT = 6,
-	TEGRA_I2C_CNFG_CMD1_MASK = 0x1 << TEGRA_I2C_CNFG_CMD1_SHIFT,
-	TEGRA_I2C_CNFG_START_SHIFT = 5,
-	TEGRA_I2C_CNFG_START_MASK = 0x1 << TEGRA_I2C_CNFG_START_SHIFT,
-	TEGRA_I2C_CNFG_SLV2_SHIFT = 4,
-	TEGRA_I2C_CNFG_SLV2_MASK = 0x1 << TEGRA_I2C_CNFG_SLV2_SHIFT,
-	TEGRA_I2C_CNFG_LENGTH_SHIFT = 1,
-	TEGRA_I2C_CNFG_LENGTH_MASK = 0x7 << TEGRA_I2C_CNFG_LENGTH_SHIFT,
-	TEGRA_I2C_CNFG_A_MOD_SHIFT = 0,
-	TEGRA_I2C_CNFG_A_MOD_MASK = 0x1 << TEGRA_I2C_CNFG_A_MOD_SHIFT
+	I2C_CNFG_MSTR_CLR_BUS_ON_TIMEOUT = 0x1 << 15,
+	I2C_CNFG_DEBOUNCE_CNT_SHIFT = 12,
+	I2C_CNFG_DEBOUNCE_CNT_MASK = 0x7 << I2C_CNFG_DEBOUNCE_CNT_SHIFT,
+	I2C_CNFG_NEW_MASTER_FSM = 0x1 << 11,
+	I2C_CNFG_PACKET_MODE_EN = 0x1 << 10,
+	I2C_CNFG_SEND = 0x1 << 9,
+	I2C_CNFG_NOACK = 0x1 << 8,
+	I2C_CNFG_CMD2 = 0x1 << 7,
+	I2C_CNFG_CMD1 = 0x1 << 6,
+	I2C_CNFG_START = 0x1 << 5,
+	I2C_CNFG_SLV2_SHIFT = 4,
+	I2C_CNFG_SLV2_MASK = 0x1 << I2C_CNFG_SLV2_SHIFT,
+	I2C_CNFG_LENGTH_SHIFT = 1,
+	I2C_CNFG_LENGTH_MASK = 0x7 << I2C_CNFG_LENGTH_SHIFT,
+	I2C_CNFG_A_MOD = 0x1 << 0,
 };
 
 enum {
-	TEGRA_I2C_PKT_STATUS_COMPLETE_SHIFT = 24,
-	TEGRA_I2C_PKT_STATUS_COMPLETE_MASK =
-		0x1 << TEGRA_I2C_PKT_STATUS_COMPLETE_SHIFT,
-	TEGRA_I2C_PKT_STATUS_PKT_ID_SHIFT = 16,
-	TEGRA_I2C_PKT_STATUS_PKT_ID_MASK =
-		0xff << TEGRA_I2C_PKT_STATUS_PKT_ID_SHIFT,
-	TEGRA_I2C_PKT_STATUS_BYTENUM_SHIFT = 4,
-	TEGRA_I2C_PKT_STATUS_BYTENUM_MASK =
-		0xfff << TEGRA_I2C_PKT_STATUS_BYTENUM_SHIFT,
-	TEGRA_I2C_PKT_STATUS_NOACK_ADDR_SHIFT = 3,
-	TEGRA_I2C_PKT_STATUS_NOACK_ADDR_MASK =
-		0x1 << TEGRA_I2C_PKT_STATUS_NOACK_ADDR_SHIFT,
-	TEGRA_I2C_PKT_STATUS_NOACK_DATA_SHIFT = 2,
-	TEGRA_I2C_PKT_STATUS_NOACK_DATA_MASK =
-		0x1 << TEGRA_I2C_PKT_STATUS_NOACK_DATA_SHIFT,
-	TEGRA_I2C_PKT_STATUS_ARB_LOST_SHIFT = 1,
-	TEGRA_I2C_PKT_STATUS_ARB_LOST_MASK =
-		0x1 << TEGRA_I2C_PKT_STATUS_ARB_LOST_SHIFT,
-	TEGRA_I2C_PKT_STATUS_BUSY_SHIFT = 0,
-	TEGRA_I2C_PKT_STATUS_BUSY_MASK =
-		0x1 << TEGRA_I2C_PKT_STATUS_BUSY_SHIFT,
+	I2C_PKT_STATUS_COMPLETE = 0x1 << 24,
+	I2C_PKT_STATUS_PKT_ID_SHIFT = 16,
+	I2C_PKT_STATUS_PKT_ID_MASK = 0xff << I2C_PKT_STATUS_PKT_ID_SHIFT,
+	I2C_PKT_STATUS_BYTENUM_SHIFT = 4,
+	I2C_PKT_STATUS_BYTENUM_MASK = 0xfff << I2C_PKT_STATUS_BYTENUM_SHIFT,
+	I2C_PKT_STATUS_NOACK_ADDR = 0x1 << 3,
+	I2C_PKT_STATUS_NOACK_DATA = 0x1 << 2,
+	I2C_PKT_STATUS_ARB_LOST = 0x1 << 1,
+	I2C_PKT_STATUS_BUSY = 0x1 << 0
 };
 
 enum {
-	TEGRA_I2C_FIFO_STATUS_TX_FIFO_EMPTY_CNT_SHIFT = 4,
-	TEGRA_I2C_FIFO_STATUS_TX_FIFO_EMPTY_CNT_MASK =
-		0xf << TEGRA_I2C_FIFO_STATUS_TX_FIFO_EMPTY_CNT_SHIFT,
-
-	TEGRA_I2C_FIFO_STATUS_RX_FIFO_FULL_CNT_SHIFT = 0,
-	TEGRA_I2C_FIFO_STATUS_RX_FIFO_FULL_CNT_MASK =
-		0xf << TEGRA_I2C_FIFO_STATUS_RX_FIFO_FULL_CNT_SHIFT
+	I2C_FIFO_STATUS_TX_FIFO_EMPTY_CNT_SHIFT = 4,
+	I2C_FIFO_STATUS_TX_FIFO_EMPTY_CNT_MASK =
+		0xf << I2C_FIFO_STATUS_TX_FIFO_EMPTY_CNT_SHIFT,
+	I2C_FIFO_STATUS_RX_FIFO_FULL_CNT_SHIFT = 0,
+	I2C_FIFO_STATUS_RX_FIFO_FULL_CNT_MASK =
+		0xf << I2C_FIFO_STATUS_RX_FIFO_FULL_CNT_SHIFT
 };
 
 extern void * const tegra_i2c_bases[];