From: Greg Kroah-Hartman Date: Wed, 7 Mar 2012 19:55:44 +0000 (-0800) Subject: 3.2-stable patches X-Git-Tag: v3.0.24~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a082ff138756b3063a51722f453d061c1ec1414c;p=thirdparty%2Fkernel%2Fstable-queue.git 3.2-stable patches added patches: omap-4430sdp-panda-rename-hpd-gpio-to-ct_cp_hpd.patch omap-4430sdp-panda-setup-hdmi-gpio-muxes.patch omapdss-remove-wrong-hdmi-hpd-muxing.patch --- diff --git a/queue-3.2/omap-4430sdp-panda-rename-hpd-gpio-to-ct_cp_hpd.patch b/queue-3.2/omap-4430sdp-panda-rename-hpd-gpio-to-ct_cp_hpd.patch new file mode 100644 index 00000000000..8a65d46ba4a --- /dev/null +++ b/queue-3.2/omap-4430sdp-panda-rename-hpd-gpio-to-ct_cp_hpd.patch @@ -0,0 +1,64 @@ +From 3932a32fcf5393f8be70ac99dc718ad7ad0a415b Mon Sep 17 00:00:00 2001 +From: Tomi Valkeinen +Date: Tue, 17 Jan 2012 10:49:38 +0200 +Subject: OMAP: 4430SDP/Panda: rename HPD GPIO to CT_CP_HPD + +From: Tomi Valkeinen + +commit 3932a32fcf5393f8be70ac99dc718ad7ad0a415b upstream. + +The GPIO 60 on 4430sdp and Panda is not HPD GPIO, as currently marked in +the board files, but CT_CP_HPD, which is used to enable/disable HPD +functionality. + +This patch renames the GPIO. + +Signed-off-by: Tomi Valkeinen +Acked-by: Tony Lindgren +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/mach-omap2/board-4430sdp.c | 4 ++-- + arch/arm/mach-omap2/board-omap4panda.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +--- a/arch/arm/mach-omap2/board-4430sdp.c ++++ b/arch/arm/mach-omap2/board-4430sdp.c +@@ -52,7 +52,7 @@ + #define ETH_KS8851_QUART 138 + #define OMAP4_SFH7741_SENSOR_OUTPUT_GPIO 184 + #define OMAP4_SFH7741_ENABLE_GPIO 188 +-#define HDMI_GPIO_HPD 60 /* Hot plug pin for HDMI */ ++#define HDMI_GPIO_CT_CP_HPD 60 /* HPD mode enable/disable */ + #define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */ + #define DISPLAY_SEL_GPIO 59 /* LCD2/PicoDLP switch */ + #define DLP_POWER_ON_GPIO 40 +@@ -610,7 +610,7 @@ static void sdp4430_hdmi_mux_init(void) + } + + static struct gpio sdp4430_hdmi_gpios[] = { +- { HDMI_GPIO_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_hpd" }, ++ { HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" }, + { HDMI_GPIO_LS_OE, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ls_oe" }, + }; + +--- a/arch/arm/mach-omap2/board-omap4panda.c ++++ b/arch/arm/mach-omap2/board-omap4panda.c +@@ -51,7 +51,7 @@ + #define GPIO_HUB_NRESET 62 + #define GPIO_WIFI_PMENA 43 + #define GPIO_WIFI_IRQ 53 +-#define HDMI_GPIO_HPD 60 /* Hot plug pin for HDMI */ ++#define HDMI_GPIO_CT_CP_HPD 60 /* HPD mode enable/disable */ + #define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */ + + /* wl127x BT, FM, GPS connectivity chip */ +@@ -494,7 +494,7 @@ static void omap4_panda_hdmi_mux_init(vo + } + + static struct gpio panda_hdmi_gpios[] = { +- { HDMI_GPIO_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_hpd" }, ++ { HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" }, + { HDMI_GPIO_LS_OE, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ls_oe" }, + }; + diff --git a/queue-3.2/omap-4430sdp-panda-setup-hdmi-gpio-muxes.patch b/queue-3.2/omap-4430sdp-panda-setup-hdmi-gpio-muxes.patch new file mode 100644 index 00000000000..81269e78444 --- /dev/null +++ b/queue-3.2/omap-4430sdp-panda-setup-hdmi-gpio-muxes.patch @@ -0,0 +1,45 @@ +From 78a1ad8f12db70b8b0a4548b90704de08ee216ce Mon Sep 17 00:00:00 2001 +From: Tomi Valkeinen +Date: Tue, 17 Jan 2012 11:02:36 +0200 +Subject: OMAP: 4430SDP/Panda: setup HDMI GPIO muxes + +From: Tomi Valkeinen + +commit 78a1ad8f12db70b8b0a4548b90704de08ee216ce upstream. + +The HDMI GPIO pins LS_OE and CT_CP_HPD are not currently configured. +This patch configures them as output pins. + +Signed-off-by: Tomi Valkeinen +Acked-by: Tony Lindgren +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/mach-omap2/board-4430sdp.c | 3 +++ + arch/arm/mach-omap2/board-omap4panda.c | 3 +++ + 2 files changed, 6 insertions(+) + +--- a/arch/arm/mach-omap2/board-4430sdp.c ++++ b/arch/arm/mach-omap2/board-4430sdp.c +@@ -824,6 +824,9 @@ static void omap_4430sdp_display_init(vo + sdp4430_hdmi_mux_init(); + sdp4430_picodlp_init(); + omap_display_init(&sdp4430_dss_data); ++ ++ omap_mux_init_gpio(HDMI_GPIO_LS_OE, OMAP_PIN_OUTPUT); ++ omap_mux_init_gpio(HDMI_GPIO_CT_CP_HPD, OMAP_PIN_OUTPUT); + } + + #ifdef CONFIG_OMAP_MUX +--- a/arch/arm/mach-omap2/board-omap4panda.c ++++ b/arch/arm/mach-omap2/board-omap4panda.c +@@ -541,6 +541,9 @@ void omap4_panda_display_init(void) + + omap4_panda_hdmi_mux_init(); + omap_display_init(&omap4_panda_dss_data); ++ ++ omap_mux_init_gpio(HDMI_GPIO_LS_OE, OMAP_PIN_OUTPUT); ++ omap_mux_init_gpio(HDMI_GPIO_CT_CP_HPD, OMAP_PIN_OUTPUT); + } + + static void __init omap4_panda_init(void) diff --git a/queue-3.2/omapdss-remove-wrong-hdmi-hpd-muxing.patch b/queue-3.2/omapdss-remove-wrong-hdmi-hpd-muxing.patch new file mode 100644 index 00000000000..d0f0ae26c71 --- /dev/null +++ b/queue-3.2/omapdss-remove-wrong-hdmi-hpd-muxing.patch @@ -0,0 +1,54 @@ +From 7bb122d155f742fe2d79849090c825be7b4a247e Mon Sep 17 00:00:00 2001 +From: Tomi Valkeinen +Date: Tue, 17 Jan 2012 10:59:00 +0200 +Subject: OMAPDSS: remove wrong HDMI HPD muxing + +From: Tomi Valkeinen + +commit 7bb122d155f742fe2d79849090c825be7b4a247e upstream. + +"hdmi_hpd" pin is muxed to INPUT and PULLUP, but the pin is not +currently used, and in the future when it is used, the pin is used as a +GPIO and is board specific, not an OMAP4 wide thing. + +So remove the muxing for now. + +Signed-off-by: Tomi Valkeinen +Acked-by: Tony Lindgren +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/mach-omap2/board-4430sdp.c | 4 ---- + arch/arm/mach-omap2/board-omap4panda.c | 4 ---- + 2 files changed, 8 deletions(-) + +--- a/arch/arm/mach-omap2/board-4430sdp.c ++++ b/arch/arm/mach-omap2/board-4430sdp.c +@@ -597,12 +597,8 @@ static void __init omap_sfh7741prox_init + + static void sdp4430_hdmi_mux_init(void) + { +- /* PAD0_HDMI_HPD_PAD1_HDMI_CEC */ +- omap_mux_init_signal("hdmi_hpd", +- OMAP_PIN_INPUT_PULLUP); + omap_mux_init_signal("hdmi_cec", + OMAP_PIN_INPUT_PULLUP); +- /* PAD0_HDMI_DDC_SCL_PAD1_HDMI_DDC_SDA */ + omap_mux_init_signal("hdmi_ddc_scl", + OMAP_PIN_INPUT_PULLUP); + omap_mux_init_signal("hdmi_ddc_sda", +--- a/arch/arm/mach-omap2/board-omap4panda.c ++++ b/arch/arm/mach-omap2/board-omap4panda.c +@@ -481,12 +481,8 @@ int __init omap4_panda_dvi_init(void) + + static void omap4_panda_hdmi_mux_init(void) + { +- /* PAD0_HDMI_HPD_PAD1_HDMI_CEC */ +- omap_mux_init_signal("hdmi_hpd", +- OMAP_PIN_INPUT_PULLUP); + omap_mux_init_signal("hdmi_cec", + OMAP_PIN_INPUT_PULLUP); +- /* PAD0_HDMI_DDC_SCL_PAD1_HDMI_DDC_SDA */ + omap_mux_init_signal("hdmi_ddc_scl", + OMAP_PIN_INPUT_PULLUP); + omap_mux_init_signal("hdmi_ddc_sda", diff --git a/queue-3.2/series b/queue-3.2/series index ca083b96d77..5cffba84ad4 100644 --- a/queue-3.2/series +++ b/queue-3.2/series @@ -57,3 +57,6 @@ drm-i915-fix-eld-writing-for-sandybridge.patch arm-orion-fix-usb-phy-for-orion5x.patch arm-orion-fix-orion5x-gpio-regression-from-mpp-cleanup.patch omap-4430sdp-panda-use-gpio_free_array-to-free-hdmi-gpios.patch +omap-4430sdp-panda-rename-hpd-gpio-to-ct_cp_hpd.patch +omapdss-remove-wrong-hdmi-hpd-muxing.patch +omap-4430sdp-panda-setup-hdmi-gpio-muxes.patch