apalis-tk1: clean-up board platform data header file

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Acked-by: Dominik Sliwa <dominik.sliwa@toradex.com>

2 files changed, 98 insertions, 147 deletions

diff --git a/arch/arm/mach-tegra/board-apalis-tk1.c b/arch/arm/mach-tegra/board-apalis-tk1.c
index 443cf937271b..22a1f7d10d21 100644
--- a/arch/arm/mach-tegra/board-apalis-tk1.c
+++ b/arch/arm/mach-tegra/board-apalis-tk1.c
@@ -592,9 +592,6 @@ static void __init tegra_apalis_tk1_dt_init(void)
 			     apalis_tk1_auxdata_lookup, &platform_bus);
 #endif
 
-#define PEX_PERST_N     TEGRA_GPIO_PDD1 /* Apalis GPIO7 */
-#define RESET_MOCI_N    TEGRA_GPIO_PU4
-
 	/* Reset PLX PEX 8605 PCIe Switch plus PCIe devices on Apalis Evaluation
 	   Board */
 	gpio_request(PEX_PERST_N, "PEX_PERST_N");
@@ -610,8 +607,6 @@ static void __init tegra_apalis_tk1_dt_init(void)
 	gpio_set_value(RESET_MOCI_N, 1);
 
 #if 0
-#define LAN_RESET_N TEGRA_GPIO_PS2
-
 	/* Reset I210 Gigabit Ethernet Controller */
 	gpio_request(LAN_RESET_N, "LAN_RESET_N");
 	gpio_direction_output(LAN_RESET_N, 0);
diff --git a/arch/arm/mach-tegra/board-apalis-tk1.h b/arch/arm/mach-tegra/board-apalis-tk1.h
index 72161afbd787..a7074a110561 100644
--- a/arch/arm/mach-tegra/board-apalis-tk1.h
+++ b/arch/arm/mach-tegra/board-apalis-tk1.h
@@ -17,48 +17,27 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef _MACH_TEGRA_BOARD_APALIS_H
-#define _MACH_TEGRA_BOARD_APALIS_H
+#ifndef _MACH_TEGRA_BOARD_APALIS_TK1_H
+#define _MACH_TEGRA_BOARD_APALIS_TK1_H
 
 #include <mach/gpio-tegra.h>
 #include <mach/irqs.h>
 #include "gpio-names.h"
 
-int apalis_tk1_emc_init(void);
-int apalis_tk1_display_init(void);
-int apalis_tk1_panel_init(void);
-int apalis_tk1_sdhci_init(void);
-int apalis_tk1_sensors_init(void);
-int apalis_tk1_regulator_init(void);
-int apalis_tk1_suspend_init(void);
-int apalis_tk1_rail_alignment_init(void);
-int apalis_tk1_soctherm_init(void);
-int apalis_tk1_edp_init(void);
-void apalis_tk1_new_sysedp_init(void);
-void apalis_tk1_sysedp_dynamic_capping_init(void);
-void apalis_tk1_sysedp_batmon_init(void);
-void apalis_tk1_camera_auxdata(void *);
-
-/* Invensense MPU Definitions */
-#define MPU_GYRO_NAME			"mpu9250"
-#define MPU_GYRO_IRQ_GPIO		TEGRA_GPIO_PS0
-#define MPU_GYRO_ADDR			0x69
-#define MPU_GYRO_BUS_NUM		0
-#define MPU_GYRO_ORIENTATION		MTMAT_TOP_CCW_0
-#define MPU_GYRO_ORIENTATION_E1762	MTMAT_TOP_CCW_270
-#define MPU_COMPASS_NAME		"ak8975"
-#define MPU_COMPASS_ADDR		0x0C
-#define MPU_COMPASS_ADDR_TN8		0x0D
-#define MPU_COMPASS_ORIENTATION		MTMAT_BOT_CCW_270
-#define MPU_BMP_NAME			"bmp280"
-#define MPU_BMP_ADDR			0x77
+/* GPIO */
 
