[PATCH 00/16] The last large installment of DT for Snowball

[PATCH 00/16] The last large installment of DT for Snowball

[Lee Jones]

Everything to follow will be small, mostly unrelated changes and
enablement of the odd left-over driver.

 arch/arm/boot/dts/db8500.dtsi          |  143 +++++++++++++++++++++++++++++++-
 arch/arm/boot/dts/snowball.dts         |   14 ++++
 arch/arm/configs/u8500_defconfig       |    1 +
 arch/arm/mach-ux500/board-mop500-uib.c |    4 +-
 arch/arm/mach-ux500/board-mop500.c     |   12 ++-
 arch/arm/mach-ux500/board-mop500.h     |    1 +
 drivers/input/misc/ab8500-ponkey.c     |    6 ++
 drivers/mfd/ab8500-sysctrl.c           |    6 ++
 drivers/mfd/db8500-prcmu.c             |    1 +
 drivers/misc/ab8500-pwm.c              |    6 ++
 drivers/regulator/db8500-prcmu.c       |  137 +++++++++++++++++++++++-------
 11 files changed, 297 insertions(+), 34 deletions(-)

[PATCH 01/16] Input: Add Device Tree support to the ab8500-ponkey driver

[Lee Jones]

This patch will allow the ab8500-ponkey driver to be probed during
boot when Device Tree is enabled.

Cc: linux-input at vger.kernel.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/input/misc/ab8500-ponkey.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/input/misc/ab8500-ponkey.c b/drivers/input/misc/ab8500-ponkey.c
index 350fd0c..394aa1f 100644
--- a/drivers/input/misc/ab8500-ponkey.c
+++ b/drivers/input/misc/ab8500-ponkey.c
@@ -131,10 +131,16 @@ static int __devexit ab8500_ponkey_remove(struct platform_device *pdev)
 	return 0;
 }
 
+static const struct of_device_id ab8500_ponkey_match[] = {
+	{ .compatible = "stericsson,ab8500-ponkey", },
+	{}
+};
+
 static struct platform_driver ab8500_ponkey_driver = {
 	.driver		= {
 		.name	= "ab8500-poweron-key",
 		.owner	= THIS_MODULE,
+		.of_match_table = ab8500_ponkey_match,
 	},
 	.probe		= ab8500_ponkey_probe,
 	.remove		= __devexit_p(ab8500_ponkey_remove),
-- 
1.7.9.5

[PATCH 02/16] ARM: ux500: Enable LED heartbeat functionality on Snowball

[Lee Jones]

This patch configures the user LED on Snowball to double flash
every second or so, whilst it's still alive. This can give key
indications as to what the board is doing in the case of no
console output.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/mach-ux500/board-mop500.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index de94b2d..8845286 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -57,7 +57,7 @@
 static struct gpio_led snowball_led_array[] = {
 	{
 		.name = "user_led",
-		.default_trigger = "none",
+		.default_trigger = "heartbeat",
 		.gpio = 142,
 	},
 };
-- 
1.7.9.5

[PATCH 03/16] ARM: ux500: Enable LED heartbeat functionality on Snowbal via DT

[Lee Jones]

This patch configures the user LED on Snowball to double flash
every second or so, whilst it's still alive. This can give key
indications as to what the board is doing in the case of no
console output.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/snowball.dts |    1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts
index 6b00350..15ee419 100644
--- a/arch/arm/boot/dts/snowball.dts
+++ b/arch/arm/boot/dts/snowball.dts
@@ -68,6 +68,7 @@
 			label = "user_led";
 			gpios = <&gpio4 14 0x4>;
 			default-state = "on";
+			linux,default-trigger = "heartbeat";
 		};
 	};
 
-- 
1.7.9.5

[PATCH 04/16] ARM: ux500: Only initialise STE's UIBs on boards which support them

[Lee Jones]

ST-Ericsson uses User Interface Boards to extend functionality of
some of their development boards. However, these aren't compatible
with all the supported boards found in Mainline (Snowball for
instance). This patch ensures that the UIBs are only probed on
boards which can actually support them. This in turn saves lots of
unnecessary error messages normally found in Snowball's boot log.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/mach-ux500/board-mop500-uib.c |    4 +---
 arch/arm/mach-ux500/board-mop500.c     |    8 ++++++++
 arch/arm/mach-ux500/board-mop500.h     |    1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-ux500/board-mop500-uib.c b/arch/arm/mach-ux500/board-mop500-uib.c
index b29a788..1f47d96 100644
--- a/arch/arm/mach-ux500/board-mop500-uib.c
+++ b/arch/arm/mach-ux500/board-mop500-uib.c
@@ -96,7 +96,7 @@ static void __init __mop500_uib_init(struct uib *uib, const char *why)
 /*
  * Detect the UIB attached based on the presence or absence of i2c devices.
  */
-static int __init mop500_uib_init(void)
+int __init mop500_uib_init(void)
 {
 	struct uib *uib = mop500_uib;
 	struct i2c_adapter *i2c0;
@@ -131,5 +131,3 @@ static int __init mop500_uib_init(void)
 
 	return 0;
 }
-
-module_init(mop500_uib_init);
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 8845286..faa46b1 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -635,6 +635,8 @@ static void __init mop500_init_machine(void)
 
 	/* This board has full regulator constraints */
 	regulator_has_full_constraints();
+
+	mop500_uib_init();
 }
 
 static void __init snowball_init_machine(void)
@@ -699,6 +701,8 @@ static void __init hrefv60_init_machine(void)
 
 	/* This board has full regulator constraints */
 	regulator_has_full_constraints();
+
+	mop500_uib_init();
 }
 
 MACHINE_START(U8500, "ST-Ericsson MOP500 platform")
@@ -809,6 +813,8 @@ static void __init u8500_init_machine(void)
 		i2c_register_board_info(2, mop500_i2c2_devices,
 					ARRAY_SIZE(mop500_i2c2_devices));
 
+		mop500_uib_init();
+
 	} else if (of_machine_is_compatible("calaosystems,snowball-a9500")) {
 		//snowball_pins_init();
 
@@ -842,6 +848,8 @@ static void __init u8500_init_machine(void)
 		i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs);
 		i2c_register_board_info(2, mop500_i2c2_devices,
 					ARRAY_SIZE(mop500_i2c2_devices));
+
+		mop500_uib_init();
 	}
 
 	/* This board has full regulator constraints */
diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h
index 44ab4bd..b5bfc1a 100644
--- a/arch/arm/mach-ux500/board-mop500.h
+++ b/arch/arm/mach-ux500/board-mop500.h
@@ -92,6 +92,7 @@ void __init mop500_pinmaps_init(void);
 void __init snowball_pinmaps_init(void);
 void __init hrefv60_pinmaps_init(void);
 
+int __init mop500_uib_init(void);
 void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info,
 		unsigned n);
 
-- 
1.7.9.5

[PATCH 05/16] regulator: db8500-prcmu: Separate regulator registration from probe

[Lee Jones]

This will provide us with a convenient way to register regulators when
booting with Device Tree both enabled & disabled and will save us a
great deal of code duplication in time.

