diff options
author | Teresa Remmet <t.remmet@phytec.de> | 2019-05-24 15:20:00 +0200 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2019-06-10 14:06:26 +0200 |
commit | 66fa560004b40842f090e4c167a10394ca579071 (patch) | |
tree | 40128d7f936f6954e8a7986755e9ae0f67ed5de0 | |
parent | ARM: dts: am335x-phycore-som: Add emmc node (diff) | |
download | linux-66fa560004b40842f090e4c167a10394ca579071.tar.xz linux-66fa560004b40842f090e4c167a10394ca579071.zip |
ARM: dts: am335x-phycore-som: Enable gpmc node in dts files
As nand flash is not always the primary storage device any more
disable it in the phycore-som include file. Enable it the device tree
files where it is populated.
Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | arch/arm/boot/dts/am335x-phycore-rdk.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/am335x-phycore-som.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/am335x-wega-rdk.dts | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/am335x-phycore-rdk.dts b/arch/arm/boot/dts/am335x-phycore-rdk.dts index 305f0b35d6ea..d674d91e18c7 100644 --- a/arch/arm/boot/dts/am335x-phycore-rdk.dts +++ b/arch/arm/boot/dts/am335x-phycore-rdk.dts @@ -13,6 +13,10 @@ #include "am335x-pcm-953.dtsi" /* SoM */ +&gpmc { + status = "okay"; +}; + &i2c_eeprom { status = "okay"; }; diff --git a/arch/arm/boot/dts/am335x-phycore-som.dtsi b/arch/arm/boot/dts/am335x-phycore-som.dtsi index 2bc2265534e1..adf04dbefe28 100644 --- a/arch/arm/boot/dts/am335x-phycore-som.dtsi +++ b/arch/arm/boot/dts/am335x-phycore-som.dtsi @@ -190,7 +190,7 @@ }; &gpmc { - status = "okay"; + status = "disabled"; pinctrl-names = "default"; pinctrl-0 = <&nandflash_pins>; ranges = <0 0 0x08000000 0x1000000>; /* CS0: NAND */ diff --git a/arch/arm/boot/dts/am335x-wega-rdk.dts b/arch/arm/boot/dts/am335x-wega-rdk.dts index 6431b7db8109..fd8a844ba780 100644 --- a/arch/arm/boot/dts/am335x-wega-rdk.dts +++ b/arch/arm/boot/dts/am335x-wega-rdk.dts @@ -13,6 +13,10 @@ #include "am335x-wega.dtsi" /* SoM */ +&gpmc { + status = "okay"; +}; + &i2c_eeprom { status = "okay"; }; |