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

Commit fe6d7199 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Device tree changes for omaps for v4.13 merge window.
This adds support for am335x-boneblue. The rest of
the changes are for enabling features on various
devices with the git shortlog describing the changes.

* tag 'omap-for-v4.13/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  arm: dts: am33xx: Remove redundant interrupt-parent property
  ARM: dts: bonegreen-wireless: add WL1835 Bluetooth device node
  ARM: dts: AM43XX: Remove min and max voltage values for dcdc3
  ARM: dts: Add am335x-boneblue
  ARM: dts: twl4030: Add missing madc reference for bci subnode
  ARM: dts: am43xx-clocks: Add support for CLKOUT2
  ARM: dts: Configure USB host for 37xx-evm
  ARM: dts: omap: Add generic compatible string for I2C EEPROM
  ARM: dts: Enable earlycon stdout path for LogicPD torpedo
  ARM: dts: Enable earlycon stdout path for duovero
  arm: dts: boneblack-wireless: add WL1835 Bluetooth device node
  ARM: dts: am571x-idk: Enable the system mailboxes 5 and 6
  ARM: dts: am572x-idk: Enable the system mailboxes 5 and 6
  ARM: dts: omap4-devkit8000: fix gpmc ranges property
  ARM: dts: omap3: Remove 'enable-active-low' property
  ARM: dts: OMAP5: uevm: add µSD card detect
  ARM: dts: omap4-droid4: Add bluetooth
  ARM: dts: dra7x-evm: Enable dual-role mode for USB1
  ARM: dts: Use - instead of @ for DT OPP entries for TI SoCs
  ARM: dts: am335x-phycore-som: fix rv4162 compatible

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f46b563f de09eb52

Documentation/devicetree/bindings/cpufreq/ti-cpufreq.txt

+10 −10
Original line number Diff line number Diff line
@@ -63,64 +63,64 @@ cpu0_opp_table: opp-table { 
	 * because they can not be enabled simultaneously on a

	 * single SoC.

	 */

	opp50@300000000 {

	opp50-300000000 {

		opp-hz = /bits/ 64 <300000000>;

		opp-microvolt = <950000 931000 969000>;

		opp-supported-hw = <0x06 0x0010>;

		opp-suspend;

	};



	opp100@275000000 {

	opp100-275000000 {

		opp-hz = /bits/ 64 <275000000>;

		opp-microvolt = <1100000 1078000 1122000>;

		opp-supported-hw = <0x01 0x00FF>;

		opp-suspend;

	};



	opp100@300000000 {

	opp100-300000000 {

		opp-hz = /bits/ 64 <300000000>;

		opp-microvolt = <1100000 1078000 1122000>;

		opp-supported-hw = <0x06 0x0020>;

		opp-suspend;

	};



	opp100@500000000 {

	opp100-500000000 {

		opp-hz = /bits/ 64 <500000000>;

		opp-microvolt = <1100000 1078000 1122000>;

		opp-supported-hw = <0x01 0xFFFF>;

	};



	opp100@600000000 {

	opp100-600000000 {

		opp-hz = /bits/ 64 <600000000>;

		opp-microvolt = <1100000 1078000 1122000>;

		opp-supported-hw = <0x06 0x0040>;

	};



	opp120@600000000 {

	opp120-600000000 {

		opp-hz = /bits/ 64 <600000000>;

		opp-microvolt = <1200000 1176000 1224000>;

		opp-supported-hw = <0x01 0xFFFF>;

	};



	opp120@720000000 {

	opp120-720000000 {

		opp-hz = /bits/ 64 <720000000>;

		opp-microvolt = <1200000 1176000 1224000>;

		opp-supported-hw = <0x06 0x0080>;

	};



	oppturbo@720000000 {

	oppturbo-720000000 {

		opp-hz = /bits/ 64 <720000000>;

		opp-microvolt = <1260000 1234800 1285200>;

		opp-supported-hw = <0x01 0xFFFF>;

	};



	oppturbo@800000000 {

	oppturbo-800000000 {

		opp-hz = /bits/ 64 <800000000>;

		opp-microvolt = <1260000 1234800 1285200>;

		opp-supported-hw = <0x06 0x0100>;

	};



	oppnitro@1000000000 {

	oppnitro-1000000000 {

		opp-hz = /bits/ 64 <1000000000>;

		opp-microvolt = <1325000 1298500 1351500>;

		opp-supported-hw = <0x04 0x0200>;

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -603,6 +603,7 @@ dtb-$(CONFIG_SOC_AM33XX) += \ 
	am335x-bone.dtb \

	am335x-boneblack.dtb \

	am335x-boneblack-wireless.dtb \

	am335x-boneblue.dtb \

	am335x-bonegreen.dtb \

	am335x-bonegreen-wireless.dtb \

	am335x-chiliboard.dtb \

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

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



	at24@50 {

		compatible = "at24,24c02";

		compatible = "atmel,24c02";

		pagesize = <8>;

		reg = <0x50>;

	};

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

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ 


&i2c0 {

	eeprom: eeprom@50 {

		compatible = "at,24c256";

		compatible = "atmel,24c256";

		reg = <0x50>;

	};

};

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

+5 −5
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ 
	};



	baseboard_eeprom: baseboard_eeprom@50 {

		compatible = "at,24c256";

		compatible = "atmel,24c256";

		reg = <0x50>;



		#address-cells = <1>;
@@ -251,7 +251,7 @@ 
	clock-frequency = <100000>;



	cape_eeprom0: cape_eeprom0@54 {

		compatible = "at,24c256";

		compatible = "atmel,24c256";

		reg = <0x54>;

		#address-cells = <1>;

		#size-cells = <1>;
@@ -261,7 +261,7 @@ 
	};



	cape_eeprom1: cape_eeprom1@55 {

		compatible = "at,24c256";

		compatible = "atmel,24c256";

		reg = <0x55>;

		#address-cells = <1>;

		#size-cells = <1>;
@@ -271,7 +271,7 @@ 
	};



	cape_eeprom2: cape_eeprom2@56 {

		compatible = "at,24c256";

		compatible = "atmel,24c256";

		reg = <0x56>;

		#address-cells = <1>;

		#size-cells = <1>;
@@ -281,7 +281,7 @@ 
	};



	cape_eeprom3: cape_eeprom3@57 {

		compatible = "at,24c256";

		compatible = "atmel,24c256";

		reg = <0x57>;

		#address-cells = <1>;

		#size-cells = <1>;