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

Commit 2dc71a68 authored Oct 15, 2015 by Arnd Bergmann

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

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

Merge "Device tree changes for omaps for v4.4 merge window:" from Tony Lindgren:

- DCAN sleep pins for am437x-gp-evm

- A series of changes to add audio support for dra7

- Add support for gpio keys and LEDs on dra7

- Regulator clean-up for am335x-wega

- A series of changes to enable IOMMUs and mailboxes for dra7
  accelerators

- Add support for am335x-bonegreen

- Fix up GPIO flags where 0 was used instead of GPIO_ACTIVE_HIGH

- Fix omap3-lilly-am33x IRQ level flag

- Remove duplicate uart2 pinmux for igep and fix indentation and
  update igep to use pinctrl macros for the register offsets

- Fix MMC cd-gpios usage

Note that this branch is against v4.3-rc4 as that contains critical
MMC related fixes to boot with MMC working on most omaps.

* tag 'omap-for-v4.4/dt-pt1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (33 commits)
  ARM: dts: omap3-igep: Use OMAP3_CORE1_IOPAD pinmux macro
  ARM: dts: dra7xx: am57xx: fix cd-gpios definition as per hardware design and dt binding docs
  ARM: dts: am43xx: fix cd-gpios definition as per hardware design and dt binding docs
  ARM: dts: am335x: fix cd-gpios definition as per hardware design and dt binding docs
  ARM: dts: omap3-igep0020: Remove duplicate uart2 pinmux
  ARM: dts: omap3-igep: Fix indentation
  ARM: dts: omap3-lilly-a83x: Don't use IRQ level flag for a GPIO
  ARM: dts: DRA74x: Add IOMMU nodes for DSP2
  ARM: dts: DRA7: Add common IOMMU nodes
  ARM: dts: DRA74x: Add dsp2_system syscon node
  ARM: dts: DRA7: Add dsp1_system syscon node
  ARM: dts: Use defined GPIO constants in flags cell for OMAP2+ boards
  ARM: dts: Add am335x-bonegreen
  ARM: dts: beagle-x15: Enable the system mailboxes 5 and 6
  ARM: dts: dra72-evm: Enable the system mailboxes 5 and 6
  ARM: dts: dra7-evm: Enable the system mailboxes 5 and 6
  ARM: dts: DRA72x: Add IPC sub-mailbox nodes for IPU1, IPU2 & DSP1
  ARM: dts: DRA74x: Add IPC sub-mailbox nodes for all IPUs & DSPs
  ARM: dts: am335x-wega: Clean up regulators
  ARM: dts: dra7-evm: add gpio key support
  ...

parents 5d984ee7 be146412

arch/arm/boot/dts/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -454,6 +454,7 @@ dtb-$(CONFIG_SOC_AM33XX) += \
		am335x-base0033.dtb \
		am335x-bone.dtb \
		am335x-boneblack.dtb \
		am335x-bonegreen.dtb \
		am335x-sl50.dtb \
		am335x-evm.dtb \
		am335x-evmsk.dtb \

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -383,8 +383,7 @@
		bus-width = <0x4>;
		pinctrl-names = "default";
		pinctrl-0 = <&mmc1_pins>;
		cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
		cd-inverted;
		cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
		};

		&aes {

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

0 → 100644

+53 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		*/
		/dts-v1/;

		#include "am33xx.dtsi"
		#include "am335x-bone-common.dtsi"

		/ {
		model = "TI AM335x BeagleBone Green";
		compatible = "ti,am335x-bone-green", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
		};

		&ldo3_reg {
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <1800000>;
		regulator-always-on;
		};

		&mmc1 {
		vmmc-supply = <&vmmcsd_fixed>;
		};

		&mmc2 {
		vmmc-supply = <&vmmcsd_fixed>;
		pinctrl-names = "default";
		pinctrl-0 = <&emmc_pins>;
		bus-width = <8>;
		status = "okay";
		};

		&am33xx_pinmux {
		uart2_pins: uart2_pins {
		pinctrl-single,pins = <
		0x150 (PIN_INPUT \| MUX_MODE1) /* spi0_sclk.uart2_rxd */
		0x154 (PIN_OUTPUT \| MUX_MODE1) /* spi0_d0.uart2_txd */
		>;
		};
		};

		&uart2 {
		pinctrl-names = "default";
		pinctrl-0 = <&uart2_pins>;
		status = "okay";
		};

		&rtc {
		system-power-controller;
		};

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -737,7 +737,7 @@
		bus-width = <4>;
		pinctrl-names = "default";
		pinctrl-0 = <&mmc1_pins>;
		cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
		cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
		};

		&mmc3 {

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -647,7 +647,7 @@
		bus-width = <4>;
		pinctrl-names = "default";
		pinctrl-0 = <&mmc1_pins>;
		cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
		cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
		};

		&sham {