[PATCH 0/4] ARM: digicolor: dt and config updates

[PATCH 0/4] ARM: digicolor: dt and config updates

[Baruch Siach]

This series enables a couple of digicolor SoC devices for which drives were
added during the v4.1 cycle. Also, add a MAINTAINERS entry for digicolor, and
enabled the platform in multi_v7_defconfig.

Based on v4.1-rc1.

Baruch Siach (4):
  ARM: digicolor: enable CX92755 on-chip RTC device
  ARM: digicolor: add i2c master controller support
  MAINTAINERS: add Conexant Digicolor machines entry
  ARM: multi_v7_defconfig: enable Conexant Digicolor platform

 MAINTAINERS                           |  6 ++++++
 arch/arm/boot/dts/cx92755.dtsi        | 17 +++++++++++++++++
 arch/arm/boot/dts/cx92755_equinox.dts |  4 ++++
 arch/arm/configs/multi_v7_defconfig   |  5 +++++
 4 files changed, 32 insertions(+)

-- 
2.1.4

[PATCH 1/4] ARM: digicolor: enable CX92755 on-chip RTC device

[Baruch Siach]

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

diff --git a/arch/arm/boot/dts/cx92755.dtsi b/arch/arm/boot/dts/cx92755.dtsi
index 490c08075e67..a2f5ffe1e8a8 100644
--- a/arch/arm/boot/dts/cx92755.dtsi
+++ b/arch/arm/boot/dts/cx92755.dtsi
@@ -82,6 +82,12 @@
 		clocks = <&main_clk>;
 	};
 
+	rtc at f0000c30 {
+		compatible = "cnxt,cx92755-rtc";
+		reg = <0xf0000c30 0x18>;
+		interrupts = <25>;
+	};
+
 	uc_regs: syscon at f00003a0 {
 		compatible = "cnxt,cx92755-uc", "syscon";
 		reg = <0xf00003a0 0x10>;
-- 
2.1.4

[PATCH 2/4] ARM: digicolor: add i2c master controller support

[Baruch Siach]

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 arch/arm/boot/dts/cx92755.dtsi        | 11 +++++++++++
 arch/arm/boot/dts/cx92755_equinox.dts |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/arch/arm/boot/dts/cx92755.dtsi b/arch/arm/boot/dts/cx92755.dtsi
index a2f5ffe1e8a8..af333261d046 100644
--- a/arch/arm/boot/dts/cx92755.dtsi
+++ b/arch/arm/boot/dts/cx92755.dtsi
@@ -116,4 +116,15 @@
 		interrupts = <46>;
 		status = "disabled";
 	};
+
+	i2c: i2c at f0000120 {
+		compatible = "cnxt,cx92755-i2c";
+		reg = <0xf0000120 0x10>;
+		interrupts = <28>;
+		clocks = <&main_clk>;
+		clock-frequency = <100000>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+	};
 };
diff --git a/arch/arm/boot/dts/cx92755_equinox.dts b/arch/arm/boot/dts/cx92755_equinox.dts
index f33bf5635d47..90d52cc416dc 100644
--- a/arch/arm/boot/dts/cx92755_equinox.dts
+++ b/arch/arm/boot/dts/cx92755_equinox.dts
@@ -72,3 +72,7 @@
 &uart0 {
 	status = "okay";
 };
+
+&i2c {
+	status = "okay";
+};
-- 
2.1.4

[PATCH 3/4] MAINTAINERS: add Conexant Digicolor machines entry

[Baruch Siach]

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

diff --git a/MAINTAINERS b/MAINTAINERS
index 2e5bbc0d68b2..fc6949f77729 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -990,6 +990,12 @@ F:	drivers/clocksource/timer-prima2.c
 F:	drivers/clocksource/timer-atlas7.c
 N:	[^a-z]sirf
 
+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
+N:	digicolor
+
 ARM/EBSA110 MACHINE SUPPORT
 M:	Russell King <linux@arm.linux.org.uk>
 L:	linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
-- 
2.1.4

[PATCH 4/4] ARM: multi_v7_defconfig: enable Conexant Digicolor platform

[Baruch Siach]

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

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index ab86655c1f4b..46124579ba8c 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -30,6 +30,7 @@ CONFIG_ARCH_BERLIN=y
 CONFIG_MACH_BERLIN_BG2=y
 CONFIG_MACH_BERLIN_BG2CD=y
 CONFIG_MACH_BERLIN_BG2Q=y
+CONFIG_ARCH_DIGICOLOR=y
 CONFIG_ARCH_HIGHBANK=y
 CONFIG_ARCH_HISI=y
 CONFIG_ARCH_HI3xxx=y
@@ -257,6 +258,8 @@ CONFIG_SERIAL_XILINX_PS_UART=y
 CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
 CONFIG_SERIAL_FSL_LPUART=y
 CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
+CONFIG_SERIAL_CONEXANT_DIGICOLOR=y
+CONFIG_SERIAL_CONEXANT_DIGICOLOR_CONSOLE=y
 CONFIG_SERIAL_ST_ASC=y
 CONFIG_SERIAL_ST_ASC_CONSOLE=y
 CONFIG_I2C_CHARDEV=y
@@ -266,6 +269,7 @@ CONFIG_I2C_MUX_PCA954x=y
 CONFIG_I2C_MUX_PINCTRL=y
 CONFIG_I2C_CADENCE=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
+CONFIG_I2C_DIGICOLOR=y
 CONFIG_I2C_GPIO=m
 CONFIG_I2C_EXYNOS5=y
 CONFIG_I2C_MV64XXX=y
@@ -504,6 +508,7 @@ CONFIG_RTC_DRV_TPS6586X=y
 CONFIG_RTC_DRV_TPS65910=y
 CONFIG_RTC_DRV_S35390A=m
 CONFIG_RTC_DRV_EM3027=y
+CONFIG_RTC_DRV_DIGICOLOR=y
 CONFIG_RTC_DRV_PL031=y
 CONFIG_RTC_DRV_VT8500=y
 CONFIG_RTC_DRV_SUN6I=y
-- 
2.1.4

[PATCH 0/4] ARM: digicolor: dt and config updates

[Arnd Bergmann]

On Tuesday 28 April 2015, Baruch Siach wrote:
> This series enables a couple of digicolor SoC devices for which drives were
> added during the v4.1 cycle. Also, add a MAINTAINERS entry for digicolor, and
> enabled the platform in multi_v7_defconfig.
> 
> Based on v4.1-rc1.
> 
> Baruch Siach (4):
>   ARM: digicolor: enable CX92755 on-chip RTC device
>   ARM: digicolor: add i2c master controller support
>   MAINTAINERS: add Conexant Digicolor machines entry
>   ARM: multi_v7_defconfig: enable Conexant Digicolor platform

I've merged the first two patches into next/dt, the third patch into fixes
and the fourth patch into next/defconfig. Thanks!

I had not mentioned the maintainers change, but it's already part of 4.1-rc3
now.

	Arnd