From: Greg Kroah-Hartman Date: Wed, 9 May 2012 18:47:31 +0000 (-0700) Subject: 3.3-stable patches X-Git-Tag: v3.3.6~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a692159d734b82e9ee4b3057853cf69e5d5a4dbb;p=thirdparty%2Fkernel%2Fstable-queue.git 3.3-stable patches added patches: arm-omap-revert-arm-omap-ctrl-fix-control_dsiphy-register-fields.patch arm-orion5x-fix-gpio-enable-bits-for-mpp9.patch regulator-fix-the-logic-to-ensure-new-voltage-setting-in-valid-range.patch --- diff --git a/queue-3.3/arm-omap-revert-arm-omap-ctrl-fix-control_dsiphy-register-fields.patch b/queue-3.3/arm-omap-revert-arm-omap-ctrl-fix-control_dsiphy-register-fields.patch new file mode 100644 index 00000000000..e4b3965ed56 --- /dev/null +++ b/queue-3.3/arm-omap-revert-arm-omap-ctrl-fix-control_dsiphy-register-fields.patch @@ -0,0 +1,49 @@ +From 08ca7444f589bedf9ad5d82883e5d0754852d73b Mon Sep 17 00:00:00 2001 +From: Archit Taneja +Date: Thu, 19 Apr 2012 17:39:16 +0530 +Subject: ARM: OMAP: Revert "ARM: OMAP: ctrl: Fix CONTROL_DSIPHY register fields" + +From: Archit Taneja + +commit 08ca7444f589bedf9ad5d82883e5d0754852d73b upstream. + +This reverts commit 46f8c3c7e95c0d30d95911e7975ddc4f93b3e237. + +The commit above swapped the DSI1_PPID and DSI2_PPID register fields in +CONTROL_DSIPHY to be in sync with the newer public OMAP TRMs(after version V). + +With this commit, contention errors were reported on DSI lanes some OMAP4 SDPs. +After probing the DSI lanes on OMAP4 SDP, it was seen that setting bits in the +DSI2_PPID field was pulling up voltage on DSI1 lanes, and DSI1_PPID field was +pulling up voltage on DSI2 lanes. + +This proves that the current version of OMAP4 TRM is incorrect, swap the +position of register fields according to the older TRM versions as they were +correct. + +Acked-by: Tomi Valkeinen +Signed-off-by: Archit Taneja +Signed-off-by: Tony Lindgren +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h ++++ b/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h +@@ -941,10 +941,10 @@ + #define OMAP4_DSI2_LANEENABLE_MASK (0x7 << 29) + #define OMAP4_DSI1_LANEENABLE_SHIFT 24 + #define OMAP4_DSI1_LANEENABLE_MASK (0x1f << 24) +-#define OMAP4_DSI2_PIPD_SHIFT 19 +-#define OMAP4_DSI2_PIPD_MASK (0x1f << 19) +-#define OMAP4_DSI1_PIPD_SHIFT 14 +-#define OMAP4_DSI1_PIPD_MASK (0x1f << 14) ++#define OMAP4_DSI1_PIPD_SHIFT 19 ++#define OMAP4_DSI1_PIPD_MASK (0x1f << 19) ++#define OMAP4_DSI2_PIPD_SHIFT 14 ++#define OMAP4_DSI2_PIPD_MASK (0x1f << 14) + + /* CONTROL_MCBSPLP */ + #define OMAP4_ALBCTRLRX_FSX_SHIFT 31 diff --git a/queue-3.3/arm-orion5x-fix-gpio-enable-bits-for-mpp9.patch b/queue-3.3/arm-orion5x-fix-gpio-enable-bits-for-mpp9.patch new file mode 100644 index 00000000000..d1a7da3a464 --- /dev/null +++ b/queue-3.3/arm-orion5x-fix-gpio-enable-bits-for-mpp9.patch @@ -0,0 +1,40 @@ +From 48d99f47a81a66bdd61a348c7fe8df5a7afdf5f3 Mon Sep 17 00:00:00 2001 +From: Ben Hutchings +Date: Sun, 8 Apr 2012 05:18:53 +0100 +Subject: ARM: orion5x: Fix GPIO enable bits for MPP9 + +From: Ben Hutchings + +commit 48d99f47a81a66bdd61a348c7fe8df5a7afdf5f3 upstream. + +Commit 554cdaefd1cf7bb54b209c4e68c7cec87ce442a9 ('ARM: orion5x: Refactor +mpp code to use common orion platform mpp.') seems to have accidentally +inverted the GPIO valid bits for MPP9 (only). For the mv2120 platform +which uses MPP9 as a GPIO LED device, this results in the error: + +[ 12.711476] leds-gpio: probe of leds-gpio failed with error -22 + +Reported-by: Henry von Tresckow +References: http://bugs.debian.org/667446 +Signed-off-by: Ben Hutchings +Tested-by: Hans Henry von Tresckow +Signed-off-by: Jason Cooper +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/mach-orion5x/mpp.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/arch/arm/mach-orion5x/mpp.h ++++ b/arch/arm/mach-orion5x/mpp.h +@@ -65,8 +65,8 @@ + #define MPP8_GIGE MPP(8, 0x1, 0, 0, 1, 1, 1) + + #define MPP9_UNUSED MPP(9, 0x0, 0, 0, 1, 1, 1) +-#define MPP9_GPIO MPP(9, 0x0, 0, 0, 1, 1, 1) +-#define MPP9_GIGE MPP(9, 0x1, 1, 1, 1, 1, 1) ++#define MPP9_GPIO MPP(9, 0x0, 1, 1, 1, 1, 1) ++#define MPP9_GIGE MPP(9, 0x1, 0, 0, 1, 1, 1) + + #define MPP10_UNUSED MPP(10, 0x0, 0, 0, 1, 1, 1) + #define MPP10_GPIO MPP(10, 0x0, 1, 1, 1, 1, 1) diff --git a/queue-3.3/regulator-fix-the-logic-to-ensure-new-voltage-setting-in-valid-range.patch b/queue-3.3/regulator-fix-the-logic-to-ensure-new-voltage-setting-in-valid-range.patch new file mode 100644 index 00000000000..80a635cde38 --- /dev/null +++ b/queue-3.3/regulator-fix-the-logic-to-ensure-new-voltage-setting-in-valid-range.patch @@ -0,0 +1,32 @@ +From f55205f4d4a8823a11bb8b37ef2ecbd78fb09463 Mon Sep 17 00:00:00 2001 +From: Axel Lin +Date: Wed, 11 Apr 2012 20:53:58 +0800 +Subject: regulator: Fix the logic to ensure new voltage setting in valid range + +From: Axel Lin + +commit f55205f4d4a8823a11bb8b37ef2ecbd78fb09463 upstream. + +I think this is a typo. +To ensure new voltage setting won't greater than desc->max, +the equation should be desc->min + desc->step * new_val <= desc->max. + +Signed-off-by: Axel Lin +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/regulator/max8997.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/regulator/max8997.c ++++ b/drivers/regulator/max8997.c +@@ -689,7 +689,7 @@ static int max8997_set_voltage_buck(stru + } + + new_val++; +- } while (desc->min + desc->step + new_val <= desc->max); ++ } while (desc->min + desc->step * new_val <= desc->max); + + new_idx = tmp_idx; + new_val = tmp_val; diff --git a/queue-3.3/series b/queue-3.3/series index afb364668f4..e74f099752e 100644 --- a/queue-3.3/series +++ b/queue-3.3/series @@ -16,3 +16,6 @@ arm-7410-1-add-extra-clobber-registers-for-assembly-in-kernel_execve.patch arm-7411-1-audit-fix-treatment-of-saved-ip-register-during-syscall-tracing.patch arm-7412-1-audit-use-only-audit_arch_arm-regardless-of-endianness.patch arm-7414-1-smp-prevent-use-of-the-console-when-using-idmap_pgd.patch +regulator-fix-the-logic-to-ensure-new-voltage-setting-in-valid-range.patch +arm-orion5x-fix-gpio-enable-bits-for-mpp9.patch +arm-omap-revert-arm-omap-ctrl-fix-control_dsiphy-register-fields.patch