Commit 0dfc6294 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'pxa-dt-4.20' of https://github.com/rjarzmik/linux into next/dt 

This device-tree pxa update brings :
 - a couple of changes for future pxa2xx platforms
  - 2 fixes in RTC and I2C domain

* tag 'pxa-dt-4.20' of https://github.com/rjarzmik/linux

:
  ARM: dts: pxa: add pincontrol helpers
  ARM: dts: pxa: fix power i2c base address
  ARM: dts: pxa: fix the rtc controller
  ARM: dts: pxa: change serial node names

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 4bef2317 9f296fe2

arch/arm/boot/dts/pxa25x.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -80,6 +80,10 @@ 
			#pwm-cells = <1>;

			clocks = <&clks CLK_PWM1>;

		};



		rtc@40900000 {

			clocks = <&clks CLK_OSC32k768>;

		};

	};



	timer@40a00000 {

arch/arm/boot/dts/pxa27x.dtsi

+5 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 
			clocks = <&clks CLK_PWM1>;

		};



		pwri2c: i2c@40f000180 {

		pwri2c: i2c@40f00180 {

			compatible = "mrvl,pxa-i2c";

			reg = <0x40f00180 0x24>;

			interrupts = <6>;
@@ -113,6 +113,10 @@ 


			status = "disabled";

		};



		rtc@40900000 {

			clocks = <&clks CLK_OSC32k768>;

		};

	};



	clocks {

arch/arm/boot/dts/pxa2xx.dtsi

+23 −4
Original line number Diff line number Diff line
@@ -9,6 +9,25 @@ 
#include "skeleton.dtsi"

#include "dt-bindings/clock/pxa-clock.h"



#define PMGROUP(pin) #pin

#define PMMUX(func, pin, af)			\

	mux- ## func {				\

		groups = PMGROUP(P ## pin);	\

		function = #af;			\

	}

#define PMMUX_LPM_LOW(func, pin, af)		\

	mux- ## func {				\

		groups = PMGROUP(P ## pin);	\

		function = #af;			\

		low-power-disable;		\

	}

#define PMMUX_LPM_HIGH(func, pin, af)		\

	mux- ## func {				\

		groups = PMGROUP(P ## pin);	\

		function = #af;			\

		low-power-enable;		\

	}



/ {

	model = "Marvell PXA2xx family SoC";

	compatible = "marvell,pxa2xx";
@@ -76,7 +95,7 @@ 
			};

		};



		ffuart: uart@40100000 {

		ffuart: serial@40100000 {

			compatible = "mrvl,pxa-uart";

			reg = <0x40100000 0x30>;

			interrupts = <22>;
@@ -84,7 +103,7 @@ 
			status = "disabled";

		};



		btuart: uart@40200000 {

		btuart: serial@40200000 {

			compatible = "mrvl,pxa-uart";

			reg = <0x40200000 0x30>;

			interrupts = <21>;
@@ -92,7 +111,7 @@ 
			status = "disabled";

		};



		stuart: uart@40700000 {

		stuart: serial@40700000 {

			compatible = "mrvl,pxa-uart";

			reg = <0x40700000 0x30>;

			interrupts = <20>;
@@ -100,7 +119,7 @@ 
			status = "disabled";

		};



		hwuart: uart@41100000 {

		hwuart: serial@41100000 {

			compatible = "mrvl,pxa-uart";

			reg = <0x41100000 0x30>;

			interrupts = <7>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE