Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3abb0c6c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v4.9/dt-pt1-signed' of... 

Merge tag 'omap-for-v4.9/dt-pt1-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Merge "DTS related changes for omaps for v4.9 merge window" from Tony Lindgren:

- Update elm phandle for am335x

- Fix overo NAND gpmc ranges, this has always been broken so it can
  wait for the merge window

- Fix NAND and use NAND ready pin for logicpd gpmc, this can wait too
  as it's been using the older configration since the dts got added

- A series of dtc warning fixes for unit names

- Keep dcdc3, 5 and 6 enabled during suspend on am347x boards

- Disable DDR regulator during rtc-only/poweroff mode for am437x boards

- Remove redundant regulator compatibles for am437x boards

- Increas QSPI max frequency for dra7 boards

- Enable QSPI for am57xx-idk-common

- Enable am335x-wega audio support

- Workaround for i845 for dra7

- Update binding for logicpd boards

- Add gpio-decoder nodes for am335x-icev2 board

- Add linux,pci-domain property for dra7

- Fix dra7 clock data gmac_gmii_ref_clk_div and related clock tree
  entries, these can wait for merge window as Ethernet works on dra7

- A series of changes to drop skeleton.dtsi because of dtc warnings

* tag 'omap-for-v4.9/dt-pt1-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (54 commits)
  ARM: dts: dra7: Add missing unit name to memory nodes
  ARM: dts: dra62x: Add missing unit name to memory nodes
  ARM: dts: dm8168: Add missing unit name to memory nodes
  ARM: dts: dm8148: Add missing unit name to memory nodes
  ARM: dts: am572x: Add missing unit name to memory nodes
  ARM: dts: am4372: Add missing unit name to memory nodes
  ARM: dts: am3517: Add missing unit name to memory nodes
  ARM: dts: am335x: Add missing unit name to memory nodes
  ARM: dts: omap5: Add missing unit name to memory nodes
  ARM: dts: omap4: Add missing unit name to memory nodes
  ARM: dts: omap3: Add missing unit name to memory nodes
  ARM: dts: omap2: Add missing unit name to memory nodes
  ARM: dts: am4372: Remove skeleton.dtsi usage
  ARM: dts: dra7: Remove skeleton.dtsi usage
  ARM: dts: dm816x: Remove skeleton.dtsi usage
  ARM: dts: dm814x: Remove skeleton.dtsi usage
  ARM: dts: am33xx: Remove skeleton.dtsi usage
  ARM: dts: omap5: Remove skeleton.dtsi usage
  ARM: dts: omap4: Remove skeleton.dtsi usage
  ARM: dts: omap3: Remove skeleton.dtsi usage
  ...
parents cbd1d63c 5c4d9f0d

Documentation/devicetree/bindings/arm/omap/omap.txt

+6 −0
Original line number Diff line number Diff line
@@ -180,3 +180,9 @@ Boards: 


- DRA722 EVM: Software Development Board for DRA722

  compatible = "ti,dra72-evm", "ti,dra722", "ti,dra72", "ti,dra7"



- DM3730 Logic PD Torpedo + Wireless: Commercial System on Module with WiFi and Bluetooth

  compatible = "logicpd,dm3730-torpedo-devkit", "ti,omap3630", "ti,omap3"



- DM3730 Logic PD SOM-LV: Commercial System on Module with WiFi and Bluetooth

  compatible = "logicpd,dm3730-som-lv-devkit", "ti,omap3630", "ti,omap3"

arch/arm/boot/dts/am335x-baltos.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -24,12 +24,12 @@ 
		};

	};



	memory {

	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x10000000>; /* 256 MB */

	};



	vbat: fixedregulator@0 {

	vbat: fixedregulator0 {

		compatible = "regulator-fixed";

		regulator-name = "vbat";

		regulator-min-microvolt = <5000000>;
@@ -37,7 +37,7 @@ 
		regulator-boot-on;

	};



	wl12xx_vmmc: fixedregulator@2 {

	wl12xx_vmmc: fixedregulator2 {

		pinctrl-names = "default";

		pinctrl-0 = <&wl12xx_gpio>;

		compatible = "regulator-fixed";
@@ -226,7 +226,7 @@ 


		#address-cells = <1>;

		#size-cells = <1>;

		elm_id = <&elm>;

		ti,elm-id = <&elm>;

	};

};

arch/arm/boot/dts/am335x-base0033.dts

+2 −2
Original line number Diff line number Diff line
@@ -29,13 +29,13 @@ 


		compatible = "gpio-leds";



		led@0 {

		led0 {

			label = "base:red:user";

			gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;	/* gpio1_21 */

			default-state = "off";

		};



		led@1 {

		led1 {

			label = "base:green:user";

			gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>;	/* gpio2_0 */

			default-state = "off";

arch/arm/boot/dts/am335x-bone-common.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
		};

	};



	memory {

	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x10000000>; /* 256 MB */

	};
@@ -28,28 +28,28 @@ 


		compatible = "gpio-leds";



		led@2 {

		led2 {

			label = "beaglebone:green:heartbeat";

			gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "heartbeat";

			default-state = "off";

		};



		led@3 {

		led3 {

			label = "beaglebone:green:mmc0";

			gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "mmc0";

			default-state = "off";

		};



		led@4 {

		led4 {

			label = "beaglebone:green:usr2";

			gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "cpu0";

			default-state = "off";

		};



		led@5 {

		led5 {

			label = "beaglebone:green:usr3";

			gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "mmc1";
@@ -57,7 +57,7 @@ 
		};

	};



	vmmcsd_fixed: fixedregulator@0 {

	vmmcsd_fixed: fixedregulator0 {

		compatible = "regulator-fixed";

		regulator-name = "vmmcsd_fixed";

		regulator-min-microvolt = <3300000>;

arch/arm/boot/dts/am335x-chilisom.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
		};

	};



	memory {

	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x20000000>; /* 512 MB */

	};