summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorJon Mayo <jmayo@nvidia.com>2013-07-12 10:28:41 -0700
committerJon Mayo <jmayo@nvidia.com>2014-03-26 13:22:32 -0700
commit6b9135ba7fd0dd7968bba09be08b68a1a58085c4 (patch)
treecbfa368ce695bbce482a53daddfc4c4fa36103ae /arch/arm
parent8aa3ef6c308b70cba6b270542221d7f16b61585c (diff)
video: tegra: dc: fix ddc_bus typo in struct
Rename dcc_bus to ddc_bus. Bug 1325097 Change-Id: Id6d0241c5d31f7d8eb360cee84a93e68feb09b17 Signed-off-by: Jon Mayo <jmayo@nvidia.com> Reviewed-on: http://git-master/r/248471 (cherry picked from commit 0985b01c112e0e6ad56b468de5b2e728c77d7396) Reviewed-on: http://git-master/r/387198 GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-tegra/board-ardbeg-panel.c2
-rw-r--r--arch/arm/mach-tegra/board-dalmore-panel.c2
-rw-r--r--arch/arm/mach-tegra/board-loki-panel.c2
-rw-r--r--arch/arm/mach-tegra/board-macallan-panel.c2
-rw-r--r--arch/arm/mach-tegra/board-pismo-panel.c2
-rw-r--r--arch/arm/mach-tegra/board-pluto-panel.c2
-rw-r--r--arch/arm/mach-tegra/board-roth-panel.c2
-rw-r--r--arch/arm/mach-tegra/board-vcm30_t124-panel.c2
-rw-r--r--arch/arm/mach-tegra/include/mach/dc.h5
9 files changed, 12 insertions, 9 deletions
diff --git a/arch/arm/mach-tegra/board-ardbeg-panel.c b/arch/arm/mach-tegra/board-ardbeg-panel.c
index 35a629fd6fe4..a34d2cc36ee9 100644
--- a/arch/arm/mach-tegra/board-ardbeg-panel.c
+++ b/arch/arm/mach-tegra/board-ardbeg-panel.c
@@ -437,7 +437,7 @@ static struct tegra_dc_out ardbeg_disp2_out = {
.parent_clk = "pll_d",
#endif /* CONFIG_TEGRA_HDMI_PRIMARY */
- .dcc_bus = 3,
+ .ddc_bus = 3,
.hotplug_gpio = ardbeg_hdmi_hpd,
.hdmi_out = &ardbeg_hdmi_out,
diff --git a/arch/arm/mach-tegra/board-dalmore-panel.c b/arch/arm/mach-tegra/board-dalmore-panel.c
index cd69d977f943..a90f9d9810dd 100644
--- a/arch/arm/mach-tegra/board-dalmore-panel.c
+++ b/arch/arm/mach-tegra/board-dalmore-panel.c
@@ -285,7 +285,7 @@ static struct tegra_dc_out dalmore_disp2_out = {
.flags = TEGRA_DC_OUT_HOTPLUG_HIGH,
.parent_clk = "pll_d2_out0",
- .dcc_bus = 3,
+ .ddc_bus = 3,
.hotplug_gpio = dalmore_hdmi_hpd,
.hdmi_out = &dalmore_hdmi_out,
diff --git a/arch/arm/mach-tegra/board-loki-panel.c b/arch/arm/mach-tegra/board-loki-panel.c
index ce05ce3cc7c3..611f894def80 100644
--- a/arch/arm/mach-tegra/board-loki-panel.c
+++ b/arch/arm/mach-tegra/board-loki-panel.c
@@ -271,7 +271,7 @@ static struct tegra_dc_out loki_disp2_out = {
.flags = TEGRA_DC_OUT_HOTPLUG_HIGH,
.parent_clk = "pll_d2",
- .dcc_bus = 3,
+ .ddc_bus = 3,
.hotplug_gpio = loki_hdmi_hpd,
.max_pixclock = KHZ2PICOS(297000),
diff --git a/arch/arm/mach-tegra/board-macallan-panel.c b/arch/arm/mach-tegra/board-macallan-panel.c
index 4db92d8d3b64..61a9adbdef61 100644
--- a/arch/arm/mach-tegra/board-macallan-panel.c
+++ b/arch/arm/mach-tegra/board-macallan-panel.c
@@ -231,7 +231,7 @@ static struct tegra_dc_out macallan_disp2_out = {
.flags = TEGRA_DC_OUT_HOTPLUG_HIGH,
.parent_clk = "pll_d2_out0",
- .dcc_bus = 3,
+ .ddc_bus = 3,
.hotplug_gpio = macallan_hdmi_hpd,
.max_pixclock = KHZ2PICOS(297000),
diff --git a/arch/arm/mach-tegra/board-pismo-panel.c b/arch/arm/mach-tegra/board-pismo-panel.c
index ff4435ec19de..1ae4b497bc36 100644
--- a/arch/arm/mach-tegra/board-pismo-panel.c
+++ b/arch/arm/mach-tegra/board-pismo-panel.c
@@ -229,7 +229,7 @@ static struct tegra_dc_out pismo_disp2_out = {
.flags = TEGRA_DC_OUT_HOTPLUG_HIGH,
.parent_clk = "pll_d2_out0",
- .dcc_bus = 3,
+ .ddc_bus = 3,
.hotplug_gpio = pismo_hdmi_hpd,
.max_pixclock = KHZ2PICOS(148500),
diff --git a/arch/arm/mach-tegra/board-pluto-panel.c b/arch/arm/mach-tegra/board-pluto-panel.c
index 8a107a588618..f77aad087902 100644
--- a/arch/arm/mach-tegra/board-pluto-panel.c
+++ b/arch/arm/mach-tegra/board-pluto-panel.c
@@ -223,7 +223,7 @@ static struct tegra_dc_out pluto_disp2_out = {
.flags = TEGRA_DC_OUT_HOTPLUG_HIGH,
.parent_clk = "pll_d2_out0",
- .dcc_bus = 3,
+ .ddc_bus = 3,
.hotplug_gpio = pluto_hdmi_hpd,
.max_pixclock = KHZ2PICOS(297000),
diff --git a/arch/arm/mach-tegra/board-roth-panel.c b/arch/arm/mach-tegra/board-roth-panel.c
index 427ca7bce303..bd6ad0bf5206 100644
--- a/arch/arm/mach-tegra/board-roth-panel.c
+++ b/arch/arm/mach-tegra/board-roth-panel.c
@@ -746,7 +746,7 @@ static struct tegra_dc_out roth_disp2_out = {
.flags = TEGRA_DC_OUT_HOTPLUG_HIGH,
.parent_clk = "pll_d2_out0",
- .dcc_bus = 3,
+ .ddc_bus = 3,
.hotplug_gpio = roth_hdmi_hpd,
.max_pixclock = KHZ2PICOS(297000),
diff --git a/arch/arm/mach-tegra/board-vcm30_t124-panel.c b/arch/arm/mach-tegra/board-vcm30_t124-panel.c
index 9f6adceff4ff..624908574ae5 100644
--- a/arch/arm/mach-tegra/board-vcm30_t124-panel.c
+++ b/arch/arm/mach-tegra/board-vcm30_t124-panel.c
@@ -259,7 +259,7 @@ static struct tegra_dc_out vcm30_t124_disp2_out = {
TEGRA_DC_OUT_NVHDCP_POLICY_ON_DEMAND,
.parent_clk = "pll_d2",
- .dcc_bus = 3,
+ .ddc_bus = 3,
.hotplug_gpio = VCM30_T124_HDMI_HPD,
.hdmi_out = &vcm30_t124_hdmi_out,
diff --git a/arch/arm/mach-tegra/include/mach/dc.h b/arch/arm/mach-tegra/include/mach/dc.h
index 56fb83074502..37bdbffec2b0 100644
--- a/arch/arm/mach-tegra/include/mach/dc.h
+++ b/arch/arm/mach-tegra/include/mach/dc.h
@@ -526,6 +526,9 @@ enum {
TEGRA_PIN_OUT_CONFIG_SEL_LSPI_DE,
};
+/* this is the old name. provided for compatibility with old board files. */
+#define dcc_bus ddc_bus
+
struct tegra_dc_out {
int type;
unsigned flags;
@@ -534,7 +537,7 @@ struct tegra_dc_out {
unsigned h_size;
unsigned v_size;
- int dcc_bus;
+ int ddc_bus;
int hotplug_gpio;
int hotplug_state; /* 0 normal 1 force on */
const char *parent_clk;