diff options
| author | Juan Gutierrez <juan.gutierrez@nxp.com> | 2017-04-24 15:40:32 -0500 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:26:22 +0800 |
| commit | 3a7d91a79c3448f7ecb7643bab95eeb691a900da (patch) | |
| tree | a97bb88d13f07b82038d14a68dcb4d6334599c7b /arch/arm/boot/dts/imx6dqscm-1gb-evb-fix-ldo.dts | |
| parent | ba17bee537f464fa0d0c68f0f6786b1b2a9cdd90 (diff) | |
MXSCM-293-1 arm: dts: fixes for MX6 SCM devices on L4.9
- replace legacy wakeup property with 'wakeup-source'
- add "jedec,spi-nor" flash compatible binding
- fix lcd display id
- fixig typo for gpios
- use external wdog_b reset instead of issuing a sw reset
- add off-on-delay for usdhc vmmc-supply regulator on mx6sxscm
- add missing sai1 and wdog1 configs for mx6sxscm
- fix vgen6 regulator maximum microvolt for mx6dqscm
- disable CAAM since cannot coexist with LCDIF for mx6sxscm
- add the reg into the rpmsg node for mx6sxscm
Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>
Diffstat (limited to 'arch/arm/boot/dts/imx6dqscm-1gb-evb-fix-ldo.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx6dqscm-1gb-evb-fix-ldo.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6dqscm-1gb-evb-fix-ldo.dts b/arch/arm/boot/dts/imx6dqscm-1gb-evb-fix-ldo.dts index f0dcf7dc9b96..1013cf7d3997 100644 --- a/arch/arm/boot/dts/imx6dqscm-1gb-evb-fix-ldo.dts +++ b/arch/arm/boot/dts/imx6dqscm-1gb-evb-fix-ldo.dts @@ -32,7 +32,7 @@ internal_scm_flash: m25p80@0 { #address-cells = <1>; #size-cells = <1>; - compatible = "micron,n25q128a13"; + compatible = "micron,n25q128a13", "jedec,spi-nor"; spi-max-frequency = <20000000>; reg = <0>; }; @@ -151,7 +151,7 @@ vgen6_reg: vgen6 { regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3150000>; + regulator-max-microvolt = <3300000>; regulator-always-on; }; }; |