arm: tegra12: smmu: remove dependency on ppcs1/2

remove incorrect dependency on swgids ppcs1 and ppcs2.

Change-Id: I7a13ea4d01f0dca92b1994a3027f47e6435836d7
Signed-off-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-on: http://git-master/r/294250
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Hiroshi Doyu <hdoyu@nvidia.com>
Tested-by: Hiroshi Doyu <hdoyu@nvidia.com>

1 files changed, 29 insertions, 58 deletions

diff --git a/arch/arm/mach-tegra/devices.c b/arch/arm/mach-tegra/devices.c
index c6d55fe7c931..35f5793d29ee 100644
--- a/arch/arm/mach-tegra/devices.c
+++ b/arch/arm/mach-tegra/devices.c
@@ -2197,81 +2197,52 @@ struct swgid_fixup tegra_swgid_fixup_t124[] = {
 	{ .name = "host1x",	.swgids = SWGID(HC) | SWGID(VDE) |
 	  SWGID(EPP) | SWGID(HDA), },
 	{ .name = "isp",	.swgids = SWGID(ISP2) | SWGID(ISP2B), },
-	{ .name = "max77660",	.swgids = SWGID(PPCS) | SWGID(PPCS1) |
-	  SWGID(PPCS2), },
-	{ .name = "max8831",	.swgids = SWGID(PPCS) | SWGID(PPCS1) |
-	  SWGID(PPCS2), },
+	{ .name = "max77660",	.swgids = SWGID(PPCS), },
+	{ .name = "max8831",	.swgids = SWGID(PPCS), },
 	{ .name = "msenc",	.swgids = SWGID(MSENC), },
 	{ .name = "mpe",	.swgids = SWGID(MPE), },
 	{ .name = "tegra-aes",	.swgids = SWGID(VDE), },
 	{ .name = "nvavp",	.swgids = SWGID(AVPC) | SWGID(A9AVP), },
-	{ .name = "serial8250",	.swgids = SWGID(PPCS) | SWGID(PPCS1) |
-	  SWGID(PPCS2), },
-	{ .name = "serial-tegra",	.swgids = SWGID(PPCS) | SWGID(PPCS1) |
-	  SWGID(PPCS2), },
+	{ .name = "serial8250",	.swgids = SWGID(PPCS), },
+	{ .name = "serial-tegra",	.swgids = SWGID(PPCS), },
 	{ .name = "dtv",	.swgids = SWGID(PPCS), },
-	{ .name = "snd-soc-dummy",	.swgids = SWGID(PPCS) | SWGID(PPCS1) |
-	  SWGID(PPCS2), },
-	{ .name = "spdif-dit",	.swgids = SWGID(PPCS) | SWGID(PPCS1) |
-	  SWGID(PPCS2), },
-	{ .name = "tegra12-se",	.swgids = SWGID(PPCS) | SWGID(PPCS1) |
-	  SWGID(PPCS2), },
-	{ .name = "spi-tegra114",	.swgids = SWGID(PPCS) | SWGID(PPCS1) |
-	  SWGID(PPCS2), },
-	{ .name = "tegra14-i2c",	.swgids = SWGID(PPCS) | SWGID(PPCS1) |
-	  SWGID(PPCS2), },
-	{ .name = "tegra30-ahub",	.swgids = SWGID(PPCS) | SWGID(PPCS1) |
-	  SWGID(PPCS2), },
-	{ .name = "tegra30-dam",	.swgids = SWGID(PPCS) | SWGID(PPCS1) |
-	  SWGID(PPCS2), },
+	{ .name = "snd-soc-dummy",	.swgids = SWGID(PPCS), },
+	{ .name = "spdif-dit",	.swgids = SWGID(PPCS), },
+	{ .name = "tegra12-se",	.swgids = SWGID(PPCS), },
+	{ .name = "spi-tegra114",	.swgids = SWGID(PPCS), },
+	{ .name = "tegra14-i2c",	.swgids = SWGID(PPCS), },
+	{ .name = "tegra30-ahub",	.swgids = SWGID(PPCS), },
+	{ .name = "tegra30-dam",	.swgids = SWGID(PPCS), },
 	{ .name = "tegra30-hda",	.swgids = SWGID(HDA), },
-	{ .name = "tegra30-i2s",	.swgids = SWGID(PPCS) | SWGID(PPCS1) |
-	  SWGID(PPCS2), },
-	{ .name = "tegra30-spdif",	.swgids = SWGID(PPCS) | SWGID(PPCS1) |
-	  SWGID(PPCS2), },
+	{ .name = "tegra30-i2s",	.swgids = SWGID(PPCS), },
+	{ .name = "tegra30-spdif",	.swgids = SWGID(PPCS), },
 	{ .name = "tegradc.0", .swgids = SWGID(DC) | SWGID(DC12),
 	  .linear_map = tegra_fb_linear_map, },
 	{ .name = "tegradc.1", .swgids = SWGID(DCB),
 	  .linear_map = tegra_fb_linear_map, },
-	{ .name = "tegra_bb",	.swgids = SWGID(PPCS) | SWGID(PPCS1) |
-	  SWGID(PPCS2), },
-	{ .name = "tegra_dma",	.swgids = SWGID(PPCS) | SWGID(PPCS1) |
-	  SWGID(PPCS2), },
-	{ .name = "tegra-ehci",	.swgids = SWGID(PPCS) | SWGID(PPCS1) |
-	  SWGID(PPCS2), },
-	{ .name = "tegra-fuse",	.swgids = SWGID(PPCS) | SWGID(PPCS1) |
-	  SWGID(PPCS2), },
-	{ .name = "tegra-i2c",	.swgids = SWGID(PPCS) | SWGID(PPCS1) |
-	  SWGID(PPCS2), },
+	{ .name = "tegra_bb",	.swgids = SWGID(PPCS), },
+	{ .name = "tegra_dma",	.swgids = SWGID(PPCS), },
+	{ .name = "tegra-ehci",	.swgids = SWGID(PPCS), },
+	{ .name = "tegra-fuse",	.swgids = SWGID(PPCS), },
+	{ .name = "tegra-i2c",	.swgids = SWGID(PPCS), },
 	{ .name = "tegra-nvmap",	.swgids = SWGID(HC) | SWGID(AVPC), },
-	{ .name = "tegra-otg",	.swgids = SWGID(PPCS) | SWGID(PPCS1) |
-	  SWGID(PPCS2), },
-	{ .name = "tegra-pcm-audio",	.swgids = SWGID(PPCS) | SWGID(PPCS1) |
-	  SWGID(PPCS2), },
-	{ .name = "tegra-rtc",	.swgids = SWGID(PPCS) | SWGID(PPCS1) |
-	  SWGID(PPCS2), },
+	{ .name = "tegra-otg",	.swgids = SWGID(PPCS), },
+	{ .name = "tegra-pcm-audio",	.swgids = SWGID(PPCS), },
+	{ .name = "tegra-rtc",	.swgids = SWGID(PPCS), },
 	{ .name = "tegra-sata",	.swgids = SWGID(SATA2), },
-	{ .name = "tegra-se",	.swgids = SWGID(PPCS) | SWGID(PPCS1) |
-	  SWGID(PPCS2), },
-	{ .name = "tegra-snd",	.swgids = SWGID(PPCS) | SWGID(PPCS1) |
-	  SWGID(PPCS2), },
-	{ .name = "tegra-tzram",	.swgids = SWGID(PPCS) | SWGID(PPCS1) |
-	  SWGID(PPCS2), },
-	{ .name = "tegra_uart",	.swgids = SWGID(PPCS) | SWGID(PPCS1) |
-	  SWGID(PPCS2), },
-	{ .name = "tegra-udc",	.swgids = SWGID(PPCS) | SWGID(PPCS1) |
-	  SWGID(PPCS2), },
-	{ .name = "tegra_usb_modem_power",	.swgids = SWGID(PPCS) |
-	  SWGID(PPCS1) | SWGID(PPCS2), },
+	{ .name = "tegra-se",	.swgids = SWGID(PPCS), },
+	{ .name = "tegra-snd",	.swgids = SWGID(PPCS), },
+	{ .name = "tegra-tzram",	.swgids = SWGID(PPCS), },
+	{ .name = "tegra_uart",	.swgids = SWGID(PPCS), },
+	{ .name = "tegra-udc",	.swgids = SWGID(PPCS), },
+	{ .name = "tegra_usb_modem_power",	.swgids = SWGID(PPCS), },
 	{ .name = "tsec",	.swgids = SWGID(TSEC), },
 	/* vic must be before vi to prevent incorrect matching */
 	{ .name = "vic",	.swgids = SWGID(VIC), },
 	{ .name = "vi",	.swgids = SWGID(VI), },
-	{ .name = "therm_est",	.swgids = SWGID(PPCS) | SWGID(PPCS1) |
-	  SWGID(PPCS2), },
+	{ .name = "therm_est",	.swgids = SWGID(PPCS), },
 	{ .name = "gk20a",	.swgids = SWGID(GPU) | SWGID(GPUB), },
-	{ .name = "tegra124-apbdma",	.swgids = SWGID(PPCS) | SWGID(PPCS1) |
-	  SWGID(PPCS2), },
+	{ .name = "tegra124-apbdma",	.swgids = SWGID(PPCS), },
 	{ .name = "tegra-nor",	.swgids = SWGID(PPCS), },
 #ifdef CONFIG_PLATFORM_ENABLE_IOMMU
 	{ .name = dummy_name,	.swgids = SWGID(PPCS) },