arm: tegra: p2360: Add SDMMC devices to DT

Bug 1500533
bug 200014401

Change-Id: I101646a2c45ad2d0937a251b201e34c146b8871e
Signed-off-by: Raveesh Kote <rkote@nvidia.com>
Signed-off-by: Vipin Kumar <vipink@nvidia.com>
Reviewed-on: http://git-master/r/424762
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Sandeep Trasi <strasi@nvidia.com>

diff --git a/arch/arm/boot/dts/tegra124-p2360.dts b/arch/arm/boot/dts/tegra124-p2360.dts
index 3fcabc9bdf46e565b58b791d8e4c93d9ca7fa566..a974e4e2c880dcedd2f9fd214a39bd6f28bd62fc 100644 (file)
--- a/arch/arm/boot/dts/tegra124-p2360.dts
+++ b/arch/arm/boot/dts/tegra124-p2360.dts
@@ -78,4 +78,17 @@
                nvidia,port1_status = <1>;
                status = "okay";
        };
+
+       sdhci@700b0600 {
+               tap-delay = <0x4>;
+               trim-delay = <0x4>;
+               ddr-trim-delay = <0x4>;
+               mmc-ocr-mask = <0>;
+               uhs_mask = <0x20>;
+               bus-width = <8>;
+               built-in;
+               ddr-clk-limit = <51000000>;
+               max-clk-limit = <200000000>;
+               status = "okay";
+       };
 };

diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile
index 80af25d43d3159ed804ac79def7de4d17c124e68..45cde73c4d93888c290967587d033e3c5842e499 100644 (file)
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@ -188,7 +188,6 @@ obj-${CONFIG_MACH_VCM30_T124}           += board-vcm30_t124-panel.o
 obj-${CONFIG_MACH_VCM30_T124}           += therm-monitor.o
 
 obj-${CONFIG_MACH_P2360}                += board-p2360.o
-obj-${CONFIG_MACH_P2360}                += board-p2360-sdhci.o
 obj-${CONFIG_MACH_P2360}                += board-p2360-panel.o
 obj-${CONFIG_MACH_P2360}                += therm-monitor.o
 

diff --git a/arch/arm/mach-tegra/board-p2360-sdhci.c b/arch/arm/mach-tegra/board-p2360-sdhci.c
deleted file mode 100644 (file)
index d2bf33d..0000000
--- a/arch/arm/mach-tegra/board-p2360-sdhci.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * arch/arm/mach-tegra/board-p2360-sdhci.c
- * Based on arch/arm/mach-tegra/board-vcm30_t124-sdhci.c
- *
- * 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/platform_device.h>
-#include <linux/mmc/host.h>
-#include <linux/platform_data/mmc-sdhci-tegra.h>
-
-#include "board.h"
-#include "board-p2360.h"
-#include "devices.h"
-
-static struct tegra_sdhci_platform_data tegra_sdhci_platform_data4 = {
-       .cd_gpio = -1,
-       .wp_gpio = -1,
-       .power_gpio = -1,
-       .is_8bit = true,
-       .tap_delay = 0x4,
-       .trim_delay = 0x4,
-       .ddr_trim_delay = 0x4,
-       .mmc_data = {
-               .built_in = 1,
-               .ocr_mask = MMC_OCR_1V8_MASK,
-       },
-       .uhs_mask = MMC_MASK_HS200,
-       .ddr_clk_limit = 51000000,
-       .max_clk_limit = 102000000,
-       /*      .max_clk = 12000000, */
-};
-
-int __init p2360_sdhci_init(void)
-{
-       tegra_sdhci_device4.dev.platform_data = &tegra_sdhci_platform_data4;
-       platform_device_register(&tegra_sdhci_device4);
-
-       return 0;
-}

diff --git a/arch/arm/mach-tegra/board-p2360.c b/arch/arm/mach-tegra/board-p2360.c
index d53470697e0816bc1e5dd6050132cbd8f05cc26f..a7876093ce88594aa349ab84fbad9697ceb52e1f 100644 (file)
--- a/arch/arm/mach-tegra/board-p2360.c
+++ b/arch/arm/mach-tegra/board-p2360.c
@@ -538,7 +538,6 @@ static void __init tegra_p2360_late_init(void)
 
        p2360_uart_init();
        platform_add_devices(p2360_devices, ARRAY_SIZE(p2360_devices));
-       p2360_sdhci_init();
 
        isomgr_init();