-/* generated soc_therm OC interrupts */
-#define TEGRA_SOC_OC_IRQ_BASE	TEGRA_NR_IRQS
-#define TEGRA_SOC_OC_NUM_IRQ	TEGRA_SOC_OC_IRQ_MAX
+#define APALIS_GPIO1	TEGRA_GPIO_PFF2
+#define APALIS_GPIO2	TEGRA_GPIO_PFF0
+#define APALIS_GPIO3	TEGRA_GPIO_PV4	/* open-drain only */
+#define APALIS_GPIO4	TEGRA_GPIO_PV5	/* open-drain only */
+#define APALIS_GPIO5	TEGRA_GPIO_PDD5
+#define APALIS_GPIO6	TEGRA_GPIO_PDD6
+#define APALIS_GPIO7	TEGRA_GPIO_PDD1
+#define APALIS_GPIO8	TEGRA_GPIO_PDD2
 
-/* External peripheral act as interrupt controller */
+#define BKL1_ON		TEGRA_GPIO_PBB5
 
+/* TBD: Camera */
 #define CAM_RSTN TEGRA_GPIO_PBB3
 #define CAM_FLASH_STROBE TEGRA_GPIO_PBB4
 #define CAM2_PWDN TEGRA_GPIO_PBB6
@@ -66,118 +45,86 @@ void apalis_tk1_camera_auxdata(void *);
 #define CAM_AF_PWDN TEGRA_GPIO_PBB7
 #define CAM_BOARD_E1806
 
-/* Modem related GPIOs */
-#define MODEM_EN		TEGRA_GPIO_PS4
-#define MDM_RST			TEGRA_GPIO_PS3
-#define MDM_COLDBOOT		TEGRA_GPIO_PO5
-#define MDM_SAR0		TEGRA_GPIO_PG2
-#define MDM_POWER_REPORT	TEGRA_GPIO_PK0
+#define FAN_EN		APALIS_GPIO8
 
-/* Baseband IDs */
-enum tegra_bb_type {
-	TEGRA_BB_BRUCE = 1,
-	TEGRA_BB_HSIC_HUB = 6,
-};
+#define HDMI1_HPD	TEGRA_GPIO_PN7
+
+#define I2C1_SCL	TEGRA_GPIO_PC4
+#define I2C1_SDA	TEGRA_GPIO_PC5
+
+#define I2C2_SCL	TEGRA_GPIO_PT5
+#define I2C2_SDA	TEGRA_GPIO_PT6
+
+#define I2C3_SCL	TEGRA_GPIO_PBB1
+#define I2C3_SDA	TEGRA_GPIO_PBB2
+
+#define LAN_RESET_N	TEGRA_GPIO_PS2
+
+#define MMC1_CD_N	TEGRA_GPIO_PV3
+
+#define PEX_PERST_N	APALIS_GPIO7
+
+#define PWR_I2C_SCL	TEGRA_GPIO_PZ6
+#define PWR_I2C_SDA	TEGRA_GPIO_PZ7
+
+#define RESET_MOCI_N	TEGRA_GPIO_PU4
+
+#define SATA1_ACT_N	TEGRA_GPIO_PN2
+
+#define SD1_CD_N	TEGRA_GPIO_PEE4
+
+#define THERMD_ALERT_N	TEGRA_GPIO_PI6
+
+#define TOUCH_WIPER	APALIS_GPIO6
+
+/* TS1 reserved for recovery circuit */
+/* TS2 reserved for PMIC power button */
+/* TS3, TS4, TS5 and TS6 are not connected by default */
+
+#define USBH_EN		TEGRA_GPIO_PN5
+#define USBH_OC_N	TEGRA_GPIO_PBB0
+#define USBO1_EN	TEGRA_GPIO_PN4
+#define USBO1_OC_N	TEGRA_GPIO_PBB4
+
+#define WAKE1_MICO	TEGRA_GPIO_PDD3
 