Cc: linux-kernel at vger.kernel.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/regulator/db8500-prcmu.c |   71 +++++++++++++++++++++++---------------
 1 file changed, 44 insertions(+), 27 deletions(-)

diff --git a/drivers/regulator/db8500-prcmu.c b/drivers/regulator/db8500-prcmu.c
index 87b2e83..d6b4d4c 100644
--- a/drivers/regulator/db8500-prcmu.c
+++ b/drivers/regulator/db8500-prcmu.c
@@ -410,40 +410,58 @@ dbx500_regulator_info[DB8500_NUM_REGULATORS] = {
 	},
 };
 
+static __devinit int db8500_regulator_register(struct platform_device *pdev,
+					struct regulator_init_data *init_data,
+					int id,
+					struct device_node *np)
+{
+	struct dbx500_regulator_info *info;
+	struct regulator_config config = { };
+	int err;
+
+	/* assign per-regulator data */
+	info = &dbx500_regulator_info[id];
+	info->dev = &pdev->dev;
+
+	config.dev = &pdev->dev;
+	config.init_data = init_data;
+	config.driver_data = info;
+	config.of_node = np;
+
+	/* register with the regulator framework */
+	info->rdev = regulator_register(&info->desc, &config);
+	if (IS_ERR(info->rdev)) {
+		err = PTR_ERR(info->rdev);
+		dev_err(&pdev->dev, "failed to register %s: err %i\n",
+			info->desc.name, err);
+
+		/* if failing, unregister all earlier regulators */
+		while (--id >= 0) {
+			info = &dbx500_regulator_info[id];
+			regulator_unregister(info->rdev);
+		}
+		return err;
+	}
+
+	dev_dbg(rdev_get_dev(info->rdev),
+		"regulator-%s-probed\n", info->desc.name);
+
+	return 0;
+}
+
 static int __devinit db8500_regulator_probe(struct platform_device *pdev)
 {
 	struct regulator_init_data *db8500_init_data =
 					dev_get_platdata(&pdev->dev);
-	struct regulator_config config = { };
 	int i, err;
 
 	/* register all regulators */
 	for (i = 0; i < ARRAY_SIZE(dbx500_regulator_info); i++) {
-		struct dbx500_regulator_info *info;
-		struct regulator_init_data *init_data = &db8500_init_data[i];
-
-		/* assign per-regulator data */
-		info = &dbx500_regulator_info[i];
-		info->dev = &pdev->dev;
-
-		config.dev = &pdev->dev;
-		config.init_data = init_data;
-		config.driver_data = info;
-
-		/* register with the regulator framework */
-		info->rdev = regulator_register(&info->desc, &config);
-		if (IS_ERR(info->rdev)) {
-			err = PTR_ERR(info->rdev);
-			dev_err(&pdev->dev, "failed to register %s: err %i\n",
-				info->desc.name, err);
-
-			/* if failing, unregister all earlier regulators */
-			while (--i >= 0) {
-				info = &dbx500_regulator_info[i];
-				regulator_unregister(info->rdev);
-			}
+		err = db8500_regulator_register(pdev,
+						&db8500_init_data[i],
+						i, NULL);
+		if (err)
 			return err;
-		}
 
 		dev_dbg(rdev_get_dev(info->rdev),
 			"regulator-%s-probed\n", info->desc.name);
@@ -451,8 +469,7 @@ static int __devinit db8500_regulator_probe(struct platform_device *pdev)
 	err = ux500_regulator_debug_init(pdev,
 					 dbx500_regulator_info,
 					 ARRAY_SIZE(dbx500_regulator_info));
-
-	return err;
+	return 0;
 }
 
 static int __exit db8500_regulator_remove(struct platform_device *pdev)
-- 
1.7.9.5

[PATCH 06/16] ARM: ux500: Apply db8500-prcmu regulator information to db8500 Device Tree

[Lee Jones]

Here we inform Device Tree of which regulators are provided by the db8500-
prcmu. This way we can reference some of their consumers directly from the
Device Tree e.g. SMSC911x Ethernet chip and the Nomadik I2C controller.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/db8500.dtsi |  107 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)

diff --git a/arch/arm/boot/dts/db8500.dtsi b/arch/arm/boot/dts/db8500.dtsi
index 076831c..5e78899 100644
--- a/arch/arm/boot/dts/db8500.dtsi
+++ b/arch/arm/boot/dts/db8500.dtsi
@@ -197,6 +197,113 @@
 				reg = <0x80157450 0xC>;
 			};
 
