Unverified Commit 42bea43c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'ux500-dts-v6.3' of... 

Merge tag 'ux500-dts-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into arm/dt

Some Ux500 DTS updates for the v6.3 kernel:

- Fix up LED node names

- Add a clkout-node for the external clock

* tag 'ux500-dts-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik

:
  ARM: dts: ux500: Add clkout-clock node
  ARM: dts: ste: align LED node names with dtschema

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 4f848f23 80b33032

arch/arm/boot/dts/ste-dbx5x0.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>

#include <dt-bindings/clock/ste-db8500-clkout.h>

#include <dt-bindings/reset/stericsson,db8500-prcc-reset.h>

#include <dt-bindings/mfd/dbx500-prcmu.h>

#include <dt-bindings/arm/ux500_pm_domains.h>
@@ -312,6 +313,11 @@ rtc_clk: rtc32k-clock { 
			smp_twd_clk: smp-twd-clock {

				#clock-cells = <0>;

			};



			clkout_clk: clkout-clock {

				/* Cell 1 id, cell 2 source, cell 3 div */

				#clock-cells = <3>;

			};

		};



		mtu@a03c6000 {

arch/arm/boot/dts/ste-href.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -92,20 +92,20 @@ lp5521@33 { 
				clock-mode = /bits/ 8 <2>;

				#address-cells = <1>;

				#size-cells = <0>;

				chan@0 {

				led@0 {

					reg = <0>;

					led-cur = /bits/ 8 <0x2f>;

					max-cur = /bits/ 8 <0x5f>;

					color = <LED_COLOR_ID_BLUE>;

					linux,default-trigger = "heartbeat";

				};

				chan@1 {

				led@1 {

					reg = <1>;

					led-cur = /bits/ 8 <0x2f>;

					max-cur = /bits/ 8 <0x5f>;

					color = <LED_COLOR_ID_BLUE>;

				};

				chan@2 {

				led@2 {

					reg = <2>;

					led-cur = /bits/ 8 <0x2f>;

					max-cur = /bits/ 8 <0x5f>;
@@ -119,19 +119,19 @@ lp5521@34 { 
				clock-mode = /bits/ 8 <2>;

				#address-cells = <1>;

				#size-cells = <0>;

				chan@0 {

				led@0 {

					reg = <0>;

					led-cur = /bits/ 8 <0x2f>;

					max-cur = /bits/ 8 <0x5f>;

					color = <LED_COLOR_ID_BLUE>;

				};

				chan@1 {

				led@1 {

					reg = <1>;

					led-cur = /bits/ 8 <0x2f>;

					max-cur = /bits/ 8 <0x5f>;

					color = <LED_COLOR_ID_BLUE>;

				};

				chan@2 {

				led@2 {

					reg = <2>;

					led-cur = /bits/ 8 <0x2f>;

					max-cur = /bits/ 8 <0x5f>;