-#define UTMI1_PORT_OWNER_XUSB   0x1
-#define UTMI2_PORT_OWNER_XUSB   0x2
-#define HSIC1_PORT_OWNER_XUSB   0x4
-#define HSIC2_PORT_OWNER_XUSB   0x8
-
-/* Touchscreen definitions */
-#define TOUCH_GPIO_IRQ_RAYDIUM_SPI	TEGRA_GPIO_PK2
-#define TOUCH_GPIO_RST_RAYDIUM_SPI	TEGRA_GPIO_PK4
-#define TOUCH_SPI_ID			0	/*SPI 1 on ardbeg_interposer*/
-#define TOUCH_SPI_CS			0	/*CS  0 on ardbeg_interposer*/
-#define NORRIN_TOUCH_SPI_ID			2	/*SPI 2 on Norrin*/
-#define NORRIN_TOUCH_SPI_CS			1	/*CS  1 on Norrin*/
-
-#define TOUCH_GPIO_IRQ_MAXIM_STI_SPI	TEGRA_GPIO_PK2
-#define TOUCH_GPIO_RST_MAXIM_STI_SPI	TEGRA_GPIO_PK4
-
-/* Audio-related GPIOs */
-/*Same GPIO's used for T114(Interposer) and T124*/
-/*Below GPIO's are same for Laguna and Ardbeg*/
-#define TEGRA_GPIO_CDC_IRQ	TEGRA_GPIO_PH4
-#define TEGRA_GPIO_HP_DET	TEGRA_GPIO_PR7
-#define NORRIN_GPIO_HP_DET	TEGRA_GPIO_PI7
-/*LDO_EN signal is required only for RT5639 and not for RT5645,
-on Laguna the LDO_EN signal comes from a GPIO expander and
-this is exposed as a fixed regulator directly handeled from
-machine driver of rt5639 and for ardebeg we use the below tegra
-GPIO, also the GPIO is same for T114 interposer and T124*/
 /*
- * TEGRA_GPIO_PR2 is low active Shift_CTRL_OE[3] on Apalis TK1 controlling the
- * level shifter of the debug UART1 receive pin!
- * #define TEGRA_GPIO_LDO_EN	TEGRA_GPIO_PR2
+ * Uncomment to use MXM3 pins 144, 146, 152, 156, 160, 162 & 164 for LEDs,
+ * PCIE1_WDISABLE_N, SW3 and UART2_3_RS232_FOFF_N on Ixora carrier board
  */
-#define TEGRA_GPIO_LDO_EN	TEGRA_GPIO_PR1
+//#define IXORA
+#ifdef IXORA
+#define LED4_GREEN		TEGRA_GPIO_PY5
+#define LED4_RED		TEGRA_GPIO_PY4
+#define LED5_GREEN		TEGRA_GPIO_PW5
+#define LED5_RED		TEGRA_GPIO_PEE5
+#define PCIE1_WDISABLE_N	TEGRA_GPIO_PY7
+#define SW3			TEGRA_GPIO_PY6
+#define UART2_3_RS232_FOFF_N	TEGRA_GPIO_PV3
+#endif /* IXORA */
 
-/*GPIOs used by board panel file */
-#define DSI_PANEL_RST_GPIO      TEGRA_GPIO_PH3
-#define DSI_PANEL_BL_PWM_GPIO   TEGRA_GPIO_PH1
+/* generated soc_therm OC interrupts */
+#define TEGRA_SOC_OC_IRQ_BASE	TEGRA_NR_IRQS
+#define TEGRA_SOC_OC_NUM_IRQ	TEGRA_SOC_OC_IRQ_MAX
+
+/* External peripheral act as interrupt controller */
+
+#define UTMI1_PORT_OWNER_XUSB   0x1
+#define UTMI2_PORT_OWNER_XUSB   0x2
+#define UTMI3_PORT_OWNER_XUSB	0x4
 
 /* HDMI Hotplug detection pin */
-#define apalis_tk1_hdmi_hpd	TEGRA_GPIO_PN7
+#define apalis_tk1_hdmi_hpd	HDMI1_HPD
 
 /* I2C related GPIOs */
