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

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

Merge branch 'sprd/dt' into next/dt 



* sprd/dt:
  arm64: dts: sprd: Add one suspend timer
  arm64: dts: sprd: Add SC27XX ADC device
  arm64: dts: sprd: Add SC27XX eFuse device
  arm64: dts: sprd: Add SC27XX vibrator device
  arm64: dts: sprd: Add SC27XX breathing light controller device

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3f0f096b b2d94b3f

arch/arm64/boot/dts/sprd/sc2731.dtsi

+44 −0
Original line number Diff line number Diff line
@@ -17,6 +17,28 @@ 
		#address-cells = <1>;

		#size-cells = <0>;



		led-controller@200 {

			compatible = "sprd,sc27xx-bltc", "sprd,sc2731-bltc";

			reg = <0x200>;

			#address-cells = <1>;

			#size-cells = <0>;



			led@0 {

				label = "red";

				reg = <0x0>;

			};



			led@1 {

				label = "green";

				reg = <0x1>;

			};



			led@2 {

				label = "blue";

				reg = <0x2>;

			};

		};



		rtc@280 {

			compatible = "sprd,sc27xx-rtc", "sprd,sc2731-rtc";

			reg = <0x280>;
@@ -35,6 +57,28 @@ 
			#interrupt-cells = <2>;

		};



		efuse@380 {

			compatible = "sprd,sc27xx-efuse", "sprd,sc2731-efuse";

			reg = <0x380>;

			#address-cells = <1>;

			#size-cells = <1>;

			hwlocks = <&hwlock 12>;

		};



		pmic_adc: adc@480 {

			compatible = "sprd,sc27xx-adc", "sprd,sc2731-adc";

			reg = <0x480>;

			interrupt-parent = <&sc2731_pmic>;

			interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;

			#io-channel-cells = <1>;

			hwlocks = <&hwlock 4>;

		};



		vibrator@ec8 {

			compatible = "sprd,sc27xx-vibrator", "sprd,sc2731-vibrator";

			reg = <0xec8>;

		};



		regulators {

			compatible = "sprd,sc27xx-regulator";

arch/arm64/boot/dts/sprd/whale2.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -146,6 +146,12 @@ 
				clocks = <&ext_32k>;

			};



			timer@40050020 {

				compatible = "sprd,sc9860-suspend-timer";

				reg = <0 0x40050020 0 0x20>;

				clocks = <&ext_32k>;

			};



			hwlock: hwspinlock@40500000 {

				compatible = "sprd,hwspinlock-r3p0";

				reg = <0 0x40500000 0 0x1000>;