summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-tegra/board-ardbeg-sdhci.c7
-rw-r--r--arch/arm/mach-tegra/board-ardbeg-sensors.c9
-rw-r--r--arch/arm/mach-tegra/board-ardbeg.c8
-rw-r--r--arch/arm/mach-tegra/board-laguna-power.c8
-rw-r--r--arch/arm/mach-tegra/tegra-board-id.h1
5 files changed, 26 insertions, 7 deletions
diff --git a/arch/arm/mach-tegra/board-ardbeg-sdhci.c b/arch/arm/mach-tegra/board-ardbeg-sdhci.c
index ccb790f80c18..cd7dfb50970a 100644
--- a/arch/arm/mach-tegra/board-ardbeg-sdhci.c
+++ b/arch/arm/mach-tegra/board-ardbeg-sdhci.c
@@ -469,8 +469,11 @@ int __init ardbeg_sdhci_init(void)
platform_device_register(&tegra_sdhci_device3);
platform_device_register(&tegra_sdhci_device2);
- platform_device_register(&tegra_sdhci_device0);
- ardbeg_wifi_init();
+ if (board_info.board_id != BOARD_PM359 &&
+ board_info.board_id != BOARD_PM375) {
+ platform_device_register(&tegra_sdhci_device0);
+ ardbeg_wifi_init();
+ }
return 0;
}
diff --git a/arch/arm/mach-tegra/board-ardbeg-sensors.c b/arch/arm/mach-tegra/board-ardbeg-sensors.c
index 3a313dd56b2f..fa14f0b91102 100644
--- a/arch/arm/mach-tegra/board-ardbeg-sensors.c
+++ b/arch/arm/mach-tegra/board-ardbeg-sensors.c
@@ -1783,6 +1783,9 @@ static int ardbeg_nct72_init(void)
board_info.board_id == BOARD_PM363)
i2c_register_board_info(1, laguna_i2c_nct72_board_info,
ARRAY_SIZE(laguna_i2c_nct72_board_info));
+ else if (board_info.board_id == BOARD_PM375)
+ i2c_register_board_info(0, laguna_i2c_nct72_board_info,
+ ARRAY_SIZE(laguna_i2c_nct72_board_info));
else if (board_info.board_id == BOARD_E1971 ||
board_info.board_id == BOARD_E1991)
/* bowmore has thermal sensor on GEN1-I2C i.e. instance 0 */
@@ -1961,7 +1964,8 @@ int __init ardbeg_sensors_init(void)
if (board_info.board_id != BOARD_PM363 &&
board_info.board_id != BOARD_PM359 &&
!of_machine_is_compatible("nvidia,tn8") &&
- !of_machine_is_compatible("nvidia,bowmore"))
+ !of_machine_is_compatible("nvidia,bowmore") &&
+ board_info.board_id != BOARD_PM375)
mpuirq_init();
ardbeg_camera_init();
@@ -1978,7 +1982,8 @@ int __init ardbeg_sensors_init(void)
#if defined(ARCH_TEGRA_12x_SOC)
/* TN8 and PM359 don't have ALS CM32181 */
if (!of_machine_is_compatible("nvidia,tn8") &&
- board_info.board_id != BOARD_PM359)
+ board_info.board_id != BOARD_PM359 &&
+ board_info.board_id != BOARD_PM375)
i2c_register_board_info(0, ardbeg_i2c_board_info_cm32181,
ARRAY_SIZE(ardbeg_i2c_board_info_cm32181));
#endif
diff --git a/arch/arm/mach-tegra/board-ardbeg.c b/arch/arm/mach-tegra/board-ardbeg.c
index 8fcceab88857..30aba3282919 100644
--- a/arch/arm/mach-tegra/board-ardbeg.c
+++ b/arch/arm/mach-tegra/board-ardbeg.c
@@ -337,6 +337,7 @@ static void ardbeg_audio_init(void)
board_info.board_id == BOARD_PM358 ||
board_info.board_id == BOARD_PM370 ||
board_info.board_id == BOARD_PM374 ||
+ board_info.board_id == BOARD_PM375 ||
board_info.board_id == BOARD_PM363) {
/*Laguna*/
ardbeg_audio_pdata_rt5639.gpio_hp_det = TEGRA_GPIO_HP_DET;
@@ -634,6 +635,7 @@ static void ardbeg_usb_init(void)
board_info.board_id == BOARD_PM358 ||
board_info.board_id == BOARD_PM370 ||
board_info.board_id == BOARD_PM374 ||
+ board_info.board_id == BOARD_PM375 ||
board_info.board_id == BOARD_PM363) {
/* Laguna */
/* Host cable is detected through AMS PMU Interrupt */
@@ -742,6 +744,7 @@ static void ardbeg_xusb_init(void)
if (board_info.board_id == BOARD_PM359 ||
board_info.board_id == BOARD_PM358 ||
board_info.board_id == BOARD_PM374 ||
+ board_info.board_id == BOARD_PM375 ||
board_info.board_id == BOARD_PM370 ||
board_info.board_id == BOARD_PM363) {
if (board_info.board_id == BOARD_PM374 ||
@@ -1119,6 +1122,7 @@ static void __init ardbeg_sysedp_init(void)
break;
case BOARD_PM358:
case BOARD_PM359:
+ case BOARD_PM375:
default:
break;
}
@@ -1144,6 +1148,7 @@ static void __init ardbeg_sysedp_dynamic_capping_init(void)
break;
case BOARD_PM358:
case BOARD_PM359:
+ case BOARD_PM375:
default:
break;
}
@@ -1165,6 +1170,7 @@ static void __init ardbeg_sysedp_batmon_init(void)
break;
case BOARD_PM358:
case BOARD_PM359:
+ case BOARD_PM375:
default:
break;
}
@@ -1190,6 +1196,7 @@ static void __init edp_init(void)
break;
case BOARD_PM358:
case BOARD_PM359:
+ case BOARD_PM375:
laguna_edp_init();
break;
case BOARD_P2530:
@@ -1341,6 +1348,7 @@ static void __init tegra_ardbeg_late_init(void)
board_info.board_id == BOARD_PM359 ||
board_info.board_id == BOARD_PM358 ||
board_info.board_id == BOARD_PM370 ||
+ board_info.board_id == BOARD_PM375 ||
board_info.board_id == BOARD_PM363) {
ardbeg_sensors_init();
norrin_soctherm_init();
diff --git a/arch/arm/mach-tegra/board-laguna-power.c b/arch/arm/mach-tegra/board-laguna-power.c
index 00813c8b8a1f..1b8265f3920e 100644
--- a/arch/arm/mach-tegra/board-laguna-power.c
+++ b/arch/arm/mach-tegra/board-laguna-power.c
@@ -1,7 +1,7 @@
/*
* arch/arm/mach-tegra/board-laguna-power.c
*
- * Copyright (c) 2013 NVIDIA Corporation. All rights reserved.
+ * Copyright (c) 2013-2014, NVIDIA CORPORATION. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -120,11 +120,12 @@ static inline void fill_reg_map(void)
struct board_info board_info;
tegra_get_board_info(&board_info);
- if ((board_info.board_id == BOARD_PM359) &&
+ if (board_info.board_id == BOARD_PM375 ||
+ ((board_info.board_id == BOARD_PM359) &&
((board_info.sku >= 0x0003) ||
((board_info.sku == 0x0002) && (board_info.major_revision == 'B')) ||
((board_info.sku == 0x0001) && (board_info.major_revision == 'C')) ||
- ((board_info.sku == 0x0000) && (board_info.major_revision == 'C'))))
+ ((board_info.sku == 0x0000) && (board_info.major_revision == 'C')))))
reg_init_value = 0x1e;
for (i = 0; i < PMU_CPU_VDD_MAP_SIZE; i++) {
@@ -133,6 +134,7 @@ static inline void fill_reg_map(void)
}
}
+
#ifdef CONFIG_ARCH_TEGRA_HAS_CL_DVFS
static struct tegra_cl_dvfs_platform_data laguna_cl_dvfs_data = {
.dfll_clk_name = "dfll_cpu",
diff --git a/arch/arm/mach-tegra/tegra-board-id.h b/arch/arm/mach-tegra/tegra-board-id.h
index e113ef0a3c3b..048d9b03a354 100644
--- a/arch/arm/mach-tegra/tegra-board-id.h
+++ b/arch/arm/mach-tegra/tegra-board-id.h
@@ -64,6 +64,7 @@
#define BOARD_E1971 0x07B3
#define BOARD_E1973 0x07B5
#define BOARD_E1991 0x07c7
+#define BOARD_PM375 0x0177
/* Board SKU */
#define BOARD_SKU_FOSTER 0x0384
generated by cgit v1.2.3 (git 2.0.4) at 2024-11-16 06:07:16 +0000