diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-13 15:32:29 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-13 15:32:29 +0200 |
| commit | 7697ff111e24b00acdd2ecffa79ba75a5ba1cc69 (patch) | |
| tree | 5ba5cede19c8bfe1170722dbb1f9c306ea7c882f | |
| parent | c76d52f5d261371c7d624bde68bcb2e467ca7fdf (diff) | |
| download | stable-queue-7697ff111e24b00acdd2ecffa79ba75a5ba1cc69.tar.gz | |
3.0 patches
| -rw-r--r-- | queue-3.0/mxc-iomux-v3-correct-no_pad_ctrl-definition.patch | 46 | ||||
| -rw-r--r-- | queue-3.0/series | 1 |
2 files changed, 47 insertions, 0 deletions
diff --git a/queue-3.0/mxc-iomux-v3-correct-no_pad_ctrl-definition.patch b/queue-3.0/mxc-iomux-v3-correct-no_pad_ctrl-definition.patch new file mode 100644 index 0000000000..e0ffe582f1 --- /dev/null +++ b/queue-3.0/mxc-iomux-v3-correct-no_pad_ctrl-definition.patch @@ -0,0 +1,46 @@ +From 425933b30b0ccfac58065bca6c853ea627443cdf Mon Sep 17 00:00:00 2001 +From: Troy Kisky <troy.kisky@boundarydevices.com> +Date: Fri, 24 Jun 2011 10:52:56 -0700 +Subject: MXC: iomux-v3: correct NO_PAD_CTRL definition + +From: Troy Kisky <troy.kisky@boundarydevices.com> + +commit 425933b30b0ccfac58065bca6c853ea627443cdf upstream. + +iomux-v3.c uses NO_PAD_CTRL as a 32 bit value +so it should not be shifted left by MUX_PAD_CTRL_SHIFT(41) + +Previously, anything requesting NO_PAD_CTRL would get +their pad control register set to 0. + +Since it is a pad control mask, place it with the other mask values. + +Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> +Acked-by: Lothar Waßmann <LW@KARO-electronics.de> +Tested-by: Lothar Waßmann <LW@KARO-electronics.de> +Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> +Cc: John Ogness <john.ogness@linutronix.de> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + arch/arm/plat-mxc/include/mach/iomux-v3.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm/plat-mxc/include/mach/iomux-v3.h ++++ b/arch/arm/plat-mxc/include/mach/iomux-v3.h +@@ -66,7 +66,6 @@ typedef u64 iomux_v3_cfg_t; + #define MUX_MODE_MASK ((iomux_v3_cfg_t)0x1f << MUX_MODE_SHIFT) + #define MUX_PAD_CTRL_SHIFT 41 + #define MUX_PAD_CTRL_MASK ((iomux_v3_cfg_t)0x1ffff << MUX_PAD_CTRL_SHIFT) +-#define NO_PAD_CTRL ((iomux_v3_cfg_t)1 << (MUX_PAD_CTRL_SHIFT + 16)) + #define MUX_SEL_INPUT_SHIFT 58 + #define MUX_SEL_INPUT_MASK ((iomux_v3_cfg_t)0xf << MUX_SEL_INPUT_SHIFT) + +@@ -85,6 +84,7 @@ typedef u64 iomux_v3_cfg_t; + * Use to set PAD control + */ + ++#define NO_PAD_CTRL (1 << 16) + #define PAD_CTL_DVS (1 << 13) + #define PAD_CTL_HYS (1 << 8) + diff --git a/queue-3.0/series b/queue-3.0/series index c831516acf..e72eb760e4 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -53,3 +53,4 @@ drm-radeon-kms-make-sure-pci-max-read-request-size-is-valid-on-evergreen-v2.patc mm-page-allocator-initialise-zlc-for-first-zone-eligible-for-zone_reclaim.patch mm-page-allocator-reconsider-zones-for-allocation-after-direct-reclaim.patch igb-fix-wol-on-second-port-of-i350-device.patch +mxc-iomux-v3-correct-no_pad_ctrl-definition.patch |