* [RFC v3 00/14] MIPS: AR913X/AR933X devicetree patchseries
@ 2016-01-23 20:17 Antony Pavlov
2016-01-23 20:17 ` [RFC v3 01/14] WIP: clk: add Atheros AR724X/AR913X/AR933X SoCs clock driver Antony Pavlov
` (5 more replies)
0 siblings, 6 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-01-23 20:17 UTC (permalink / raw)
To: linux-mips; +Cc: Antony Pavlov
Changes since RFC v2:
* add Onion Omega board support;
* add AR9132 SoC clock driver;
* add AR9132 devicetree fixes.
Changes since RFC v1:
* add Dragino MS14 board support;
* add "ref" oscillator input clock for pll-controller;
add necessary nodes to board dts files.
Antony Pavlov (14):
WIP: clk: add Atheros AR724X/AR913X/AR933X SoCs clock driver
MIPS: ath79: use clk-ath79.c driver for AR913X/AR933X
MIPS: dts: qca: ar9132: use dt-bindings/clock/ath79-clk.h macros
MIPS: dts: qca: ar9132: make extosc-related description shorter
MIPS: dts: qca: ar9132_tl_wr1043nd_v1.dts: drop unused alias node
MIPS: dts: qca: ar9132: use short references for uart and spi nodes
MIPS: dts: qca: simplify Makefile
MIPS: dts: qca: introduce AR9331 devicetree
MIPS: ath79: add initial support for TP-LINK MR3020
devicetree: add Dragino vendor id
MIPS: ath79: add initial support for Dragino MS14 (Dragino 2)
devicetree: add Onion Corporation vendor id
MIPS: ath79: add initial support for Onion Omega
WIP: MIPS: ath79: add devicetree defconfigs
.../devicetree/bindings/vendor-prefixes.txt | 2 +
arch/mips/ath79/Kconfig | 15 ++
arch/mips/ath79/clock.c | 11 +-
arch/mips/boot/dts/qca/Makefile | 8 +-
arch/mips/boot/dts/qca/ar9132.dtsi | 21 ++-
arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 88 ++++------
arch/mips/boot/dts/qca/ar9331.dtsi | 123 +++++++++++++
arch/mips/boot/dts/qca/dragino_ms14.dts | 73 ++++++++
arch/mips/boot/dts/qca/omega.dts | 54 ++++++
arch/mips/boot/dts/qca/tl_mr3020.dts | 72 ++++++++
arch/mips/configs/dragino-ms14-dt-raw_defconfig | 85 +++++++++
arch/mips/configs/onion-omega-dt-raw_defconfig | 85 +++++++++
arch/mips/configs/tl-mr3020-dt-raw_defconfig | 85 +++++++++
arch/mips/configs/tl-wr1043nd_defconfig | 87 ++++++++++
drivers/clk/Makefile | 1 +
drivers/clk/clk-ath79.c | 193 +++++++++++++++++++++
include/dt-bindings/clock/ath79-clk.h | 22 +++
17 files changed, 963 insertions(+), 62 deletions(-)
create mode 100644 arch/mips/boot/dts/qca/ar9331.dtsi
create mode 100644 arch/mips/boot/dts/qca/dragino_ms14.dts
create mode 100644 arch/mips/boot/dts/qca/omega.dts
create mode 100644 arch/mips/boot/dts/qca/tl_mr3020.dts
create mode 100644 arch/mips/configs/dragino-ms14-dt-raw_defconfig
create mode 100644 arch/mips/configs/onion-omega-dt-raw_defconfig
create mode 100644 arch/mips/configs/tl-mr3020-dt-raw_defconfig
create mode 100644 arch/mips/configs/tl-wr1043nd_defconfig
create mode 100644 drivers/clk/clk-ath79.c
create mode 100644 include/dt-bindings/clock/ath79-clk.h
--
2.6.2
^ permalink raw reply [flat|nested] 52+ messages in thread
* [RFC v3 01/14] WIP: clk: add Atheros AR724X/AR913X/AR933X SoCs clock driver
2016-01-23 20:17 [RFC v3 00/14] MIPS: AR913X/AR933X devicetree patchseries Antony Pavlov
@ 2016-01-23 20:17 ` Antony Pavlov
2016-01-25 22:21 ` Alban
2016-01-30 0:27 ` Stephen Boyd
2016-01-23 20:17 ` [RFC v3 02/14] MIPS: ath79: use clk-ath79.c driver for AR913X/AR933X Antony Pavlov
` (4 subsequent siblings)
5 siblings, 2 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-01-23 20:17 UTC (permalink / raw)
To: linux-mips
Cc: Antony Pavlov, Alban Bedel, Michael Turquette, Stephen Boyd,
Rob Herring, linux-clk, devicetree
TODO: get pll registers base address from devicetree node
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Cc: Alban Bedel <albeu@free.fr>
Cc: Michael Turquette <mturquette@baylibre.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: linux-clk@vger.kernel.org
Cc: linux-mips@linux-mips.org
Cc: devicetree@vger.kernel.org
---
drivers/clk/Makefile | 1 +
drivers/clk/clk-ath79.c | 193 ++++++++++++++++++++++++++++++++++
include/dt-bindings/clock/ath79-clk.h | 22 ++++
3 files changed, 216 insertions(+)
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index 820714c..5101763 100644
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -18,6 +18,7 @@ endif
# hardware specific clock types
# please keep this section sorted lexicographically by file/directory path name
obj-$(CONFIG_MACH_ASM9260) += clk-asm9260.o
+obj-$(CONFIG_ATH79) += clk-ath79.o
obj-$(CONFIG_COMMON_CLK_AXI_CLKGEN) += clk-axi-clkgen.o
obj-$(CONFIG_ARCH_AXXIA) += clk-axm5516.o
obj-$(CONFIG_COMMON_CLK_CDCE706) += clk-cdce706.o
diff --git a/drivers/clk/clk-ath79.c b/drivers/clk/clk-ath79.c
new file mode 100644
index 0000000..75338a7
--- /dev/null
+++ b/drivers/clk/clk-ath79.c
@@ -0,0 +1,193 @@
+/*
+ * Clock driver for Atheros AR724X/AR913X/AR933X SoCs
+ *
+ * Copyright (C) 2010-2011 Jaiganesh Narayanan <jnarayanan@atheros.com>
+ * Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2015 Alban Bedel <albeu@free.fr>
+ * Copyright (C) 2016 Antony Pavlov <antonynpavlov@gmail.com>
+ *
+ * Parts of this file are based on Atheros' 2.6.15/2.6.31 BSP
+ *
+ * This program 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 program 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.
+ */
+
+#include <linux/clk.h>
+#include <linux/clk-provider.h>
+#include <linux/clkdev.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include "clk.h"
+
+#include <dt-bindings/clock/ath79-clk.h>
+
+#include "asm/mach-ath79/ar71xx_regs.h"
+#include "asm/mach-ath79/ath79.h"
+
+#define MHZ (1000 * 1000)
+
+#define AR724X_BASE_FREQ (40 * MHZ)
+
+static struct clk *ath79_clks[ATH79_CLK_END];
+
+static struct clk_onecell_data clk_data = {
+ .clks = ath79_clks,
+ .clk_num = ARRAY_SIZE(ath79_clks),
+};
+
+static struct clk *__init ath79_add_sys_clkdev(
+ const char *id, unsigned long rate)
+{
+ struct clk *clk;
+ int err;
+
+ clk = clk_register_fixed_rate(NULL, id, NULL, CLK_IS_ROOT, rate);
+ if (!clk)
+ panic("failed to allocate %s clock structure", id);
+
+ err = clk_register_clkdev(clk, id, NULL);
+ if (err)
+ panic("unable to register %s clock device", id);
+
+ return clk;
+}
+
+static void __init ar724x_clk_init(struct device_node *np)
+{
+ struct clk *ref_clk;
+ unsigned long of_ref_rate;
+ unsigned long ref_rate;
+ unsigned long cpu_rate;
+ unsigned long ddr_rate;
+ unsigned long ahb_rate;
+ u32 pll;
+ u32 freq;
+ u32 div;
+
+ ref_clk = of_clk_get(np, 0);
+ if (IS_ERR(ref_clk)) {
+ pr_err("%s: of_clk_get failed\n", np->full_name);
+ return;
+ }
+
+ of_ref_rate = clk_get_rate(ref_clk);
+
+ ref_rate = AR724X_BASE_FREQ;
+
+ if (of_ref_rate != ref_rate) {
+ pr_err("ref_rate != of_ref_rate\n");
+ ref_rate = of_ref_rate;
+ }
+
+ pll = ath79_pll_rr(AR724X_PLL_REG_CPU_CONFIG);
+
+ div = ((pll >> AR724X_PLL_FB_SHIFT) & AR724X_PLL_FB_MASK);
+ freq = div * ref_rate;
+
+ div = ((pll >> AR724X_PLL_REF_DIV_SHIFT) & AR724X_PLL_REF_DIV_MASK) * 2;
+ freq /= div;
+
+ cpu_rate = freq;
+
+ div = ((pll >> AR724X_DDR_DIV_SHIFT) & AR724X_DDR_DIV_MASK) + 1;
+ ddr_rate = freq / div;
+
+ div = (((pll >> AR724X_AHB_DIV_SHIFT) & AR724X_AHB_DIV_MASK) + 1) * 2;
+ ahb_rate = cpu_rate / div;
+
+ ath79_clks[ATH79_CLK_REF] = ath79_add_sys_clkdev("ref", ref_rate);
+ ath79_clks[ATH79_CLK_CPU] = ath79_add_sys_clkdev("cpu", cpu_rate);
+ ath79_clks[ATH79_CLK_DDR] = ath79_add_sys_clkdev("ddr", ddr_rate);
+ ath79_clks[ATH79_CLK_AHB] = ath79_add_sys_clkdev("ahb", ahb_rate);
+ ath79_clks[ATH79_CLK_WDT] = ath79_add_sys_clkdev("wdt", ahb_rate);
+ ath79_clks[ATH79_CLK_UART] = ath79_add_sys_clkdev("uart", ahb_rate);
+
+ of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
+}
+
+static void __init ar933x_clk_init(struct device_node *np)
+{
+ struct clk *ref_clk;
+ unsigned long of_ref_rate;
+ unsigned long ref_rate;
+ unsigned long cpu_rate;
+ unsigned long ddr_rate;
+ unsigned long ahb_rate;
+ u32 clock_ctrl;
+ u32 cpu_config;
+ u32 freq;
+ u32 t;
+
+ ref_clk = of_clk_get(np, 0);
+ if (IS_ERR(ref_clk)) {
+ pr_err("%s: of_clk_get failed\n", np->full_name);
+ return;
+ }
+
+ of_ref_rate = clk_get_rate(ref_clk);
+
+ t = ath79_reset_rr(AR933X_RESET_REG_BOOTSTRAP);
+ if (t & AR933X_BOOTSTRAP_REF_CLK_40)
+ ref_rate = 40 * MHZ;
+ else
+ ref_rate = 25 * MHZ;
+
+ if (ref_rate != of_ref_rate) {
+ pr_err("ref_rate != of_ref_rate\n");
+ ref_rate = of_ref_rate;
+ }
+
+ clock_ctrl = ath79_pll_rr(AR933X_PLL_CLOCK_CTRL_REG);
+ if (clock_ctrl & AR933X_PLL_CLOCK_CTRL_BYPASS) {
+ cpu_rate = ref_rate;
+ ahb_rate = ref_rate;
+ ddr_rate = ref_rate;
+ } else {
+ cpu_config = ath79_pll_rr(AR933X_PLL_CPU_CONFIG_REG);
+
+ t = (cpu_config >> AR933X_PLL_CPU_CONFIG_REFDIV_SHIFT) &
+ AR933X_PLL_CPU_CONFIG_REFDIV_MASK;
+ freq = ref_rate / t;
+
+ t = (cpu_config >> AR933X_PLL_CPU_CONFIG_NINT_SHIFT) &
+ AR933X_PLL_CPU_CONFIG_NINT_MASK;
+ freq *= t;
+
+ t = (cpu_config >> AR933X_PLL_CPU_CONFIG_OUTDIV_SHIFT) &
+ AR933X_PLL_CPU_CONFIG_OUTDIV_MASK;
+ if (t == 0)
+ t = 1;
+
+ freq >>= t;
+
+ t = ((clock_ctrl >> AR933X_PLL_CLOCK_CTRL_CPU_DIV_SHIFT) &
+ AR933X_PLL_CLOCK_CTRL_CPU_DIV_MASK) + 1;
+ cpu_rate = freq / t;
+
+ t = ((clock_ctrl >> AR933X_PLL_CLOCK_CTRL_DDR_DIV_SHIFT) &
+ AR933X_PLL_CLOCK_CTRL_DDR_DIV_MASK) + 1;
+ ddr_rate = freq / t;
+
+ t = ((clock_ctrl >> AR933X_PLL_CLOCK_CTRL_AHB_DIV_SHIFT) &
+ AR933X_PLL_CLOCK_CTRL_AHB_DIV_MASK) + 1;
+ ahb_rate = freq / t;
+ }
+
+ ath79_clks[ATH79_CLK_REF] = ath79_add_sys_clkdev("ref", ref_rate);
+ ath79_clks[ATH79_CLK_CPU] = ath79_add_sys_clkdev("cpu", cpu_rate);
+ ath79_clks[ATH79_CLK_DDR] = ath79_add_sys_clkdev("ddr", ddr_rate);
+ ath79_clks[ATH79_CLK_AHB] = ath79_add_sys_clkdev("ahb", ahb_rate);
+ ath79_clks[ATH79_CLK_WDT] = ath79_add_sys_clkdev("wdt", ahb_rate);
+ ath79_clks[ATH79_CLK_UART] = ath79_add_sys_clkdev("uart", ref_rate);
+
+ of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
+}
+CLK_OF_DECLARE(ar9130_clk, "qca,ar9130-pll", ar724x_clk_init);
+CLK_OF_DECLARE(ar933x_clk, "qca,ar9330-pll", ar933x_clk_init);
diff --git a/include/dt-bindings/clock/ath79-clk.h b/include/dt-bindings/clock/ath79-clk.h
new file mode 100644
index 0000000..1c6fb04
--- /dev/null
+++ b/include/dt-bindings/clock/ath79-clk.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2014, 2016 Antony Pavlov <antonynpavlov@gmail.com>
+ *
+ * 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.
+ *
+ */
+
+#ifndef __DT_BINDINGS_ATH79_CLK_H
+#define __DT_BINDINGS_ATH79_CLK_H
+
+#define ATH79_CLK_REF 0
+#define ATH79_CLK_CPU 1
+#define ATH79_CLK_DDR 2
+#define ATH79_CLK_AHB 3
+#define ATH79_CLK_WDT 4
+#define ATH79_CLK_UART 5
+
+#define ATH79_CLK_END 6
+
+#endif /* __DT_BINDINGS_ATH79_CLK_H */
--
2.6.2
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [RFC v3 02/14] MIPS: ath79: use clk-ath79.c driver for AR913X/AR933X
2016-01-23 20:17 [RFC v3 00/14] MIPS: AR913X/AR933X devicetree patchseries Antony Pavlov
2016-01-23 20:17 ` [RFC v3 01/14] WIP: clk: add Atheros AR724X/AR913X/AR933X SoCs clock driver Antony Pavlov
@ 2016-01-23 20:17 ` Antony Pavlov
2016-01-25 22:24 ` Alban
2016-01-23 20:17 ` [RFC v3 04/14] MIPS: dts: qca: ar9132: make extosc-related description shorter Antony Pavlov
` (3 subsequent siblings)
5 siblings, 1 reply; 52+ messages in thread
From: Antony Pavlov @ 2016-01-23 20:17 UTC (permalink / raw)
To: linux-mips; +Cc: Antony Pavlov, Gabor Juhos, Alban Bedel
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Cc: Gabor Juhos <juhosg@openwrt.org>
Cc: Alban Bedel <albeu@free.fr>
Cc: linux-mips@linux-mips.org
---
arch/mips/ath79/clock.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/arch/mips/ath79/clock.c b/arch/mips/ath79/clock.c
index eb5117c..8a287bf 100644
--- a/arch/mips/ath79/clock.c
+++ b/arch/mips/ath79/clock.c
@@ -24,6 +24,7 @@
#include <asm/mach-ath79/ath79.h>
#include <asm/mach-ath79/ar71xx_regs.h>
#include "common.h"
+#include "machtypes.h"
#define AR71XX_BASE_FREQ 40000000
#define AR724X_BASE_FREQ 5000000
@@ -133,6 +134,10 @@ static void __init ar913x_clocks_init(void)
u32 freq;
u32 div;
+ if (IS_ENABLED(CONFIG_OF) && mips_machtype == ATH79_MACH_GENERIC_OF) {
+ return;
+ }
+
ref_rate = AR913X_BASE_FREQ;
pll = ath79_pll_rr(AR913X_PLL_REG_CPU_CONFIG);
@@ -167,6 +172,10 @@ static void __init ar933x_clocks_init(void)
u32 freq;
u32 t;
+ if (IS_ENABLED(CONFIG_OF) && mips_machtype == ATH79_MACH_GENERIC_OF) {
+ return;
+ }
+
t = ath79_reset_rr(AR933X_RESET_REG_BOOTSTRAP);
if (t & AR933X_BOOTSTRAP_REF_CLK_40)
ref_rate = (40 * 1000 * 1000);
@@ -483,8 +492,6 @@ static void __init ath79_clocks_init_dt(struct device_node *np)
CLK_OF_DECLARE(ar7100, "qca,ar7100-pll", ath79_clocks_init_dt);
CLK_OF_DECLARE(ar7240, "qca,ar7240-pll", ath79_clocks_init_dt);
-CLK_OF_DECLARE(ar9130, "qca,ar9130-pll", ath79_clocks_init_dt);
-CLK_OF_DECLARE(ar9330, "qca,ar9330-pll", ath79_clocks_init_dt);
CLK_OF_DECLARE(ar9340, "qca,ar9340-pll", ath79_clocks_init_dt);
CLK_OF_DECLARE(ar9550, "qca,qca9550-pll", ath79_clocks_init_dt);
#endif
--
2.6.2
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [RFC v3 03/14] MIPS: dts: qca: ar9132: use dt-bindings/clock/ath79-clk.h macros
2016-01-23 20:17 [RFC v3 00/14] MIPS: AR913X/AR933X devicetree patchseries Antony Pavlov
@ 2016-01-23 20:17 ` Antony Pavlov
2016-01-23 20:17 ` [RFC v3 02/14] MIPS: ath79: use clk-ath79.c driver for AR913X/AR933X Antony Pavlov
` (4 subsequent siblings)
5 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-01-23 20:17 UTC (permalink / raw)
To: linux-mips-6z/3iImG2C8G8FEW9MqTrA
Cc: Antony Pavlov, Alban Bedel, devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-clk-u79uwXL29TY76Z2rM5mHXA
The old ar9132 clk implementation (see arch/mips/ath79/clock.c)
have had only 3 devicetree clks (cpu, ddr, ahb). Two additional
clocks (wdt and uart) have realized as aliases for ahb clock.
In the old ar9132 clk implementation the wdt and uart clocks
were inaccessible via devicetree so index "2" used for reference
to ahb clock instead, e.g.
clocks = <&pll 2>;
In the new ar9132 clk implementation (see drivers/clk/clk-ath79.c)
the wdt and uart clks are accessible via devicetree
so appropriate ATH79_CLK_WDT and ATH79_CLK_UART are used in ar9132.dtsi.
Signed-off-by: Antony Pavlov <antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Alban Bedel <albeu-GANU6spQydw@public.gmane.org>
Cc: linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-clk-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
---
arch/mips/boot/dts/qca/ar9132.dtsi | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/arch/mips/boot/dts/qca/ar9132.dtsi b/arch/mips/boot/dts/qca/ar9132.dtsi
index 13d0439..4a537ea 100644
--- a/arch/mips/boot/dts/qca/ar9132.dtsi
+++ b/arch/mips/boot/dts/qca/ar9132.dtsi
@@ -1,3 +1,5 @@
+#include <dt-bindings/clock/ath79-clk.h>
+
/ {
compatible = "qca,ar9132";
@@ -57,7 +59,7 @@
reg = <0x18020000 0x20>;
interrupts = <3>;
- clocks = <&pll 2>;
+ clocks = <&pll ATH79_CLK_UART>;
clock-names = "uart";
reg-io-width = <4>;
@@ -100,7 +102,7 @@
interrupts = <4>;
- clocks = <&pll 2>;
+ clocks = <&pll ATH79_CLK_WDT>;
clock-names = "wdt";
};
@@ -129,7 +131,7 @@
compatible = "qca,ar9132-spi", "qca,ar7100-spi";
reg = <0x1f000000 0x10>;
- clocks = <&pll 2>;
+ clocks = <&pll ATH79_CLK_AHB>;
clock-names = "ahb";
status = "disabled";
--
2.6.2
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [RFC v3 03/14] MIPS: dts: qca: ar9132: use dt-bindings/clock/ath79-clk.h macros
@ 2016-01-23 20:17 ` Antony Pavlov
0 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-01-23 20:17 UTC (permalink / raw)
To: linux-mips; +Cc: Antony Pavlov, Alban Bedel, devicetree, linux-clk
The old ar9132 clk implementation (see arch/mips/ath79/clock.c)
have had only 3 devicetree clks (cpu, ddr, ahb). Two additional
clocks (wdt and uart) have realized as aliases for ahb clock.
In the old ar9132 clk implementation the wdt and uart clocks
were inaccessible via devicetree so index "2" used for reference
to ahb clock instead, e.g.
clocks = <&pll 2>;
In the new ar9132 clk implementation (see drivers/clk/clk-ath79.c)
the wdt and uart clks are accessible via devicetree
so appropriate ATH79_CLK_WDT and ATH79_CLK_UART are used in ar9132.dtsi.
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Cc: Alban Bedel <albeu@free.fr>
Cc: linux-mips@linux-mips.org
Cc: devicetree@vger.kernel.org
Cc: linux-clk@vger.kernel.org
---
arch/mips/boot/dts/qca/ar9132.dtsi | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/arch/mips/boot/dts/qca/ar9132.dtsi b/arch/mips/boot/dts/qca/ar9132.dtsi
index 13d0439..4a537ea 100644
--- a/arch/mips/boot/dts/qca/ar9132.dtsi
+++ b/arch/mips/boot/dts/qca/ar9132.dtsi
@@ -1,3 +1,5 @@
+#include <dt-bindings/clock/ath79-clk.h>
+
/ {
compatible = "qca,ar9132";
@@ -57,7 +59,7 @@
reg = <0x18020000 0x20>;
interrupts = <3>;
- clocks = <&pll 2>;
+ clocks = <&pll ATH79_CLK_UART>;
clock-names = "uart";
reg-io-width = <4>;
@@ -100,7 +102,7 @@
interrupts = <4>;
- clocks = <&pll 2>;
+ clocks = <&pll ATH79_CLK_WDT>;
clock-names = "wdt";
};
@@ -129,7 +131,7 @@
compatible = "qca,ar9132-spi", "qca,ar7100-spi";
reg = <0x1f000000 0x10>;
- clocks = <&pll 2>;
+ clocks = <&pll ATH79_CLK_AHB>;
clock-names = "ahb";
status = "disabled";
--
2.6.2
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [RFC v3 04/14] MIPS: dts: qca: ar9132: make extosc-related description shorter
2016-01-23 20:17 [RFC v3 00/14] MIPS: AR913X/AR933X devicetree patchseries Antony Pavlov
2016-01-23 20:17 ` [RFC v3 01/14] WIP: clk: add Atheros AR724X/AR913X/AR933X SoCs clock driver Antony Pavlov
2016-01-23 20:17 ` [RFC v3 02/14] MIPS: ath79: use clk-ath79.c driver for AR913X/AR933X Antony Pavlov
@ 2016-01-23 20:17 ` Antony Pavlov
2016-01-23 20:17 ` [RFC v3 07/14] MIPS: dts: qca: simplify Makefile Antony Pavlov
` (2 subsequent siblings)
5 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-01-23 20:17 UTC (permalink / raw)
To: linux-mips; +Cc: Antony Pavlov, Alban Bedel, devicetree, linux-clk
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Cc: Alban Bedel <albeu@free.fr>
Cc: linux-mips@linux-mips.org
Cc: devicetree@vger.kernel.org
Cc: linux-clk@vger.kernel.org
---
arch/mips/boot/dts/qca/ar9132.dtsi | 9 ++++++++-
arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 14 ++++----------
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/arch/mips/boot/dts/qca/ar9132.dtsi b/arch/mips/boot/dts/qca/ar9132.dtsi
index 4a537ea..cd1602f 100644
--- a/arch/mips/boot/dts/qca/ar9132.dtsi
+++ b/arch/mips/boot/dts/qca/ar9132.dtsi
@@ -28,6 +28,13 @@
<&ddr_ctrl 0>, <&ddr_ctrl 1>;
};
+ extosc: oscillator {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+
+ /* The board must provide the extosc clock frequency */
+ };
+
ahb {
compatible = "simple-bus";
ranges;
@@ -89,8 +96,8 @@
"qca,ar9130-pll";
reg = <0x18050000 0x20>;
+ clocks = <&extosc>;
clock-names = "ref";
- /* The board must provides the ref clock */
#clock-cells = <1>;
clock-output-names = "cpu", "ddr", "ahb";
diff --git a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
index 003015a..53057ca 100644
--- a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
+++ b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
@@ -18,21 +18,11 @@
reg = <0x0 0x2000000>;
};
- extosc: oscillator {
- compatible = "fixed-clock";
- #clock-cells = <0>;
- clock-frequency = <40000000>;
- };
-
ahb {
apb {
uart@18020000 {
status = "okay";
};
-
- pll-controller@18050000 {
- clocks = <&extosc>;
- };
};
spi@1f000000 {
@@ -110,3 +100,7 @@
};
};
};
+
+&extosc {
+ clock-frequency = <40000000>;
+};
--
2.6.2
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [RFC v3 05/14] MIPS: dts: qca: ar9132_tl_wr1043nd_v1.dts: drop unused alias node
2016-01-23 20:17 [RFC v3 00/14] MIPS: AR913X/AR933X devicetree patchseries Antony Pavlov
@ 2016-01-23 20:17 ` Antony Pavlov
2016-01-23 20:17 ` [RFC v3 02/14] MIPS: ath79: use clk-ath79.c driver for AR913X/AR933X Antony Pavlov
` (4 subsequent siblings)
5 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-01-23 20:17 UTC (permalink / raw)
To: linux-mips-6z/3iImG2C8G8FEW9MqTrA
Cc: Antony Pavlov, Alban Bedel, devicetree-u79uwXL29TY76Z2rM5mHXA
The TP-LINK TL-WR1043ND board has only one serial port,
so replacing the default of 0 with 0 does nothing useful.
Moreover, the correct name for aliases node is "aliases" not "alias".
An overview of the "aliases" node usage can be found
on the device tree usage page at devicetree.org [1].
Also please see chapter 3.3 ("Aliases node") of the ePAPR 1.1 [2].
[1] http://devicetree.org/Device_Tree_Usage#aliases_Node
[2] https://www.power.org/documentation/epapr-version-1-1/
Signed-off-by: Antony Pavlov <antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Alban Bedel <albeu-GANU6spQydw@public.gmane.org>
Cc: linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
---
arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
index 53057ca..9618105 100644
--- a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
+++ b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
@@ -9,10 +9,6 @@
compatible = "tplink,tl-wr1043nd-v1", "qca,ar9132";
model = "TP-Link TL-WR1043ND Version 1";
- alias {
- serial0 = "/ahb/apb/uart@18020000";
- };
-
memory@0 {
device_type = "memory";
reg = <0x0 0x2000000>;
--
2.6.2
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [RFC v3 05/14] MIPS: dts: qca: ar9132_tl_wr1043nd_v1.dts: drop unused alias node
@ 2016-01-23 20:17 ` Antony Pavlov
0 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-01-23 20:17 UTC (permalink / raw)
To: linux-mips; +Cc: Antony Pavlov, Alban Bedel, devicetree
The TP-LINK TL-WR1043ND board has only one serial port,
so replacing the default of 0 with 0 does nothing useful.
Moreover, the correct name for aliases node is "aliases" not "alias".
An overview of the "aliases" node usage can be found
on the device tree usage page at devicetree.org [1].
Also please see chapter 3.3 ("Aliases node") of the ePAPR 1.1 [2].
[1] http://devicetree.org/Device_Tree_Usage#aliases_Node
[2] https://www.power.org/documentation/epapr-version-1-1/
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Cc: Alban Bedel <albeu@free.fr>
Cc: linux-mips@linux-mips.org
Cc: devicetree@vger.kernel.org
---
arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
index 53057ca..9618105 100644
--- a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
+++ b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
@@ -9,10 +9,6 @@
compatible = "tplink,tl-wr1043nd-v1", "qca,ar9132";
model = "TP-Link TL-WR1043ND Version 1";
- alias {
- serial0 = "/ahb/apb/uart@18020000";
- };
-
memory@0 {
device_type = "memory";
reg = <0x0 0x2000000>;
--
2.6.2
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [RFC v3 06/14] MIPS: dts: qca: ar9132: use short references for uart and spi nodes
2016-01-23 20:17 [RFC v3 00/14] MIPS: AR913X/AR933X devicetree patchseries Antony Pavlov
@ 2016-01-23 20:17 ` Antony Pavlov
2016-01-23 20:17 ` [RFC v3 02/14] MIPS: ath79: use clk-ath79.c driver for AR913X/AR933X Antony Pavlov
` (4 subsequent siblings)
5 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-01-23 20:17 UTC (permalink / raw)
To: linux-mips-6z/3iImG2C8G8FEW9MqTrA
Cc: Antony Pavlov, Alban Bedel, devicetree-u79uwXL29TY76Z2rM5mHXA
Signed-off-by: Antony Pavlov <antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Alban Bedel <albeu-GANU6spQydw@public.gmane.org>
Cc: linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
---
arch/mips/boot/dts/qca/ar9132.dtsi | 4 +-
arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 70 +++++++++++-------------
2 files changed, 35 insertions(+), 39 deletions(-)
diff --git a/arch/mips/boot/dts/qca/ar9132.dtsi b/arch/mips/boot/dts/qca/ar9132.dtsi
index cd1602f..a14f6f2 100644
--- a/arch/mips/boot/dts/qca/ar9132.dtsi
+++ b/arch/mips/boot/dts/qca/ar9132.dtsi
@@ -61,7 +61,7 @@
#qca,ddr-wb-channel-cells = <1>;
};
- uart@18020000 {
+ uart: uart@18020000 {
compatible = "ns8250";
reg = <0x18020000 0x20>;
interrupts = <3>;
@@ -134,7 +134,7 @@
};
};
- spi@1f000000 {
+ spi: spi@1f000000 {
compatible = "qca,ar9132-spi", "qca,ar7100-spi";
reg = <0x1f000000 0x10>;
diff --git a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
index 9618105..f22c22c 100644
--- a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
+++ b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
@@ -14,43 +14,6 @@
reg = <0x0 0x2000000>;
};
- ahb {
- apb {
- uart@18020000 {
- status = "okay";
- };
- };
-
- spi@1f000000 {
- status = "okay";
- num-cs = <1>;
-
- flash@0 {
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "s25sl064a";
- reg = <0>;
- spi-max-frequency = <25000000>;
-
- partition@0 {
- label = "u-boot";
- reg = <0x000000 0x020000>;
- };
-
- partition@1 {
- label = "firmware";
- reg = <0x020000 0x7D0000>;
- };
-
- partition@2 {
- label = "art";
- reg = <0x7F0000 0x010000>;
- read-only;
- };
- };
- };
- };
-
gpio-keys {
compatible = "gpio-keys-polled";
#address-cells = <1>;
@@ -100,3 +63,36 @@
&extosc {
clock-frequency = <40000000>;
};
+
+&uart {
+ status = "okay";
+};
+
+&spi {
+ status = "okay";
+ num-cs = <1>;
+
+ flash@0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "s25sl064a";
+ reg = <0>;
+ spi-max-frequency = <25000000>;
+
+ partition@0 {
+ label = "u-boot";
+ reg = <0x000000 0x020000>;
+ };
+
+ partition@1 {
+ label = "firmware";
+ reg = <0x020000 0x7D0000>;
+ };
+
+ partition@2 {
+ label = "art";
+ reg = <0x7F0000 0x010000>;
+ read-only;
+ };
+ };
+};
--
2.6.2
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [RFC v3 06/14] MIPS: dts: qca: ar9132: use short references for uart and spi nodes
@ 2016-01-23 20:17 ` Antony Pavlov
0 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-01-23 20:17 UTC (permalink / raw)
To: linux-mips; +Cc: Antony Pavlov, Alban Bedel, devicetree
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Cc: Alban Bedel <albeu@free.fr>
Cc: linux-mips@linux-mips.org
Cc: devicetree@vger.kernel.org
---
arch/mips/boot/dts/qca/ar9132.dtsi | 4 +-
arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 70 +++++++++++-------------
2 files changed, 35 insertions(+), 39 deletions(-)
diff --git a/arch/mips/boot/dts/qca/ar9132.dtsi b/arch/mips/boot/dts/qca/ar9132.dtsi
index cd1602f..a14f6f2 100644
--- a/arch/mips/boot/dts/qca/ar9132.dtsi
+++ b/arch/mips/boot/dts/qca/ar9132.dtsi
@@ -61,7 +61,7 @@
#qca,ddr-wb-channel-cells = <1>;
};
- uart@18020000 {
+ uart: uart@18020000 {
compatible = "ns8250";
reg = <0x18020000 0x20>;
interrupts = <3>;
@@ -134,7 +134,7 @@
};
};
- spi@1f000000 {
+ spi: spi@1f000000 {
compatible = "qca,ar9132-spi", "qca,ar7100-spi";
reg = <0x1f000000 0x10>;
diff --git a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
index 9618105..f22c22c 100644
--- a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
+++ b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
@@ -14,43 +14,6 @@
reg = <0x0 0x2000000>;
};
- ahb {
- apb {
- uart@18020000 {
- status = "okay";
- };
- };
-
- spi@1f000000 {
- status = "okay";
- num-cs = <1>;
-
- flash@0 {
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "s25sl064a";
- reg = <0>;
- spi-max-frequency = <25000000>;
-
- partition@0 {
- label = "u-boot";
- reg = <0x000000 0x020000>;
- };
-
- partition@1 {
- label = "firmware";
- reg = <0x020000 0x7D0000>;
- };
-
- partition@2 {
- label = "art";
- reg = <0x7F0000 0x010000>;
- read-only;
- };
- };
- };
- };
-
gpio-keys {
compatible = "gpio-keys-polled";
#address-cells = <1>;
@@ -100,3 +63,36 @@
&extosc {
clock-frequency = <40000000>;
};
+
+&uart {
+ status = "okay";
+};
+
+&spi {
+ status = "okay";
+ num-cs = <1>;
+
+ flash@0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "s25sl064a";
+ reg = <0>;
+ spi-max-frequency = <25000000>;
+
+ partition@0 {
+ label = "u-boot";
+ reg = <0x000000 0x020000>;
+ };
+
+ partition@1 {
+ label = "firmware";
+ reg = <0x020000 0x7D0000>;
+ };
+
+ partition@2 {
+ label = "art";
+ reg = <0x7F0000 0x010000>;
+ read-only;
+ };
+ };
+};
--
2.6.2
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [RFC v3 07/14] MIPS: dts: qca: simplify Makefile
2016-01-23 20:17 [RFC v3 00/14] MIPS: AR913X/AR933X devicetree patchseries Antony Pavlov
` (2 preceding siblings ...)
2016-01-23 20:17 ` [RFC v3 04/14] MIPS: dts: qca: ar9132: make extosc-related description shorter Antony Pavlov
@ 2016-01-23 20:17 ` Antony Pavlov
2016-01-25 22:41 ` Alban
[not found] ` <1453580251-2341-1-git-send-email-antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-01-23 20:17 ` [RFC v3 14/14] WIP: MIPS: ath79: add devicetree defconfigs Antony Pavlov
5 siblings, 1 reply; 52+ messages in thread
From: Antony Pavlov @ 2016-01-23 20:17 UTC (permalink / raw)
To: linux-mips; +Cc: Antony Pavlov, Alban Bedel
Do as arch/mips/boot/dts/ralink/Makefile does.
Without this patch adding a dtb-file leads
to adding __two__ lines to the Makefile.
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Cc: Alban Bedel <albeu@free.fr>
Cc: linux-mips@linux-mips.org
---
arch/mips/boot/dts/qca/Makefile | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/mips/boot/dts/qca/Makefile b/arch/mips/boot/dts/qca/Makefile
index 2d61455d..244329e 100644
--- a/arch/mips/boot/dts/qca/Makefile
+++ b/arch/mips/boot/dts/qca/Makefile
@@ -1,8 +1,7 @@
# All DTBs
-dtb-$(CONFIG_ATH79) += ar9132_tl_wr1043nd_v1.dtb
+dtb-$(CONFIG_DTB_TL_WR1043ND_V1) += ar9132_tl_wr1043nd_v1.dtb
-# Select a DTB to build in the kernel
-obj-$(CONFIG_DTB_TL_WR1043ND_V1) += ar9132_tl_wr1043nd_v1.dtb.o
+obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
# Force kbuild to make empty built-in.o if necessary
obj- += dummy.o
--
2.6.2
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [RFC v3 08/14] MIPS: dts: qca: introduce AR9331 devicetree
2016-01-23 20:17 [RFC v3 00/14] MIPS: AR913X/AR933X devicetree patchseries Antony Pavlov
@ 2016-01-23 20:17 ` Antony Pavlov
2016-01-23 20:17 ` [RFC v3 02/14] MIPS: ath79: use clk-ath79.c driver for AR913X/AR933X Antony Pavlov
` (4 subsequent siblings)
5 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-01-23 20:17 UTC (permalink / raw)
To: linux-mips-6z/3iImG2C8G8FEW9MqTrA
Cc: Antony Pavlov, Gabor Juhos, Alban Bedel,
devicetree-u79uwXL29TY76Z2rM5mHXA
This patch introduces devicetree for Atheros AR9331 SoC (AKA Hornet).
The AR9331 chip is a Wi-Fi System-On-Chip (WiSOC),
typically used in very cheap Access Points and Routers.
Signed-off-by: Antony Pavlov <antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Gabor Juhos <juhosg-p3rKhJxN3npAfugRpC6u6w@public.gmane.org>
Cc: Alban Bedel <albeu-GANU6spQydw@public.gmane.org>
Cc: linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
---
arch/mips/boot/dts/qca/ar9331.dtsi | 123 +++++++++++++++++++++++++++++++++++++
1 file changed, 123 insertions(+)
diff --git a/arch/mips/boot/dts/qca/ar9331.dtsi b/arch/mips/boot/dts/qca/ar9331.dtsi
new file mode 100644
index 0000000..bf128a2
--- /dev/null
+++ b/arch/mips/boot/dts/qca/ar9331.dtsi
@@ -0,0 +1,123 @@
+#include <dt-bindings/clock/ath79-clk.h>
+
+/ {
+ compatible = "qca,ar9331";
+
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cpus {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ cpu@0 {
+ device_type = "cpu";
+ compatible = "mips,mips24Kc";
+ reg = <0>;
+ };
+ };
+
+ cpuintc: interrupt-controller {
+ compatible = "qca,ar7100-cpu-intc";
+
+ interrupt-controller;
+ #interrupt-cells = <1>;
+
+ qca,ddr-wb-channel-interrupts = <2>, <3>;
+ qca,ddr-wb-channels = <&ddr_ctrl 3>, <&ddr_ctrl 2>;
+ };
+
+ extosc: oscillator {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ };
+
+ ahb {
+ compatible = "simple-bus";
+ ranges;
+
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ interrupt-parent = <&cpuintc>;
+
+ apb {
+ compatible = "simple-bus";
+ ranges;
+
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ interrupt-parent = <&miscintc>;
+
+ ddr_ctrl: memory-controller@18000000 {
+ compatible = "qca,ar7240-ddr-controller";
+ reg = <0x18000000 0x100>;
+
+ #qca,ddr-wb-channel-cells = <1>;
+ };
+
+ uart: uart@18020000 {
+ compatible = "qca,ar9330-uart";
+ reg = <0x18020000 0x14>;
+
+ interrupts = <3>;
+
+ clocks = <&pll ATH79_CLK_UART>;
+ clock-names = "uart";
+
+ status = "disabled";
+ };
+
+ gpio: gpio@18040000 {
+ compatible = "qca,ar7100-gpio";
+ reg = <0x18040000 0x34>;
+ interrupts = <2>;
+
+ ngpios = <30>;
+
+ gpio-controller;
+ #gpio-cells = <2>;
+
+ interrupt-controller;
+ #interrupt-cells = <2>;
+
+ status = "disabled";
+ };
+
+ pll: pll-controller@18050000 {
+ compatible = "qca,ar9330-pll";
+ reg = <0x18050000 0x20>;
+
+ clocks = <&extosc>;
+ clock-names = "ref";
+
+ #clock-cells = <1>;
+ };
+
+ miscintc: interrupt-controller@18060010 {
+ compatible = "qca,ar7240-misc-intc";
+ reg = <0x18060010 0x4>;
+
+ interrupt-parent = <&cpuintc>;
+ interrupts = <6>;
+
+ interrupt-controller;
+ #interrupt-cells = <1>;
+ };
+
+ spi: spi@1f000000 {
+ compatible = "qca,ar7100-spi";
+ reg = <0x1f000000 0x10>;
+
+ clocks = <&pll ATH79_CLK_AHB>;
+ clock-names = "ahb";
+
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ status = "disabled";
+ };
+ };
+ };
+};
--
2.6.2
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [RFC v3 08/14] MIPS: dts: qca: introduce AR9331 devicetree
@ 2016-01-23 20:17 ` Antony Pavlov
0 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-01-23 20:17 UTC (permalink / raw)
To: linux-mips; +Cc: Antony Pavlov, Gabor Juhos, Alban Bedel, devicetree
This patch introduces devicetree for Atheros AR9331 SoC (AKA Hornet).
The AR9331 chip is a Wi-Fi System-On-Chip (WiSOC),
typically used in very cheap Access Points and Routers.
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Cc: Gabor Juhos <juhosg@openwrt.org>
Cc: Alban Bedel <albeu@free.fr>
Cc: linux-mips@linux-mips.org
Cc: devicetree@vger.kernel.org
---
arch/mips/boot/dts/qca/ar9331.dtsi | 123 +++++++++++++++++++++++++++++++++++++
1 file changed, 123 insertions(+)
diff --git a/arch/mips/boot/dts/qca/ar9331.dtsi b/arch/mips/boot/dts/qca/ar9331.dtsi
new file mode 100644
index 0000000..bf128a2
--- /dev/null
+++ b/arch/mips/boot/dts/qca/ar9331.dtsi
@@ -0,0 +1,123 @@
+#include <dt-bindings/clock/ath79-clk.h>
+
+/ {
+ compatible = "qca,ar9331";
+
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ cpus {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ cpu@0 {
+ device_type = "cpu";
+ compatible = "mips,mips24Kc";
+ reg = <0>;
+ };
+ };
+
+ cpuintc: interrupt-controller {
+ compatible = "qca,ar7100-cpu-intc";
+
+ interrupt-controller;
+ #interrupt-cells = <1>;
+
+ qca,ddr-wb-channel-interrupts = <2>, <3>;
+ qca,ddr-wb-channels = <&ddr_ctrl 3>, <&ddr_ctrl 2>;
+ };
+
+ extosc: oscillator {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ };
+
+ ahb {
+ compatible = "simple-bus";
+ ranges;
+
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ interrupt-parent = <&cpuintc>;
+
+ apb {
+ compatible = "simple-bus";
+ ranges;
+
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ interrupt-parent = <&miscintc>;
+
+ ddr_ctrl: memory-controller@18000000 {
+ compatible = "qca,ar7240-ddr-controller";
+ reg = <0x18000000 0x100>;
+
+ #qca,ddr-wb-channel-cells = <1>;
+ };
+
+ uart: uart@18020000 {
+ compatible = "qca,ar9330-uart";
+ reg = <0x18020000 0x14>;
+
+ interrupts = <3>;
+
+ clocks = <&pll ATH79_CLK_UART>;
+ clock-names = "uart";
+
+ status = "disabled";
+ };
+
+ gpio: gpio@18040000 {
+ compatible = "qca,ar7100-gpio";
+ reg = <0x18040000 0x34>;
+ interrupts = <2>;
+
+ ngpios = <30>;
+
+ gpio-controller;
+ #gpio-cells = <2>;
+
+ interrupt-controller;
+ #interrupt-cells = <2>;
+
+ status = "disabled";
+ };
+
+ pll: pll-controller@18050000 {
+ compatible = "qca,ar9330-pll";
+ reg = <0x18050000 0x20>;
+
+ clocks = <&extosc>;
+ clock-names = "ref";
+
+ #clock-cells = <1>;
+ };
+
+ miscintc: interrupt-controller@18060010 {
+ compatible = "qca,ar7240-misc-intc";
+ reg = <0x18060010 0x4>;
+
+ interrupt-parent = <&cpuintc>;
+ interrupts = <6>;
+
+ interrupt-controller;
+ #interrupt-cells = <1>;
+ };
+
+ spi: spi@1f000000 {
+ compatible = "qca,ar7100-spi";
+ reg = <0x1f000000 0x10>;
+
+ clocks = <&pll ATH79_CLK_AHB>;
+ clock-names = "ahb";
+
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ status = "disabled";
+ };
+ };
+ };
+};
--
2.6.2
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [RFC v3 09/14] MIPS: ath79: add initial support for TP-LINK MR3020
2016-01-23 20:17 [RFC v3 00/14] MIPS: AR913X/AR933X devicetree patchseries Antony Pavlov
@ 2016-01-23 20:17 ` Antony Pavlov
2016-01-23 20:17 ` [RFC v3 02/14] MIPS: ath79: use clk-ath79.c driver for AR913X/AR933X Antony Pavlov
` (4 subsequent siblings)
5 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-01-23 20:17 UTC (permalink / raw)
To: linux-mips-6z/3iImG2C8G8FEW9MqTrA
Cc: Antony Pavlov, Gabor Juhos, Alban Bedel,
devicetree-u79uwXL29TY76Z2rM5mHXA
Currently only the UART, SPI-flash and LEDs are supported.
Links:
* http://www.tp-link.com/en/products/details/?model=TL-MR3020
* http://wiki.openwrt.org/toh/tp-link/tl-mr3020
* https://wikidevi.com/wiki/TP-LINK_TL-MR3020
Signed-off-by: Antony Pavlov <antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Gabor Juhos <juhosg-p3rKhJxN3npAfugRpC6u6w@public.gmane.org>
Cc: Alban Bedel <albeu-GANU6spQydw@public.gmane.org>
Cc: linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
---
arch/mips/ath79/Kconfig | 5 +++
arch/mips/boot/dts/qca/Makefile | 1 +
arch/mips/boot/dts/qca/tl_mr3020.dts | 72 ++++++++++++++++++++++++++++++++++++
3 files changed, 78 insertions(+)
diff --git a/arch/mips/ath79/Kconfig b/arch/mips/ath79/Kconfig
index 13c04cf..4fd53ae 100644
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
@@ -77,6 +77,11 @@ choice
help
Select a devicetree that should be built into the kernel.
+ config DTB_TL_MR3020
+ bool "TL-MR3020"
+ select BUILTIN_DTB
+ select SOC_AR933X
+
config DTB_TL_WR1043ND_V1
bool "TL-WR1043ND Version 1"
select BUILTIN_DTB
diff --git a/arch/mips/boot/dts/qca/Makefile b/arch/mips/boot/dts/qca/Makefile
index 244329e..04fe47c 100644
--- a/arch/mips/boot/dts/qca/Makefile
+++ b/arch/mips/boot/dts/qca/Makefile
@@ -1,5 +1,6 @@
# All DTBs
dtb-$(CONFIG_DTB_TL_WR1043ND_V1) += ar9132_tl_wr1043nd_v1.dtb
+dtb-$(CONFIG_DTB_TL_MR3020) += tl_mr3020.dtb
obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
diff --git a/arch/mips/boot/dts/qca/tl_mr3020.dts b/arch/mips/boot/dts/qca/tl_mr3020.dts
new file mode 100644
index 0000000..ac9f3dc
--- /dev/null
+++ b/arch/mips/boot/dts/qca/tl_mr3020.dts
@@ -0,0 +1,72 @@
+/dts-v1/;
+
+#include "ar9331.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+ model = "TP-Link TL-MR3020";
+ compatible = "tplink,tl-mr3020";
+
+ aliases {
+ serial0 = &uart;
+ };
+
+ memory@0 {
+ device_type = "memory";
+ reg = <0x0 0x2000000>;
+ };
+
+ leds {
+ compatible = "gpio-leds";
+
+ wlan {
+ label = "tp-link:green:wlan";
+ gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
+ default-state = "off";
+ };
+
+ lan {
+ label = "tp-link:green:lan";
+ gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
+ default-state = "off";
+ };
+
+ wps {
+ label = "tp-link:green:wps";
+ gpios = <&gpio 26 GPIO_ACTIVE_LOW>;
+ default-state = "off";
+ };
+
+ led3g {
+ label = "tp-link:green:3g";
+ gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
+ default-state = "off";
+ };
+ };
+};
+
+&extosc {
+ clock-frequency = <25000000>;
+};
+
+&uart {
+ status = "okay";
+};
+
+&gpio {
+ status = "okay";
+};
+
+&spi {
+ num-chipselects = <1>;
+ status = "okay";
+
+ /* Spansion S25FL032PIF SPI flash */
+ spiflash: s25sl032p@0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "spansion,s25sl032p", "jedec,spi-nor";
+ spi-max-frequency = <104000000>;
+ reg = <0>;
+ };
+};
--
2.6.2
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [RFC v3 09/14] MIPS: ath79: add initial support for TP-LINK MR3020
@ 2016-01-23 20:17 ` Antony Pavlov
0 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-01-23 20:17 UTC (permalink / raw)
To: linux-mips; +Cc: Antony Pavlov, Gabor Juhos, Alban Bedel, devicetree
Currently only the UART, SPI-flash and LEDs are supported.
Links:
* http://www.tp-link.com/en/products/details/?model=TL-MR3020
* http://wiki.openwrt.org/toh/tp-link/tl-mr3020
* https://wikidevi.com/wiki/TP-LINK_TL-MR3020
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Cc: Gabor Juhos <juhosg@openwrt.org>
Cc: Alban Bedel <albeu@free.fr>
Cc: linux-mips@linux-mips.org
Cc: devicetree@vger.kernel.org
---
arch/mips/ath79/Kconfig | 5 +++
arch/mips/boot/dts/qca/Makefile | 1 +
arch/mips/boot/dts/qca/tl_mr3020.dts | 72 ++++++++++++++++++++++++++++++++++++
3 files changed, 78 insertions(+)
diff --git a/arch/mips/ath79/Kconfig b/arch/mips/ath79/Kconfig
index 13c04cf..4fd53ae 100644
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
@@ -77,6 +77,11 @@ choice
help
Select a devicetree that should be built into the kernel.
+ config DTB_TL_MR3020
+ bool "TL-MR3020"
+ select BUILTIN_DTB
+ select SOC_AR933X
+
config DTB_TL_WR1043ND_V1
bool "TL-WR1043ND Version 1"
select BUILTIN_DTB
diff --git a/arch/mips/boot/dts/qca/Makefile b/arch/mips/boot/dts/qca/Makefile
index 244329e..04fe47c 100644
--- a/arch/mips/boot/dts/qca/Makefile
+++ b/arch/mips/boot/dts/qca/Makefile
@@ -1,5 +1,6 @@
# All DTBs
dtb-$(CONFIG_DTB_TL_WR1043ND_V1) += ar9132_tl_wr1043nd_v1.dtb
+dtb-$(CONFIG_DTB_TL_MR3020) += tl_mr3020.dtb
obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
diff --git a/arch/mips/boot/dts/qca/tl_mr3020.dts b/arch/mips/boot/dts/qca/tl_mr3020.dts
new file mode 100644
index 0000000..ac9f3dc
--- /dev/null
+++ b/arch/mips/boot/dts/qca/tl_mr3020.dts
@@ -0,0 +1,72 @@
+/dts-v1/;
+
+#include "ar9331.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+ model = "TP-Link TL-MR3020";
+ compatible = "tplink,tl-mr3020";
+
+ aliases {
+ serial0 = &uart;
+ };
+
+ memory@0 {
+ device_type = "memory";
+ reg = <0x0 0x2000000>;
+ };
+
+ leds {
+ compatible = "gpio-leds";
+
+ wlan {
+ label = "tp-link:green:wlan";
+ gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
+ default-state = "off";
+ };
+
+ lan {
+ label = "tp-link:green:lan";
+ gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
+ default-state = "off";
+ };
+
+ wps {
+ label = "tp-link:green:wps";
+ gpios = <&gpio 26 GPIO_ACTIVE_LOW>;
+ default-state = "off";
+ };
+
+ led3g {
+ label = "tp-link:green:3g";
+ gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
+ default-state = "off";
+ };
+ };
+};
+
+&extosc {
+ clock-frequency = <25000000>;
+};
+
+&uart {
+ status = "okay";
+};
+
+&gpio {
+ status = "okay";
+};
+
+&spi {
+ num-chipselects = <1>;
+ status = "okay";
+
+ /* Spansion S25FL032PIF SPI flash */
+ spiflash: s25sl032p@0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "spansion,s25sl032p", "jedec,spi-nor";
+ spi-max-frequency = <104000000>;
+ reg = <0>;
+ };
+};
--
2.6.2
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [RFC v3 10/14] devicetree: add Dragino vendor id
2016-01-23 20:17 [RFC v3 00/14] MIPS: AR913X/AR933X devicetree patchseries Antony Pavlov
@ 2016-01-23 20:17 ` Antony Pavlov
2016-01-23 20:17 ` [RFC v3 02/14] MIPS: ath79: use clk-ath79.c driver for AR913X/AR933X Antony Pavlov
` (4 subsequent siblings)
5 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-01-23 20:17 UTC (permalink / raw)
To: linux-mips-6z/3iImG2C8G8FEW9MqTrA
Cc: Antony Pavlov, devicetree-u79uwXL29TY76Z2rM5mHXA
Please see http://www.dragino.com/about/about.html for details.
Signed-off-by: Antony Pavlov <antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
---
Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 55df1d4..64f35c9 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -67,6 +67,7 @@ digilent Diglent, Inc.
dlg Dialog Semiconductor
dlink D-Link Corporation
dmo Data Modul AG
+dragino Dragino Technology Co., Limited
ea Embedded Artists AB
ebv EBV Elektronik
edt Emerging Display Technologies
--
2.6.2
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [RFC v3 10/14] devicetree: add Dragino vendor id
@ 2016-01-23 20:17 ` Antony Pavlov
0 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-01-23 20:17 UTC (permalink / raw)
To: linux-mips; +Cc: Antony Pavlov, devicetree
Please see http://www.dragino.com/about/about.html for details.
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Cc: devicetree@vger.kernel.org
---
Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 55df1d4..64f35c9 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -67,6 +67,7 @@ digilent Diglent, Inc.
dlg Dialog Semiconductor
dlink D-Link Corporation
dmo Data Modul AG
+dragino Dragino Technology Co., Limited
ea Embedded Artists AB
ebv EBV Elektronik
edt Emerging Display Technologies
--
2.6.2
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [RFC v3 11/14] MIPS: ath79: add initial support for Dragino MS14 (Dragino 2)
2016-01-23 20:17 [RFC v3 00/14] MIPS: AR913X/AR933X devicetree patchseries Antony Pavlov
@ 2016-01-23 20:17 ` Antony Pavlov
2016-01-23 20:17 ` [RFC v3 02/14] MIPS: ath79: use clk-ath79.c driver for AR913X/AR933X Antony Pavlov
` (4 subsequent siblings)
5 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-01-23 20:17 UTC (permalink / raw)
To: linux-mips-6z/3iImG2C8G8FEW9MqTrA
Cc: Antony Pavlov, Gabor Juhos, Alban Bedel,
devicetree-u79uwXL29TY76Z2rM5mHXA
Currently only the UART, SPI-flash and LEDs are supported.
Links:
* http://www.dragino.com/products/mother-board/item/71-ms14-p.html
* https://wiki.openwrt.org/toh/dragino/ms14
Signed-off-by: Antony Pavlov <antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Gabor Juhos <juhosg-p3rKhJxN3npAfugRpC6u6w@public.gmane.org>
Cc: Alban Bedel <albeu-GANU6spQydw@public.gmane.org>
Cc: linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
---
arch/mips/ath79/Kconfig | 5 +++
arch/mips/boot/dts/qca/Makefile | 1 +
arch/mips/boot/dts/qca/dragino_ms14.dts | 73 +++++++++++++++++++++++++++++++++
3 files changed, 79 insertions(+)
diff --git a/arch/mips/ath79/Kconfig b/arch/mips/ath79/Kconfig
index 4fd53ae..2797581 100644
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
@@ -77,6 +77,11 @@ choice
help
Select a devicetree that should be built into the kernel.
+ config DTB_DRAGINO_MS14
+ bool "Dragino MS14 (Dragino 2)"
+ select BUILTIN_DTB
+ select SOC_AR933X
+
config DTB_TL_MR3020
bool "TL-MR3020"
select BUILTIN_DTB
diff --git a/arch/mips/boot/dts/qca/Makefile b/arch/mips/boot/dts/qca/Makefile
index 04fe47c..428ebac5 100644
--- a/arch/mips/boot/dts/qca/Makefile
+++ b/arch/mips/boot/dts/qca/Makefile
@@ -1,5 +1,6 @@
# All DTBs
dtb-$(CONFIG_DTB_TL_WR1043ND_V1) += ar9132_tl_wr1043nd_v1.dtb
+dtb-$(CONFIG_DTB_DRAGINO_MS14) += dragino_ms14.dtb
dtb-$(CONFIG_DTB_TL_MR3020) += tl_mr3020.dtb
obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
diff --git a/arch/mips/boot/dts/qca/dragino_ms14.dts b/arch/mips/boot/dts/qca/dragino_ms14.dts
new file mode 100644
index 0000000..7c25d1f
--- /dev/null
+++ b/arch/mips/boot/dts/qca/dragino_ms14.dts
@@ -0,0 +1,73 @@
+/dts-v1/;
+
+#include "ar9331.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+ model = "Dragino MS14 (Dragino 2)";
+ compatible = "dragino,ms14";
+
+ aliases {
+ serial0 = &uart;
+ };
+
+ memory@0 {
+ device_type = "memory";
+ reg = <0x0 0x4000000>;
+ };
+
+
+ leds {
+ compatible = "gpio-leds";
+
+ wlan {
+ label = "dragino2:red:wlan";
+ gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
+ default-state = "off";
+ };
+
+ lan {
+ label = "dragino2:red:lan";
+ gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
+ default-state = "off";
+ };
+
+ wan {
+ label = "dragino2:red:wan";
+ gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
+ default-state = "off";
+ };
+
+ system {
+ label = "dragino2:red:system";
+ gpios = <&gpio 28 GPIO_ACTIVE_HIGH>;
+ default-state = "off";
+ };
+ };
+};
+
+&extosc {
+ clock-frequency = <25000000>;
+};
+
+&uart {
+ status = "okay";
+};
+
+&gpio {
+ status = "okay";
+};
+
+&spi {
+ num-chipselects = <1>;
+ status = "okay";
+
+ /* Winbond 25Q128BVFG SPI flash */
+ spiflash: w25q128@0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "winbond,w25q128", "jedec,spi-nor";
+ spi-max-frequency = <104000000>;
+ reg = <0>;
+ };
+};
--
2.6.2
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [RFC v3 11/14] MIPS: ath79: add initial support for Dragino MS14 (Dragino 2)
@ 2016-01-23 20:17 ` Antony Pavlov
0 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-01-23 20:17 UTC (permalink / raw)
To: linux-mips; +Cc: Antony Pavlov, Gabor Juhos, Alban Bedel, devicetree
Currently only the UART, SPI-flash and LEDs are supported.
Links:
* http://www.dragino.com/products/mother-board/item/71-ms14-p.html
* https://wiki.openwrt.org/toh/dragino/ms14
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Cc: Gabor Juhos <juhosg@openwrt.org>
Cc: Alban Bedel <albeu@free.fr>
Cc: linux-mips@linux-mips.org
Cc: devicetree@vger.kernel.org
---
arch/mips/ath79/Kconfig | 5 +++
arch/mips/boot/dts/qca/Makefile | 1 +
arch/mips/boot/dts/qca/dragino_ms14.dts | 73 +++++++++++++++++++++++++++++++++
3 files changed, 79 insertions(+)
diff --git a/arch/mips/ath79/Kconfig b/arch/mips/ath79/Kconfig
index 4fd53ae..2797581 100644
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
@@ -77,6 +77,11 @@ choice
help
Select a devicetree that should be built into the kernel.
+ config DTB_DRAGINO_MS14
+ bool "Dragino MS14 (Dragino 2)"
+ select BUILTIN_DTB
+ select SOC_AR933X
+
config DTB_TL_MR3020
bool "TL-MR3020"
select BUILTIN_DTB
diff --git a/arch/mips/boot/dts/qca/Makefile b/arch/mips/boot/dts/qca/Makefile
index 04fe47c..428ebac5 100644
--- a/arch/mips/boot/dts/qca/Makefile
+++ b/arch/mips/boot/dts/qca/Makefile
@@ -1,5 +1,6 @@
# All DTBs
dtb-$(CONFIG_DTB_TL_WR1043ND_V1) += ar9132_tl_wr1043nd_v1.dtb
+dtb-$(CONFIG_DTB_DRAGINO_MS14) += dragino_ms14.dtb
dtb-$(CONFIG_DTB_TL_MR3020) += tl_mr3020.dtb
obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
diff --git a/arch/mips/boot/dts/qca/dragino_ms14.dts b/arch/mips/boot/dts/qca/dragino_ms14.dts
new file mode 100644
index 0000000..7c25d1f
--- /dev/null
+++ b/arch/mips/boot/dts/qca/dragino_ms14.dts
@@ -0,0 +1,73 @@
+/dts-v1/;
+
+#include "ar9331.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+ model = "Dragino MS14 (Dragino 2)";
+ compatible = "dragino,ms14";
+
+ aliases {
+ serial0 = &uart;
+ };
+
+ memory@0 {
+ device_type = "memory";
+ reg = <0x0 0x4000000>;
+ };
+
+
+ leds {
+ compatible = "gpio-leds";
+
+ wlan {
+ label = "dragino2:red:wlan";
+ gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
+ default-state = "off";
+ };
+
+ lan {
+ label = "dragino2:red:lan";
+ gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
+ default-state = "off";
+ };
+
+ wan {
+ label = "dragino2:red:wan";
+ gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
+ default-state = "off";
+ };
+
+ system {
+ label = "dragino2:red:system";
+ gpios = <&gpio 28 GPIO_ACTIVE_HIGH>;
+ default-state = "off";
+ };
+ };
+};
+
+&extosc {
+ clock-frequency = <25000000>;
+};
+
+&uart {
+ status = "okay";
+};
+
+&gpio {
+ status = "okay";
+};
+
+&spi {
+ num-chipselects = <1>;
+ status = "okay";
+
+ /* Winbond 25Q128BVFG SPI flash */
+ spiflash: w25q128@0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "winbond,w25q128", "jedec,spi-nor";
+ spi-max-frequency = <104000000>;
+ reg = <0>;
+ };
+};
--
2.6.2
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [RFC v3 12/14] devicetree: add Onion Corporation vendor id
2016-01-23 20:17 [RFC v3 00/14] MIPS: AR913X/AR933X devicetree patchseries Antony Pavlov
@ 2016-01-23 20:17 ` Antony Pavlov
2016-01-23 20:17 ` [RFC v3 02/14] MIPS: ath79: use clk-ath79.c driver for AR913X/AR933X Antony Pavlov
` (4 subsequent siblings)
5 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-01-23 20:17 UTC (permalink / raw)
To: linux-mips-6z/3iImG2C8G8FEW9MqTrA
Cc: Antony Pavlov, devicetree-u79uwXL29TY76Z2rM5mHXA
Please see https://onion.io/contact for details.
Signed-off-by: Antony Pavlov <antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
---
Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 64f35c9..a81e423 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -162,6 +162,7 @@ nuvoton Nuvoton Technology Corporation
nvidia NVIDIA
nxp NXP Semiconductors
okaya Okaya Electric America, Inc.
+onion Onion Corporation
onnn ON Semiconductor Corp.
opencores OpenCores.org
option Option NV
--
2.6.2
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [RFC v3 12/14] devicetree: add Onion Corporation vendor id
@ 2016-01-23 20:17 ` Antony Pavlov
0 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-01-23 20:17 UTC (permalink / raw)
To: linux-mips; +Cc: Antony Pavlov, devicetree
Please see https://onion.io/contact for details.
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Cc: devicetree@vger.kernel.org
---
Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 64f35c9..a81e423 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -162,6 +162,7 @@ nuvoton Nuvoton Technology Corporation
nvidia NVIDIA
nxp NXP Semiconductors
okaya Okaya Electric America, Inc.
+onion Onion Corporation
onnn ON Semiconductor Corp.
opencores OpenCores.org
option Option NV
--
2.6.2
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [RFC v3 13/14] MIPS: ath79: add initial support for Onion Omega
2016-01-23 20:17 [RFC v3 00/14] MIPS: AR913X/AR933X devicetree patchseries Antony Pavlov
@ 2016-01-23 20:17 ` Antony Pavlov
2016-01-23 20:17 ` [RFC v3 02/14] MIPS: ath79: use clk-ath79.c driver for AR913X/AR933X Antony Pavlov
` (4 subsequent siblings)
5 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-01-23 20:17 UTC (permalink / raw)
To: linux-mips-6z/3iImG2C8G8FEW9MqTrA
Cc: Antony Pavlov, Gabor Juhos, Alban Bedel, L . D . Pinney,
Boken Lin, Jacky Huang, devicetree-u79uwXL29TY76Z2rM5mHXA
Currently only the UART, SPI-flash and LEDs are supported.
Please see https://onion.io/omega for details.
Signed-off-by: Antony Pavlov <antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Gabor Juhos <juhosg-p3rKhJxN3npAfugRpC6u6w@public.gmane.org>
Cc: Alban Bedel <albeu-GANU6spQydw@public.gmane.org>
Cc: L. D. Pinney <ldpinney-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Boken Lin <bl-Jj7zZGp/71Y@public.gmane.org>
Cc: Jacky Huang <huangfangcheng-9Onoh4P/yGk@public.gmane.org>
Cc: linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
---
arch/mips/ath79/Kconfig | 5 ++++
arch/mips/boot/dts/qca/Makefile | 1 +
arch/mips/boot/dts/qca/omega.dts | 54 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 60 insertions(+)
diff --git a/arch/mips/ath79/Kconfig b/arch/mips/ath79/Kconfig
index 2797581..5273039 100644
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
@@ -82,6 +82,11 @@ choice
select BUILTIN_DTB
select SOC_AR933X
+ config DTB_ONION_OMEGA
+ bool "Onion Omega"
+ select BUILTIN_DTB
+ select SOC_AR933X
+
config DTB_TL_MR3020
bool "TL-MR3020"
select BUILTIN_DTB
diff --git a/arch/mips/boot/dts/qca/Makefile b/arch/mips/boot/dts/qca/Makefile
index 428ebac5..efecdac 100644
--- a/arch/mips/boot/dts/qca/Makefile
+++ b/arch/mips/boot/dts/qca/Makefile
@@ -1,6 +1,7 @@
# All DTBs
dtb-$(CONFIG_DTB_TL_WR1043ND_V1) += ar9132_tl_wr1043nd_v1.dtb
dtb-$(CONFIG_DTB_DRAGINO_MS14) += dragino_ms14.dtb
+dtb-$(CONFIG_DTB_ONION_OMEGA) += omega.dtb
dtb-$(CONFIG_DTB_TL_MR3020) += tl_mr3020.dtb
obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
diff --git a/arch/mips/boot/dts/qca/omega.dts b/arch/mips/boot/dts/qca/omega.dts
new file mode 100644
index 0000000..9cd9f91
--- /dev/null
+++ b/arch/mips/boot/dts/qca/omega.dts
@@ -0,0 +1,54 @@
+/dts-v1/;
+
+#include "ar9331.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+ model = "Onion Omega";
+ compatible = "onion,omega";
+
+ aliases {
+ serial0 = &uart;
+ };
+
+ memory@0 {
+ device_type = "memory";
+ reg = <0x0 0x4000000>;
+ };
+
+ leds {
+ compatible = "gpio-leds";
+
+ system {
+ label = "onion:amber:system";
+ gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
+ default-state = "off";
+ };
+ };
+};
+
+&extosc {
+ clock-frequency = <25000000>;
+};
+
+&uart {
+ status = "okay";
+};
+
+&gpio {
+ status = "okay";
+};
+
+&spi {
+ num-chipselects = <1>;
+ status = "okay";
+
+ /* Winbond 25Q128FVSG SPI flash */
+ spiflash: w25q128@0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "winbond,w25q128", "jedec,spi-nor";
+ spi-max-frequency = <104000000>;
+ reg = <0>;
+ };
+};
--
2.6.2
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [RFC v3 13/14] MIPS: ath79: add initial support for Onion Omega
@ 2016-01-23 20:17 ` Antony Pavlov
0 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-01-23 20:17 UTC (permalink / raw)
To: linux-mips
Cc: Antony Pavlov, Gabor Juhos, Alban Bedel, L . D . Pinney,
Boken Lin, Jacky Huang, devicetree
Currently only the UART, SPI-flash and LEDs are supported.
Please see https://onion.io/omega for details.
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Cc: Gabor Juhos <juhosg@openwrt.org>
Cc: Alban Bedel <albeu@free.fr>
Cc: L. D. Pinney <ldpinney@gmail.com>
Cc: Boken Lin <bl@onion.io>
Cc: Jacky Huang <huangfangcheng@163.com>
Cc: linux-mips@linux-mips.org
Cc: devicetree@vger.kernel.org
---
arch/mips/ath79/Kconfig | 5 ++++
arch/mips/boot/dts/qca/Makefile | 1 +
arch/mips/boot/dts/qca/omega.dts | 54 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 60 insertions(+)
diff --git a/arch/mips/ath79/Kconfig b/arch/mips/ath79/Kconfig
index 2797581..5273039 100644
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
@@ -82,6 +82,11 @@ choice
select BUILTIN_DTB
select SOC_AR933X
+ config DTB_ONION_OMEGA
+ bool "Onion Omega"
+ select BUILTIN_DTB
+ select SOC_AR933X
+
config DTB_TL_MR3020
bool "TL-MR3020"
select BUILTIN_DTB
diff --git a/arch/mips/boot/dts/qca/Makefile b/arch/mips/boot/dts/qca/Makefile
index 428ebac5..efecdac 100644
--- a/arch/mips/boot/dts/qca/Makefile
+++ b/arch/mips/boot/dts/qca/Makefile
@@ -1,6 +1,7 @@
# All DTBs
dtb-$(CONFIG_DTB_TL_WR1043ND_V1) += ar9132_tl_wr1043nd_v1.dtb
dtb-$(CONFIG_DTB_DRAGINO_MS14) += dragino_ms14.dtb
+dtb-$(CONFIG_DTB_ONION_OMEGA) += omega.dtb
dtb-$(CONFIG_DTB_TL_MR3020) += tl_mr3020.dtb
obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
diff --git a/arch/mips/boot/dts/qca/omega.dts b/arch/mips/boot/dts/qca/omega.dts
new file mode 100644
index 0000000..9cd9f91
--- /dev/null
+++ b/arch/mips/boot/dts/qca/omega.dts
@@ -0,0 +1,54 @@
+/dts-v1/;
+
+#include "ar9331.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+ model = "Onion Omega";
+ compatible = "onion,omega";
+
+ aliases {
+ serial0 = &uart;
+ };
+
+ memory@0 {
+ device_type = "memory";
+ reg = <0x0 0x4000000>;
+ };
+
+ leds {
+ compatible = "gpio-leds";
+
+ system {
+ label = "onion:amber:system";
+ gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
+ default-state = "off";
+ };
+ };
+};
+
+&extosc {
+ clock-frequency = <25000000>;
+};
+
+&uart {
+ status = "okay";
+};
+
+&gpio {
+ status = "okay";
+};
+
+&spi {
+ num-chipselects = <1>;
+ status = "okay";
+
+ /* Winbond 25Q128FVSG SPI flash */
+ spiflash: w25q128@0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "winbond,w25q128", "jedec,spi-nor";
+ spi-max-frequency = <104000000>;
+ reg = <0>;
+ };
+};
--
2.6.2
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [RFC v3 14/14] WIP: MIPS: ath79: add devicetree defconfigs
2016-01-23 20:17 [RFC v3 00/14] MIPS: AR913X/AR933X devicetree patchseries Antony Pavlov
` (4 preceding siblings ...)
[not found] ` <1453580251-2341-1-git-send-email-antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
@ 2016-01-23 20:17 ` Antony Pavlov
5 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-01-23 20:17 UTC (permalink / raw)
To: linux-mips; +Cc: Antony Pavlov
This commits add defconfig files
to demonstrate devicetree-enabled ath79 linux kernel.
The boards with u-boot_mod-like bootloader are supported:
* TP-LINK MR3020;
* Dragino 2;
* Onion Omega;
* TP-LINK WR1043ND.
Here is a small instruction:
1. download rootfs.mipsI.cpio image into your linux kernel
source root dir.
$ wget https://github.com/frantony/linux/raw/c95a5953e3dd96ad304de515f79acb555e0bc24e/rootfs.mipsI.cpio
2. you have to disable fw_getenv() function because
devicetree-enabled kernel will hangs if started
from u-boot_mod:
> --- a/arch/mips/fw/lib/cmdline.c
> +++ b/arch/mips/fw/lib/cmdline.c
> @@ -51,6 +51,8 @@ char *fw_getenv(char *envname)
> {
> char *result = NULL;
>
> + return result;
> +
3. configure linux kernel, e.g.
3.1 for TP-LINK TL-MR3020
$ make ARCH=mips tl-mr3020-dt-raw_defconfig
3.2 for Dragino 2
$ make ARCH=mips dragino-ms14-dt-raw_defconfig
3.3 for Onion Omega
$ make ARCH=mips onion-omega-dt-raw_defconfig
3.4 for TP-LINK TL-WR1043ND
$ make ARCH=mips tl-wr1043nd_defconfig
4. compile vmlinux.bin kernel image, e.g.
$ make ARCH=mips CROSS_COMPILE=<your cross compiler> vmlinux.bin
5. put the vmlinux.bin into the root directory of your tftp-server
6. connect to u-boot_mod console
7. use u-boot_mod to download vmlinux.bin into RAM of your board and run it:
uboot> setenv serverip 192.168.1.2; setenv ipaddr 192.168.1.22
uboot> tftpboot 0x80060000 vmlinux.bin; go 0x80060000
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Cc: linux-mips@linux-mips.org
---
arch/mips/configs/dragino-ms14-dt-raw_defconfig | 85 ++++++++++++++++++++++++
arch/mips/configs/onion-omega-dt-raw_defconfig | 85 ++++++++++++++++++++++++
arch/mips/configs/tl-mr3020-dt-raw_defconfig | 85 ++++++++++++++++++++++++
arch/mips/configs/tl-wr1043nd_defconfig | 87 +++++++++++++++++++++++++
4 files changed, 342 insertions(+)
diff --git a/arch/mips/configs/dragino-ms14-dt-raw_defconfig b/arch/mips/configs/dragino-ms14-dt-raw_defconfig
new file mode 100644
index 0000000..b7c9eff
--- /dev/null
+++ b/arch/mips/configs/dragino-ms14-dt-raw_defconfig
@@ -0,0 +1,85 @@
+CONFIG_ATH79=y
+CONFIG_DTB_DRAGINO_MS14=y
+CONFIG_HZ_100=y
+# CONFIG_SECCOMP is not set
+CONFIG_MIPS_RAW_APPENDED_DTB=y
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SYSVIPC=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_CGROUPS=y
+CONFIG_CGROUP_DEBUG=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_NAMESPACES=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE="rootfs.mipsI.cpio"
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_EMBEDDED=y
+# CONFIG_VM_EVENT_COUNTERS is not set
+# CONFIG_SLUB_DEBUG is not set
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_SUSPEND is not set
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+# CONFIG_IPV6 is not set
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+CONFIG_MTD=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_M25P80=y
+CONFIG_MTD_SPI_NOR=y
+CONFIG_NETDEVICES=y
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_SERIO is not set
+# CONFIG_VT is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_DEVKMEM is not set
+CONFIG_SERIAL_AR933X=y
+CONFIG_SERIAL_AR933X_CONSOLE=y
+# CONFIG_HW_RANDOM is not set
+CONFIG_SPI=y
+CONFIG_SPI_ATH79=y
+CONFIG_GPIO_SYSFS=y
+# CONFIG_HWMON is not set
+# CONFIG_HID is not set
+# CONFIG_USB_SUPPORT is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+# CONFIG_IOMMU_SUPPORT is not set
+# CONFIG_DNOTIFY is not set
+CONFIG_PROC_KCORE=y
+# CONFIG_PROC_PAGE_MONITOR is not set
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_ROOT_NFS=y
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_FTRACE is not set
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="init=/bin/sh machtype=DTB console=ttyATH0 root=/dev/ram"
+CONFIG_CMDLINE_OVERRIDE=y
+CONFIG_DEBUG_ZBOOT=y
+CONFIG_CRC_ITU_T=y
diff --git a/arch/mips/configs/onion-omega-dt-raw_defconfig b/arch/mips/configs/onion-omega-dt-raw_defconfig
new file mode 100644
index 0000000..c7e4291
--- /dev/null
+++ b/arch/mips/configs/onion-omega-dt-raw_defconfig
@@ -0,0 +1,85 @@
+CONFIG_ATH79=y
+CONFIG_DTB_ONION_OMEGA=y
+CONFIG_HZ_100=y
+# CONFIG_SECCOMP is not set
+CONFIG_MIPS_RAW_APPENDED_DTB=y
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SYSVIPC=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_CGROUPS=y
+CONFIG_CGROUP_DEBUG=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_NAMESPACES=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE="rootfs.mipsI.cpio"
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_EMBEDDED=y
+# CONFIG_VM_EVENT_COUNTERS is not set
+# CONFIG_SLUB_DEBUG is not set
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_SUSPEND is not set
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+# CONFIG_IPV6 is not set
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+CONFIG_MTD=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_M25P80=y
+CONFIG_MTD_SPI_NOR=y
+CONFIG_NETDEVICES=y
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_SERIO is not set
+# CONFIG_VT is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_DEVKMEM is not set
+CONFIG_SERIAL_AR933X=y
+CONFIG_SERIAL_AR933X_CONSOLE=y
+# CONFIG_HW_RANDOM is not set
+CONFIG_SPI=y
+CONFIG_SPI_ATH79=y
+CONFIG_GPIO_SYSFS=y
+# CONFIG_HWMON is not set
+# CONFIG_HID is not set
+# CONFIG_USB_SUPPORT is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+# CONFIG_IOMMU_SUPPORT is not set
+# CONFIG_DNOTIFY is not set
+CONFIG_PROC_KCORE=y
+# CONFIG_PROC_PAGE_MONITOR is not set
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_ROOT_NFS=y
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_FTRACE is not set
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="init=/bin/sh machtype=DTB console=ttyATH0 root=/dev/ram"
+CONFIG_CMDLINE_OVERRIDE=y
+CONFIG_DEBUG_ZBOOT=y
+CONFIG_CRC_ITU_T=y
diff --git a/arch/mips/configs/tl-mr3020-dt-raw_defconfig b/arch/mips/configs/tl-mr3020-dt-raw_defconfig
new file mode 100644
index 0000000..00cf775
--- /dev/null
+++ b/arch/mips/configs/tl-mr3020-dt-raw_defconfig
@@ -0,0 +1,85 @@
+CONFIG_ATH79=y
+CONFIG_DTB_TL_MR3020=y
+CONFIG_HZ_100=y
+# CONFIG_SECCOMP is not set
+CONFIG_MIPS_RAW_APPENDED_DTB=y
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SYSVIPC=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_CGROUPS=y
+CONFIG_CGROUP_DEBUG=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_NAMESPACES=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE="rootfs.mipsI.cpio"
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_EMBEDDED=y
+# CONFIG_VM_EVENT_COUNTERS is not set
+# CONFIG_SLUB_DEBUG is not set
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_SUSPEND is not set
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+# CONFIG_IPV6 is not set
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+CONFIG_MTD=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_M25P80=y
+CONFIG_MTD_SPI_NOR=y
+CONFIG_NETDEVICES=y
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_SERIO is not set
+# CONFIG_VT is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_DEVKMEM is not set
+CONFIG_SERIAL_AR933X=y
+CONFIG_SERIAL_AR933X_CONSOLE=y
+# CONFIG_HW_RANDOM is not set
+CONFIG_SPI=y
+CONFIG_SPI_ATH79=y
+CONFIG_GPIO_SYSFS=y
+# CONFIG_HWMON is not set
+# CONFIG_HID is not set
+# CONFIG_USB_SUPPORT is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+# CONFIG_IOMMU_SUPPORT is not set
+# CONFIG_DNOTIFY is not set
+CONFIG_PROC_KCORE=y
+# CONFIG_PROC_PAGE_MONITOR is not set
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_ROOT_NFS=y
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_FTRACE is not set
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="init=/bin/sh machtype=DTB console=ttyATH0 root=/dev/ram"
+CONFIG_CMDLINE_OVERRIDE=y
+CONFIG_DEBUG_ZBOOT=y
+CONFIG_CRC_ITU_T=y
diff --git a/arch/mips/configs/tl-wr1043nd_defconfig b/arch/mips/configs/tl-wr1043nd_defconfig
new file mode 100644
index 0000000..de80fa7
--- /dev/null
+++ b/arch/mips/configs/tl-wr1043nd_defconfig
@@ -0,0 +1,87 @@
+CONFIG_ATH79=y
+CONFIG_DTB_TL_WR1043ND_V1=y
+CONFIG_HZ_100=y
+# CONFIG_SECCOMP is not set
+CONFIG_MIPS_RAW_APPENDED_DTB=y
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SYSVIPC=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_CGROUPS=y
+CONFIG_CGROUP_DEBUG=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_NAMESPACES=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE="rootfs.mipsI.cpio"
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_EMBEDDED=y
+# CONFIG_VM_EVENT_COUNTERS is not set
+# CONFIG_SLUB_DEBUG is not set
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_SUSPEND is not set
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+# CONFIG_IPV6 is not set
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+CONFIG_MTD=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_M25P80=y
+CONFIG_MTD_SPI_NOR=y
+CONFIG_NETDEVICES=y
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_SERIO is not set
+# CONFIG_VT is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_DEVKMEM is not set
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_OF_PLATFORM=y
+# CONFIG_HW_RANDOM is not set
+CONFIG_SPI=y
+CONFIG_SPI_ATH79=y
+CONFIG_GPIO_SYSFS=y
+# CONFIG_HWMON is not set
+# CONFIG_HID is not set
+# CONFIG_USB_SUPPORT is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+# CONFIG_IOMMU_SUPPORT is not set
+# CONFIG_DNOTIFY is not set
+CONFIG_PROC_KCORE=y
+# CONFIG_PROC_PAGE_MONITOR is not set
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_ROOT_NFS=y
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_FTRACE is not set
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="init=/bin/sh machtype=DTB console=ttyS0,115200 root=/dev/ram"
+CONFIG_CMDLINE_OVERRIDE=y
+CONFIG_DEBUG_ZBOOT=y
+CONFIG_CRC_ITU_T=y
--
2.6.2
^ permalink raw reply related [flat|nested] 52+ messages in thread
* Re: [RFC v3 01/14] WIP: clk: add Atheros AR724X/AR913X/AR933X SoCs clock driver
2016-01-23 20:17 ` [RFC v3 01/14] WIP: clk: add Atheros AR724X/AR913X/AR933X SoCs clock driver Antony Pavlov
@ 2016-01-25 22:21 ` Alban
2016-01-31 20:41 ` Antony Pavlov
2016-01-30 0:27 ` Stephen Boyd
1 sibling, 1 reply; 52+ messages in thread
From: Alban @ 2016-01-25 22:21 UTC (permalink / raw)
To: Antony Pavlov
Cc: Aban Bedel, linux-mips, Michael Turquette, Stephen Boyd,
Rob Herring, linux-clk, devicetree
On Sat, 23 Jan 2016 23:17:18 +0300
Antony Pavlov <antonynpavlov@gmail.com> wrote:
> TODO: get pll registers base address from devicetree node
>
> Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> Cc: Alban Bedel <albeu@free.fr>
> Cc: Michael Turquette <mturquette@baylibre.com>
> Cc: Stephen Boyd <sboyd@codeaurora.org>
> Cc: Rob Herring <robh+dt@kernel.org>
> Cc: linux-clk@vger.kernel.org
> Cc: linux-mips@linux-mips.org
> Cc: devicetree@vger.kernel.org
> ---
> drivers/clk/Makefile | 1 +
> drivers/clk/clk-ath79.c | 193 ++++++++++++++++++++++++++++++++++
> include/dt-bindings/clock/ath79-clk.h | 22 ++++
> 3 files changed, 216 insertions(+)
>
> diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
> index 820714c..5101763 100644
> --- a/drivers/clk/Makefile
> +++ b/drivers/clk/Makefile
> @@ -18,6 +18,7 @@ endif
> # hardware specific clock types
> # please keep this section sorted lexicographically by file/directory path name
> obj-$(CONFIG_MACH_ASM9260) += clk-asm9260.o
> +obj-$(CONFIG_ATH79) += clk-ath79.o
> obj-$(CONFIG_COMMON_CLK_AXI_CLKGEN) += clk-axi-clkgen.o
> obj-$(CONFIG_ARCH_AXXIA) += clk-axm5516.o
> obj-$(CONFIG_COMMON_CLK_CDCE706) += clk-cdce706.o
> diff --git a/drivers/clk/clk-ath79.c b/drivers/clk/clk-ath79.c
> new file mode 100644
> index 0000000..75338a7
> --- /dev/null
> +++ b/drivers/clk/clk-ath79.c
> @@ -0,0 +1,193 @@
> +/*
> + * Clock driver for Atheros AR724X/AR913X/AR933X SoCs
> + *
> + * Copyright (C) 2010-2011 Jaiganesh Narayanan <jnarayanan@atheros.com>
> + * Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
> + * Copyright (C) 2015 Alban Bedel <albeu@free.fr>
> + * Copyright (C) 2016 Antony Pavlov <antonynpavlov@gmail.com>
> + *
> + * Parts of this file are based on Atheros' 2.6.15/2.6.31 BSP
> + *
> + * This program 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 program 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.
> + */
> +
> +#include <linux/clk.h>
> +#include <linux/clk-provider.h>
> +#include <linux/clkdev.h>
> +#include <linux/of.h>
> +#include <linux/of_address.h>
> +#include "clk.h"
> +
> +#include <dt-bindings/clock/ath79-clk.h>
> +
> +#include "asm/mach-ath79/ar71xx_regs.h"
> +#include "asm/mach-ath79/ath79.h"
> +
> +#define MHZ (1000 * 1000)
> +
> +#define AR724X_BASE_FREQ (40 * MHZ)
> +
> +static struct clk *ath79_clks[ATH79_CLK_END];
> +
> +static struct clk_onecell_data clk_data = {
> + .clks = ath79_clks,
> + .clk_num = ARRAY_SIZE(ath79_clks),
> +};
> +
> +static struct clk *__init ath79_add_sys_clkdev(
> + const char *id, unsigned long rate)
> +{
> + struct clk *clk;
> + int err;
> +
> + clk = clk_register_fixed_rate(NULL, id, NULL, CLK_IS_ROOT, rate);
> + if (!clk)
> + panic("failed to allocate %s clock structure", id);
> +
> + err = clk_register_clkdev(clk, id, NULL);
> + if (err)
> + panic("unable to register %s clock device", id);
> +
> + return clk;
> +}
>
> +static void __init ar724x_clk_init(struct device_node *np)
> +{
> + struct clk *ref_clk;
> + unsigned long of_ref_rate;
> + unsigned long ref_rate;
> + unsigned long cpu_rate;
> + unsigned long ddr_rate;
> + unsigned long ahb_rate;
> + u32 pll;
> + u32 freq;
> + u32 div;
> +
> + ref_clk = of_clk_get(np, 0);
> + if (IS_ERR(ref_clk)) {
> + pr_err("%s: of_clk_get failed\n", np->full_name);
> + return;
> + }
It would be better to have this function take the ref clock as
argument, to allow using it for both OF and legacy platforms.
> + of_ref_rate = clk_get_rate(ref_clk);
> +
> + ref_rate = AR724X_BASE_FREQ;
> +
> + if (of_ref_rate != ref_rate) {
> + pr_err("ref_rate != of_ref_rate\n");
> + ref_rate = of_ref_rate;
> + }
I don't think that this test is really useful.
> + pll = ath79_pll_rr(AR724X_PLL_REG_CPU_CONFIG);
> +
> + div = ((pll >> AR724X_PLL_FB_SHIFT) & AR724X_PLL_FB_MASK);
> + freq = div * ref_rate;
> +
> + div = ((pll >> AR724X_PLL_REF_DIV_SHIFT) & AR724X_PLL_REF_DIV_MASK) * 2;
> + freq /= div;
> +
> + cpu_rate = freq;
> +
> + div = ((pll >> AR724X_DDR_DIV_SHIFT) & AR724X_DDR_DIV_MASK) + 1;
> + ddr_rate = freq / div;
> +
> + div = (((pll >> AR724X_AHB_DIV_SHIFT) & AR724X_AHB_DIV_MASK) + 1) * 2;
> + ahb_rate = cpu_rate / div;
For a new driver it would make sense to use clk_register_divider() and
similar generic building blocks.
> + ath79_clks[ATH79_CLK_REF] = ath79_add_sys_clkdev("ref", ref_rate);
> + ath79_clks[ATH79_CLK_CPU] = ath79_add_sys_clkdev("cpu", cpu_rate);
> + ath79_clks[ATH79_CLK_DDR] = ath79_add_sys_clkdev("ddr", ddr_rate);
> + ath79_clks[ATH79_CLK_AHB] = ath79_add_sys_clkdev("ahb", ahb_rate);
> + ath79_clks[ATH79_CLK_WDT] = ath79_add_sys_clkdev("wdt", ahb_rate);
> + ath79_clks[ATH79_CLK_UART] = ath79_add_sys_clkdev("uart", ahb_rate);
You shouldn't add ref, wdt and uart, they are not needed and make the
driver incompatible with the current DT bindings.
> + of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
> +}
> +
> +static void __init ar933x_clk_init(struct device_node *np)
> +{
> + struct clk *ref_clk;
> + unsigned long of_ref_rate;
> + unsigned long ref_rate;
> + unsigned long cpu_rate;
> + unsigned long ddr_rate;
> + unsigned long ahb_rate;
> + u32 clock_ctrl;
> + u32 cpu_config;
> + u32 freq;
> + u32 t;
> +
> + ref_clk = of_clk_get(np, 0);
> + if (IS_ERR(ref_clk)) {
> + pr_err("%s: of_clk_get failed\n", np->full_name);
> + return;
> + }
> +
> + of_ref_rate = clk_get_rate(ref_clk);
> +
> + t = ath79_reset_rr(AR933X_RESET_REG_BOOTSTRAP);
> + if (t & AR933X_BOOTSTRAP_REF_CLK_40)
> + ref_rate = 40 * MHZ;
> + else
> + ref_rate = 25 * MHZ;
> +
> + if (ref_rate != of_ref_rate) {
> + pr_err("ref_rate != of_ref_rate\n");
> + ref_rate = of_ref_rate;
> + }
> +
> + clock_ctrl = ath79_pll_rr(AR933X_PLL_CLOCK_CTRL_REG);
> + if (clock_ctrl & AR933X_PLL_CLOCK_CTRL_BYPASS) {
> + cpu_rate = ref_rate;
> + ahb_rate = ref_rate;
> + ddr_rate = ref_rate;
> + } else {
> + cpu_config = ath79_pll_rr(AR933X_PLL_CPU_CONFIG_REG);
> +
> + t = (cpu_config >> AR933X_PLL_CPU_CONFIG_REFDIV_SHIFT) &
> + AR933X_PLL_CPU_CONFIG_REFDIV_MASK;
> + freq = ref_rate / t;
> +
> + t = (cpu_config >> AR933X_PLL_CPU_CONFIG_NINT_SHIFT) &
> + AR933X_PLL_CPU_CONFIG_NINT_MASK;
> + freq *= t;
> +
> + t = (cpu_config >> AR933X_PLL_CPU_CONFIG_OUTDIV_SHIFT) &
> + AR933X_PLL_CPU_CONFIG_OUTDIV_MASK;
> + if (t == 0)
> + t = 1;
> +
> + freq >>= t;
> +
> + t = ((clock_ctrl >> AR933X_PLL_CLOCK_CTRL_CPU_DIV_SHIFT) &
> + AR933X_PLL_CLOCK_CTRL_CPU_DIV_MASK) + 1;
> + cpu_rate = freq / t;
> +
> + t = ((clock_ctrl >> AR933X_PLL_CLOCK_CTRL_DDR_DIV_SHIFT) &
> + AR933X_PLL_CLOCK_CTRL_DDR_DIV_MASK) + 1;
> + ddr_rate = freq / t;
> +
> + t = ((clock_ctrl >> AR933X_PLL_CLOCK_CTRL_AHB_DIV_SHIFT) &
> + AR933X_PLL_CLOCK_CTRL_AHB_DIV_MASK) + 1;
> + ahb_rate = freq / t;
> + }
> +
> + ath79_clks[ATH79_CLK_REF] = ath79_add_sys_clkdev("ref", ref_rate);
> + ath79_clks[ATH79_CLK_CPU] = ath79_add_sys_clkdev("cpu", cpu_rate);
> + ath79_clks[ATH79_CLK_DDR] = ath79_add_sys_clkdev("ddr", ddr_rate);
> + ath79_clks[ATH79_CLK_AHB] = ath79_add_sys_clkdev("ahb", ahb_rate);
> + ath79_clks[ATH79_CLK_WDT] = ath79_add_sys_clkdev("wdt", ahb_rate);
> + ath79_clks[ATH79_CLK_UART] = ath79_add_sys_clkdev("uart", ref_rate);
> +
> + of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
> +}
> +CLK_OF_DECLARE(ar9130_clk, "qca,ar9130-pll", ar724x_clk_init);
> +CLK_OF_DECLARE(ar933x_clk, "qca,ar9330-pll", ar933x_clk_init);
> diff --git a/include/dt-bindings/clock/ath79-clk.h b/include/dt-bindings/clock/ath79-clk.h
> new file mode 100644
> index 0000000..1c6fb04
> --- /dev/null
> +++ b/include/dt-bindings/clock/ath79-clk.h
> @@ -0,0 +1,22 @@
> +/*
> + * Copyright (C) 2014, 2016 Antony Pavlov <antonynpavlov@gmail.com>
> + *
> + * 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.
> + *
> + */
> +
> +#ifndef __DT_BINDINGS_ATH79_CLK_H
> +#define __DT_BINDINGS_ATH79_CLK_H
> +
> +#define ATH79_CLK_REF 0
> +#define ATH79_CLK_CPU 1
> +#define ATH79_CLK_DDR 2
> +#define ATH79_CLK_AHB 3
> +#define ATH79_CLK_WDT 4
> +#define ATH79_CLK_UART 5
> +
> +#define ATH79_CLK_END 6
> +
> +#endif /* __DT_BINDINGS_ATH79_CLK_H */
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [RFC v3 02/14] MIPS: ath79: use clk-ath79.c driver for AR913X/AR933X
2016-01-23 20:17 ` [RFC v3 02/14] MIPS: ath79: use clk-ath79.c driver for AR913X/AR933X Antony Pavlov
@ 2016-01-25 22:24 ` Alban
2016-02-01 23:34 ` Ralf Baechle
0 siblings, 1 reply; 52+ messages in thread
From: Alban @ 2016-01-25 22:24 UTC (permalink / raw)
To: Antony Pavlov; +Cc: Aban Bedel, linux-mips, Gabor Juhos
On Sat, 23 Jan 2016 23:17:19 +0300
Antony Pavlov <antonynpavlov@gmail.com> wrote:
> Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> Cc: Gabor Juhos <juhosg@openwrt.org>
> Cc: Alban Bedel <albeu@free.fr>
> Cc: linux-mips@linux-mips.org
> ---
> arch/mips/ath79/clock.c | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/arch/mips/ath79/clock.c b/arch/mips/ath79/clock.c
> index eb5117c..8a287bf 100644
> --- a/arch/mips/ath79/clock.c
> +++ b/arch/mips/ath79/clock.c
> @@ -24,6 +24,7 @@
> #include <asm/mach-ath79/ath79.h>
> #include <asm/mach-ath79/ar71xx_regs.h>
> #include "common.h"
> +#include "machtypes.h"
>
> #define AR71XX_BASE_FREQ 40000000
> #define AR724X_BASE_FREQ 5000000
> @@ -133,6 +134,10 @@ static void __init ar913x_clocks_init(void)
> u32 freq;
> u32 div;
>
> + if (IS_ENABLED(CONFIG_OF) && mips_machtype == ATH79_MACH_GENERIC_OF) {
> + return;
> + }
> +
I think it would make more sense to move the whole implementation to
drivers/clk, otherwise we'll need to maintain two implementations.
Alban
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [RFC v3 05/14] MIPS: dts: qca: ar9132_tl_wr1043nd_v1.dts: drop unused alias node
2016-01-23 20:17 ` Antony Pavlov
@ 2016-01-25 22:25 ` Alban
-1 siblings, 0 replies; 52+ messages in thread
From: Alban @ 2016-01-25 22:25 UTC (permalink / raw)
To: Antony Pavlov
Cc: Aban Bedel, linux-mips-6z/3iImG2C8G8FEW9MqTrA,
devicetree-u79uwXL29TY76Z2rM5mHXA
On Sat, 23 Jan 2016 23:17:22 +0300
Antony Pavlov <antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> The TP-LINK TL-WR1043ND board has only one serial port,
> so replacing the default of 0 with 0 does nothing useful.
>
> Moreover, the correct name for aliases node is "aliases" not "alias".
>
> An overview of the "aliases" node usage can be found
> on the device tree usage page at devicetree.org [1].
>
> Also please see chapter 3.3 ("Aliases node") of the ePAPR 1.1 [2].
>
> [1] http://devicetree.org/Device_Tree_Usage#aliases_Node
> [2] https://www.power.org/documentation/epapr-version-1-1/
>
> Signed-off-by: Antony Pavlov <antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Acked-by: Alban Bedel <albeu-GANU6spQydw@public.gmane.org>
> Cc: Alban Bedel <albeu-GANU6spQydw@public.gmane.org>
> Cc: linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org
> Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> ---
> arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
> index 53057ca..9618105 100644
> --- a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
> +++ b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
> @@ -9,10 +9,6 @@
> compatible = "tplink,tl-wr1043nd-v1", "qca,ar9132";
> model = "TP-Link TL-WR1043ND Version 1";
>
> - alias {
> - serial0 = "/ahb/apb/uart@18020000";
> - };
> -
> memory@0 {
> device_type = "memory";
> reg = <0x0 0x2000000>;
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [RFC v3 05/14] MIPS: dts: qca: ar9132_tl_wr1043nd_v1.dts: drop unused alias node
@ 2016-01-25 22:25 ` Alban
0 siblings, 0 replies; 52+ messages in thread
From: Alban @ 2016-01-25 22:25 UTC (permalink / raw)
To: Antony Pavlov; +Cc: Aban Bedel, linux-mips, devicetree
On Sat, 23 Jan 2016 23:17:22 +0300
Antony Pavlov <antonynpavlov@gmail.com> wrote:
> The TP-LINK TL-WR1043ND board has only one serial port,
> so replacing the default of 0 with 0 does nothing useful.
>
> Moreover, the correct name for aliases node is "aliases" not "alias".
>
> An overview of the "aliases" node usage can be found
> on the device tree usage page at devicetree.org [1].
>
> Also please see chapter 3.3 ("Aliases node") of the ePAPR 1.1 [2].
>
> [1] http://devicetree.org/Device_Tree_Usage#aliases_Node
> [2] https://www.power.org/documentation/epapr-version-1-1/
>
> Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Acked-by: Alban Bedel <albeu@free.fr>
> Cc: Alban Bedel <albeu@free.fr>
> Cc: linux-mips@linux-mips.org
> Cc: devicetree@vger.kernel.org
> ---
> arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
> index 53057ca..9618105 100644
> --- a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
> +++ b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
> @@ -9,10 +9,6 @@
> compatible = "tplink,tl-wr1043nd-v1", "qca,ar9132";
> model = "TP-Link TL-WR1043ND Version 1";
>
> - alias {
> - serial0 = "/ahb/apb/uart@18020000";
> - };
> -
> memory@0 {
> device_type = "memory";
> reg = <0x0 0x2000000>;
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [RFC v3 06/14] MIPS: dts: qca: ar9132: use short references for uart and spi nodes
2016-01-23 20:17 ` Antony Pavlov
(?)
@ 2016-01-25 22:31 ` Alban
2016-02-01 18:41 ` Antony Pavlov
-1 siblings, 1 reply; 52+ messages in thread
From: Alban @ 2016-01-25 22:31 UTC (permalink / raw)
To: Antony Pavlov; +Cc: Aban Bedel, linux-mips, devicetree
On Sat, 23 Jan 2016 23:17:23 +0300
Antony Pavlov <antonynpavlov@gmail.com> wrote:
I personally prefer the version without aliases :) Is there any
guidelines on this?
Alban
> Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> Cc: Alban Bedel <albeu@free.fr>
> Cc: linux-mips@linux-mips.org
> Cc: devicetree@vger.kernel.org
> ---
> arch/mips/boot/dts/qca/ar9132.dtsi | 4 +-
> arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 70 +++++++++++-------------
> 2 files changed, 35 insertions(+), 39 deletions(-)
>
> diff --git a/arch/mips/boot/dts/qca/ar9132.dtsi b/arch/mips/boot/dts/qca/ar9132.dtsi
> index cd1602f..a14f6f2 100644
> --- a/arch/mips/boot/dts/qca/ar9132.dtsi
> +++ b/arch/mips/boot/dts/qca/ar9132.dtsi
> @@ -61,7 +61,7 @@
> #qca,ddr-wb-channel-cells = <1>;
> };
>
> - uart@18020000 {
> + uart: uart@18020000 {
> compatible = "ns8250";
> reg = <0x18020000 0x20>;
> interrupts = <3>;
> @@ -134,7 +134,7 @@
> };
> };
>
> - spi@1f000000 {
> + spi: spi@1f000000 {
> compatible = "qca,ar9132-spi", "qca,ar7100-spi";
> reg = <0x1f000000 0x10>;
>
> diff --git a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
> index 9618105..f22c22c 100644
> --- a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
> +++ b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
> @@ -14,43 +14,6 @@
> reg = <0x0 0x2000000>;
> };
>
> - ahb {
> - apb {
> - uart@18020000 {
> - status = "okay";
> - };
> - };
> -
> - spi@1f000000 {
> - status = "okay";
> - num-cs = <1>;
> -
> - flash@0 {
> - #address-cells = <1>;
> - #size-cells = <1>;
> - compatible = "s25sl064a";
> - reg = <0>;
> - spi-max-frequency = <25000000>;
> -
> - partition@0 {
> - label = "u-boot";
> - reg = <0x000000 0x020000>;
> - };
> -
> - partition@1 {
> - label = "firmware";
> - reg = <0x020000 0x7D0000>;
> - };
> -
> - partition@2 {
> - label = "art";
> - reg = <0x7F0000 0x010000>;
> - read-only;
> - };
> - };
> - };
> - };
> -
> gpio-keys {
> compatible = "gpio-keys-polled";
> #address-cells = <1>;
> @@ -100,3 +63,36 @@
> &extosc {
> clock-frequency = <40000000>;
> };
> +
> +&uart {
> + status = "okay";
> +};
> +
> +&spi {
> + status = "okay";
> + num-cs = <1>;
> +
> + flash@0 {
> + #address-cells = <1>;
> + #size-cells = <1>;
> + compatible = "s25sl064a";
> + reg = <0>;
> + spi-max-frequency = <25000000>;
> +
> + partition@0 {
> + label = "u-boot";
> + reg = <0x000000 0x020000>;
> + };
> +
> + partition@1 {
> + label = "firmware";
> + reg = <0x020000 0x7D0000>;
> + };
> +
> + partition@2 {
> + label = "art";
> + reg = <0x7F0000 0x010000>;
> + read-only;
> + };
> + };
> +};
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [RFC v3 07/14] MIPS: dts: qca: simplify Makefile
2016-01-23 20:17 ` [RFC v3 07/14] MIPS: dts: qca: simplify Makefile Antony Pavlov
@ 2016-01-25 22:41 ` Alban
2016-01-31 21:15 ` Antony Pavlov
0 siblings, 1 reply; 52+ messages in thread
From: Alban @ 2016-01-25 22:41 UTC (permalink / raw)
To: Antony Pavlov; +Cc: Aban Bedel, linux-mips
On Sat, 23 Jan 2016 23:17:24 +0300
Antony Pavlov <antonynpavlov@gmail.com> wrote:
> Do as arch/mips/boot/dts/ralink/Makefile does.
> Without this patch adding a dtb-file leads
> to adding __two__ lines to the Makefile.
I have some patches in my queue to allow using appended DTB and remove
the builtin DTB support. That would also fix the problem as the second
Makefile line wouldn't be needed anymore. I try to post them soon.
Alban
> Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> Cc: Alban Bedel <albeu@free.fr>
> Cc: linux-mips@linux-mips.org
> ---
> arch/mips/boot/dts/qca/Makefile | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/arch/mips/boot/dts/qca/Makefile b/arch/mips/boot/dts/qca/Makefile
> index 2d61455d..244329e 100644
> --- a/arch/mips/boot/dts/qca/Makefile
> +++ b/arch/mips/boot/dts/qca/Makefile
> @@ -1,8 +1,7 @@
> # All DTBs
> -dtb-$(CONFIG_ATH79) += ar9132_tl_wr1043nd_v1.dtb
> +dtb-$(CONFIG_DTB_TL_WR1043ND_V1) += ar9132_tl_wr1043nd_v1.dtb
>
> -# Select a DTB to build in the kernel
> -obj-$(CONFIG_DTB_TL_WR1043ND_V1) += ar9132_tl_wr1043nd_v1.dtb.o
> +obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
>
> # Force kbuild to make empty built-in.o if necessary
> obj- += dummy.o
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [RFC v3 08/14] MIPS: dts: qca: introduce AR9331 devicetree
2016-01-23 20:17 ` Antony Pavlov
@ 2016-01-25 22:46 ` Alban
-1 siblings, 0 replies; 52+ messages in thread
From: Alban @ 2016-01-25 22:46 UTC (permalink / raw)
To: Antony Pavlov
Cc: Aban Bedel, linux-mips-6z/3iImG2C8G8FEW9MqTrA, Gabor Juhos,
devicetree-u79uwXL29TY76Z2rM5mHXA
On Sat, 23 Jan 2016 23:17:25 +0300
Antony Pavlov <antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> This patch introduces devicetree for Atheros AR9331 SoC (AKA Hornet).
> The AR9331 chip is a Wi-Fi System-On-Chip (WiSOC),
> typically used in very cheap Access Points and Routers.
>
> Signed-off-by: Antony Pavlov <antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Gabor Juhos <juhosg-p3rKhJxN3npAfugRpC6u6w@public.gmane.org>
> Cc: Alban Bedel <albeu-GANU6spQydw@public.gmane.org>
> Cc: linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org
> Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> ---
> arch/mips/boot/dts/qca/ar9331.dtsi | 123 +++++++++++++++++++++++++++++++++++++
> 1 file changed, 123 insertions(+)
>
> diff --git a/arch/mips/boot/dts/qca/ar9331.dtsi b/arch/mips/boot/dts/qca/ar9331.dtsi
> new file mode 100644
> index 0000000..bf128a2
> --- /dev/null
> +++ b/arch/mips/boot/dts/qca/ar9331.dtsi
> @@ -0,0 +1,123 @@
> +#include <dt-bindings/clock/ath79-clk.h>
> +
> +/ {
> + compatible = "qca,ar9331";
> +
[...]
> +
> + extosc: oscillator {
> + compatible = "fixed-clock";
> + #clock-cells = <0>;
> + };
This oscillator is on the board and not in the SoC, so it should
be in the board DTS.
Alban
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [RFC v3 08/14] MIPS: dts: qca: introduce AR9331 devicetree
@ 2016-01-25 22:46 ` Alban
0 siblings, 0 replies; 52+ messages in thread
From: Alban @ 2016-01-25 22:46 UTC (permalink / raw)
To: Antony Pavlov; +Cc: Aban Bedel, linux-mips, Gabor Juhos, devicetree
On Sat, 23 Jan 2016 23:17:25 +0300
Antony Pavlov <antonynpavlov@gmail.com> wrote:
> This patch introduces devicetree for Atheros AR9331 SoC (AKA Hornet).
> The AR9331 chip is a Wi-Fi System-On-Chip (WiSOC),
> typically used in very cheap Access Points and Routers.
>
> Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> Cc: Gabor Juhos <juhosg@openwrt.org>
> Cc: Alban Bedel <albeu@free.fr>
> Cc: linux-mips@linux-mips.org
> Cc: devicetree@vger.kernel.org
> ---
> arch/mips/boot/dts/qca/ar9331.dtsi | 123 +++++++++++++++++++++++++++++++++++++
> 1 file changed, 123 insertions(+)
>
> diff --git a/arch/mips/boot/dts/qca/ar9331.dtsi b/arch/mips/boot/dts/qca/ar9331.dtsi
> new file mode 100644
> index 0000000..bf128a2
> --- /dev/null
> +++ b/arch/mips/boot/dts/qca/ar9331.dtsi
> @@ -0,0 +1,123 @@
> +#include <dt-bindings/clock/ath79-clk.h>
> +
> +/ {
> + compatible = "qca,ar9331";
> +
[...]
> +
> + extosc: oscillator {
> + compatible = "fixed-clock";
> + #clock-cells = <0>;
> + };
This oscillator is on the board and not in the SoC, so it should
be in the board DTS.
Alban
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [RFC v3 12/14] devicetree: add Onion Corporation vendor id
2016-01-23 20:17 ` Antony Pavlov
@ 2016-01-26 21:15 ` Rob Herring
-1 siblings, 0 replies; 52+ messages in thread
From: Rob Herring @ 2016-01-26 21:15 UTC (permalink / raw)
To: Antony Pavlov
Cc: linux-mips-6z/3iImG2C8G8FEW9MqTrA, devicetree-u79uwXL29TY76Z2rM5mHXA
On Sat, Jan 23, 2016 at 11:17:29PM +0300, Antony Pavlov wrote:
> Please see https://onion.io/contact for details.
>
> Signed-off-by: Antony Pavlov <antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> ---
> Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
> 1 file changed, 1 insertion(+)
Is this the publishers of "The Onion"?
Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [RFC v3 12/14] devicetree: add Onion Corporation vendor id
@ 2016-01-26 21:15 ` Rob Herring
0 siblings, 0 replies; 52+ messages in thread
From: Rob Herring @ 2016-01-26 21:15 UTC (permalink / raw)
To: Antony Pavlov; +Cc: linux-mips, devicetree
On Sat, Jan 23, 2016 at 11:17:29PM +0300, Antony Pavlov wrote:
> Please see https://onion.io/contact for details.
>
> Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> Cc: devicetree@vger.kernel.org
> ---
> Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
> 1 file changed, 1 insertion(+)
Is this the publishers of "The Onion"?
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [RFC v3 10/14] devicetree: add Dragino vendor id
2016-01-23 20:17 ` Antony Pavlov
@ 2016-01-26 21:16 ` Rob Herring
-1 siblings, 0 replies; 52+ messages in thread
From: Rob Herring @ 2016-01-26 21:16 UTC (permalink / raw)
To: Antony Pavlov
Cc: linux-mips-6z/3iImG2C8G8FEW9MqTrA, devicetree-u79uwXL29TY76Z2rM5mHXA
On Sat, Jan 23, 2016 at 11:17:27PM +0300, Antony Pavlov wrote:
> Please see http://www.dragino.com/about/about.html for details.
>
> Signed-off-by: Antony Pavlov <antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> ---
> Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
> 1 file changed, 1 insertion(+)
Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [RFC v3 10/14] devicetree: add Dragino vendor id
@ 2016-01-26 21:16 ` Rob Herring
0 siblings, 0 replies; 52+ messages in thread
From: Rob Herring @ 2016-01-26 21:16 UTC (permalink / raw)
To: Antony Pavlov; +Cc: linux-mips, devicetree
On Sat, Jan 23, 2016 at 11:17:27PM +0300, Antony Pavlov wrote:
> Please see http://www.dragino.com/about/about.html for details.
>
> Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> Cc: devicetree@vger.kernel.org
> ---
> Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
> 1 file changed, 1 insertion(+)
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [RFC v3 12/14] devicetree: add Onion Corporation vendor id
2016-01-26 21:15 ` Rob Herring
@ 2016-01-27 8:42 ` Antony Pavlov
-1 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-01-27 8:42 UTC (permalink / raw)
To: Rob Herring
Cc: linux-mips-6z/3iImG2C8G8FEW9MqTrA, devicetree-u79uwXL29TY76Z2rM5mHXA
On Tue, 26 Jan 2016 15:15:29 -0600
Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> wrote:
> On Sat, Jan 23, 2016 at 11:17:29PM +0300, Antony Pavlov wrote:
> > Please see https://onion.io/contact for details.
> >
> > Signed-off-by: Antony Pavlov <antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> > Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> > ---
> > Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
> > 1 file changed, 1 insertion(+)
>
> Is this the publishers of "The Onion"?
Hélas non!
https://foursquare.com/v/the-onion/4ff5f6ae067d7fbeb9bbb3c5
>
> Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
--
--
Best regards,
Antony Pavlov
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [RFC v3 12/14] devicetree: add Onion Corporation vendor id
@ 2016-01-27 8:42 ` Antony Pavlov
0 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-01-27 8:42 UTC (permalink / raw)
To: Rob Herring; +Cc: linux-mips, devicetree
On Tue, 26 Jan 2016 15:15:29 -0600
Rob Herring <robh@kernel.org> wrote:
> On Sat, Jan 23, 2016 at 11:17:29PM +0300, Antony Pavlov wrote:
> > Please see https://onion.io/contact for details.
> >
> > Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> > Cc: devicetree@vger.kernel.org
> > ---
> > Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
> > 1 file changed, 1 insertion(+)
>
> Is this the publishers of "The Onion"?
Hélas non!
https://foursquare.com/v/the-onion/4ff5f6ae067d7fbeb9bbb3c5
>
> Acked-by: Rob Herring <robh@kernel.org>
--
--
Best regards,
Antony Pavlov
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [RFC v3 01/14] WIP: clk: add Atheros AR724X/AR913X/AR933X SoCs clock driver
2016-01-23 20:17 ` [RFC v3 01/14] WIP: clk: add Atheros AR724X/AR913X/AR933X SoCs clock driver Antony Pavlov
2016-01-25 22:21 ` Alban
@ 2016-01-30 0:27 ` Stephen Boyd
2016-02-01 0:23 ` Antony Pavlov
1 sibling, 1 reply; 52+ messages in thread
From: Stephen Boyd @ 2016-01-30 0:27 UTC (permalink / raw)
To: Antony Pavlov
Cc: linux-mips, Alban Bedel, Michael Turquette, Rob Herring,
linux-clk, devicetree
On 01/23, Antony Pavlov wrote:
> TODO: get pll registers base address from devicetree node
>
> Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> Cc: Alban Bedel <albeu@free.fr>
> Cc: Michael Turquette <mturquette@baylibre.com>
> Cc: Stephen Boyd <sboyd@codeaurora.org>
> Cc: Rob Herring <robh+dt@kernel.org>
> Cc: linux-clk@vger.kernel.org
> Cc: linux-mips@linux-mips.org
> Cc: devicetree@vger.kernel.org
> ---
Is there a binding document for this?
> drivers/clk/Makefile | 1 +
> drivers/clk/clk-ath79.c | 193 ++++++++++++++++++++++++++++++++++
> include/dt-bindings/clock/ath79-clk.h | 22 ++++
> 3 files changed, 216 insertions(+)
>
> diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
> index 820714c..5101763 100644
> --- a/drivers/clk/Makefile
> +++ b/drivers/clk/Makefile
> diff --git a/drivers/clk/clk-ath79.c b/drivers/clk/clk-ath79.c
> new file mode 100644
> index 0000000..75338a7
> --- /dev/null
> +++ b/drivers/clk/clk-ath79.c
> @@ -0,0 +1,193 @@
> +/*
> + */
> +
> +#include <linux/clk.h>
> +#include <linux/clk-provider.h>
> +#include <linux/clkdev.h>
> +#include <linux/of.h>
> +#include <linux/of_address.h>
> +#include "clk.h"
Don't include this header.
> +
> +#include <dt-bindings/clock/ath79-clk.h>
> +
> +#include "asm/mach-ath79/ar71xx_regs.h"
> +#include "asm/mach-ath79/ath79.h"
Can we get away without including these headers?
> +
> +#define MHZ (1000 * 1000)
> +
> +#define AR724X_BASE_FREQ (40 * MHZ)
> +
> +static struct clk *ath79_clks[ATH79_CLK_END];
> +
> +static struct clk_onecell_data clk_data = {
> + .clks = ath79_clks,
> + .clk_num = ARRAY_SIZE(ath79_clks),
> +};
> +
> +static struct clk *__init ath79_add_sys_clkdev(
> + const char *id, unsigned long rate)
> +{
> + struct clk *clk;
> + int err;
> +
> + clk = clk_register_fixed_rate(NULL, id, NULL, CLK_IS_ROOT, rate);
> + if (!clk)
> + panic("failed to allocate %s clock structure", id);
> +
> + err = clk_register_clkdev(clk, id, NULL);
Why are we using clkdev? Can't we use DT lookups?
> + if (err)
> + panic("unable to register %s clock device", id);
> +
> + return clk;
> +}
> +
> +static void __init ar724x_clk_init(struct device_node *np)
> +{
> + struct clk *ref_clk;
> + unsigned long of_ref_rate;
> + unsigned long ref_rate;
> + unsigned long cpu_rate;
> + unsigned long ddr_rate;
> + unsigned long ahb_rate;
> + u32 pll;
> + u32 freq;
> + u32 div;
> +
> + ref_clk = of_clk_get(np, 0);
> + if (IS_ERR(ref_clk)) {
> + pr_err("%s: of_clk_get failed\n", np->full_name);
> + return;
> + }
> +
> + of_ref_rate = clk_get_rate(ref_clk);
> +
> + ref_rate = AR724X_BASE_FREQ;
> +
> + if (of_ref_rate != ref_rate) {
> + pr_err("ref_rate != of_ref_rate\n");
> + ref_rate = of_ref_rate;
> + }
> +
> + pll = ath79_pll_rr(AR724X_PLL_REG_CPU_CONFIG);
> +
> + div = ((pll >> AR724X_PLL_FB_SHIFT) & AR724X_PLL_FB_MASK);
> + freq = div * ref_rate;
> +
> + div = ((pll >> AR724X_PLL_REF_DIV_SHIFT) & AR724X_PLL_REF_DIV_MASK) * 2;
> + freq /= div;
> +
> + cpu_rate = freq;
> +
> + div = ((pll >> AR724X_DDR_DIV_SHIFT) & AR724X_DDR_DIV_MASK) + 1;
> + ddr_rate = freq / div;
> +
> + div = (((pll >> AR724X_AHB_DIV_SHIFT) & AR724X_AHB_DIV_MASK) + 1) * 2;
> + ahb_rate = cpu_rate / div;
> +
> + ath79_clks[ATH79_CLK_REF] = ath79_add_sys_clkdev("ref", ref_rate);
> + ath79_clks[ATH79_CLK_CPU] = ath79_add_sys_clkdev("cpu", cpu_rate);
> + ath79_clks[ATH79_CLK_DDR] = ath79_add_sys_clkdev("ddr", ddr_rate);
> + ath79_clks[ATH79_CLK_AHB] = ath79_add_sys_clkdev("ahb", ahb_rate);
> + ath79_clks[ATH79_CLK_WDT] = ath79_add_sys_clkdev("wdt", ahb_rate);
> + ath79_clks[ATH79_CLK_UART] = ath79_add_sys_clkdev("uart", ahb_rate);
> +
> + of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
What if this fails?
> +}
> +
> +static void __init ar933x_clk_init(struct device_node *np)
> +{
> + struct clk *ref_clk;
> + unsigned long of_ref_rate;
> + unsigned long ref_rate;
> + unsigned long cpu_rate;
> + unsigned long ddr_rate;
> + unsigned long ahb_rate;
> + u32 clock_ctrl;
> + u32 cpu_config;
> + u32 freq;
> + u32 t;
> +
> + ref_clk = of_clk_get(np, 0);
> + if (IS_ERR(ref_clk)) {
> + pr_err("%s: of_clk_get failed\n", np->full_name);
> + return;
> + }
> +
> + of_ref_rate = clk_get_rate(ref_clk);
> +
> + t = ath79_reset_rr(AR933X_RESET_REG_BOOTSTRAP);
> + if (t & AR933X_BOOTSTRAP_REF_CLK_40)
> + ref_rate = 40 * MHZ;
> + else
> + ref_rate = 25 * MHZ;
> +
> + if (ref_rate != of_ref_rate) {
Does this happen? I'd prefer we find a way to avoid calling
of_clk_get() and clk_get_rate() in this driver.
> + pr_err("ref_rate != of_ref_rate\n");
> + ref_rate = of_ref_rate;
> + }
> +
> + clock_ctrl = ath79_pll_rr(AR933X_PLL_CLOCK_CTRL_REG);
> + if (clock_ctrl & AR933X_PLL_CLOCK_CTRL_BYPASS) {
> + cpu_rate = ref_rate;
> + ahb_rate = ref_rate;
> + ddr_rate = ref_rate;
So if it's in bypass, why not register fixed factor clocks of
1/1 and set the parent to ref_clk?
> + } else {
> + cpu_config = ath79_pll_rr(AR933X_PLL_CPU_CONFIG_REG);
> +
> + t = (cpu_config >> AR933X_PLL_CPU_CONFIG_REFDIV_SHIFT) &
> + AR933X_PLL_CPU_CONFIG_REFDIV_MASK;
> + freq = ref_rate / t;
> +
> + t = (cpu_config >> AR933X_PLL_CPU_CONFIG_NINT_SHIFT) &
> + AR933X_PLL_CPU_CONFIG_NINT_MASK;
> + freq *= t;
> +
> + t = (cpu_config >> AR933X_PLL_CPU_CONFIG_OUTDIV_SHIFT) &
> + AR933X_PLL_CPU_CONFIG_OUTDIV_MASK;
> + if (t == 0)
> + t = 1;
> +
> + freq >>= t;
> +
> + t = ((clock_ctrl >> AR933X_PLL_CLOCK_CTRL_CPU_DIV_SHIFT) &
> + AR933X_PLL_CLOCK_CTRL_CPU_DIV_MASK) + 1;
> + cpu_rate = freq / t;
> +
> + t = ((clock_ctrl >> AR933X_PLL_CLOCK_CTRL_DDR_DIV_SHIFT) &
> + AR933X_PLL_CLOCK_CTRL_DDR_DIV_MASK) + 1;
> + ddr_rate = freq / t;
> +
> + t = ((clock_ctrl >> AR933X_PLL_CLOCK_CTRL_AHB_DIV_SHIFT) &
> + AR933X_PLL_CLOCK_CTRL_AHB_DIV_MASK) + 1;
> + ahb_rate = freq / t;
These look like something we could implement as real clocks with
clk_ops. The parent still looks like ref_clk, but we would be
reading hardware in recalc_rate to figure out what the rate is.
> + }
> +
> + ath79_clks[ATH79_CLK_REF] = ath79_add_sys_clkdev("ref", ref_rate);
> + ath79_clks[ATH79_CLK_CPU] = ath79_add_sys_clkdev("cpu", cpu_rate);
> + ath79_clks[ATH79_CLK_DDR] = ath79_add_sys_clkdev("ddr", ddr_rate);
> + ath79_clks[ATH79_CLK_AHB] = ath79_add_sys_clkdev("ahb", ahb_rate);
> + ath79_clks[ATH79_CLK_WDT] = ath79_add_sys_clkdev("wdt", ahb_rate);
> + ath79_clks[ATH79_CLK_UART] = ath79_add_sys_clkdev("uart", ref_rate);
> +
> + of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
> +}
> +CLK_OF_DECLARE(ar9130_clk, "qca,ar9130-pll", ar724x_clk_init);
> +CLK_OF_DECLARE(ar933x_clk, "qca,ar9330-pll", ar933x_clk_init);
Is there a reason this isn't a platform driver?
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [RFC v3 01/14] WIP: clk: add Atheros AR724X/AR913X/AR933X SoCs clock driver
2016-01-25 22:21 ` Alban
@ 2016-01-31 20:41 ` Antony Pavlov
0 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-01-31 20:41 UTC (permalink / raw)
To: Alban
Cc: linux-mips, Michael Turquette, Stephen Boyd, Rob Herring,
linux-clk, devicetree
On Mon, 25 Jan 2016 23:21:56 +0100
Alban <albeu@free.fr> wrote:
> On Sat, 23 Jan 2016 23:17:18 +0300
> Antony Pavlov <antonynpavlov@gmail.com> wrote:
>
> > TODO: get pll registers base address from devicetree node
> >
> > Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> > Cc: Alban Bedel <albeu@free.fr>
> > Cc: Michael Turquette <mturquette@baylibre.com>
> > Cc: Stephen Boyd <sboyd@codeaurora.org>
> > Cc: Rob Herring <robh+dt@kernel.org>
> > Cc: linux-clk@vger.kernel.org
> > Cc: linux-mips@linux-mips.org
> > Cc: devicetree@vger.kernel.org
> > ---
> > drivers/clk/Makefile | 1 +
> > drivers/clk/clk-ath79.c | 193 ++++++++++++++++++++++++++++++++++
> > include/dt-bindings/clock/ath79-clk.h | 22 ++++
> > 3 files changed, 216 insertions(+)
> >
> > diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
> > index 820714c..5101763 100644
> > --- a/drivers/clk/Makefile
> > +++ b/drivers/clk/Makefile
> > @@ -18,6 +18,7 @@ endif
> > # hardware specific clock types
> > # please keep this section sorted lexicographically by file/directory path name
> > obj-$(CONFIG_MACH_ASM9260) += clk-asm9260.o
> > +obj-$(CONFIG_ATH79) += clk-ath79.o
> > obj-$(CONFIG_COMMON_CLK_AXI_CLKGEN) += clk-axi-clkgen.o
> > obj-$(CONFIG_ARCH_AXXIA) += clk-axm5516.o
> > obj-$(CONFIG_COMMON_CLK_CDCE706) += clk-cdce706.o
> > diff --git a/drivers/clk/clk-ath79.c b/drivers/clk/clk-ath79.c
> > new file mode 100644
> > index 0000000..75338a7
> > --- /dev/null
> > +++ b/drivers/clk/clk-ath79.c
> > @@ -0,0 +1,193 @@
> > +/*
> > + * Clock driver for Atheros AR724X/AR913X/AR933X SoCs
> > + *
> > + * Copyright (C) 2010-2011 Jaiganesh Narayanan <jnarayanan@atheros.com>
> > + * Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
> > + * Copyright (C) 2015 Alban Bedel <albeu@free.fr>
> > + * Copyright (C) 2016 Antony Pavlov <antonynpavlov@gmail.com>
> > + *
> > + * Parts of this file are based on Atheros' 2.6.15/2.6.31 BSP
> > + *
> > + * This program 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 program 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.
> > + */
> > +
> > +#include <linux/clk.h>
> > +#include <linux/clk-provider.h>
> > +#include <linux/clkdev.h>
> > +#include <linux/of.h>
> > +#include <linux/of_address.h>
> > +#include "clk.h"
> > +
> > +#include <dt-bindings/clock/ath79-clk.h>
> > +
> > +#include "asm/mach-ath79/ar71xx_regs.h"
> > +#include "asm/mach-ath79/ath79.h"
> > +
> > +#define MHZ (1000 * 1000)
> > +
> > +#define AR724X_BASE_FREQ (40 * MHZ)
> > +
> > +static struct clk *ath79_clks[ATH79_CLK_END];
> > +
> > +static struct clk_onecell_data clk_data = {
> > + .clks = ath79_clks,
> > + .clk_num = ARRAY_SIZE(ath79_clks),
> > +};
> > +
> > +static struct clk *__init ath79_add_sys_clkdev(
> > + const char *id, unsigned long rate)
> > +{
> > + struct clk *clk;
> > + int err;
> > +
> > + clk = clk_register_fixed_rate(NULL, id, NULL, CLK_IS_ROOT, rate);
> > + if (!clk)
> > + panic("failed to allocate %s clock structure", id);
> > +
> > + err = clk_register_clkdev(clk, id, NULL);
> > + if (err)
> > + panic("unable to register %s clock device", id);
> > +
> > + return clk;
> > +}
> >
> > +static void __init ar724x_clk_init(struct device_node *np)
> > +{
> > + struct clk *ref_clk;
> > + unsigned long of_ref_rate;
> > + unsigned long ref_rate;
> > + unsigned long cpu_rate;
> > + unsigned long ddr_rate;
> > + unsigned long ahb_rate;
> > + u32 pll;
> > + u32 freq;
> > + u32 div;
> > +
> > + ref_clk = of_clk_get(np, 0);
> > + if (IS_ERR(ref_clk)) {
> > + pr_err("%s: of_clk_get failed\n", np->full_name);
> > + return;
> > + }
>
> It would be better to have this function take the ref clock as
> argument, to allow using it for both OF and legacy platforms.
I'll try to use this idea in v5 patch version.
> > + of_ref_rate = clk_get_rate(ref_clk);
> > +
> > + ref_rate = AR724X_BASE_FREQ;
> > +
> > + if (of_ref_rate != ref_rate) {
> > + pr_err("ref_rate != of_ref_rate\n");
> > + ref_rate = of_ref_rate;
> > + }
>
> I don't think that this test is really useful.
Yes, I can make this check optional.
> > + pll = ath79_pll_rr(AR724X_PLL_REG_CPU_CONFIG);
> > +
> > + div = ((pll >> AR724X_PLL_FB_SHIFT) & AR724X_PLL_FB_MASK);
> > + freq = div * ref_rate;
> > +
> > + div = ((pll >> AR724X_PLL_REF_DIV_SHIFT) & AR724X_PLL_REF_DIV_MASK) * 2;
> > + freq /= div;
> > +
> > + cpu_rate = freq;
> > +
> > + div = ((pll >> AR724X_DDR_DIV_SHIFT) & AR724X_DDR_DIV_MASK) + 1;
> > + ddr_rate = freq / div;
> > +
> > + div = (((pll >> AR724X_AHB_DIV_SHIFT) & AR724X_AHB_DIV_MASK) + 1) * 2;
> > + ahb_rate = cpu_rate / div;
>
> For a new driver it would make sense to use clk_register_divider() and
> similar generic building blocks.
>
> > + ath79_clks[ATH79_CLK_REF] = ath79_add_sys_clkdev("ref", ref_rate);
> > + ath79_clks[ATH79_CLK_CPU] = ath79_add_sys_clkdev("cpu", cpu_rate);
> > + ath79_clks[ATH79_CLK_DDR] = ath79_add_sys_clkdev("ddr", ddr_rate);
> > + ath79_clks[ATH79_CLK_AHB] = ath79_add_sys_clkdev("ahb", ahb_rate);
> > + ath79_clks[ATH79_CLK_WDT] = ath79_add_sys_clkdev("wdt", ahb_rate);
> > + ath79_clks[ATH79_CLK_UART] = ath79_add_sys_clkdev("uart", ahb_rate);
>
> You shouldn't add ref, wdt and uart, they are not needed and make the
> driver incompatible with the current DT bindings.
Please describe the situation then this incompatibility does matter.
Current ath79 dt support is very preliminary and the only dt user
is 5-years old TP-Link WR1043ND so it's near impossible to break somethink.
Anyway current ath79 dt binding is somewhat broken (see __your__ message 'Re: [RFC 1/4] WIP: MIPS: ath79: make ar933x clks more devicetree-friendly' from 'Thu, 21 Jan 2016 12:03:20 +0100').
--
Best regards,
Antony Pavlov
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [RFC v3 01/14] WIP: clk: add Atheros AR724X/AR913X/AR933X SoCs clock driver
@ 2016-01-31 20:41 ` Antony Pavlov
0 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-01-31 20:41 UTC (permalink / raw)
To: Alban
Cc: linux-mips, Michael Turquette, Stephen Boyd, Rob Herring,
linux-clk, devicetree
On Mon, 25 Jan 2016 23:21:56 +0100
Alban <albeu@free.fr> wrote:
> On Sat, 23 Jan 2016 23:17:18 +0300
> Antony Pavlov <antonynpavlov@gmail.com> wrote:
>=20
> > TODO: get pll registers base address from devicetree node
> >=20
> > Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> > Cc: Alban Bedel <albeu@free.fr>
> > Cc: Michael Turquette <mturquette@baylibre.com>
> > Cc: Stephen Boyd <sboyd@codeaurora.org>
> > Cc: Rob Herring <robh+dt@kernel.org>
> > Cc: linux-clk@vger.kernel.org
> > Cc: linux-mips@linux-mips.org
> > Cc: devicetree@vger.kernel.org
> > ---
> > drivers/clk/Makefile | 1 +
> > drivers/clk/clk-ath79.c | 193 ++++++++++++++++++++++++++=
++++++++
> > include/dt-bindings/clock/ath79-clk.h | 22 ++++
> > 3 files changed, 216 insertions(+)
> >=20
> > diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
> > index 820714c..5101763 100644
> > --- a/drivers/clk/Makefile
> > +++ b/drivers/clk/Makefile
> > @@ -18,6 +18,7 @@ endif
> > # hardware specific clock types
> > # please keep this section sorted lexicographically by file/directory =
path name
> > obj-$(CONFIG_MACH_ASM9260) +=3D clk-asm9260.o
> > +obj-$(CONFIG_ATH79) +=3D clk-ath79.o
> > obj-$(CONFIG_COMMON_CLK_AXI_CLKGEN) +=3D clk-axi-clkgen.o
> > obj-$(CONFIG_ARCH_AXXIA) +=3D clk-axm5516.o
> > obj-$(CONFIG_COMMON_CLK_CDCE706) +=3D clk-cdce706.o
> > diff --git a/drivers/clk/clk-ath79.c b/drivers/clk/clk-ath79.c
> > new file mode 100644
> > index 0000000..75338a7
> > --- /dev/null
> > +++ b/drivers/clk/clk-ath79.c
> > @@ -0,0 +1,193 @@
> > +/*
> > + * Clock driver for Atheros AR724X/AR913X/AR933X SoCs
> > + *
> > + * Copyright (C) 2010-2011 Jaiganesh Narayanan <jnarayanan@atheros.com>
> > + * Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
> > + * Copyright (C) 2015 Alban Bedel <albeu@free.fr>
> > + * Copyright (C) 2016 Antony Pavlov <antonynpavlov@gmail.com>
> > + *
> > + * Parts of this file are based on Atheros' 2.6.15/2.6.31 BSP
> > + *
> > + * This program 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 program 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.
> > + */
> > +
> > +#include <linux/clk.h>
> > +#include <linux/clk-provider.h>
> > +#include <linux/clkdev.h>
> > +#include <linux/of.h>
> > +#include <linux/of_address.h>
> > +#include "clk.h"
> > +
> > +#include <dt-bindings/clock/ath79-clk.h>
> > +
> > +#include "asm/mach-ath79/ar71xx_regs.h"
> > +#include "asm/mach-ath79/ath79.h"
> > +
> > +#define MHZ (1000 * 1000)
> > +
> > +#define AR724X_BASE_FREQ (40 * MHZ)
> > +
> > +static struct clk *ath79_clks[ATH79_CLK_END];
> > +
> > +static struct clk_onecell_data clk_data =3D {
> > + .clks =3D ath79_clks,
> > + .clk_num =3D ARRAY_SIZE(ath79_clks),
> > +};
> > +
> > +static struct clk *__init ath79_add_sys_clkdev(
> > + const char *id, unsigned long rate)
> > +{
> > + struct clk *clk;
> > + int err;
> > +
> > + clk =3D clk_register_fixed_rate(NULL, id, NULL, CLK_IS_ROOT, rate);
> > + if (!clk)
> > + panic("failed to allocate %s clock structure", id);
> > +
> > + err =3D clk_register_clkdev(clk, id, NULL);
> > + if (err)
> > + panic("unable to register %s clock device", id);
> > +
> > + return clk;
> > +}
> >
> > +static void __init ar724x_clk_init(struct device_node *np)
> > +{
> > + struct clk *ref_clk;
> > + unsigned long of_ref_rate;
> > + unsigned long ref_rate;
> > + unsigned long cpu_rate;
> > + unsigned long ddr_rate;
> > + unsigned long ahb_rate;
> > + u32 pll;
> > + u32 freq;
> > + u32 div;
> > +
> > + ref_clk =3D of_clk_get(np, 0);
> > + if (IS_ERR(ref_clk)) {
> > + pr_err("%s: of_clk_get failed\n", np->full_name);
> > + return;
> > + }
>=20
> It would be better to have this function take the ref clock as
> argument, to allow using it for both OF and legacy platforms.
I'll try to use this idea in v5 patch version.
> > + of_ref_rate =3D clk_get_rate(ref_clk);
> > +
> > + ref_rate =3D AR724X_BASE_FREQ;
> > +
> > + if (of_ref_rate !=3D ref_rate) {
> > + pr_err("ref_rate !=3D of_ref_rate\n");
> > + ref_rate =3D of_ref_rate;
> > + }
>=20
> I don't think that this test is really useful.
Yes, I can make this check optional.
> > + pll =3D ath79_pll_rr(AR724X_PLL_REG_CPU_CONFIG);
> > +
> > + div =3D ((pll >> AR724X_PLL_FB_SHIFT) & AR724X_PLL_FB_MASK);
> > + freq =3D div * ref_rate;
> > +
> > + div =3D ((pll >> AR724X_PLL_REF_DIV_SHIFT) & AR724X_PLL_REF_DIV_MASK)=
* 2;
> > + freq /=3D div;
> > +
> > + cpu_rate =3D freq;
> > +
> > + div =3D ((pll >> AR724X_DDR_DIV_SHIFT) & AR724X_DDR_DIV_MASK) + 1;
> > + ddr_rate =3D freq / div;
> > +
> > + div =3D (((pll >> AR724X_AHB_DIV_SHIFT) & AR724X_AHB_DIV_MASK) + 1) *=
2;
> > + ahb_rate =3D cpu_rate / div;
>=20
> For a new driver it would make sense to use clk_register_divider() and
> similar generic building blocks.
>=20
> > + ath79_clks[ATH79_CLK_REF] =3D ath79_add_sys_clkdev("ref", ref_rate);
> > + ath79_clks[ATH79_CLK_CPU] =3D ath79_add_sys_clkdev("cpu", cpu_rate);
> > + ath79_clks[ATH79_CLK_DDR] =3D ath79_add_sys_clkdev("ddr", ddr_rate);
> > + ath79_clks[ATH79_CLK_AHB] =3D ath79_add_sys_clkdev("ahb", ahb_rate);
> > + ath79_clks[ATH79_CLK_WDT] =3D ath79_add_sys_clkdev("wdt", ahb_rate);
> > + ath79_clks[ATH79_CLK_UART] =3D ath79_add_sys_clkdev("uart", ahb_rate);
>=20
> You shouldn't add ref, wdt and uart, they are not needed and make the
> driver incompatible with the current DT bindings.
Please describe the situation then this incompatibility does matter.
Current ath79 dt support is very preliminary and the only dt user
is 5-years old TP-Link WR1043ND so it's near impossible to break somethink.
Anyway current ath79 dt binding is somewhat broken (see __your__ message 'R=
e: [RFC 1/4] WIP: MIPS: ath79: make ar933x clks more devicetree-friendly' f=
rom 'Thu, 21 Jan 2016 12:03:20 +0100').
--=A0
Best regards,
=A0 Antony Pavlov
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [RFC v3 08/14] MIPS: dts: qca: introduce AR9331 devicetree
2016-01-25 22:46 ` Alban
(?)
@ 2016-01-31 20:59 ` Antony Pavlov
-1 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-01-31 20:59 UTC (permalink / raw)
To: Alban
Cc: linux-mips, Gabor Juhos, devicetree, Rob Herring, Frank Rowand,
Grant Likely
On Mon, 25 Jan 2016 23:46:30 +0100
Alban <albeu@free.fr> wrote:
> On Sat, 23 Jan 2016 23:17:25 +0300
> Antony Pavlov <antonynpavlov@gmail.com> wrote:
>
> > This patch introduces devicetree for Atheros AR9331 SoC (AKA Hornet).
> > The AR9331 chip is a Wi-Fi System-On-Chip (WiSOC),
> > typically used in very cheap Access Points and Routers.
> >
> > Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> > Cc: Gabor Juhos <juhosg@openwrt.org>
> > Cc: Alban Bedel <albeu@free.fr>
> > Cc: linux-mips@linux-mips.org
> > Cc: devicetree@vger.kernel.org
> > ---
> > arch/mips/boot/dts/qca/ar9331.dtsi | 123 +++++++++++++++++++++++++++++++++++++
> > 1 file changed, 123 insertions(+)
> >
> > diff --git a/arch/mips/boot/dts/qca/ar9331.dtsi b/arch/mips/boot/dts/qca/ar9331.dtsi
> > new file mode 100644
> > index 0000000..bf128a2
> > --- /dev/null
> > +++ b/arch/mips/boot/dts/qca/ar9331.dtsi
> > @@ -0,0 +1,123 @@
> > +#include <dt-bindings/clock/ath79-clk.h>
> > +
> > +/ {
> > + compatible = "qca,ar9331";
> > +
>
> [...]
>
> > +
> > + extosc: oscillator {
> > + compatible = "fixed-clock";
> > + #clock-cells = <0>;
> > + };
>
> This oscillator is on the board and not in the SoC, so it should
> be in the board DTS.
This oscillator is always has to be connected to the SoC, it's abligatory thing.
So there no logic incosistency in adding this oscillator node template to SoC's dtsi file.
This oscillator node is not describes oscillator completely but this node
makes it possible to introduce oscillator early so we can make reference on
it just in ar9331.dtsi file. So we have no need to make full oscillator description
in every board dts file.
Futher is we make full oscillator' description in a board dts file then we have
to additionally describe binding of the oscillator to SoC's clk block.
--
Best regards,
Antony Pavlov
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [RFC v3 07/14] MIPS: dts: qca: simplify Makefile
2016-01-25 22:41 ` Alban
@ 2016-01-31 21:15 ` Antony Pavlov
0 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-01-31 21:15 UTC (permalink / raw)
To: Alban; +Cc: linux-mips
On Mon, 25 Jan 2016 23:41:04 +0100
Alban <albeu@free.fr> wrote:
> On Sat, 23 Jan 2016 23:17:24 +0300
> Antony Pavlov <antonynpavlov@gmail.com> wrote:
>
> > Do as arch/mips/boot/dts/ralink/Makefile does.
> > Without this patch adding a dtb-file leads
> > to adding __two__ lines to the Makefile.
>
> I have some patches in my queue to allow using appended DTB and remove
> the builtin DTB support. That would also fix the problem as the second
> Makefile line wouldn't be needed anymore. I try to post them soon.
What bootloader do you use on your TP-Link WR1043ND?
Please describe you linux kernel image with appended DTB creation procedure.
> Alban
>
> > Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> > Cc: Alban Bedel <albeu@free.fr>
> > Cc: linux-mips@linux-mips.org
> > ---
> > arch/mips/boot/dts/qca/Makefile | 5 ++---
> > 1 file changed, 2 insertions(+), 3 deletions(-)
> >
> > diff --git a/arch/mips/boot/dts/qca/Makefile b/arch/mips/boot/dts/qca/Makefile
> > index 2d61455d..244329e 100644
> > --- a/arch/mips/boot/dts/qca/Makefile
> > +++ b/arch/mips/boot/dts/qca/Makefile
> > @@ -1,8 +1,7 @@
> > # All DTBs
> > -dtb-$(CONFIG_ATH79) += ar9132_tl_wr1043nd_v1.dtb
> > +dtb-$(CONFIG_DTB_TL_WR1043ND_V1) += ar9132_tl_wr1043nd_v1.dtb
> >
> > -# Select a DTB to build in the kernel
> > -obj-$(CONFIG_DTB_TL_WR1043ND_V1) += ar9132_tl_wr1043nd_v1.dtb.o
> > +obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
> >
> > # Force kbuild to make empty built-in.o if necessary
> > obj- += dummy.o
>
--
--
Best regards,
Antony Pavlov
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [RFC v3 01/14] WIP: clk: add Atheros AR724X/AR913X/AR933X SoCs clock driver
2016-01-30 0:27 ` Stephen Boyd
@ 2016-02-01 0:23 ` Antony Pavlov
0 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-02-01 0:23 UTC (permalink / raw)
To: Stephen Boyd
Cc: linux-mips, Alban Bedel, Michael Turquette, Rob Herring,
linux-clk, devicetree
On Fri, 29 Jan 2016 16:27:34 -0800
Stephen Boyd <sboyd@codeaurora.org> wrote:
> On 01/23, Antony Pavlov wrote:
> > TODO: get pll registers base address from devicetree node
> >
> > Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> > Cc: Alban Bedel <albeu@free.fr>
> > Cc: Michael Turquette <mturquette@baylibre.com>
> > Cc: Stephen Boyd <sboyd@codeaurora.org>
> > Cc: Rob Herring <robh+dt@kernel.org>
> > Cc: linux-clk@vger.kernel.org
> > Cc: linux-mips@linux-mips.org
> > Cc: devicetree@vger.kernel.org
> > ---
>
> Is there a binding document for this?
Yes, there is the binding document: Documentation/devicetree/bindings/clock/qca,ath79-pll.txt
Anyway I suppose I have to update it in RFCv5.
> > drivers/clk/Makefile | 1 +
> > drivers/clk/clk-ath79.c | 193 ++++++++++++++++++++++++++++++++++
> > include/dt-bindings/clock/ath79-clk.h | 22 ++++
> > 3 files changed, 216 insertions(+)
> >
> > diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
> > index 820714c..5101763 100644
> > --- a/drivers/clk/Makefile
> > +++ b/drivers/clk/Makefile
> > diff --git a/drivers/clk/clk-ath79.c b/drivers/clk/clk-ath79.c
> > new file mode 100644
> > index 0000000..75338a7
> > --- /dev/null
> > +++ b/drivers/clk/clk-ath79.c
> > @@ -0,0 +1,193 @@
> > +/*
> > + */
> > +
> > +#include <linux/clk.h>
> > +#include <linux/clk-provider.h>
> > +#include <linux/clkdev.h>
> > +#include <linux/of.h>
> > +#include <linux/of_address.h>
> > +#include "clk.h"
>
> Don't include this header.
Ok, I'll try to drop it in RFC v5.
> > +
> > +#include <dt-bindings/clock/ath79-clk.h>
> > +
> > +#include "asm/mach-ath79/ar71xx_regs.h"
> > +#include "asm/mach-ath79/ath79.h"
>
> Can we get away without including these headers?
I have dropped ath79.h and ath79-clk.h in RFCv4.
> > +
> > +#define MHZ (1000 * 1000)
> > +
> > +#define AR724X_BASE_FREQ (40 * MHZ)
> > +
> > +static struct clk *ath79_clks[ATH79_CLK_END];
> > +
> > +static struct clk_onecell_data clk_data = {
> > + .clks = ath79_clks,
> > + .clk_num = ARRAY_SIZE(ath79_clks),
> > +};
> > +
> > +static struct clk *__init ath79_add_sys_clkdev(
> > + const char *id, unsigned long rate)
> > +{
> > + struct clk *clk;
> > + int err;
> > +
> > + clk = clk_register_fixed_rate(NULL, id, NULL, CLK_IS_ROOT, rate);
> > + if (!clk)
> > + panic("failed to allocate %s clock structure", id);
> > +
> > + err = clk_register_clkdev(clk, id, NULL);
>
> Why are we using clkdev? Can't we use DT lookups?
Hmm, I have just reused legacy ath79_add_sys_clkdev() function.
I'll try to see how to use DT lookups.
> > + if (err)
> > + panic("unable to register %s clock device", id);
> > +
> > + return clk;
> > +}
> > +
> > +static void __init ar724x_clk_init(struct device_node *np)
> > +{
> > + struct clk *ref_clk;
> > + unsigned long of_ref_rate;
> > + unsigned long ref_rate;
> > + unsigned long cpu_rate;
> > + unsigned long ddr_rate;
> > + unsigned long ahb_rate;
> > + u32 pll;
> > + u32 freq;
> > + u32 div;
> > +
> > + ref_clk = of_clk_get(np, 0);
> > + if (IS_ERR(ref_clk)) {
> > + pr_err("%s: of_clk_get failed\n", np->full_name);
> > + return;
> > + }
> > +
> > + of_ref_rate = clk_get_rate(ref_clk);
> > +
> > + ref_rate = AR724X_BASE_FREQ;
> > +
> > + if (of_ref_rate != ref_rate) {
> > + pr_err("ref_rate != of_ref_rate\n");
> > + ref_rate = of_ref_rate;
> > + }
> > +
> > + pll = ath79_pll_rr(AR724X_PLL_REG_CPU_CONFIG);
> > +
> > + div = ((pll >> AR724X_PLL_FB_SHIFT) & AR724X_PLL_FB_MASK);
> > + freq = div * ref_rate;
> > +
> > + div = ((pll >> AR724X_PLL_REF_DIV_SHIFT) & AR724X_PLL_REF_DIV_MASK) * 2;
> > + freq /= div;
> > +
> > + cpu_rate = freq;
> > +
> > + div = ((pll >> AR724X_DDR_DIV_SHIFT) & AR724X_DDR_DIV_MASK) + 1;
> > + ddr_rate = freq / div;
> > +
> > + div = (((pll >> AR724X_AHB_DIV_SHIFT) & AR724X_AHB_DIV_MASK) + 1) * 2;
> > + ahb_rate = cpu_rate / div;
> > +
> > + ath79_clks[ATH79_CLK_REF] = ath79_add_sys_clkdev("ref", ref_rate);
> > + ath79_clks[ATH79_CLK_CPU] = ath79_add_sys_clkdev("cpu", cpu_rate);
> > + ath79_clks[ATH79_CLK_DDR] = ath79_add_sys_clkdev("ddr", ddr_rate);
> > + ath79_clks[ATH79_CLK_AHB] = ath79_add_sys_clkdev("ahb", ahb_rate);
> > + ath79_clks[ATH79_CLK_WDT] = ath79_add_sys_clkdev("wdt", ahb_rate);
> > + ath79_clks[ATH79_CLK_UART] = ath79_add_sys_clkdev("uart", ahb_rate);
> > +
> > + of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
>
> What if this fails?
Ok, I'll add return code result checks as drivers/clk/ingenic/cgu.c does.
> > +}
> > +
> > +static void __init ar933x_clk_init(struct device_node *np)
> > +{
> > + struct clk *ref_clk;
> > + unsigned long of_ref_rate;
> > + unsigned long ref_rate;
> > + unsigned long cpu_rate;
> > + unsigned long ddr_rate;
> > + unsigned long ahb_rate;
> > + u32 clock_ctrl;
> > + u32 cpu_config;
> > + u32 freq;
> > + u32 t;
> > +
> > + ref_clk = of_clk_get(np, 0);
> > + if (IS_ERR(ref_clk)) {
> > + pr_err("%s: of_clk_get failed\n", np->full_name);
> > + return;
> > + }
> > +
> > + of_ref_rate = clk_get_rate(ref_clk);
> > +
> > + t = ath79_reset_rr(AR933X_RESET_REG_BOOTSTRAP);
> > + if (t & AR933X_BOOTSTRAP_REF_CLK_40)
> > + ref_rate = 40 * MHZ;
> > + else
> > + ref_rate = 25 * MHZ;
> > +
> > + if (ref_rate != of_ref_rate) {
>
> Does this happen? I'd prefer we find a way to avoid calling
> of_clk_get() and clk_get_rate() in this driver.
>
> > + pr_err("ref_rate != of_ref_rate\n");
> > + ref_rate = of_ref_rate;
> > + }
> > +
> > + clock_ctrl = ath79_pll_rr(AR933X_PLL_CLOCK_CTRL_REG);
> > + if (clock_ctrl & AR933X_PLL_CLOCK_CTRL_BYPASS) {
> > + cpu_rate = ref_rate;
> > + ahb_rate = ref_rate;
> > + ddr_rate = ref_rate;
>
> So if it's in bypass, why not register fixed factor clocks of
> 1/1 and set the parent to ref_clk?
I suppose that realising clocks as "real clocks with clk_ops" will be more simple
solution.
> > + } else {
> > + cpu_config = ath79_pll_rr(AR933X_PLL_CPU_CONFIG_REG);
> > +
> > + t = (cpu_config >> AR933X_PLL_CPU_CONFIG_REFDIV_SHIFT) &
> > + AR933X_PLL_CPU_CONFIG_REFDIV_MASK;
> > + freq = ref_rate / t;
> > +
> > + t = (cpu_config >> AR933X_PLL_CPU_CONFIG_NINT_SHIFT) &
> > + AR933X_PLL_CPU_CONFIG_NINT_MASK;
> > + freq *= t;
> > +
> > + t = (cpu_config >> AR933X_PLL_CPU_CONFIG_OUTDIV_SHIFT) &
> > + AR933X_PLL_CPU_CONFIG_OUTDIV_MASK;
> > + if (t == 0)
> > + t = 1;
> > +
> > + freq >>= t;
> > +
> > + t = ((clock_ctrl >> AR933X_PLL_CLOCK_CTRL_CPU_DIV_SHIFT) &
> > + AR933X_PLL_CLOCK_CTRL_CPU_DIV_MASK) + 1;
> > + cpu_rate = freq / t;
> > +
> > + t = ((clock_ctrl >> AR933X_PLL_CLOCK_CTRL_DDR_DIV_SHIFT) &
> > + AR933X_PLL_CLOCK_CTRL_DDR_DIV_MASK) + 1;
> > + ddr_rate = freq / t;
> > +
> > + t = ((clock_ctrl >> AR933X_PLL_CLOCK_CTRL_AHB_DIV_SHIFT) &
> > + AR933X_PLL_CLOCK_CTRL_AHB_DIV_MASK) + 1;
> > + ahb_rate = freq / t;
>
> These look like something we could implement as real clocks with
> clk_ops. The parent still looks like ref_clk, but we would be
> reading hardware in recalc_rate to figure out what the rate is.
Hmm. I have already realized this solution in 2014 for barebox
please see http://lists.infradead.org/pipermail/barebox/2014-March/018414.html
Current RFC v3 driver is based on arch/mips/ath79/clock.c, but
I suppose I have to use barebox driver as a base for RFC v5 driver.
> > + }
> > +
> > + ath79_clks[ATH79_CLK_REF] = ath79_add_sys_clkdev("ref", ref_rate);
> > + ath79_clks[ATH79_CLK_CPU] = ath79_add_sys_clkdev("cpu", cpu_rate);
> > + ath79_clks[ATH79_CLK_DDR] = ath79_add_sys_clkdev("ddr", ddr_rate);
> > + ath79_clks[ATH79_CLK_AHB] = ath79_add_sys_clkdev("ahb", ahb_rate);
> > + ath79_clks[ATH79_CLK_WDT] = ath79_add_sys_clkdev("wdt", ahb_rate);
> > + ath79_clks[ATH79_CLK_UART] = ath79_add_sys_clkdev("uart", ref_rate);
> > +
> > + of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
> > +}
> > +CLK_OF_DECLARE(ar9130_clk, "qca,ar9130-pll", ar724x_clk_init);
> > +CLK_OF_DECLARE(ar933x_clk, "qca,ar9330-pll", ar933x_clk_init);
>
> Is there a reason this isn't a platform driver?
We already have legacy platform driver arch/mips/ath79/clock.c.
I'm trying to realize modern clk driver and then adapt it to use with legacy code.
--
Best regards,
Antony Pavlov
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [RFC v3 01/14] WIP: clk: add Atheros AR724X/AR913X/AR933X SoCs clock driver
@ 2016-02-01 0:23 ` Antony Pavlov
0 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-02-01 0:23 UTC (permalink / raw)
To: Stephen Boyd
Cc: linux-mips, Alban Bedel, Michael Turquette, Rob Herring,
linux-clk, devicetree
On Fri, 29 Jan 2016 16:27:34 -0800
Stephen Boyd <sboyd@codeaurora.org> wrote:
> On 01/23, Antony Pavlov wrote:
> > TODO: get pll registers base address from devicetree node
> >=20
> > Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> > Cc: Alban Bedel <albeu@free.fr>
> > Cc: Michael Turquette <mturquette@baylibre.com>
> > Cc: Stephen Boyd <sboyd@codeaurora.org>
> > Cc: Rob Herring <robh+dt@kernel.org>
> > Cc: linux-clk@vger.kernel.org
> > Cc: linux-mips@linux-mips.org
> > Cc: devicetree@vger.kernel.org
> > ---
>=20
> Is there a binding document for this?
Yes, there is the binding document: Documentation/devicetree/bindings/clock=
/qca,ath79-pll.txt
Anyway I suppose I have to update it in RFCv5.
> > drivers/clk/Makefile | 1 +
> > drivers/clk/clk-ath79.c | 193 ++++++++++++++++++++++++++=
++++++++
> > include/dt-bindings/clock/ath79-clk.h | 22 ++++
> > 3 files changed, 216 insertions(+)
> >=20
> > diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
> > index 820714c..5101763 100644
> > --- a/drivers/clk/Makefile
> > +++ b/drivers/clk/Makefile
> > diff --git a/drivers/clk/clk-ath79.c b/drivers/clk/clk-ath79.c
> > new file mode 100644
> > index 0000000..75338a7
> > --- /dev/null
> > +++ b/drivers/clk/clk-ath79.c
> > @@ -0,0 +1,193 @@
> > +/*
> > + */
> > +
> > +#include <linux/clk.h>
> > +#include <linux/clk-provider.h>
> > +#include <linux/clkdev.h>
> > +#include <linux/of.h>
> > +#include <linux/of_address.h>
> > +#include "clk.h"
>=20
> Don't include this header.
Ok, I'll try to drop it in RFC v5.
> > +
> > +#include <dt-bindings/clock/ath79-clk.h>
> > +
> > +#include "asm/mach-ath79/ar71xx_regs.h"
> > +#include "asm/mach-ath79/ath79.h"
>=20
> Can we get away without including these headers?
I have dropped ath79.h and ath79-clk.h in RFCv4.
> > +
> > +#define MHZ (1000 * 1000)
> > +
> > +#define AR724X_BASE_FREQ (40 * MHZ)
> > +
> > +static struct clk *ath79_clks[ATH79_CLK_END];
> > +
> > +static struct clk_onecell_data clk_data =3D {
> > + .clks =3D ath79_clks,
> > + .clk_num =3D ARRAY_SIZE(ath79_clks),
> > +};
> > +
> > +static struct clk *__init ath79_add_sys_clkdev(
> > + const char *id, unsigned long rate)
> > +{
> > + struct clk *clk;
> > + int err;
> > +
> > + clk =3D clk_register_fixed_rate(NULL, id, NULL, CLK_IS_ROOT, rate);
> > + if (!clk)
> > + panic("failed to allocate %s clock structure", id);
> > +
> > + err =3D clk_register_clkdev(clk, id, NULL);
>=20
> Why are we using clkdev? Can't we use DT lookups?
Hmm, I have just reused legacy ath79_add_sys_clkdev() function.
I'll try to see how to use DT lookups.
> > + if (err)
> > + panic("unable to register %s clock device", id);
> > +
> > + return clk;
> > +}
> > +
> > +static void __init ar724x_clk_init(struct device_node *np)
> > +{
> > + struct clk *ref_clk;
> > + unsigned long of_ref_rate;
> > + unsigned long ref_rate;
> > + unsigned long cpu_rate;
> > + unsigned long ddr_rate;
> > + unsigned long ahb_rate;
> > + u32 pll;
> > + u32 freq;
> > + u32 div;
> > +
> > + ref_clk =3D of_clk_get(np, 0);
> > + if (IS_ERR(ref_clk)) {
> > + pr_err("%s: of_clk_get failed\n", np->full_name);
> > + return;
> > + }
> > +
> > + of_ref_rate =3D clk_get_rate(ref_clk);
> > +
> > + ref_rate =3D AR724X_BASE_FREQ;
> > +
> > + if (of_ref_rate !=3D ref_rate) {
> > + pr_err("ref_rate !=3D of_ref_rate\n");
> > + ref_rate =3D of_ref_rate;
> > + }
> > +
> > + pll =3D ath79_pll_rr(AR724X_PLL_REG_CPU_CONFIG);
> > +
> > + div =3D ((pll >> AR724X_PLL_FB_SHIFT) & AR724X_PLL_FB_MASK);
> > + freq =3D div * ref_rate;
> > +
> > + div =3D ((pll >> AR724X_PLL_REF_DIV_SHIFT) & AR724X_PLL_REF_DIV_MASK)=
* 2;
> > + freq /=3D div;
> > +
> > + cpu_rate =3D freq;
> > +
> > + div =3D ((pll >> AR724X_DDR_DIV_SHIFT) & AR724X_DDR_DIV_MASK) + 1;
> > + ddr_rate =3D freq / div;
> > +
> > + div =3D (((pll >> AR724X_AHB_DIV_SHIFT) & AR724X_AHB_DIV_MASK) + 1) *=
2;
> > + ahb_rate =3D cpu_rate / div;
> > +
> > + ath79_clks[ATH79_CLK_REF] =3D ath79_add_sys_clkdev("ref", ref_rate);
> > + ath79_clks[ATH79_CLK_CPU] =3D ath79_add_sys_clkdev("cpu", cpu_rate);
> > + ath79_clks[ATH79_CLK_DDR] =3D ath79_add_sys_clkdev("ddr", ddr_rate);
> > + ath79_clks[ATH79_CLK_AHB] =3D ath79_add_sys_clkdev("ahb", ahb_rate);
> > + ath79_clks[ATH79_CLK_WDT] =3D ath79_add_sys_clkdev("wdt", ahb_rate);
> > + ath79_clks[ATH79_CLK_UART] =3D ath79_add_sys_clkdev("uart", ahb_rate);
> > +
> > + of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
>=20
> What if this fails?
Ok, I'll add return code result checks as drivers/clk/ingenic/cgu.c does.
=20
> > +}
> > +
> > +static void __init ar933x_clk_init(struct device_node *np)
> > +{
> > + struct clk *ref_clk;
> > + unsigned long of_ref_rate;
> > + unsigned long ref_rate;
> > + unsigned long cpu_rate;
> > + unsigned long ddr_rate;
> > + unsigned long ahb_rate;
> > + u32 clock_ctrl;
> > + u32 cpu_config;
> > + u32 freq;
> > + u32 t;
> > +
> > + ref_clk =3D of_clk_get(np, 0);
> > + if (IS_ERR(ref_clk)) {
> > + pr_err("%s: of_clk_get failed\n", np->full_name);
> > + return;
> > + }
> > +
> > + of_ref_rate =3D clk_get_rate(ref_clk);
> > +
> > + t =3D ath79_reset_rr(AR933X_RESET_REG_BOOTSTRAP);
> > + if (t & AR933X_BOOTSTRAP_REF_CLK_40)
> > + ref_rate =3D 40 * MHZ;
> > + else
> > + ref_rate =3D 25 * MHZ;
> > +
> > + if (ref_rate !=3D of_ref_rate) {
>=20
> Does this happen? I'd prefer we find a way to avoid calling
> of_clk_get() and clk_get_rate() in this driver.
>=20
> > + pr_err("ref_rate !=3D of_ref_rate\n");
> > + ref_rate =3D of_ref_rate;
> > + }
> > +
> > + clock_ctrl =3D ath79_pll_rr(AR933X_PLL_CLOCK_CTRL_REG);
> > + if (clock_ctrl & AR933X_PLL_CLOCK_CTRL_BYPASS) {
> > + cpu_rate =3D ref_rate;
> > + ahb_rate =3D ref_rate;
> > + ddr_rate =3D ref_rate;
>=20
> So if it's in bypass, why not register fixed factor clocks of
> 1/1 and set the parent to ref_clk?
I suppose that realising clocks as "real clocks with clk_ops" will be more =
simple
solution.
> > + } else {
> > + cpu_config =3D ath79_pll_rr(AR933X_PLL_CPU_CONFIG_REG);
> > +
> > + t =3D (cpu_config >> AR933X_PLL_CPU_CONFIG_REFDIV_SHIFT) &
> > + AR933X_PLL_CPU_CONFIG_REFDIV_MASK;
> > + freq =3D ref_rate / t;
> > +
> > + t =3D (cpu_config >> AR933X_PLL_CPU_CONFIG_NINT_SHIFT) &
> > + AR933X_PLL_CPU_CONFIG_NINT_MASK;
> > + freq *=3D t;
> > +
> > + t =3D (cpu_config >> AR933X_PLL_CPU_CONFIG_OUTDIV_SHIFT) &
> > + AR933X_PLL_CPU_CONFIG_OUTDIV_MASK;
> > + if (t =3D=3D 0)
> > + t =3D 1;
> > +
> > + freq >>=3D t;
> > +
> > + t =3D ((clock_ctrl >> AR933X_PLL_CLOCK_CTRL_CPU_DIV_SHIFT) &
> > + AR933X_PLL_CLOCK_CTRL_CPU_DIV_MASK) + 1;
> > + cpu_rate =3D freq / t;
> > +
> > + t =3D ((clock_ctrl >> AR933X_PLL_CLOCK_CTRL_DDR_DIV_SHIFT) &
> > + AR933X_PLL_CLOCK_CTRL_DDR_DIV_MASK) + 1;
> > + ddr_rate =3D freq / t;
> > +
> > + t =3D ((clock_ctrl >> AR933X_PLL_CLOCK_CTRL_AHB_DIV_SHIFT) &
> > + AR933X_PLL_CLOCK_CTRL_AHB_DIV_MASK) + 1;
> > + ahb_rate =3D freq / t;
>=20
> These look like something we could implement as real clocks with
> clk_ops. The parent still looks like ref_clk, but we would be
> reading hardware in recalc_rate to figure out what the rate is.
Hmm. I have already realized this solution in 2014 for barebox
please see http://lists.infradead.org/pipermail/barebox/2014-March/018414.h=
tml
Current RFC v3 driver is based on arch/mips/ath79/clock.c, but
I suppose I have to use barebox driver as a base for RFC v5 driver.
> > + }
> > +
> > + ath79_clks[ATH79_CLK_REF] =3D ath79_add_sys_clkdev("ref", ref_rate);
> > + ath79_clks[ATH79_CLK_CPU] =3D ath79_add_sys_clkdev("cpu", cpu_rate);
> > + ath79_clks[ATH79_CLK_DDR] =3D ath79_add_sys_clkdev("ddr", ddr_rate);
> > + ath79_clks[ATH79_CLK_AHB] =3D ath79_add_sys_clkdev("ahb", ahb_rate);
> > + ath79_clks[ATH79_CLK_WDT] =3D ath79_add_sys_clkdev("wdt", ahb_rate);
> > + ath79_clks[ATH79_CLK_UART] =3D ath79_add_sys_clkdev("uart", ref_rate);
> > +
> > + of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
> > +}
> > +CLK_OF_DECLARE(ar9130_clk, "qca,ar9130-pll", ar724x_clk_init);
> > +CLK_OF_DECLARE(ar933x_clk, "qca,ar9330-pll", ar933x_clk_init);
>=20
> Is there a reason this isn't a platform driver?
We already have legacy platform driver arch/mips/ath79/clock.c.
I'm trying to realize modern clk driver and then adapt it to use with legac=
y code.
--=A0
Best regards,
=A0 Antony Pavlov
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [RFC v3 01/14] WIP: clk: add Atheros AR724X/AR913X/AR933X SoCs clock driver
2016-01-31 20:41 ` Antony Pavlov
@ 2016-02-01 11:03 ` Alban
-1 siblings, 0 replies; 52+ messages in thread
From: Alban @ 2016-02-01 11:03 UTC (permalink / raw)
To: Antony Pavlov
Cc: Aban Bedel, linux-mips-6z/3iImG2C8G8FEW9MqTrA, Michael Turquette,
Stephen Boyd, Rob Herring, linux-clk-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA
On Sun, 31 Jan 2016 23:41:55 +0300
Antony Pavlov <antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> > > + ath79_clks[ATH79_CLK_REF] = ath79_add_sys_clkdev("ref", ref_rate);
> > > + ath79_clks[ATH79_CLK_CPU] = ath79_add_sys_clkdev("cpu", cpu_rate);
> > > + ath79_clks[ATH79_CLK_DDR] = ath79_add_sys_clkdev("ddr", ddr_rate);
> > > + ath79_clks[ATH79_CLK_AHB] = ath79_add_sys_clkdev("ahb", ahb_rate);
> > > + ath79_clks[ATH79_CLK_WDT] = ath79_add_sys_clkdev("wdt", ahb_rate);
> > > + ath79_clks[ATH79_CLK_UART] = ath79_add_sys_clkdev("uart", ahb_rate);
> >
> > You shouldn't add ref, wdt and uart, they are not needed and make the
> > driver incompatible with the current DT bindings.
>
> Please describe the situation then this incompatibility does matter.
>
> Current ath79 dt support is very preliminary and the only dt user
> is 5-years old TP-Link WR1043ND so it's near impossible to break somethink.
>
> Anyway current ath79 dt binding is somewhat broken (see __your__ message
> 'Re: [RFC 1/4] WIP: MIPS: ath79: make ar933x clks more
> devicetree-friendly' from 'Thu, 21 Jan 2016 12:03:20 +0100').
The point is that DT is about describing the hardware in a consistent
and OS independent manner. It shouldn't be modeled just to suit some
existing code. So it is no big deal if the code doesn't use all the
informations provided by the DT, like here where the input clock is not
*yet* used by the code. However it is a no-go to extend the binding to
add things that don't exists in the hardware just to suit some old code.
I agree we might need to clear a few things regarding the UART clock in
the newer SoC, in particular if the UART use the output of the PLL
pre-divider or something similar. Then we would need to rework the DT
binding for the those SoC. However with the current knowledge I don't
see any need to change the biding yet.
Alban
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [RFC v3 01/14] WIP: clk: add Atheros AR724X/AR913X/AR933X SoCs clock driver
@ 2016-02-01 11:03 ` Alban
0 siblings, 0 replies; 52+ messages in thread
From: Alban @ 2016-02-01 11:03 UTC (permalink / raw)
To: Antony Pavlov
Cc: Aban Bedel, linux-mips, Michael Turquette, Stephen Boyd,
Rob Herring, linux-clk, devicetree
On Sun, 31 Jan 2016 23:41:55 +0300
Antony Pavlov <antonynpavlov@gmail.com> wrote:
> > > + ath79_clks[ATH79_CLK_REF] = ath79_add_sys_clkdev("ref", ref_rate);
> > > + ath79_clks[ATH79_CLK_CPU] = ath79_add_sys_clkdev("cpu", cpu_rate);
> > > + ath79_clks[ATH79_CLK_DDR] = ath79_add_sys_clkdev("ddr", ddr_rate);
> > > + ath79_clks[ATH79_CLK_AHB] = ath79_add_sys_clkdev("ahb", ahb_rate);
> > > + ath79_clks[ATH79_CLK_WDT] = ath79_add_sys_clkdev("wdt", ahb_rate);
> > > + ath79_clks[ATH79_CLK_UART] = ath79_add_sys_clkdev("uart", ahb_rate);
> >
> > You shouldn't add ref, wdt and uart, they are not needed and make the
> > driver incompatible with the current DT bindings.
>
> Please describe the situation then this incompatibility does matter.
>
> Current ath79 dt support is very preliminary and the only dt user
> is 5-years old TP-Link WR1043ND so it's near impossible to break somethink.
>
> Anyway current ath79 dt binding is somewhat broken (see __your__ message
> 'Re: [RFC 1/4] WIP: MIPS: ath79: make ar933x clks more
> devicetree-friendly' from 'Thu, 21 Jan 2016 12:03:20 +0100').
The point is that DT is about describing the hardware in a consistent
and OS independent manner. It shouldn't be modeled just to suit some
existing code. So it is no big deal if the code doesn't use all the
informations provided by the DT, like here where the input clock is not
*yet* used by the code. However it is a no-go to extend the binding to
add things that don't exists in the hardware just to suit some old code.
I agree we might need to clear a few things regarding the UART clock in
the newer SoC, in particular if the UART use the output of the PLL
pre-divider or something similar. Then we would need to rework the DT
binding for the those SoC. However with the current knowledge I don't
see any need to change the biding yet.
Alban
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [RFC v3 06/14] MIPS: dts: qca: ar9132: use short references for uart and spi nodes
2016-01-25 22:31 ` Alban
@ 2016-02-01 18:41 ` Antony Pavlov
0 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-02-01 18:41 UTC (permalink / raw)
To: Alban
Cc: linux-mips-6z/3iImG2C8G8FEW9MqTrA,
devicetree-u79uwXL29TY76Z2rM5mHXA, Sascha Hauer, Marek Vasut,
Wills Wang, Daniel Schwierzeck
On Mon, 25 Jan 2016 23:31:48 +0100
Alban <albeu-GANU6spQydw@public.gmane.org> wrote:
> On Sat, 23 Jan 2016 23:17:23 +0300
> Antony Pavlov <antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
>
> I personally prefer the version without aliases :) Is there any
> guidelines on this?
Here are some Sascha Hauer's arguments for using aliases in the dts files:
- Using aliases reduces the number of indentations in dts files;
- dts files become independent of the layout of the dtsi files (it
becomes possible to introduce another bus {} hierarchy between a
toplevel bus and the devices when you have to);
- less chances for typos. if &i2c2 does not exist you get an error. If
instead you duplicate the whole path in the dts file a typo in the
path will just create another node.
And here is a Marek Vasut's additional argument:
- Aliases allow you to introduce some sort of ordering. For example if you have
gmac0 and gmac1 and you want to have them ordered correctly, you use aliases.
(in case we're talking about the /aliases node).
> > Signed-off-by: Antony Pavlov <antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> > Cc: Alban Bedel <albeu-GANU6spQydw@public.gmane.org>
> > Cc: linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org
> > Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> > ---
> > arch/mips/boot/dts/qca/ar9132.dtsi | 4 +-
> > arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 70 +++++++++++-------------
> > 2 files changed, 35 insertions(+), 39 deletions(-)
> >
> > diff --git a/arch/mips/boot/dts/qca/ar9132.dtsi b/arch/mips/boot/dts/qca/ar9132.dtsi
> > index cd1602f..a14f6f2 100644
> > --- a/arch/mips/boot/dts/qca/ar9132.dtsi
> > +++ b/arch/mips/boot/dts/qca/ar9132.dtsi
> > @@ -61,7 +61,7 @@
> > #qca,ddr-wb-channel-cells = <1>;
> > };
> >
> > - uart@18020000 {
> > + uart: uart@18020000 {
> > compatible = "ns8250";
> > reg = <0x18020000 0x20>;
> > interrupts = <3>;
> > @@ -134,7 +134,7 @@
> > };
> > };
> >
> > - spi@1f000000 {
> > + spi: spi@1f000000 {
> > compatible = "qca,ar9132-spi", "qca,ar7100-spi";
> > reg = <0x1f000000 0x10>;
> >
> > diff --git a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
> > index 9618105..f22c22c 100644
> > --- a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
> > +++ b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
> > @@ -14,43 +14,6 @@
> > reg = <0x0 0x2000000>;
> > };
> >
> > - ahb {
> > - apb {
> > - uart@18020000 {
> > - status = "okay";
> > - };
> > - };
> > -
> > - spi@1f000000 {
> > - status = "okay";
> > - num-cs = <1>;
> > -
> > - flash@0 {
> > - #address-cells = <1>;
> > - #size-cells = <1>;
> > - compatible = "s25sl064a";
> > - reg = <0>;
> > - spi-max-frequency = <25000000>;
> > -
> > - partition@0 {
> > - label = "u-boot";
> > - reg = <0x000000 0x020000>;
> > - };
> > -
> > - partition@1 {
> > - label = "firmware";
> > - reg = <0x020000 0x7D0000>;
> > - };
> > -
> > - partition@2 {
> > - label = "art";
> > - reg = <0x7F0000 0x010000>;
> > - read-only;
> > - };
> > - };
> > - };
> > - };
> > -
> > gpio-keys {
> > compatible = "gpio-keys-polled";
> > #address-cells = <1>;
> > @@ -100,3 +63,36 @@
> > &extosc {
> > clock-frequency = <40000000>;
> > };
> > +
> > +&uart {
> > + status = "okay";
> > +};
> > +
> > +&spi {
> > + status = "okay";
> > + num-cs = <1>;
> > +
> > + flash@0 {
> > + #address-cells = <1>;
> > + #size-cells = <1>;
> > + compatible = "s25sl064a";
> > + reg = <0>;
> > + spi-max-frequency = <25000000>;
> > +
> > + partition@0 {
> > + label = "u-boot";
> > + reg = <0x000000 0x020000>;
> > + };
> > +
> > + partition@1 {
> > + label = "firmware";
> > + reg = <0x020000 0x7D0000>;
> > + };
> > +
> > + partition@2 {
> > + label = "art";
> > + reg = <0x7F0000 0x010000>;
> > + read-only;
> > + };
> > + };
> > +};
>
--
--
Best regards,
Antony Pavlov
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [RFC v3 06/14] MIPS: dts: qca: ar9132: use short references for uart and spi nodes
@ 2016-02-01 18:41 ` Antony Pavlov
0 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-02-01 18:41 UTC (permalink / raw)
To: Alban
Cc: linux-mips, devicetree, Sascha Hauer, Marek Vasut, Wills Wang,
Daniel Schwierzeck
On Mon, 25 Jan 2016 23:31:48 +0100
Alban <albeu@free.fr> wrote:
> On Sat, 23 Jan 2016 23:17:23 +0300
> Antony Pavlov <antonynpavlov@gmail.com> wrote:
>
> I personally prefer the version without aliases :) Is there any
> guidelines on this?
Here are some Sascha Hauer's arguments for using aliases in the dts files:
- Using aliases reduces the number of indentations in dts files;
- dts files become independent of the layout of the dtsi files (it
becomes possible to introduce another bus {} hierarchy between a
toplevel bus and the devices when you have to);
- less chances for typos. if &i2c2 does not exist you get an error. If
instead you duplicate the whole path in the dts file a typo in the
path will just create another node.
And here is a Marek Vasut's additional argument:
- Aliases allow you to introduce some sort of ordering. For example if you have
gmac0 and gmac1 and you want to have them ordered correctly, you use aliases.
(in case we're talking about the /aliases node).
> > Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> > Cc: Alban Bedel <albeu@free.fr>
> > Cc: linux-mips@linux-mips.org
> > Cc: devicetree@vger.kernel.org
> > ---
> > arch/mips/boot/dts/qca/ar9132.dtsi | 4 +-
> > arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 70 +++++++++++-------------
> > 2 files changed, 35 insertions(+), 39 deletions(-)
> >
> > diff --git a/arch/mips/boot/dts/qca/ar9132.dtsi b/arch/mips/boot/dts/qca/ar9132.dtsi
> > index cd1602f..a14f6f2 100644
> > --- a/arch/mips/boot/dts/qca/ar9132.dtsi
> > +++ b/arch/mips/boot/dts/qca/ar9132.dtsi
> > @@ -61,7 +61,7 @@
> > #qca,ddr-wb-channel-cells = <1>;
> > };
> >
> > - uart@18020000 {
> > + uart: uart@18020000 {
> > compatible = "ns8250";
> > reg = <0x18020000 0x20>;
> > interrupts = <3>;
> > @@ -134,7 +134,7 @@
> > };
> > };
> >
> > - spi@1f000000 {
> > + spi: spi@1f000000 {
> > compatible = "qca,ar9132-spi", "qca,ar7100-spi";
> > reg = <0x1f000000 0x10>;
> >
> > diff --git a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
> > index 9618105..f22c22c 100644
> > --- a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
> > +++ b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
> > @@ -14,43 +14,6 @@
> > reg = <0x0 0x2000000>;
> > };
> >
> > - ahb {
> > - apb {
> > - uart@18020000 {
> > - status = "okay";
> > - };
> > - };
> > -
> > - spi@1f000000 {
> > - status = "okay";
> > - num-cs = <1>;
> > -
> > - flash@0 {
> > - #address-cells = <1>;
> > - #size-cells = <1>;
> > - compatible = "s25sl064a";
> > - reg = <0>;
> > - spi-max-frequency = <25000000>;
> > -
> > - partition@0 {
> > - label = "u-boot";
> > - reg = <0x000000 0x020000>;
> > - };
> > -
> > - partition@1 {
> > - label = "firmware";
> > - reg = <0x020000 0x7D0000>;
> > - };
> > -
> > - partition@2 {
> > - label = "art";
> > - reg = <0x7F0000 0x010000>;
> > - read-only;
> > - };
> > - };
> > - };
> > - };
> > -
> > gpio-keys {
> > compatible = "gpio-keys-polled";
> > #address-cells = <1>;
> > @@ -100,3 +63,36 @@
> > &extosc {
> > clock-frequency = <40000000>;
> > };
> > +
> > +&uart {
> > + status = "okay";
> > +};
> > +
> > +&spi {
> > + status = "okay";
> > + num-cs = <1>;
> > +
> > + flash@0 {
> > + #address-cells = <1>;
> > + #size-cells = <1>;
> > + compatible = "s25sl064a";
> > + reg = <0>;
> > + spi-max-frequency = <25000000>;
> > +
> > + partition@0 {
> > + label = "u-boot";
> > + reg = <0x000000 0x020000>;
> > + };
> > +
> > + partition@1 {
> > + label = "firmware";
> > + reg = <0x020000 0x7D0000>;
> > + };
> > +
> > + partition@2 {
> > + label = "art";
> > + reg = <0x7F0000 0x010000>;
> > + read-only;
> > + };
> > + };
> > +};
>
--
--
Best regards,
Antony Pavlov
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [RFC v3 02/14] MIPS: ath79: use clk-ath79.c driver for AR913X/AR933X
2016-01-25 22:24 ` Alban
@ 2016-02-01 23:34 ` Ralf Baechle
0 siblings, 0 replies; 52+ messages in thread
From: Ralf Baechle @ 2016-02-01 23:34 UTC (permalink / raw)
To: Alban; +Cc: Antony Pavlov, linux-mips, Gabor Juhos
On Mon, Jan 25, 2016 at 11:24:28PM +0100, Alban wrote:
> > + if (IS_ENABLED(CONFIG_OF) && mips_machtype == ATH79_MACH_GENERIC_OF) {
> > + return;
> > + }
> > +
>
> I think it would make more sense to move the whole implementation to
> drivers/clk, otherwise we'll need to maintain two implementations.
As a general rule, if there's a driver subsystem for something, I want
code to go there, not arch/mips.
Ralf
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [RFC v3 08/14] MIPS: dts: qca: introduce AR9331 devicetree
2016-01-25 22:46 ` Alban
@ 2016-03-14 18:53 ` Antony Pavlov
-1 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-03-14 18:53 UTC (permalink / raw)
To: Alban
Cc: linux-mips-6z/3iImG2C8G8FEW9MqTrA, Gabor Juhos,
devicetree-u79uwXL29TY76Z2rM5mHXA
On Mon, 25 Jan 2016 23:46:30 +0100
Alban <albeu-GANU6spQydw@public.gmane.org> wrote:
> On Sat, 23 Jan 2016 23:17:25 +0300
> Antony Pavlov <antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
>
> > This patch introduces devicetree for Atheros AR9331 SoC (AKA Hornet).
> > The AR9331 chip is a Wi-Fi System-On-Chip (WiSOC),
> > typically used in very cheap Access Points and Routers.
> >
> > Signed-off-by: Antony Pavlov <antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> > Cc: Gabor Juhos <juhosg-p3rKhJxN3npAfugRpC6u6w@public.gmane.org>
> > Cc: Alban Bedel <albeu-GANU6spQydw@public.gmane.org>
> > Cc: linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org
> > Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> > ---
> > arch/mips/boot/dts/qca/ar9331.dtsi | 123 +++++++++++++++++++++++++++++++++++++
> > 1 file changed, 123 insertions(+)
> >
> > diff --git a/arch/mips/boot/dts/qca/ar9331.dtsi b/arch/mips/boot/dts/qca/ar9331.dtsi
> > new file mode 100644
> > index 0000000..bf128a2
> > --- /dev/null
> > +++ b/arch/mips/boot/dts/qca/ar9331.dtsi
> > @@ -0,0 +1,123 @@
> > +#include <dt-bindings/clock/ath79-clk.h>
> > +
> > +/ {
> > + compatible = "qca,ar9331";
> > +
>
> [...]
>
> > +
> > + extosc: oscillator {
> > + compatible = "fixed-clock";
> > + #clock-cells = <0>;
> > + };
>
> This oscillator is on the board and not in the SoC, so it should
> be in the board DTS.
However oscillator is inside SoC!
Please see https://en.wikipedia.org/wiki/Electronic_oscillator
An electronic oscillator is an electronic circuit that produces a periodic,
oscillating electronic signal, often a sine wave or a square wave.
Please see AR9331 data sheet: the SoC has no input for external oscillator,
only two pins (XTALO and XTALI) for connecting 25 MHz or 40 MHz quartz crystal.
The crystal can't produce a square wave itself! The crystal is only a part
of a complete oscillator.
So we have a good reason to put basic oscillator node into the SoC dtsi-file.
--
Best regards,
Antony Pavlov
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [RFC v3 08/14] MIPS: dts: qca: introduce AR9331 devicetree
@ 2016-03-14 18:53 ` Antony Pavlov
0 siblings, 0 replies; 52+ messages in thread
From: Antony Pavlov @ 2016-03-14 18:53 UTC (permalink / raw)
To: Alban; +Cc: linux-mips, Gabor Juhos, devicetree
On Mon, 25 Jan 2016 23:46:30 +0100
Alban <albeu@free.fr> wrote:
> On Sat, 23 Jan 2016 23:17:25 +0300
> Antony Pavlov <antonynpavlov@gmail.com> wrote:
>
> > This patch introduces devicetree for Atheros AR9331 SoC (AKA Hornet).
> > The AR9331 chip is a Wi-Fi System-On-Chip (WiSOC),
> > typically used in very cheap Access Points and Routers.
> >
> > Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> > Cc: Gabor Juhos <juhosg@openwrt.org>
> > Cc: Alban Bedel <albeu@free.fr>
> > Cc: linux-mips@linux-mips.org
> > Cc: devicetree@vger.kernel.org
> > ---
> > arch/mips/boot/dts/qca/ar9331.dtsi | 123 +++++++++++++++++++++++++++++++++++++
> > 1 file changed, 123 insertions(+)
> >
> > diff --git a/arch/mips/boot/dts/qca/ar9331.dtsi b/arch/mips/boot/dts/qca/ar9331.dtsi
> > new file mode 100644
> > index 0000000..bf128a2
> > --- /dev/null
> > +++ b/arch/mips/boot/dts/qca/ar9331.dtsi
> > @@ -0,0 +1,123 @@
> > +#include <dt-bindings/clock/ath79-clk.h>
> > +
> > +/ {
> > + compatible = "qca,ar9331";
> > +
>
> [...]
>
> > +
> > + extosc: oscillator {
> > + compatible = "fixed-clock";
> > + #clock-cells = <0>;
> > + };
>
> This oscillator is on the board and not in the SoC, so it should
> be in the board DTS.
However oscillator is inside SoC!
Please see https://en.wikipedia.org/wiki/Electronic_oscillator
An electronic oscillator is an electronic circuit that produces a periodic,
oscillating electronic signal, often a sine wave or a square wave.
Please see AR9331 data sheet: the SoC has no input for external oscillator,
only two pins (XTALO and XTALI) for connecting 25 MHz or 40 MHz quartz crystal.
The crystal can't produce a square wave itself! The crystal is only a part
of a complete oscillator.
So we have a good reason to put basic oscillator node into the SoC dtsi-file.
--
Best regards,
Antony Pavlov
^ permalink raw reply [flat|nested] 52+ messages in thread
end of thread, other threads:[~2016-03-14 18:53 UTC | newest]
Thread overview: 52+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-23 20:17 [RFC v3 00/14] MIPS: AR913X/AR933X devicetree patchseries Antony Pavlov
2016-01-23 20:17 ` [RFC v3 01/14] WIP: clk: add Atheros AR724X/AR913X/AR933X SoCs clock driver Antony Pavlov
2016-01-25 22:21 ` Alban
2016-01-31 20:41 ` Antony Pavlov
2016-01-31 20:41 ` Antony Pavlov
[not found] ` <20160131234155.eee918745880878963c044aa-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-02-01 11:03 ` Alban
2016-02-01 11:03 ` Alban
2016-01-30 0:27 ` Stephen Boyd
2016-02-01 0:23 ` Antony Pavlov
2016-02-01 0:23 ` Antony Pavlov
2016-01-23 20:17 ` [RFC v3 02/14] MIPS: ath79: use clk-ath79.c driver for AR913X/AR933X Antony Pavlov
2016-01-25 22:24 ` Alban
2016-02-01 23:34 ` Ralf Baechle
2016-01-23 20:17 ` [RFC v3 04/14] MIPS: dts: qca: ar9132: make extosc-related description shorter Antony Pavlov
2016-01-23 20:17 ` [RFC v3 07/14] MIPS: dts: qca: simplify Makefile Antony Pavlov
2016-01-25 22:41 ` Alban
2016-01-31 21:15 ` Antony Pavlov
[not found] ` <1453580251-2341-1-git-send-email-antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-01-23 20:17 ` [RFC v3 03/14] MIPS: dts: qca: ar9132: use dt-bindings/clock/ath79-clk.h macros Antony Pavlov
2016-01-23 20:17 ` Antony Pavlov
2016-01-23 20:17 ` [RFC v3 05/14] MIPS: dts: qca: ar9132_tl_wr1043nd_v1.dts: drop unused alias node Antony Pavlov
2016-01-23 20:17 ` Antony Pavlov
[not found] ` <1453580251-2341-6-git-send-email-antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-01-25 22:25 ` Alban
2016-01-25 22:25 ` Alban
2016-01-23 20:17 ` [RFC v3 06/14] MIPS: dts: qca: ar9132: use short references for uart and spi nodes Antony Pavlov
2016-01-23 20:17 ` Antony Pavlov
2016-01-25 22:31 ` Alban
2016-02-01 18:41 ` Antony Pavlov
2016-02-01 18:41 ` Antony Pavlov
2016-01-23 20:17 ` [RFC v3 08/14] MIPS: dts: qca: introduce AR9331 devicetree Antony Pavlov
2016-01-23 20:17 ` Antony Pavlov
[not found] ` <1453580251-2341-9-git-send-email-antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-01-25 22:46 ` Alban
2016-01-25 22:46 ` Alban
2016-01-31 20:59 ` Antony Pavlov
2016-03-14 18:53 ` Antony Pavlov
2016-03-14 18:53 ` Antony Pavlov
2016-01-23 20:17 ` [RFC v3 09/14] MIPS: ath79: add initial support for TP-LINK MR3020 Antony Pavlov
2016-01-23 20:17 ` Antony Pavlov
2016-01-23 20:17 ` [RFC v3 10/14] devicetree: add Dragino vendor id Antony Pavlov
2016-01-23 20:17 ` Antony Pavlov
[not found] ` <1453580251-2341-11-git-send-email-antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-01-26 21:16 ` Rob Herring
2016-01-26 21:16 ` Rob Herring
2016-01-23 20:17 ` [RFC v3 11/14] MIPS: ath79: add initial support for Dragino MS14 (Dragino 2) Antony Pavlov
2016-01-23 20:17 ` Antony Pavlov
2016-01-23 20:17 ` [RFC v3 12/14] devicetree: add Onion Corporation vendor id Antony Pavlov
2016-01-23 20:17 ` Antony Pavlov
[not found] ` <1453580251-2341-13-git-send-email-antonynpavlov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-01-26 21:15 ` Rob Herring
2016-01-26 21:15 ` Rob Herring
2016-01-27 8:42 ` Antony Pavlov
2016-01-27 8:42 ` Antony Pavlov
2016-01-23 20:17 ` [RFC v3 13/14] MIPS: ath79: add initial support for Onion Omega Antony Pavlov
2016-01-23 20:17 ` Antony Pavlov
2016-01-23 20:17 ` [RFC v3 14/14] WIP: MIPS: ath79: add devicetree defconfigs Antony Pavlov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.