diff options
author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-04-04 14:23:55 +0200 |
---|---|---|
committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-04-04 14:23:55 +0200 |
commit | 837e5b8e0685e2e4974e5a86dfd7cbf5802e1422 (patch) | |
tree | 1b4e116a20e6fdef01a1fc9ee7b46aeeecc23ed0 /drivers/pinctrl/intel/pinctrl-broxton.c | |
parent | 418f717cce5834203e24368717f542360b020681 (diff) | |
parent | 61a4577c9a4419b99e647744923517d47255da35 (diff) |
Merge tag 'v4.4.59' into toradex_vf_4.4-next
This is the 4.4.59 stable release
Diffstat (limited to 'drivers/pinctrl/intel/pinctrl-broxton.c')
-rw-r--r-- | drivers/pinctrl/intel/pinctrl-broxton.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/intel/pinctrl-broxton.c b/drivers/pinctrl/intel/pinctrl-broxton.c index 5979d38c46b2..7329500943a3 100644 --- a/drivers/pinctrl/intel/pinctrl-broxton.c +++ b/drivers/pinctrl/intel/pinctrl-broxton.c @@ -19,7 +19,7 @@ #define BXT_PAD_OWN 0x020 #define BXT_HOSTSW_OWN 0x080 -#define BXT_PADCFGLOCK 0x090 +#define BXT_PADCFGLOCK 0x060 #define BXT_GPI_IE 0x110 #define BXT_COMMUNITY(s, e) \ |