diff options
| author | Juan Gutierrez <juan.gutierrez@nxp.com> | 2017-04-24 15:40:32 -0500 |
|---|---|---|
| committer | Anson Huang <Anson.Huang@nxp.com> | 2017-06-09 22:19:40 +0800 |
| commit | 37d0dcafa3dcfe9f806778a2c0ceb9a0aca4a0d0 (patch) | |
| tree | 1545d33087e8816248039a1bdd5493928fa97b43 /arch/arm/boot/dts/imx6dqscm-1gb-evb-interleave-android-ldo.dts | |
| parent | 60b0a4f5d37b9f68bca8c9b39cd559dc9efd18a9 (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-interleave-android-ldo.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx6dqscm-1gb-evb-interleave-android-ldo.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6dqscm-1gb-evb-interleave-android-ldo.dts b/arch/arm/boot/dts/imx6dqscm-1gb-evb-interleave-android-ldo.dts index e0ca32841ced..5136cd77ed4b 100644 --- a/arch/arm/boot/dts/imx6dqscm-1gb-evb-interleave-android-ldo.dts +++ b/arch/arm/boot/dts/imx6dqscm-1gb-evb-interleave-android-ldo.dts @@ -28,7 +28,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>; }; @@ -140,7 +140,7 @@ vgen6_reg: vgen6 { regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3150000>; + regulator-max-microvolt = <3300000>; regulator-always-on; }; }; |