summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/arm/boot/dts/tegra124-laguna-pm358.dts6
-rw-r--r--arch/arm/boot/dts/tegra124-laguna.dts12
-rw-r--r--arch/arm/mach-tegra/Makefile2
-rw-r--r--arch/arm/mach-tegra/board-ardbeg-sata.c64
-rw-r--r--arch/arm/mach-tegra/board-ardbeg.c8
-rw-r--r--arch/arm/mach-tegra/board-ardbeg.h2
-rw-r--r--arch/arm64/boot/dts/tegra132-norrin-pm374-0001-common.dtsi6
-rw-r--r--arch/arm64/mach-tegra/Makefile2
-rw-r--r--arch/arm64/mach-tegra/board-ardbeg64-sata.c2
-rw-r--r--arch/arm64/mach-tegra/board-t132ref-sata.c2
10 files changed, 21 insertions, 85 deletions
diff --git a/arch/arm/boot/dts/tegra124-laguna-pm358.dts b/arch/arm/boot/dts/tegra124-laguna-pm358.dts
index 9aeb8a63dcdc..69fb1b765379 100644
--- a/arch/arm/boot/dts/tegra124-laguna-pm358.dts
+++ b/arch/arm/boot/dts/tegra124-laguna-pm358.dts
@@ -109,4 +109,10 @@
nvidia,wake-gpio = <&gpio TEGRA_GPIO(DD, 3) 0>;
status = "okay";
};
+
+ sata@0x70020000 {
+ status = "okay";
+ nvidia,pexp-gpio = <&tca6416 9 0>;
+ nvidia,enable-sata-port;
+ };
};
diff --git a/arch/arm/boot/dts/tegra124-laguna.dts b/arch/arm/boot/dts/tegra124-laguna.dts
index e4de32bc1f05..3531e447616c 100644
--- a/arch/arm/boot/dts/tegra124-laguna.dts
+++ b/arch/arm/boot/dts/tegra124-laguna.dts
@@ -150,11 +150,6 @@
status = "okay";
};
- sata-controller {
- pexp-gpio = <&tca6416 9 0>;
- status = "okay";
- };
-
tegra-snd-max98090 {
compatible = "nvidia,tegra-snd-max98090";
nvidia,name = "tegra-snd-max98090";
@@ -173,4 +168,11 @@
nvidia,i2s-param,0,channels = <2>;
nvidia,i2s-param,0,bit-clk = <1536000>;
};
+
+ sata@0x70020000 {
+ status = "okay";
+ nvidia,pexp-gpio = <&tca6416 9 0>;
+ nvidia,enable-sata-port;
+ };
+
};
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile
index 285c89d79cea..ca7a87c1dd1e 100644
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@ -222,7 +222,6 @@ obj-${CONFIG_MACH_TEGRA_PLUTO} += panel-s-1080p-5.o
obj-${CONFIG_MACH_ARDBEG} += board-ardbeg.o
obj-${CONFIG_MACH_ARDBEG} += board-ardbeg-sdhci.o
-obj-${CONFIG_MACH_ARDBEG} += board-ardbeg-sata.o
obj-${CONFIG_MACH_ARDBEG} += board-ardbeg-sensors.o
obj-${CONFIG_MACH_ARDBEG} += board-ardbeg-panel.o
obj-${CONFIG_MACH_ARDBEG} += board-ardbeg-memory.o
@@ -264,7 +263,6 @@ obj-${CONFIG_MACH_LOKI} += panel-j-720p-5.o
obj-${CONFIG_MACH_LAGUNA} += board-ardbeg.o
obj-${CONFIG_MACH_LAGUNA} += board-ardbeg-sdhci.o
-obj-${CONFIG_MACH_LAGUNA} += board-ardbeg-sata.o
obj-${CONFIG_MACH_LAGUNA} += board-ardbeg-sensors.o
obj-${CONFIG_MACH_LAGUNA} += board-ardbeg-panel.o
obj-${CONFIG_MACH_LAGUNA} += board-laguna-power.o
diff --git a/arch/arm/mach-tegra/board-ardbeg-sata.c b/arch/arm/mach-tegra/board-ardbeg-sata.c
deleted file mode 100644
index a6f11b48c172..000000000000
--- a/arch/arm/mach-tegra/board-ardbeg-sata.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *
- * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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, see <http://www.gnu.org/licenses/>.
- */
-
-#include <linux/io.h>
-#include <linux/kernel.h>
-#include <linux/platform_data/tegra_ahci.h>
-#include <linux/tegra-soc.h>
-
-#include "board.h"
-#include "board-ardbeg.h"
-#include "devices.h"
-#include "iomap.h"
-#include "tegra-board-id.h"
-
-#ifdef CONFIG_SATA_AHCI_TEGRA
-static struct tegra_ahci_platform_data tegra_ahci_platform_data0 = {
- .gen2_rx_eq = -1,
- .pexp_gpio = PMU_TCA6416_GPIO(9),
-};
-#endif
-
-void arbdeg_sata_clk_gate(void)
-{
- u32 val;
- if (!tegra_platform_is_silicon())
- return;
- val = readl(IO_ADDRESS(CLK_RST_CNTRL_RST_DEV_W_SET));
- if (val & SET_CEC_RST)
- writel(0x108, IO_ADDRESS(CLK_RST_CNTRL_RST_DEV_V_SET));
- val = readl(IO_ADDRESS(CLK_RST_CNTRL_RST_DEV_W_SET));
- while (val & SET_CEC_RST)
- val = readl(IO_ADDRESS(CLK_RST_CNTRL_RST_DEV_W_SET));
-}
-
-int __init ardbeg_sata_init(void)
-{
-#ifdef CONFIG_SATA_AHCI_TEGRA
- struct board_info board_info;
- tegra_get_board_info(&board_info);
-
- if ((board_info.board_id != BOARD_PM358) &&
- (board_info.board_id != BOARD_PM359) &&
- (board_info.board_id != BOARD_PM374))
- tegra_ahci_platform_data0.pexp_gpio = -1;
-
- tegra_sata_device.dev.platform_data = &tegra_ahci_platform_data0;
- platform_device_register(&tegra_sata_device);
-#endif
- return 0;
-}
diff --git a/arch/arm/mach-tegra/board-ardbeg.c b/arch/arm/mach-tegra/board-ardbeg.c
index c57214dedaba..d4028d34ab23 100644
--- a/arch/arm/mach-tegra/board-ardbeg.c
+++ b/arch/arm/mach-tegra/board-ardbeg.c
@@ -926,6 +926,8 @@ static struct of_dev_auxdata ardbeg_auxdata_lookup[] __initdata = {
NULL),
OF_DEV_AUXDATA("nvidia,tegra124-camera", 0, "pcl-generic",
NULL),
+ OF_DEV_AUXDATA("nvidia,tegra114-ahci-sata", 0x70027000, "tegra-sata.0",
+ NULL),
{}
};
#endif
@@ -1290,12 +1292,6 @@ static void __init tegra_ardbeg_late_init(void)
loki_sdhci_init();
else
ardbeg_sdhci_init();
- if (board_info.board_id == BOARD_E1782 ||
- board_info.board_id == BOARD_PM374)
- ardbeg_sata_init();
- else if (board_info.board_id != BOARD_PM358 &&
- board_info.board_id != BOARD_PM359)
- arbdeg_sata_clk_gate();
if (board_info.board_id == BOARD_PM359 ||
board_info.board_id == BOARD_PM358 ||
board_info.board_id == BOARD_PM370 ||
diff --git a/arch/arm/mach-tegra/board-ardbeg.h b/arch/arm/mach-tegra/board-ardbeg.h
index 255fa5262d40..816d311615e4 100644
--- a/arch/arm/mach-tegra/board-ardbeg.h
+++ b/arch/arm/mach-tegra/board-ardbeg.h
@@ -30,8 +30,6 @@ int ardbeg_emc_init(void);
int ardbeg_display_init(void);
int ardbeg_panel_init(void);
int ardbeg_sdhci_init(void);
-int ardbeg_sata_init(void);
-void arbdeg_sata_clk_gate(void);
int ardbeg_sensors_init(void);
int ardbeg_regulator_init(void);
int ardbeg_suspend_init(void);
diff --git a/arch/arm64/boot/dts/tegra132-norrin-pm374-0001-common.dtsi b/arch/arm64/boot/dts/tegra132-norrin-pm374-0001-common.dtsi
index 8103d8748d42..b0757a304d50 100644
--- a/arch/arm64/boot/dts/tegra132-norrin-pm374-0001-common.dtsi
+++ b/arch/arm64/boot/dts/tegra132-norrin-pm374-0001-common.dtsi
@@ -137,4 +137,10 @@
nvidia,hsic0 = /bits/8 <0x1 0x1 0x8 0xa 0 0 1 0x22 0>;
status = "okay";
};
+
+ sata@0x70020000 {
+ status = "okay";
+ nvidia,pexp-gpio = <&tca6416 9 0>;
+ nvidia,enable-sata-port;
+ };
};
diff --git a/arch/arm64/mach-tegra/Makefile b/arch/arm64/mach-tegra/Makefile
index 8080d474869d..349a9fef3a7c 100644
--- a/arch/arm64/mach-tegra/Makefile
+++ b/arch/arm64/mach-tegra/Makefile
@@ -19,7 +19,6 @@ obj-${CONFIG_MACH_EXUMA} += board-ardbeg64-power.o
obj-${CONFIG_MACH_EXUMA} += board-ardbeg64-sdhci.o
obj-${CONFIG_MACH_EXUMA} += board-ardbeg64-sensors.o
obj-${CONFIG_MACH_EXUMA} += board-ardbeg64-sysedp.o
-obj-${CONFIG_MACH_EXUMA} += board-ardbeg64-sata.o
obj-${CONFIG_MACH_EXUMA} += board-norrin-power.o
obj-${CONFIG_MACH_EXUMA} += board-norrin64-memory.o
obj-${CONFIG_MACH_EXUMA} += board-tn8-power.o
@@ -45,7 +44,6 @@ obj-${CONFIG_MACH_T132REF} += board-t132ref-norrin-power.o
obj-${CONFIG_MACH_T132REF} += board-t132ref-norrin-memory.o
obj-${CONFIG_MACH_T132REF} += board-t132ref-panel.o
obj-${CONFIG_MACH_T132REF} += board-t132ref-power.o
-obj-${CONFIG_MACH_T132REF} += board-t132ref-sata.o
obj-${CONFIG_MACH_T132REF} += board-t132ref-sdhci.o
obj-${CONFIG_MACH_T132REF} += board-t132ref-tn8-power.o
obj-${CONFIG_MACH_T132REF} += board-t132ref-sysedp.o
diff --git a/arch/arm64/mach-tegra/board-ardbeg64-sata.c b/arch/arm64/mach-tegra/board-ardbeg64-sata.c
deleted file mode 100644
index 30e63f059e4a..000000000000
--- a/arch/arm64/mach-tegra/board-ardbeg64-sata.c
+++ /dev/null
@@ -1,2 +0,0 @@
-/* FIXME: temporary */
-#include "../../arm/mach-tegra/board-ardbeg-sata.c"
diff --git a/arch/arm64/mach-tegra/board-t132ref-sata.c b/arch/arm64/mach-tegra/board-t132ref-sata.c
deleted file mode 100644
index 30e63f059e4a..000000000000
--- a/arch/arm64/mach-tegra/board-t132ref-sata.c
+++ /dev/null
@@ -1,2 +0,0 @@
-/* FIXME: temporary */
-#include "../../arm/mach-tegra/board-ardbeg-sata.c"
generated by cgit v1.2.3 (git 2.0.4) at 2024-06-01 05:29:50 +0000