[PATCH 0/4] ARM: digicolor: misc updates for 4.3

[PATCH 0/4] ARM: digicolor: misc updates for 4.3

[Baruch Siach]

This series contains the following updates for Conexant Digicolor machines:

   * Enable the watchdog driver that was added during the 4.2 merge window, 
     both in .dtsi and in multi_v7_defconfig

   * Use the standard stdout-path property in the chosen node to configure the 
     console

   * Make .dts/.dtsi files to the Digicolor MAINTAINERS entry

Based on v4.2-rc1.

Baruch Siach (4):
  ARM: digicolor: enable watchdog device
  ARM: multi_v7_defconfig: enable Conexant Digicolor watchdog
  ARM: digicolor: dts: use stdout-path for console configuration
  MAINTAINERS: digicolor: add dts files

 MAINTAINERS                           | 1 +
 arch/arm/boot/dts/cx92755.dtsi        | 7 +++++++
 arch/arm/boot/dts/cx92755_equinox.dts | 3 +--
 arch/arm/configs/multi_v7_defconfig   | 1 +
 4 files changed, 10 insertions(+), 2 deletions(-)

-- 
2.1.4

[PATCH 1/4] ARM: digicolor: enable watchdog device

[Baruch Siach]

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 arch/arm/boot/dts/cx92755.dtsi | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/arm/boot/dts/cx92755.dtsi b/arch/arm/boot/dts/cx92755.dtsi
index af333261d046..df4c6f1f93f9 100644
--- a/arch/arm/boot/dts/cx92755.dtsi
+++ b/arch/arm/boot/dts/cx92755.dtsi
@@ -88,6 +88,13 @@
 		interrupts = <25>;
 	};
 
+	watchdog at f0000fc0 {
+		compatible = "cnxt,cx92755-wdt";
+		reg = <0xf0000fc0 0x8>;
+		clocks = <&main_clk>;
+		timeout-sec = <15>;
+	};
+
 	uc_regs: syscon at f00003a0 {
 		compatible = "cnxt,cx92755-uc", "syscon";
 		reg = <0xf00003a0 0x10>;
-- 
2.1.4

[PATCH 2/4] ARM: multi_v7_defconfig: enable Conexant Digicolor watchdog

[Baruch Siach]

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 arch/arm/configs/multi_v7_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 6d83a1bf0c74..d0450e399a07 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -372,6 +372,7 @@ CONFIG_ORION_WATCHDOG=y
 CONFIG_ST_LPC_WATCHDOG=y
 CONFIG_SUNXI_WATCHDOG=y
 CONFIG_MESON_WATCHDOG=y
+CONFIG_DIGICOLOR_WATCHDOG=y
 CONFIG_MFD_AS3711=y
 CONFIG_MFD_AS3722=y
 CONFIG_MFD_BCM590XX=y
-- 
2.1.4

[PATCH 3/4] ARM: digicolor: dts: use stdout-path for console configuration

[Baruch Siach]

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 arch/arm/boot/dts/cx92755_equinox.dts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/cx92755_equinox.dts b/arch/arm/boot/dts/cx92755_equinox.dts
index 90d52cc416dc..5da00806c41e 100644
--- a/arch/arm/boot/dts/cx92755_equinox.dts
+++ b/arch/arm/boot/dts/cx92755_equinox.dts
@@ -64,8 +64,7 @@
 	};
 
 	chosen {
-		bootargs = "console=ttyS0,115200";
-		stdout-path = &uart0;
+		stdout-path = "serial0:115200n8";
 	};
 };
 
-- 
2.1.4

[PATCH 4/4] MAINTAINERS: digicolor: add dts files

[Baruch Siach]

The 'digicolor' regexp doesn't cover the dts files. Add a glob pattern for
them.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 8133cefb6b6e..3961bc4b0ba6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1001,6 +1001,7 @@ ARM/CONEXANT DIGICOLOR MACHINE SUPPORT
 M:	Baruch Siach <baruch@tkos.co.il>
 L:	linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
 S:	Maintained
+F:	arch/arm/boot/dts/cx92755*
 N:	digicolor
 
 ARM/EBSA110 MACHINE SUPPORT
-- 
2.1.4

[PATCH 4/4] MAINTAINERS: digicolor: add dts files

[Olof Johansson]

On Mon, Jul 06, 2015 at 02:41:46PM +0300, Baruch Siach wrote:
> The 'digicolor' regexp doesn't cover the dts files. Add a glob pattern for
> them.
> 
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>

Thanks, applied to fixes.


-Olof

[PATCH 0/4] ARM: digicolor: misc updates for 4.3

[Olof Johansson]

On Mon, Jul 06, 2015 at 02:41:42PM +0300, Baruch Siach wrote:
> This series contains the following updates for Conexant Digicolor machines:
> 
>    * Enable the watchdog driver that was added during the 4.2 merge window, 
>      both in .dtsi and in multi_v7_defconfig
> 
>    * Use the standard stdout-path property in the chosen node to configure the 
>      console
> 
>    * Make .dts/.dtsi files to the Digicolor MAINTAINERS entry
> 
> Based on v4.2-rc1.
> 
> Baruch Siach (4):
>   ARM: digicolor: enable watchdog device
>   ARM: multi_v7_defconfig: enable Conexant Digicolor watchdog
>   ARM: digicolor: dts: use stdout-path for console configuration
>   MAINTAINERS: digicolor: add dts files

Thanks, I applied the two DT patches to next/dt, the defconfig change to next/defconfig.


-Olof