Skip to contentSkip to conversation

mvebu support for kirkwood HP T5325

PATCH Superseded Andrew Lunn 3 participants 15 messages Feb 24, 2014

Subsystems (5)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Andrew Lunn

author maintainer
#0 lore raw

v2 cover mvebu support for kirkwood HP T5325

This patchset adds support to mvebu for the HP T5325 thin client. This is the first kirkwood device using device tree which supports audio. However the audio codec is missing a device tree binding, and simple-audio-card does not yet quite support all the properties needed for this hardware. So C code is used for the audio devices.

v2:
Indentation fixes, space->tab, extra spaces removed. Split DTS into a patch of its own.

Andrew Lunn (5):
ARM: Kirkwood: Add audio node to kirkwood.dtsi
ARM: mvebu: Add i2c alias so setting bus number
ARM: mvebu: Add HP T5325 thin client
ARM: mvebu: Add dts file describing HP T5325 thin client
ARM: mvebu: Add HP T5325 devices to {multi|mvebu}_v5_defconfig

 arch/arm/boot/dts/Makefile           |   1 +
 arch/arm/boot/dts/kirkwood-t5325.dts | 209 +++++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/kirkwood.dtsi      |  12 +-
 arch/arm/configs/multi_v5_defconfig  |   9 ++
 arch/arm/configs/mvebu_v5_defconfig  |   9 ++
 arch/arm/mach-mvebu/Kconfig          |   7 ++
 arch/arm/mach-mvebu/Makefile         |   1 +
 arch/arm/mach-mvebu/board-t5325.c    |  41 +++++++
 arch/arm/mach-mvebu/board.h          |  22 ++++
 arch/arm/mach-mvebu/kirkwood.c       |  11 +-
 10 files changed, 320 insertions(+), 2 deletions(-)
 create mode 100644 arch/arm/boot/dts/kirkwood-t5325.dts
 create mode 100644 arch/arm/mach-mvebu/board-t5325.c
 create mode 100644 arch/arm/mach-mvebu/board.h
Signature · 1 line
1.8.5.3
author maintainer
#1 lore raw

PATCH v2 1/5 ARM: Kirkwood: Add audio node to kirkwood.dtsi

The binding has existed for a while, so add the missing node so it can be used by devices.

---
v2:
Tabify

---
 arch/arm/boot/dts/kirkwood.dtsi | 9 +++++++++
 1 file changed, 9 insertions(+)
arch/arm/boot/dts/kirkwood.dtsi +9 -0
index 7b921b30cfcb..180dc69ff742 100644
@@ -310,5 +310,14 @@
 			#phy-cells = <0>;
 			status = "ok";
 		};
+
+		audio0: audio-controller at a0000 {
+			compatible = "marvell,kirkwood-audio";
+			reg = <0xa0000 0x2210>;
+			interrupts = <24>;
+			clocks = <&gate_clk 9>;
+			clock-names = "internal";
+			status = "disabled";
+                };
 	};
 };
Signature · 1 line
1.8.5.3
#2 lore raw

PATCH v2 1/5 ARM: Kirkwood: Add audio node to kirkwood.dtsi

Quoted 18 lines · Andrew Lunn

The binding has existed for a while, so add the missing node so it can be used by devices.

---
v2:
Tabify

---
 arch/arm/boot/dts/kirkwood.dtsi | 9 +++++++++
 1 file changed, 9 insertions(+)
arch/arm/boot/dts/kirkwood.dtsi +0 -0
index 7b921b30cfcb..180dc69ff742 100644
@@ -310,5 +310,14 @@
 			#phy-cells = <0>;
 			status = "ok";

arch/arm/boot/dts/kirkwood.dtsi line 321

Quoted 10 lines
arch/arm/boot/dts/kirkwood.dtsi +9 -0
 		};
+
+		audio0: audio-controller at a0000 {
+			compatible = "marvell,kirkwood-audio";
+			reg = <0xa0000 0x2210>;
+			interrupts = <24>;
+			clocks = <&gate_clk 9>;
+			clock-names = "internal";
+			status = "disabled";
+                };

leading whitespace before brace.

thx,

Jason.

Quoted 10 lines
arch/arm/boot/dts/kirkwood.dtsi +0 -0
 	};
 };
Signature · 7 lines
1.8.5.3


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
author maintainer
#3 lore raw

PATCH v2 2/5 ARM: mvebu: Add i2c alias so setting bus number

In reply to Andrew Lunn

When using platform_driver instantiation, the i2c bus was given bus number 0. The kirkwood-t5325 audio driver has this bus number hard coded for the address of the codec. However by default device tree i2c busses are dynamically allocated a bus number, starting from 1. Thus the kirkwood-t5325 cannot find its audio codec. By adding an alias in the DT file we can control the bus number and set it to 0. The codec can then be found.

---
 arch/arm/boot/dts/kirkwood.dtsi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/boot/dts/kirkwood.dtsi +2 -1
