diff options
| author | Tom Rini <trini@konsulko.com> | 2017-11-27 07:22:11 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-11-27 07:22:11 -0500 |
| commit | 6e6cf015e7cdd7ca83a933320a81201972bd5e5e (patch) | |
| tree | 997f0b96c2fdbea089ffa9ebf97f0b8fb2be8836 /drivers/pinctrl | |
| parent | 0931b6f20e19f6c412d6ad1ba8e3b50b2a70c3c0 (diff) | |
| parent | 5451ca4da99f09bce7a693056865c93c1182f183 (diff) | |
| download | u-boot-6e6cf015e7cdd7ca83a933320a81201972bd5e5e.tar.gz u-boot-6e6cf015e7cdd7ca83a933320a81201972bd5e5e.tar.xz u-boot-6e6cf015e7cdd7ca83a933320a81201972bd5e5e.zip | |
Merge git://www.denx.de/git/u-boot-imx
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/pinctrl')
| -rw-r--r-- | drivers/pinctrl/nxp/pinctrl-imx6.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/pinctrl/nxp/pinctrl-imx6.c b/drivers/pinctrl/nxp/pinctrl-imx6.c index 0f767d9079..cac577b40b 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx6.c +++ b/drivers/pinctrl/nxp/pinctrl-imx6.c @@ -13,6 +13,11 @@ static struct imx_pinctrl_soc_info imx6_pinctrl_soc_info; +/* FIXME Before reloaction, BSS is overlapped with DT area */ +static struct imx_pinctrl_soc_info imx6ul_pinctrl_soc_info = { + .flags = ZERO_OFFSET_VALID, +}; + static struct imx_pinctrl_soc_info imx6_snvs_pinctrl_soc_info = { .flags = ZERO_OFFSET_VALID, }; @@ -32,7 +37,7 @@ static const struct udevice_id imx6_pinctrl_match[] = { { .compatible = "fsl,imx6sll-iomuxc-snvs", .data = (ulong)&imx6_snvs_pinctrl_soc_info }, { .compatible = "fsl,imx6sll-iomuxc", .data = (ulong)&imx6_pinctrl_soc_info }, { .compatible = "fsl,imx6sx-iomuxc", .data = (ulong)&imx6_pinctrl_soc_info }, - { .compatible = "fsl,imx6ul-iomuxc", .data = (ulong)&imx6_pinctrl_soc_info }, + { .compatible = "fsl,imx6ul-iomuxc", .data = (ulong)&imx6ul_pinctrl_soc_info }, { .compatible = "fsl,imx6ull-iomuxc-snvs", .data = (ulong)&imx6_snvs_pinctrl_soc_info }, { /* sentinel */ } }; |