* [PATCH] mmc: mxs-mmc: Fix merge issue causing build error
From: Marek Vasut @ 2012-10-01 20:52 UTC (permalink / raw)
To: linux-arm-kernel
The following error appeared due to trivial merge problem:
drivers/mmc/host/mxs-mmc.c: In function 'mxs_mmc_enable_sdio_irq':
drivers/mmc/host/mxs-mmc.c:527:3: error: 'struct mxs_mmc_host' has no member named 'base'
drivers/mmc/host/mxs-mmc.c:527:3: error: 'struct mxs_mmc_host' has no member named 'devid'
make[3]: *** [drivers/mmc/host/mxs-mmc.o] Error 1
This patches corrects the issue.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
---
drivers/mmc/host/mxs-mmc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index bb4c2bf..80d1e6d 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -525,7 +525,7 @@ static void mxs_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable)
writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK,
ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_SET);
writel(BM_SSP_CTRL1_SDIO_IRQ_EN,
- host->base + HW_SSP_CTRL1(host) + STMP_OFFSET_REG_SET);
+ ssp->base + HW_SSP_CTRL1(ssp) + STMP_OFFSET_REG_SET);
} else {
writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK,
ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_CLR);
--
1.7.10.4
^ permalink raw reply related
* [PATCH V2 0/3] Add clock framework for armada 370/XP
From: Gregory CLEMENT @ 2012-10-01 21:12 UTC (permalink / raw)
To: linux-arm-kernel
Hello Mike,
My first version didn't get many attention, so I guess it's too late
for 3.7! ;) I should have ping you earlier about this series. This
time was not lost, by using the cpu clock with SMP I found a bug and
fixed it. And I also improved the spelling and removed unnecessary
small piece of code thanks to the feed back of Andrew Lunn.
The purpose of this patch set is to add support for clock framework
for Armada 370 and Armada XP SoCs. All the support is done under the
directory drivers/clk/mvebu/ as the support for other mvebu SoCs was
in mind during the writing of the code.
Two kinds of clocks are added:
- The CPU clocks are only for Armada XP (which si multi-core)
- The core clocks are clocks which have their rate fixed during
reset.
This patch set is based on the clk-3.7 branch of Mike Turquette as it
use the patch "clk: add of_clk_src_onecell_get() support" from Shawn
Guo.
Many thanks to Thomas Petazzoni and Sebastian Hesselbarth for their
review and feedback. The device tree bindings were really improved
with the advices of Sebastian.
Changelog:
V1 -> V2:
- Improved the spelling and the wording of the documentation and the
1st commit log
- Removed the "end_of_list" name which are unused here.
- Fix the cpu clock by using of_clk_src_onecell_get in the same way it
was used for the core clocks
Regards,
Gregory CLEMENT (3):
clk: mvebu: add armada-370-xp specific clocks
clk: armada-370-xp: add support for clock framework
clocksource: time-armada-370-xp converted to clk framework
.../devicetree/bindings/clock/mvebu-core-clock.txt | 40 +++
.../devicetree/bindings/clock/mvebu-cpu-clock.txt | 21 ++
arch/arm/boot/dts/armada-370-db.dts | 4 -
arch/arm/boot/dts/armada-370-xp.dtsi | 1 +
arch/arm/boot/dts/armada-370.dtsi | 12 +
arch/arm/boot/dts/armada-xp.dtsi | 48 +++
arch/arm/mach-mvebu/Kconfig | 5 +
arch/arm/mach-mvebu/armada-370-xp.c | 8 +-
arch/arm/mach-mvebu/common.h | 1 +
drivers/clk/Makefile | 1 +
drivers/clk/mvebu/Makefile | 2 +
drivers/clk/mvebu/clk-core.c | 312 ++++++++++++++++++++
drivers/clk/mvebu/clk-core.h | 19 ++
drivers/clk/mvebu/clk-cpu.c | 155 ++++++++++
drivers/clk/mvebu/clk-cpu.h | 19 ++
drivers/clk/mvebu/clk.c | 36 +++
drivers/clocksource/time-armada-370-xp.c | 11 +-
17 files changed, 685 insertions(+), 10 deletions(-)
create mode 100644 Documentation/devicetree/bindings/clock/mvebu-core-clock.txt
create mode 100644 Documentation/devicetree/bindings/clock/mvebu-cpu-clock.txt
create mode 100644 drivers/clk/mvebu/Makefile
create mode 100644 drivers/clk/mvebu/clk-core.c
create mode 100644 drivers/clk/mvebu/clk-core.h
create mode 100644 drivers/clk/mvebu/clk-cpu.c
create mode 100644 drivers/clk/mvebu/clk-cpu.h
create mode 100644 drivers/clk/mvebu/clk.c
--
1.7.9.5
^ permalink raw reply
* [PATCH V2 1/3] clk: mvebu: add armada-370-xp specific clocks
From: Gregory CLEMENT @ 2012-10-01 21:12 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1349125926-16144-1-git-send-email-gregory.clement@free-electrons.com>
Add Armada 370/XP specific clocks: core clocks and CPU clocks.
The CPU clocks are only for Armada XP for the SMP mode.
The core clocks are clocks which have their rate set during reset. The
code was written with the other SoCs of the mvebu family in
mind. Adding them should be pretty straight forward. For a new
SoC, only 3 binding have to be added:
- one to provide the tclk frequency
- one to provde the pclk frequency
- and one to provide the ratio between the pclk and the children
clocks
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
.../devicetree/bindings/clock/mvebu-core-clock.txt | 40 +++
.../devicetree/bindings/clock/mvebu-cpu-clock.txt | 21 ++
drivers/clk/Makefile | 1 +
drivers/clk/mvebu/Makefile | 2 +
drivers/clk/mvebu/clk-core.c | 312 ++++++++++++++++++++
drivers/clk/mvebu/clk-core.h | 19 ++
drivers/clk/mvebu/clk-cpu.c | 155 ++++++++++
drivers/clk/mvebu/clk-cpu.h | 19 ++
drivers/clk/mvebu/clk.c | 36 +++
9 files changed, 605 insertions(+)
create mode 100644 Documentation/devicetree/bindings/clock/mvebu-core-clock.txt
create mode 100644 Documentation/devicetree/bindings/clock/mvebu-cpu-clock.txt
create mode 100644 drivers/clk/mvebu/Makefile
create mode 100644 drivers/clk/mvebu/clk-core.c
create mode 100644 drivers/clk/mvebu/clk-core.h
create mode 100644 drivers/clk/mvebu/clk-cpu.c
create mode 100644 drivers/clk/mvebu/clk-cpu.h
create mode 100644 drivers/clk/mvebu/clk.c
diff --git a/Documentation/devicetree/bindings/clock/mvebu-core-clock.txt b/Documentation/devicetree/bindings/clock/mvebu-core-clock.txt
new file mode 100644
index 0000000..d2e0965
--- /dev/null
+++ b/Documentation/devicetree/bindings/clock/mvebu-core-clock.txt
@@ -0,0 +1,40 @@
+Device Tree Clock bindings for core clock of Marvell EBU platforms
+
+This is the binding for the "core" clock of the mvebu SoCs, the rate
+of this clocks are fixed during reset. Their value or ratio are taken
+from the Sample at Reset(SAR) register.
+
+Required properties:
+- compatible : shall be one of the following:
+ "marvell,armada-370-core-clockctrl" - core clock for Armada 370
+ "marvell,armada-xp-core-clockctrl" - core clock for Armada XP
+- reg : Address and length of the SAR register set
+- #clock-cells : should be set to 1.
+- clock-output-names: A list of clock output names that mvebu core
+ clocks provides. The full list of all valid clock names, IDs and
+ description are below.
+ Name ID Description
+ tclk 0 Peripheral clock
+ pclk 1 CPU clock
+ nbclk 2 L2 clock
+ hclk 3 DRAM control clock
+ dramclk 4 DDR clock
+
+coreclk: mvebu-sar at d0018230 {
+ #clock-cells = <1>;
+ reg = <0xd0018230 0x08>;
+ compatible = "marvell,armada-370-core-clockctrl";
+ clock-output-names =
+ "tclk", /* 0 */
+ "pclk", /* 1 */
+ "nbclk", /* 2 */
+ "hclk", /* 3 */
+ "dramclk", /* 4 */
+};
+
+timer at d0020300 {
+ compatible = "marvell,armada-370-xp-timer";
+ reg = <0xd0020300 0x30>;
+ interrupts = <37>, <38>, <39>, <40>;
+ clocks = <&coreclk 0>;
+};
diff --git a/Documentation/devicetree/bindings/clock/mvebu-cpu-clock.txt b/Documentation/devicetree/bindings/clock/mvebu-cpu-clock.txt
new file mode 100644
index 0000000..c524618
--- /dev/null
+++ b/Documentation/devicetree/bindings/clock/mvebu-cpu-clock.txt
@@ -0,0 +1,21 @@
+Device Tree Clock bindings for cpu clock of Marvell EBU platforms
+
+Required properties:
+- compatible : shall be one of the following:
+ "marvell,armada-xp-cpu-clockctrl" - cpu clocks for Armada XP
+- reg : Address and length of the clock complex register set
+- #clock-cells : should be set to 1.
+- clocks : shall be the input parent clock phandle for the clock.
+
+cpuclk: clock-complex at d0018700 {
+ #clock-cells = <1>;
+ compatible = "marvell,armada-xp-cpu-clockctrl";
+ reg = <0xd0018700 0xA0>;
+ clocks = <&coreclk 1>;
+}
+
+cpu at 0 {
+ compatible = "marvell,sheeva-v7";
+ reg = <0>;
+ clocks = <&cpuclk 0>;
+};
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index 6327536..435e4c0 100644
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -11,6 +11,7 @@ obj-$(CONFIG_PLAT_SPEAR) += spear/
obj-$(CONFIG_ARCH_U300) += clk-u300.o
obj-$(CONFIG_COMMON_CLK_VERSATILE) += versatile/
obj-$(CONFIG_ARCH_PRIMA2) += clk-prima2.o
+obj-$(CONFIG_ARCH_MVEBU) += mvebu/
ifeq ($(CONFIG_COMMON_CLK), y)
obj-$(CONFIG_ARCH_MMP) += mmp/
endif
diff --git a/drivers/clk/mvebu/Makefile b/drivers/clk/mvebu/Makefile
new file mode 100644
index 0000000..de94a87
--- /dev/null
+++ b/drivers/clk/mvebu/Makefile
@@ -0,0 +1,2 @@
+obj-y += clk.o clk-core.o
+obj-$(CONFIG_MVEBU_CLK_CPU) += clk-cpu.o
diff --git a/drivers/clk/mvebu/clk-core.c b/drivers/clk/mvebu/clk-core.c
new file mode 100644
index 0000000..5792cb5
--- /dev/null
+++ b/drivers/clk/mvebu/clk-core.c
@@ -0,0 +1,312 @@
+/*
+ * Marvell EBU clock core handling defined at reset
+ *
+ * Copyright (C) 2012 Marvell
+ *
+ * Gregory CLEMENT <gregory.clement@free-electrons.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+#include <linux/kernel.h>
+#include <linux/clk.h>
+#include <linux/clkdev.h>
+#include <linux/clk-provider.h>
+#include <linux/of_address.h>
+#include <linux/io.h>
+#include <linux/of.h>
+
+/* Sample At Reset is a 64 bit bitfiled split in two register of 32
+ * bits*/
+
+#define SARL 0 /* Low part [0:31] */
+#define SARL_AXP_PCLK_FREQ_OPT 21
+#define SARL_AXP_PCLK_FREQ_OPT_MASK 0x7
+#define SARL_A370_PCLK_FREQ_OPT 11
+#define SARL_A370_PCLK_FREQ_OPT_MASK 0xF
+#define SARL_AXP_FAB_FREQ_OPT 24
+#define SARL_AXP_FAB_FREQ_OPT_MASK 0xF
+#define SARL_A370_FAB_FREQ_OPT 15
+#define SARL_A370_FAB_FREQ_OPT_MASK 0x1F
+#define SARL_A370_TCLK_FREQ_OPT 20
+#define SARL_A370_TCLK_FREQ_OPT_MASK 0x1
+#define SARH 4 /* High part [32:63] */
+#define SARH_AXP_PCLK_FREQ_OPT (52-32)
+#define SARH_AXP_PCLK_FREQ_OPT_MASK 0x1
+#define SARH_AXP_PCLK_FREQ_OPT_SHIFT 3
+#define SARH_AXP_FAB_FREQ_OPT (51-32)
+#define SARH_AXP_FAB_FREQ_OPT_MASK 0x1
+#define SARH_AXP_FAB_FREQ_OPT_SHIFT 4
+
+u32 *sar_reg;
+int sar_reg_size;
+
+enum core_clk {
+ tclk, pclk, nbclk, hclk, dramclk, clk_max
+};
+
+struct core_clk_fn {
+ u32(*get_tclk_freq) (void);
+ u32(*get_pck_freq) (void);
+ const int *(*get_fab_freq_opt) (void);
+};
+
+/* Ratio between VCO and each of the member in the following order:
+ CPU clock, L2 clock, DRAM controler clock, DDR clcok */
+static const int reset_core_ratio[32][4] = {
+ [0x01] = {1, 2, 2, 2},
+ [0x02] = {2, 2, 6, 3},
+ [0x03] = {2, 2, 3, 3},
+ [0x04] = {1, 2, 3, 3},
+ [0x05] = {1, 2, 4, 2},
+ [0x06] = {1, 1, 2, 2},
+ [0x07] = {2, 3, 6, 6},
+ [0x09] = {1, 2, 6, 3},
+ [0x0A] = {2, 4, 10, 5},
+ [0x0C] = {1, 2, 4, 4},
+ [0x0F] = {2, 2, 5, 5},
+ [0x13] = {1, 1, 2, 1},
+ [0x14] = {2, 3, 6, 3},
+ [0x1B] = {1, 1, 1, 1},
+};
+
+static struct clk *clks[clk_max];
+
+static struct clk_onecell_data clk_data;
+
+/* Frequency in MHz*/
+static u32 armada_370_pclk[] = { 400, 533, 667, 800, 1000, 1067, 1200 };
+
+static u32 armada_xp_pclk[] = { 1000, 1066, 1200, 1333, 1500, 1666,
+ 1800, 2000, 667, 0, 800, 1600
+};
+
+static u32 armada_370_tclk[] = { 166, 200 };
+
+static const int *__init armada_370_get_fab_freq_opt(void)
+{
+ u8 fab_freq_opt = 0;
+
+ fab_freq_opt = ((sar_reg[0] >> SARL_A370_FAB_FREQ_OPT) &
+ SARL_A370_FAB_FREQ_OPT_MASK);
+
+ if (reset_core_ratio[fab_freq_opt][0] == 0)
+ return NULL;
+ else
+ return reset_core_ratio[fab_freq_opt];
+}
+
+static u32 __init armada_370_get_pck_freq(void)
+{
+ u32 cpu_freq;
+ u8 cpu_freq_select = 0;
+
+ cpu_freq_select = ((sar_reg[0] >> SARL_A370_PCLK_FREQ_OPT) &
+ SARL_A370_PCLK_FREQ_OPT_MASK);
+ if (cpu_freq_select > ARRAY_SIZE(armada_370_pclk)) {
+ pr_err("CPU freq select unsuported %d\n", cpu_freq_select);
+ cpu_freq = 0;
+ } else
+ cpu_freq = armada_370_pclk[cpu_freq_select];
+
+ return cpu_freq * 1000 * 1000;
+}
+
+static u32 __init armada_370_get_tclk_freq(void)
+{
+ u32 tclk_freq;
+ u8 tclk_freq_select = 0;
+
+ tclk_freq_select = ((sar_reg[0] >> SARL_A370_TCLK_FREQ_OPT) &
+ SARL_A370_TCLK_FREQ_OPT_MASK);
+ if (tclk_freq_select > ARRAY_SIZE(armada_370_tclk)) {
+ pr_err("TCLK freq select unsuported %d\n", tclk_freq_select);
+ tclk_freq = 0;
+ } else
+ tclk_freq = armada_370_tclk[tclk_freq_select];
+
+ return tclk_freq * 1000 * 1000;
+}
+
+static const int *__init armada_xp_get_fab_freq_opt(void)
+{
+ u8 fab_freq_opt = 0;
+
+ fab_freq_opt = ((sar_reg[0] >> SARL_AXP_FAB_FREQ_OPT) &
+ SARL_AXP_FAB_FREQ_OPT_MASK);
+ /* The upper bit is not contiguous to the other ones
+ * and located in the high part of the SAR
+ * registers */
+ fab_freq_opt |= (((sar_reg[1] >> SARH_AXP_FAB_FREQ_OPT) &
+ SARH_AXP_FAB_FREQ_OPT_MASK)
+ << SARH_AXP_FAB_FREQ_OPT_SHIFT);
+
+ if (reset_core_ratio[fab_freq_opt][0] == 0)
+ return NULL;
+ else
+ return reset_core_ratio[fab_freq_opt];
+}
+
+static u32 __init armada_xp_get_pck_freq(void)
+{
+ u32 cpu_freq;
+ u8 cpu_freq_select = 0;
+
+ cpu_freq_select = ((sar_reg[0] >> SARL_AXP_PCLK_FREQ_OPT) &
+ SARL_AXP_PCLK_FREQ_OPT_MASK);
+ /* The upper bit is not contiguous to the other ones
+ * and located in the high part of the SAR
+ * registers */
+ cpu_freq_select |= (((sar_reg[1] >> SARH_AXP_PCLK_FREQ_OPT) &
+ SARH_AXP_PCLK_FREQ_OPT_MASK)
+ << SARH_AXP_PCLK_FREQ_OPT_SHIFT);
+ if (cpu_freq_select > ARRAY_SIZE(armada_xp_pclk)) {
+ pr_err("CPU freq select unsuported: %d\n", cpu_freq_select);
+ cpu_freq = 0;
+ } else
+ cpu_freq = armada_xp_pclk[cpu_freq_select];
+
+ return cpu_freq * 1000 * 1000;
+}
+
+/* For Armada XP TCLK frequency is fix: 250MHz */
+static u32 __init armada_xp_get_tclk_freq(void)
+{
+ return 250 * 1000 * 1000;
+}
+
+void __init of_core_clk_setup(struct device_node *node,
+ struct core_clk_fn clk_fn)
+{
+ struct clk *clk;
+ unsigned long rate;
+ const char *clk_name;
+ int i;
+
+ /* clock 0 is tclk */
+ of_property_read_string_index(node, "clock-output-names", tclk,
+ &clk_name);
+ rate = clk_fn.get_tclk_freq();
+ if (rate != 0)
+ clk = clk_register_fixed_rate(NULL, clk_name, NULL,
+ CLK_IS_ROOT, rate);
+ else {
+ pr_err("Invalid freq for %s\n", clk_name);
+ return;
+ }
+
+ if (WARN_ON(IS_ERR(clk)))
+ return;
+ clks[tclk] = clk;
+
+ /* clock 1 is pclk */
+ of_property_read_string_index(node, "clock-output-names", pclk,
+ &clk_name);
+ rate = clk_fn.get_pck_freq();
+ if (rate != 0)
+ clk = clk_register_fixed_rate(NULL, clk_name, NULL,
+ CLK_IS_ROOT, rate);
+ else {
+ pr_err("Invalid freq for %s\n", clk_name);
+ return;
+ }
+ if (WARN_ON(IS_ERR(clk)))
+ return;
+ clks[pclk] = clk;
+
+ /* the clocks 2 to 4 are nbclk, hclk and dramclk and are all
+ * derivated from the clock 1: pclk */
+
+ for (i = nbclk; i <= dramclk; i++) {
+ const int *ratio = clk_fn.get_fab_freq_opt();
+ const char *parent_clk_name;
+
+ of_property_read_string_index(node, "clock-output-names",
+ i, &clk_name);
+ of_property_read_string_index(node, "clock-output-names",
+ pclk, &parent_clk_name);
+
+ if (ratio != NULL)
+ clk = clk_register_fixed_factor(NULL, clk_name,
+ parent_clk_name, 0,
+ ratio[0],
+ ratio[i - nbclk + 1]);
+ else {
+ pr_err("Invalid clk ratio for %s\n", clk_name);
+ return;
+ }
+
+ if (WARN_ON(IS_ERR(clk)))
+ return;
+ clks[i] = clk;
+ }
+ clk_data.clk_num = ARRAY_SIZE(clks);
+ clk_data.clks = clks;
+ of_clk_add_provider(node, of_clk_src_onecell_get, &clk_data);
+}
+
+static struct core_clk_fn armada_370_clk_fn = {
+ .get_tclk_freq = armada_370_get_tclk_freq,
+ .get_pck_freq = armada_370_get_pck_freq,
+ .get_fab_freq_opt = armada_370_get_fab_freq_opt,
+};
+
+static struct core_clk_fn armada_xp_clk_fn = {
+ .get_tclk_freq = armada_xp_get_tclk_freq,
+ .get_pck_freq = armada_xp_get_pck_freq,
+ .get_fab_freq_opt = armada_xp_get_fab_freq_opt,
+};
+
+static const __initconst struct of_device_id clk_match[] = {
+ {
+ .compatible = "marvell,armada-370-core-clockctrl",
+ .data = &armada_370_clk_fn,
+ },
+
+ {
+ .compatible = "marvell,armada-xp-core-clockctrl",
+ .data = &armada_xp_clk_fn,
+ },
+ {
+ /* sentinel */
+ }
+};
+
+void __init mvebu_core_clocks_init(void)
+{
+ struct device_node *np;
+ struct resource res;
+ void __iomem *sar_base;
+ int i;
+
+ np = of_find_node_by_name(NULL, "mvebu-sar");
+
+ if (!np)
+ goto err;
+
+ if (of_address_to_resource(np, 0, &res))
+ goto err;
+
+ sar_reg_size = resource_size(&res);
+ sar_reg = kmalloc(sar_reg_size, GFP_KERNEL);
+
+ sar_base = ioremap(res.start, sar_reg_size);
+ if (sar_base == NULL)
+ goto err;
+ for (i = 0; i < sar_reg_size; i += sizeof(*sar_reg))
+ sar_reg[i] = readl(sar_base + i);
+
+ iounmap(sar_base);
+
+ for_each_matching_node(np, clk_match) {
+ const struct of_device_id *match = of_match_node(clk_match, np);
+ struct core_clk_fn *clk_fn = match->data;
+ of_core_clk_setup(np, *clk_fn);
+ }
+
+ return;
+err:
+ pr_err("%s:SAR base adresse not set in DT\n", __func__);
+ return;
+}
diff --git a/drivers/clk/mvebu/clk-core.h b/drivers/clk/mvebu/clk-core.h
new file mode 100644
index 0000000..a04f80b
--- /dev/null
+++ b/drivers/clk/mvebu/clk-core.h
@@ -0,0 +1,19 @@
+/*
+ * * Marvell EBU clock core handling defined at reset
+ *
+ * Copyright (C) 2012 Marvell
+ *
+ * Gregory CLEMENT <gregory.clement@free-electrons.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#ifndef __MVEBU_CLK_CORE_H
+#define __MVEBU_CLK_CORE_H
+
+void __init of_core_clk_setup(struct device_node *node);
+void __init mvebu_core_clocks_init(void);
+
+#endif
diff --git a/drivers/clk/mvebu/clk-cpu.c b/drivers/clk/mvebu/clk-cpu.c
new file mode 100644
index 0000000..6b5c841
--- /dev/null
+++ b/drivers/clk/mvebu/clk-cpu.c
@@ -0,0 +1,155 @@
+/*
+ * Marvell MVEBU CPU clock handling.
+ *
+ * Copyright (C) 2012 Marvell
+ *
+ * Gregory CLEMENT <gregory.clement@free-electrons.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+#include <linux/kernel.h>
+#include <linux/clk.h>
+#include <linux/clkdev.h>
+#include <linux/clk-provider.h>
+#include <linux/of_address.h>
+#include <linux/io.h>
+#include <linux/of.h>
+#include <linux/delay.h>
+
+#define SYS_CTRL_CLK_DIVIDER_CTRL_OFFSET 0x0
+#define SYS_CTRL_CLK_DIVIDER_VALUE_OFFSET 0xC
+#define SYS_CTRL_CLK_DIVIDER_MASK 0x3F
+
+#define MAX_CPU 4
+struct cpu_clk {
+ struct clk_hw hw;
+ int cpu;
+ const char *clk_name;
+ const char *parent_name;
+ void __iomem *reg_base;
+};
+
+static struct clk **clks;
+
+static struct clk_onecell_data clk_data;
+
+#define to_cpu_clk(p) container_of(p, struct cpu_clk, hw)
+
+static unsigned long clk_cpu_recalc_rate(struct clk_hw *hwclk,
+ unsigned long parent_rate)
+{
+ struct cpu_clk *cpuclk = to_cpu_clk(hwclk);
+ u32 reg, div;
+
+ reg = readl(cpuclk->reg_base + SYS_CTRL_CLK_DIVIDER_VALUE_OFFSET);
+ div = (reg >> (cpuclk->cpu * 8)) & SYS_CTRL_CLK_DIVIDER_MASK;
+ return parent_rate / div;
+}
+
+static long clk_cpu_round_rate(struct clk_hw *hwclk, unsigned long rate,
+ unsigned long *parent_rate)
+{
+ /* Valid ratio are 1:1, 1:2 and 1:3 */
+ u32 div;
+
+ div = *parent_rate / rate;
+ if (div == 0)
+ div = 1;
+ else if (div > 3)
+ div = 3;
+
+ return *parent_rate / div;
+}
+
+static int clk_cpu_set_rate(struct clk_hw *hwclk, unsigned long rate,
+ unsigned long parent_rate)
+{
+ struct cpu_clk *cpuclk = to_cpu_clk(hwclk);
+ u32 reg, div;
+ u32 reload_mask;
+
+ div = parent_rate / rate;
+ reg = (readl(cpuclk->reg_base + SYS_CTRL_CLK_DIVIDER_VALUE_OFFSET)
+ & (~(SYS_CTRL_CLK_DIVIDER_MASK << (cpuclk->cpu * 8))))
+ | (div << (cpuclk->cpu * 8));
+ writel(reg, cpuclk->reg_base + SYS_CTRL_CLK_DIVIDER_VALUE_OFFSET);
+ /* Set clock divider reload smooth bit mask */
+ reload_mask = 1 << (20 + cpuclk->cpu);
+
+ reg = readl(cpuclk->reg_base + SYS_CTRL_CLK_DIVIDER_CTRL_OFFSET)
+ | reload_mask;
+ writel(reg, cpuclk->reg_base + SYS_CTRL_CLK_DIVIDER_CTRL_OFFSET);
+
+ /* Now trigger the clock update */
+ reg = readl(cpuclk->reg_base + SYS_CTRL_CLK_DIVIDER_CTRL_OFFSET)
+ | 1 << 24;
+ writel(reg, cpuclk->reg_base + SYS_CTRL_CLK_DIVIDER_CTRL_OFFSET);
+
+ /* Wait for clocks to settle down then clear reload request */
+ udelay(1000);
+ reg &= ~(reload_mask | 1 << 24);
+ writel(reg, cpuclk->reg_base + SYS_CTRL_CLK_DIVIDER_CTRL_OFFSET);
+ udelay(1000);
+
+ return 0;
+}
+
+static const struct clk_ops cpu_ops = {
+ .recalc_rate = clk_cpu_recalc_rate,
+ .round_rate = clk_cpu_round_rate,
+ .set_rate = clk_cpu_set_rate,
+};
+
+void __init of_cpu_clk_setup(struct device_node *node)
+{
+ struct cpu_clk *cpuclk;
+ void __iomem *clock_complex_base = of_iomap(node, 0);
+ int cpu;
+ if (clock_complex_base == NULL) {
+ pr_err("%s: clock-complex base register not set\n",
+ __func__);
+ return;
+ }
+
+ cpuclk = kzalloc(MAX_CPU * sizeof(*cpuclk), GFP_KERNEL);
+ clks = kzalloc(MAX_CPU * sizeof(*clks), GFP_KERNEL);
+
+ if (WARN_ON(!cpuclk))
+ return;
+ for (cpu = 0; cpu < MAX_CPU; cpu++) {
+ struct clk_init_data init;
+ struct clk *clk;
+ struct clk *parent_clk;
+ char *clk_name = kzalloc(5, GFP_KERNEL);
+
+ sprintf(clk_name, "cpu%d", cpu);
+ parent_clk = of_clk_get(node, 0);
+
+ cpuclk[cpu].parent_name = __clk_get_name(parent_clk);
+ cpuclk[cpu].clk_name = clk_name;
+ cpuclk[cpu].cpu = cpu;
+ cpuclk[cpu].reg_base = clock_complex_base;
+ cpuclk[cpu].hw.init = &init;
+
+ init.name = cpuclk[cpu].clk_name;
+ init.ops = &cpu_ops;
+ init.flags = 0;
+ init.parent_names = &cpuclk[cpu].parent_name;
+ init.num_parents = 1;
+
+ clk = clk_register(NULL, &cpuclk[cpu].hw);
+ if (WARN_ON(IS_ERR(clk)))
+ goto bail_out;
+ clks[cpu] = clk;
+ }
+ clk_data.clk_num = MAX_CPU;
+ clk_data.clks = clks;
+ of_clk_add_provider(node, of_clk_src_onecell_get, &clk_data);
+
+ return;
+bail_out:
+ kfree(clks);
+ kfree(cpuclk);
+}
diff --git a/drivers/clk/mvebu/clk-cpu.h b/drivers/clk/mvebu/clk-cpu.h
new file mode 100644
index 0000000..5d28356
--- /dev/null
+++ b/drivers/clk/mvebu/clk-cpu.h
@@ -0,0 +1,19 @@
+/*
+ * Marvell MVEBU CPU clock handling.
+ *
+ * Copyright (C) 2012 Marvell
+ *
+ * Gregory CLEMENT <gregory.clement@free-electrons.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#ifndef __MVEBU_CLK_CPU_H
+#define __MVEBU_CLK_CPU_H
+
+void __init of_cpu_clk_setup(struct device_node *node);
+void __init mvebu_cpu_clocks_init(void);
+
+#endif
diff --git a/drivers/clk/mvebu/clk.c b/drivers/clk/mvebu/clk.c
new file mode 100644
index 0000000..0864df7
--- /dev/null
+++ b/drivers/clk/mvebu/clk.c
@@ -0,0 +1,36 @@
+/*
+ * Marvell EBU SoC clock handling.
+ *
+ * Copyright (C) 2012 Marvell
+ *
+ * Gregory CLEMENT <gregory.clement@free-electrons.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+#include <linux/kernel.h>
+#include <linux/clk.h>
+#include <linux/clk-provider.h>
+#include <linux/of_address.h>
+#include <linux/of.h>
+#include "clk-cpu.h"
+#include "clk-core.h"
+
+static const __initconst struct of_device_id clk_match[] = {
+#ifdef CONFIG_MVEBU_CLK_CPU
+ {
+ .compatible = "marvell,armada-xp-cpu-clockctrl",
+ .data = of_cpu_clk_setup,
+ },
+#endif
+ {
+ /* sentinel */
+ }
+};
+
+void __init mvebu_clocks_init(void)
+{
+ mvebu_core_clocks_init();
+ of_clk_init(clk_match);
+}
--
1.7.9.5
^ permalink raw reply related
* [PATCH V2 2/3] clk: armada-370-xp: add support for clock framework
From: Gregory CLEMENT @ 2012-10-01 21:12 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1349125926-16144-1-git-send-email-gregory.clement@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
arch/arm/boot/dts/armada-370.dtsi | 12 +++++++++
arch/arm/boot/dts/armada-xp.dtsi | 48 +++++++++++++++++++++++++++++++++++
arch/arm/mach-mvebu/Kconfig | 5 ++++
arch/arm/mach-mvebu/armada-370-xp.c | 8 +++++-
arch/arm/mach-mvebu/common.h | 1 +
5 files changed, 73 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index 3228ccc..9bfc904 100644
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -31,5 +31,17 @@
compatible = "marvell,armada-370-xp-system-controller";
reg = <0xd0018200 0x100>;
};
+ coreclk: mvebu-sar at d0018230 {
+ #clock-cells = <1>;
+ reg = <0xd0018230 0x08>;
+ compatible = "marvell,armada-370-core-clockctrl";
+ clock-output-names =
+ "tclk", /* 0 */
+ "pclk", /* 1 */
+ "nbclk", /* 2 */
+ "hclk", /* 3 */
+ "dramclk", /* 4 */
+ };
+
};
};
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index 71d6b5d..e75f3a2 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -27,6 +27,35 @@
<0xd0021870 0x58>;
};
+ cpus {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ cpu at 0 {
+ compatible = "marvell,sheeva-v7";
+ reg = <0>;
+ clocks = <&cpuclk 0>;
+ };
+
+ cpu at 1 {
+ compatible = "marvell,sheeva-v7";
+ reg = <1>;
+ clocks = <&cpuclk 1>;
+ };
+
+ cpu at 2 {
+ compatible = "marvell,sheeva-v7";
+ reg = <2>;
+ clocks = <&cpuclk 2>;
+ };
+
+ cpu at 3 {
+ compatible = "marvell,sheeva-v7";
+ reg = <3>;
+ clocks = <&cpuclk 3>;
+ };
+ };
+
soc {
serial at d0012200 {
compatible = "ns16550";
@@ -47,6 +76,25 @@
marvell,timer-25Mhz;
};
+ coreclk: mvebu-sar at d0018230 {
+ #clock-cells = <1>;
+ reg = <0xd0018230 0x08>;
+ compatible = "marvell,armada-xp-core-clockctrl";
+ clock-output-names =
+ "tclk", /* 0 */
+ "pclk", /* 1 */
+ "nbclk", /* 2 */
+ "hclk", /* 3 */
+ "dramclk", /* 4 */
+ };
+
+ cpuclk: clock-complex at d0018700 {
+ #clock-cells = <1>;
+ compatible = "marvell,armada-xp-cpu-clockctrl";
+ reg = <0xd0018700 0xA0>;
+ clocks = <&coreclk 1>;
+ };
+
system-controller at d0018200 {
compatible = "marvell,armada-370-xp-system-controller";
reg = <0xd0018200 0x500>;
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index caa2c5e..0370af9 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -2,10 +2,15 @@ if ARCH_MVEBU
menu "Marvell SOC with device tree"
+config MVEBU_CLK_CPU
+ bool
+
config MACH_ARMADA_370_XP
bool "Marvell Armada 370 and Aramada XP boards"
select ARMADA_370_XP_TIMER
select CPU_V7
+ select CLKDEV_LOOKUP
+ select MVEBU_CLK_CPU
help
Say 'Y' here if you want your kernel to support boards based on
diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c
index 4ef923b..612e2c2 100644
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@ -37,8 +37,14 @@ void __init armada_370_xp_map_io(void)
iotable_init(armada_370_xp_io_desc, ARRAY_SIZE(armada_370_xp_io_desc));
}
+void __init armada_370_xp_timer_and_clk_init(void)
+{
+ mvebu_clocks_init();
+ armada_370_xp_timer_init();
+}
+
struct sys_timer armada_370_xp_timer = {
- .init = armada_370_xp_timer_init,
+ .init = armada_370_xp_timer_and_clk_init,
};
static void __init armada_370_xp_dt_init(void)
diff --git a/arch/arm/mach-mvebu/common.h b/arch/arm/mach-mvebu/common.h
index 02f89ea..281fab3 100644
--- a/arch/arm/mach-mvebu/common.h
+++ b/arch/arm/mach-mvebu/common.h
@@ -16,6 +16,7 @@
#define __ARCH_MVEBU_COMMON_H
void mvebu_restart(char mode, const char *cmd);
+void mvebu_clocks_init(void);
void armada_370_xp_init_irq(void);
void armada_370_xp_handle_irq(struct pt_regs *regs);
--
1.7.9.5
^ permalink raw reply related
* [PATCH V2 3/3] clocksource: time-armada-370-xp converted to clk framework
From: Gregory CLEMENT @ 2012-10-01 21:12 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1349125926-16144-1-git-send-email-gregory.clement@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
arch/arm/boot/dts/armada-370-db.dts | 4 ----
arch/arm/boot/dts/armada-370-xp.dtsi | 1 +
drivers/clocksource/time-armada-370-xp.c | 11 ++++++-----
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts
index fffd5c2..4a31b03 100644
--- a/arch/arm/boot/dts/armada-370-db.dts
+++ b/arch/arm/boot/dts/armada-370-db.dts
@@ -34,9 +34,5 @@
clock-frequency = <200000000>;
status = "okay";
};
- timer at d0020300 {
- clock-frequency = <600000000>;
- status = "okay";
- };
};
};
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 6b6b932..e62f478 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -62,6 +62,7 @@
compatible = "marvell,armada-370-xp-timer";
reg = <0xd0020300 0x30>;
interrupts = <37>, <38>, <39>, <40>;
+ clocks = <&coreclk 2>;
};
};
};
diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c
index 4674f94..a4605fd 100644
--- a/drivers/clocksource/time-armada-370-xp.c
+++ b/drivers/clocksource/time-armada-370-xp.c
@@ -18,6 +18,7 @@
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/kernel.h>
+#include <linux/clk.h>
#include <linux/timer.h>
#include <linux/clockchips.h>
#include <linux/interrupt.h>
@@ -167,7 +168,6 @@ void __init armada_370_xp_timer_init(void)
u32 u;
struct device_node *np;
unsigned int timer_clk;
- int ret;
np = of_find_compatible_node(NULL, NULL, "marvell,armada-370-xp-timer");
timer_base = of_iomap(np, 0);
WARN_ON(!timer_base);
@@ -179,13 +179,14 @@ void __init armada_370_xp_timer_init(void)
timer_base + TIMER_CTRL_OFF);
timer_clk = 25000000;
} else {
- u32 clk = 0;
- ret = of_property_read_u32(np, "clock-frequency", &clk);
- WARN_ON(!clk || ret < 0);
+ unsigned long rate = 0;
+ struct clk *clk = of_clk_get(np, 0);
+ WARN_ON(IS_ERR(clk));
+ rate = clk_get_rate(clk);
u = readl(timer_base + TIMER_CTRL_OFF);
writel(u & ~(TIMER0_25MHZ | TIMER1_25MHZ),
timer_base + TIMER_CTRL_OFF);
- timer_clk = clk / TIMER_DIVIDER;
+ timer_clk = rate / TIMER_DIVIDER;
}
/* We use timer 0 as clocksource, and timer 1 for
--
1.7.9.5
^ permalink raw reply related
* [PATCH v2 1/5] [media] omap3isp: Fix compilation error in ispreg.h
From: Ido Yariv @ 2012-10-01 22:46 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20120927195526.GP4840@atomide.com>
Commit c49f34bc ("ARM: OMAP2+ Move SoC specific headers to be local to
mach-omap2") moved omap34xx.h to mach-omap2. This broke omap3isp, as it
includes omap34xx.h.
Instead of moving omap34xx to platform_data, simply add the two
definitions the driver needs and remove the include altogether.
Signed-off-by: Ido Yariv <ido@wizery.com>
---
drivers/media/platform/omap3isp/ispreg.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/media/platform/omap3isp/ispreg.h b/drivers/media/platform/omap3isp/ispreg.h
index 084ea77..e2c57f3 100644
--- a/drivers/media/platform/omap3isp/ispreg.h
+++ b/drivers/media/platform/omap3isp/ispreg.h
@@ -27,13 +27,13 @@
#ifndef OMAP3_ISP_REG_H
#define OMAP3_ISP_REG_H
-#include <plat/omap34xx.h>
-
-
#define CM_CAM_MCLK_HZ 172800000 /* Hz */
/* ISP Submodules offset */
+#define L4_34XX_BASE 0x48000000
+#define OMAP3430_ISP_BASE (L4_34XX_BASE + 0xBC000)
+
#define OMAP3ISP_REG_BASE OMAP3430_ISP_BASE
#define OMAP3ISP_REG(offset) (OMAP3ISP_REG_BASE + (offset))
--
1.7.11.4
^ permalink raw reply related
* [PATCH v2 2/5] iommu/omap: Merge iommu2.h into iommu.h
From: Ido Yariv @ 2012-10-01 22:46 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1349131591-10804-1-git-send-email-ido@wizery.com>
Since iommu is not supported on OMAP1 and will not likely to ever be
supported, merge plat/iommu2.h into iommu.h so only one file would have
to move to platform_data/ as part of the single zImage effort.
Signed-off-by: Ido Yariv <ido@wizery.com>
---
arch/arm/plat-omap/include/plat/iommu.h | 88 +++++++++++++++++++++++++++--
arch/arm/plat-omap/include/plat/iommu2.h | 96 --------------------------------
2 files changed, 83 insertions(+), 101 deletions(-)
delete mode 100644 arch/arm/plat-omap/include/plat/iommu2.h
diff --git a/arch/arm/plat-omap/include/plat/iommu.h b/arch/arm/plat-omap/include/plat/iommu.h
index 68b5f03..7e8c7b6 100644
--- a/arch/arm/plat-omap/include/plat/iommu.h
+++ b/arch/arm/plat-omap/include/plat/iommu.h
@@ -13,6 +13,12 @@
#ifndef __MACH_IOMMU_H
#define __MACH_IOMMU_H
+#include <linux/io.h>
+
+#if defined(CONFIG_ARCH_OMAP1)
+#error "iommu for this processor not implemented yet"
+#endif
+
struct iotlb_entry {
u32 da;
u32 pa;
@@ -159,11 +165,70 @@ static inline struct omap_iommu *dev_to_omap_iommu(struct device *dev)
#define OMAP_IOMMU_ERR_TBLWALK_FAULT (1 << 3)
#define OMAP_IOMMU_ERR_MULTIHIT_FAULT (1 << 4)
-#if defined(CONFIG_ARCH_OMAP1)
-#error "iommu for this processor not implemented yet"
-#else
-#include <plat/iommu2.h>
-#endif
+/*
+ * MMU Register offsets
+ */
+#define MMU_REVISION 0x00
+#define MMU_SYSCONFIG 0x10
+#define MMU_SYSSTATUS 0x14
+#define MMU_IRQSTATUS 0x18
+#define MMU_IRQENABLE 0x1c
+#define MMU_WALKING_ST 0x40
+#define MMU_CNTL 0x44
+#define MMU_FAULT_AD 0x48
+#define MMU_TTB 0x4c
+#define MMU_LOCK 0x50
+#define MMU_LD_TLB 0x54
+#define MMU_CAM 0x58
+#define MMU_RAM 0x5c
+#define MMU_GFLUSH 0x60
+#define MMU_FLUSH_ENTRY 0x64
+#define MMU_READ_CAM 0x68
+#define MMU_READ_RAM 0x6c
+#define MMU_EMU_FAULT_AD 0x70
+
+#define MMU_REG_SIZE 256
+
+/*
+ * MMU Register bit definitions
+ */
+#define MMU_LOCK_BASE_SHIFT 10
+#define MMU_LOCK_BASE_MASK (0x1f << MMU_LOCK_BASE_SHIFT)
+#define MMU_LOCK_BASE(x) \
+ ((x & MMU_LOCK_BASE_MASK) >> MMU_LOCK_BASE_SHIFT)
+
+#define MMU_LOCK_VICT_SHIFT 4
+#define MMU_LOCK_VICT_MASK (0x1f << MMU_LOCK_VICT_SHIFT)
+#define MMU_LOCK_VICT(x) \
+ ((x & MMU_LOCK_VICT_MASK) >> MMU_LOCK_VICT_SHIFT)
+
+#define MMU_CAM_VATAG_SHIFT 12
+#define MMU_CAM_VATAG_MASK \
+ ((~0UL >> MMU_CAM_VATAG_SHIFT) << MMU_CAM_VATAG_SHIFT)
+#define MMU_CAM_P (1 << 3)
+#define MMU_CAM_V (1 << 2)
+#define MMU_CAM_PGSZ_MASK 3
+#define MMU_CAM_PGSZ_1M (0 << 0)
+#define MMU_CAM_PGSZ_64K (1 << 0)
+#define MMU_CAM_PGSZ_4K (2 << 0)
+#define MMU_CAM_PGSZ_16M (3 << 0)
+
+#define MMU_RAM_PADDR_SHIFT 12
+#define MMU_RAM_PADDR_MASK \
+ ((~0UL >> MMU_RAM_PADDR_SHIFT) << MMU_RAM_PADDR_SHIFT)
+#define MMU_RAM_ENDIAN_SHIFT 9
+#define MMU_RAM_ENDIAN_MASK (1 << MMU_RAM_ENDIAN_SHIFT)
+#define MMU_RAM_ENDIAN_BIG (1 << MMU_RAM_ENDIAN_SHIFT)
+#define MMU_RAM_ENDIAN_LITTLE (0 << MMU_RAM_ENDIAN_SHIFT)
+#define MMU_RAM_ELSZ_SHIFT 7
+#define MMU_RAM_ELSZ_MASK (3 << MMU_RAM_ELSZ_SHIFT)
+#define MMU_RAM_ELSZ_8 (0 << MMU_RAM_ELSZ_SHIFT)
+#define MMU_RAM_ELSZ_16 (1 << MMU_RAM_ELSZ_SHIFT)
+#define MMU_RAM_ELSZ_32 (2 << MMU_RAM_ELSZ_SHIFT)
+#define MMU_RAM_ELSZ_NONE (3 << MMU_RAM_ELSZ_SHIFT)
+#define MMU_RAM_MIXED_SHIFT 6
+#define MMU_RAM_MIXED_MASK (1 << MMU_RAM_MIXED_SHIFT)
+#define MMU_RAM_MIXED MMU_RAM_MIXED_MASK
/*
* utilities for super page(16MB, 1MB, 64KB and 4KB)
@@ -218,4 +283,17 @@ omap_iommu_dump_ctx(struct omap_iommu *obj, char *buf, ssize_t len);
extern size_t
omap_dump_tlb_entries(struct omap_iommu *obj, char *buf, ssize_t len);
+/*
+ * register accessors
+ */
+static inline u32 iommu_read_reg(struct omap_iommu *obj, size_t offs)
+{
+ return __raw_readl(obj->regbase + offs);
+}
+
+static inline void iommu_write_reg(struct omap_iommu *obj, u32 val, size_t offs)
+{
+ __raw_writel(val, obj->regbase + offs);
+}
+
#endif /* __MACH_IOMMU_H */
diff --git a/arch/arm/plat-omap/include/plat/iommu2.h b/arch/arm/plat-omap/include/plat/iommu2.h
deleted file mode 100644
index d4116b5..0000000
--- a/arch/arm/plat-omap/include/plat/iommu2.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * omap iommu: omap2 architecture specific definitions
- *
- * Copyright (C) 2008-2009 Nokia Corporation
- *
- * Written by Hiroshi DOYU <Hiroshi.DOYU@nokia.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 __MACH_IOMMU2_H
-#define __MACH_IOMMU2_H
-
-#include <linux/io.h>
-
-/*
- * MMU Register offsets
- */
-#define MMU_REVISION 0x00
-#define MMU_SYSCONFIG 0x10
-#define MMU_SYSSTATUS 0x14
-#define MMU_IRQSTATUS 0x18
-#define MMU_IRQENABLE 0x1c
-#define MMU_WALKING_ST 0x40
-#define MMU_CNTL 0x44
-#define MMU_FAULT_AD 0x48
-#define MMU_TTB 0x4c
-#define MMU_LOCK 0x50
-#define MMU_LD_TLB 0x54
-#define MMU_CAM 0x58
-#define MMU_RAM 0x5c
-#define MMU_GFLUSH 0x60
-#define MMU_FLUSH_ENTRY 0x64
-#define MMU_READ_CAM 0x68
-#define MMU_READ_RAM 0x6c
-#define MMU_EMU_FAULT_AD 0x70
-
-#define MMU_REG_SIZE 256
-
-/*
- * MMU Register bit definitions
- */
-#define MMU_LOCK_BASE_SHIFT 10
-#define MMU_LOCK_BASE_MASK (0x1f << MMU_LOCK_BASE_SHIFT)
-#define MMU_LOCK_BASE(x) \
- ((x & MMU_LOCK_BASE_MASK) >> MMU_LOCK_BASE_SHIFT)
-
-#define MMU_LOCK_VICT_SHIFT 4
-#define MMU_LOCK_VICT_MASK (0x1f << MMU_LOCK_VICT_SHIFT)
-#define MMU_LOCK_VICT(x) \
- ((x & MMU_LOCK_VICT_MASK) >> MMU_LOCK_VICT_SHIFT)
-
-#define MMU_CAM_VATAG_SHIFT 12
-#define MMU_CAM_VATAG_MASK \
- ((~0UL >> MMU_CAM_VATAG_SHIFT) << MMU_CAM_VATAG_SHIFT)
-#define MMU_CAM_P (1 << 3)
-#define MMU_CAM_V (1 << 2)
-#define MMU_CAM_PGSZ_MASK 3
-#define MMU_CAM_PGSZ_1M (0 << 0)
-#define MMU_CAM_PGSZ_64K (1 << 0)
-#define MMU_CAM_PGSZ_4K (2 << 0)
-#define MMU_CAM_PGSZ_16M (3 << 0)
-
-#define MMU_RAM_PADDR_SHIFT 12
-#define MMU_RAM_PADDR_MASK \
- ((~0UL >> MMU_RAM_PADDR_SHIFT) << MMU_RAM_PADDR_SHIFT)
-#define MMU_RAM_ENDIAN_SHIFT 9
-#define MMU_RAM_ENDIAN_MASK (1 << MMU_RAM_ENDIAN_SHIFT)
-#define MMU_RAM_ENDIAN_BIG (1 << MMU_RAM_ENDIAN_SHIFT)
-#define MMU_RAM_ENDIAN_LITTLE (0 << MMU_RAM_ENDIAN_SHIFT)
-#define MMU_RAM_ELSZ_SHIFT 7
-#define MMU_RAM_ELSZ_MASK (3 << MMU_RAM_ELSZ_SHIFT)
-#define MMU_RAM_ELSZ_8 (0 << MMU_RAM_ELSZ_SHIFT)
-#define MMU_RAM_ELSZ_16 (1 << MMU_RAM_ELSZ_SHIFT)
-#define MMU_RAM_ELSZ_32 (2 << MMU_RAM_ELSZ_SHIFT)
-#define MMU_RAM_ELSZ_NONE (3 << MMU_RAM_ELSZ_SHIFT)
-#define MMU_RAM_MIXED_SHIFT 6
-#define MMU_RAM_MIXED_MASK (1 << MMU_RAM_MIXED_SHIFT)
-#define MMU_RAM_MIXED MMU_RAM_MIXED_MASK
-
-/*
- * register accessors
- */
-static inline u32 iommu_read_reg(struct omap_iommu *obj, size_t offs)
-{
- return __raw_readl(obj->regbase + offs);
-}
-
-static inline void iommu_write_reg(struct omap_iommu *obj, u32 val, size_t offs)
-{
- __raw_writel(val, obj->regbase + offs);
-}
-
-#endif /* __MACH_IOMMU2_H */
--
1.7.11.4
^ permalink raw reply related
* [PATCH v2 3/5] iommu/omap: Make some definitions local
From: Ido Yariv @ 2012-10-01 22:46 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1349131591-10804-1-git-send-email-ido@wizery.com>
Move some of the definitions in plat/iommu.h that can be made local to
either drivers/iommu or arch/arm/mach-omap2. This minimizes the number
of global definitions once plat/iommu.h moves to platform_data/ as part
of the single zImage effort.
Signed-off-by: Ido Yariv <ido@wizery.com>
---
arch/arm/mach-omap2/iommu2.c | 6 ++++
arch/arm/plat-omap/include/plat/iommu.h | 55 ------------------------------
drivers/iommu/omap-iommu-debug.c | 2 ++
drivers/iommu/omap-iommu.c | 2 ++
drivers/iommu/omap-iommu.h | 59 +++++++++++++++++++++++++++++++++
drivers/iommu/omap-iovmm.c | 2 ++
6 files changed, 71 insertions(+), 55 deletions(-)
create mode 100644 drivers/iommu/omap-iommu.h
diff --git a/arch/arm/mach-omap2/iommu2.c b/arch/arm/mach-omap2/iommu2.c
index eefc379..c986880 100644
--- a/arch/arm/mach-omap2/iommu2.c
+++ b/arch/arm/mach-omap2/iommu2.c
@@ -65,6 +65,12 @@
((pgsz) == MMU_CAM_PGSZ_64K) ? 0xffff0000 : \
((pgsz) == MMU_CAM_PGSZ_4K) ? 0xfffff000 : 0)
+/* IOMMU errors */
+#define OMAP_IOMMU_ERR_TLB_MISS (1 << 0)
+#define OMAP_IOMMU_ERR_TRANS_FAULT (1 << 1)
+#define OMAP_IOMMU_ERR_EMU_MISS (1 << 2)
+#define OMAP_IOMMU_ERR_TBLWALK_FAULT (1 << 3)
+#define OMAP_IOMMU_ERR_MULTIHIT_FAULT (1 << 4)
static void __iommu_set_twl(struct omap_iommu *obj, bool on)
{
diff --git a/arch/arm/plat-omap/include/plat/iommu.h b/arch/arm/plat-omap/include/plat/iommu.h
index 7e8c7b6..35a0245 100644
--- a/arch/arm/plat-omap/include/plat/iommu.h
+++ b/arch/arm/plat-omap/include/plat/iommu.h
@@ -77,11 +77,6 @@ struct cr_regs {
};
};
-struct iotlb_lock {
- short base;
- short vict;
-};
-
/* architecture specific functions */
struct iommu_functions {
unsigned long version;
@@ -145,26 +140,6 @@ struct omap_iommu_arch_data {
struct omap_iommu *iommu_dev;
};
-#ifdef CONFIG_IOMMU_API
-/**
- * dev_to_omap_iommu() - retrieves an omap iommu object from a user device
- * @dev: iommu client device
- */
-static inline struct omap_iommu *dev_to_omap_iommu(struct device *dev)
-{
- struct omap_iommu_arch_data *arch_data = dev->archdata.iommu;
-
- return arch_data->iommu_dev;
-}
-#endif
-
-/* IOMMU errors */
-#define OMAP_IOMMU_ERR_TLB_MISS (1 << 0)
-#define OMAP_IOMMU_ERR_TRANS_FAULT (1 << 1)
-#define OMAP_IOMMU_ERR_EMU_MISS (1 << 2)
-#define OMAP_IOMMU_ERR_TBLWALK_FAULT (1 << 3)
-#define OMAP_IOMMU_ERR_MULTIHIT_FAULT (1 << 4)
-
/*
* MMU Register offsets
*/
@@ -192,16 +167,6 @@ static inline struct omap_iommu *dev_to_omap_iommu(struct device *dev)
/*
* MMU Register bit definitions
*/
-#define MMU_LOCK_BASE_SHIFT 10
-#define MMU_LOCK_BASE_MASK (0x1f << MMU_LOCK_BASE_SHIFT)
-#define MMU_LOCK_BASE(x) \
- ((x & MMU_LOCK_BASE_MASK) >> MMU_LOCK_BASE_SHIFT)
-
-#define MMU_LOCK_VICT_SHIFT 4
-#define MMU_LOCK_VICT_MASK (0x1f << MMU_LOCK_VICT_SHIFT)
-#define MMU_LOCK_VICT(x) \
- ((x & MMU_LOCK_VICT_MASK) >> MMU_LOCK_VICT_SHIFT)
-
#define MMU_CAM_VATAG_SHIFT 12
#define MMU_CAM_VATAG_MASK \
((~0UL >> MMU_CAM_VATAG_SHIFT) << MMU_CAM_VATAG_SHIFT)
@@ -257,32 +222,12 @@ static inline struct omap_iommu *dev_to_omap_iommu(struct device *dev)
/*
* global functions
*/
-extern u32 omap_iommu_arch_version(void);
-
-extern void omap_iotlb_cr_to_e(struct cr_regs *cr, struct iotlb_entry *e);
-
-extern int
-omap_iopgtable_store_entry(struct omap_iommu *obj, struct iotlb_entry *e);
-
-extern int omap_iommu_set_isr(const char *name,
- int (*isr)(struct omap_iommu *obj, u32 da, u32 iommu_errs,
- void *priv),
- void *isr_priv);
-
extern void omap_iommu_save_ctx(struct device *dev);
extern void omap_iommu_restore_ctx(struct device *dev);
extern int omap_install_iommu_arch(const struct iommu_functions *ops);
extern void omap_uninstall_iommu_arch(const struct iommu_functions *ops);
-extern int omap_foreach_iommu_device(void *data,
- int (*fn)(struct device *, void *));
-
-extern ssize_t
-omap_iommu_dump_ctx(struct omap_iommu *obj, char *buf, ssize_t len);
-extern size_t
-omap_dump_tlb_entries(struct omap_iommu *obj, char *buf, ssize_t len);
-
/*
* register accessors
*/
diff --git a/drivers/iommu/omap-iommu-debug.c b/drivers/iommu/omap-iommu-debug.c
index f55fc5d..a0b0309 100644
--- a/drivers/iommu/omap-iommu-debug.c
+++ b/drivers/iommu/omap-iommu-debug.c
@@ -24,6 +24,8 @@
#include <plat/iopgtable.h>
+#include "omap-iommu.h"
+
#define MAXCOLUMN 100 /* for short messages */
static DEFINE_MUTEX(iommu_debug_lock);
diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index d0b1234..80844b3 100644
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -28,6 +28,8 @@
#include <plat/iopgtable.h>
+#include "omap-iommu.h"
+
#define for_each_iotlb_cr(obj, n, __i, cr) \
for (__i = 0; \
(__i < (n)) && (cr = __iotlb_read_cr((obj), __i), true); \
diff --git a/drivers/iommu/omap-iommu.h b/drivers/iommu/omap-iommu.h
new file mode 100644
index 0000000..51fd00c
--- /dev/null
+++ b/drivers/iommu/omap-iommu.h
@@ -0,0 +1,59 @@
+/*
+ * omap iommu: miscellaneous iommu functions and structures
+ *
+ * Copyright (C) 2008-2009 Nokia Corporation
+ * Copyright (C) 2012 Texas Instruments
+ *
+ * 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 _OMAP_IOMMU_H
+#define _OMAP_IOMMU_H
+
+/*
+ * MMU Register bit definitions
+ */
+#define MMU_LOCK_BASE_SHIFT 10
+#define MMU_LOCK_BASE_MASK (0x1f << MMU_LOCK_BASE_SHIFT)
+#define MMU_LOCK_BASE(x) \
+ ((x & MMU_LOCK_BASE_MASK) >> MMU_LOCK_BASE_SHIFT)
+
+#define MMU_LOCK_VICT_SHIFT 4
+#define MMU_LOCK_VICT_MASK (0x1f << MMU_LOCK_VICT_SHIFT)
+#define MMU_LOCK_VICT(x) \
+ ((x & MMU_LOCK_VICT_MASK) >> MMU_LOCK_VICT_SHIFT)
+
+struct iotlb_lock {
+ short base;
+ short vict;
+};
+
+extern u32 omap_iommu_arch_version(void);
+
+extern void omap_iotlb_cr_to_e(struct cr_regs *cr, struct iotlb_entry *e);
+
+extern int
+omap_iopgtable_store_entry(struct omap_iommu *obj, struct iotlb_entry *e);
+
+extern int omap_foreach_iommu_device(void *data,
+ int (*fn)(struct device *, void *));
+
+extern ssize_t
+omap_iommu_dump_ctx(struct omap_iommu *obj, char *buf, ssize_t len);
+extern size_t
+omap_dump_tlb_entries(struct omap_iommu *obj, char *buf, ssize_t len);
+
+/**
+ * dev_to_omap_iommu() - retrieves an omap iommu object from a user device
+ * @dev: iommu client device
+ */
+static inline struct omap_iommu *dev_to_omap_iommu(struct device *dev)
+{
+ struct omap_iommu_arch_data *arch_data = dev->archdata.iommu;
+
+ return arch_data->iommu_dev;
+}
+
+#endif
diff --git a/drivers/iommu/omap-iovmm.c b/drivers/iommu/omap-iovmm.c
index 2e10c3e..b362fb5 100644
--- a/drivers/iommu/omap-iovmm.c
+++ b/drivers/iommu/omap-iovmm.c
@@ -26,6 +26,8 @@
#include <plat/iopgtable.h>
+#include "omap-iommu.h"
+
static struct kmem_cache *iovm_area_cachep;
/* return the offset of the first scatterlist entry in a sg table */
--
1.7.11.4
^ permalink raw reply related
* [PATCH v2 4/5] arm: omap: Move iommu/iovmm headers to platform_data
From: Ido Yariv @ 2012-10-01 22:46 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1349131591-10804-1-git-send-email-ido@wizery.com>
Move iommu/iovmm headers from plat/ to platform_data/ as part of the
single zImage work.
Signed-off-by: Ido Yariv <ido@wizery.com>
---
arch/arm/mach-omap2/devices.c | 2 +-
arch/arm/mach-omap2/iommu2.c | 2 +-
arch/arm/mach-omap2/omap-iommu.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 +-
drivers/iommu/omap-iommu-debug.c | 4 ++--
drivers/iommu/omap-iommu.c | 2 +-
drivers/iommu/omap-iovmm.c | 4 ++--
drivers/media/platform/omap3isp/isp.h | 5 +++--
drivers/media/platform/omap3isp/ispvideo.c | 6 ++++--
.../plat/iommu.h => include/linux/platform_data/iommu-omap.h | 0
.../plat/iovmm.h => include/linux/platform_data/iovmm-omap.h | 0
12 files changed, 17 insertions(+), 14 deletions(-)
rename arch/arm/plat-omap/include/plat/iommu.h => include/linux/platform_data/iommu-omap.h (100%)
rename arch/arm/plat-omap/include/plat/iovmm.h => include/linux/platform_data/iovmm-omap.h (100%)
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index c8c2117..6cd0c2a 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -126,7 +126,7 @@ static struct platform_device omap2cam_device = {
#if defined(CONFIG_IOMMU_API)
-#include <plat/iommu.h>
+#include <linux/platform_data/iommu-omap.h>
static struct resource omap3isp_resources[] = {
{
diff --git a/arch/arm/mach-omap2/iommu2.c b/arch/arm/mach-omap2/iommu2.c
index c986880..82f9174 100644
--- a/arch/arm/mach-omap2/iommu2.c
+++ b/arch/arm/mach-omap2/iommu2.c
@@ -18,7 +18,7 @@
#include <linux/slab.h>
#include <linux/stringify.h>
-#include <plat/iommu.h>
+#include <linux/platform_data/iommu-omap.h>
/*
* omap2 architecture specific register bit definitions
diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c
index df298d4..a6a4ff8 100644
--- a/arch/arm/mach-omap2/omap-iommu.c
+++ b/arch/arm/mach-omap2/omap-iommu.c
@@ -13,7 +13,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
-#include <plat/iommu.h>
+#include <linux/platform_data/iommu-omap.h>
#include "soc.h"
#include "common.h"
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 2857772..35ebf14 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -26,8 +26,8 @@
#include <plat/mmc.h>
#include <linux/platform_data/asoc-ti-mcbsp.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
+#include <linux/platform_data/iommu-omap.h>
#include <plat/dmtimer.h>
-#include <plat/iommu.h>
#include "am35xx.h"
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 652d028..5850b3e 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -27,10 +27,10 @@
#include <plat/dma.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
#include <linux/platform_data/asoc-ti-mcbsp.h>
+#include <linux/platform_data/iommu-omap.h>
#include <plat/mmc.h>
#include <plat/dmtimer.h>
#include <plat/common.h>
-#include <plat/iommu.h>
#include "omap_hwmod_common_data.h"
#include "cm1_44xx.h"
diff --git a/drivers/iommu/omap-iommu-debug.c b/drivers/iommu/omap-iommu-debug.c
index a0b0309..8c1e30b 100644
--- a/drivers/iommu/omap-iommu-debug.c
+++ b/drivers/iommu/omap-iommu-debug.c
@@ -19,8 +19,8 @@
#include <linux/platform_device.h>
#include <linux/debugfs.h>
-#include <plat/iommu.h>
-#include <plat/iovmm.h>
+#include <linux/platform_data/iommu-omap.h>
+#include <linux/platform_data/iovmm-omap.h>
#include <plat/iopgtable.h>
diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index 80844b3..6100334 100644
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -24,7 +24,7 @@
#include <asm/cacheflush.h>
-#include <plat/iommu.h>
+#include <linux/platform_data/iommu-omap.h>
#include <plat/iopgtable.h>
diff --git a/drivers/iommu/omap-iovmm.c b/drivers/iommu/omap-iovmm.c
index b362fb5..b5ac2cd 100644
--- a/drivers/iommu/omap-iovmm.c
+++ b/drivers/iommu/omap-iovmm.c
@@ -21,8 +21,8 @@
#include <asm/cacheflush.h>
#include <asm/mach/map.h>
-#include <plat/iommu.h>
-#include <plat/iovmm.h>
+#include <linux/platform_data/iommu-omap.h>
+#include <linux/platform_data/iovmm-omap.h>
#include <plat/iopgtable.h>
diff --git a/drivers/media/platform/omap3isp/isp.h b/drivers/media/platform/omap3isp/isp.h
index 8be7487..62c76f9 100644
--- a/drivers/media/platform/omap3isp/isp.h
+++ b/drivers/media/platform/omap3isp/isp.h
@@ -34,8 +34,9 @@
#include <linux/platform_device.h>
#include <linux/wait.h>
#include <linux/iommu.h>
-#include <plat/iommu.h>
-#include <plat/iovmm.h>
+
+#include <linux/platform_data/iommu-omap.h>
+#include <linux/platform_data/iovmm-omap.h>
#include "ispstat.h"
#include "ispccdc.h"
diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c
index 3a5085e..1093f07 100644
--- a/drivers/media/platform/omap3isp/ispvideo.c
+++ b/drivers/media/platform/omap3isp/ispvideo.c
@@ -34,8 +34,10 @@
#include <linux/vmalloc.h>
#include <media/v4l2-dev.h>
#include <media/v4l2-ioctl.h>
-#include <plat/iommu.h>
-#include <plat/iovmm.h>
+
+#include <linux/platform_data/iommu-omap.h>
+#include <linux/platform_data/iovmm-omap.h>
+
#include <plat/omap-pm.h>
#include "ispvideo.h"
diff --git a/arch/arm/plat-omap/include/plat/iommu.h b/include/linux/platform_data/iommu-omap.h
similarity index 100%
rename from arch/arm/plat-omap/include/plat/iommu.h
rename to include/linux/platform_data/iommu-omap.h
diff --git a/arch/arm/plat-omap/include/plat/iovmm.h b/include/linux/platform_data/iovmm-omap.h
similarity index 100%
rename from arch/arm/plat-omap/include/plat/iovmm.h
rename to include/linux/platform_data/iovmm-omap.h
--
1.7.11.4
^ permalink raw reply related
* [PATCH v2 5/5] arm: omap: Move iopgtable header to drivers/iommu/
From: Ido Yariv @ 2012-10-01 22:46 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1349131591-10804-1-git-send-email-ido@wizery.com>
The iopgtable header file is only used by the iommu & iovmm drivers, so
move it to drivers/iommu/, as part of the single zImage effort.
Signed-off-by: Ido Yariv <ido@wizery.com>
---
drivers/iommu/omap-iommu-debug.c | 3 +--
drivers/iommu/omap-iommu.c | 3 +--
.../include/plat/iopgtable.h => drivers/iommu/omap-iopgtable.h | 0
drivers/iommu/omap-iovmm.c | 3 +--
4 files changed, 3 insertions(+), 6 deletions(-)
rename arch/arm/plat-omap/include/plat/iopgtable.h => drivers/iommu/omap-iopgtable.h (100%)
diff --git a/drivers/iommu/omap-iommu-debug.c b/drivers/iommu/omap-iommu-debug.c
index 8c1e30b..84dbfd2 100644
--- a/drivers/iommu/omap-iommu-debug.c
+++ b/drivers/iommu/omap-iommu-debug.c
@@ -22,8 +22,7 @@
#include <linux/platform_data/iommu-omap.h>
#include <linux/platform_data/iovmm-omap.h>
-#include <plat/iopgtable.h>
-
+#include "omap-iopgtable.h"
#include "omap-iommu.h"
#define MAXCOLUMN 100 /* for short messages */
diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index 6100334..1ca33b0 100644
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -26,8 +26,7 @@
#include <linux/platform_data/iommu-omap.h>
-#include <plat/iopgtable.h>
-
+#include "omap-iopgtable.h"
#include "omap-iommu.h"
#define for_each_iotlb_cr(obj, n, __i, cr) \
diff --git a/arch/arm/plat-omap/include/plat/iopgtable.h b/drivers/iommu/omap-iopgtable.h
similarity index 100%
rename from arch/arm/plat-omap/include/plat/iopgtable.h
rename to drivers/iommu/omap-iopgtable.h
diff --git a/drivers/iommu/omap-iovmm.c b/drivers/iommu/omap-iovmm.c
index b5ac2cd..2820e3a 100644
--- a/drivers/iommu/omap-iovmm.c
+++ b/drivers/iommu/omap-iovmm.c
@@ -24,8 +24,7 @@
#include <linux/platform_data/iommu-omap.h>
#include <linux/platform_data/iovmm-omap.h>
-#include <plat/iopgtable.h>
-
+#include "omap-iopgtable.h"
#include "omap-iommu.h"
static struct kmem_cache *iovm_area_cachep;
--
1.7.11.4
^ permalink raw reply related
* [PATCH] ARM: OMAP: fix return value check in beagle_opp_init()
From: Kevin Hilman @ 2012-10-01 23:00 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <CAPgLHd9aJUYX_a7_iXLi5r6VEVuB0W15G9Ryw2bVzNzko2NpBA@mail.gmail.com>
Wei Yongjun <weiyj.lk@gmail.com> writes:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> In case of error, the function omap_device_get_by_hwmod_name()
> returns ERR_PTR() not NULL pointer. The NULL test in the return
> value check should be replaced with IS_ERR().
>
> dpatch engine is used to auto generated this patch.
> (https://github.com/weiyj/dpatch)
>
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Kevin Hilman <khilman@ti.com>
> ---
> arch/arm/mach-omap2/board-omap3beagle.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
> index 6202fc7..a548d70 100644
> --- a/arch/arm/mach-omap2/board-omap3beagle.c
> +++ b/arch/arm/mach-omap2/board-omap3beagle.c
> @@ -466,7 +466,7 @@ static void __init beagle_opp_init(void)
> mpu_dev = omap_device_get_by_hwmod_name("mpu");
> iva_dev = omap_device_get_by_hwmod_name("iva");
>
> - if (!mpu_dev || !iva_dev) {
> + if (IS_ERR(mpu_dev) || IS_ERR(iva_dev)) {
> pr_err("%s: Aiee.. no mpu/dsp devices? %p %p\n",
> __func__, mpu_dev, iva_dev);
> return;
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* [PATCH] ARM: OMAP: omap_device: fix return value check in omap_device_build_ss()
From: Kevin Hilman @ 2012-10-01 23:01 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <CAPgLHd8ys7uU8wBhMF7JWZEDAddOnGo4vHPu1V_+Q3__WWK-3g@mail.gmail.com>
Wei Yongjun <weiyj.lk@gmail.com> writes:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> In case of error, the function omap_device_alloc() returns ERR_PTR()
> and never returns NULL pointer. The NULL test in the return value
> check should be replaced with IS_ERR().
>
> dpatch engine is used to auto generated this patch.
> (https://github.com/weiyj/dpatch)
>
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Kevin Hilman <khilman@ti.com>
> ---
> arch/arm/plat-omap/omap_device.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c
> index c490240..3f62de6 100644
> --- a/arch/arm/plat-omap/omap_device.c
> +++ b/arch/arm/plat-omap/omap_device.c
> @@ -671,7 +671,7 @@ struct platform_device __init *omap_device_build_ss(const char *pdev_name, int p
> dev_set_name(&pdev->dev, "%s", pdev->name);
>
> od = omap_device_alloc(pdev, ohs, oh_cnt, pm_lats, pm_lats_cnt);
> - if (!od)
> + if (IS_ERR(od))
> goto odbs_exit1;
>
> ret = platform_device_add_data(pdev, pdata, pdata_len);
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* OMAP baseline test results for v3.6-rc7
From: Paul Walmsley @ 2012-10-01 23:28 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <50645A1D.5040108@compulab.co.il>
On Thu, 27 Sep 2012, Igor Grinberg wrote:
> Have you tried the nohlt boot parameter?
> It looks like the wfi is killing those SoCs once you use EMAC.
Just tried with nohlt. Didn't help on CM-T3517 with either NFS or MMC
root, nor with the 3517EVM with NFS root. But I was able to get the
3517EVM booting to userspace with MMC root. Looks like the CM-T3517 board
file is missing the MMC setup code, so would guess that adding that back
in would help.
- Paul
^ permalink raw reply
* [GIT PULL 0/12] ARM: soc: updates for 3.7, first batch
From: Olof Johansson @ 2012-10-01 23:56 UTC (permalink / raw)
To: linux-arm-kernel
Hi Linus,
Here is the first batch of pull requests for arm-soc for this merge
window. Some of them are tiny, and we will probably start to combine
them into slightly larger misc branches in the future. I didn't do it
this time around since the dependencies between branches ended up quite
complex this time around.
We unfortunately have a somewhat conflict-heavy merge window in front
of us. The reason is a couple of substantial moves of header files and
Makefile contents on platforms. The shuffling is done to allow multiple
platforms to be built into the same kernel image, a goal that has
been worked towards for quite some time now and finally are bearing
fruit. We're starting out with just a few platforms but it's expected
that several more will be enabled for 3.8.
As usual I have described the conflicts in each pull request and how I
resolved them. I have also pushed up a temporary branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git merge-part1-resolved
that contains the merges as I have done them.
With that, here comes the first batch of updates. There will be a second
batch later on once these have been merged.
Thanks!
-Olof
^ permalink raw reply
* [GIT PULL 1/12] ARM: soc: non-critical bug fixes
From: Olof Johansson @ 2012-10-01 23:56 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1349135827-24790-1-git-send-email-olof@lixom.net>
These were submitted as bug fixes before v3.6 but not considered important
enough to be included in it. Some of them cross over to cleanup territory
as well, and aren't strictly bugfixes.
Conflicts: none
----------------------------------------------------------------
The following changes since commit d9a807461fc8cc0d6ba589ea0730d139122af012:
Merge tag 'usb-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/fixes-non-critical
for you to fetch changes up to b10dcdcac43b2b5adf800a19f782fef38ada75a1:
Merge tag 'ep93xx-fixes-for-3.7' of git://github.com/RyanMallon/linux-ep93xx into next/fixes-non-critical
----------------------------------------------------------------
Arnd Bergmann (8):
watchdog/mpc8xxx: add a const qualifier
powerpc/fsl_msi: drop unneeded cast to non-const pointer
mfd/da9052: make i2c_device_id array const
i2c/mpc: make data used as *of_device_id.data const
macintosh/mediabay: make data used as *of_device_id.data const
can: mpc5xxx_can: make data used as *of_device_id.data const
ARM: ep93xx: use __iomem pointers for MMIO
ARM: nomadik: remove NAND_NO_READRDY use
Axel Lin (2):
ARM: ux500: Fix build error due to missing include of asm/pmu.h in cpu-db8500.c
ARM: ep93xx: Fix build error due to 'SZ_32M' undeclared
David Brown (1):
ARM: msm: Remove call to missing FPGA init on 8660
Julia Lawall (1):
ARM: S3C24xx: delete double assignment
Kukjin Kim (1):
ARM: EXYNOS: fix address for EXYNOS4 MDMA1
Laxman Dewangan (2):
dma: tegra: make tegra_dma.chip_data a pointer to const data
dma: tegra: make data used as *of_device_id.data const
Lee Jones (1):
ARM: ux500: Provide SMSC911x fixed-regulator when not booting DT
Linus Walleij (1):
ARM: ux500: set proper GIC flags
Olof Johansson (9):
Merge branch 'ofdeviceiddata' of git://git.pengutronix.de/git/ukl/linux into next/fixes-non-critical
Merge tag 'ux500-core-updates' of http://git.kernel.org/.../linusw/linux-stericsson into next/fixes-non-critical
Merge tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into next/fixes-non-critical
Merge tag 'msm-fix-noncrit-for-3.7' of git://git.kernel.org/.../davidb/linux-msm into next/fixes-non-critical
Merge tag 'tegra-for-3.7-fixes' of git://git.kernel.org/.../swarren/linux-tegra into next/fixes-non-critical
Merge tag 'omap-fixes-noncritical-for-v3.7' of git://git.kernel.org/.../tmlind/linux-omap into next/fixes-non-critical
Merge branch 'v3.7-samsung-fixes-1' of git://git.kernel.org/.../kgene/linux-samsung into next/fixes-non-critical
Merge branch 'pxa/fixes' into next/fixes-non-critical
Merge tag 'ep93xx-fixes-for-3.7' of git://github.com/RyanMallon/linux-ep93xx into next/fixes-non-critical
Paul Walmsley (1):
ARM: OMAP4: wakeupgen: remove duplicate AUXCOREBOOT* read/write
Peter De Schrijver (2):
ARM: tegra: fix return value for debugfs init
ARM: tegra: fix debugfs entry for Tegra30
Peter Senna Tschudin (1):
ARM: S3C24XX: removes unnecessary semicolon
Rohit Vaswani (2):
ARM: msm: io: Remove 7x30 iomap region from 7x00
ARM: msm: io: Change the default static iomappings to be shared
Ryan Mallon (1):
ARM: ep93xx: Move ts72xx.h out of include/mach
Santosh Shilimkar (1):
ARM: OMAP4: wakeupgen: Fix the typo in AUXCOREBOOT register save
Seung-Woo Kim (1):
ARM: EXYNOS: fixed SYSMMU setup definition to mate parameter name
Stephen Boyd (1):
ARM: msm: Fix early debug uart mapping on some memory configs
Stephen Warren (1):
ARM: enable SUSPEND/ARCH_SUSPEND_POSSIBLE for ARCH_TEGRA
Sylwester Nawrocki (1):
ARM: SAMSUNG: Add missing variable declaration in s3c64xx_spi1_set_platdata()
Uwe Kleine-K?nig (17):
spi/imx: make spi_imx_data.devtype_data member point to const data
spi/spi-omap2-mcspi: add a const qualifier
serial/imx: make imx_port.devdata member point to const data
serial/mpc52xx_uart: add a const qualifier
ARM: cache-l2x0: add a const qualifier
misc/atmel_tc: make atmel_tc.tcb_config member point to const data
gpio/gpio-omap.c: add a const qualifier
gpio/mpc8xxx: add a const qualifier
i2c/i2c-omap: add a const qualifier
i2c/mpc: add a const qualifier
mmc/omap_hsmmc: add a const qualifier
macintosh/mediabay: add a const qualifier
powerpc/83xx: add a const qualifier
powerpc/fsl_msi: add a const qualifier
powerpc/celleb_pci: add a const qualifier
of: add const to struct *of_device_id.data
gpio/gpio-omap: make platformdata used as *of_device_id.data const
Wei Yongjun (2):
gpio/omap: fix possible memory leak in omap2_gpio_dev_init()
ARM: pxa: fix return value check in pxa2xx_drv_pcmcia_probe()
arch/arm/Kconfig | 2 +-
arch/arm/mach-ep93xx/adssphere.c | 1 +
arch/arm/mach-ep93xx/gesbc9312.c | 1 +
arch/arm/mach-ep93xx/ts72xx.c | 12 +++---
.../arm/mach-ep93xx/{include/mach => }/ts72xx.h | 10 ++---
arch/arm/mach-exynos/include/mach/map.h | 2 +-
arch/arm/mach-exynos/include/mach/sysmmu.h | 2 +-
arch/arm/mach-msm/board-msm8x60.c | 5 ---
arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 2 +-
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 2 +-
arch/arm/mach-msm/io.c | 25 ++++++------
arch/arm/mach-nomadik/board-nhk8815.c | 3 +-
arch/arm/mach-omap2/gpio.c | 2 +
arch/arm/mach-omap2/omap-wakeupgen.c | 8 +---
arch/arm/mach-s3c24xx/mach-h1940.c | 4 +-
arch/arm/mach-tegra/powergate.c | 43 ++++++++++++++++----
arch/arm/mach-ux500/Kconfig | 1 +
arch/arm/mach-ux500/board-mop500-regulators.c | 15 +++++++
arch/arm/mach-ux500/board-mop500-regulators.h | 1 +
arch/arm/mach-ux500/board-mop500.c | 19 +++++++++
arch/arm/mach-ux500/cpu-db8500.c | 1 +
arch/arm/mach-ux500/cpu.c | 2 +
arch/arm/mm/cache-l2x0.c | 2 +-
arch/arm/plat-samsung/devs.c | 2 +
arch/powerpc/platforms/83xx/suspend.c | 2 +-
arch/powerpc/platforms/cell/celleb_pci.c | 2 +-
arch/powerpc/sysdev/fsl_msi.c | 8 ++--
drivers/dma/tegra20-apb-dma.c | 8 ++--
drivers/gpio/gpio-mpc8xxx.c | 2 +-
drivers/gpio/gpio-omap.c | 8 ++--
drivers/i2c/busses/i2c-mpc.c | 12 +++---
drivers/i2c/busses/i2c-omap.c | 3 +-
drivers/macintosh/mediabay.c | 8 ++--
drivers/mfd/da9052-i2c.c | 4 +-
drivers/mmc/host/omap_hsmmc.c | 2 +-
drivers/net/can/mscan/mpc5xxx_can.c | 4 +-
drivers/pcmcia/pxa2xx_base.c | 2 +-
drivers/spi/spi-imx.c | 2 +-
drivers/spi/spi-omap2-mcspi.c | 2 +-
drivers/tty/serial/mpc52xx_uart.c | 2 +-
drivers/watchdog/mpc8xxx_wdt.c | 2 +-
include/linux/atmel_tc.h | 2 +-
include/linux/mod_devicetable.h | 2 +-
43 files changed, 154 insertions(+), 90 deletions(-)
rename arch/arm/mach-ep93xx/{include/mach => }/ts72xx.h (89%)
^ permalink raw reply
* [GIT PULL 2/12] ARM: soc: general cleanups
From: Olof Johansson @ 2012-10-01 23:56 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1349135827-24790-1-git-send-email-olof@lixom.net>
This is a large branch that contains a handful of different cleanups:
- Fixing up the I/O space remapping on PCI on ARM. This is a series
from Rob Herring that restructures how all pci devices allocate I/O
space, and it's part of the work to allow multiplatform kernels.
- A number of cleanup series for OMAP, moving and removing some
headers, sparse irq rework and in general preparation for
multiplatform.
- Final removal of all non-DT boards for Tegra, it is now
device-tree-only!
- Removal of a stale platform, nxp4008. It's an old mobile chipset
that is no longer in use, and was very likely never really used with
a mainline kernel. We have not been able to find anyone interested
in keeping it around in the kernel.
- Removal of the legacy dmaengine driver on tegra
+ A handful of other things that I haven't described above.
Conflicts:
* drivers/staging/tidspbridge/core/wdt.c has an add/change conflict
* drivers/usb/host/Kconfig has a change/remove conflict due to nxp4008 removal
* drivers/w1/masters/omap_hdq.c has had similar cleanups merged through
Greg K-H, go with what's already in the tree on those conflicts.
----------------------------------------------------------------
The following changes since commit 17a505edb09495510ac8998450980472c412455b:
Merge branch 'next/fixes-non-critical' into HEAD
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/cleanup
for you to fetch changes up to 9cf1c871526cf6bfec2a653e1e068ee72592542c:
Merge tag 'omap-devel-board-late-v3-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
----------------------------------------------------------------
Afzal Mohammed (10):
ARM: OMAP2+: gpmc: update nand register helper
ARM: OMAP2+: gpmc-nand: update gpmc-nand regs
mtd: nand: omap2: handle nand on gpmc
ARM: OMAP2+: gpmc-nand: update resource with memory
ARM: OMAP2+: gpmc-onenand: provide memory as resource
mtd: nand: omap2: obtain memory from resource
mtd: onenand: omap2: obtain memory from resource
ARM: OMAP2+: gpmc: Modify interrupt handling
ARM: OMAP2+: gpmc-nand: Modify Interrupt handling
mtd: nand: omap2: use gpmc provided irqs
AnilKumar Ch (1):
ARM: OMAP2+: serial: Change MAX_HSUART_PORTS to 6
Arnd Bergmann (31):
ARM: bcmring: move cfg_global header to mach/
ARM: bcmring: remove include/csp/ subdir
ARM: bcmring: use proper MMIO accessors
iop13xx: use more regular PCI I/O space handling
Merge branch 'cleanup/io-pci' into next/cleanups
Merge branch 'testing/bcmring' into next/cleanups
Merge branch 'u300-cleanup' of git://git.kernel.org/.../linusw/linux-stericsson into next/cleanup
Merge commit 'a849088aa1' from rmk/fixes into cleanup/io-pci
Merge branch 'cleanup/io-pci' into next/cleanup
ARM: shmobile: use __iomem pointers for MMIO
ARM: at91: use __iomem pointers for MMIO
ARM: ebsa110: use __iomem pointers for MMIO
ARM: imx: use __iomem pointers for MMIO
ARM: integrator: use __iomem pointers for MMIO
ARM: iop13xx: use __iomem pointers for MMIO
ARM: iop32x: use __iomem pointers for MMIO
ARM: ixp4xx: use __iomem pointers for MMIO
ARM: ks8695: use __iomem pointers for MMIO
ARM: lpc32xx: use __iomem pointers for MMIO
ARM: msm: use __iomem pointers for MMIO
ARM: nomadik: use __iomem pointers for MMIO
ARM: prima2: use __iomem pointers for MMIO
ARM: sa1100: use __iomem pointers for MMIO
ARM: spear13xx: use __iomem pointers for MMIO
ARM: samsung: use __iomem pointers for MMIO
input: rpcmouse: use __iomem pointers for MMIO
serial: ks8695: use __iomem pointers for MMIO
scsi: eesox: use __iomem pointers for MMIO
video: da8xx-fb: use __iomem pointers for MMIO
net: seeq: use __iomem pointers for MMIO
ARM: omap: move platform_data definitions
Barry Song (3):
ARM: PRIMA2: use DT_MACHINE_START and convert to generic board
ARM: PRIMA2: adjust Kconfig to support select SoC features
ARM: SIRF: make sirf irqchip driver optional since new SoCs will have GIC
Chao Xie (5):
arm: mmp: make private clock definition exclude from common clock
arm: mmp: move pxa168 clock definition to separated file
arm: mmp: move pxa910 clock definition to separated file
ARM: mmp: move mmp2 clock definition to separated file
ARM: mmp: remove unused definition in APBC and APMU
Fabio Estevam (2):
ARM: plat-mxc: Remove unused imx_ioremap
ARM: imx27-phytec-phycore: Fix I2C EEPROM address
Igor Grinberg (9):
ARM: OMAP: cleanup struct omap_board_config_kernel
ARM: OMAP: omap3evm: cleanup revision bits
ARM: OMAP: remove the sti console workaround
ARM: OMAP1: remove the crystal type tag parsing
ARM: OMAP: remove the omap custom tags
ARM: OMAP1: move omap1_bl pdata out of arch/arm/*
ARM: OMAP1: move lcd pdata out of arch/arm/*
ARM: OMAP: move debug_card_init() function
ARM: OMAP: remove plat/board.h file
Javier Martin (1):
ARM i.MX mx2_camera: Remove MX2_CAMERA_SWAP16 and MX2_CAMERA_PACK_DIR_MSB flags.
Jon Hunter (1):
ARM: PMU: Add runtime PM Support
Jonghwan Choi (1):
ARM: EXYNOS: cleanup unused code related to GPS
Laxman Dewangan (7):
ARM: tegra: use IO_ADDRESS for getting virtual address
ARM: dt: tegra: harmony: add regulators
ARM: tegra: config: enable dmaengine based APB DMA driver
ARM: tegra: dma: remove legacy APB DMA driver
ARM: tegra: apbio: remove support of legacy DMA driver based access
spi: tegra: remove support of legacy DMA driver based access
ASoC: tegra: remove support of legacy DMA driver based access
Linus Walleij (12):
ARM: u300: retire ancient platforms
pinctrl/coh901: retire ancient GPIO block versions
pinctrl/coh901: move header to platform data dir
ARM: u300: merge u300.c into core.c and rid headers
ARM: u300: delete remnant clkdev.h file
ARM: u300: move DMA channel header into mach-u300
ARM: u300: convert to sparse IRQs
ARM: ks8695: merge the timer header into the timer driver
ARM: ks8695: use [readl|writel]_relaxed()
ARM: ks8695: delete resume hook from timer
ARM: ks8695: convert to generic time and clocksource
watchdog: ks8695: sink registers into driver
Matt Porter (1):
ARM: OMAP2+: Enable pinctrl dummy states
Olof Johansson (24):
Merge branch 'marco-prepare' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel into next/cleanup
Merge tag 'arm-perf-3.7' of git://git.kernel.org/.../will/linux into next/cleanup
Merge tag 'ks8695-time-for-arm-soc' of http://git.kernel.org/.../linusw/linux-stericsson into next/cleanup
Merge branch 'ag5evm' of git://git.kernel.org/.../horms/renesas into next/cleanup
Merge branch 'pnx4008-removal' of git://git.antcom.de/linux-2.6 into next/cleanup
Merge branch 'ks8695/timer' into next/cleanup
Merge branch 'clk' of git://github.com/hzhuang1/linux into next/cleanup
Merge tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup
Merge tag 'msm-cleanup-for-3.7' of git://git.kernel.org/.../davidb/linux-msm into next/cleanup
Merge tag 'tegra-for-3.7-cleanup' of git://git.kernel.org/.../swarren/linux-tegra into next/cleanup
Merge branch 'depends/tps6589x-dt' into next/cleanup
Merge tag 'tegra-for-3.7-board-removal' of git://git.kernel.org/.../swarren/linux-tegra into next/cleanup
Merge tag 'omap-devel-gpmc-fixed-for-v3.7' of git://git.kernel.org/.../tmlind/linux-omap into next/cleanup
Merge tag 'cleanup-omap-tags-for-v3.7' of git://git.kernel.org/.../tmlind/linux-omap into next/cleanup
Merge branch 'depends/tty-omap-serial' into next/cleanup
Merge tag 'omap-cleanup-sparseirq-for-v3.7' of git://git.kernel.org/.../tmlind/linux-omap into next/cleanup
Merge tag 'omap-cleanup-makefile-sparse-for-v3.7' of git://git.kernel.org/.../tmlind/linux-omap into next/cleanup
Merge tag 'cleanup-fixes-for-v3.7' of git://git.kernel.org/.../tmlind/linux-omap into next/cleanup
Merge branch 'samsung/cleanup' into next/cleanup
Merge tag 'tegra-for-3.7-dmaengine' of git://git.kernel.org/.../swarren/linux-tegra into next/cleanup
Merge tag 'omap-cleanup-local-headers-for-v3.7' of git://git.kernel.org/.../tmlind/linux-omap into next/cleanup
Merge branch 'board' of git://github.com/hzhuang1/linux into next/cleanup
Merge branch 'cleanup/__iomem' into next/cleanup
Merge tag 'omap-devel-board-late-v3-for-v3.7' of git://git.kernel.org/.../tmlind/linux-omap into next/cleanup
Oskar Schirmer (1):
serial/imx: fix IMX UART macro usage to reflect correct processor
Paul Walmsley (8):
ARM: OMAP2+: clean up whitespace in Makefile
ARM: OMAP2+: clean up omap_hwmod.o build directives in Makefile
ARM: OMAP2+: move MPU INTCPS, secure monitor, SDRC build directives in Makefile
ARM: OMAP2+: clean up OMAP4 PRM & sleep build directives in Makefile
ARM: OMAP2+: clean up OMAP clock Makefile sections
ARM: OMAP2+: clean up PRCM sections of the Makefile
ARM: OMAP: clean up some smatch warnings, fix some printk(KERN_ERR ...
ARM: OMAP: unwrap strings
Peter Ujfalusi (1):
ARM: OMAP4: twl-common: Support for additional devices on i2c1 bus
Rob Herring (16):
i2c: iop3xx: clean-up trailing whitespace
i2c: iop3xx: use standard gpiolib functions
ARM: Add fixed PCI i/o mapping
ARM: move PCI i/o resource setup into common code
ARM: versatile: use fixed PCI i/o mapping
ARM: tegra: use fixed PCI i/o mapping
ARM: integrator: use fixed PCI i/o mapping
ARM: integrator: remove trailing whitespace on pci_v3.c
ARM: shark: use fixed PCI i/o mapping
ARM: footbridge: use fixed PCI i/o mapping
ARM: dove: use fixed PCI i/o mapping
ARM: kirkwood: use fixed PCI i/o mapping
ARM: orion5x: use fixed PCI i/o mapping
ARM: iop13xx: use fixed PCI i/o mapping
ARM: mv78xx0: use fixed pci i/o mapping
ARM: iop3xx: use fixed PCI i/o mapping
Roland Stigge (1):
ARM: mach-pnx4008: Remove architecture
Sachin Kamat (2):
ARM: S3C24XX: Use module_platform_driver macro in h1940-bluetooth.c
ARM: S3C24XX: Use module_platform_driver macro in mach-osiris-dvs.c
Sascha Hauer (3):
ARM: i.MX clk pllv1: move mxc_decode_pll code to its user
ARM: i.MX remove last leftovers from legacy clock support
ARM i.MX53 clk: Fix ldb parent clocks
Stephen Boyd (6):
ARM: msm: Remove msm_hw_reset_hook
ARM: msm: clock-pcom: Mark functions static
ARM: msm: Remove unused idle.c
ARM: msm: Fix sparse warnings due to incorrect type
ARM: msm: Remove unused acpuclock-arm11
ARM: msm: Remove uncompiled board-msm7x27
Stephen Warren (9):
ARM: tegra: remove duplicate select USE_OF
gpio: tegra: remove useless includes of <mach/*.h>
mmc: tegra: remove useless include of <mach/*.h>
Merge commit 'tps6589x-dt' into for-3.7/board-removal
ARM: tegra: remove board (but not DT) support for TrimSlice
ARM: tegra: remove board (but not DT) support for Paz00
ARM: tegra: remove board (but not DT) support for Harmony
ARM: dt: tegra: harmony: configure power off
ARM: tegra: harmony: fix ldo7 regulator-name
Sudeep KarkadaNagesha (2):
ARM: pmu: remove arm_pmu_type enumeration
ARM: perf: move irq registration into pmu implementation
Sylwester Nawrocki (4):
ARM: S3C24XX: Convert users of s3c2410_gpio_setpin to gpiolib API
ARM: S3C24XX: Remove obsolete GPIO API declarations
gpio-samsung: Remove now unused s3c2410_gpio* API
gpio: samsung: Update documentation
Tony Lindgren (46):
Merge tags 'omap-devel-gpmc-fixed-for-v3.7' and 'cleanup-omap-tags-for-v3.7' into cleanup-sparseirq
ARM: OMAP1: Move define of OMAP_LCD_DMA to dma.h
ARM: OMAP1: Define OMAP1_INT_I2C locally
ARM: OMAP2+: Make INTCPS_NR_IRQS local for mach-omap2/irq.c
ARM: OMAP2+: Remove unused nand_irq for GPMC
ARM: OMAP2+: Remove hardcoded twl4030 gpio_base, irq_base and irq_end
ARM: OMAP: Move gpio.h to include/linux/platform_data
Input: omap-keypad: Remove dependencies to mach includes
W1: OMAP HDQ1W: Remove dependencies to mach/hardware.h
ARM: OMAP2+: Prepare for irqs.h removal
ARM: OMAP2+: Remove hardcoded IRQs and enable SPARSE_IRQ
ARM: OMAP1: Move plat/irqs.h to mach/irqs.h
ARM: OMAP: Remove unused old gpio-switch.h
ARM: OMAP: Split plat/hardware.h, use local soc.h for omap2+
ARM: OMAP2+ Move SoC specific headers to be local to mach-omap2
ARM: OMAP1: Move SoC specific headers from plat to mach for omap1
Merge tag 'omap-cleanup-a-for-3.7' of git://git.kernel.org/.../pjw/omap-pending into cleanup-makefile-sparse
Merge tag 'omap-cleanup-b-for-3.7' of git://git.kernel.org/.../pjw/omap-pending into cleanup-makefile-sparse
mfd: Fix compile for twl-core.c by removing cpu_is_omap usage
ARM: OMAP1: Include gpio-omap.h for board-h2 and board-h3
ARM: OMAP: Remove unused param.h
ARM: OMAP: Remove smp.h
ARM: OMAP1: Make plat/mux.h omap1 only
ARM: OMAP1: Move board-ams-delta.h from plat to mach
ARM: OMAP2+: Make id.h local
ARM: OMAP2+: Make am35xx.h local
ARM: OMAP2+: Make board-rx51.h local
ARM: OMAP2+: Make ctrl_module_core_44xx.h local
ARM: OMAP2+: Make ctrl_module_pad_core_44xx.h local
ARM: OMAP2+: Make ctrl_module_pad_wkup_44xx.h local
ARM: OMAP2+: Make ctrl_module_wkup_44xx.h local
ARM: OMAP2+: Make omap-secure.h local
ARM: OMAP2+: Make omap-wakeupgen.h local
ARM: OMAP1: Move board-sx1.h from plat to mach
ARM: OMAP1: Move board-voiceblue.h from plat to mach
ARM: OMAP2+: Make debug-devices.h local
ARM: OMAP1: Move flash.h from plat to mach
ARM: OMAP2+: Make gpmc-smc91x.h local
ARM: OMAP2+: Make gpmc-smsc911x.h local
ARM: OMAP2+: Make hdq1w.h local
ARM: OMAP1: Move irda.h from plat to mach
ARM: OMAP2+: Make l3_2xxx.h local
ARM: OMAP2+: Make l3_3xxx.h local
ARM: OMAP2+: Make l4_2xxx.h local
ARM: OMAP2+: Make l4_3xxx.h local
ARM: OMAP2+: Make omap4-keypad.h local
Wei Yongjun (4):
ARM i.MX: remove duplicated include from clk-imx21.c
ARM: mach-shmobile: remove duplicated include from board-ag5evm.c
ARM: msm: dma: use list_move_tail instead of list_del/list_add_tail
ARM: mmp: using for_each_set_bit to simplify the code
Will Deacon (6):
ARM: perf: add devicetree bindings for 11MPcore, A5, A7 and A15 PMUs
ARM: pmu: remove unused reservation mechanism
ARM: perf: remove mysterious compiler barrier
ARM: perf: probe devicetree in preference to current CPU
ARM: perf: prepare for moving CPU PMU code into separate file
ARM: perf: move CPU-specific PMU handling code into separate file
Documentation/arm/Samsung-S3C24XX/GPIO.txt | 82 +-
Documentation/arm/Samsung/GPIO.txt | 8 +-
Documentation/arm/memory.txt | 3 +
Documentation/devicetree/bindings/arm/pmu.txt | 4 +
MAINTAINERS | 1 -
arch/arm/Kconfig | 43 +-
arch/arm/Makefile | 1 -
arch/arm/boot/dts/imx27-phytec-phycore.dts | 2 +-
arch/arm/boot/dts/tegra20-harmony.dts | 220 ++++
arch/arm/configs/pnx4008_defconfig | 472 --------
arch/arm/configs/prima2_defconfig | 7 +-
arch/arm/configs/tegra_defconfig | 2 +
arch/arm/include/asm/hardware/iop3xx.h | 12 +-
arch/arm/include/asm/io.h | 8 +
arch/arm/include/asm/mach/map.h | 8 +
arch/arm/include/asm/mach/pci.h | 13 +
arch/arm/include/asm/perf_event.h | 9 +-
arch/arm/include/asm/pmu.h | 77 +-
arch/arm/kernel/Makefile | 3 +-
arch/arm/kernel/bios32.c | 54 +-
arch/arm/kernel/perf_event.c | 347 +-----
arch/arm/kernel/perf_event_cpu.c | 295 +++++
arch/arm/kernel/perf_event_v6.c | 12 +-
arch/arm/kernel/perf_event_v7.c | 32 +-
arch/arm/kernel/perf_event_xscale.c | 10 +-
arch/arm/kernel/pmu.c | 36 -
arch/arm/mach-at91/at91x40.c | 2 +-
arch/arm/mach-at91/at91x40_time.c | 4 +-
arch/arm/mach-at91/include/mach/hardware.h | 4 +-
arch/arm/mach-at91/include/mach/uncompress.h | 6 +-
arch/arm/mach-at91/setup.c | 4 +-
arch/arm/mach-bcmring/arch.c | 5 +-
arch/arm/mach-bcmring/core.c | 3 +-
arch/arm/mach-bcmring/csp/chipc/chipcHw.c | 137 +--
arch/arm/mach-bcmring/csp/chipc/chipcHw_init.c | 90 +-
arch/arm/mach-bcmring/csp/chipc/chipcHw_reset.c | 19 +-
arch/arm/mach-bcmring/csp/dmac/dmacHw.c | 27 +-
arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c | 6 +-
arch/arm/mach-bcmring/csp/tmr/tmrHw.c | 6 +-
arch/arm/mach-bcmring/include/cfg_global.h | 13 -
arch/arm/mach-bcmring/include/csp/cache.h | 35 -
arch/arm/mach-bcmring/include/csp/delay.h | 36 -
arch/arm/mach-bcmring/include/csp/errno.h | 32 -
arch/arm/mach-bcmring/include/csp/intcHw.h | 40 -
arch/arm/mach-bcmring/include/csp/module.h | 32 -
arch/arm/mach-bcmring/include/csp/secHw.h | 65 --
arch/arm/mach-bcmring/include/csp/stdint.h | 30 -
arch/arm/mach-bcmring/include/csp/string.h | 34 -
.../{cfg_global_defines.h => mach/cfg_global.h} | 11 +
.../mach-bcmring/include/mach/csp/cap_inline.h | 2 +-
.../mach-bcmring/include/mach/csp/chipcHw_def.h | 6 +-
.../include/mach/csp/chipcHw_inline.h | 119 +-
.../mach-bcmring/include/mach/csp/chipcHw_reg.h | 6 +-
.../arm/mach-bcmring/include/mach/csp/ddrcReg.h | 6 +-
.../include/{ => mach}/csp/dmacHw.h | 4 +-
.../mach-bcmring/include/mach/csp/dmacHw_priv.h | 2 +-
.../mach-bcmring/include/mach/csp/dmacHw_reg.h | 106 +-
arch/arm/mach-bcmring/include/mach/csp/hw_cfg.h | 2 +-
.../mach-bcmring/include/mach/csp/intcHw_reg.h | 18 +-
.../arm/mach-bcmring/include/mach/csp/mm_addr.h | 2 +-
arch/arm/mach-bcmring/include/mach/csp/mm_io.h | 8 +-
.../mach-bcmring/include/{ => mach}/csp/reg.h | 25 +-
.../include/mach/csp/secHw_inline.h | 10 +-
.../mach-bcmring/include/{ => mach}/csp/tmrHw.h | 2 +-
arch/arm/mach-bcmring/include/mach/dma.h | 2 +-
arch/arm/mach-bcmring/include/mach/hardware.h | 2 +-
arch/arm/mach-bcmring/include/mach/reg_nand.h | 2 +-
arch/arm/mach-bcmring/include/mach/reg_umi.h | 4 +-
arch/arm/mach-bcmring/mm.c | 4 +-
arch/arm/mach-bcmring/timer.c | 2 +-
arch/arm/mach-dove/common.c | 10 -
arch/arm/mach-dove/include/mach/dove.h | 8 +-
arch/arm/mach-dove/include/mach/io.h | 19 -
arch/arm/mach-dove/pcie.c | 43 +-
arch/arm/mach-ebsa110/core.c | 8 +-
arch/arm/mach-ebsa110/core.h | 12 +-
arch/arm/mach-exynos/clock-exynos5.c | 9 -
arch/arm/mach-exynos/include/mach/map.h | 1 -
arch/arm/mach-footbridge/common.c | 12 +-
arch/arm/mach-footbridge/dc21285.c | 16 +-
.../mach-footbridge/include/mach/debug-macro.S | 3 +-
arch/arm/mach-footbridge/include/mach/io.h | 12 +-
arch/arm/mach-imx/Makefile | 2 +-
arch/arm/mach-imx/clk-imx21.c | 1 -
arch/arm/mach-imx/clk-imx51-imx53.c | 4 +-
arch/arm/mach-imx/clk-pllv1.c | 49 +-
arch/arm/mach-imx/clk.c | 3 +
arch/arm/mach-imx/clk.h | 3 +-
arch/arm/mach-imx/mach-kzm_arm11_01.c | 5 +-
arch/arm/mach-imx/mach-mx31ads.c | 2 +-
arch/arm/mach-imx/mach-mx31lite.c | 2 +-
arch/arm/mach-integrator/core.c | 4 +-
arch/arm/mach-integrator/cpu.c | 8 +-
arch/arm/mach-integrator/include/mach/io.h | 33 -
.../arm/mach-integrator/include/mach/platform.h | 4 +
arch/arm/mach-integrator/integrator_ap.c | 21 +-
arch/arm/mach-integrator/integrator_cp.c | 6 +-
arch/arm/mach-integrator/pci_v3.c | 62 +-
arch/arm/mach-iop13xx/include/mach/io.h | 28 -
arch/arm/mach-iop13xx/include/mach/iop13xx.h | 48 +-
arch/arm/mach-iop13xx/include/mach/memory.h | 14 +-
arch/arm/mach-iop13xx/io.c | 35 +-
arch/arm/mach-iop13xx/pci.c | 53 +-
arch/arm/mach-iop13xx/pci.h | 4 +-
arch/arm/mach-iop13xx/setup.c | 20 +-
arch/arm/mach-iop32x/glantank.c | 2 +-
arch/arm/mach-iop32x/include/mach/io.h | 19 -
arch/arm/mach-iop33x/include/mach/io.h | 19 -
arch/arm/mach-ixp4xx/common.c | 8 +-
arch/arm/mach-ixp4xx/include/mach/cpu.h | 5 +-
arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h | 10 +-
arch/arm/mach-kirkwood/common.c | 10 -
arch/arm/mach-kirkwood/include/mach/io.h | 24 -
arch/arm/mach-kirkwood/include/mach/kirkwood.h | 8 +-
arch/arm/mach-kirkwood/pcie.c | 44 +-
arch/arm/mach-ks8695/cpu.c | 2 +-
arch/arm/mach-ks8695/include/mach/hardware.h | 2 +-
arch/arm/mach-ks8695/include/mach/regs-timer.h | 40 -
arch/arm/mach-ks8695/include/mach/uncompress.h | 6 +-
arch/arm/mach-ks8695/time.c | 133 ++-
arch/arm/mach-lpc32xx/common.c | 8 +-
arch/arm/mach-lpc32xx/include/mach/hardware.h | 2 +-
arch/arm/mach-mmp/Makefile | 8 +-
arch/arm/mach-mmp/clock-mmp2.c | 111 ++
arch/arm/mach-mmp/clock-pxa168.c | 91 ++
arch/arm/mach-mmp/clock-pxa910.c | 67 ++
arch/arm/mach-mmp/common.h | 3 +
arch/arm/mach-mmp/include/mach/regs-apbc.h | 95 --
arch/arm/mach-mmp/include/mach/regs-apmu.h | 15 -
arch/arm/mach-mmp/irq.c | 4 +-
arch/arm/mach-mmp/mmp2.c | 71 +-
arch/arm/mach-mmp/pxa168.c | 58 +-
arch/arm/mach-mmp/pxa910.c | 40 +-
arch/arm/mach-msm/Makefile | 4 +-
arch/arm/mach-msm/acpuclock-arm11.c | 525 ---------
arch/arm/mach-msm/acpuclock.h | 32 -
arch/arm/mach-msm/board-mahimahi.c | 1 -
arch/arm/mach-msm/board-msm7x27.c | 170 ---
arch/arm/mach-msm/board-sapphire.c | 1 -
arch/arm/mach-msm/clock-pcom.c | 18 +-
arch/arm/mach-msm/dma.c | 3 +-
arch/arm/mach-msm/idle.c | 49 -
arch/arm/mach-msm/include/mach/board.h | 10 -
arch/arm/mach-msm/include/mach/system.h | 19 -
arch/arm/mach-msm/io.c | 3 +-
arch/arm/mach-msm/proc_comm.c | 1 -
arch/arm/mach-msm/smd.c | 26 +-
arch/arm/mach-msm/timer.c | 2 +-
arch/arm/mach-mv78xx0/addr-map.c | 3 +-
arch/arm/mach-mv78xx0/common.c | 5 -
arch/arm/mach-mv78xx0/include/mach/io.h | 24 -
arch/arm/mach-mv78xx0/include/mach/mv78xx0.h | 21 +-
arch/arm/mach-mv78xx0/pcie.c | 110 +-
arch/arm/mach-nomadik/include/mach/hardware.h | 2 +-
arch/arm/mach-nomadik/include/mach/uncompress.h | 8 +-
arch/arm/mach-omap1/ams-delta-fiq-handler.S | 3 +-
arch/arm/mach-omap1/ams-delta-fiq.c | 2 +-
arch/arm/mach-omap1/board-ams-delta.c | 8 +-
arch/arm/mach-omap1/board-fsample.c | 7 +-
arch/arm/mach-omap1/board-generic.c | 8 +-
arch/arm/mach-omap1/board-h2.c | 9 +-
arch/arm/mach-omap1/board-h3.c | 7 +-
arch/arm/mach-omap1/board-htcherald.c | 8 +-
arch/arm/mach-omap1/board-innovator.c | 6 +-
arch/arm/mach-omap1/board-nokia770.c | 8 +-
arch/arm/mach-omap1/board-osk.c | 8 +-
arch/arm/mach-omap1/board-palmte.c | 10 +-
arch/arm/mach-omap1/board-palmtt.c | 10 +-
arch/arm/mach-omap1/board-palmz71.c | 10 +-
arch/arm/mach-omap1/board-perseus2.c | 7 +-
arch/arm/mach-omap1/board-sx1-mmc.c | 2 +-
arch/arm/mach-omap1/board-sx1.c | 11 +-
arch/arm/mach-omap1/board-voiceblue.c | 12 +-
arch/arm/mach-omap1/clock.c | 4 +-
arch/arm/mach-omap1/clock_data.c | 21 +-
arch/arm/mach-omap1/devices.c | 5 +-
arch/arm/mach-omap1/dma.c | 8 +-
arch/arm/mach-omap1/flash.c | 2 +-
arch/arm/mach-omap1/gpio15xx.c | 1 +
arch/arm/mach-omap1/gpio16xx.c | 1 +
arch/arm/mach-omap1/gpio7xx.c | 1 +
arch/arm/mach-omap1/i2c.c | 2 +-
.../arm/mach-omap1/include/mach/ams-delta-fiq.h | 2 -
.../include/mach}/board-ams-delta.h | 0
.../include/mach}/board-sx1.h | 0
.../include/mach}/board-voiceblue.h | 0
.../plat => mach-omap1/include/mach}/flash.h | 0
arch/arm/mach-omap1/include/mach/gpio.h | 2 -
arch/arm/mach-omap1/include/mach/hardware.h | 285 ++++-
.../plat => mach-omap1/include/mach}/irda.h | 0
arch/arm/mach-omap1/include/mach/irqs.h | 267 ++++-
.../plat => mach-omap1/include/mach}/mux.h | 0
.../plat => mach-omap1/include/mach}/omap1510.h | 3 +-
.../plat => mach-omap1/include/mach}/omap16xx.h | 3 +-
.../plat => mach-omap1/include/mach}/omap7xx.h | 3 +-
arch/arm/mach-omap1/include/mach/smp.h | 5 -
arch/arm/mach-omap1/io.c | 2 +-
arch/arm/mach-omap1/lcd_dma.c | 6 +-
arch/arm/mach-omap1/leds-h2p2-debug.c | 13 +-
arch/arm/mach-omap1/leds.c | 3 +-
arch/arm/mach-omap1/mcbsp.c | 4 +-
arch/arm/mach-omap1/mux.c | 58 +-
arch/arm/mach-omap1/pm.c | 2 +-
arch/arm/mach-omap1/serial.c | 3 +-
arch/arm/mach-omap1/usb.c | 2 +-
arch/arm/mach-omap2/Makefile | 108 +-
.../include/plat => mach-omap2}/am33xx.h | 0
arch/arm/mach-omap2/am35xx-emac.c | 2 +-
arch/arm/mach-omap2/{include/mach => }/am35xx.h | 0
arch/arm/mach-omap2/board-2430sdp.c | 8 +-
arch/arm/mach-omap2/board-3430sdp.c | 14 +-
arch/arm/mach-omap2/board-3630sdp.c | 8 +-
arch/arm/mach-omap2/board-4430sdp.c | 18 +-
arch/arm/mach-omap2/board-am3517crane.c | 10 -
arch/arm/mach-omap2/board-am3517evm.c | 13 +-
arch/arm/mach-omap2/board-apollon.c | 2 -
arch/arm/mach-omap2/board-cm-t35.c | 16 +-
arch/arm/mach-omap2/board-cm-t3517.c | 13 +-
arch/arm/mach-omap2/board-devkit8000.c | 13 +-
arch/arm/mach-omap2/board-flash.c | 8 +-
arch/arm/mach-omap2/board-generic.c | 2 -
arch/arm/mach-omap2/board-h4.c | 5 +-
arch/arm/mach-omap2/board-igep0020.c | 9 +-
arch/arm/mach-omap2/board-ldp.c | 11 +-
arch/arm/mach-omap2/board-n8x0.c | 16 +-
arch/arm/mach-omap2/board-omap3beagle.c | 7 +-
arch/arm/mach-omap2/board-omap3evm.c | 29 +-
arch/arm/mach-omap2/board-omap3logic.c | 18 +-
arch/arm/mach-omap2/board-omap3pandora.c | 9 +-
arch/arm/mach-omap2/board-omap3stalker.c | 21 +-
arch/arm/mach-omap2/board-omap3touchbook.c | 9 +-
arch/arm/mach-omap2/board-omap4panda.c | 16 +-
arch/arm/mach-omap2/board-overo.c | 19 +-
arch/arm/mach-omap2/board-rm680.c | 8 +-
arch/arm/mach-omap2/board-rx51-peripherals.c | 15 +-
arch/arm/mach-omap2/board-rx51-video.c | 4 +-
arch/arm/mach-omap2/board-rx51.c | 4 +-
.../mach-omap2/{include/mach => }/board-rx51.h | 0
arch/arm/mach-omap2/board-ti8168evm.c | 8 -
arch/arm/mach-omap2/board-zoom-debugboard.c | 12 +-
arch/arm/mach-omap2/board-zoom-display.c | 4 +-
arch/arm/mach-omap2/board-zoom-peripherals.c | 6 +-
arch/arm/mach-omap2/board-zoom.c | 1 -
arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 2 +-
arch/arm/mach-omap2/clkt34xx_dpll3m2.c | 10 +-
arch/arm/mach-omap2/clkt_clksel.c | 28 +-
arch/arm/mach-omap2/clkt_dpll.c | 10 +-
arch/arm/mach-omap2/clock.c | 28 +-
arch/arm/mach-omap2/clock2420_data.c | 2 +-
arch/arm/mach-omap2/clock2430.c | 2 +-
arch/arm/mach-omap2/clock2430_data.c | 3 +-
arch/arm/mach-omap2/clock2xxx.c | 2 +-
arch/arm/mach-omap2/clock33xx_data.c | 2 +-
arch/arm/mach-omap2/clock3xxx.c | 5 +-
arch/arm/mach-omap2/clock3xxx_data.c | 3 +-
arch/arm/mach-omap2/clock44xx_data.c | 2 +-
arch/arm/mach-omap2/clockdomain.c | 74 +-
arch/arm/mach-omap2/cm2xxx_3xxx.c | 3 +-
arch/arm/mach-omap2/common-board-devices.c | 8 +-
arch/arm/mach-omap2/common.c | 4 +-
arch/arm/mach-omap2/common.h | 9 +-
arch/arm/mach-omap2/control.c | 2 +-
arch/arm/mach-omap2/control.h | 10 +-
arch/arm/mach-omap2/cpuidle34xx.c | 1 -
.../{include/mach => }/ctrl_module_core_44xx.h | 0
.../mach => }/ctrl_module_pad_core_44xx.h | 0
.../mach => }/ctrl_module_pad_wkup_44xx.h | 0
.../{include/mach => }/ctrl_module_wkup_44xx.h | 0
arch/arm/mach-omap2/debug-devices.h | 9 +
arch/arm/mach-omap2/devices.c | 31 +-
arch/arm/mach-omap2/dpll3xxx.c | 9 +-
arch/arm/mach-omap2/dpll44xx.c | 2 +-
arch/arm/mach-omap2/dsp.c | 2 +-
arch/arm/mach-omap2/emu.c | 3 +-
arch/arm/mach-omap2/gpio.c | 1 +
arch/arm/mach-omap2/gpmc-nand.c | 34 +-
arch/arm/mach-omap2/gpmc-onenand.c | 29 +-
arch/arm/mach-omap2/gpmc-smc91x.c | 5 +-
.../include/plat => mach-omap2}/gpmc-smc91x.h | 0
arch/arm/mach-omap2/gpmc-smsc911x.c | 3 +-
.../include/plat => mach-omap2}/gpmc-smsc911x.h | 0
arch/arm/mach-omap2/gpmc.c | 169 ++-
arch/arm/mach-omap2/hdq1w.c | 2 +-
.../include/plat => mach-omap2}/hdq1w.h | 0
arch/arm/mach-omap2/hsmmc.c | 3 +-
arch/arm/mach-omap2/i2c.c | 1 -
arch/arm/mach-omap2/id.c | 9 +-
arch/arm/mach-omap2/{include/mach => }/id.h | 0
arch/arm/mach-omap2/include/mach/gpio.h | 2 -
arch/arm/mach-omap2/include/mach/hardware.h | 2 -
arch/arm/mach-omap2/include/mach/irqs.h | 2 -
arch/arm/mach-omap2/include/mach/smp.h | 5 -
arch/arm/mach-omap2/io.c | 1 +
arch/arm/mach-omap2/irq.c | 10 +-
.../include/plat => mach-omap2}/l3_2xxx.h | 0
.../include/plat => mach-omap2}/l3_3xxx.h | 0
.../include/plat => mach-omap2}/l4_2xxx.h | 0
.../include/plat => mach-omap2}/l4_3xxx.h | 0
arch/arm/mach-omap2/mailbox.c | 4 +-
arch/arm/mach-omap2/mcbsp.c | 4 +-
arch/arm/mach-omap2/msdi.c | 1 +
arch/arm/mach-omap2/omap-hotplug.c | 2 +-
arch/arm/mach-omap2/omap-iommu.c | 12 +-
arch/arm/mach-omap2/omap-mpuss-lowpower.c | 3 +-
arch/arm/mach-omap2/omap-secure.c | 2 +-
.../mach-omap2/{include/mach => }/omap-secure.h | 0
arch/arm/mach-omap2/omap-smp.c | 6 +-
arch/arm/mach-omap2/omap-wakeupgen.c | 5 +-
.../{include/mach => }/omap-wakeupgen.h | 0
.../include/plat => mach-omap2}/omap24xx.h | 2 -
.../include/plat => mach-omap2}/omap34xx.h | 2 -
arch/arm/mach-omap2/omap4-common.c | 11 +-
.../include/plat => mach-omap2}/omap4-keypad.h | 2 +
.../include/plat => mach-omap2}/omap44xx.h | 2 +-
.../include/plat => mach-omap2}/omap54xx.h | 0
arch/arm/mach-omap2/omap_hwmod.c | 24 +-
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 32 +-
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 80 +-
.../omap_hwmod_2xxx_3xxx_ipblock_data.c | 110 +-
.../omap_hwmod_2xxx_interconnect_data.c | 4 +-
.../mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 10 +-
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 160 +--
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 7 +-
arch/arm/mach-omap2/omap_hwmod_common_data.h | 1 +
arch/arm/mach-omap2/omap_l3_noc.c | 5 +-
arch/arm/mach-omap2/omap_phy_internal.c | 2 +
arch/arm/mach-omap2/opp.c | 15 +-
arch/arm/mach-omap2/opp2420_data.c | 2 +-
arch/arm/mach-omap2/opp2430_data.c | 2 +-
arch/arm/mach-omap2/opp3xxx_data.c | 2 -
arch/arm/mach-omap2/opp4xxx_data.c | 3 +-
arch/arm/mach-omap2/pm-debug.c | 1 -
arch/arm/mach-omap2/pm.c | 4 +-
arch/arm/mach-omap2/pm24xx.c | 14 +-
arch/arm/mach-omap2/pm34xx.c | 10 +-
arch/arm/mach-omap2/pm44xx.c | 8 +-
arch/arm/mach-omap2/powerdomain.c | 42 +-
arch/arm/mach-omap2/powerdomain2xxx_3xxx.c | 4 +-
arch/arm/mach-omap2/powerdomain44xx.c | 4 +-
arch/arm/mach-omap2/powerdomains3xxx_data.c | 4 +-
arch/arm/mach-omap2/prcm.c | 9 +-
arch/arm/mach-omap2/prm2xxx_3xxx.c | 7 +-
arch/arm/mach-omap2/prm44xx.c | 5 +-
arch/arm/mach-omap2/prm_common.c | 1 -
arch/arm/mach-omap2/sdrc2xxx.c | 2 +-
arch/arm/mach-omap2/serial.c | 14 +-
arch/arm/mach-omap2/sleep24xx.S | 3 +-
arch/arm/mach-omap2/sleep34xx.S | 2 +-
arch/arm/mach-omap2/sleep44xx.S | 4 +-
arch/arm/mach-omap2/soc.h | 7 +
arch/arm/mach-omap2/sr_device.c | 13 +-
arch/arm/mach-omap2/sram242x.S | 3 +-
arch/arm/mach-omap2/sram243x.S | 3 +-
arch/arm/mach-omap2/sram34xx.S | 3 +-
.../include/plat => mach-omap2}/ti81xx.h | 0
arch/arm/mach-omap2/timer.c | 11 +-
arch/arm/mach-omap2/twl-common.c | 38 +-
arch/arm/mach-omap2/twl-common.h | 9 +-
arch/arm/mach-omap2/usb-host.c | 2 -
arch/arm/mach-omap2/usb-musb.c | 7 +-
arch/arm/mach-omap2/vc.c | 8 +-
arch/arm/mach-omap2/voltage.c | 12 +-
arch/arm/mach-omap2/voltage.h | 2 +-
arch/arm/mach-omap2/voltagedomains3xxx_data.c | 3 +-
arch/arm/mach-omap2/vp.c | 16 +-
arch/arm/mach-orion5x/common.c | 10 -
arch/arm/mach-orion5x/include/mach/io.h | 22 -
arch/arm/mach-orion5x/include/mach/orion5x.h | 20 +-
arch/arm/mach-orion5x/pci.c | 56 +-
arch/arm/mach-pnx4008/Makefile | 12 -
arch/arm/mach-pnx4008/Makefile.boot | 4 -
arch/arm/mach-pnx4008/clock.c | 1001 ----------------
arch/arm/mach-pnx4008/clock.h | 43 -
arch/arm/mach-pnx4008/core.c | 290 -----
arch/arm/mach-pnx4008/dma.c | 1105 ------------------
arch/arm/mach-pnx4008/gpio.c | 328 ------
arch/arm/mach-pnx4008/i2c.c | 86 --
arch/arm/mach-pnx4008/include/mach/clock.h | 62 -
.../arm/mach-pnx4008/include/mach/debug-macro.S | 21 -
arch/arm/mach-pnx4008/include/mach/dma.h | 160 ---
.../arm/mach-pnx4008/include/mach/entry-macro.S | 116 --
.../mach-pnx4008/include/mach/gpio-pnx4008.h | 241 ----
arch/arm/mach-pnx4008/include/mach/hardware.h | 32 -
arch/arm/mach-pnx4008/include/mach/irq.h | 42 -
arch/arm/mach-pnx4008/include/mach/irqs.h | 215 ----
arch/arm/mach-pnx4008/include/mach/param.h | 21 -
arch/arm/mach-pnx4008/include/mach/platform.h | 69 --
arch/arm/mach-pnx4008/include/mach/pm.h | 33 -
arch/arm/mach-pnx4008/include/mach/timex.h | 19 -
arch/arm/mach-pnx4008/include/mach/uncompress.h | 46 -
arch/arm/mach-pnx4008/irq.c | 121 --
arch/arm/mach-pnx4008/pm.c | 153 ---
arch/arm/mach-pnx4008/serial.c | 67 --
arch/arm/mach-pnx4008/sleep.S | 195 ----
arch/arm/mach-pnx4008/time.c | 134 ---
arch/arm/mach-pnx4008/time.h | 70 --
arch/arm/mach-prima2/Kconfig | 19 +
arch/arm/mach-prima2/Makefile | 4 +-
arch/arm/mach-prima2/{prima2.c => common.c} | 11 +-
arch/arm/mach-prima2/include/mach/uncompress.h | 4 +-
arch/arm/mach-prima2/irq.c | 2 +-
arch/arm/mach-pxa/devices.c | 3 +-
arch/arm/mach-realview/realview_eb.c | 3 +-
arch/arm/mach-realview/realview_pb1176.c | 3 +-
arch/arm/mach-realview/realview_pb11mp.c | 3 +-
arch/arm/mach-realview/realview_pba8.c | 3 +-
arch/arm/mach-realview/realview_pbx.c | 3 +-
arch/arm/mach-s3c24xx/h1940-bluetooth.c | 14 +-
arch/arm/mach-s3c24xx/mach-anubis.c | 3 +-
arch/arm/mach-s3c24xx/mach-jive.c | 12 +-
arch/arm/mach-s3c24xx/mach-mini2440.c | 4 +-
arch/arm/mach-s3c24xx/mach-nexcoder.c | 22 +-
arch/arm/mach-s3c24xx/mach-osiris-dvs.c | 13 +-
arch/arm/mach-s3c24xx/mach-osiris.c | 7 +-
arch/arm/mach-sa1100/include/mach/simpad.h | 2 +-
arch/arm/mach-sa1100/simpad.c | 2 +-
arch/arm/mach-shark/core.c | 18 -
arch/arm/mach-shark/include/mach/debug-macro.S | 7 +-
arch/arm/mach-shark/include/mach/entry-macro.S | 3 +-
arch/arm/mach-shark/include/mach/io.h | 18 -
arch/arm/mach-shark/pci.c | 5 +
arch/arm/mach-shmobile/board-ag5evm.c | 1 -
arch/arm/mach-shmobile/board-ap4evb.c | 12 +-
arch/arm/mach-shmobile/board-armadillo800eva.c | 6 +-
arch/arm/mach-shmobile/board-bonito.c | 8 +-
arch/arm/mach-shmobile/board-g3evm.c | 12 +-
arch/arm/mach-shmobile/board-g4evm.c | 30 +-
arch/arm/mach-shmobile/board-kzm9g.c | 8 +-
arch/arm/mach-shmobile/board-mackerel.c | 22 +-
arch/arm/mach-shmobile/clock-r8a7740.c | 46 +-
arch/arm/mach-shmobile/clock-sh7367.c | 44 +-
arch/arm/mach-shmobile/clock-sh7372.c | 60 +-
arch/arm/mach-shmobile/clock-sh7377.c | 50 +-
arch/arm/mach-shmobile/clock-sh73a0.c | 70 +-
arch/arm/mach-shmobile/include/mach/gpio.h | 6 +-
arch/arm/mach-shmobile/intc-r8a7779.c | 14 +-
arch/arm/mach-shmobile/intc-sh7372.c | 27 +-
arch/arm/mach-shmobile/intc-sh73a0.c | 20 +-
arch/arm/mach-shmobile/pm-rmobile.c | 6 +-
arch/arm/mach-shmobile/pm-sh7372.c | 57 +-
arch/arm/mach-shmobile/setup-sh7367.c | 2 +-
arch/arm/mach-shmobile/setup-sh7377.c | 2 +-
arch/arm/mach-shmobile/setup-sh73a0.c | 2 +-
arch/arm/mach-spear13xx/include/mach/spear.h | 14 +-
arch/arm/mach-spear13xx/spear13xx.c | 6 +-
arch/arm/mach-tegra/Kconfig | 27 -
arch/arm/mach-tegra/Makefile | 12 +-
arch/arm/mach-tegra/apbio.c | 122 +-
arch/arm/mach-tegra/board-dt-tegra20.c | 23 +-
arch/arm/mach-tegra/board-harmony-pcie.c | 49 +-
arch/arm/mach-tegra/board-harmony-pinmux.c | 156 ---
arch/arm/mach-tegra/board-harmony-power.c | 156 ---
arch/arm/mach-tegra/board-harmony.c | 197 ----
arch/arm/mach-tegra/board-harmony.h | 41 -
arch/arm/mach-tegra/board-paz00-pinmux.c | 156 ---
arch/arm/mach-tegra/board-paz00.c | 192 ---
arch/arm/mach-tegra/board-paz00.h | 17 +-
arch/arm/mach-tegra/board-trimslice-pinmux.c | 155 ---
arch/arm/mach-tegra/board-trimslice.c | 183 ---
arch/arm/mach-tegra/board-trimslice.h | 30 -
arch/arm/mach-tegra/devices.c | 3 +-
arch/arm/mach-tegra/dma.c | 823 -------------
arch/arm/mach-tegra/fuse.c | 4 +-
arch/arm/mach-tegra/include/mach/dma.h | 97 --
arch/arm/mach-tegra/include/mach/io.h | 46 -
arch/arm/mach-tegra/include/mach/iomap.h | 3 +
arch/arm/mach-tegra/pcie.c | 95 +-
arch/arm/mach-u300/Kconfig | 43 +-
arch/arm/mach-u300/Makefile | 1 -
arch/arm/mach-u300/core.c | 100 +-
.../mach-u300/{include/mach => }/dma_channels.h | 11 +-
arch/arm/mach-u300/i2c.c | 6 +-
arch/arm/mach-u300/include/mach/clkdev.h | 7 -
arch/arm/mach-u300/include/mach/irqs.h | 36 +-
arch/arm/mach-u300/include/mach/platform.h | 20 -
arch/arm/mach-u300/include/mach/syscon.h | 32 +-
arch/arm/mach-u300/include/mach/u300-regs.h | 19 +-
arch/arm/mach-u300/spi.c | 2 +-
arch/arm/mach-u300/timer.c | 5 +-
arch/arm/mach-u300/timer.h | 1 +
arch/arm/mach-u300/u300-gpio.h | 46 +-
arch/arm/mach-u300/u300.c | 57 -
arch/arm/mach-ux500/cpu-db8500.c | 3 +-
arch/arm/mach-versatile/core.c | 5 -
arch/arm/mach-versatile/include/mach/hardware.h | 1 -
arch/arm/mach-versatile/include/mach/io.h | 27 -
arch/arm/mach-versatile/pci.c | 22 +-
arch/arm/mach-vexpress/ct-ca9x4.c | 3 +-
arch/arm/mm/ioremap.c | 14 +
arch/arm/mm/mmu.c | 54 +-
arch/arm/plat-iop/pci.c | 25 +-
arch/arm/plat-iop/pmu.c | 3 +-
arch/arm/plat-iop/setup.c | 5 -
arch/arm/plat-mxc/Makefile | 2 +-
arch/arm/plat-mxc/clock.c | 257 ----
arch/arm/plat-mxc/cpufreq.c | 1 -
arch/arm/plat-mxc/devices/platform-imx-uart.c | 2 +-
arch/arm/plat-mxc/include/mach/clock.h | 70 --
arch/arm/plat-mxc/include/mach/mx2_cam.h | 2 -
arch/arm/plat-mxc/include/mach/mx31.h | 6 +-
arch/arm/plat-mxc/system.c | 4 -
arch/arm/plat-omap/Kconfig | 1 +
arch/arm/plat-omap/Makefile | 3 +-
arch/arm/plat-omap/common.c | 42 +-
arch/arm/plat-omap/counter_32k.c | 3 -
arch/arm/plat-omap/debug-devices.c | 3 -
arch/arm/plat-omap/debug-leds.c | 1 +
arch/arm/plat-omap/devices.c | 92 --
arch/arm/plat-omap/dma.c | 54 +-
arch/arm/plat-omap/fb.c | 2 -
arch/arm/plat-omap/i2c.c | 4 +-
arch/arm/plat-omap/include/plat/board.h | 138 ---
arch/arm/plat-omap/include/plat/cpu.h | 3 +
arch/arm/plat-omap/include/plat/dma.h | 2 +
arch/arm/plat-omap/include/plat/gpio-switch.h | 54 -
arch/arm/plat-omap/include/plat/gpmc.h | 19 +
arch/arm/plat-omap/include/plat/hardware.h | 293 -----
arch/arm/plat-omap/include/plat/irqs-44xx.h | 144 ---
arch/arm/plat-omap/include/plat/irqs.h | 453 -------
arch/arm/plat-omap/include/plat/mmc.h | 1 -
arch/arm/plat-omap/include/plat/omap-serial.h | 4 +-
arch/arm/plat-omap/include/plat/param.h | 8 -
arch/arm/plat-omap/include/plat/usb.h | 1 -
arch/arm/plat-omap/mux.c | 90 --
arch/arm/plat-omap/omap-pm-noop.c | 39 +-
arch/arm/plat-omap/omap_device.c | 25 +-
arch/arm/plat-omap/sram.c | 1 -
arch/arm/plat-samsung/devs.c | 3 +-
arch/arm/plat-samsung/include/plat/gpio-fns.h | 97 --
arch/arm/plat-samsung/s5p-irq-gpioint.c | 4 +-
arch/arm/tools/mach-types | 1 -
drivers/dma/omap-dma.c | 2 +
drivers/gpio/gpio-omap.c | 15 +-
drivers/gpio/gpio-samsung.c | 40 -
drivers/gpio/gpio-tegra.c | 3 -
drivers/gpio/gpio-twl4030.c | 15 +-
drivers/i2c/busses/Kconfig | 2 +-
drivers/i2c/busses/i2c-iop3xx.c | 121 +-
drivers/input/keyboard/Kconfig | 2 +-
drivers/input/keyboard/omap-keypad.c | 156 +--
drivers/input/mouse/rpcmouse.c | 2 +-
drivers/input/serio/ams_delta_serio.c | 2 +-
drivers/media/video/omap/omap_vout.c | 1 +
drivers/media/video/omap3isp/isp.c | 2 +
drivers/mfd/twl-core.c | 54 +-
drivers/mmc/host/omap.c | 2 -
drivers/mmc/host/omap_hsmmc.c | 1 -
drivers/mmc/host/sdhci-tegra.c | 1 -
drivers/mtd/nand/ams-delta.c | 10 +-
drivers/mtd/nand/bcm_umi_nand.c | 12 +-
drivers/mtd/nand/nand_bcm_umi.h | 73 +-
drivers/mtd/nand/omap2.c | 303 +++--
drivers/mtd/onenand/omap2.c | 34 +-
drivers/net/ethernet/seeq/ether3.c | 4 +-
drivers/pcmcia/omap_cf.c | 2 +-
drivers/pinctrl/pinctrl-coh901.c | 220 +---
drivers/power/avs/smartreflex.c | 2 +
drivers/remoteproc/omap_remoteproc.c | 2 +-
drivers/scsi/arm/eesox.c | 2 +-
drivers/spi/Kconfig | 2 +-
drivers/spi/spi-omap-uwire.c | 5 +-
drivers/spi/spi-omap2-mcspi.c | 2 +-
drivers/spi/spi-tegra.c | 55 +-
drivers/staging/tidspbridge/core/dsp-clock.c | 2 +-
drivers/staging/tidspbridge/core/tiomap3430.c | 2 +-
.../staging/tidspbridge/core/tiomap3430_pwr.c | 2 +-
drivers/staging/tidspbridge/core/tiomap_io.c | 2 +-
drivers/staging/tidspbridge/core/wdt.c | 2 +-
.../staging/tidspbridge/rmgr/drv_interface.c | 2 +-
drivers/tty/serial/serial_ks8695.c | 4 +-
drivers/usb/Kconfig | 1 -
drivers/usb/host/Kconfig | 2 +-
drivers/usb/host/ohci-hcd.c | 2 +-
drivers/usb/host/ohci-nxp.c | 84 +-
drivers/usb/host/ohci-omap.c | 2 +-
drivers/usb/musb/tusb6010_omap.c | 1 -
drivers/usb/otg/isp1301_omap.c | 2 +-
drivers/video/backlight/omap1_bl.c | 4 +-
drivers/video/da8xx-fb.c | 8 +-
drivers/video/omap/lcd_ams_delta.c | 3 +-
drivers/video/omap/lcd_mipid.c | 2 +-
drivers/video/omap/lcd_osk.c | 2 +-
drivers/video/omap2/dss/dispc.c | 1 +
drivers/video/omap2/omapfb/omapfb-main.c | 1 +
drivers/watchdog/Kconfig | 6 +-
drivers/watchdog/ks8695_wdt.c | 14 +-
drivers/watchdog/omap_wdt.c | 5 +
include/linux/i2c/twl.h | 3 -
include/linux/mfd/twl6040.h | 1 -
include/linux/omapfb.h | 7 +-
.../linux/platform_data/asoc-ti-mcbsp.h | 0
.../linux/platform_data/dsp-omap.h | 0
.../linux/platform_data/gpio-omap.h | 15 +-
.../linux/platform_data/keypad-omap.h | 0
.../linux/platform_data/lcd-mipid.h | 0
.../linux/platform_data/mtd-nand-omap2.h | 3 +-
.../linux/platform_data/mtd-onenand-omap2.h | 0
include/linux/platform_data/omap1_bl.h | 11 +
.../linux/platform_data/pinctrl-coh901.h | 13 +-
.../linux/platform_data/remoteproc-omap.h | 0
.../linux/platform_data/spi-omap2-mcspi.h | 0
.../linux/platform_data/voltage-omap.h | 0
include/linux/power/smartreflex.h | 2 +-
sound/soc/omap/am3517evm.c | 2 +-
sound/soc/omap/ams-delta.c | 4 +-
sound/soc/omap/igep0020.c | 2 +-
sound/soc/omap/mcbsp.c | 4 +-
sound/soc/omap/n810.c | 2 +-
sound/soc/omap/omap-abe-twl6040.c | 4 -
sound/soc/omap/omap-mcbsp.c | 3 +-
sound/soc/omap/omap-mcpdm.c | 2 +
sound/soc/omap/omap-pcm.c | 1 +
sound/soc/omap/omap3beagle.c | 2 +-
sound/soc/omap/omap3evm.c | 2 +-
sound/soc/omap/omap3pandora.c | 2 +-
sound/soc/omap/osk5912.c | 2 +-
sound/soc/omap/overo.c | 2 +-
sound/soc/omap/rx51.c | 2 +-
sound/soc/omap/sdp3430.c | 3 +-
sound/soc/omap/zoom2.c | 2 +-
sound/soc/tegra/Kconfig | 2 +-
sound/soc/tegra/tegra_pcm.c | 232 ----
sound/soc/tegra/tegra_pcm.h | 14 -
623 files changed, 4618 insertions(+), 15490 deletions(-)
delete mode 100644 arch/arm/configs/pnx4008_defconfig
create mode 100644 arch/arm/kernel/perf_event_cpu.c
delete mode 100644 arch/arm/kernel/pmu.c
delete mode 100644 arch/arm/mach-bcmring/include/cfg_global.h
delete mode 100644 arch/arm/mach-bcmring/include/csp/cache.h
delete mode 100644 arch/arm/mach-bcmring/include/csp/delay.h
delete mode 100644 arch/arm/mach-bcmring/include/csp/errno.h
delete mode 100644 arch/arm/mach-bcmring/include/csp/intcHw.h
delete mode 100644 arch/arm/mach-bcmring/include/csp/module.h
delete mode 100644 arch/arm/mach-bcmring/include/csp/secHw.h
delete mode 100644 arch/arm/mach-bcmring/include/csp/stdint.h
delete mode 100644 arch/arm/mach-bcmring/include/csp/string.h
rename arch/arm/mach-bcmring/include/{cfg_global_defines.h => mach/cfg_global.h} (74%)
rename arch/arm/mach-bcmring/include/{ => mach}/csp/dmacHw.h (99%)
rename arch/arm/mach-bcmring/include/{ => mach}/csp/reg.h (81%)
rename arch/arm/mach-bcmring/include/{ => mach}/csp/tmrHw.h (99%)
delete mode 100644 arch/arm/mach-dove/include/mach/io.h
create mode 100644 arch/arm/mach-imx/clk.c
delete mode 100644 arch/arm/mach-integrator/include/mach/io.h
delete mode 100644 arch/arm/mach-iop13xx/include/mach/io.h
delete mode 100644 arch/arm/mach-iop32x/include/mach/io.h
delete mode 100644 arch/arm/mach-iop33x/include/mach/io.h
delete mode 100644 arch/arm/mach-kirkwood/include/mach/io.h
delete mode 100644 arch/arm/mach-ks8695/include/mach/regs-timer.h
create mode 100644 arch/arm/mach-mmp/clock-mmp2.c
create mode 100644 arch/arm/mach-mmp/clock-pxa168.c
create mode 100644 arch/arm/mach-mmp/clock-pxa910.c
delete mode 100644 arch/arm/mach-msm/acpuclock-arm11.c
delete mode 100644 arch/arm/mach-msm/acpuclock.h
delete mode 100644 arch/arm/mach-msm/board-msm7x27.c
delete mode 100644 arch/arm/mach-msm/idle.c
delete mode 100644 arch/arm/mach-msm/include/mach/system.h
delete mode 100644 arch/arm/mach-mv78xx0/include/mach/io.h
rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/board-ams-delta.h (100%)
rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/board-sx1.h (100%)
rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/board-voiceblue.h (100%)
rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/flash.h (100%)
rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/irda.h (100%)
rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/mux.h (100%)
rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/omap1510.h (97%)
rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/omap16xx.h (99%)
rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/omap7xx.h (98%)
delete mode 100644 arch/arm/mach-omap1/include/mach/smp.h
rename arch/arm/{plat-omap/include/plat => mach-omap2}/am33xx.h (100%)
rename arch/arm/mach-omap2/{include/mach => }/am35xx.h (100%)
rename arch/arm/mach-omap2/{include/mach => }/board-rx51.h (100%)
rename arch/arm/mach-omap2/{include/mach => }/ctrl_module_core_44xx.h (100%)
rename arch/arm/mach-omap2/{include/mach => }/ctrl_module_pad_core_44xx.h (100%)
rename arch/arm/mach-omap2/{include/mach => }/ctrl_module_pad_wkup_44xx.h (100%)
rename arch/arm/mach-omap2/{include/mach => }/ctrl_module_wkup_44xx.h (100%)
create mode 100644 arch/arm/mach-omap2/debug-devices.h
rename arch/arm/{plat-omap/include/plat => mach-omap2}/gpmc-smc91x.h (100%)
rename arch/arm/{plat-omap/include/plat => mach-omap2}/gpmc-smsc911x.h (100%)
rename arch/arm/{plat-omap/include/plat => mach-omap2}/hdq1w.h (100%)
rename arch/arm/mach-omap2/{include/mach => }/id.h (100%)
delete mode 100644 arch/arm/mach-omap2/include/mach/smp.h
rename arch/arm/{plat-omap/include/plat => mach-omap2}/l3_2xxx.h (100%)
rename arch/arm/{plat-omap/include/plat => mach-omap2}/l3_3xxx.h (100%)
rename arch/arm/{plat-omap/include/plat => mach-omap2}/l4_2xxx.h (100%)
rename arch/arm/{plat-omap/include/plat => mach-omap2}/l4_3xxx.h (100%)
rename arch/arm/mach-omap2/{include/mach => }/omap-secure.h (100%)
rename arch/arm/mach-omap2/{include/mach => }/omap-wakeupgen.h (100%)
rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap24xx.h (98%)
rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap34xx.h (98%)
rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap4-keypad.h (87%)
rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap44xx.h (97%)
rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap54xx.h (100%)
create mode 100644 arch/arm/mach-omap2/soc.h
rename arch/arm/{plat-omap/include/plat => mach-omap2}/ti81xx.h (100%)
delete mode 100644 arch/arm/mach-orion5x/include/mach/io.h
delete mode 100644 arch/arm/mach-pnx4008/Makefile
delete mode 100644 arch/arm/mach-pnx4008/Makefile.boot
delete mode 100644 arch/arm/mach-pnx4008/clock.c
delete mode 100644 arch/arm/mach-pnx4008/clock.h
delete mode 100644 arch/arm/mach-pnx4008/core.c
delete mode 100644 arch/arm/mach-pnx4008/dma.c
delete mode 100644 arch/arm/mach-pnx4008/gpio.c
delete mode 100644 arch/arm/mach-pnx4008/i2c.c
delete mode 100644 arch/arm/mach-pnx4008/include/mach/clock.h
delete mode 100644 arch/arm/mach-pnx4008/include/mach/debug-macro.S
delete mode 100644 arch/arm/mach-pnx4008/include/mach/dma.h
delete mode 100644 arch/arm/mach-pnx4008/include/mach/entry-macro.S
delete mode 100644 arch/arm/mach-pnx4008/include/mach/gpio-pnx4008.h
delete mode 100644 arch/arm/mach-pnx4008/include/mach/hardware.h
delete mode 100644 arch/arm/mach-pnx4008/include/mach/irq.h
delete mode 100644 arch/arm/mach-pnx4008/include/mach/irqs.h
delete mode 100644 arch/arm/mach-pnx4008/include/mach/param.h
delete mode 100644 arch/arm/mach-pnx4008/include/mach/platform.h
delete mode 100644 arch/arm/mach-pnx4008/include/mach/pm.h
delete mode 100644 arch/arm/mach-pnx4008/include/mach/timex.h
delete mode 100644 arch/arm/mach-pnx4008/include/mach/uncompress.h
delete mode 100644 arch/arm/mach-pnx4008/irq.c
delete mode 100644 arch/arm/mach-pnx4008/pm.c
delete mode 100644 arch/arm/mach-pnx4008/serial.c
delete mode 100644 arch/arm/mach-pnx4008/sleep.S
delete mode 100644 arch/arm/mach-pnx4008/time.c
delete mode 100644 arch/arm/mach-pnx4008/time.h
create mode 100644 arch/arm/mach-prima2/Kconfig
rename arch/arm/mach-prima2/{prima2.c => common.c} (81%)
delete mode 100644 arch/arm/mach-shark/include/mach/io.h
delete mode 100644 arch/arm/mach-tegra/board-harmony-pinmux.c
delete mode 100644 arch/arm/mach-tegra/board-harmony-power.c
delete mode 100644 arch/arm/mach-tegra/board-harmony.c
delete mode 100644 arch/arm/mach-tegra/board-harmony.h
delete mode 100644 arch/arm/mach-tegra/board-paz00-pinmux.c
delete mode 100644 arch/arm/mach-tegra/board-trimslice-pinmux.c
delete mode 100644 arch/arm/mach-tegra/board-trimslice.c
delete mode 100644 arch/arm/mach-tegra/board-trimslice.h
delete mode 100644 arch/arm/mach-tegra/dma.c
delete mode 100644 arch/arm/mach-tegra/include/mach/io.h
rename arch/arm/mach-u300/{include/mach => }/dma_channels.h (88%)
delete mode 100644 arch/arm/mach-u300/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-u300/include/mach/platform.h
create mode 100644 arch/arm/mach-u300/timer.h
delete mode 100644 arch/arm/mach-u300/u300.c
delete mode 100644 arch/arm/mach-versatile/include/mach/io.h
delete mode 100644 arch/arm/plat-mxc/clock.c
delete mode 100644 arch/arm/plat-mxc/include/mach/clock.h
delete mode 100644 arch/arm/plat-omap/devices.c
delete mode 100644 arch/arm/plat-omap/include/plat/board.h
delete mode 100644 arch/arm/plat-omap/include/plat/gpio-switch.h
delete mode 100644 arch/arm/plat-omap/include/plat/hardware.h
delete mode 100644 arch/arm/plat-omap/include/plat/irqs-44xx.h
delete mode 100644 arch/arm/plat-omap/include/plat/irqs.h
delete mode 100644 arch/arm/plat-omap/include/plat/param.h
delete mode 100644 arch/arm/plat-omap/mux.c
rename arch/arm/plat-omap/include/plat/mcbsp.h => include/linux/platform_data/asoc-ti-mcbsp.h (100%)
rename arch/arm/plat-omap/include/plat/dsp.h => include/linux/platform_data/dsp-omap.h (100%)
rename arch/arm/plat-omap/include/plat/gpio.h => include/linux/platform_data/gpio-omap.h (94%)
rename arch/arm/plat-omap/include/plat/keypad.h => include/linux/platform_data/keypad-omap.h (100%)
rename arch/arm/plat-omap/include/plat/lcd_mipid.h => include/linux/platform_data/lcd-mipid.h (100%)
rename arch/arm/plat-omap/include/plat/nand.h => include/linux/platform_data/mtd-nand-omap2.h (96%)
rename arch/arm/plat-omap/include/plat/onenand.h => include/linux/platform_data/mtd-onenand-omap2.h (100%)
create mode 100644 include/linux/platform_data/omap1_bl.h
rename arch/arm/mach-u300/include/mach/gpio-u300.h => include/linux/platform_data/pinctrl-coh901.h (72%)
rename arch/arm/plat-omap/include/plat/remoteproc.h => include/linux/platform_data/remoteproc-omap.h (100%)
rename arch/arm/plat-omap/include/plat/mcspi.h => include/linux/platform_data/spi-omap2-mcspi.h (100%)
rename arch/arm/plat-omap/include/plat/voltage.h => include/linux/platform_data/voltage-omap.h (100%)
^ permalink raw reply
* [GIT PULL 3/12] ARM: soc: MAINTAINERS updates
From: Olof Johansson @ 2012-10-01 23:56 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1349135827-24790-1-git-send-email-olof@lixom.net>
Maintainers updates for KS8965 adding Greg Ungerer, and removing
myself and Colin Cross as tegra maintainers, since Stephen Warren has
been handling it on his own for several releases now.
Conflicts: none
----------------------------------------------------------------
The following changes since commit ed0a0ed0a4e0e6eeebfa154f97ebb41abc5bbee8:
Merge branch 'next/cleanup' into HEAD
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/maintainers
for you to fetch changes up to d192f93cfca6a0aedbf10fa548d8bc17b86275d6:
Merge tag 'tegra-for-3.7-maintainers' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/maintainers
----------------------------------------------------------------
Arnd Bergmann (1):
ARM: ks8695: add maintainers entry
Olof Johansson (1):
Merge tag 'tegra-for-3.7-maintainers' of git://git.kernel.org/.../swarren/linux-tegra into next/maintainers
Stephen Warren (1):
MAINTAINERS: tegra: remove Olof/Colin, add device tree files
Uwe Kleine-K?nig (1):
MAINTAINERS: add defconfig file to TEGRA section
MAINTAINERS | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
^ permalink raw reply
* [GIT PULL 4/12] ARM: soc: soc-specific updates
From: Olof Johansson @ 2012-10-01 23:56 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1349135827-24790-1-git-send-email-olof@lixom.net>
Most notable here is probably the addition of basic support for the
BCM2835, an SoC used in some of the Roku 2 players as well as the
much-hyped Raspberry Pi, cleaned up and contributed by Stephen
Warren. It's still early days on mainline support, with just the
basics working. But it has to start somewhere!
Beyond that there's some conversions of clock infrastructure on tegra
to common clock, misc updates for several other platforms, and OMAP
now has its own bus (under drivers/bus) to manage its devices through.
This branch adds two new directories outside of arch/arm:
drivers/irqchip for new irq controllers, and drivers/bus for the above
OMAP bus. It's expected that some of the other platforms will migrate
parts of their platforms to those directories over time as well.
Conflicts:
* Trivial add/add conflict in arch/arm/mach-ux500/cpu.c
* Trivial add/add conflict in drivers/clocksource/Makefile
* Change/delete conflict in arch/arm/mach-ux500/clock.c. Remove the file.
----------------------------------------------------------------
The following changes since commit f7b967bffefe69f1ad8b79e263237ec1feba7b9b:
Merge branch 'next/maintainers' into HEAD
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/soc
for you to fetch changes up to b6e3b5c2fea9c76617e101cbbc54ed14961f9dee:
Merge branch 'lpc32xx/core' of git://git.antcom.de/linux-2.6 into next/soc
----------------------------------------------------------------
Alex Gershgorin (1):
ARM: i.MX35: Implement camera and keypad clocks
Arnd Bergmann (2):
Merge branch 'ux500-core' of git://git.kernel.org/.../linusw/linux-stericsson into next/soc
ARM: shmobile: add new __iomem annotation for new code
Chander Kashyap (3):
ARM: EXYNOS: Turn off clocks for NAND, OneNAND and TSI controllers
ARM: EXYNOS: Put PCM, Slimbus, Spdif clocks to off state
ARM: SAMSUNG: Add check for NULL in clock interface
Dave Martin (1):
ARM: mxc: ssi-fiq: Make ssi-fiq.S Thumb-2 compatible
Joseph Lo (7):
ARM: tegra: clocks: separate tegra_clk_32k_ops from Tegra20 and Tegra30
ARM: tegra30: clocks: fix the wrong tegra_audio_sync_clk_ops name
ARM: tegra: introduce tegra_cpu_car_ops structures
ARM: tegra: replace the CPU CAR access code by tegra_cpu_car_ops
ARM: tegra: clean up the common assembly macros into sleep.h
ARM: tegra30: add CPU hotplug support
ARM: tegra20: add CPU hotplug support
Kevin Hilman (4):
ARM: OMAP: omap_device: keep track of driver bound status
ARM: OMAP: omap_device: don't attempt late suspend if no driver bound
ARM: OMAP: omap_device: idle devices with no driver bound
ARM: OMAP: AM33xx hwmod: fixup SPI after platform_data move
Leela Krishna Amudala (1):
ARM: EXYNOS: Add bus clock for FIMD
Linus Walleij (4):
ARM: ux500: delete remnant U5500 macros
ARM: ux500: add a U8520 detection macro
ARM: ux500: reform Ux500 family names
ARM: ux500: add detection for DB8500 ASIC v2.2
Loic PALLARDY (1):
ARM: ux500: Correct Ux500 family names usage
Olof Johansson (14):
Merge branch 'ux500/asic-id' into next/soc
Merge branch 'kzm9g' of git://git.kernel.org/.../horms/renesas into next/soc
Merge branch 'lpc32xx/core' of git://git.antcom.de/linux-2.6 into next/soc
Merge branch 'soc' of git://git.kernel.org/.../horms/renesas into next/soc
Merge branch 'renesas/pmu' into next/soc
Merge tag 'imx-soc' of git://git.pengutronix.de/git/imx/linux-2.6 into next/soc
Merge tag 'tegra-for-3.7-common-clk' of git://git.kernel.org/.../swarren/linux-tegra into next/soc
Merge tag 'tegra-for-3.7-cpu-hotplug' of git://git.kernel.org/.../swarren/linux-tegra into next/soc
Merge tag 'devel-omap-device-for-v3.7' of git://git.kernel.org/.../tmlind/linux-omap into next/soc
Merge tag 'omap-devel-am33xx-for-v3.7' of git://git.kernel.org/.../tmlind/linux-omap into next/soc
Merge tag 'rpi-for-3.7' of git://git.kernel.org/.../swarren/linux-rpi into next/soc
Merge branch 'next/devel-samsung' of git://git.kernel.org/.../kgene/linux-samsung into next/soc
Merge branch 'bcm2835/soc' into next/soc
Merge branch 'lpc32xx/core' of git://git.antcom.de/linux-2.6 into next/soc
Phil Edworthy (1):
r8a7779: add SDHI clock support
Prashant Gaikwad (8):
ARM: tegra30: Separate out clk ops and clk data
ARM: tegra20: Separate out clk ops and clk data
ARM: tegra: Rename tegra20 clock file
ARM: tegra: Add clk_tegra structure and helper functions
ARM: tegra: Port tegra to generic clock framework
ARM: tegra: Remove duplicate code
ARM: tegra: Fix data type for io address
ARM: Tegra: Add smp_twd clock for Tegra20
Roland Stigge (6):
ARM: LPC32xx: Use handle_edge_irq() callback on edge type irqs
ARM: LPC32xx: Provide DMA filter callbacks via platform data
ARM: LPC32xx: Remove board specific GPIO init
ARM: LPC32xx: Board cleanup
ARM: LPC32xx: Platform update for devicetree completion of spi-pl022
ARM: LPC32xx: Support GPI 28
Sachin Kamat (2):
ARM: EXYNOS: Fix incorrect help text
ARM: SAMSUNG: Fix HDMI related warnings
Sascha Hauer (1):
ARM i.MX53: register CAN clocks
Simon Arlott (5):
ARM: add infra-structure for BCM2835 and Raspberry Pi
ARM: bcm2835: add interrupt controller driver
ARM: bcm2835: add system timer
ARM: bcm2835: add stub clock driver
ARM: bcm2835: instantiate console UART
Stephen Warren (7):
ARM: tegra: turn on UART A clock at boot
ARM: tegra: fix U16 divider range check
ARM: tegra: remove tegra_timer from tegra_list_clks
ARM: tegra: fix overflow in tegra20_pll_clk_round_rate()
ARM: tegra: cpu-tegra: explicitly manage re-parenting
MAINTAINERS: add an entry for the BCM2835 ARM sub-architecture
irqchip: fill in empty Kconfig
Sylwester Nawrocki (1):
ARM: S3C24XX: Add .get_rate callback for "camif-upll" clock
Tetsuyuki Kobayashi (3):
ARM: shmobile: kzm9g: enable restarting
ARM: shmobile: sh73a0: enable PMU(Performance Monitoring Unit)
ARM: shmobile: emev2: enable PMU(Performance Monitoring Unit)
Tony Lindgren (2):
Merge tag 'for_3.7-omap_device' of git://git.kernel.org/.../khilman/linux-omap-pm into devel-omap-device
Merge tag 'omap-devel-a2-for-3.7' of git://git.kernel.org/.../pjw/omap-pending into devel-am33xx
Torben Hohn (1):
arm imx31: add a few pinmux settings the tt01 needs
Vaibhav Hiremath (4):
ARM: OMAP2+: hwmod: Hook-up am33xx support in omap_hwmod framework
ARM: OMAP3+: hwmod: Add AM33XX HWMOD data
ARM: OMAP2+: dpll: Add missing soc_is_am33xx() check for common functions
ARM: AM33XX: clock: Add dcan clock aliases for device-tree
.../devicetree/bindings/arm/bcm2835.txt | 8 +
.../brcm,bcm2835-armctrl-ic.txt | 110 +
.../timer/brcm,bcm2835-system-timer.txt | 22 +
.../devicetree/bindings/vendor-prefixes.txt | 1 +
MAINTAINERS | 10 +
arch/arm/Kconfig | 18 +
arch/arm/Makefile | 1 +
arch/arm/boot/dts/bcm2835-rpi-b.dts | 12 +
arch/arm/boot/dts/bcm2835.dtsi | 39 +
arch/arm/configs/bcm2835_defconfig | 95 +
arch/arm/configs/kzm9d_defconfig | 1 +
arch/arm/configs/kzm9g_defconfig | 1 +
arch/arm/mach-bcm2835/Makefile | 1 +
arch/arm/mach-bcm2835/Makefile.boot | 5 +
arch/arm/mach-bcm2835/bcm2835.c | 64 +
.../arm/mach-bcm2835/include/mach/bcm2835_soc.h | 29 +
.../arm/mach-bcm2835/include/mach/debug-macro.S | 21 +
arch/arm/mach-bcm2835/include/mach/timex.h | 26 +
arch/arm/mach-bcm2835/include/mach/uncompress.h | 45 +
arch/arm/mach-exynos/Kconfig | 4 +-
arch/arm/mach-exynos/clock-exynos4.c | 31 +
arch/arm/mach-exynos/clock-exynos5.c | 32 +-
arch/arm/mach-imx/clk-imx35.c | 11 +-
arch/arm/mach-imx/clk-imx51-imx53.c | 14 +-
.../mach-lpc32xx/include/mach/gpio-lpc32xx.h | 2 +-
arch/arm/mach-lpc32xx/irq.c | 7 +-
arch/arm/mach-lpc32xx/phy3250.c | 42 +-
arch/arm/mach-omap2/Makefile | 1 +
arch/arm/mach-omap2/clkt_dpll.c | 4 +-
arch/arm/mach-omap2/clock33xx_data.c | 2 +
arch/arm/mach-omap2/dpll3xxx.c | 4 +-
arch/arm/mach-omap2/io.c | 2 +
arch/arm/mach-omap2/omap_hwmod.c | 178 +
arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 3381 ++++++++++++++++++
arch/arm/mach-s3c24xx/clock-s3c2440.c | 14 +
arch/arm/mach-shmobile/board-kzm9g.c | 8 +
arch/arm/mach-shmobile/clock-r8a7779.c | 11 +-
arch/arm/mach-shmobile/setup-emev2.c | 21 +
arch/arm/mach-shmobile/setup-sh73a0.c | 21 +
arch/arm/mach-tegra/Makefile | 6 +-
arch/arm/mach-tegra/board-dt-tegra20.c | 1 +
arch/arm/mach-tegra/clock.c | 574 +--
arch/arm/mach-tegra/clock.h | 40 +-
arch/arm/mach-tegra/common.c | 4 +-
arch/arm/mach-tegra/cpu-tegra.c | 48 +-
arch/arm/mach-tegra/headsmp.S | 6 +-
arch/arm/mach-tegra/hotplug.c | 118 +-
arch/arm/mach-tegra/include/mach/clk.h | 3 +
arch/arm/mach-tegra/platsmp.c | 29 +-
arch/arm/mach-tegra/sleep-t20.S | 82 +
arch/arm/mach-tegra/sleep-t30.S | 107 +
arch/arm/mach-tegra/sleep.S | 33 +-
arch/arm/mach-tegra/sleep.h | 85 +
arch/arm/mach-tegra/tegra20_clocks.c | 1625 +++++++++
arch/arm/mach-tegra/tegra20_clocks.h | 42 +
arch/arm/mach-tegra/tegra20_clocks_data.c | 1144 ++++++
arch/arm/mach-tegra/tegra2_clocks.c | 2484 -------------
arch/arm/mach-tegra/tegra30_clocks.c | 2593 +++++---------
arch/arm/mach-tegra/tegra30_clocks.h | 53 +
arch/arm/mach-tegra/tegra30_clocks_data.c | 1372 +++++++
arch/arm/mach-tegra/tegra_cpu_car.h | 87 +
arch/arm/mach-ux500/cache-l2x0.c | 2 +-
arch/arm/mach-ux500/cpu-db8500.c | 2 +-
arch/arm/mach-ux500/cpu.c | 2 +-
arch/arm/mach-ux500/include/mach/id.h | 44 +-
arch/arm/mach-ux500/platsmp.c | 4 +-
arch/arm/mach-ux500/timer.c | 2 +-
arch/arm/plat-mxc/include/mach/iomux-mx3.h | 5 +
arch/arm/plat-mxc/ssi-fiq.S | 89 +-
arch/arm/plat-omap/include/plat/omap_device.h | 2 +
arch/arm/plat-omap/include/plat/omap_hwmod.h | 1 +
arch/arm/plat-omap/omap_device.c | 56 +-
arch/arm/plat-samsung/clock.c | 8 +-
arch/arm/plat-samsung/devs.c | 3 +-
drivers/Kconfig | 2 +
drivers/Makefile | 2 +
drivers/clk/Makefile | 1 +
drivers/clk/clk-bcm2835.c | 59 +
drivers/clocksource/Makefile | 1 +
drivers/clocksource/bcm2835_timer.c | 161 +
drivers/irqchip/Kconfig | 1 +
drivers/irqchip/Makefile | 1 +
drivers/irqchip/irq-bcm2835.c | 223 ++
include/linux/bcm2835_timer.h | 22 +
include/linux/clk/bcm2835.h | 24 +
include/linux/irqchip/bcm2835.h | 29 +
86 files changed, 10542 insertions(+), 5039 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/bcm2835.txt
create mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt
create mode 100644 Documentation/devicetree/bindings/timer/brcm,bcm2835-system-timer.txt
create mode 100644 arch/arm/boot/dts/bcm2835-rpi-b.dts
create mode 100644 arch/arm/boot/dts/bcm2835.dtsi
create mode 100644 arch/arm/configs/bcm2835_defconfig
create mode 100644 arch/arm/mach-bcm2835/Makefile
create mode 100644 arch/arm/mach-bcm2835/Makefile.boot
create mode 100644 arch/arm/mach-bcm2835/bcm2835.c
create mode 100644 arch/arm/mach-bcm2835/include/mach/bcm2835_soc.h
create mode 100644 arch/arm/mach-bcm2835/include/mach/debug-macro.S
create mode 100644 arch/arm/mach-bcm2835/include/mach/timex.h
create mode 100644 arch/arm/mach-bcm2835/include/mach/uncompress.h
create mode 100644 arch/arm/mach-omap2/omap_hwmod_33xx_data.c
create mode 100644 arch/arm/mach-tegra/sleep-t20.S
create mode 100644 arch/arm/mach-tegra/sleep-t30.S
create mode 100644 arch/arm/mach-tegra/sleep.h
create mode 100644 arch/arm/mach-tegra/tegra20_clocks.c
create mode 100644 arch/arm/mach-tegra/tegra20_clocks.h
create mode 100644 arch/arm/mach-tegra/tegra20_clocks_data.c
delete mode 100644 arch/arm/mach-tegra/tegra2_clocks.c
create mode 100644 arch/arm/mach-tegra/tegra30_clocks.h
create mode 100644 arch/arm/mach-tegra/tegra30_clocks_data.c
create mode 100644 arch/arm/mach-tegra/tegra_cpu_car.h
create mode 100644 drivers/clk/clk-bcm2835.c
create mode 100644 drivers/clocksource/bcm2835_timer.c
create mode 100644 drivers/irqchip/Kconfig
create mode 100644 drivers/irqchip/Makefile
create mode 100644 drivers/irqchip/irq-bcm2835.c
create mode 100644 include/linux/bcm2835_timer.h
create mode 100644 include/linux/clk/bcm2835.h
create mode 100644 include/linux/irqchip/bcm2835.h
^ permalink raw reply
* [GIT PULL 5/12] ARM: soc: device tree updates
From: Olof Johansson @ 2012-10-01 23:57 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1349135827-24790-1-git-send-email-olof@lixom.net>
Device tree conversion and enablement branch. Mostly a bunch of new
bindings and setup for various platforms, but the Via/Winchip VT8500
platform is also converted over from being 100% legacy to now use
device tree for probing. More of that will come for 3.8.
Conflicts:
* Looks like Tony merged his bindings patch both through USB and our
tree. Our version is a little cleaner, so keep that one.
* Lots of conflicts with removed files in vt8500, that should all be deleted.
----------------------------------------------------------------
The following changes since commit 6d55d5968a8622f3ea20ec40737aea1cfba6438c:
Merge branch 'next/soc' into HEAD
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/dt
for you to fetch changes up to 99261fbad0a16f105b262d7525801697588ba526:
Merge branch 'lpc32xx/dts' of git://git.antcom.de/linux-2.6 into next/dt
----------------------------------------------------------------
Aneesh V (3):
Documentation: dt: device tree bindings for LPDDR2 memories
Documentation: dt: emif: device tree bindings for TI's EMIF sdram controller
ARM: dts: EMIF and LPDDR2 device tree data for OMAP4 boards
AnilKumar Ch (5):
arm/dts: regulator: Add tps65910 device tree data
arm/dts: regulator: Add tps65217 device tree data
arm/dts: Add tps65910 regulator DT data to am335x-evm.dts
arm/dts: Add tps65217 regulator DT data to am335x-bone.dts
ARM: OMAP2+: select PINCTRL in Kconfig
Arnd Bergmann (2):
Merge branch 'dt' of git://github.com/hzhuang1/linux into next/dt
Merge branch 'dt' of git://github.com/hzhuang1/linux into next/dt
Balaji T K (1):
arm/dts: omap5: Add mmc controller nodes and board data
Barry Song (3):
ARM: PRIMA2: add missing interrupts property for pinctrl node
ARM: PRIMA2: rename prima2-cb.dts to prima2.dtsi as it only has SoC features
pinctrl: sirf: add DT-binding pinmux mapping support
Benoit Cousson (3):
ARM: dts: OMAP4: Cleanup and move GIC outside of the OCP
ARM: dts: omap3-beagle: Add heartbeat and mmc LEDs support
ARM: dts: OMAP4: Add reg and interrupts for every nodes
Chao Xie (7):
ARM: pxa: support CKENC in clk_enable
gpio: pxa: add chain_eneter and chain_exit for irq handler
ARM: cache: fix uninitialized ptr in tauros2_init
ARM: cache: add cputype.h for tauros2
ARM: cache: add extra feature enable for tauros2
ARM: mmp&dove: modify tauros2_init call
ARM: cache: add dt support for tauros2 cache
Daniel Mack (7):
RTC: add DT bindings to pxa-rtc
MTD: pxa3xx-nand: add devicetree bindings
GPIO: gpio-pxa: simplify pxa_gpio_to_irq() and pxa_irq_to_chip()
ARM: pxa: add devicetree code for irq handling
ARM: pxa3xx: skip default device initialization when booting via DT
ARM: pxa3xx: add generic DT machine code
ARM: pxa: add .dtsi files
Dong Aisheng (1):
ARM: mx28evk: add missed clkmux select for saif
Fabio Estevam (14):
ARM: imx23-olinuxino.dts: Add AUART0 support
ARM: mach-mxs: Remove board entries in dt_board_compat
ARM: mxs: Rename 'hog-gpios'
ARM: mxs: Let mmc0 pin detect be generic
ARM: olinuxino: Add gpio-led support
ARM: dts: imx: Always enable the watchdog
ARM: dts: imx: Move SDMA firmware to SoC dtsi file
ARM: mach-imx: Remove board entries in dt_board_compat
ARM: mx28evk: Add SPI flash support
ARM: mx28evk: Add LRADC support
ARM: mx28evk: Add I2C EEPROM support
ARM: imx6q-sabrelite: Rename 'pinctrl_gpio_hog'
ARM: dts: mx23: Add USB resources
ARM: dts: imx23-olinuxino: Add USB host support
Florian Vaussard (5):
gpio/twl4030: get platform data from device tree
ARM: dts: omap3: Add gpio-twl4030 properties for BeagleBoard and omap3-EVM
ARM: dts: OMAP3: Add support for Gumstix Overo with Tobi expansion board
Documentation: dt: Update the OMAP documentation with Overo/Toby
ARM: dts: omap3-overo: Add support for the blue LED
Haojian Zhuang (5):
ARM: mmp: enable tauros2 cache in pxa910
ARM: mmp: enable tauros2 cache in mmp2 dt
ARM: pxa: append the definition of CKENC
mtd: nand: append missing parameter and value
ARM: pxa: fix build issue while CONFIG_OF is disabled
Heiko Stuebner (1):
gpio: samsung: add devicetree init for s3c24xx arches
Huang Shijie (1):
ARM: imx6q: use pll2_pfd2_396m as the enfc_sel's parent
Laxman Dewangan (3):
ARM: dt: tegra: cardhu: add entry for PMIC TPS65911.
ARM: dt: tegra: cardhu: split dts file for support multiple board versions
ARM: tegra: cardhu: add dt entry for fixed regulators
Lee Jones (39):
ASoC: Ux500: Move MSP pinctrl setup into the MSP driver
ASoC: Ux500: Enable MOP500 driver for Device Tree
ASoC: Ux500: Enable ux500 MSP driver for Device Tree
ASoC: codecs: Enable AB8500 CODEC for Device Tree
ASoC: Ux500: Minor coding layout changes
Documentation: Define the MOP500 Audio Machine Driver Device Tree bindings
Documentation: Define the MSP Driver Device Tree bindings
ARM: ux500: Rename db8500.dtsi to dbx5x0.dtsi to encompass the u9500, u8540 and u9540
ARM: ux500: Clean-up temporary Device Tree enablement helpers
ARM: ux500: Pass PMU platform data due for Perf though AUXDATA
Documentation: Add the AB8500 CODEC device to the MFD AB8500 doc
of/irq: Create stub for of_irq_find_parent when !CONFIG_OF
ARM: ux500: Identify the PRCMU as an interrupt controller
ARM: ux500: Force AB8500 to use the GIC as its interrupt controller
Revert "input: ab8500-ponkey: Create AB8500 domain IRQ mapping"
ARM: ux500: Remove unused snowball_of_platform_devs struct
ARM: ux500: Match Power-On-Key MFD and DTS compatible strings
drivers/rtc/rtc-ab8500.c: Revoke Device Tree enablement
ARM: ux500: Add i2c configurations to the Device Tree for DB8500 based devices
ARM: ux500: Add skeleton Device Tree for the HREF reference board
ARM: ux500: Add UART support to the HREF Device Tree
ARM: ux500: Pass SDI DMA information though AUX_DATA to MMCI
ARM: ux500: Clean-up MSP platform code
ARM: ux500: Add AB8500 CODEC node to DB8500 Device Tree
ARM: ux500: Fork MSP platform registration for step-by-step DT enablement
ARM: ux500: Pass MSP DMA platform data though AUXDATA
ARM: ux500: Stop registering the MOP500 Audio driver from platform code
ARM: ux500: Remove platform registration of MSP devices
ARM: ux500: Rename MSP board file to something more meaningful
ARM: ux500: Add nodes for the MSP into Device Tree
ARM: ux500: Add all encompassing sound node to the Snowball Device Tree
ARM: ux500: Stop registering Audio devices for HREF when DT is enabled
ARM: ux500: Stop registering I2C sub-devices for HREF when DT is enabled
ARM: ux500: Add all known I2C sub-device nodes to the HREF DT
ARM: ux500: Add nodes for the MSP into the HREF Device Tree
ARM: ux500: Add all encompassing sound node to the HREF Device Tree
ARM: ux500: Remove redundant #gpio-cell properties from Snowball DT
ARM: ux500: Apply tc3589x's GPIO/IRQ properties to HREF's DT
ARM: ux500: Fix SSP register address format
Marek Vasut (7):
ARM: dts: imx28: Add compatible and interrupt for LRADC
ARM: mx28: Add SPI 2 pinmux into imx28.dtsi
ARM: mx28: Add USB PHY overcurrent pinmux
ARM: mxs: Update DENX M28 machine and dts file
ARM: dts: m28evk: Fix MMC WP pin being inverted
ARM: dts: mxs: Add ethernetX to macX aliases
ARM: mxs: m28evk: Disable OCOTP OUI loading
Matt Sealey (3):
ARM: efikamx: remove support for Genesi Efika MX from the build
ARM: efikamx: remove Genesi Efika MX from the i.MX v6/v7 defconfig
ARM: efikamx: remove Genesi Efika MX platform files from the tree
Maxime Ripard (8):
ARM: dts: mxs: Add alternative I2C muxing options for imx28
ARM: dts: mxs: Add pwm4 muxing options for imx28
ARM: dts: mxs: Add I2C1 muxing options for imx28
ARM: dts: mxs: Add the second I2C adapter to the CFA10049 expansion board
ARM: dts: mxs: Enable USB1 Host on the CFA-10049 expansion board
ARM: dts: mxs: Add missing address and size cells in SSP nodes
ARM: dts: cfa10049: Add SSP3 to the 10049 board
ARM: dts: cfa10049: Add the 74HC595 gpio expanders
Michael Grzeschik (1):
ARM: dts: imx: add imx5x usb entries
Olof Johansson (23):
ARM: omap: add dtb targets
Merge branch 'soc-core' of git://git.kernel.org/.../horms/renesas into next/dt
Merge branch 'pinmux-dt' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel into next/dt
Merge branch 'lpc32xx/dts' of git://git.antcom.de/linux-2.6 into next/dt
Merge tag 'mxs-dt-3.7' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
Merge branch 'clk-3.7' of git://git.linaro.org/people/mturquette/linux into next/dt
Merge tag 'mxs-clk-dt-lookup' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
Merge tag 'imx-dt-3.7' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
Merge tag 'imx-clk-dt-lookup' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
Merge branches 'msm/fixes-non-critical' and 'msm/cleanup' into next/dt
Merge tag 'msm-dt-for-3.7' of git://git.kernel.org/.../davidb/linux-msm into next/dt
Merge tag 'tegra-for-3.7-dt' of git://git.kernel.org/.../swarren/linux-tegra into next/dt
Merge tag 'omap-devel-dt-merged-for-v3.7' of git://git.kernel.org/.../tmlind/linux-omap into next/dt
Merge branch 'next/gpio-samsung' of git://git.kernel.org/.../kgene/linux-samsung into next/dt
Merge tag 'tegra-for-3.7-dt2' of git://git.kernel.org/.../swarren/linux-tegra into next/dt
Merge tag 'mxs-dt-3.7-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
Merge tag 'imx-dt-3.7-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
Merge branch 'for-arm-soc-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into next/dt
Merge tag 'vt8500-for-next' of git://git.code.sf.net/p/linuxwmt/code into next/dt
Merge branch 'dt2' of git://github.com/hzhuang1/linux into next/dt
Merge tag 'devel-dt-arch-timer-for-v3.7' of git://git.kernel.org/.../tmlind/linux-omap into next/dt
Merge branch 'vt8500/devel' into next/dt
Merge branch 'lpc32xx/dts' of git://git.antcom.de/linux-2.6 into next/dt
Peter Ujfalusi (9):
ARM: OMAP: omap_device: Fix up resource names when booted with devicetree
ARM: dts: omap2: Add McBSP entries for OMAP2420 and OMAP2430 SoC
ARM: dts: omap2420-h4: Include omap2420.dtsi file instead the common omap2
ARM: dts: omap3: Add McBSP entries
ARM: dts: omap4: Add McBSP entries
ARM: dts: omap4: Add reg-names for McPDM and DMIC
ARM: dts: omap5: Add McBSP entries
ARM: dts: omap5: Add McPDM and DMIC section to the dtsi file
ARM: dts: omap3-beagle: Enable audio support
Rajendra Nayak (1):
arm/dts: Cleanup regulator naming and remove @0,1
Richard Zhao (2):
ARM: dts: imx6q-sabrelite: add usbmisc device
ARM: dts: imx6q-sabrelite: add usbotg pinctrl support
Roland Stigge (3):
ARM: LPC32xx: Adjust device tree node to new standard num-cs
ARM: LPC32xx: Extend dts for EA3250 board
ARM: LPC32xx: LED fix in PHY3250 DTS file
Santosh Shilimkar (4):
ARM: OMAP4: Add L2 Cache Controller in Device Tree
ARM: OMAP4: Add local timer support for Device Tree
ARM: OMAP: Add initialisation for the real-time counter.
ARM: OMAP5: Enable arch timer support
Shawn Guo (34):
ARM: mxs: tx28: reset fec phy for device tree boot
ARM: mxs: use auxdata to pass flexcan_switch function hook
ARM: mxs: remove board files
ARM: mxs: remove non-DT core functions
ARM: mxs: remove platform device codes
ARM: mxs: remove iomux driver
Merge tag 'mxs-dt-3.7' into mxs/clk-dt-lookup
clk: mxs: replace imx28 clk_register_clkdev with clock DT lookup
clk: mxs: replace imx23 clk_register_clkdev with clock DT lookup
ARM: dts: imx6q: improve indentation for fsl,pins
ARM: dts: imx6q: name iomuxc sub-nodes following pin function
ARM: dts: imx6q: sort iomuxc sub-nodes in name
ARM: dts: imx6q-sabrelite: add pinctrl for usdhc and enet
ARM: dts: imx6q-arm2: add pinctrl for uart and enet
ARM: dts: imx6q-sabresd: add pinctrl settings
ARM: imx6q: remove dummy pinctrl state
ARM: dts: imx53-qsb: add pinctrl settings
ARM: dts: imx53-ard: add pinctrl settings
ARM: dts: imx53-evk: add pinctrl settings
ARM: dts: imx53-smd: add pinctrl settings
ARM: imx53: build in pinctrl support
ARM: imx53: decouple device tree boot from board files
ARM: imx53: support device tree boot only
ARM: imx53: remove unneeded files and functions
ARM: dts: imx51-babbage: add pinctrl settings
ARM: imx51: build in pinctrl support
ARM: imx51: decouple device tree boot from board files
ARM: imx6q: replace clk_register_clkdev with clock DT lookup
Merge tag 'mxs-dt-3.7' into mxs/dt-for-3.7-2
Merge remote-tracking branch 'mturquette/clk-3.7' into mxs/dt-for-3.7-2
Merge tag 'mxs-clk-dt-lookup' into mxs/dt-for-3.7-2
Merge tag 'imx-dt-3.7' into imx/dt-for-3.7-2
Merge remote-tracking branch 'mturquette/clk-3.7' into imx/dt-for-3.7-2
Merge tag 'imx-clk-dt-lookup' into imx/dt-for-3.7-2
Sourav Poddar (6):
ARM: dts: omap5-evm: Add I2C support
ARM: dts: omap5-evm: Add tmp102 sensor support
ARM: dts: omap5-evm: Add keypad data
ARM: dts: omap5-evm: Add bmp085 sensor support
ARM: dts: omap4-sdp: Add keypad data
Documentation: dt: i2c: trivial-devices: Update for tmp102
Steffen Trumtrar (1):
ARM i.MX53: dts: add flexcan to imx53
Stephen Boyd (11):
ARM: msm: Add handle_irq handler for 8660 DT machine
ARM: msm: Add msm8660-surf.dts to Makefile.boot
ARM: msm: Don't touch GIC registers outside of GIC code
ARM: msm: Allow timer.c to compile on multiple targets
ARM: msm: Add DT support to msm_timer
ARM: msm: Move 8660 to DT timer
ARM: msm: Make 8660 a DT only target
ARM: msm: Rename board-msm8x60 to signify its DT only status
ARM: msm: Move io mapping prototypes to common.h
ARM: msm: Add DT support for 8960
ARM: msm: Remove non-DT targets from 8960
Stephen Warren (6):
ARM: dt: tegra: seaboard: add regulators
ARM: dt: tegra: ventana: add regulators
ARM: dt: tegra: paz00: add regulators
ARM: dt: tegra: whistler: add regulators
ARM: dt: tegra: configure power off for some boards
ARM: dt: tegra: whistler: configure power off
Tetsuyuki Kobayashi (1):
ARM: mach-shmobile: Add compilation support for dtbs using 'make dtbs'
Thierry Reding (5):
ARM: tegra: dts: Add pwm label
ARM: tegra: Add Avionic Design Tamonten support
ARM: tegra: Add Avionic Design Plutux support
ARM: tegra: Add Avionic Design Medcom-Wide support
ARM: tegra: Add Avionic Design Tamonten Evaluation Carrier support
Tony Lindgren (9):
Merge branch 'devel-dt-regulator' into devel-dt
Merge branch 'for_3.7/dts' of git://git.kernel.org/.../bcousson/linux-omap-dt into devel-dt
arm/dts: Add omap36xx.dtsi file and rename omap3-beagle to omap3-beagle-xm
arm/dts: Add pinctrl driver entries for omap2/3/4
arm/dts: Mux uart pins for omap4-sdp
Merge tag 'omap-cleanup-sparseirq-for-v3.7' into devel-dt
Merge branch 'for_3.7/omap5_arch_timer' of git://github.com/SantoshShilimkar/linux into devel-dt-arch-timer
Merge tag 'v3.6-rc6' into devel-dt
Merge branch 'devel-dt-arch-timer' into devel-dt
Tony Prisk (9):
arm: vt8500: Add device tree files for VIA/Wondermedia SoC's
rtc: vt8500: Add devicetree support for vt8500-rtc
serial: vt8500: Add devicetree support for vt8500-serial
video: vt8500: Add devicetree support for vt8500-fb and wm8505-fb
arm: vt8500: clk: Add Common Clock Framework support
arm: vt8500: doc: Add device tree bindings for arch-vt8500 devices
arm: vt8500: gpio: Devicetree support for arch-vt8500
arm: vt8500: Update arch-vt8500 to devicetree support.
arm: vt8500: Fixup for missing gpio.h
Uwe Kleine-K?nig (1):
ARM: imx/imx31-dt: drop selecting USE_OF
Vaibhav Hiremath (4):
arm/dts: AM33XX: Set the default status of module to "disabled" state
ARM: OMAP: omap_device: Do not overwrite resources allocated by OF layer
ARM: dts: AM33XX: Convert all hex numbers to lower-case
ARM: dts: AM33XX: Specify reg and interrupt property for all nodes
Zhangfei Gao (1):
ARM: dt: mmp-dma: add binding file
.../devicetree/bindings/arm/mrvl/tauros2.txt | 17 +
.../devicetree/bindings/arm/msm/timer.txt | 38 +
.../devicetree/bindings/arm/omap/omap.txt | 3 +
.../devicetree/bindings/arm/vt8500.txt | 14 +
.../bindings/arm/vt8500/via,vt8500-intc.txt | 16 +
.../bindings/arm/vt8500/via,vt8500-pmc.txt | 13 +
.../bindings/arm/vt8500/via,vt8500-timer.txt | 15 +
.../devicetree/bindings/clock/imx23-clock.txt | 76 ++
.../devicetree/bindings/clock/imx28-clock.txt | 99 ++
.../devicetree/bindings/clock/imx6q-clock.txt | 222 ++++
.../devicetree/bindings/clock/vt8500.txt | 72 ++
.../devicetree/bindings/dma/mmp-dma.txt | 74 ++
.../devicetree/bindings/gpio/gpio-samsung.txt | 43 +
.../devicetree/bindings/gpio/gpio-twl4030.txt | 6 +
.../devicetree/bindings/gpio/gpio-vt8500.txt | 24 +
.../devicetree/bindings/i2c/trivial-devices.txt | 1 +
.../bindings/lpddr2/lpddr2-timings.txt | 52 +
.../devicetree/bindings/lpddr2/lpddr2.txt | 102 ++
.../bindings/memory-controllers/ti/emif.txt | 55 +
.../devicetree/bindings/mfd/ab8500.txt | 15 +
.../devicetree/bindings/mtd/pxa3xx-nand.txt | 31 +
.../devicetree/bindings/rtc/pxa-rtc.txt | 14 +
.../devicetree/bindings/rtc/via,vt8500-rtc.txt | 15 +
.../devicetree/bindings/sound/ux500-mop500.txt | 39 +
.../devicetree/bindings/sound/ux500-msp.txt | 43 +
.../bindings/tty/serial/via,vt8500-uart.txt | 17 +
.../devicetree/bindings/usb/platform-uhci.txt | 21 +-
.../devicetree/bindings/usb/via,vt8500-ehci.txt | 15 +
.../devicetree/bindings/vendor-prefixes.txt | 2 +
.../devicetree/bindings/video/via,vt8500-fb.txt | 62 +
.../bindings/video/wm,prizm-ge-rops.txt | 13 +
.../devicetree/bindings/video/wm,wm8505-fb.txt | 23 +
arch/arm/Kconfig | 7 +-
arch/arm/boot/dts/am335x-bone.dts | 60 +
arch/arm/boot/dts/am335x-evm.dts | 100 ++
arch/arm/boot/dts/am33xx.dtsi | 71 +-
arch/arm/boot/dts/{db8500.dtsi => dbx5x0.dtsi} | 71 +-
arch/arm/boot/dts/ea3250.dts | 109 +-
arch/arm/boot/dts/elpida_ecb240abacn.dtsi | 67 +
arch/arm/boot/dts/hrefv60plus.dts | 95 ++
arch/arm/boot/dts/imx23-evk.dts | 3 +-
arch/arm/boot/dts/imx23-olinuxino.dts | 57 +
arch/arm/boot/dts/imx23-stmp378x_devb.dts | 2 +-
arch/arm/boot/dts/imx23.dtsi | 38 +-
arch/arm/boot/dts/imx27-phytec-phycore.dts | 4 -
arch/arm/boot/dts/imx27.dtsi | 1 -
arch/arm/boot/dts/imx28-apx4devkit.dts | 2 +-
arch/arm/boot/dts/imx28-cfa10049.dts | 99 ++
arch/arm/boot/dts/imx28-evk.dts | 29 +-
arch/arm/boot/dts/imx28-m28evk.dts | 83 +-
arch/arm/boot/dts/imx28-tx28.dts | 23 +-
arch/arm/boot/dts/imx28.dtsi | 123 +-
arch/arm/boot/dts/imx51-babbage.dts | 44 +-
arch/arm/boot/dts/imx51.dtsi | 146 ++-
arch/arm/boot/dts/imx53-ard.dts | 59 +-
arch/arm/boot/dts/imx53-evk.dts | 39 +-
arch/arm/boot/dts/imx53-qsb.dts | 42 +-
arch/arm/boot/dts/imx53-smd.dts | 46 +-
arch/arm/boot/dts/imx53.dtsi | 199 ++-
arch/arm/boot/dts/imx6q-arm2.dts | 21 +
arch/arm/boot/dts/imx6q-sabrelite.dts | 31 +-
arch/arm/boot/dts/imx6q-sabresd.dts | 25 +-
arch/arm/boot/dts/imx6q.dtsi | 316 ++++-
arch/arm/boot/dts/mmp2.dtsi | 5 +
arch/arm/boot/dts/msm8660-surf.dts | 19 +-
arch/arm/boot/dts/msm8960-cdp.dts | 41 +
arch/arm/boot/dts/omap2420-h4.dts | 2 +-
arch/arm/boot/dts/omap2420.dtsi | 48 +
arch/arm/boot/dts/omap2430.dtsi | 92 ++
.../{omap3-beagle.dts => omap3-beagle-xm.dts} | 54 +-
arch/arm/boot/dts/omap3-evm.dts | 13 +
arch/arm/boot/dts/omap3-overo.dtsi | 57 +
arch/arm/boot/dts/omap3-tobi.dts | 35 +
arch/arm/boot/dts/omap3.dtsi | 94 +-
arch/arm/boot/dts/omap36xx.dtsi | 25 +
arch/arm/boot/dts/omap4-panda.dts | 11 +
arch/arm/boot/dts/omap4-sdp.dts | 127 +-
arch/arm/boot/dts/omap4.dtsi | 195 ++-
arch/arm/boot/dts/omap5-evm.dts | 64 +
arch/arm/boot/dts/omap5.dtsi | 139 ++
arch/arm/boot/dts/phy3250.dts | 16 +-
arch/arm/boot/dts/prima2-cb.dts | 424 ------
arch/arm/boot/dts/prima2-evb.dts | 37 +
arch/arm/boot/dts/prima2.dtsi | 640 +++++++++
arch/arm/boot/dts/pxa27x.dtsi | 14 +
arch/arm/boot/dts/pxa2xx.dtsi | 132 ++
arch/arm/boot/dts/pxa3xx.dtsi | 32 +
arch/arm/boot/dts/pxa910.dtsi | 5 +
arch/arm/boot/dts/snowball.dts | 19 +-
arch/arm/boot/dts/tegra20-medcom-wide.dts | 58 +
arch/arm/boot/dts/tegra20-paz00.dts | 173 +++
arch/arm/boot/dts/tegra20-plutux.dts | 50 +
arch/arm/boot/dts/tegra20-seaboard.dts | 186 +++
arch/arm/boot/dts/tegra20-tamonten.dtsi | 449 +++++++
arch/arm/boot/dts/tegra20-tec.dts | 53 +
arch/arm/boot/dts/tegra20-ventana.dts | 206 +++
arch/arm/boot/dts/tegra20-whistler.dts | 295 +++++
arch/arm/boot/dts/tegra20.dtsi | 2 +-
arch/arm/boot/dts/tegra30-cardhu-a02.dts | 87 ++
arch/arm/boot/dts/tegra30-cardhu-a04.dts | 98 ++
arch/arm/boot/dts/tegra30-cardhu.dts | 171 ---
arch/arm/boot/dts/tegra30-cardhu.dtsi | 475 +++++++
arch/arm/boot/dts/tegra30.dtsi | 2 +-
arch/arm/boot/dts/tps65217.dtsi | 56 +
arch/arm/boot/dts/tps65910.dtsi | 86 ++
arch/arm/boot/dts/twl4030.dtsi | 6 +-
arch/arm/boot/dts/twl6030.dtsi | 26 +-
arch/arm/boot/dts/vt8500-bv07.dts | 36 +
arch/arm/boot/dts/vt8500.dtsi | 116 ++
arch/arm/boot/dts/wm8505-ref.dts | 36 +
arch/arm/boot/dts/wm8505.dtsi | 143 ++
arch/arm/boot/dts/wm8650-mid.dts | 36 +
arch/arm/boot/dts/wm8650.dtsi | 147 +++
arch/arm/configs/imx_v6_v7_defconfig | 4 +-
arch/arm/configs/mxs_defconfig | 6 -
arch/arm/configs/omap2plus_defconfig | 1 +
arch/arm/include/asm/hardware/cache-tauros2.h | 5 +-
arch/arm/mach-dove/common.c | 2 +-
arch/arm/mach-imx/Kconfig | 106 +-
arch/arm/mach-imx/Makefile | 9 +-
arch/arm/mach-imx/Makefile.boot | 8 +-
arch/arm/mach-imx/clk-imx6q.c | 51 +-
arch/arm/mach-imx/devices-imx53.h | 48 -
arch/arm/mach-imx/efika.h | 10 -
arch/arm/mach-imx/imx51-dt.c | 21 -
arch/arm/mach-imx/{imx53-dt.c => mach-imx53.c} | 27 -
arch/arm/mach-imx/mach-imx6q.c | 11 -
arch/arm/mach-imx/mach-mx51_efikamx.c | 300 -----
arch/arm/mach-imx/mach-mx51_efikasb.c | 296 -----
arch/arm/mach-imx/mach-mx53_ard.c | 272 ----
arch/arm/mach-imx/mach-mx53_evk.c | 179 ---
arch/arm/mach-imx/mach-mx53_loco.c | 321 -----
arch/arm/mach-imx/mach-mx53_smd.c | 168 ---
arch/arm/mach-imx/mm-imx5.c | 47 -
arch/arm/mach-imx/mx51_efika.c | 633 ---------
arch/arm/mach-mmp/mmp2.c | 2 +-
arch/arm/mach-mmp/pxa910.c | 4 +
arch/arm/mach-msm/Kconfig | 41 +-
arch/arm/mach-msm/Makefile | 4 +-
arch/arm/mach-msm/Makefile.boot | 3 +
arch/arm/mach-msm/board-dt-8660.c | 63 +
arch/arm/mach-msm/board-dt-8960.c | 49 +
arch/arm/mach-msm/board-halibut.c | 5 +-
arch/arm/mach-msm/board-msm7x30.c | 9 +-
arch/arm/mach-msm/board-msm8960.c | 122 --
arch/arm/mach-msm/board-msm8x60.c | 161 ---
arch/arm/mach-msm/board-qsd8x50.c | 7 +-
arch/arm/mach-msm/board-trout.c | 5 +-
arch/arm/mach-msm/common.h | 30 +
arch/arm/mach-msm/devices-msm8960.c | 85 --
arch/arm/mach-msm/include/mach/board.h | 3 -
arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 7 -
arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 4 -
arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 4 -
arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 4 -
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 4 -
arch/arm/mach-msm/io.c | 2 +
arch/arm/mach-msm/platsmp.c | 8 -
arch/arm/mach-msm/timer.c | 186 ++-
arch/arm/mach-mxs/Kconfig | 89 --
arch/arm/mach-mxs/Makefile | 11 +-
arch/arm/mach-mxs/Makefile.boot | 1 +
arch/arm/mach-mxs/devices-mx23.h | 43 -
arch/arm/mach-mxs/devices-mx28.h | 63 -
arch/arm/mach-mxs/devices.c | 87 --
arch/arm/mach-mxs/devices/Kconfig | 33 -
arch/arm/mach-mxs/devices/Makefile | 12 -
arch/arm/mach-mxs/devices/platform-auart.c | 65 -
arch/arm/mach-mxs/devices/platform-dma.c | 31 -
arch/arm/mach-mxs/devices/platform-fec.c | 52 -
arch/arm/mach-mxs/devices/platform-flexcan.c | 51 -
arch/arm/mach-mxs/devices/platform-gpio-mxs.c | 33 -
arch/arm/mach-mxs/devices/platform-gpmi-nand.c | 81 --
arch/arm/mach-mxs/devices/platform-mxs-i2c.c | 52 -
arch/arm/mach-mxs/devices/platform-mxs-mmc.c | 76 --
arch/arm/mach-mxs/devices/platform-mxs-pwm.c | 22 -
arch/arm/mach-mxs/devices/platform-mxs-saif.c | 61 -
arch/arm/mach-mxs/devices/platform-mxsfb.c | 47 -
.../mach-mxs/devices/platform-rtc-stmp3xxx.c | 51 -
arch/arm/mach-mxs/include/mach/common.h | 9 -
arch/arm/mach-mxs/include/mach/devices-common.h | 114 --
arch/arm/mach-mxs/include/mach/iomux-mx23.h | 355 -----
arch/arm/mach-mxs/include/mach/iomux-mx28.h | 537 --------
arch/arm/mach-mxs/include/mach/iomux.h | 168 ---
arch/arm/mach-mxs/iomux.c | 101 --
arch/arm/mach-mxs/mach-apx4devkit.c | 273 ----
arch/arm/mach-mxs/mach-m28evk.c | 366 ------
arch/arm/mach-mxs/mach-mx23evk.c | 190 ---
arch/arm/mach-mxs/mach-mx28evk.c | 477 -------
arch/arm/mach-mxs/mach-mxs.c | 140 +-
arch/arm/mach-mxs/mach-stmp378x_devb.c | 123 --
arch/arm/mach-mxs/mach-tx28.c | 184 ---
arch/arm/mach-mxs/mm.c | 39 -
arch/arm/mach-mxs/module-tx28.c | 160 ---
arch/arm/mach-mxs/module-tx28.h | 10 -
arch/arm/mach-omap2/Kconfig | 6 +
arch/arm/mach-omap2/Makefile.boot | 6 +
arch/arm/mach-omap2/omap4-common.c | 5 +-
arch/arm/mach-omap2/omap_hwmod.c | 27 +
arch/arm/mach-omap2/timer.c | 103 +-
arch/arm/mach-prima2/Makefile.boot | 2 +
arch/arm/mach-pxa/Kconfig | 12 +
arch/arm/mach-pxa/Makefile | 3 +
arch/arm/mach-pxa/clock-pxa3xx.c | 8 +-
arch/arm/mach-pxa/include/mach/pxa3xx-regs.h | 1 +
arch/arm/mach-pxa/irq.c | 131 +-
arch/arm/mach-pxa/pxa-dt.c | 63 +
arch/arm/mach-pxa/pxa3xx.c | 23 +-
arch/arm/mach-shmobile/Makefile.boot | 4 +
arch/arm/mach-tegra/Makefile.boot | 6 +-
arch/arm/mach-ux500/Makefile | 2 +-
...{board-mop500-msp.c => board-mop500-audio.c} | 102 +-
arch/arm/mach-ux500/board-mop500-msp.h | 14 -
arch/arm/mach-ux500/board-mop500-sdi.c | 4 +-
arch/arm/mach-ux500/board-mop500.c | 39 +-
arch/arm/mach-ux500/board-mop500.h | 11 +
arch/arm/mach-ux500/cpu-db8500.c | 10 +-
arch/arm/mach-ux500/include/mach/msp.h | 2 -
arch/arm/mach-vt8500/Kconfig | 73 --
arch/arm/mach-vt8500/Makefile | 8 +-
arch/arm/mach-vt8500/bv07.c | 81 --
arch/arm/mach-vt8500/common.h | 28 +
arch/arm/mach-vt8500/devices-vt8500.c | 96 --
arch/arm/mach-vt8500/devices-wm8505.c | 103 --
arch/arm/mach-vt8500/devices.c | 281 ----
arch/arm/mach-vt8500/devices.h | 89 --
arch/arm/mach-vt8500/gpio.c | 240 ----
arch/arm/mach-vt8500/include/mach/restart.h | 4 +-
arch/arm/mach-vt8500/include/mach/vt8500_irqs.h | 88 --
arch/arm/mach-vt8500/include/mach/vt8500_regs.h | 79 --
arch/arm/mach-vt8500/include/mach/wm8505_irqs.h | 115 --
arch/arm/mach-vt8500/include/mach/wm8505_regs.h | 78 --
arch/arm/mach-vt8500/irq.c | 209 +--
arch/arm/mach-vt8500/restart.c | 54 -
arch/arm/mach-vt8500/timer.c | 67 +-
arch/arm/mach-vt8500/vt8500.c | 195 +++
arch/arm/mach-vt8500/wm8505_7in.c | 80 --
arch/arm/mm/cache-tauros2.c | 83 +-
arch/arm/plat-mxc/include/mach/common.h | 6 -
arch/arm/plat-mxc/include/mach/iomux-mx53.h | 1219 ------------------
arch/arm/plat-omap/include/plat/omap_hwmod.h | 1 +
arch/arm/plat-omap/omap_device.c | 79 +-
drivers/clk/Makefile | 1 +
drivers/clk/clk-vt8500.c | 510 ++++++++
drivers/clk/mxs/clk-imx23.c | 55 +-
drivers/clk/mxs/clk-imx28.c | 113 +-
drivers/gpio/Kconfig | 6 +
drivers/gpio/Makefile | 1 +
drivers/gpio/gpio-pxa.c | 77 +-
drivers/gpio/gpio-samsung.c | 63 +
drivers/gpio/gpio-twl4030.c | 77 +-
drivers/gpio/gpio-vt8500.c | 316 +++++
drivers/mtd/nand/pxa3xx_nand.c | 87 +-
drivers/pinctrl/pinctrl-sirf.c | 58 +-
drivers/rtc/rtc-ab8500.c | 6 -
drivers/rtc/rtc-pxa.c | 11 +
drivers/rtc/rtc-vt8500.c | 9 +-
drivers/tty/serial/vt8500_serial.c | 58 +-
drivers/video/Kconfig | 6 +-
drivers/video/vt8500lcdfb.c | 79 +-
drivers/video/wm8505fb.c | 97 +-
drivers/video/wmt_ge_rops.c | 9 +-
include/linux/mfd/abx500/ab8500-codec.h | 6 +-
include/linux/of_irq.h | 5 +
sound/soc/codecs/ab8500-codec.c | 81 ++
sound/soc/ux500/mop500.c | 47 +-
sound/soc/ux500/ux500_msp_dai.c | 6 +
sound/soc/ux500/ux500_msp_i2s.c | 89 +-
sound/soc/ux500/ux500_msp_i2s.h | 8 +-
269 files changed, 10743 insertions(+), 11219 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/mrvl/tauros2.txt
create mode 100644 Documentation/devicetree/bindings/arm/msm/timer.txt
create mode 100644 Documentation/devicetree/bindings/arm/vt8500.txt
create mode 100644 Documentation/devicetree/bindings/arm/vt8500/via,vt8500-intc.txt
create mode 100644 Documentation/devicetree/bindings/arm/vt8500/via,vt8500-pmc.txt
create mode 100644 Documentation/devicetree/bindings/arm/vt8500/via,vt8500-timer.txt
create mode 100644 Documentation/devicetree/bindings/clock/imx23-clock.txt
create mode 100644 Documentation/devicetree/bindings/clock/imx28-clock.txt
create mode 100644 Documentation/devicetree/bindings/clock/imx6q-clock.txt
create mode 100644 Documentation/devicetree/bindings/clock/vt8500.txt
create mode 100644 Documentation/devicetree/bindings/dma/mmp-dma.txt
create mode 100644 Documentation/devicetree/bindings/gpio/gpio-vt8500.txt
create mode 100644 Documentation/devicetree/bindings/lpddr2/lpddr2-timings.txt
create mode 100644 Documentation/devicetree/bindings/lpddr2/lpddr2.txt
create mode 100644 Documentation/devicetree/bindings/memory-controllers/ti/emif.txt
create mode 100644 Documentation/devicetree/bindings/mtd/pxa3xx-nand.txt
create mode 100644 Documentation/devicetree/bindings/rtc/pxa-rtc.txt
create mode 100644 Documentation/devicetree/bindings/rtc/via,vt8500-rtc.txt
create mode 100644 Documentation/devicetree/bindings/sound/ux500-mop500.txt
create mode 100644 Documentation/devicetree/bindings/sound/ux500-msp.txt
create mode 100644 Documentation/devicetree/bindings/tty/serial/via,vt8500-uart.txt
create mode 100644 Documentation/devicetree/bindings/usb/via,vt8500-ehci.txt
create mode 100644 Documentation/devicetree/bindings/video/via,vt8500-fb.txt
create mode 100644 Documentation/devicetree/bindings/video/wm,prizm-ge-rops.txt
create mode 100644 Documentation/devicetree/bindings/video/wm,wm8505-fb.txt
rename arch/arm/boot/dts/{db8500.dtsi => dbx5x0.dtsi} (88%)
create mode 100644 arch/arm/boot/dts/elpida_ecb240abacn.dtsi
create mode 100644 arch/arm/boot/dts/hrefv60plus.dts
create mode 100644 arch/arm/boot/dts/imx28-cfa10049.dts
create mode 100644 arch/arm/boot/dts/msm8960-cdp.dts
create mode 100644 arch/arm/boot/dts/omap2420.dtsi
create mode 100644 arch/arm/boot/dts/omap2430.dtsi
rename arch/arm/boot/dts/{omap3-beagle.dts => omap3-beagle-xm.dts} (52%)
create mode 100644 arch/arm/boot/dts/omap3-overo.dtsi
create mode 100644 arch/arm/boot/dts/omap3-tobi.dts
create mode 100644 arch/arm/boot/dts/omap36xx.dtsi
delete mode 100644 arch/arm/boot/dts/prima2-cb.dts
create mode 100644 arch/arm/boot/dts/prima2-evb.dts
create mode 100644 arch/arm/boot/dts/prima2.dtsi
create mode 100644 arch/arm/boot/dts/pxa27x.dtsi
create mode 100644 arch/arm/boot/dts/pxa2xx.dtsi
create mode 100644 arch/arm/boot/dts/pxa3xx.dtsi
create mode 100644 arch/arm/boot/dts/tegra20-medcom-wide.dts
create mode 100644 arch/arm/boot/dts/tegra20-plutux.dts
create mode 100644 arch/arm/boot/dts/tegra20-tamonten.dtsi
create mode 100644 arch/arm/boot/dts/tegra20-tec.dts
create mode 100644 arch/arm/boot/dts/tegra30-cardhu-a02.dts
create mode 100644 arch/arm/boot/dts/tegra30-cardhu-a04.dts
delete mode 100644 arch/arm/boot/dts/tegra30-cardhu.dts
create mode 100644 arch/arm/boot/dts/tegra30-cardhu.dtsi
create mode 100644 arch/arm/boot/dts/tps65217.dtsi
create mode 100644 arch/arm/boot/dts/tps65910.dtsi
create mode 100644 arch/arm/boot/dts/vt8500-bv07.dts
create mode 100644 arch/arm/boot/dts/vt8500.dtsi
create mode 100644 arch/arm/boot/dts/wm8505-ref.dts
create mode 100644 arch/arm/boot/dts/wm8505.dtsi
create mode 100644 arch/arm/boot/dts/wm8650-mid.dts
create mode 100644 arch/arm/boot/dts/wm8650.dtsi
delete mode 100644 arch/arm/mach-imx/devices-imx53.h
delete mode 100644 arch/arm/mach-imx/efika.h
rename arch/arm/mach-imx/{imx53-dt.c => mach-imx53.c} (81%)
delete mode 100644 arch/arm/mach-imx/mach-mx51_efikamx.c
delete mode 100644 arch/arm/mach-imx/mach-mx51_efikasb.c
delete mode 100644 arch/arm/mach-imx/mach-mx53_ard.c
delete mode 100644 arch/arm/mach-imx/mach-mx53_evk.c
delete mode 100644 arch/arm/mach-imx/mach-mx53_loco.c
delete mode 100644 arch/arm/mach-imx/mach-mx53_smd.c
delete mode 100644 arch/arm/mach-imx/mx51_efika.c
create mode 100644 arch/arm/mach-msm/board-dt-8660.c
create mode 100644 arch/arm/mach-msm/board-dt-8960.c
delete mode 100644 arch/arm/mach-msm/board-msm8960.c
delete mode 100644 arch/arm/mach-msm/board-msm8x60.c
create mode 100644 arch/arm/mach-msm/common.h
delete mode 100644 arch/arm/mach-msm/devices-msm8960.c
delete mode 100644 arch/arm/mach-mxs/devices-mx23.h
delete mode 100644 arch/arm/mach-mxs/devices-mx28.h
delete mode 100644 arch/arm/mach-mxs/devices.c
delete mode 100644 arch/arm/mach-mxs/devices/Kconfig
delete mode 100644 arch/arm/mach-mxs/devices/Makefile
delete mode 100644 arch/arm/mach-mxs/devices/platform-auart.c
delete mode 100644 arch/arm/mach-mxs/devices/platform-dma.c
delete mode 100644 arch/arm/mach-mxs/devices/platform-fec.c
delete mode 100644 arch/arm/mach-mxs/devices/platform-flexcan.c
delete mode 100644 arch/arm/mach-mxs/devices/platform-gpio-mxs.c
delete mode 100644 arch/arm/mach-mxs/devices/platform-gpmi-nand.c
delete mode 100644 arch/arm/mach-mxs/devices/platform-mxs-i2c.c
delete mode 100644 arch/arm/mach-mxs/devices/platform-mxs-mmc.c
delete mode 100644 arch/arm/mach-mxs/devices/platform-mxs-pwm.c
delete mode 100644 arch/arm/mach-mxs/devices/platform-mxs-saif.c
delete mode 100644 arch/arm/mach-mxs/devices/platform-mxsfb.c
delete mode 100644 arch/arm/mach-mxs/devices/platform-rtc-stmp3xxx.c
delete mode 100644 arch/arm/mach-mxs/include/mach/devices-common.h
delete mode 100644 arch/arm/mach-mxs/include/mach/iomux-mx23.h
delete mode 100644 arch/arm/mach-mxs/include/mach/iomux-mx28.h
delete mode 100644 arch/arm/mach-mxs/include/mach/iomux.h
delete mode 100644 arch/arm/mach-mxs/iomux.c
delete mode 100644 arch/arm/mach-mxs/mach-apx4devkit.c
delete mode 100644 arch/arm/mach-mxs/mach-m28evk.c
delete mode 100644 arch/arm/mach-mxs/mach-mx23evk.c
delete mode 100644 arch/arm/mach-mxs/mach-mx28evk.c
delete mode 100644 arch/arm/mach-mxs/mach-stmp378x_devb.c
delete mode 100644 arch/arm/mach-mxs/mach-tx28.c
delete mode 100644 arch/arm/mach-mxs/module-tx28.c
delete mode 100644 arch/arm/mach-mxs/module-tx28.h
create mode 100644 arch/arm/mach-pxa/pxa-dt.c
rename arch/arm/mach-ux500/{board-mop500-msp.c => board-mop500-audio.c} (66%)
delete mode 100644 arch/arm/mach-ux500/board-mop500-msp.h
delete mode 100644 arch/arm/mach-vt8500/Kconfig
delete mode 100644 arch/arm/mach-vt8500/bv07.c
create mode 100644 arch/arm/mach-vt8500/common.h
delete mode 100644 arch/arm/mach-vt8500/devices-vt8500.c
delete mode 100644 arch/arm/mach-vt8500/devices-wm8505.c
delete mode 100644 arch/arm/mach-vt8500/devices.c
delete mode 100644 arch/arm/mach-vt8500/devices.h
delete mode 100644 arch/arm/mach-vt8500/gpio.c
delete mode 100644 arch/arm/mach-vt8500/include/mach/vt8500_irqs.h
delete mode 100644 arch/arm/mach-vt8500/include/mach/vt8500_regs.h
delete mode 100644 arch/arm/mach-vt8500/include/mach/wm8505_irqs.h
delete mode 100644 arch/arm/mach-vt8500/include/mach/wm8505_regs.h
delete mode 100644 arch/arm/mach-vt8500/restart.c
create mode 100644 arch/arm/mach-vt8500/vt8500.c
delete mode 100644 arch/arm/mach-vt8500/wm8505_7in.c
delete mode 100644 arch/arm/plat-mxc/include/mach/iomux-mx53.h
create mode 100644 drivers/clk/clk-vt8500.c
create mode 100644 drivers/gpio/gpio-vt8500.c
^ permalink raw reply
* [GIT PULL 6/12] ARM: soc: cleanups, part 2
From: Olof Johansson @ 2012-10-01 23:57 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1349135827-24790-1-git-send-email-olof@lixom.net>
A shorter cleanup branch submitted separately due to dependencies with
some of the previous topics.
Major thing here is that the Broadcom bcmring platform is removed. It's an
SoC that's used on some stationary VoIP platforms, and is in desperate
need of some cleanup. Broadcom came back and suggested that we just
deprecate the platform for now, since they aren't going to spend the
resources needed on cleaning it up, and there are no users of the platform
directly from mainline.
Conflicts:
* A few removed files in tegra, safe to remove here.
* bcmring/bcm2835 conflicts in Kconfig and Makefile, remove bcmring.
----------------------------------------------------------------
The following changes since commit 7e95c548818d2b311090848083277fb907cfb56d:
Merge branch 'next/dt' into HEAD
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/cleanup2
for you to fetch changes up to b98138e00d96abc85b100c9b6886f105d9868ab5:
Merge branch 'cleanup/__iomem' into next/cleanup2
----------------------------------------------------------------
Alexander Shiyan (4):
ARM: clps711x: Added simple clock framework
ARM: clps711x: Fix lowlevel debug-macro
ARM: clps711x: Fix register definitions
ARM: clps711x: Remove board support for CEIVA
Andrew Lunn (1):
ARM: Orion5x: ts78xx: Add IOMEM for virtual addresses.
Arnd Bergmann (6):
Merge branch 'clps711x/cleanup' into next/cleanup2
ARM: Remove mach-bcmring
Merge branch 'bcmring/cleanup' into bcmring/removal
Merge branch 'bcmring/removal' into next/cleanup2
ARM: ux500: use __iomem pointers for MMIO
Merge branch 'cleanup/__iomem' into next/cleanup2
Olof Johansson (2):
Merge tag 'xceiv-for-v3.7' of git://git.kernel.org/.../balbi/usb into next/cleanup2
Merge tag 'tegra-for-3.7-cleanup2' of git://git.kernel.org/.../swarren/linux-tegra into next/cleanup2
Stephen Warren (7):
Merge branch 'for-3.7/board-removal' into for-3.7/cleanup2
Merge branch 'for-3.7/common-clk' into for-3.7/cleanup2
Merge commit 'xceiv-for-v3.7' into for-3.7/cleanup2
ARM: tegra: remove dead code
ARM: tegra: remove useless includes of <mach/*.h>
ARM: tegra: delete unused headers
pinctrl: tegra: move pinconf-tegra.h content into drivers/pinctrl
MAINTAINERS | 16 -
arch/arm/Kconfig | 16 +-
arch/arm/Makefile | 1 -
arch/arm/configs/bcmring_defconfig | 79 -
arch/arm/mach-bcmring/Kconfig | 19 -
arch/arm/mach-bcmring/Makefile | 8 -
arch/arm/mach-bcmring/Makefile.boot | 6 -
arch/arm/mach-bcmring/arch.c | 198 ---
arch/arm/mach-bcmring/clock.c | 223 ---
arch/arm/mach-bcmring/clock.h | 33 -
arch/arm/mach-bcmring/core.c | 227 ---
arch/arm/mach-bcmring/core.h | 31 -
arch/arm/mach-bcmring/csp/Makefile | 3 -
arch/arm/mach-bcmring/csp/chipc/Makefile | 1 -
arch/arm/mach-bcmring/csp/chipc/chipcHw.c | 779 --------
arch/arm/mach-bcmring/csp/chipc/chipcHw_init.c | 283 ---
arch/arm/mach-bcmring/csp/chipc/chipcHw_reset.c | 125 --
arch/arm/mach-bcmring/csp/chipc/chipcHw_str.c | 64 -
arch/arm/mach-bcmring/csp/dmac/Makefile | 1 -
arch/arm/mach-bcmring/csp/dmac/dmacHw.c | 916 ----------
arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c | 1017 -----------
arch/arm/mach-bcmring/csp/tmr/Makefile | 1 -
arch/arm/mach-bcmring/csp/tmr/tmrHw.c | 576 ------
arch/arm/mach-bcmring/dma.c | 1518 ----------------
arch/arm/mach-bcmring/dma_device.c | 593 ------
arch/arm/mach-bcmring/include/mach/cfg_global.h | 51 -
arch/arm/mach-bcmring/include/mach/csp/cap.h | 63 -
.../mach-bcmring/include/mach/csp/cap_inline.h | 409 -----
.../mach-bcmring/include/mach/csp/chipcHw_def.h | 1123 ------------
.../include/mach/csp/chipcHw_inline.h | 1682 ------------------
.../mach-bcmring/include/mach/csp/chipcHw_reg.h | 530 ------
.../arm/mach-bcmring/include/mach/csp/ddrcReg.h | 872 ---------
arch/arm/mach-bcmring/include/mach/csp/dmacHw.h | 596 -------
.../mach-bcmring/include/mach/csp/dmacHw_priv.h | 145 --
.../mach-bcmring/include/mach/csp/dmacHw_reg.h | 406 -----
arch/arm/mach-bcmring/include/mach/csp/hw_cfg.h | 73 -
.../mach-bcmring/include/mach/csp/intcHw_reg.h | 246 ---
.../arm/mach-bcmring/include/mach/csp/mm_addr.h | 101 --
arch/arm/mach-bcmring/include/mach/csp/mm_io.h | 147 --
arch/arm/mach-bcmring/include/mach/csp/reg.h | 115 --
.../mach-bcmring/include/mach/csp/secHw_def.h | 100 --
.../include/mach/csp/secHw_inline.h | 79 -
arch/arm/mach-bcmring/include/mach/csp/tmrHw.h | 263 ---
.../mach-bcmring/include/mach/csp/tmrHw_reg.h | 82 -
arch/arm/mach-bcmring/include/mach/dma.h | 630 -------
.../arm/mach-bcmring/include/mach/entry-macro.S | 76 -
arch/arm/mach-bcmring/include/mach/hardware.h | 57 -
arch/arm/mach-bcmring/include/mach/irqs.h | 132 --
.../mach-bcmring/include/mach/memory_settings.h | 67 -
arch/arm/mach-bcmring/include/mach/reg_nand.h | 66 -
arch/arm/mach-bcmring/include/mach/reg_umi.h | 237 ---
arch/arm/mach-bcmring/include/mach/timer.h | 77 -
arch/arm/mach-bcmring/include/mach/timex.h | 25 -
arch/arm/mach-bcmring/include/mach/uncompress.h | 43 -
arch/arm/mach-bcmring/irq.c | 126 --
arch/arm/mach-bcmring/mm.c | 60 -
arch/arm/mach-bcmring/timer.c | 61 -
arch/arm/mach-clps711x/Kconfig | 6 -
arch/arm/mach-clps711x/Makefile | 1 -
arch/arm/mach-clps711x/ceiva.c | 64 -
arch/arm/mach-clps711x/common.c | 89 +-
arch/arm/mach-clps711x/include/mach/clps711x.h | 9 +-
.../mach-clps711x/include/mach/debug-macro.S | 8 +-
arch/arm/mach-clps711x/include/mach/hardware.h | 48 -
arch/arm/mach-clps711x/include/mach/timex.h | 23 +-
arch/arm/mach-orion5x/ts78xx-setup.c | 12 +-
arch/arm/mach-tegra/Makefile | 2 -
arch/arm/mach-tegra/board-dt-tegra20.c | 27 +-
arch/arm/mach-tegra/board-pinmux.c | 87 -
arch/arm/mach-tegra/board-pinmux.h | 54 -
arch/arm/mach-tegra/devices.c | 701 --------
arch/arm/mach-tegra/devices.h | 60 -
arch/arm/mach-tegra/include/mach/gpio-tegra.h | 28 -
.../arm/mach-tegra/include/mach/pinconf-tegra.h | 63 -
arch/arm/mach-tegra/include/mach/suspend.h | 38 -
arch/arm/mach-tegra/tegra20_clocks.c | 1 -
arch/arm/mach-tegra/tegra20_clocks_data.c | 1 -
arch/arm/mach-tegra/timer.c | 1 -
arch/arm/mach-ux500/include/mach/uncompress.h | 4 +-
arch/arm/tools/mach-types | 1 -
drivers/pinctrl/pinctrl-tegra.c | 2 -
drivers/pinctrl/pinctrl-tegra.h | 44 +
drivers/usb/phy/tegra_usb_phy.c | 1 -
drivers/video/Kconfig | 12 -
drivers/video/Makefile | 1 -
drivers/video/epson1355fb.c | 749 --------
include/video/epson1355.h | 64 -
87 files changed, 159 insertions(+), 17516 deletions(-)
delete mode 100644 arch/arm/configs/bcmring_defconfig
delete mode 100644 arch/arm/mach-bcmring/Kconfig
delete mode 100644 arch/arm/mach-bcmring/Makefile
delete mode 100644 arch/arm/mach-bcmring/Makefile.boot
delete mode 100644 arch/arm/mach-bcmring/arch.c
delete mode 100644 arch/arm/mach-bcmring/clock.c
delete mode 100644 arch/arm/mach-bcmring/clock.h
delete mode 100644 arch/arm/mach-bcmring/core.c
delete mode 100644 arch/arm/mach-bcmring/core.h
delete mode 100644 arch/arm/mach-bcmring/csp/Makefile
delete mode 100644 arch/arm/mach-bcmring/csp/chipc/Makefile
delete mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw.c
delete mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw_init.c
delete mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw_reset.c
delete mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw_str.c
delete mode 100644 arch/arm/mach-bcmring/csp/dmac/Makefile
delete mode 100644 arch/arm/mach-bcmring/csp/dmac/dmacHw.c
delete mode 100644 arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c
delete mode 100644 arch/arm/mach-bcmring/csp/tmr/Makefile
delete mode 100644 arch/arm/mach-bcmring/csp/tmr/tmrHw.c
delete mode 100644 arch/arm/mach-bcmring/dma.c
delete mode 100644 arch/arm/mach-bcmring/dma_device.c
delete mode 100644 arch/arm/mach-bcmring/include/mach/cfg_global.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/cap.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/cap_inline.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/chipcHw_def.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/chipcHw_inline.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/chipcHw_reg.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/ddrcReg.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/dmacHw.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/dmacHw_priv.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/dmacHw_reg.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/hw_cfg.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/intcHw_reg.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/mm_addr.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/mm_io.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/reg.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/secHw_def.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/secHw_inline.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/tmrHw.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/tmrHw_reg.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/dma.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/entry-macro.S
delete mode 100644 arch/arm/mach-bcmring/include/mach/hardware.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/irqs.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/memory_settings.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/reg_nand.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/reg_umi.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/timer.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/timex.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/uncompress.h
delete mode 100644 arch/arm/mach-bcmring/irq.c
delete mode 100644 arch/arm/mach-bcmring/mm.c
delete mode 100644 arch/arm/mach-bcmring/timer.c
delete mode 100644 arch/arm/mach-clps711x/ceiva.c
delete mode 100644 arch/arm/mach-tegra/board-pinmux.c
delete mode 100644 arch/arm/mach-tegra/board-pinmux.h
delete mode 100644 arch/arm/mach-tegra/devices.c
delete mode 100644 arch/arm/mach-tegra/devices.h
delete mode 100644 arch/arm/mach-tegra/include/mach/gpio-tegra.h
delete mode 100644 arch/arm/mach-tegra/include/mach/pinconf-tegra.h
delete mode 100644 arch/arm/mach-tegra/include/mach/suspend.h
delete mode 100644 drivers/video/epson1355fb.c
delete mode 100644 include/video/epson1355.h
^ permalink raw reply
* [GIT PULL 7/12] ARM: soc: soc-specific updates, take 2
From: Olof Johansson @ 2012-10-01 23:57 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1349135827-24790-1-git-send-email-olof@lixom.net>
This branch converts the MXS Freescale platform to use irqdomains and
sparse IRQ, in preparation for DT probing and multiplatform kernels.
Conflicts: none.
----------------------------------------------------------------
The following changes since commit 5d3a0a95868a9669816da193bb284121df9031c8:
Merge branch 'next/cleanup2' into HEAD
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/soc2
for you to fetch changes up to 36246a820075b65907112891b77ff7915fdb06a5:
Merge tag 'mxs-sparse-irq' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc2
----------------------------------------------------------------
Olof Johansson (1):
Merge tag 'mxs-sparse-irq' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc2
Shawn Guo (6):
gpio/mxs: adopt irq_domain support for mxs gpio driver
ARM: mxs: retrieve timer irq from device tree
ARM: mxs: select MULTI_IRQ_HANDLER
ARM: mxs: adopt irq_domain support for icoll driver
ARM: mxs: select SPARSE_IRQ
ARM: mxs: remove mach/irqs.h
arch/arm/Kconfig | 2 +
arch/arm/boot/dts/imx23.dtsi | 5 +-
arch/arm/boot/dts/imx28.dtsi | 5 +-
arch/arm/mach-mxs/icoll.c | 63 +++++++++++++++++++----
arch/arm/mach-mxs/include/mach/common.h | 3 +-
arch/arm/mach-mxs/include/mach/entry-macro.S | 35 -------------
arch/arm/mach-mxs/include/mach/irqs.h | 32 ------------
arch/arm/mach-mxs/mach-mxs.c | 39 ++------------
arch/arm/mach-mxs/timer.c | 13 ++++-
drivers/clk/mxs/clk-imx23.c | 2 +-
drivers/clk/mxs/clk-imx28.c | 2 +-
drivers/gpio/gpio-mxs.c | 48 ++++++++++-------
12 files changed, 112 insertions(+), 137 deletions(-)
delete mode 100644 arch/arm/mach-mxs/include/mach/entry-macro.S
delete mode 100644 arch/arm/mach-mxs/include/mach/irqs.h
^ permalink raw reply
* [GIT PULL 8/12] ARM: soc: driver specific changes
From: Olof Johansson @ 2012-10-01 23:57 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1349135827-24790-1-git-send-email-olof@lixom.net>
- A long-coming conversion of various platforms to a common LED
infrastructure
- AT91 is moved over to use the newer MCI driver for MMC
- Pincontrol conversions for samsung platforms
- DT bindings for gscaler on samsung
- i2c driver fixes for tegra, acked by i2c maintainer
Conflicts:
* add/add conflicts in arch/arm/boot/dts/omap4.dtsi, keep both sides.
* remove/remove conflict in arch/arm/mach-clps711x/common.c, keep HEAD
* Add/add conflicts on arch/arm/mach-omap*/*, keep both sides.
* driver/Makefile add/add conflict with bus and irqchip. Keep both.
* drivers/bus/omap_l3_noc.c conflicts with static vs variable IRQs, keep
the variable case (from this branch).
* Removal/change conflict of two led files and an nxp4008 file, remove
them all.
----------------------------------------------------------------
The following changes since commit 5c008d7029fcd12a9a54fa618781b71353f6c4bd:
Merge branch 'next/soc2' into HEAD
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/drivers
for you to fetch changes up to 04ef037c926ddb31088c976538e29eada4fd1490:
Merge branch 'samsung/pinctrl' into next/drivers
----------------------------------------------------------------
Arnd Bergmann (4):
Merge branch 'for-arm-soc' of git://git.kernel.org/.../cooloney/linux-leds into next/drivers
Merge tag 'at91-for-next-soc' of git://github.com/at91linux/linux-at91 into at91/mci
Merge branch 'drivers/ocp2scp' into next/drivers
Merge branch 'drivers/ocp2scp' into next/drivers
Bryan Wu (18):
led-triggers: create a trigger for CPU activity
ARM: at91: convert old leds drivers to gpio_led and led_trigger drivers
ARM: mach-realview and mach-versatile: retire custom LED code
ARM: mach-ks8695: remove leds driver, since nobody use it
ARM: mach-shark: retire custom LED code
ARM: mach-orion5x: convert custom LED code to gpio_led and LED CPU trigger
ARM: mach-integrator: move CM_CTRL to header file for accessing by other functions
ARM: mach-integrator: retire custom LED code
ARM: mach-clps711x: retire custom LED code of P720T machine
ARM: mach-ebsa110: retire custom LED code
ARM: mach-footbridge: retire custom LED code
char: nwflash: remove old led event code
ARM: mach-pxa: retire custom LED code
ARM: plat-samsung: remove including old leds event API header file
ARM: mach-pnx4008: remove including old leds event API header file
ARM: mach-omap1: retire custom LED code
ARM: mach-sa1100: retire custom LED code
ARM: use new LEDS CPU trigger stub to replace old one
Kishon Vijay Abraham I (3):
drivers: bus: add a new driver for omap-ocp2scp
arm/dts: omap4: Add ocp2scp data
drivers: bus: omap-ocp2scp: Fix compile error
Laxman Dewangan (6):
ARM: tegra: clock: add i2c fast clock entry in clock table
i2c: tegra: pass proper name for getting clock
ARM: tegra: clock: add connection name in i2c clock entry
ARM: tegra: clock: remove unused clock entry for i2c
i2c: tegra: I2_M_NOSTART functionality not supported in Tegra20
i2c: tegra: dynamically control fast clk
Ludovic Desroches (1):
ARM: at91: add atmel-mci support for chips and boards which can use it
Nicolas Ferre (1):
ARM: at91/defconfig: change the MCI driver to use in defconfigs
Olof Johansson (7):
Merge branch 'drivers/ocp2scp' into next/drivers
Merge tag 'tegra-for-3.7-drivers-i2c' of git://git.kernel.org/.../swarren/linux-tegra into next/drivers
drivers: bus: omap_l3: use resources instead of hardcoded irqs
Merge branch 'drivers/ocp2scp' into next/drivers
Merge branch 'next/pinctrl-samsung' of git://git.kernel.org/.../kgene/linux-samsung into next/drivers
Merge branch 'next/dt-gscaler' of git://git.kernel.org/.../kgene/linux-samsung into next/drivers
Merge branch 'samsung/pinctrl' into next/drivers
Paul Bolle (1):
ARM: at91: set i2c_board_info.type to "ds1339" directly
Richard Genoud (1):
ARM: at91/defconfig: Remove unaffected config option
Santosh Shilimkar (1):
drivers: bus: Move the OMAP interconnect driver to drivers/bus/
Shaik Ameer Basha (2):
ARM: EXYNOS: Add clock support for G-Scaler
ARM: EXYNOS: Adds G-Scaler device from Device Tree
Thomas Abraham (6):
pinctrl: add samsung pinctrl and gpiolib driver
pinctrl: add exynos4210 specific extensions for samsung pinctrl driver
gpio: exynos4: skip gpiolib registration if pinctrl driver is used
ARM: EXYNOS: skip wakeup interrupt setup if pinctrl driver is used
ARM: dts: Add pinctrl node entries for SAMSUNG EXYNOS4210 SoC
ARM: EXYNOS: Enable pinctrl driver support for EXYNOS4 device tree enabled platform
Tomasz Figa (7):
pinctrl: exynos: Set pin function to EINT in irq_set_type of GPIO EINTa
pinctrl: exynos: Fix typos in gpio/wkup _irq_mask
pinctrl: exynos: Handle only unmasked wakeup interrupts
pinctrl: exynos: Mark exynos_irq_demux_eint as inline
pinctrl: exynos: Correct the detection of wakeup-eint node
pinctrl: samsung: Uninline samsung_pinctrl_get_soc_data
pinctrl: exynos: Fix wakeup IRQ domain registration check
.../devicetree/bindings/bus/omap-ocp2scp.txt | 10 +
.../devicetree/bindings/media/exynos5-gsc.txt | 30 +
.../bindings/pinctrl/samsung-pinctrl.txt | 196 ++++
arch/arm/Kconfig | 53 --
arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 457 ++++++++++
arch/arm/boot/dts/exynos4210.dtsi | 37 +
arch/arm/boot/dts/exynos5250.dtsi | 28 +
arch/arm/boot/dts/omap4.dtsi | 8 +
arch/arm/configs/afeb9260_defconfig | 1 -
arch/arm/configs/at91rm9200_defconfig | 2 +-
arch/arm/configs/at91sam9261_defconfig | 2 +-
arch/arm/configs/at91sam9263_defconfig | 3 +-
arch/arm/configs/at91sam9g20_defconfig | 2 +-
arch/arm/configs/at91sam9rl_defconfig | 2 +-
arch/arm/configs/cpu9260_defconfig | 2 +-
arch/arm/configs/cpu9g20_defconfig | 2 +-
arch/arm/configs/qil-a9260_defconfig | 3 +-
arch/arm/configs/stamp9g20_defconfig | 1 -
arch/arm/configs/usb-a9260_defconfig | 1 -
arch/arm/include/asm/leds.h | 50 --
arch/arm/kernel/Makefile | 1 -
arch/arm/kernel/leds.c | 121 ---
arch/arm/kernel/process.c | 6 +-
arch/arm/kernel/time.c | 17 -
arch/arm/mach-at91/at91rm9200_devices.c | 92 +-
arch/arm/mach-at91/at91sam9260_devices.c | 84 +-
arch/arm/mach-at91/at91sam9261_devices.c | 60 +-
arch/arm/mach-at91/at91sam9263.c | 4 +-
arch/arm/mach-at91/at91sam9263_devices.c | 161 ++--
arch/arm/mach-at91/at91sam9rl_devices.c | 60 +-
arch/arm/mach-at91/board-afeb-9260v1.c | 14 +-
arch/arm/mach-at91/board-carmeva.c | 14 +-
arch/arm/mach-at91/board-cpu9krea.c | 17 +-
arch/arm/mach-at91/board-cpuat91.c | 13 +-
arch/arm/mach-at91/board-csb337.c | 16 +-
arch/arm/mach-at91/board-eb9200.c | 14 +-
arch/arm/mach-at91/board-ecbat91.c | 32 +-
arch/arm/mach-at91/board-eco920.c | 36 +-
arch/arm/mach-at91/board-flexibity.c | 14 +-
arch/arm/mach-at91/board-foxg20.c | 16 +-
arch/arm/mach-at91/board-kafa.c | 17 +-
arch/arm/mach-at91/board-kb9202.c | 37 +-
arch/arm/mach-at91/board-neocore926.c | 13 +-
arch/arm/mach-at91/board-picotux200.c | 14 +-
arch/arm/mach-at91/board-qil-a9260.c | 14 +-
arch/arm/mach-at91/board-rm9200dk.c | 17 +-
arch/arm/mach-at91/board-rm9200ek.c | 17 +-
arch/arm/mach-at91/board-rsi-ews.c | 16 +-
arch/arm/mach-at91/board-sam9-l9260.c | 39 +-
arch/arm/mach-at91/board-sam9260ek.c | 16 +-
arch/arm/mach-at91/board-sam9261ek.c | 16 +-
arch/arm/mach-at91/board-sam9263ek.c | 13 +-
arch/arm/mach-at91/board-sam9g20ek.c | 16 +-
arch/arm/mach-at91/board-sam9rlek.c | 13 +-
arch/arm/mach-at91/board-stamp9g20.c | 14 -
arch/arm/mach-at91/board-usb-a926x.c | 2 -
arch/arm/mach-at91/board-yl-9200.c | 16 +-
arch/arm/mach-at91/include/mach/board.h | 1 -
arch/arm/mach-at91/leds.c | 105 ---
arch/arm/mach-clps711x/Makefile | 2 -
arch/arm/mach-clps711x/p720t-leds.c | 63 --
arch/arm/mach-clps711x/p720t.c | 62 ++
arch/arm/mach-ebsa110/Makefile | 4 +-
arch/arm/mach-ebsa110/leds.c | 81 +-
arch/arm/mach-exynos/Kconfig | 2 +
arch/arm/mach-exynos/clock-exynos5.c | 86 ++
arch/arm/mach-exynos/common.c | 26 +
arch/arm/mach-exynos/include/mach/map.h | 5 +
arch/arm/mach-exynos/mach-exynos5-dt.c | 8 +
arch/arm/mach-footbridge/Makefile | 4 -
arch/arm/mach-footbridge/ebsa285-leds.c | 138 ---
arch/arm/mach-footbridge/ebsa285.c | 81 ++
arch/arm/mach-footbridge/netwinder-hw.c | 112 ++-
arch/arm/mach-footbridge/netwinder-leds.c | 138 ---
arch/arm/mach-integrator/Makefile | 3 +-
arch/arm/mach-integrator/core.c | 3 -
arch/arm/mach-integrator/include/mach/cm.h | 2 +
arch/arm/mach-integrator/leds.c | 161 ++--
arch/arm/mach-ks8695/Makefile | 3 -
arch/arm/mach-ks8695/devices.c | 21 -
arch/arm/mach-ks8695/include/mach/devices.h | 5 -
arch/arm/mach-ks8695/leds.c | 92 --
arch/arm/mach-omap1/Makefile | 8 -
arch/arm/mach-omap1/board-h2.c | 32 +
arch/arm/mach-omap1/board-h3.c | 32 +
arch/arm/mach-omap1/board-osk.c | 33 +
arch/arm/mach-omap1/leds-h2p2-debug.c | 169 ----
arch/arm/mach-omap1/leds-innovator.c | 98 --
arch/arm/mach-omap1/leds-osk.c | 113 ---
arch/arm/mach-omap1/leds.c | 70 --
arch/arm/mach-omap1/leds.h | 3 -
arch/arm/mach-omap1/time.c | 1 -
arch/arm/mach-omap1/timer32k.c | 1 -
arch/arm/mach-omap2/Kconfig | 2 +
arch/arm/mach-omap2/Makefile | 5 -
arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 1 -
arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 1 -
arch/arm/mach-orion5x/rd88f5182-setup.c | 72 +-
arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 1 -
arch/arm/mach-pxa/Makefile | 8 -
arch/arm/mach-pxa/idp.c | 81 ++
arch/arm/mach-pxa/leds-idp.c | 115 ---
arch/arm/mach-pxa/leds-lubbock.c | 124 ---
arch/arm/mach-pxa/leds-mainstone.c | 119 ---
arch/arm/mach-pxa/leds.c | 32 -
arch/arm/mach-pxa/leds.h | 13 -
arch/arm/mach-pxa/lubbock.c | 95 ++
arch/arm/mach-pxa/mainstone.c | 94 ++
arch/arm/mach-realview/core.c | 39 -
arch/arm/mach-realview/core.h | 2 -
arch/arm/mach-realview/realview_eb.c | 5 -
arch/arm/mach-realview/realview_pb1176.c | 5 -
arch/arm/mach-realview/realview_pb11mp.c | 5 -
arch/arm/mach-realview/realview_pba8.c | 5 -
arch/arm/mach-realview/realview_pbx.c | 5 -
arch/arm/mach-sa1100/Makefile | 9 -
arch/arm/mach-sa1100/assabet.c | 85 ++
arch/arm/mach-sa1100/badge4.c | 30 +
arch/arm/mach-sa1100/cerf.c | 42 +
arch/arm/mach-sa1100/hackkit.c | 32 +
arch/arm/mach-sa1100/lart.c | 26 +
arch/arm/mach-sa1100/leds-assabet.c | 113 ---
arch/arm/mach-sa1100/leds-badge4.c | 110 ---
arch/arm/mach-sa1100/leds-cerf.c | 110 ---
arch/arm/mach-sa1100/leds-hackkit.c | 112 ---
arch/arm/mach-sa1100/leds-lart.c | 101 ---
arch/arm/mach-sa1100/leds.c | 50 --
arch/arm/mach-sa1100/leds.h | 13 -
arch/arm/mach-shark/Makefile | 4 +-
arch/arm/mach-shark/core.c | 1 -
arch/arm/mach-shark/leds.c | 220 ++---
arch/arm/mach-tegra/tegra20_clocks_data.c | 20 +-
arch/arm/mach-tegra/tegra30_clocks_data.c | 15 +-
arch/arm/mach-versatile/core.c | 5 -
arch/arm/plat-omap/Kconfig | 3 +-
arch/arm/plat-omap/debug-leds.c | 293 ++----
arch/arm/plat-samsung/time.c | 1 -
arch/arm/plat-versatile/Kconfig | 4 +-
arch/arm/plat-versatile/leds.c | 8 +-
drivers/Kconfig | 2 +
drivers/Makefile | 1 +
drivers/bus/Kconfig | 21 +
drivers/bus/Makefile | 8 +
drivers/bus/omap-ocp2scp.c | 88 ++
.../mach-omap2 => drivers/bus}/omap_l3_noc.c | 4 +-
.../mach-omap2 => drivers/bus}/omap_l3_noc.h | 0
.../mach-omap2 => drivers/bus}/omap_l3_smx.c | 0
.../mach-omap2 => drivers/bus}/omap_l3_smx.h | 0
drivers/char/nwflash.c | 34 -
drivers/gpio/gpio-samsung.c | 21 +
drivers/i2c/busses/i2c-tegra.c | 130 ++-
drivers/leds/Kconfig | 10 +
drivers/leds/Makefile | 1 +
drivers/leds/ledtrig-cpu.c | 163 ++++
drivers/mtd/nand/Kconfig | 40 -
drivers/pinctrl/Kconfig | 9 +
drivers/pinctrl/Makefile | 2 +
drivers/pinctrl/pinctrl-exynos.c | 579 ++++++++++++
drivers/pinctrl/pinctrl-exynos.h | 218 +++++
drivers/pinctrl/pinctrl-samsung.c | 888 +++++++++++++++++++
drivers/pinctrl/pinctrl-samsung.h | 239 +++++
include/linux/leds.h | 16 +
162 files changed, 4908 insertions(+), 3542 deletions(-)
create mode 100644 Documentation/devicetree/bindings/bus/omap-ocp2scp.txt
create mode 100644 Documentation/devicetree/bindings/media/exynos5-gsc.txt
create mode 100644 Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
create mode 100644 arch/arm/boot/dts/exynos4210-pinctrl.dtsi
delete mode 100644 arch/arm/include/asm/leds.h
delete mode 100644 arch/arm/kernel/leds.c
delete mode 100644 arch/arm/mach-clps711x/p720t-leds.c
delete mode 100644 arch/arm/mach-footbridge/ebsa285-leds.c
delete mode 100644 arch/arm/mach-footbridge/netwinder-leds.c
delete mode 100644 arch/arm/mach-ks8695/leds.c
delete mode 100644 arch/arm/mach-omap1/leds-h2p2-debug.c
delete mode 100644 arch/arm/mach-omap1/leds-innovator.c
delete mode 100644 arch/arm/mach-omap1/leds-osk.c
delete mode 100644 arch/arm/mach-omap1/leds.c
delete mode 100644 arch/arm/mach-omap1/leds.h
delete mode 100644 arch/arm/mach-pxa/leds-idp.c
delete mode 100644 arch/arm/mach-pxa/leds-lubbock.c
delete mode 100644 arch/arm/mach-pxa/leds-mainstone.c
delete mode 100644 arch/arm/mach-pxa/leds.c
delete mode 100644 arch/arm/mach-pxa/leds.h
delete mode 100644 arch/arm/mach-sa1100/leds-assabet.c
delete mode 100644 arch/arm/mach-sa1100/leds-badge4.c
delete mode 100644 arch/arm/mach-sa1100/leds-cerf.c
delete mode 100644 arch/arm/mach-sa1100/leds-hackkit.c
delete mode 100644 arch/arm/mach-sa1100/leds-lart.c
delete mode 100644 arch/arm/mach-sa1100/leds.c
delete mode 100644 arch/arm/mach-sa1100/leds.h
create mode 100644 drivers/bus/Kconfig
create mode 100644 drivers/bus/Makefile
create mode 100644 drivers/bus/omap-ocp2scp.c
rename {arch/arm/mach-omap2 => drivers/bus}/omap_l3_noc.c (98%)
rename {arch/arm/mach-omap2 => drivers/bus}/omap_l3_noc.h (100%)
rename {arch/arm/mach-omap2 => drivers/bus}/omap_l3_smx.c (100%)
rename {arch/arm/mach-omap2 => drivers/bus}/omap_l3_smx.h (100%)
create mode 100644 drivers/leds/ledtrig-cpu.c
create mode 100644 drivers/pinctrl/pinctrl-exynos.c
create mode 100644 drivers/pinctrl/pinctrl-exynos.h
create mode 100644 drivers/pinctrl/pinctrl-samsung.c
create mode 100644 drivers/pinctrl/pinctrl-samsung.h
^ permalink raw reply
* [GIT PULL 9/12] ARM: soc: board specific updates
From: Olof Johansson @ 2012-10-01 23:57 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1349135827-24790-1-git-send-email-olof@lixom.net>
Misc board updates:
- Greg added a handful of boards to KS8695 (since he has stepped up to
maintain it).
- Qualcomm has added DT-only board support for a couple of their newer SoCs.
- misc other updates for Samsung and Freescale boards.
Conflicts:
* add/add conflict in arch/arm/mach-shmobile/board-armadillo800eva.c. Keep both.
----------------------------------------------------------------
The following changes since commit 8b1a13b02812b60b88920801363920956691feb3:
Merge branch 'next/drivers' into HEAD
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/boards
for you to fetch changes up to e6ca4ae895e9fbf8b96d3ee1dd44ea96e95babad:
Merge branch 'next/board-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/boards
----------------------------------------------------------------
Arnd Bergmann (1):
Merge branch 'board' of git://github.com/hzhuang1/linux into next/boards
Fabio Estevam (1):
ARM: mx27pdk: Add audio support
Greg Ungerer (2):
ARM: ks8695: add board support for the SnapGear boards based on the KS8695
ARM: ks8695: add board support for the OpenGear boards based on the KS8695
Haojian Zhuang (2):
ARM: mmp: implement DEBUG_LL port choice
ARM: mmp: enable debug uart port in defconfig
Kuninori Morimoto (2):
ARM: shmobile: marzen: fixup regulator id for smsc911x
ARM: shmobile: marzen: enable thermal sensor
Lei Wen (1):
ARM: ttc_dkb: add nand support
Mark Brown (2):
ARM: S3C64XX: Update configuration for WM5102 module on Cragganmore
ARM: S3C64XX: Register audio platform devices for Bells on Cragganmore
Nobuhiro Iwamatsu (1):
ARM: shmobile: armadillo800eva: Add support RTC
Olof Johansson (7):
Merge branch 'ks8695/boards' into next/boards
Merge branch 'boards' of git://git.kernel.org/.../horms/renesas into next/boards
Merge branch 'board' of git://github.com/hzhuang1/linux into next/boards
Merge branch 'boards' of git://git.kernel.org/.../horms/renesas into next/boards
Merge tag 'imx-boards' of git://git.pengutronix.de/git/imx/linux-2.6 into next/boards
Merge tag 'msm-board-for-3.7' of git://git.kernel.org/.../davidb/linux-msm into next/boards
Merge branch 'next/board-samsung' of git://git.kernel.org/.../kgene/linux-samsung into next/boards
Phil Edworthy (1):
ARM: shmobile: marzen: add SDHI0 support
Sachin Kamat (4):
ARM: dts: Use active low flag for gpio-keys on Origen
ARM: dts: Add heartbeat gpio-leds support to Origen
ARM: EXYNOS: Add generic PWM lookup support for SMDK4X12
ARM: EXYNOS: Add generic PWM lookup support for SMDKV310
Stephen Boyd (2):
ARM: msm: Allow msm_iomap-8x60 and msm_iomap-8960 to coexist
ARM: msm: Allow 8960 and 8660 to compile together
Tushar Behera (1):
ARM: EXYNOS: Use generic pwm driver in Origen board
arch/arm/Kconfig.debug | 14 ++
arch/arm/boot/dts/exynos4210-origen.dts | 18 +-
arch/arm/configs/armadillo800eva_defconfig | 3 +
arch/arm/configs/marzen_defconfig | 2 +
arch/arm/configs/mmp2_defconfig | 5 +-
arch/arm/configs/pxa910_defconfig | 4 +-
arch/arm/mach-exynos/Kconfig | 3 +
arch/arm/mach-exynos/mach-origen.c | 6 +
arch/arm/mach-exynos/mach-smdk4x12.c | 6 +
arch/arm/mach-exynos/mach-smdkv310.c | 7 +
arch/arm/mach-imx/Kconfig | 1 +
arch/arm/mach-imx/mach-mx27_3ds.c | 21 +-
arch/arm/mach-ks8695/Kconfig | 61 ++++++
arch/arm/mach-ks8695/Makefile | 8 +
arch/arm/mach-ks8695/board-og.c | 199 +++++++++++++++++++
arch/arm/mach-ks8695/board-sg.c | 121 +++++++++++
arch/arm/mach-mmp/include/mach/debug-macro.S | 12 +-
arch/arm/mach-mmp/ttc_dkb.c | 10 +
arch/arm/mach-msm/Kconfig | 8 +-
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 11 -
arch/arm/mach-msm/include/mach/msm_iomap.h | 3 +-
arch/arm/mach-msm/io.c | 2 -
arch/arm/mach-s3c64xx/mach-crag6410-module.c | 36 +++-
arch/arm/mach-s3c64xx/mach-crag6410.c | 12 ++
arch/arm/mach-shmobile/board-armadillo800eva.c | 25 +++
arch/arm/mach-shmobile/board-marzen.c | 68 ++++++-
26 files changed, 633 insertions(+), 33 deletions(-)
create mode 100644 arch/arm/mach-ks8695/board-og.c
create mode 100644 arch/arm/mach-ks8695/board-sg.c
^ permalink raw reply
* [GIT PULL 10/12] ARM: soc: device tree updates, take 2
From: Olof Johansson @ 2012-10-01 23:57 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1349135827-24790-1-git-send-email-olof@lixom.net>
This branch contains mostly a set of changes for device tree bindings
on Samsung Exynos. It was staged behind the other branches due to
dependencies on pincontrol and board changes.
Conflicts:
* remove/remove conflict in arch/arm/mach-exynos/clock-exynos5.c. Remove
both sides, i.e. the whole first entry.
----------------------------------------------------------------
The following changes since commit a8e1ceb728d249fbe0bc5e30b9b8ceb0f33b54f5:
Merge branch 'next/boards' into HEAD
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/dt2
for you to fetch changes up to 7b27fa258c8f2670a8c09bbc6c4b2c874d155da2:
Merge branch 'next/dt2' into HEAD
----------------------------------------------------------------
Kukjin Kim (3):
ARM: dts: use uart2 for console on smdkv310 and smdk5250
Merge branches 'next/pinctrl-samsung' and 'next/board-samsung' into next/dt-samsung-new
Merge branch 'next/dt-samsung' into next/dt-samsung-new
Olof Johansson (4):
Merge branch 'samsung/boards' into next/dt2
Merge branch 'samsung/pinctrl' into next/dt2
Merge branch 'next/dt-samsung-new' of git://git.kernel.org/.../kgene/linux-samsung into next/dt2
Merge branch 'next/dt2' into HEAD
Thomas Abraham (3):
ARM: EXYNOS: Add support for MSHC controller clocks
ARM: EXYNOS: Add AUXDATA support for MSHC controllers
ARM: dts: Add nodes for dw_mmc controllers for Samsung EXYNOS5250 platforms
Tomasz Figa (6):
ARM: dts: Move parts common to EXYNOS4 from exynos4210.dtsi to exynos4.dtsi
ARM: EXYNOS: Use exynos4 prefix instead of exynos4210 on exynos4-dt
ARM: dts: Assume status of all optional nodes as disabled for exynos4
ARM: dts: Specify address and size cells for i2c controllers for EXYNOS4
ARM: EXYNOS: Add OF compatibility lookups for EXYNOS4 i2c adapters
ARM: dts: Add basic dts file for Samsung Trats board
Tushar Behera (1):
ARM: dts: Enable on-board keys as wakeup source for exynos4210-origen
arch/arm/boot/dts/exynos4.dtsi | 248 +++++++++++++++++++++++++
arch/arm/boot/dts/exynos4210-origen.dts | 63 +------
arch/arm/boot/dts/exynos4210-smdkv310.dts | 54 +-----
arch/arm/boot/dts/exynos4210-trats.dts | 237 +++++++++++++++++++++++
arch/arm/boot/dts/exynos4210.dtsi | 186 +------------------
arch/arm/boot/dts/exynos5250-smdk5250.dts | 59 +++++-
arch/arm/boot/dts/exynos5250.dtsi | 32 ++++
arch/arm/mach-exynos/Makefile.boot | 2 +-
arch/arm/mach-exynos/clock-exynos5.c | 45 ++---
arch/arm/mach-exynos/include/mach/map.h | 4 +
arch/arm/mach-exynos/mach-exynos4-dt.c | 32 +++-
arch/arm/mach-exynos/mach-exynos5-dt.c | 8 +
12 files changed, 644 insertions(+), 326 deletions(-)
create mode 100644 arch/arm/boot/dts/exynos4.dtsi
create mode 100644 arch/arm/boot/dts/exynos4210-trats.dts
^ permalink raw reply
* [GIT PULL 11/12] ARM: soc: documentation updates
From: Olof Johansson @ 2012-10-01 23:57 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1349135827-24790-1-git-send-email-olof@lixom.net>
Documentation update for Marvell SoCs, the secret decoder ring to all
their crazy product names and numbers.
Conflicts: none.
----------------------------------------------------------------
The following changes since commit 7b27fa258c8f2670a8c09bbc6c4b2c874d155da2:
Merge branch 'next/dt2' into HEAD
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/docs
for you to fetch changes up to c1faefbb5ba24957e0e5b519adf0e128380f49de:
Merge branch 'marvell-doc' of git://github.com/MISL-EBU-System-SW/mainline-public into next/docs
----------------------------------------------------------------
Arnd Bergmann (1):
Merge branch 'marvell-doc' of git://github.com/MISL-EBU-System-SW/mainline-public into next/docs
Thomas Petazzoni (1):
arm: add documentation describing Marvell families of SoC
Documentation/arm/Marvell/README | 232 ++++++++++++++++++++++++++++++++++
1 file changed, 232 insertions(+)
create mode 100644 Documentation/arm/Marvell/README
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox