From a9aa4233b8948ef212dd0b62d0bf4e8ef0b8894b Mon Sep 17 00:00:00 2001 From: Axel Haslam Date: Mon, 21 Nov 2016 16:41:55 +0100 Subject: ARM: dts: da850-lcdk: fix mmc card detect polarity The polarity of the card detect pin is inverted. Change it to reflect the right polarity for the board which is ACTIVE_LOW. Signed-off-by: Axel Haslam Signed-off-by: Sekhar Nori --- arch/arm/boot/dts/da850-lcdk.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/da850-lcdk.dts b/arch/arm/boot/dts/da850-lcdk.dts index 03f9bfda5385..8411a91911fd 100644 --- a/arch/arm/boot/dts/da850-lcdk.dts +++ b/arch/arm/boot/dts/da850-lcdk.dts @@ -122,7 +122,7 @@ bus-width = <4>; pinctrl-names = "default"; pinctrl-0 = <&mmc0_pins>; - cd-gpios = <&gpio 64 GPIO_ACTIVE_HIGH>; + cd-gpios = <&gpio 64 GPIO_ACTIVE_LOW>; status = "okay"; }; -- cgit v1.2.3 From e177e7307c47f7276626b0c36e8b10e90e7321d2 Mon Sep 17 00:00:00 2001 From: Fabien Parent Date: Thu, 24 Nov 2016 15:35:45 +0100 Subject: ARM: dts: da850-lcdk: Add ethernet0 alias to DT In order to avoid Linux generating a random mac address on every boot, add an ethernet0 alias that will allow u-boot to patch the dtb with the MAC address programmed into the EEPROM. Signed-off-by: Fabien Parent Signed-off-by: Sekhar Nori --- arch/arm/boot/dts/da850-lcdk.dts | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/boot/dts/da850-lcdk.dts b/arch/arm/boot/dts/da850-lcdk.dts index 8411a91911fd..bd976f286bc7 100644 --- a/arch/arm/boot/dts/da850-lcdk.dts +++ b/arch/arm/boot/dts/da850-lcdk.dts @@ -13,6 +13,7 @@ aliases { serial2 = &serial2; + ethernet0 = ð0; }; chosen { -- cgit v1.2.3 From 878e908ad95637dc6567a9b5f6876a580ae90dfa Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Thu, 24 Nov 2016 10:31:24 +0100 Subject: ARM: dts: da850: enable memctrl and mstpri nodes per board Currently the memory controller and master priorities drivers are enabled in da850.dtsi. For boards for which there are no settings defined, this makes these drivers emit error messages. Disable the nodes in da850.dtsi and only enable them for da850-lcdk - the only board that currently needs them. Signed-off-by: Bartosz Golaszewski Signed-off-by: Sekhar Nori --- arch/arm/boot/dts/da850-lcdk.dts | 8 ++++++++ arch/arm/boot/dts/da850.dtsi | 2 ++ 2 files changed, 10 insertions(+) diff --git a/arch/arm/boot/dts/da850-lcdk.dts b/arch/arm/boot/dts/da850-lcdk.dts index bd976f286bc7..afcb4821deb1 100644 --- a/arch/arm/boot/dts/da850-lcdk.dts +++ b/arch/arm/boot/dts/da850-lcdk.dts @@ -228,3 +228,11 @@ }; }; }; + +&prictrl { + status = "okay"; +}; + +&memctrl { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi index 6205917b4f59..ffc6e1abd1b7 100644 --- a/arch/arm/boot/dts/da850.dtsi +++ b/arch/arm/boot/dts/da850.dtsi @@ -212,6 +212,7 @@ prictrl: priority-controller@14110 { compatible = "ti,da850-mstpri"; reg = <0x14110 0x0c>; + status = "disabled"; }; cfgchip: chip-controller@1417c { compatible = "ti,da830-cfgchip", "syscon", "simple-mfd"; @@ -467,5 +468,6 @@ memctrl: memory-controller@b0000000 { compatible = "ti,da850-ddr-controller"; reg = <0xb0000000 0xe8>; + status = "disabled"; }; }; -- cgit v1.2.3