aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSubramaniam Chanderashekarapuram2014-05-09 13:45:14 -0500
committerSubramaniam Chanderashekarapuram2014-05-09 13:45:14 -0500
commit4cf68dece85af7fab62be02cde28b0934ec89a0b (patch)
treeb7c0ce7486491883d0d048bcf4d0489a916cf407
parentc47488acc318f9e6086dcfe17bfb84e5aa481bf4 (diff)
downloadkernel-omap-p-ti-linux-3.8.y-presi-wip-v3.tar.gz
kernel-omap-p-ti-linux-3.8.y-presi-wip-v3.tar.xz
kernel-omap-p-ti-linux-3.8.y-presi-wip-v3.zip
enable ipu related hwmods and switch to omap2plus_defconfigp-ti-linux-3.8.y-presi-wip-v3
Change-Id: I0098a16cde600eb7f7394b361a8553283825cc99 Signed-off-by: Subramaniam Chanderashekarapuram <subramaniam.ca@ti.com>
-rw-r--r--arch/arm/boot/dts/dra7.dtsi1
-rw-r--r--arch/arm/boot/dts/dra72-evm.dts2
-rw-r--r--arch/arm/boot/dts/dra72x.dtsi2
-rw-r--r--arch/arm/configs/omap2plus_defconfig1
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_7xx_data.c5
5 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index cce18e806cc8..5b0aeb9d5613 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -957,7 +957,6 @@
957 ti,hwmods = "dss_core"; 957 ti,hwmods = "dss_core";
958 #address-cells = <1>; 958 #address-cells = <1>;
959 #size-cells = <0>; 959 #size-cells = <0>;
960 vdda_video-supply = <&ldoln_reg>;
961 960
962 dispc { 961 dispc {
963 compatible = "ti,omap4-dispc"; 962 compatible = "ti,omap4-dispc";
diff --git a/arch/arm/boot/dts/dra72-evm.dts b/arch/arm/boot/dts/dra72-evm.dts
index e1e912ab87bf..1fdc7439d3a9 100644
--- a/arch/arm/boot/dts/dra72-evm.dts
+++ b/arch/arm/boot/dts/dra72-evm.dts
@@ -7,7 +7,7 @@
7 */ 7 */
8/dts-v1/; 8/dts-v1/;
9 9
10#include "dra72x.dtsi" 10/include/ "dra72x.dtsi"
11 11
12/ { 12/ {
13 model = "TI DRA722"; 13 model = "TI DRA722";
diff --git a/arch/arm/boot/dts/dra72x.dtsi b/arch/arm/boot/dts/dra72x.dtsi
index f1ec22f6ebf4..f43d759f426e 100644
--- a/arch/arm/boot/dts/dra72x.dtsi
+++ b/arch/arm/boot/dts/dra72x.dtsi
@@ -7,7 +7,7 @@
7 * Based on "omap4.dtsi" 7 * Based on "omap4.dtsi"
8 */ 8 */
9 9
10#include "dra7.dtsi" 10/include/ "dra7.dtsi"
11 11
12/ { 12/ {
13 compatible = "ti,dra722", "ti,dra72", "ti,dra7"; 13 compatible = "ti,dra722", "ti,dra72", "ti,dra7";
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
index fa6ba02eddb6..fa949e1ddb90 100644
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -26,6 +26,7 @@ CONFIG_OMAP_RESET_CLOCKS=y
26CONFIG_OMAP_MUX_DEBUG=y 26CONFIG_OMAP_MUX_DEBUG=y
27CONFIG_SOC_OMAP5=y 27CONFIG_SOC_OMAP5=y
28CONFIG_SOC_DRA7XX=y 28CONFIG_SOC_DRA7XX=y
29CONFIG_DRA7X_ZEBU=y
29CONFIG_IVA_HIGH_OPP=y 30CONFIG_IVA_HIGH_OPP=y
30CONFIG_ARM_THUMBEE=y 31CONFIG_ARM_THUMBEE=y
31CONFIG_ARM_ERRATA_411920=y 32CONFIG_ARM_ERRATA_411920=y
diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
index 724d23bd6531..8a39858e52ab 100644
--- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
@@ -6903,13 +6903,13 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = {
6903 &dra7xx_l3_main_1__gpu, 6903 &dra7xx_l3_main_1__gpu,
6904#endif 6904#endif
6905 &dra7xx_l4_per1__hdq1w, 6905 &dra7xx_l4_per1__hdq1w,
6906#ifndef CONFIG_DRA7X_ZEBU 6906//#ifndef CONFIG_DRA7X_ZEBU
6907 &dra7xx_l4_per1__i2c1, 6907 &dra7xx_l4_per1__i2c1,
6908 &dra7xx_l4_per1__i2c2, 6908 &dra7xx_l4_per1__i2c2,
6909 &dra7xx_l4_per1__i2c3, 6909 &dra7xx_l4_per1__i2c3,
6910 &dra7xx_l4_per1__i2c4, 6910 &dra7xx_l4_per1__i2c4,
6911 &dra7xx_l4_per1__i2c5, 6911 &dra7xx_l4_per1__i2c5,
6912#endif 6912//#endif
6913 &dra7xx_ipu1__l3_main_1, 6913 &dra7xx_ipu1__l3_main_1,
6914 &dra7xx_ipu2__l3_main_1, 6914 &dra7xx_ipu2__l3_main_1,
6915 &dra7xx_l4_cfg__mailbox1, 6915 &dra7xx_l4_cfg__mailbox1,
@@ -6967,7 +6967,6 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = {
6967 &dra7xx_l4_per3__rtcss, 6967 &dra7xx_l4_per3__rtcss,
6968#endif 6968#endif
6969 &dra7xx_l4_cfg__sata, 6969 &dra7xx_l4_cfg__sata,
6970#endif
6971 &dra7xx_l4_cfg__smartreflex_core, 6970 &dra7xx_l4_cfg__smartreflex_core,
6972 &dra7xx_l4_cfg__smartreflex_dspeve, 6971 &dra7xx_l4_cfg__smartreflex_dspeve,
6973 &dra7xx_l4_cfg__smartreflex_gpu, 6972 &dra7xx_l4_cfg__smartreflex_gpu,