+			db8500-prcmu-regulators {
+				compatible = "stericsson,db8500-prcmu-regulator";
+
+				// DB8500_REGULATOR_VAPE
+				db8500_vape_reg: db8500_vape {
+					regulator-name = "db8500-vape";
+					regulator-always-on;
+				};
+
+				// DB8500_REGULATOR_VARM
+				db8500_varm_reg: db8500_varm {
+					regulator-name = "db8500-varm";
+				};
+
+				// DB8500_REGULATOR_VMODEM
+				db8500_vmodem_reg: db8500_vmodem {
+					regulator-name = "db8500-vmodem";
+				};
+
+				// DB8500_REGULATOR_VPLL
+				db8500_vpll_reg: db8500_vpll {
+					regulator-name = "db8500-vpll";
+				};
+
+				// DB8500_REGULATOR_VSMPS1
+				db8500_vsmps1_reg: db8500_vsmps1 {
+					regulator-name = "db8500-vsmps1";
+				};
+
+				// DB8500_REGULATOR_VSMPS2
+				db8500_vsmps2_reg: db8500_vsmps2 {
+					regulator-name = "db8500-vsmps2";
+				};
+
+				// DB8500_REGULATOR_VSMPS3
+				db8500_vsmps3_reg: db8500_vsmps3 {
+					regulator-name = "db8500-vsmps3";
+				};
+
+				// DB8500_REGULATOR_VRF1
+				db8500_vrf1_reg: db8500_vrf1 {
+					regulator-name = "db8500-vrf1";
+				};
+
+				// DB8500_REGULATOR_SWITCH_SVAMMDSP
+				db8500_sva_mmdsp_reg: db8500_sva_mmdsp {
+					regulator-name = "db8500-sva-mmdsp";
+				};
+
+				// DB8500_REGULATOR_SWITCH_SVAMMDSPRET
+				db8500_sva_mmdsp_ret_reg: db8500_sva_mmdsp_ret {
+					regulator-name = "db8500-sva-mmdsp-ret";
+				};
+
+				// DB8500_REGULATOR_SWITCH_SVAPIPE
+				db8500_sva_pipe_reg: db8500_sva_pipe {
+					regulator-name = "db8500_sva_pipe";
+				};
+
+				// DB8500_REGULATOR_SWITCH_SIAMMDSP
+				db8500_sia_mmdsp_reg: db8500_sia_mmdsp {
+					regulator-name = "db8500_sia_mmdsp";
+				};
+
+				// DB8500_REGULATOR_SWITCH_SIAMMDSPRET
+				db8500_sia_mmdsp_ret_reg: db8500_sia_mmdsp_ret {
+					regulator-name = "db8500-sia-mmdsp-ret";
+				};
+
+				// DB8500_REGULATOR_SWITCH_SIAPIPE
+				db8500_sia_pipe_reg: db8500_sia_pipe {
+					regulator-name = "db8500-sia-pipe";
+				};
+
+				// DB8500_REGULATOR_SWITCH_SGA
+				db8500_sga_reg: db8500_sga {
+					regulator-name = "db8500-sga";
+					vin-supply = <&db8500_vape_reg>;
+				};
+
+				// DB8500_REGULATOR_SWITCH_B2R2_MCDE
+				db8500_b2r2_mcde_reg: db8500_b2r2_mcde {
+					regulator-name = "db8500-b2r2-mcde";
+					vin-supply = <&db8500_vape_reg>;
+				};
+
+				// DB8500_REGULATOR_SWITCH_ESRAM12
+				db8500_esram12_reg: db8500_esram12 {
+					regulator-name = "db8500-esram12";
+				};
+
+				// DB8500_REGULATOR_SWITCH_ESRAM12RET
+				db8500_esram12_ret_reg: db8500_esram12_ret {
+					regulator-name = "db8500-esram12-ret";
+				};
+
+				// DB8500_REGULATOR_SWITCH_ESRAM34
+				db8500_esram34_reg: db8500_esram34 {
+					regulator-name = "db8500-esram34";
+				};
+
+				// DB8500_REGULATOR_SWITCH_ESRAM34RET
+				db8500_esram34_ret_reg: db8500_esram34_ret {
+					regulator-name = "db8500-esram34-ret";
+				};
+			};
+
 			ab8500 at 5 {
 				compatible = "stericsson,ab8500";
 				reg = <5>; /* mailbox 5 is i2c */
-- 
1.7.9.5

[PATCH 07/16] regulator: Enable Device Tree for the db8500-prcmu regulator driver

[Lee Jones]

Here we use the previous regulator register code separated from probe to
register each of the regulators mentioned in Device Tree.

Cc: linux-kernel at vger.kernel.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/regulator/db8500-prcmu.c |   76 ++++++++++++++++++++++++++++++++++----
 1 file changed, 69 insertions(+), 7 deletions(-)

diff --git a/drivers/regulator/db8500-prcmu.c b/drivers/regulator/db8500-prcmu.c
index d6b4d4c..968f97f 100644
--- a/drivers/regulator/db8500-prcmu.c
+++ b/drivers/regulator/db8500-prcmu.c
@@ -17,6 +17,8 @@
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
 #include <linux/regulator/db8500-prcmu.h>
+#include <linux/regulator/of_regulator.h>
+#include <linux/of.h>
 #include <linux/module.h>
 #include "dbx500-prcmu.h"
 
@@ -449,23 +451,77 @@ static __devinit int db8500_regulator_register(struct platform_device *pdev,
 	return 0;
 }
 
+static struct of_regulator_match db8500_regulator_matches[] = {
+	{ .name	= "db8500-vape",          .driver_data = (void *) DB8500_REGULATOR_VAPE, },
+	{ .name	= "db8500-varm",          .driver_data = (void *) DB8500_REGULATOR_VARM, },
+	{ .name	= "db8500-vmodem",        .driver_data = (void *) DB8500_REGULATOR_VMODEM, },
+	{ .name	= "db8500-vpll",          .driver_data = (void *) DB8500_REGULATOR_VPLL, },
+	{ .name	= "db8500-vsmps1",        .driver_data = (void *) DB8500_REGULATOR_VSMPS1, },
+	{ .name	= "db8500-vsmps2",        .driver_data = (void *) DB8500_REGULATOR_VSMPS2, },
+	{ .name	= "db8500-vsmps3",        .driver_data = (void *) DB8500_REGULATOR_VSMPS3, },
+	{ .name	= "db8500-vrf1",          .driver_data = (void *) DB8500_REGULATOR_VRF1, },
+	{ .name	= "db8500-sva-mmdsp",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAMMDSP, },
+	{ .name	= "db8500-sva-mmdsp-ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAMMDSPRET, },
+	{ .name	= "db8500-sva-pipe",      .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAPIPE, },
+	{ .name	= "db8500-sia-mmdsp",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAMMDSP, },
+	{ .name	= "db8500-sia-mmdsp-ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAMMDSPRET, },
+	{ .name	= "db8500-sia-pipe",      .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAPIPE, },
+	{ .name	= "db8500-sga",           .driver_data = (void *) DB8500_REGULATOR_SWITCH_SGA, },
+	{ .name	= "db8500-b2r2-mcde",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_B2R2_MCDE, },
+	{ .name	= "db8500-esram12",       .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM12, },
+	{ .name	= "db8500-esram12-ret",   .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM12RET, },
+	{ .name	= "db8500-esram34",       .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM34, },
+	{ .name	= "db8500-esram34-ret",   .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM34RET, },
+};
+
+static __devinit int
+db8500_regulator_of_probe(struct platform_device *pdev,
+			struct device_node *np)
+{
+	int i, err;
+
+	for (i = 0; i < ARRAY_SIZE(dbx500_regulator_info); i++) {
+		err = db8500_regulator_register(
+			pdev, db8500_regulator_matches[i].init_data,
+			i, db8500_regulator_matches[i].of_node);
+		if (err)
+			return err;
+	}
+
+	return 0;
+}
+
 static int __devinit db8500_regulator_probe(struct platform_device *pdev)
 {
 	struct regulator_init_data *db8500_init_data =
 					dev_get_platdata(&pdev->dev);
+	struct device_node *np = pdev->dev.of_node;
 	int i, err;
 
 	/* register all regulators */
-	for (i = 0; i < ARRAY_SIZE(dbx500_regulator_info); i++) {
-		err = db8500_regulator_register(pdev,
-						&db8500_init_data[i],
-						i, NULL);
-		if (err)
+	if (np) {
+		err = of_regulator_match(&pdev->dev, np,
+					db8500_regulator_matches,
+					ARRAY_SIZE(db8500_regulator_matches));
+		if (err < 0) {
+			dev_err(&pdev->dev,
+				"Error parsing regulator init data: %d\n", err);
 			return err;
+		}
 
-		dev_dbg(rdev_get_dev(info->rdev),
-			"regulator-%s-probed\n", info->desc.name);
+		err = db8500_regulator_of_probe(pdev, np);
+		if (err)
+			return err;
+	} else {
+		for (i = 0; i < ARRAY_SIZE(dbx500_regulator_info); i++) {
+			err = db8500_regulator_register(pdev,
+							&db8500_init_data[i],
+							i, NULL);
+			if (err)
+				return err;
+		}
 	}
+
 	err = ux500_regulator_debug_init(pdev,
 					 dbx500_regulator_info,
 					 ARRAY_SIZE(dbx500_regulator_info));
@@ -491,10 +547,16 @@ static int __exit db8500_regulator_remove(struct platform_device *pdev)
 	return 0;
 }
 
+static const struct of_device_id db8500_prcmu_regulator_match[] = {
+        { .compatible = "stericsson,db8500-prcmu-regulator", },
+        {}
+};
+
 static struct platform_driver db8500_regulator_driver = {
 	.driver = {
 		.name = "db8500-prcmu-regulators",
 		.owner = THIS_MODULE,
+		.of_match_table = db8500_prcmu_regulator_match,
 	},
 	.probe = db8500_regulator_probe,
 	.remove = __exit_p(db8500_regulator_remove),
-- 
1.7.9.5

[PATCH 08/16] ARM: ux500: Allow PRCMU regulator to be probed during a DT enabled boot

[Lee Jones]

This patch adds the correct compatible string for use during Device Tree
population. Without it the DB8500 PRCMU regulators would be processed
when DT is enabled.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/mach-ux500/board-mop500.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index faa46b1..33d47e1 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -771,6 +771,7 @@ static const struct of_device_id u8500_local_bus_nodes[] = {
 	/* only create devices below soc node */
 	{ .compatible = "stericsson,db8500", },
 	{ .compatible = "stericsson,db8500-prcmu", },
+	{ .compatible = "stericsson,db8500-prcmu-regulator", },
 	{ .compatible = "stericsson,ab8500", },
 	{ .compatible = "stericsson,ab8500-regulator", },
 	{ .compatible = "simple-bus"},
-- 
1.7.9.5

[PATCH 09/16] ARM: ux500: Provide regulator support for SMSC911x via Device Tree

[Lee Jones]

This patch adds a fixed regulator for use by the SMSC911x Ethernet
chip driver into the db8500 Device Tree. It also references other
regulators required by the same device.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/snowball.dts   |   13 +++++++++++++
 arch/arm/configs/u8500_defconfig |    1 +
 drivers/mfd/db8500-prcmu.c       |    1 +
 3 files changed, 15 insertions(+)

diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts
index 15ee419..ae3c367 100644
--- a/arch/arm/boot/dts/snowball.dts
+++ b/arch/arm/boot/dts/snowball.dts
@@ -20,6 +20,16 @@
 		reg = <0x00000000 0x20000000>;
 	};
 
+	en_3v3_reg: en_3v3 {
+		compatible = "regulator-fixed";
+                regulator-name = "en-3v3-fixed-supply";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                gpios = <&gpio0 26  0x4>; // 26
+                startup-delay-us = <5000>;
+                enable-active-high;
+	};
+
 	gpio_keys {
 		compatible = "gpio-keys";
 		#address-cells = <1>;
@@ -81,6 +91,9 @@
 				reg = <0 0x10000>;
 				interrupts = <12 0x1>;
 				interrupt-parent = <&gpio4>;
+				vdd33a-supply = <&en_3v3_reg>;
+				vddvario-supply = <&db8500_vape_reg>;
+
 
 				reg-shift = <1>;
 				reg-io-width = <2>;
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index c6973c5..440152a 100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -75,6 +75,7 @@ CONFIG_AB5500_CORE=y
 CONFIG_AB8500_CORE=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_AB8500=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_HID_SUPPORT is not set
 CONFIG_USB_GADGET=y
 CONFIG_AB8500_USB=y
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index d534449..40204e1 100644
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -2735,6 +2735,7 @@ static struct regulator_consumer_supply db8500_vape_consumers[] = {
 	REGULATOR_SUPPLY("vcore", "uart2"),
 	REGULATOR_SUPPLY("v-ape", "nmk-ske-keypad.0"),
 	REGULATOR_SUPPLY("v-hsi", "ste_hsi.0"),
+	REGULATOR_SUPPLY("vddvario", "smsc911x.0"),
 };
 
 static struct regulator_consumer_supply db8500_vsmps2_consumers[] = {
-- 
1.7.9.5

[PATCH 10/16] ARM: ux500: Add db8500 Device Tree node for ab8500-sysctrl

[Lee Jones]

This adds the DT node for the mfd/ab8500-sysctrl driver. It will
allow probing of the driver during a Device Tree enabled boot.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/db8500.dtsi |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/boot/dts/db8500.dtsi b/arch/arm/boot/dts/db8500.dtsi
index 5e78899..3c00e0670 100644
--- a/arch/arm/boot/dts/db8500.dtsi
+++ b/arch/arm/boot/dts/db8500.dtsi
@@ -329,6 +329,10 @@
 					interrupt-names = "ONKEY_DBF", "ONKEY_DBR";
 				};
 
+				ab8500-sysctrl {
+					compatible = "stericsson,ab8500-sysctrl";
+				};
+
 				ab8500-regulators {
 					compatible = "stericsson,ab8500-regulator";
 
-- 
1.7.9.5

[PATCH 11/16] mfd: Enable Device Tree support in the ab8500-sysctrl driver

[Lee Jones]

This patch ensures probing of the ab8500-sysctrl driver during a DT
enabled boot, so long as the associated nodes are present in the
Device Tree binary.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/mfd/ab8500-sysctrl.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/mfd/ab8500-sysctrl.c b/drivers/mfd/ab8500-sysctrl.c
index c28d4eb..5a3e51c 100644
--- a/drivers/mfd/ab8500-sysctrl.c
+++ b/drivers/mfd/ab8500-sysctrl.c
@@ -61,10 +61,16 @@ static int __devexit ab8500_sysctrl_remove(struct platform_device *pdev)
 	return 0;
 }
 
+static const struct of_device_id ab8500_sysctrl_match[] = {
+	{ .compatible = "stericsson,ab8500-sysctrl", },
+	{}
+};
+
 static struct platform_driver ab8500_sysctrl_driver = {
 	.driver = {
 		.name = "ab8500-sysctrl",
 		.owner = THIS_MODULE,
+		.of_match_table = ab8500_sysctrl_match,
 	},
 	.probe = ab8500_sysctrl_probe,
 	.remove = __devexit_p(ab8500_sysctrl_remove),
-- 
1.7.9.5

[PATCH 12/16] ARM: ux500: Add db8500 Device Tree node for misc/ab8500-pwm

[Lee Jones]

This adds the DT node for the misc/ab8500-pwm driver. It will
allow probing of the driver during a Device Tree enabled boot.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/db8500.dtsi |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/boot/dts/db8500.dtsi b/arch/arm/boot/dts/db8500.dtsi
index 3c00e0670..37dcc13 100644
--- a/arch/arm/boot/dts/db8500.dtsi
+++ b/arch/arm/boot/dts/db8500.dtsi
@@ -333,6 +333,10 @@
 					compatible = "stericsson,ab8500-sysctrl";
 				};
 
+				ab8500-pwm {
+					compatible = "stericsson,ab8500-pwm";
+				};
+
 				ab8500-regulators {
 					compatible = "stericsson,ab8500-regulator";
 
-- 
1.7.9.5

[PATCH 13/16] mfd: Enable Device Tree support in the ab8500-pwm driver

[Lee Jones]

This patch ensures probing of the ab8500-pwm driver during a DT
enabled boot, so long as the associated nodes are present in the
Device Tree binary.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/misc/ab8500-pwm.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/misc/ab8500-pwm.c b/drivers/misc/ab8500-pwm.c
index d7a9aa1..042a8fe 100644
--- a/drivers/misc/ab8500-pwm.c
+++ b/drivers/misc/ab8500-pwm.c
@@ -142,10 +142,16 @@ static int __devexit ab8500_pwm_remove(struct platform_device *pdev)
 	return 0;
 }
 
+static const struct of_device_id ab8500_pwm_match[] = {
+	{ .compatible = "stericsson,ab8500-pwm", },
+	{}
+};
+
 static struct platform_driver ab8500_pwm_driver = {
 	.driver = {
 		.name = "ab8500-pwm",
 		.owner = THIS_MODULE,
+		.of_match_table = ab8500_pwm_match,
 	},
 	.probe = ab8500_pwm_probe,
 	.remove = __devexit_p(ab8500_pwm_remove),
-- 
1.7.9.5

[PATCH 14/16] ARM: ux500: Add a ab8500-usb Device Tree node for db8500 based devices

[Lee Jones]

Here we specify each of the ab8500 USB driver's seven IRQs, which the
driver references by name. We also apply regulator support for the
three used by the device.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/db8500.dtsi |   21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/arch/arm/boot/dts/db8500.dtsi b/arch/arm/boot/dts/db8500.dtsi
index 37dcc13..dcc5099 100644
--- a/arch/arm/boot/dts/db8500.dtsi
+++ b/arch/arm/boot/dts/db8500.dtsi
@@ -322,6 +322,27 @@
 					vddadc-supply = <&ab8500_ldo_tvout_reg>;
 				};
 
+				ab8500-usb {
+					compatible = "stericsson,ab8500-usb";
+					interrupts = < 0 90 0x4
+						       0 96 0x4
+						       0 14 0x4
+						       0 15 0x4
+						       0 79 0x4
+						       0 74 0x4
+						       0 75 0x4>;
+					interrupt-names = "ID_WAKEUP_R",
+							  "ID_WAKEUP_F",
+							  "VBUS_DET_F",
+							  "VBUS_DET_R",
+							  "USB_LINK_STATUS",
+							  "USB_ADP_PROBE_PLUG",
+							  "USB_ADP_PROBE_UNPLUG";
+					vddulpivio18-supply = <&ab8500_ldo_initcore_reg>;
+					v-ape-supply = <&db8500_vape_reg>;
+					musb_1v8-supply = <&db8500_vsmps2_reg>;
+				};
+
 				ab8500-ponkey {
 					compatible = "stericsson,ab8500-ponkey";
 					interrupts = <0 6 0x4
-- 
1.7.9.5

[PATCH 15/16] ARM: ux500: Add regulator support for nomadik-i2c into the db8500 Device Tree

[Lee Jones]

Now we have full ab8500 and db8500-prcmu regulator support within DT
we can easily reference them from within each of the consumer's nodes.
Here we reference the ones used by each of the Nomadic I2C controllers.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/db8500.dtsi |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm/boot/dts/db8500.dtsi b/arch/arm/boot/dts/db8500.dtsi
index dcc5099..f1e0fb4 100644
--- a/arch/arm/boot/dts/db8500.dtsi
+++ b/arch/arm/boot/dts/db8500.dtsi
@@ -434,6 +434,7 @@
 			interrupts = <0 21 0x4>;
 			#address-cells = <1>;
 			#size-cells = <0>;
+			v-i2c-supply = <&db8500_vape_reg>;
 		};
 
 		i2c at 80122000 {
@@ -442,6 +443,7 @@
 			interrupts = <0 22 0x4>;
 			#address-cells = <1>;
 			#size-cells = <0>;
+			v-i2c-supply = <&db8500_vape_reg>;
 		};
 
 		i2c at 80128000 {
@@ -450,6 +452,7 @@
 			interrupts = <0 55 0x4>;
 			#address-cells = <1>;
 			#size-cells = <0>;
+			v-i2c-supply = <&db8500_vape_reg>;
 		};
 
 		i2c at 80110000 {
@@ -458,6 +461,7 @@
 			interrupts = <0 12 0x4>;
 			#address-cells = <1>;
 			#size-cells = <0>;
+			v-i2c-supply = <&db8500_vape_reg>;
 		};
 
 		i2c at 8012a000 {
@@ -466,6 +470,7 @@
 			interrupts = <0 51 0x4>;
 			#address-cells = <1>;
 			#size-cells = <0>;
+			v-i2c-supply = <&db8500_vape_reg>;
 		};
 
 		ssp at 80002000 {
-- 
1.7.9.5

[PATCH 16/16] ARM: ux500: Re-enable SMSC911x platform code registration during non-DT boots

[Lee Jones]

The patch to disable SMSC911x registration was applied twice in the upstream
kernel by mistake. Git interpreted this as 'take the same entry from a
similar struct' which was close by. This was the wrong thing to do. This patch
rectifies this error and re-enables SMSC911x registration when Device Tree is
not enabled.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/mach-ux500/board-mop500.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 33d47e1..2ddbb87 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -596,6 +596,7 @@ static void __init mop500_uart_init(struct device *parent)
 static struct platform_device *snowball_platform_devs[] __initdata = {
 	&snowball_led_dev,
 	&snowball_key_dev,
+	&snowball_sbnet_dev,
 	&ab8500_device,
 };
 
-- 
1.7.9.5

[PATCH 05/16] regulator: db8500-prcmu: Separate regulator registration from probe

[Mark Brown]

On Fri, May 18, 2012 at 09:39:04AM +0100, Lee Jones wrote:
> This will provide us with a convenient way to register regulators when
> booting with Device Tree both enabled & disabled and will save us a
> great deal of code duplication in time.

Applied, thanks.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120518/8cc8d638/attachment.sig>

[PATCH 07/16] regulator: Enable Device Tree for the db8500-prcmu regulator driver

[Mark Brown]

On Fri, May 18, 2012 at 09:39:06AM +0100, Lee Jones wrote:
> Here we use the previous regulator register code separated from probe to
> register each of the regulators mentioned in Device Tree.

Applied, thanks.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120518/218fb70d/attachment.sig>

[PATCH 11/16] mfd: Enable Device Tree support in the ab8500-sysctrl driver

[Samuel Ortiz]

Hi Lee,

On Fri, May 18, 2012 at 09:39:10AM +0100, Lee Jones wrote:
> This patch ensures probing of the ab8500-sysctrl driver during a DT
> enabled boot, so long as the associated nodes are present in the
> Device Tree binary.
Applied, thanks.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

[PATCH 13/16] mfd: Enable Device Tree support in the ab8500-pwm driver

[Samuel Ortiz]

Hi Lee,

On Fri, May 18, 2012 at 09:39:12AM +0100, Lee Jones wrote:
> This patch ensures probing of the ab8500-pwm driver during a DT
> enabled boot, so long as the associated nodes are present in the
> Device Tree binary.
Applied as well, thanks.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

[PATCH 05/16] regulator: db8500-prcmu: Separate regulator registration from probe

[Linus Walleij]

On Fri, May 18, 2012 at 10:39 AM, Lee Jones <lee.jones@linaro.org> wrote:

> This will provide us with a convenient way to register regulators when
> booting with Device Tree both enabled & disabled and will save us a
> great deal of code duplication in time.
>
> Cc: linux-kernel at vger.kernel.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Thanks,
Linus Walleij

[PATCH 07/16] regulator: Enable Device Tree for the db8500-prcmu regulator driver

[Linus Walleij]

On Fri, May 18, 2012 at 10:39 AM, Lee Jones <lee.jones@linaro.org> wrote:

> Here we use the previous regulator register code separated from probe to
> register each of the regulators mentioned in Device Tree.
>
> Cc: linux-kernel at vger.kernel.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Thanks,
Linus Walleij

[PATCH 01/16] Input: Add Device Tree support to the ab8500-ponkey driver

[Linus Walleij]

On Fri, May 18, 2012 at 10:39 AM, Lee Jones <lee.jones@linaro.org> wrote:

> This patch will allow the ab8500-ponkey driver to be probed during
> boot when Device Tree is enabled.
>
> Cc: linux-input at vger.kernel.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Thanks,
Linus Walleij

[PATCH 02/16] ARM: ux500: Enable LED heartbeat functionality on Snowball

[Linus Walleij]

On Fri, May 18, 2012 at 10:39 AM, Lee Jones <lee.jones@linaro.org> wrote:

> This patch configures the user LED on Snowball to double flash
> every second or so, whilst it's still alive. This can give key
> indications as to what the board is doing in the case of no
> console output.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

This doesn't look like it has anything to do with the DT stuff, shall
I queue it in the ux500 tree?

Yours,
Linus Walleij

[PATCH 03/16] ARM: ux500: Enable LED heartbeat functionality on Snowbal via DT

[Linus Walleij]

On Fri, May 18, 2012 at 10:39 AM, Lee Jones <lee.jones@linaro.org> wrote:

> This patch configures the user LED on Snowball to double flash
> every second or so, whilst it's still alive. This can give key
> indications as to what the board is doing in the case of no
> console output.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Thanks,
Linus Walleij

[PATCH 04/16] ARM: ux500: Only initialise STE's UIBs on boards which support them

[Linus Walleij]

On Fri, May 18, 2012 at 10:39 AM, Lee Jones <lee.jones@linaro.org> wrote:

> ST-Ericsson uses User Interface Boards to extend functionality of
> some of their development boards. However, these aren't compatible
> with all the supported boards found in Mainline (Snowball for
> instance). This patch ensures that the UIBs are only probed on
> boards which can actually support them. This in turn saves lots of
> unnecessary error messages normally found in Snowball's boot log.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Shall I take this through the ux500  tree?

Thanks,
Linus Walleij

[PATCH 06/16] ARM: ux500: Apply db8500-prcmu regulator information to db8500 Device Tree

[Linus Walleij]

On Fri, May 18, 2012 at 10:39 AM, Lee Jones <lee.jones@linaro.org> wrote:

> Here we inform Device Tree of which regulators are provided by the db8500-
> prcmu. This way we can reference some of their consumers directly from the
> Device Tree e.g. SMSC911x Ethernet chip and the Nomadik I2C controller.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

I am hesitant about the I2C controller. That thing is a voltage domain and
it appears these should be handled centrally. using runtime PM and
power domains.

Linus Walleij

[PATCH 08/16] ARM: ux500: Allow PRCMU regulator to be probed during a DT enabled boot

[Linus Walleij]

On Fri, May 18, 2012 at 10:39 AM, Lee Jones <lee.jones@linaro.org> wrote:

> This patch adds the correct compatible string for use during Device Tree
> population. Without it the DB8500 PRCMU regulators would be processed
> when DT is enabled.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Thanks,
Linus Walleij

[PATCH 09/16] ARM: ux500: Provide regulator support for SMSC911x via Device Tree

[Linus Walleij]

On Fri, May 18, 2012 at 10:39 AM, Lee Jones <lee.jones@linaro.org> wrote:

> This patch adds a fixed regulator for use by the SMSC911x Ethernet
> chip driver into the db8500 Device Tree. It also references other
> regulators required by the same device.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ?arch/arm/boot/dts/snowball.dts ? | ? 13 +++++++++++++
> ?arch/arm/configs/u8500_defconfig | ? ?1 +
> ?drivers/mfd/db8500-prcmu.c ? ? ? | ? ?1 +

We usually don't mix code and defconfig changes in the same patch.

Why can't the snowball Kconfig select the fixed regulator instead,
so you get rid of the defconfig change?

> diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
> index d534449..40204e1 100644
> --- a/drivers/mfd/db8500-prcmu.c
> +++ b/drivers/mfd/db8500-prcmu.c
> @@ -2735,6 +2735,7 @@ static struct regulator_consumer_supply db8500_vape_consumers[] = {
> ? ? ? ?REGULATOR_SUPPLY("vcore", "uart2"),
> ? ? ? ?REGULATOR_SUPPLY("v-ape", "nmk-ske-keypad.0"),
> ? ? ? ?REGULATOR_SUPPLY("v-hsi", "ste_hsi.0"),
> + ? ? ? REGULATOR_SUPPLY("vddvario", "smsc911x.0"),
> ?};

Hm we have discussed previously that these regulator supplies should be passed
from the platform rather than open-coded in the driver.

Well, Device Tree solves that problem long term I guess.

Yours,
Lins Walleij

[PATCH 10/16] ARM: ux500: Add db8500 Device Tree node for ab8500-sysctrl

[Linus Walleij]

On Fri, May 18, 2012 at 10:39 AM, Lee Jones <lee.jones@linaro.org> wrote:

> This adds the DT node for the mfd/ab8500-sysctrl driver. It will
> allow probing of the driver during a Device Tree enabled boot.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Thanks,
Linus Walleij

[PATCH 12/16] ARM: ux500: Add db8500 Device Tree node for misc/ab8500-pwm

[Linus Walleij]

On Fri, May 18, 2012 at 10:39 AM, Lee Jones <lee.jones@linaro.org> wrote:

> This adds the DT node for the misc/ab8500-pwm driver. It will
> allow probing of the driver during a Device Tree enabled boot.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Thanks,
Linus Walleij

[PATCH 14/16] ARM: ux500: Add a ab8500-usb Device Tree node for db8500 based devices

[Linus Walleij]

On Fri, May 18, 2012 at 10:39 AM, Lee Jones <lee.jones@linaro.org> wrote:

> Here we specify each of the ab8500 USB driver's seven IRQs, which the
> driver references by name. We also apply regulator support for the
> three used by the device.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>


Acked-by: Linus Walleij <linus.walleij@linaro.org>

Thanks,
Linus Walleij

[PATCH 15/16] ARM: ux500: Add regulator support for nomadik-i2c into the db8500 Device Tree

[Linus Walleij]

On Fri, May 18, 2012 at 10:39 AM, Lee Jones <lee.jones@linaro.org> wrote:

> Now we have full ab8500 and db8500-prcmu regulator support within DT
> we can easily reference them from within each of the consumer's nodes.
> Here we reference the ones used by each of the Nomadic I2C controllers.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

I'm hesitant about this. It seems to be going about things the wrong way
to have the platform device take a voltage domain regulator.

Yours,
Linus Walleij

[PATCH 16/16] ARM: ux500: Re-enable SMSC911x platform code registration during non-DT boots

[Linus Walleij]

On Fri, May 18, 2012 at 10:39 AM, Lee Jones <lee.jones@linaro.org> wrote:

> The patch to disable SMSC911x registration was applied twice in the upstream
> kernel by mistake. Git interpreted this as 'take the same entry from a
> similar struct' which was close by. This was the wrong thing to do. This patch
> rectifies this error and re-enables SMSC911x registration when Device Tree is
> not enabled.
>
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

This patch needs to go first, and into the -rc series.

Thanks,
Linus Walleij

[PATCH 09/16] ARM: ux500: Provide regulator support for SMSC911x via Device Tree

[Arnd Bergmann]

On Monday 21 May 2012, Linus Walleij wrote:
> On Fri, May 18, 2012 at 10:39 AM, Lee Jones <lee.jones@linaro.org> wrote:
> 
> > This patch adds a fixed regulator for use by the SMSC911x Ethernet
> > chip driver into the db8500 Device Tree. It also references other
> > regulators required by the same device.
> >
> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> >  arch/arm/boot/dts/snowball.dts   |   13 +++++++++++++
> >  arch/arm/configs/u8500_defconfig |    1 +
> >  drivers/mfd/db8500-prcmu.c       |    1 +
> 
> We usually don't mix code and defconfig changes in the same patch.

I think it would be good if we did more often ;-)

> Why can't the snowball Kconfig select the fixed regulator instead,
> so you get rid of the defconfig change?

Is it a build dependency or a run-time dependency? I'd say if the
kernel fails to build without enabling the fixed regulator, it
needs to be selected in Kconfig, otherwise I'd prefer to have it
enabled in the defconfig file.

	Arnd

[PATCH 02/16] ARM: ux500: Enable LED heartbeat functionality on Snowball

[Lee Jones]

On 21/05/12 22:33, Linus Walleij wrote:
> On Fri, May 18, 2012 at 10:39 AM, Lee Jones<lee.jones@linaro.org>  wrote:
>
>> This patch configures the user LED on Snowball to double flash
>> every second or so, whilst it's still alive. This can give key
>> indications as to what the board is doing in the case of no
>> console output.
>>
>> Signed-off-by: Lee Jones<lee.jones@linaro.org>
>
> Acked-by: Linus Walleij<linus.walleij@linaro.org>
>
> This doesn't look like it has anything to do with the DT stuff, shall
> I queue it in the ux500 tree?

Yes please.


-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

[PATCH 04/16] ARM: ux500: Only initialise STE's UIBs on boards which support them

[Lee Jones]

On 21/05/12 22:36, Linus Walleij wrote:
> On Fri, May 18, 2012 at 10:39 AM, Lee Jones<lee.jones@linaro.org>  wrote:
>
>> ST-Ericsson uses User Interface Boards to extend functionality of
>> some of their development boards. However, these aren't compatible
>> with all the supported boards found in Mainline (Snowball for
>> instance). This patch ensures that the UIBs are only probed on
>> boards which can actually support them. This in turn saves lots of
>> unnecessary error messages normally found in Snowball's boot log.
>>
>> Signed-off-by: Lee Jones<lee.jones@linaro.org>
>
> Acked-by: Linus Walleij<linus.walleij@linaro.org>
>
> Shall I take this through the ux500  tree?

Yes please.

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

[PATCH 06/16] ARM: ux500: Apply db8500-prcmu regulator information to db8500 Device Tree

[Lee Jones]

On 21/05/12 22:37, Linus Walleij wrote:
> On Fri, May 18, 2012 at 10:39 AM, Lee Jones<lee.jones@linaro.org>  wrote:
>
>> Here we inform Device Tree of which regulators are provided by the db8500-
>> prcmu. This way we can reference some of their consumers directly from the
>> Device Tree e.g. SMSC911x Ethernet chip and the Nomadik I2C controller.
>>
>> Signed-off-by: Lee Jones<lee.jones@linaro.org>
>
> I am hesitant about the I2C controller. That thing is a voltage domain and
> it appears these should be handled centrally. using runtime PM and
> power domains.

This patch doesn't have anything to do with the I2C controller. I only 
mentioned it as an example. Would you like me to change the commit log 
and re-submit?

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

[PATCH 09/16] ARM: ux500: Provide regulator support for SMSC911x via Device Tree

[Lee Jones]

On 21/05/12 22:42, Linus Walleij wrote:
> On Fri, May 18, 2012 at 10:39 AM, Lee Jones<lee.jones@linaro.org>  wrote:
>
>> This patch adds a fixed regulator for use by the SMSC911x Ethernet
>> chip driver into the db8500 Device Tree. It also references other
>> regulators required by the same device.
>>
>> Signed-off-by: Lee Jones<lee.jones@linaro.org>
>>   arch/arm/boot/dts/snowball.dts   |   13 +++++++++++++
>>   arch/arm/configs/u8500_defconfig |    1 +
>>   drivers/mfd/db8500-prcmu.c       |    1 +
>
> We usually don't mix code and defconfig changes in the same patch.
>
> Why can't the snowball Kconfig select the fixed regulator instead,
> so you get rid of the defconfig change?

I can do that.

>> diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
>> index d534449..40204e1 100644
>> --- a/drivers/mfd/db8500-prcmu.c
>> +++ b/drivers/mfd/db8500-prcmu.c
>> @@ -2735,6 +2735,7 @@ static struct regulator_consumer_supply db8500_vape_consumers[] = {
>>         REGULATOR_SUPPLY("vcore", "uart2"),
>>         REGULATOR_SUPPLY("v-ape", "nmk-ske-keypad.0"),
>>         REGULATOR_SUPPLY("v-hsi", "ste_hsi.0"),
>> +       REGULATOR_SUPPLY("vddvario", "smsc911x.0"),
>>   };
>
> Hm we have discussed previously that these regulator supplies should be passed
> from the platform rather than open-coded in the driver.

So, do you want me to chop this out of this patch and re-submit then?

> Well, Device Tree solves that problem long term I guess.

Right.


-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

[PATCH 15/16] ARM: ux500: Add regulator support for nomadik-i2c into the db8500 Device Tree

[Lee Jones]

On 21/05/12 22:45, Linus Walleij wrote:
> On Fri, May 18, 2012 at 10:39 AM, Lee Jones<lee.jones@linaro.org>  wrote:
>
>> Now we have full ab8500 and db8500-prcmu regulator support within DT
>> we can easily reference them from within each of the consumer's nodes.
>> Here we reference the ones used by each of the Nomadic I2C controllers.
>>
>> Signed-off-by: Lee Jones<lee.jones@linaro.org>
>
> I'm hesitant about this. It seems to be going about things the wrong way
> to have the platform device take a voltage domain regulator.

This doesn't change the behavior of the current system, only DT:s it.

It's just that:

> struct regulator_consumer_supply db8500_vape_consumers[] = {
>         REGULATOR_SUPPLY("v-i2c", "nmk-i2c.0")

In drivers/mfd/db8500-prcmu.c is replaced by:

> v-i2c-supply = <&db8500_vape_reg>;

In the Device Tree.

If we want to start re-working things, can we do it after the DT 
enablement please?

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

[PATCH 16/16] ARM: ux500: Re-enable SMSC911x platform code registration during non-DT boots

[Lee Jones]

On 21/05/12 22:46, Linus Walleij wrote:
> On Fri, May 18, 2012 at 10:39 AM, Lee Jones<lee.jones@linaro.org>  wrote:
>
>> The patch to disable SMSC911x registration was applied twice in the upstream
>> kernel by mistake. Git interpreted this as 'take the same entry from a
>> similar struct' which was close by. This was the wrong thing to do. This patch
>> rectifies this error and re-enables SMSC911x registration when Device Tree is
>> not enabled.
>>
>> Acked-by: Linus Walleij<linus.walleij@linaro.org>
>> Signed-off-by: Lee Jones<lee.jones@linaro.org>
>
> Acked-by: Linus Walleij<linus.walleij@linaro.org>
>
> This patch needs to go first, and into the -rc series.

Do you want to take it?

If not, how would you like me to take it forward?

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

[PATCH 06/16] ARM: ux500: Apply db8500-prcmu regulator information to db8500 Device Tree

[Linus Walleij]

On Fri, May 18, 2012 at 4:39 PM, Lee Jones <lee.jones@linaro.org> wrote:

> Here we inform Device Tree of which regulators are provided by the db8500-
> prcmu. This way we can reference some of their consumers directly from the
> Device Tree e.g. SMSC911x Ethernet chip and the Nomadik I2C controller.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Remove mentioning the I2C controller and
Acked-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

[PATCH 15/16] ARM: ux500: Add regulator support for nomadik-i2c into the db8500 Device Tree

[Linus Walleij]

On Tue, May 22, 2012 at 4:00 PM, Lee Jones <lee.jones@linaro.org> wrote:

> This doesn't change the behavior of the current system, only DT:s it.
>
> It's just that:
>
>> struct regulator_consumer_supply db8500_vape_consumers[] = {
>> ? ? ? ?REGULATOR_SUPPLY("v-i2c", "nmk-i2c.0")
>
> In drivers/mfd/db8500-prcmu.c is replaced by:
>
>> v-i2c-supply = <&db8500_vape_reg>;
>
> In the Device Tree

Yes...

> If we want to start re-working things, can we do it after the DT enablement
> please?

I'm told not to put DT bindings for things in place if they are
incorrect, since they get set in stone... and I'm told we should
probably remove this one regulator from the device rather.
I'm just uncertain.

Linus Walleij

[PATCH 16/16] ARM: ux500: Re-enable SMSC911x platform code registration during non-DT boots

[Linus Walleij]

On Tue, May 22, 2012 at 4:01 PM, Lee Jones <lee.jones@linaro.org> wrote:

> Do you want to take it?
>
> If not, how would you like me to take it forward?

Please do, I've screwed up DT patches in the past so it's better
if they go through a separate pull request.

Yours,
Linus Walleij

[PATCH 15/16] ARM: ux500: Add regulator support for nomadik-i2c into the db8500 Device Tree

[Lee Jones]

On 29/05/12 09:53, Linus Walleij wrote:
> On Tue, May 22, 2012 at 4:00 PM, Lee Jones<lee.jones@linaro.org>  wrote:
>
>> This doesn't change the behavior of the current system, only DT:s it.
>>
>> It's just that:
>>
>>> struct regulator_consumer_supply db8500_vape_consumers[] = {
>>>         REGULATOR_SUPPLY("v-i2c", "nmk-i2c.0")
>>
>> In drivers/mfd/db8500-prcmu.c is replaced by:
>>
>>> v-i2c-supply =<&db8500_vape_reg>;
>>
>> In the Device Tree
>
> Yes...
>
>> If we want to start re-working things, can we do it after the DT enablement
>> please?
>
> I'm told not to put DT bindings for things in place if they are
> incorrect, since they get set in stone... and I'm told we should
> probably remove this one regulator from the device rather.
> I'm just uncertain.

Nothing is set in stone. I'm always happy to do clean-ups and code 
corrections. :)

Mark,

What's the answer?

Kind regards,
Lee

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

[PATCH 15/16] ARM: ux500: Add regulator support for nomadik-i2c into the db8500 Device Tree

[Linus Walleij]

On Tue, May 29, 2012 at 12:50 PM, Lee Jones <lee.jones@linaro.org> wrote:
> [Me]
>> I'm told not to put DT bindings for things in place if they are
>> incorrect, since they get set in stone... and I'm told we should
>> probably remove this one regulator from the device rather.
>> I'm just uncertain.
>
> Nothing is set in stone. I'm always happy to do clean-ups and code
> corrections. :)

So assume this one device tree gets deployed, and some poor windows
phone developer start scratching his head about the strange voltage
domain regulator for the I2C device, when in reality there is no such
thing, there is only an APE voltage domain regulator common for all
these devices.

So with device trees the fit between physical reality and what we
model in the kernel needs to be as close as possible or we will
cause trouble.

That's the implications it will have unless we get it right, and that's
why I'm hesitant.

Yours,
Linus Walleij

[PATCH 15/16] ARM: ux500: Add regulator support for nomadik-i2c into the db8500 Device Tree

[Lee Jones]

On 30/05/12 08:09, Linus Walleij wrote:
> On Tue, May 29, 2012 at 12:50 PM, Lee Jones<lee.jones@linaro.org>  wrote:
>> [Me]
>>> I'm told not to put DT bindings for things in place if they are
>>> incorrect, since they get set in stone... and I'm told we should
>>> probably remove this one regulator from the device rather.
>>> I'm just uncertain.
>>
>> Nothing is set in stone. I'm always happy to do clean-ups and code
>> corrections. :)
>
> So assume this one device tree gets deployed, and some poor windows
> phone developer start scratching his head about the strange voltage
> domain regulator for the I2C device, when in reality there is no such
> thing, there is only an APE voltage domain regulator common for all
> these devices.
 >
> So with device trees the fit between physical reality and what we
> model in the kernel needs to be as close as possible or we will
> cause trouble.
>
> That's the implications it will have unless we get it right, and that's
> why I'm hesitant.

I'm more than happy to 'do the right thing', but I need to know what 
that is first.


-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

[PATCH 15/16] ARM: ux500: Add regulator support for nomadik-i2c into the db8500 Device Tree

[Linus Walleij]

On Wed, May 30, 2012 at 8:33 AM, Lee Jones <lee.jones@linaro.org> wrote:
> On 30/05/12 08:09, Linus Walleij wrote:

>> So assume this one device tree gets deployed, and some poor windows
>> phone developer start scratching his head about the strange voltage
>> domain regulator for the I2C device, when in reality there is no such
>> thing, there is only an APE voltage domain regulator common for all
>> these devices.
>
> I'm more than happy to 'do the right thing', but I need to know what that is
> first.

My working assumption is that the right thing to do is delete this regulator
from the I2C driver, then refactor the (out-of-tree) runtime PM code to
fetch the voltage domain regulators, so the APE voltage domain
regulators get taken by the voltage domains instead.

I haven't tried deleting it though, plese try it and see if the domain is
still on anyway, then it's the way to proceed.

Yours,
Linus Walleij

[PATCH 01/16] Input: Add Device Tree support to the ab8500-ponkey driver

[Dmitry Torokhov]

On Mon, May 21, 2012 at 11:32:45PM +0200, Linus Walleij wrote:
> On Fri, May 18, 2012 at 10:39 AM, Lee Jones <lee.jones@linaro.org> wrote:
> 
> > This patch will allow the ab8500-ponkey driver to be probed during
> > boot when Device Tree is enabled.
> >
> > Cc: linux-input at vger.kernel.org
> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> 
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
> 

Applied, thanks.

-- 
Dmitry