* [PATCH v3 1/4] ARM: initial support for Conexant Digicolor CX92755 SoC
2015-01-14 8:40 [PATCH v3 0/4] ARM: Conexant Digicolor CX92755 SoC support Baruch Siach
@ 2015-01-14 8:40 ` Baruch Siach
2015-01-27 23:02 ` Olof Johansson
2015-01-14 8:40 ` [PATCH v3 2/4] ARM: digicolor: add low level debug support Baruch Siach
` (3 subsequent siblings)
4 siblings, 1 reply; 12+ messages in thread
From: Baruch Siach @ 2015-01-14 8:40 UTC (permalink / raw)
To: arm
Cc: Mark Rutland, Arnd Bergmann, linux-arm-kernel, linux-kernel,
devicetree, Baruch Siach
Add initial support for the Conexant CX92755 SoC. The CX92755 is one of the
Digicolor series of SoCs, all sharing many of the same peripherals. The code
was tested on the CX92755 evaluation kit, AKA Equinox.
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
arch/arm/Kconfig | 2 ++
arch/arm/mach-digicolor/Kconfig | 5 +++++
arch/arm/mach-digicolor/Makefile | 1 +
arch/arm/mach-digicolor/digicolor.c | 18 ++++++++++++++++++
4 files changed, 26 insertions(+)
create mode 100644 arch/arm/mach-digicolor/Kconfig
create mode 100644 arch/arm/mach-digicolor/Makefile
create mode 100644 arch/arm/mach-digicolor/digicolor.c
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 97d07ed60a0b..86e2202565e6 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -858,6 +858,8 @@ source "arch/arm/mach-cns3xxx/Kconfig"
source "arch/arm/mach-davinci/Kconfig"
+source "arch/arm/mach-digicolor/Kconfig"
+
source "arch/arm/mach-dove/Kconfig"
source "arch/arm/mach-ep93xx/Kconfig"
diff --git a/arch/arm/mach-digicolor/Kconfig b/arch/arm/mach-digicolor/Kconfig
new file mode 100644
index 000000000000..5a0669a2738e
--- /dev/null
+++ b/arch/arm/mach-digicolor/Kconfig
@@ -0,0 +1,5 @@
+config ARCH_DIGICOLOR
+ bool "Conexant Digicolor SoC Support"
+ depends on ARCH_MULTI_V7
+ select CLKSRC_MMIO
+ select GENERIC_IRQ_CHIP
diff --git a/arch/arm/mach-digicolor/Makefile b/arch/arm/mach-digicolor/Makefile
new file mode 100644
index 000000000000..3d8a1d228408
--- /dev/null
+++ b/arch/arm/mach-digicolor/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_ARCH_DIGICOLOR) += digicolor.o
diff --git a/arch/arm/mach-digicolor/digicolor.c b/arch/arm/mach-digicolor/digicolor.c
new file mode 100644
index 000000000000..cfc88d1caa47
--- /dev/null
+++ b/arch/arm/mach-digicolor/digicolor.c
@@ -0,0 +1,18 @@
+/*
+ * Support for Conexant Digicolor SoCs
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#include <asm/mach/arch.h>
+
+static const char *digicolor_dt_compat[] __initconst = {
+ "cnxt,cx92755",
+ NULL,
+};
+
+DT_MACHINE_START(DIGICOLOR, "Conexant Digicolor (Flattened Device Tree)")
+ .dt_compat = digicolor_dt_compat,
+MACHINE_END
--
2.1.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v3 2/4] ARM: digicolor: add low level debug support
2015-01-14 8:40 [PATCH v3 0/4] ARM: Conexant Digicolor CX92755 SoC support Baruch Siach
2015-01-14 8:40 ` [PATCH v3 1/4] ARM: initial support for Conexant Digicolor CX92755 SoC Baruch Siach
@ 2015-01-14 8:40 ` Baruch Siach
[not found] ` <5b6342c716e2e56da34d7a518b49817967de948a.1421219953.git.baruch-NswTu9S1W3P6gbPvEgmw2w@public.gmane.org>
2015-01-14 8:40 ` [PATCH v3 3/4] ARM: digicolor: add minimal device tree description Baruch Siach
` (2 subsequent siblings)
4 siblings, 1 reply; 12+ messages in thread
From: Baruch Siach @ 2015-01-14 8:40 UTC (permalink / raw)
To: arm
Cc: Mark Rutland, Arnd Bergmann, linux-arm-kernel, linux-kernel,
devicetree, Baruch Siach
Use the USART peripheral as UART for low level debug. Only the UA0 port is
currently supported.
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
arch/arm/Kconfig.debug | 12 ++++++++++--
arch/arm/include/debug/digicolor.S | 35 +++++++++++++++++++++++++++++++++++
2 files changed, 45 insertions(+), 2 deletions(-)
create mode 100644 arch/arm/include/debug/digicolor.S
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 5ddd4906f7a7..7ccab0629dd2 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -241,6 +241,13 @@ choice
Say Y here if you want the debug print routines to direct
their output to the serial port in the DC21285 (Footbridge).
+ config DEBUG_DIGICOLOR_UA0
+ bool "Kernel low-level debugging messages via Digicolor UA0"
+ depends on ARCH_DIGICOLOR
+ help
+ Say Y here if you want the debug print routines to direct
+ their output to the UA0 serial port in the CX92755.
+
config DEBUG_FOOTBRIDGE_COM1
bool "Kernel low-level debugging messages via footbridge 8250 at PCI COM1"
depends on FOOTBRIDGE
@@ -1204,6 +1211,7 @@ config DEBUG_LL_INCLUDE
default "debug/vt8500.S" if DEBUG_VT8500_UART0
default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1
default "debug/bcm63xx.S" if DEBUG_UART_BCM63XX
+ default "debug/digicolor.S" if DEBUG_DIGICOLOR_UA0
default "mach/debug-macro.S"
# Compatibility options for PL01x
@@ -1320,7 +1328,7 @@ config DEBUG_UART_PHYS
DEBUG_RCAR_GEN2_SCIF0 || DEBUG_RCAR_GEN2_SCIF2 || \
DEBUG_RMOBILE_SCIFA0 || DEBUG_RMOBILE_SCIFA1 || \
DEBUG_RMOBILE_SCIFA4 || DEBUG_S3C24XX_UART || \
- DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART
+ DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART || DEBUG_DIGICOLOR_UA0
config DEBUG_UART_VIRT
hex "Virtual base address of debug UART"
@@ -1398,7 +1406,7 @@ config DEBUG_UART_VIRT
depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_MESON_UARTAO || \
DEBUG_MSM_UART || DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \
- DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART
+ DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART || DEBUG_DIGICOLOR_UA0
config DEBUG_UART_8250_SHIFT
int "Register offset shift for the 8250 debug UART"
diff --git a/arch/arm/include/debug/digicolor.S b/arch/arm/include/debug/digicolor.S
new file mode 100644
index 000000000000..c9517150766a
--- /dev/null
+++ b/arch/arm/include/debug/digicolor.S
@@ -0,0 +1,35 @@
+/*
+ * Debugging macro include header for Conexant Digicolor USART
+ *
+ * Copyright (C) 2014 Paradox Innovation Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+*/
+
+#define UA0_STATUS 0x0742
+#define UA0_EMI_REC 0x0744
+
+#define UA0_STATUS_TX_READY 0x40
+
+#ifdef CONFIG_DEBUG_UART_PHYS
+ .macro addruart, rp, rv, tmp
+ ldr \rp, =CONFIG_DEBUG_UART_PHYS
+ ldr \rv, =CONFIG_DEBUG_UART_VIRT
+ .endm
+#endif
+
+ .macro senduart,rd,rx
+ strb \rd, [\rx, #UA0_EMI_REC]
+ .endm
+
+ .macro waituart,rd,rx
+ .endm
+
+ .macro busyuart,rd,rx
+1001: ldrb \rd, [\rx, #UA0_STATUS]
+ tst \rd, #UA0_STATUS_TX_READY
+ beq 1001b
+ .endm
--
2.1.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v3 3/4] ARM: digicolor: add minimal device tree description
2015-01-14 8:40 [PATCH v3 0/4] ARM: Conexant Digicolor CX92755 SoC support Baruch Siach
2015-01-14 8:40 ` [PATCH v3 1/4] ARM: initial support for Conexant Digicolor CX92755 SoC Baruch Siach
2015-01-14 8:40 ` [PATCH v3 2/4] ARM: digicolor: add low level debug support Baruch Siach
@ 2015-01-14 8:40 ` Baruch Siach
[not found] ` <474d0849bb30ab4ec323fa4c1bc67b30b31d3884.1421219953.git.baruch-NswTu9S1W3P6gbPvEgmw2w@public.gmane.org>
[not found] ` <cover.1421219953.git.baruch-NswTu9S1W3P6gbPvEgmw2w@public.gmane.org>
2015-01-25 18:08 ` [PATCH v3 0/4] ARM: Conexant Digicolor CX92755 SoC support Baruch Siach
4 siblings, 1 reply; 12+ messages in thread
From: Baruch Siach @ 2015-01-14 8:40 UTC (permalink / raw)
To: arm
Cc: Mark Rutland, Arnd Bergmann, linux-arm-kernel, linux-kernel,
devicetree, Baruch Siach
cx92755.dtsi describes CX92755 on chip peripherals. conexant_equinox.dts
describes the Equinox evaluation board for the CX92755 SoC.
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/conexant_equinox.dts | 74 +++++++++++++++++++++++
arch/arm/boot/dts/cx92755.dtsi | 107 +++++++++++++++++++++++++++++++++
3 files changed, 182 insertions(+)
create mode 100644 arch/arm/boot/dts/conexant_equinox.dts
create mode 100644 arch/arm/boot/dts/cx92755.dtsi
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 91bd5bd62857..fbeb65eaddda 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -75,6 +75,7 @@ dtb-$(CONFIG_ARCH_BRCMSTB) += \
bcm7445-bcm97445svmb.dtb
dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \
da850-evm.dtb
+dtb-$(CONFIG_ARCH_DIGICOLOR) += conexant_equinox.dtb
dtb-$(CONFIG_ARCH_EFM32) += efm32gg-dk3750.dtb
dtb-$(CONFIG_ARCH_EXYNOS) += exynos3250-monk.dtb \
exynos3250-rinato.dtb \
diff --git a/arch/arm/boot/dts/conexant_equinox.dts b/arch/arm/boot/dts/conexant_equinox.dts
new file mode 100644
index 000000000000..f33bf5635d47
--- /dev/null
+++ b/arch/arm/boot/dts/conexant_equinox.dts
@@ -0,0 +1,74 @@
+/*
+ * Device Tree file for the Conexant Equinox CX92755 EVK
+ *
+ * Author: Baruch Siach <baruch@tkos.co.il>
+ *
+ * Copyright (C) 2014 Paradox Innovation Ltd.
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ * a) This file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/dts-v1/;
+
+#include "cx92755.dtsi"
+
+/ {
+ model = "Conexant Equinox CX92755 EVK";
+ compatible = "cnxt,equinox", "cnxt,cx92755";
+
+ aliases {
+ serial0 = &uart0;
+ serial1 = &uart1;
+ serial2 = &uart2;
+ };
+
+ memory@0 {
+ reg = <0 0x8000000>;
+ device_type = "memory";
+ };
+
+ chosen {
+ bootargs = "console=ttyS0,115200";
+ stdout-path = &uart0;
+ };
+};
+
+&uart0 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/cx92755.dtsi b/arch/arm/boot/dts/cx92755.dtsi
new file mode 100644
index 000000000000..984cca90ef9a
--- /dev/null
+++ b/arch/arm/boot/dts/cx92755.dtsi
@@ -0,0 +1,107 @@
+/*
+ * Device Tree Include file for the Conexant Digicolor CX92755 SoC
+ *
+ * Author: Baruch Siach <baruch@tkos.co.il>
+ *
+ * Copyright (C) 2014 Paradox Innovation Ltd.
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ * a) This file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "skeleton.dtsi"
+
+/ {
+ compatible = "cnxt,cx92755";
+
+ interrupt-parent = <&intc>;
+
+ cpus {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ cpu@0 {
+ device_type = "cpu";
+ compatible = "arm,cortex-a8";
+ reg = <0x0>;
+ };
+ };
+
+ main_clk: main_clk {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <200000000>;
+ };
+
+ intc: intc@f0000000 {
+ compatible = "cnxt,cx92755-ic";
+ interrupt-controller;
+ #interrupt-cells = <1>;
+ reg = <0xf0000000 0x1000>;
+ };
+
+ timer@f0000fc0 {
+ compatible = "cnxt,cx92755-timer";
+ reg = <0xf0000fc0 0x40>;
+ interrupts = <19>, <31>, <34>, <35>, <52>, <53>, <54>, <55>;
+ clocks = <&main_clk>;
+ };
+
+ uart0: uart@f0000740 {
+ compatible = "cnxt,cx92755-usart";
+ reg = <0xf0000740 0x20>;
+ clocks = <&main_clk>;
+ interrupts = <44>;
+ status = "disabled";
+ };
+
+ uart1: uart@f0000760 {
+ compatible = "cnxt,cx92755-usart";
+ reg = <0xf0000760 0x20>;
+ clocks = <&main_clk>;
+ interrupts = <45>;
+ status = "disabled";
+ };
+
+ uart2: uart@f0000780 {
+ compatible = "cnxt,cx92755-usart";
+ reg = <0xf0000780 0x20>;
+ clocks = <&main_clk>;
+ interrupts = <46>;
+ status = "disabled";
+ };
+};
--
2.1.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH v3 0/4] ARM: Conexant Digicolor CX92755 SoC support
2015-01-14 8:40 [PATCH v3 0/4] ARM: Conexant Digicolor CX92755 SoC support Baruch Siach
` (3 preceding siblings ...)
[not found] ` <cover.1421219953.git.baruch-NswTu9S1W3P6gbPvEgmw2w@public.gmane.org>
@ 2015-01-25 18:08 ` Baruch Siach
2015-01-27 23:03 ` Olof Johansson
4 siblings, 1 reply; 12+ messages in thread
From: Baruch Siach @ 2015-01-25 18:08 UTC (permalink / raw)
To: arm; +Cc: Mark Rutland, devicetree, linux-kernel, Arnd Bergmann,
linux-arm-kernel
Hi ARM SoC maintainers,
On Wed, Jan 14, 2015 at 10:40:29AM +0200, Baruch Siach wrote:
> This series adds initial support for the Conexant CX92755 SoC. The CX92755 is
> one of the Digicolor series of SoCs, all sharing many of the same peripherals.
> The code was tested on the CX92755 evaluation kit, AKA Equinox.
>
> Uses attempting to try this code will most likely also want the UART/console
> driver available from https://patchwork.kernel.org/patch/5515861/.
Any chance of having this series merged for 3.20? Arnd has acked this already.
Thanks,
baruch
> v3:
> * Remove earlyprintk from dts bootargs (Arnd Bergmann)
>
> * Move aliases from chip .dtsi to board .dts (Arnd Bergmann)
>
> * Add 'cpus' node (Mark Rutland)
>
> * Add commit log messages to all patches (Arnd Bergmann)
>
> * Add Arnd's ack
>
> * Split arch/arm stuff from the irq and timer drivers
>
> v2:
> http://marc.info/?t=142074613900007&r=1&w=2
>
> * Remove .map_io assignment, debug_ll is enabled by default (Arnd Bergmann)
>
> * Migrate the irq driver to generic irq chip, simplifying the code somewhat
> (Arnd Bergmann)
>
> * Change the timer dt binding, so that the 'reg' property points to the
> first "Agent Communication" register. This should improve the chance of
> reusing this binding for other SoCs in this series.
>
> * Add the CONTROL() and COUNT() macros to the timer driver to make the code
> clearer.
>
> * Move arch/arm Kconfig changes from the clocksource driver patch to the
> base arch support patch to reduce dependency between them
>
> v1:
> http://thread.gmane.org/gmane.linux.kernel/1855027
>
> Baruch Siach (4):
> ARM: initial support for Conexant Digicolor CX92755 SoC
> ARM: digicolor: add low level debug support
> ARM: digicolor: add minimal device tree description
> ARM: devicetree: document supported Conexant Digicolor SoC
>
> .../devicetree/bindings/arm/digicolor.txt | 6 ++
> arch/arm/Kconfig | 2 +
> arch/arm/Kconfig.debug | 12 ++-
> arch/arm/boot/dts/Makefile | 1 +
> arch/arm/boot/dts/conexant_equinox.dts | 74 ++++++++++++++
> arch/arm/boot/dts/cx92755.dtsi | 107 +++++++++++++++++++++
> arch/arm/include/debug/digicolor.S | 35 +++++++
> arch/arm/mach-digicolor/Kconfig | 5 +
> arch/arm/mach-digicolor/Makefile | 1 +
> arch/arm/mach-digicolor/digicolor.c | 18 ++++
> 10 files changed, 259 insertions(+), 2 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/arm/digicolor.txt
> create mode 100644 arch/arm/boot/dts/conexant_equinox.dts
> create mode 100644 arch/arm/boot/dts/cx92755.dtsi
> create mode 100644 arch/arm/include/debug/digicolor.S
> create mode 100644 arch/arm/mach-digicolor/Kconfig
> create mode 100644 arch/arm/mach-digicolor/Makefile
> create mode 100644 arch/arm/mach-digicolor/digicolor.c
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch@tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 12+ messages in thread