-/* Same for interposer and t124 */
-#define TEGRA_GPIO_I2C1_SCL	TEGRA_GPIO_PC4
-#define TEGRA_GPIO_I2C1_SDA	TEGRA_GPIO_PC5
-#define TEGRA_GPIO_I2C2_SCL	TEGRA_GPIO_PT5
-#define TEGRA_GPIO_I2C2_SDA	TEGRA_GPIO_PT6
-#define TEGRA_GPIO_I2C3_SCL	TEGRA_GPIO_PBB1
-#define TEGRA_GPIO_I2C3_SDA	TEGRA_GPIO_PBB2
-#define TEGRA_GPIO_I2C4_SCL	TEGRA_GPIO_PV4
-#define TEGRA_GPIO_I2C4_SDA	TEGRA_GPIO_PV5
-#define TEGRA_GPIO_I2C5_SCL	TEGRA_GPIO_PZ6
-#define TEGRA_GPIO_I2C5_SDA	TEGRA_GPIO_PZ7
-
-/* Laguna specific */
-
-int laguna_pinmux_init(void);
-int laguna_regulator_init(void);
-int laguna_edp_init(void);
-
-/* Norrin specific */
-int norrin_regulator_init(void);
-int norrin_soctherm_init(void);
-int norrin_emc_init(void);
-
-/* loki specific */
-int loki_pinmux_init(void);
-int loki_regulator_init(void);
-int loki_emc_init(void);
-int loki_sdhci_init(void);
-int loki_pmon_init(void);
-int loki_panel_init(void);
-int loki_kbc_init(void);
-int loki_sensors_init(void);
-int loki_soctherm_init(void);
-int loki_edp_init(void);
-int loki_fan_init(void);
-int loki_rail_alignment_init(void);
-
-/* AUO Display related GPIO */
-#define DSI_PANEL_RST_GPIO      TEGRA_GPIO_PH3 /* GMI_AD11 */
-#define LCD_RST_L               TEGRA_GPIO_PH5 /* GMI_AD13 */
-#define LCD_LR                  TEGRA_GPIO_PH6 /* GMI_AD14 */
-#define LCD_TE                  TEGRA_GPIO_PI4 /* GMI_RST_N */
-#define DSI_PANEL_BL_PWM        TEGRA_GPIO_PH1 /*GMI_AD9 */
-#define en_vdd_bl       TEGRA_GPIO_PP2 /* DAP3_DOUT */
-#define lvds_en         TEGRA_GPIO_PI0 /* GMI_WR_N */
-#define refclk_en       TEGRA_GPIO_PG4 /* GMI_AD4 */
-
-/* HID keyboard and trackpad irq same for interposer and t124 */
-#define I2C_KB_IRQ	TEGRA_GPIO_PC7
-#define I2C_TP_IRQ	TEGRA_GPIO_PW3
-
-/* TN8 specific */
-
-int tn8_regulator_init(void);
-int tn8_edp_init(void);
-void tn8_new_sysedp_init(void);
-void tn8_sysedp_dynamic_capping_init(void);
+#define TEGRA_GPIO_I2C1_SCL	I2C1_SCL
+#define TEGRA_GPIO_I2C1_SDA	I2C1_SDA
+#define TEGRA_GPIO_I2C2_SCL	I2C2_SCL
+#define TEGRA_GPIO_I2C2_SDA	I2C2_SDA
+#define TEGRA_GPIO_I2C3_SCL	I2C3_SCL
+#define TEGRA_GPIO_I2C3_SDA	I2C3_SDA
+#define TEGRA_GPIO_I2C5_SCL	PWR_I2C_SCL
+#define TEGRA_GPIO_I2C5_SDA	PWR_I2C_SDA
 
 /* SATA Specific */
 
@@ -185,10 +132,19 @@ void tn8_sysedp_dynamic_capping_init(void);
 #define CLK_RST_CNTRL_RST_DEV_V_SET 0x7000E430
 #define SET_CEC_RST 0x100
 
-#ifdef CONFIG_NV_SENSORHUB
-/* Jetson Sensor-hub */
-#define SENSOR_HUB_RST		TEGRA_GPIO_PU0
-#define SENSOR_HUB_BOOT0	TEGRA_GPIO_PU1
-#endif
+int apalis_tk1_display_init(void);
+int apalis_tk1_edp_init(void);
+int apalis_tk1_emc_init(void);
+int apalis_tk1_panel_init(void);
+int apalis_tk1_rail_alignment_init(void);
+int apalis_tk1_regulator_init(void);
+int apalis_tk1_sdhci_init(void);
+int apalis_tk1_sensors_init(void);
+int apalis_tk1_soctherm_init(void);
+int apalis_tk1_suspend_init(void);
+void apalis_tk1_camera_auxdata(void *);
+void apalis_tk1_new_sysedp_init(void);
+void apalis_tk1_sysedp_batmon_init(void);
+void apalis_tk1_sysedp_dynamic_capping_init(void);
 
 #endif