index 180dc69ff742..d8e34fab835b 100644
@@ -24,6 +24,7 @@
 	aliases {
 	       gpio0 = &gpio0;
 	       gpio1 = &gpio1;
+	       i2c0 = &i2c0;
 	};
 
 	mbus {
@@ -111,7 +112,7 @@
 			clocks = <&gate_clk 7>;
 		};
 
-		i2c at 11000 {
+		i2c0: i2c at 11000 {
 			compatible = "marvell,mv64xxx-i2c";
 			reg = <0x11000 0x20>;
 			#address-cells = <1>;
Signature · 1 line
1.8.5.3
#4 lore raw

PATCH v2 2/5 ARM: mvebu: Add i2c alias so setting bus number

Subject should be "ARM: kirkwood: ..."

thx,

Jason.

Quoted 42 lines · Andrew Lunn

When using platform_driver instantiation, the i2c bus was given bus number 0. The kirkwood-t5325 audio driver has this bus number hard coded for the address of the codec. However by default device tree i2c busses are dynamically allocated a bus number, starting from 1. Thus the kirkwood-t5325 cannot find its audio codec. By adding an alias in the DT file we can control the bus number and set it to 0. The codec can then be found.

---
 arch/arm/boot/dts/kirkwood.dtsi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/boot/dts/kirkwood.dtsi +2 -1
index 180dc69ff742..d8e34fab835b 100644
@@ -24,6 +24,7 @@
 	aliases {
 	       gpio0 = &gpio0;
 	       gpio1 = &gpio1;
+	       i2c0 = &i2c0;
 	};
 
 	mbus {
@@ -111,7 +112,7 @@
 			clocks = <&gate_clk 7>;
 		};
 
-		i2c at 11000 {
+		i2c0: i2c at 11000 {
 			compatible = "marvell,mv64xxx-i2c";
 			reg = <0x11000 0x20>;
 			#address-cells = <1>;
Signature · 7 lines
1.8.5.3


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
author maintainer
#5 lore raw

PATCH v2 2/5 ARM: mvebu: Add i2c alias so setting bus number

Quoted 1 line · Jason Cooper

Subject should be "ARM: kirkwood: ..."

Humm, why?

linux/arch/arm/boot/dts$ git log --oneline armada-370.dtsi a095b1c78a35 ARM: mvebu: sort DT nodes by address
d4fa99417a07 ARM: mvebu: link PCIe controllers to the MSI controller 238493e34d3f ARM: dts: mvebu: Update with the new compatible string for mv64xxx- 6cbe0e1feaf8 Merge tag 'dt-3.12' of git://git.infradead.org/linux-mvebu into nex 5d3b88307176 ARM: mvebu: Fix the Armada 370/XP timer compatible strings ca60985c0042 ARM: mvebu: use correct #interrupt-cells instead of #interrupts-cel 14fd8ed0a7fd ARM: mvebu: Relocate Armada 370/XP PCIe device tree nodes 0cd3754a8317 ARM: mvebu: Add BootROM to Armada 370/XP device tree 5e12a613ce39 ARM: mvebu: Add MBus to Armada 370/XP device tree 38149887ef8b ARM: mvebu: Use the preprocessor on Armada 370/XP device tree files 9214cbe50fe7 Merge tag 'dt-3.11-5' of git://git.infradead.org/users/jcooper/linu
83735101959e ARM: mvebu: Remove device tree unused properties on A370 489e138eec96 ARM: dts: mvebu: Fix wrong the address reg value for the L2-cache n 8eed481e6fe2 arm: mvebu: fix the 'ranges' property to handle PCIe

Seems to me, now that it is part of mach-mvebu, ARM: mvebu is correct.

Andrew

#6 lore raw

PATCH v2 2/5 ARM: mvebu: Add i2c alias so setting bus number

Andrew,

+ arm-soc maintainers

Quoted 6 lines · Andrew Lunn
Quoted 1 line · Jason Cooper

Subject should be "ARM: kirkwood: ..."

Humm, why?

linux/arch/arm/boot/dts$ git log --oneline armada-370.dtsi

No, you're editing:

 arch/arm/boot/dts/kirkwood.dtsi | 3 ++-
Quoted 15 lines

a095b1c78a35 ARM: mvebu: sort DT nodes by address
d4fa99417a07 ARM: mvebu: link PCIe controllers to the MSI controller 238493e34d3f ARM: dts: mvebu: Update with the new compatible string for mv64xxx- 6cbe0e1feaf8 Merge tag 'dt-3.12' of git://git.infradead.org/linux-mvebu into nex 5d3b88307176 ARM: mvebu: Fix the Armada 370/XP timer compatible strings ca60985c0042 ARM: mvebu: use correct #interrupt-cells instead of #interrupts-cel 14fd8ed0a7fd ARM: mvebu: Relocate Armada 370/XP PCIe device tree nodes 0cd3754a8317 ARM: mvebu: Add BootROM to Armada 370/XP device tree 5e12a613ce39 ARM: mvebu: Add MBus to Armada 370/XP device tree 38149887ef8b ARM: mvebu: Use the preprocessor on Armada 370/XP device tree files 9214cbe50fe7 Merge tag 'dt-3.11-5' of git://git.infradead.org/users/jcooper/linu
83735101959e ARM: mvebu: Remove device tree unused properties on A370 489e138eec96 ARM: dts: mvebu: Fix wrong the address reg value for the L2-cache n 8eed481e6fe2 arm: mvebu: fix the 'ranges' property to handle PCIe

Quoted 1 line

Seems to me, now that it is part of mach-mvebu, ARM: mvebu is correct.

"ARM: kirkwood: ..." is more helpful to someone searching --oneline for changes to the kirkwood SoC.

So yeah, mvebu encompasses kirkwood now with your patchset. Which makes the 'mvebu' term more vague. Before, folks could restrict commit history on mach-kirkwood/ or mach-dove/ to see changes for a particular SoC. With it all in mach-mvebu (and not in a single file), we need another way for developers to spot relevant commits. That's why I prefer the above.

ex: What changed from v3.15 to v3.16 for kirkwood?

$ git log --oneline v3.15..v3.16 -- arch/arm/mach-mvebu | \
	grep -i 'ARM: kirkwood'

This seems to be new territory for us (mvebu), perhaps one of the arm-soc maintainers has a preference? I'll add them to this reply.

thx,

Jason.

maintainer
#7 lore raw

PATCH v2 2/5 ARM: mvebu: Add i2c alias so setting bus number

Quoted 8 lines · Jason Cooper

ex: What changed from v3.15 to v3.16 for kirkwood?

$ git log --oneline v3.15..v3.16 -- arch/arm/mach-mvebu | \
        grep -i 'ARM: kirkwood'

This seems to be new territory for us (mvebu), perhaps one of the arm-soc maintainers has a preference? I'll add them to this reply.

I don't care, as long as you decide on something that works for you. While you're transitioning, it probably makes little sense to enforce either one too strictly.

Arnd

#8 lore raw

PATCH v2 2/5 ARM: mvebu: Add i2c alias so setting bus number

Quoted 5 lines · Arnd Bergmann
Quoted 3 lines · Jason Cooper

ex: What changed from v3.15 to v3.16 for kirkwood?

Quoted 7 lines
Quoted 5 lines
$ git log --oneline v3.15..v3.16 -- arch/arm/mach-mvebu | \
        grep -i 'ARM: kirkwood'

This seems to be new territory for us (mvebu), perhaps one of the arm-soc maintainers has a preference? I'll add them to this reply.

I don't care, as long as you decide on something that works for you.

Ok, we'll wait till we have an actual problem ;-) Seriously though, once dove and kirkwood are both migrated, we'll sit down and hash out how to handle it (if needed at all).

Quoted 2 lines

While you're transitioning, it probably makes little sense to enforce either one too strictly.

Agreed. Andrew, let's stick with the previous pseudo-file/path standard for now. If you're inclined, please change the dts patches to kirkwood. If you don't feel like it, I'll only twitch a little bit. :)

thx,

Jason.

author maintainer
#9 lore raw

PATCH v2 3/5 ARM: mvebu: Add HP T5325 thin client

In reply to Andrew Lunn

Convert the kirkwood t5325-setup.c to mostly device tree for mach-mvebu. Part of the audio setup needs to remain in C for the moment until suitable bindings are designed and implemented. So add board code, triggered by the compatibility string.

---
v2:
Remove spaces around KEY_POWER
Correct indentation of help text in Kconfig.
Put dts file into a patch of its own.

---
 arch/arm/boot/dts/Makefile        |  1 +
 arch/arm/mach-mvebu/Kconfig       |  7 +++++++
 arch/arm/mach-mvebu/Makefile      |  1 +
 arch/arm/mach-mvebu/board-t5325.c | 41 +++++++++++++++++++++++++++++++++++++++
 arch/arm/mach-mvebu/board.h       | 22 +++++++++++++++++++++
 arch/arm/mach-mvebu/kirkwood.c    | 11 ++++++++++-
 6 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/mach-mvebu/board-t5325.c
 create mode 100644 arch/arm/mach-mvebu/board.h
arch/arm/boot/dts/Makefile +1 -0
index 436cc381db4a..20c152faa800 100644
@@ -132,6 +132,7 @@ kirkwood := \
 	kirkwood-rs411.dtb \
 	kirkwood-sheevaplug.dtb \
 	kirkwood-sheevaplug-esata.dtb \
+	kirkwood-t5325.dtb \
 	kirkwood-topkick.dtb \
 	kirkwood-ts219-6281.dtb \
 	kirkwood-ts219-6282.dtb \
arch/arm/mach-mvebu/Kconfig +7 -0
index 529f9164a8ca..5de7ada19191 100644
@@ -92,6 +92,13 @@ config MACH_KIRKWOOD
 	  Say 'Y' here if you want your kernel to support boards based
 	  on the Marvell Kirkwood device tree.
 
+config MACH_T5325
+	bool "HP T5325 thin client"
+	depends on MACH_KIRKWOOD
+	help
+	  Say 'Y' here if you want your kernel to support the
+	  HP T5325 Thin client
+
 endmenu
 
 endif
arch/arm/mach-mvebu/Makefile +1 -0
index d7672f1c8a6a..bbeb41ee3e75 100644
@@ -9,3 +9,4 @@ obj-$(CONFIG_ARCH_MVEBU)	 += coherency.o coherency_ll.o pmsu.o
 obj-$(CONFIG_SMP)                += platsmp.o headsmp.o
 obj-$(CONFIG_HOTPLUG_CPU)        += hotplug.o
 obj-$(CONFIG_MACH_KIRKWOOD)	 += kirkwood.o kirkwood-pm.o
+obj-$(CONFIG_MACH_T5325)	 += board-t5325.o
arch/arm/mach-mvebu/board-t5325.c new file +41 -0

41 lines not on this page · raw message

arch/arm/mach-mvebu/board.h new file +22 -0
new file mode 100644
index 000000000000..de7f0a191394
@@ -0,0 +1,22 @@
+/*
+ * Board functions for Marvell System On Chip
+ *
+ * Copyright (C) 2014
+ *
+ * Andrew Lunn <[email protected]>
+ *
+ * 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 __ARCH_MVEBU_BOARD_H
+#define __ARCH_MVEBU_BOARD_H
+
+#ifdef CONFIG_MACH_T5325
+void t5325_init(void);
+#else
+static inline void t5325_init(void) {};
+#endif
+
+#endif
arch/arm/mach-mvebu/kirkwood.c +10 -1
index 8a38b10532e5..120207fc36f1 100644
@@ -25,6 +25,7 @@
 #include "kirkwood.h"
 #include "kirkwood-pm.h"
 #include "common.h"
+#include "board.h"
 
 static struct resource kirkwood_cpufreq_resources[] = {
 	[0] = {
@@ -158,6 +159,11 @@ void kirkwood_disable_mbus_error_propagation(void)
 	writel(readl(cpu_config) & ~CPU_CONFIG_ERROR_PROP, cpu_config);
 }
 
+static struct of_dev_auxdata auxdata[] __initdata = {
+	OF_DEV_AUXDATA("marvell,kirkwood-audio", 0xf10a0000,
+		       "mvebu-audio", NULL),
+	{ /* sentinel */ }
+};
 
 static void __init kirkwood_dt_init(void)
 {
@@ -174,7 +180,10 @@ static void __init kirkwood_dt_init(void)
 	kirkwood_pm_init();
 	kirkwood_dt_eth_fixup();
 
-	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+	if (of_machine_is_compatible("hp,t5325"))
+		t5325_init();
+
+	of_platform_populate(NULL, of_default_bus_match_table, auxdata, NULL);
 }
 
 static const char * const kirkwood_dt_board_compat[] = {
Signature · 1 line
1.8.5.3
#10 lore raw

PATCH v2 3/5 ARM: mvebu: Add HP T5325 thin client

Subject should be "ARM: kirkwood: ..."

Quoted 5 lines · Andrew Lunn

Convert the kirkwood t5325-setup.c to mostly device tree for mach-mvebu. Part of the audio setup needs to remain in C for the moment until suitable bindings are designed and implemented. So add board code, triggered by the compatibility string.

Quoted 8 lines

---
v2:
Remove spaces around KEY_POWER
Correct indentation of help text in Kconfig.
Put dts file into a patch of its own.

---
 arch/arm/boot/dts/Makefile        |  1 +

This Makefile change should be in the same patch as the one adding the dts file.

thx,

Jason.

Quoted 167 lines
 arch/arm/mach-mvebu/Kconfig       |  7 +++++++
 arch/arm/mach-mvebu/Makefile      |  1 +
 arch/arm/mach-mvebu/board-t5325.c | 41 +++++++++++++++++++++++++++++++++++++++
 arch/arm/mach-mvebu/board.h       | 22 +++++++++++++++++++++
 arch/arm/mach-mvebu/kirkwood.c    | 11 ++++++++++-
 6 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/mach-mvebu/board-t5325.c
 create mode 100644 arch/arm/mach-mvebu/board.h
arch/arm/boot/dts/Makefile +1 -0
index 436cc381db4a..20c152faa800 100644
@@ -132,6 +132,7 @@ kirkwood := \
 	kirkwood-rs411.dtb \
 	kirkwood-sheevaplug.dtb \
 	kirkwood-sheevaplug-esata.dtb \
+	kirkwood-t5325.dtb \
 	kirkwood-topkick.dtb \
 	kirkwood-ts219-6281.dtb \
 	kirkwood-ts219-6282.dtb \
arch/arm/mach-mvebu/Kconfig +7 -0
index 529f9164a8ca..5de7ada19191 100644
@@ -92,6 +92,13 @@ config MACH_KIRKWOOD
 	  Say 'Y' here if you want your kernel to support boards based
 	  on the Marvell Kirkwood device tree.
 
+config MACH_T5325
+	bool "HP T5325 thin client"
+	depends on MACH_KIRKWOOD
+	help
+	  Say 'Y' here if you want your kernel to support the
+	  HP T5325 Thin client
+
 endmenu
 
 endif
arch/arm/mach-mvebu/Makefile +1 -0
index d7672f1c8a6a..bbeb41ee3e75 100644
@@ -9,3 +9,4 @@ obj-$(CONFIG_ARCH_MVEBU)	 += coherency.o coherency_ll.o pmsu.o
 obj-$(CONFIG_SMP)                += platsmp.o headsmp.o
 obj-$(CONFIG_HOTPLUG_CPU)        += hotplug.o
 obj-$(CONFIG_MACH_KIRKWOOD)	 += kirkwood.o kirkwood-pm.o
+obj-$(CONFIG_MACH_T5325)	 += board-t5325.o
arch/arm/mach-mvebu/board-t5325.c new file +41 -0
new file mode 100644
index 000000000000..65ace6db9f28
@@ -0,0 +1,41 @@
+/*
+ * HP T5325 Board Setup
+ *
+ * Copyright (C) 2014
+ *
+ * Andrew Lunn <[email protected]>
+ *
+ * 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/i2c.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <sound/alc5623.h>
+#include "board.h"
+
+static struct platform_device hp_t5325_audio_device = {
+	.name		= "t5325-audio",
+	.id		= -1,
+};
+
+static struct alc5623_platform_data alc5621_data = {
+	.add_ctrl = 0x3700,
+	.jack_det_ctrl = 0x4810,
+};
+
+static struct i2c_board_info i2c_board_info[] __initdata = {
+	{
+		I2C_BOARD_INFO("alc5621", 0x1a),
+		.platform_data = &alc5621_data,
+	},
+};
+
+void __init t5325_init(void)
+{
+	i2c_register_board_info(0, i2c_board_info, ARRAY_SIZE(i2c_board_info));
+	platform_device_register(&hp_t5325_audio_device);
+}
arch/arm/mach-mvebu/board.h new file +22 -0
new file mode 100644
index 000000000000..de7f0a191394
@@ -0,0 +1,22 @@
+/*
+ * Board functions for Marvell System On Chip
+ *
+ * Copyright (C) 2014
+ *
+ * Andrew Lunn <[email protected]>
+ *
+ * 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 __ARCH_MVEBU_BOARD_H
+#define __ARCH_MVEBU_BOARD_H
+
+#ifdef CONFIG_MACH_T5325
+void t5325_init(void);
+#else
+static inline void t5325_init(void) {};
+#endif
+
+#endif
arch/arm/mach-mvebu/kirkwood.c +10 -1
index 8a38b10532e5..120207fc36f1 100644
@@ -25,6 +25,7 @@
 #include "kirkwood.h"
 #include "kirkwood-pm.h"
 #include "common.h"
+#include "board.h"
 
 static struct resource kirkwood_cpufreq_resources[] = {
 	[0] = {
@@ -158,6 +159,11 @@ void kirkwood_disable_mbus_error_propagation(void)
 	writel(readl(cpu_config) & ~CPU_CONFIG_ERROR_PROP, cpu_config);
 }
 
+static struct of_dev_auxdata auxdata[] __initdata = {
+	OF_DEV_AUXDATA("marvell,kirkwood-audio", 0xf10a0000,
+		       "mvebu-audio", NULL),
+	{ /* sentinel */ }
+};
 
 static void __init kirkwood_dt_init(void)
 {
@@ -174,7 +180,10 @@ static void __init kirkwood_dt_init(void)
 	kirkwood_pm_init();
 	kirkwood_dt_eth_fixup();
 
-	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+	if (of_machine_is_compatible("hp,t5325"))
+		t5325_init();
+
+	of_platform_populate(NULL, of_default_bus_match_table, auxdata, NULL);
 }
 
 static const char * const kirkwood_dt_board_compat[] = {
Signature · 7 lines
1.8.5.3


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
author maintainer
#11 lore raw

PATCH v2 3/5 ARM: mvebu: Add HP T5325 thin client

Quoted 1 line · Jason Cooper

Subject should be "ARM: kirkwood: ..."

I disagree, but lets discuss that with the other patch.

Quoted 16 lines · Andrew Lunn
Quoted 5 lines

Convert the kirkwood t5325-setup.c to mostly device tree for mach-mvebu. Part of the audio setup needs to remain in C for the moment until suitable bindings are designed and implemented. So add board code, triggered by the compatibility string.

Quoted 8 lines

---
v2:
Remove spaces around KEY_POWER
Correct indentation of help text in Kconfig.
Put dts file into a patch of its own.

---
 arch/arm/boot/dts/Makefile        |  1 +
Quoted 2 lines

This Makefile change should be in the same patch as the one adding the dts file.

Agreed. Will fix.

Andrew

author maintainer
#12 lore raw

PATCH v2 4/5 ARM: mvebu: Add dts file describing HP T5325 thin client

In reply to Andrew Lunn

Describe the T5325 using device tree properties, where possible. The first version of this file was produced by Thomas Petazzoni.

---
 arch/arm/boot/dts/kirkwood-t5325.dts | 209 +++++++++++++++++++++++++++++++++++
 1 file changed, 209 insertions(+)
 create mode 100644 arch/arm/boot/dts/kirkwood-t5325.dts
arch/arm/boot/dts/kirkwood-t5325.dts new file +209 -0
new file mode 100644
index 000000000000..8df357d822ca
@@ -0,0 +1,209 @@
+/*
+ * Device Tree file for HP t5325 Thin Client"
+ *
+ * Copyright (C) 2014
+ *
+ * Thomas Petazzoni <[email protected]>
+ * Andrew Lunn <[email protected]>
+ *
+ * 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.
+*/
+
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+
+/ {
+	model = "HP t5325 Thin Client";
+	compatible = "hp,t5325", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+	memory {
+		device_type = "memory";
+		reg = <0x00000000 0x20000000>;
+	};
+
+	chosen {
+		bootargs = "console=ttyS0,115200n8";
+	};
+
+	mbus {
+		pcie-controller {
+			status = "okay";
+
+			pcie at 1,0 {
+				status = "okay";
+			};
+		};
+	};
+
+	ocp at f1000000 {
+		pinctrl: pinctrl at 10000 {
+			pinctrl-0 = <&pmx_i2s &pmx_sysrst>;
+			pinctrl-names = "default";
+
+			pmx_button_power: pmx-button_power {
+				marvell,pins = "mpp45";
+				marvell,function = "gpio";
+			};
+
+			pmx_power_off: pmx-power-off {
+				marvell,pins = "mpp48";
+				marvell,function = "gpio";
+			};
+
+			pmx_led: pmx-led {
+				marvell,pins = "mpp21";
+				marvell,function = "gpio";
+			};
+
+			pmx_usb_sata_power_enable: pmx-usb-sata-power-enable {
+				marvell,pins = "mpp44";
+				marvell,function = "gpio";
+			};
+
+			/*
+                         * Redefined from kirkwood-6281.dtsi, because
+			 * we don't use SPI CS on MPP0, but on MPP7.
+			 */
+			pmx_spi: pmx-spi {
+				marvell,pins = "mpp1", "mpp2", "mpp3", "mpp7";
+				marvell,function = "spi";
+			};
+
+			pmx_sysrst: pmx-sysrst {
+				marvell,pins = "mpp6";
+				marvell,function = "sysrst";
+			};
+
+			pmx_i2s: pmx-i2s {
+				marvell,pins = "mpp39", "mpp40", "mpp41", "mpp42",
+					       "mpp43";
+				marvell,function = "audio";
+			};
+		};
+
+		spi at 10600 {
+			pinctrl-0 = <&pmx_spi>;
+			pinctrl-names = "default";
+			status = "okay";
+
+			flash at 0 {
+				#address-cells = <1>;
+				#size-cells = <1>;
+				compatible = "st,m25p80";
+				spi-max-frequency = <86000000>;
+				reg = <0>;
+				mode = <0>;
+
+				partition at 0 {
+					reg = <0x0 0x80000>;
+					label = "u-boot";
+				};
+
+				partition at 1 {
+					reg = <0x80000 0x40000>;
+					label = "SSD firmware";
+				};
+
+				partition at 2 {
+					reg = <0xc0000 0x10000>;
+					label = "u-boot env";
+				};
+
+				partition at 3 {
+					reg = <0xd0000 0x10000>;
+					label = "permanent u-boot env";
+				};
+
+				partition at 4 {
+					reg = <0xd0000 0x10000>;
+					label = "permanent u-boot env";
+				};
+			};
+		};
+
+		i2c at 11000 {
+			status = "okay";
+
+			alc5621: alc5621 at 1a {
+				compatible = "realtek,alc5621";
+				reg = <0x1a>;
+			};
+		};
+
+		serial at 12000 {
+			status = "okay";
+		};
+
+		sata at 80000 {
+			status = "okay";
+			nr-ports = <2>;
+		};
+
+		audio: audio-controller at a0000 {
+			status = "okay";
+		};
+	};
+
+	regulators {
+		compatible = "simple-bus";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		pinctrl-0 = <&pmx_usb_sata_power_enable>;
+		pinctrl-names = "default";
+
+		usb_power: regulator at 1 {
+			compatible = "regulator-fixed";
+			reg = <1>;
+			regulator-name = "USB-SATA Power";
+			regulator-min-microvolt = <5000000>;
+			regulator-max-microvolt = <5000000>;
+			enable-active-high;
+			regulator-always-on;
+			regulator-boot-on;
+			gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>;
+		};
+	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		pinctrl-0 = <&pmx_button_power>;
+		pinctrl-names = "default";
+
+		button at 1 {
+			label = "Power Button";
+			linux,code = <KEY_POWER>;
+			gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
+		};
+	};
+
+	gpio_poweroff {
+		compatible = "gpio-poweroff";
+		pinctrl-0 = <&pmx_power_off>;
+		pinctrl-names = "default";
+		gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>;
+	};
+
+};
+
+&mdio {
+	status = "okay";
+
+	ethphy0: ethernet-phy {
+		device_type = "ethernet-phy";
+                reg = <8>;
+	};
+};
+
+&eth0 {
+	status = "okay";
+	ethernet0-port at 0 {
+		phy-handle = <&ethphy0>;
+	};
+};
+
Signature · 1 line
1.8.5.3
#13 lore raw

PATCH v2 4/5 ARM: mvebu: Add dts file describing HP T5325 thin client

Subject should be "ARM: kirkwood: ..."

Quoted 75 lines · Andrew Lunn

Describe the T5325 using device tree properties, where possible. The first version of this file was produced by Thomas Petazzoni.

---
 arch/arm/boot/dts/kirkwood-t5325.dts | 209 +++++++++++++++++++++++++++++++++++
 1 file changed, 209 insertions(+)
 create mode 100644 arch/arm/boot/dts/kirkwood-t5325.dts
arch/arm/boot/dts/kirkwood-t5325.dts new file +60 -0
new file mode 100644
index 000000000000..8df357d822ca
@@ -0,0 +1,209 @@
+/*
+ * Device Tree file for HP t5325 Thin Client"
+ *
+ * Copyright (C) 2014
+ *
+ * Thomas Petazzoni <[email protected]>
+ * Andrew Lunn <[email protected]>
+ *
+ * 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.
+*/
+
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+
+/ {
+	model = "HP t5325 Thin Client";
+	compatible = "hp,t5325", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+	memory {
+		device_type = "memory";
+		reg = <0x00000000 0x20000000>;
+	};
+
+	chosen {
+		bootargs = "console=ttyS0,115200n8";
+	};
+
+	mbus {
+		pcie-controller {
+			status = "okay";
+
+			pcie at 1,0 {
+				status = "okay";
+			};
+		};
+	};
+
+	ocp at f1000000 {
+		pinctrl: pinctrl at 10000 {
+			pinctrl-0 = <&pmx_i2s &pmx_sysrst>;
+			pinctrl-names = "default";
+
+			pmx_button_power: pmx-button_power {
+				marvell,pins = "mpp45";
+				marvell,function = "gpio";
+			};
+
+			pmx_power_off: pmx-power-off {
+				marvell,pins = "mpp48";
+				marvell,function = "gpio";
+			};
+
+			pmx_led: pmx-led {
+				marvell,pins = "mpp21";
+				marvell,function = "gpio";
+			};

arch/arm/boot/dts/kirkwood-t5325.dts line 70

Quoted 10 lines
arch/arm/boot/dts/kirkwood-t5325.dts new file +10 -0
+
+			pmx_usb_sata_power_enable: pmx-usb-sata-power-enable {
+				marvell,pins = "mpp44";
+				marvell,function = "gpio";
+			};
+
+			/*
+                         * Redefined from kirkwood-6281.dtsi, because
+			 * we don't use SPI CS on MPP0, but on MPP7.
+			 */

wonky leading whitespace.

Quoted 119 lines
arch/arm/boot/dts/kirkwood-t5325.dts new file +119 -0
+			pmx_spi: pmx-spi {
+				marvell,pins = "mpp1", "mpp2", "mpp3", "mpp7";
+				marvell,function = "spi";
+			};
+
+			pmx_sysrst: pmx-sysrst {
+				marvell,pins = "mpp6";
+				marvell,function = "sysrst";
+			};
+
+			pmx_i2s: pmx-i2s {
+				marvell,pins = "mpp39", "mpp40", "mpp41", "mpp42",
+					       "mpp43";
+				marvell,function = "audio";
+			};
+		};
+
+		spi at 10600 {
+			pinctrl-0 = <&pmx_spi>;
+			pinctrl-names = "default";
+			status = "okay";
+
+			flash at 0 {
+				#address-cells = <1>;
+				#size-cells = <1>;
+				compatible = "st,m25p80";
+				spi-max-frequency = <86000000>;
+				reg = <0>;
+				mode = <0>;
+
+				partition at 0 {
+					reg = <0x0 0x80000>;
+					label = "u-boot";
+				};
+
+				partition at 1 {
+					reg = <0x80000 0x40000>;
+					label = "SSD firmware";
+				};
+
+				partition at 2 {
+					reg = <0xc0000 0x10000>;
+					label = "u-boot env";
+				};
+
+				partition at 3 {
+					reg = <0xd0000 0x10000>;
+					label = "permanent u-boot env";
+				};
+
+				partition at 4 {
+					reg = <0xd0000 0x10000>;
+					label = "permanent u-boot env";
+				};
+			};
+		};
+
+		i2c at 11000 {
+			status = "okay";
+
+			alc5621: alc5621 at 1a {
+				compatible = "realtek,alc5621";
+				reg = <0x1a>;
+			};
+		};
+
+		serial at 12000 {
+			status = "okay";
+		};
+
+		sata at 80000 {
+			status = "okay";
+			nr-ports = <2>;
+		};
+
+		audio: audio-controller at a0000 {
+			status = "okay";
+		};
+	};
+
+	regulators {
+		compatible = "simple-bus";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		pinctrl-0 = <&pmx_usb_sata_power_enable>;
+		pinctrl-names = "default";
+
+		usb_power: regulator at 1 {
+			compatible = "regulator-fixed";
+			reg = <1>;
+			regulator-name = "USB-SATA Power";
+			regulator-min-microvolt = <5000000>;
+			regulator-max-microvolt = <5000000>;
+			enable-active-high;
+			regulator-always-on;
+			regulator-boot-on;
+			gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>;
+		};
+	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		pinctrl-0 = <&pmx_button_power>;
+		pinctrl-names = "default";
+
+		button at 1 {
+			label = "Power Button";
+			linux,code = <KEY_POWER>;
+			gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
+		};
+	};
+
+	gpio_poweroff {
+		compatible = "gpio-poweroff";
+		pinctrl-0 = <&pmx_power_off>;
+		pinctrl-names = "default";
+		gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>;

arch/arm/boot/dts/kirkwood-t5325.dts line 199

Quoted 10 lines
arch/arm/boot/dts/kirkwood-t5325.dts new file +10 -0
+	};
+
+};
+
+&mdio {
+	status = "okay";
+
+	ethphy0: ethernet-phy {
+		device_type = "ethernet-phy";
+                reg = <8>;

leading whitespace again.

thx,

Jason.

Quoted 18 lines
arch/arm/boot/dts/kirkwood-t5325.dts new file +10 -0
+	};
+};
+
+&eth0 {
+	status = "okay";
+	ethernet0-port at 0 {
+		phy-handle = <&ethphy0>;
+	};
+};
+
Signature · 7 lines
1.8.5.3


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
author maintainer
#14 lore raw

PATCH v2 5/5 ARM: mvebu: Add HP T5325 devices to {multi|mvebu}_v5_defconfig

In reply to Andrew Lunn

The HP T5325 has a PCI based VGA controller. Add the frame buffer driver, and frame buffer support to the defconfig's. Additionally add the soc audio framework and the necessary codec.

---
 arch/arm/configs/multi_v5_defconfig | 9 +++++++++
 arch/arm/configs/mvebu_v5_defconfig | 9 +++++++++
 2 files changed, 18 insertions(+)
arch/arm/configs/multi_v5_defconfig +9 -0
index 2bc1e1707930..84ba24a0ead7 100644
@@ -11,6 +11,7 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_MVEBU=y
 CONFIG_MACH_KIRKWOOD=y
+CONFIG_MACH_T5325=y
 CONFIG_ARCH_MXC=y
 CONFIG_MACH_IMX25_DT=y
 CONFIG_MACH_IMX27_DT=y
@@ -101,6 +102,12 @@ CONFIG_THERMAL=y
 CONFIG_KIRKWOOD_THERMAL=y
 CONFIG_WATCHDOG=y
 CONFIG_ORION_WATCHDOG=y
+CONFIG_FB=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_SOC=y
+CONFIG_SND_KIRKWOOD_SOC=y
+CONFIG_SND_KIRKWOOD_SOC_T5325=y
 # CONFIG_ABX500_CORE is not set
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@ -150,6 +157,8 @@ CONFIG_RTC_DRV_S35390A=y
 CONFIG_RTC_DRV_MV=y
 CONFIG_DMADEVICES=y
 CONFIG_MV_XOR=y
+CONFIG_STAGING=y
+CONFIG_FB_XGI=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_FS_XATTR is not set
arch/arm/configs/mvebu_v5_defconfig +9 -0
index 2844636c0cf2..36484a37a1ca 100644
@@ -11,6 +11,7 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_MVEBU=y
 CONFIG_MACH_KIRKWOOD=y
+CONFIG_MACH_T5325=y
 # CONFIG_CPU_FEROCEON_OLD_ID is not set
 CONFIG_PCI_MVEBU=y
 CONFIG_PREEMPT=y
@@ -93,6 +94,12 @@ CONFIG_SENSORS_LM85=y
 CONFIG_THERMAL=y
 CONFIG_WATCHDOG=y
 CONFIG_ORION_WATCHDOG=y
+CONFIG_FB=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_SOC=y
+CONFIG_SND_KIRKWOOD_SOC=y
+CONFIG_SND_KIRKWOOD_SOC_T5325=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_HID_DRAGONRISE=y
@@ -137,6 +144,8 @@ CONFIG_RTC_DRV_S35390A=y
 CONFIG_RTC_DRV_MV=y
 CONFIG_DMADEVICES=y
 CONFIG_MV_XOR=y
+CONFIG_STAGING=y
+CONFIG_FB_XGI=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_FS_XATTR is not set
Signature · 1 line
1.8.5.3