ARM: mmp: remove SPARSE_IRQ for mmp

Add DTS file to support brownstone & ttc-dkb.

Signed-off-by Haojian Zhuang <[email protected]>

---
 arch/arm/boot/dts/mmp2-brownstone.dts |  319 +++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/ttc-dkb.dts         |  176 ++++++++++++++++++
 arch/arm/mach-mmp/brownstone.c        |   66 ++-----
 arch/arm/mach-mmp/ttc_dkb.c           |   21 ++-
 4 files changed, 530 insertions(+), 52 deletions(-)
 create mode 100644 arch/arm/boot/dts/mmp2-brownstone.dts
 create mode 100644 arch/arm/boot/dts/ttc-dkb.dts

arch/arm/boot/dts/mmp2-brownstone.dts new file +0 -0

new file mode 100644
index 0000000..5fdabc3

arch/arm/boot/dts/mmp2-brownstone.dts new file +4 -0

+	interrupt-parent = <&mmp_intc>;
+
+	memory {
+		reg = <0x00000000 0x20000000>;

arch/arm/boot/dts/mmp2-brownstone.dts new file +6 -0

+			sub-interrupts = <2>;
+			reg = <0xd4282150 0>;
+			status-mask = <0x150 0x168>;
+			/* mfp register & interrupt index */
+			mfp-edge-interrupt = <0xd401e2c4 1>;
+		};

arch/arm/boot/dts/mmp2-brownstone.dts new file +19 -0

+
+			/* gpio-clk-value: <offset & value> */
+			gpio-clk-value = <0xd4015038 0x3>;
+
+			/* gpio-mask: <offset & value> */
+			gpio-mask = <
+				0xd401909c 0xffffffff
+				0xd40190a0 0xffffffff
+				0xd40190a4 0xffffffff
+				0xd401919c 0xffffffff
+				0xd40191a0 0xffffffff
+				0xd40191a4 0xffffffff>;
+			gpio-pins = <0 192>;
+			#interrupt-cells = <1>;
+			interrupt-controller;
+			interrupts = <49>;
+			interrupt-parent = <&mmp_intc>;
+			sub-interrupts = <192>;
+		};

arch/arm/mach-mmp/brownstone.c +16 -46

index 7bb78fd..c9848ad 100644
@@ -12,6 +12,9 @@
 
 #include <linux/init.h>
 #include <linux/kernel.h>
+#include <linux/of.h>
+#include <linux/of_fdt.h>
+#include <linux/of_platform.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/gpio.h>

@@ -105,30 +108,6 @@ static unsigned long brownstone_pin_config[] __initdata = {
 	GPIO89_GPIO,
 };
 
-static struct regulator_consumer_supply max8649_supply[] = {
-	REGULATOR_SUPPLY("vcc_core", NULL),
-};
-
-static struct regulator_init_data max8649_init_data = {
-	.constraints	= {
-		.name		= "vcc_core range",
-		.min_uV		= 1150000,
-		.max_uV		= 1280000,
-		.always_on	= 1,
-		.boot_on	= 1,
-		.valid_ops_mask	= REGULATOR_CHANGE_VOLTAGE,
-	},
-	.num_consumer_supplies	= 1,
-	.consumer_supplies	= &max8649_supply[0],
-};
-
-static struct max8649_platform_data brownstone_max8649_info = {
-	.mode		= 2,	/* VID1 = 1, VID0 = 0 */
-	.extclk		= 0,
-	.ramp_timing	= MAX8649_RAMP_32MV,
-	.regulator	= &max8649_init_data,
-};
-
 static struct regulator_consumer_supply brownstone_v_5vp_supplies[] = {
 	REGULATOR_SUPPLY("v_5vp", NULL),
 };

@@ -158,47 +137,38 @@ static struct platform_device brownstone_v_5vp_device = {
 	},
 };
 
-static struct max8925_platform_data brownstone_max8925_info = {
-	.irq_base		= IRQ_BOARD_START,
-};
-
-static struct i2c_board_info brownstone_twsi1_info[] = {
-	[0] = {
-		.type		= "max8649",
-		.addr		= 0x60,
-		.platform_data	= &brownstone_max8649_info,
-	},
-	[1] = {
-		.type		= "max8925",
-		.addr		= 0x3c,
-		.irq		= IRQ_MMP2_PMIC,
-		.platform_data	= &brownstone_max8925_info,
-	},
-};
-
 static struct sdhci_pxa_platdata mmp2_sdh_platdata_mmc0 = {
 	.max_speed	= 25000000,
 };
 
+static __initdata struct of_device_id of_bus_ids[] = {
+	{ .compatible = "simple-bus", },
+	{},
+};
+
 static void __init brownstone_init(void)
 {
 	mfp_config(ARRAY_AND_SIZE(brownstone_pin_config));
 
-	/* on-chip devices */
-	mmp2_add_uart(1);
-	mmp2_add_uart(3);
-	mmp2_add_twsi(1, NULL, ARRAY_AND_SIZE(brownstone_twsi1_info));
+	if (of_platform_bus_probe(NULL, of_bus_ids, NULL) < 0)
+		BUG();
+
 	mmp2_add_sdhost(0, &mmp2_sdh_platdata_mmc0); /* SD/MMC */
 
 	/* enable 5v regulator */
 	platform_device_register(&brownstone_v_5vp_device);
 }
 
+static const char *brownstone_dt_match[] __initdata = {
+	"mrvl,mmp2-brownstone",
+	NULL,
+};
+

arch/arm/mach-mmp/ttc_dkb.c +17 -4

index e411039..c19b4dc 100644
@@ -10,6 +10,9 @@
 
 #include <linux/init.h>
 #include <linux/kernel.h>
+#include <linux/of.h>
+#include <linux/of_fdt.h>
+#include <linux/of_platform.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>

@@ -113,21 +116,31 @@ static struct platform_device *ttc_dkb_devices[] = {
 	&ttc_dkb_device_onenand,
 };
 
+static __initdata struct of_device_id of_bus_ids[] = {
+	{ .compatible = "simple-bus", },
+	{},
+};
+
 static void __init ttc_dkb_init(void)
 {
 	mfp_config(ARRAY_AND_SIZE(ttc_dkb_pin_config));
 
-	/* on-chip devices */
-	pxa910_add_uart(1);
+	if (of_platform_bus_probe(NULL, of_bus_ids, NULL) < 0)
+		BUG();
 
 	/* off-chip devices */
 	platform_add_devices(ARRAY_AND_SIZE(ttc_dkb_devices));
 }
 
+static const char *ttc_dkb_dt_match[] __initdata = {
+	"mrvl,ttc-dkb",
+	NULL,
+};
+
 MACHINE_START(TTC_DKB, "PXA910-based TTC_DKB Development Platform")
 	.map_io		= mmp_map_io,
-	.nr_irqs	= TTCDKB_NR_IRQS,
-	.init_irq       = pxa910_init_irq,
+	.init_irq       = mmp_init_intc,
 	.timer          = &pxa910_timer,
 	.init_machine   = ttc_dkb_init,
+	.dt_compat	= ttc_dkb_dt_match,
 MACHINE_END

Signature · 1 line

1.5.6.5

Quoted 3 lines · Haojian Zhuang

Add DTS file to support brownstone & ttc-dkb.

Signed-off-by Haojian Zhuang <[email protected]>

Hi Haojian.

Overall, the patch series is moving in the right direction. I've made a lot of comments, but they shouldn't be difficult to resolve. I look forward to seeing the next version of the series. Comments below...

Quoted 19 lines

---
 arch/arm/boot/dts/mmp2-brownstone.dts |  319 +++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/ttc-dkb.dts         |  176 ++++++++++++++++++
 arch/arm/mach-mmp/brownstone.c        |   66 ++-----
 arch/arm/mach-mmp/ttc_dkb.c           |   21 ++-
 4 files changed, 530 insertions(+), 52 deletions(-)
 create mode 100644 arch/arm/boot/dts/mmp2-brownstone.dts
 create mode 100644 arch/arm/boot/dts/ttc-dkb.dts

arch/arm/boot/dts/mmp2-brownstone.dts new file +4 -0

new file mode 100644
index 0000000..5fdabc3
@@ -0,0 +1,319 @@
+/dts-v1/;
+
+/include/ "skeleton.dtsi"
+

arch/arm/boot/dts/mmp2-brownstone.dts line 36

Quoted 4 lines

arch/arm/boot/dts/mmp2-brownstone.dts new file +3 -0

+			interrupt-controller;
+			#interrupt-cells = <1>;
 
+			sub-interrupts = <64>;

What is this for?

arch/arm/boot/dts/mmp2-brownstone.dts line 147

Quoted 8 lines

arch/arm/boot/dts/mmp2-brownstone.dts new file +8 -0

+			gpio-controller;
+			reg = <
+				0xd4019000 0xb0
+				0xd4019004 0xb0
+				0xd4019008 0xb0
+				0xd4019100 0xb0
+				0xd4019104 0xb0
+				0xd4019108 0xb0>;

This looks wrong. The address ranges overlap. Why not simply:
<0xd4019000 0x200>;

Make 88pm860x to support both platform data and device tree. So a translation between device tree and platform data is added.

Signed-off-by Haojian Zhuang <[email protected]>

---
 drivers/mfd/88pm860x-i2c.c |  191 +++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 189 insertions(+), 2 deletions(-)

drivers/mfd/88pm860x-i2c.c +133 -0

index e017dc8..b017e4a 100644
@@ -10,6 +10,8 @@
  */
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/of_irq.h>
+#include <linux/of_regulator.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
 #include <linux/mfd/88pm860x.h>

@@ -236,6 +238,187 @@ static const struct i2c_device_id pm860x_id_table[] = {
 };
 MODULE_DEVICE_TABLE(i2c, pm860x_id_table);
 
+#ifdef CONFIG_OF
+static int __devinit pm860x_parse_irq(struct i2c_client *i2c,
+				      struct pm860x_platform_data *pdata)
+{
+	struct device_node *of_node = i2c->dev.of_node;
+
+	pdata->irq_base = irq_alloc_descs(-1, 0, 24, 0);
+	irq_domain_add_simple(of_node, pdata->irq_base);
+	return 0;
+}
+
+static void __devinit pm860x_parse_backlight(struct device_node *np,
+					struct pm860x_platform_data *pdata)
+{
+	const __be32 *idx, *iset, *pwm;
+	int i;
+
+	idx = of_get_property(np, "cell-index", NULL);
+	if (idx == NULL)
+		return;
+	iset = of_get_property(np, "iset", NULL);
+	if (iset == NULL)
+		return;
+	pwm = of_get_property(np, "pwm", NULL);
+
+	i = be32_to_cpu(*idx);
+	pdata->backlight[i].iset = be32_to_cpu(*iset);
+	pdata->backlight[i].flags = i;
+	if (pwm)
+		pdata->backlight[i].pwm = be32_to_cpu(*pwm);
+	pdata->num_backlights++;
+}
+
+static void __devinit pm860x_parse_led(struct device_node *np,
+					struct pm860x_platform_data *pdata)
+{
+	const __be32 *idx, *iset;
+	int i;
+
+	idx = of_get_property(np, "cell-index", NULL);
+	if (idx == NULL)
+		return;
+	iset = of_get_property(np, "iset", NULL);
+	if (iset == NULL)
+		return;
+
+	i = be32_to_cpu(*idx);
+	pdata->led[i].iset = be32_to_cpu(*iset);
+	pdata->led[i].flags = i;
+	pdata->num_leds++;
+}
+
+static void __devinit pm860x_parse_touch(struct device_node *np,
+					struct pm860x_platform_data *pdata)
+{
+	struct pm860x_touch_pdata *touch;
+	const __be32 *prebias, *slot, *res, *prechg;
+
+	prebias = of_get_property(np, "prebias", NULL);
+	if (prebias == NULL)
+		return;
+	slot = of_get_property(np, "slot-cycle", NULL);
+	if (slot == NULL)
+		return;
+	res = of_get_property(np, "resistor-xplate", NULL);
+	if (res == NULL)
+		return;
+	prechg = of_get_property(np, "pen-prechg", NULL);
+	if (prechg == NULL)
+		return;
+	touch = kzalloc(sizeof(struct pm860x_touch_pdata), GFP_KERNEL);
+	if (touch == NULL)
+		return;
+	touch->gpadc_prebias = be32_to_cpu(*prebias++);
+	touch->tsi_prebias = be32_to_cpu(*prebias++);
+	touch->pen_prebias = be32_to_cpu(*prebias);
+	touch->slot_cycle = be32_to_cpu(*slot);
+	touch->pen_prechg = be32_to_cpu(*prechg);
+	pdata->touch = touch;
+}
+
+static int data[PM8607_ID_RG_MAX];
+
+static void __devinit pm860x_parse_regulator(struct device_node *np,
+					struct pm860x_platform_data *pdata)
+{
+	const char *name[PM8607_ID_RG_MAX] = {
+		"BUCK1", "BUCK2", "BUCK3", "LDO1", "LDO2", "LDO3", "LOD4",
+		"LDO5", "LDO6", "LDO7", "LDO8", "LDO9", "LDO10", "LDO11",
+		"LDO12", "LDO13", "LDO14", "LDO15"};
+	const char *cp;
+	int i;
+
+	cp = of_get_property(np, "compatible", NULL);
+	if (cp == NULL)
+		return;
+	for (i = 0; i < PM8607_ID_RG_MAX; i++) {
+		if (strncmp(cp, name[i], strlen(name[i])))
+			continue;
+		of_regulator_init_data(np, &pdata->regulator[i]);
+		data[i] = i;
+		pdata->regulator[i].driver_data = &data[i];
+		pdata->num_regulators++;
+		break;
+	}
+}
+
+static struct pm860x_platform_data __devinit
+*pm860x_get_alt_pdata(struct i2c_client *i2c)
+{
+	struct pm860x_platform_data *pdata;
+	struct device_node *of_node = i2c->dev.of_node;
+	struct device_node *np, *pp = NULL;
+	const char *cp;
+	const __be32 *p;
+	int ret;
+
+	pdata = kzalloc(sizeof(struct pm860x_platform_data), GFP_KERNEL);
+	if (pdata == NULL)
+		return NULL;
+	pdata->regulator = kzalloc(sizeof(struct regulator_init_data)
+				* PM8607_ID_RG_MAX, GFP_KERNEL);
+	if (pdata->regulator == NULL)
+		goto out_reg;
+	pdata->led = kzalloc(sizeof(struct pm860x_led_pdata) * 3,
+				GFP_KERNEL);
+	if (pdata->led == NULL)
+		goto out_led;
+	pdata->backlight = kzalloc(sizeof(struct pm860x_backlight_pdata)
+					* 3, GFP_KERNEL);
+	if (pdata->backlight == NULL)

drivers/mfd/88pm860x-i2c.c +40 -0

+
+	ret = pm860x_parse_irq(i2c, pdata);
+	if (ret < 0)
+		goto out;
+
+	for (; (np = of_get_next_child(of_node, pp)) != NULL; pp = np) {
+		cp = of_get_property(np, "compatible", NULL);
+		if (cp == NULL)
+			continue;
+		if (!strncmp(cp, "backlight", strlen("backlight")))
+			pm860x_parse_backlight(np, pdata);
+		if (!strncmp(cp, "led", strlen("led")))
+			pm860x_parse_led(np, pdata);
+		if (!strncmp(cp, "touch", strlen("touch")))
+			pm860x_parse_touch(np, pdata);
+		cp = of_get_property(np, "device_type", NULL);
+		if (cp == NULL)
+			continue;
+		if (!strncmp(cp, "regulator", strlen("regulator")))
+			pm860x_parse_regulator(np, pdata);
+	}
+	return pdata;
+out:
+	kfree(pdata->backlight);
+out_backlight:
+	kfree(pdata->led);
+out_led:
+	kfree(pdata->regulator);
+out_reg:
+	kfree(pdata);
+	return NULL;
+}
+#else
+static struct pm860x_platform_data __devinit
+*pm860x_get_alt_pdata(struct i2c_client *i2c)
+{
+	return NULL;
+}
+#endif
+
 static int verify_addr(struct i2c_client *i2c)
 {
 	unsigned short addr_8607[] = {0x30, 0x34};

@@ -264,8 +447,12 @@ static int __devinit pm860x_probe(struct i2c_client *client,
 	struct pm860x_chip *chip;

drivers/mfd/88pm860x-i2c.c +0 -0

 	}
 
 	chip = kzalloc(sizeof(struct pm860x_chip), GFP_KERNEL);

Signature · 1 line

1.5.6.5

Make max8925 to support both platform data and device tree. So a translation between device tree and platform data is added.

Signed-off-by Haojian Zhuang <[email protected]>

---
 drivers/mfd/max8925-i2c.c |  159 ++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 157 insertions(+), 2 deletions(-)

drivers/mfd/max8925-i2c.c +3 -0

index 0219115..fb74554 100644
@@ -10,6 +10,9 @@
  */
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/irq.h>
+#include <linux/of_irq.h>
+#include <linux/of_regulator.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
 #include <linux/mfd/max8925.h>

@@ -135,6 +138,154 @@ static const struct i2c_device_id max8925_id_table[] = {
 };

drivers/mfd/max8925-i2c.c +12 -0

+	return 0;
+}
+
+static void __devinit max8925_parse_backlight(struct device_node *np,
+					struct max8925_platform_data *pdata)
+{
+	struct max8925_backlight_pdata *bk;
+	const __be32 *p;
+
+	bk = kzalloc(sizeof(struct max8925_backlight_pdata), GFP_KERNEL);
+	if (bk == NULL)
+		return;

drivers/mfd/max8925-i2c.c +8 -0

+}
+
+static void __devinit max8925_parse_touch(struct device_node *np,
+					struct max8925_platform_data *pdata)
+{
+	struct max8925_touch_pdata *touch;
+	const __be32 *p;
+

drivers/mfd/max8925-i2c.c +11 -0

+}
+
+static void __devinit max8925_parse_power(struct device_node *np,
+					struct max8925_platform_data *pdata)
+{
+	struct max8925_power_pdata *power;
+	const __be32 *p;
+
+	power = kzalloc(sizeof(struct max8925_power_pdata), GFP_KERNEL);
+	if (power == NULL)
+		return;

drivers/mfd/max8925-i2c.c +11 -0

+}
+
+static void __devinit max8925_parse_regulator(struct device_node *np,
+					struct max8925_platform_data *pdata)
+{
+	const char *name[MAX8925_MAX_REGULATOR] = {
+			"SD1", "SD2", "SD3", "LDO1", "LDO2", "LDO3", "LDO4",
+			"LDO5", "LDO6", "LDO7", "LDO8", "LDO9", "LDO10",
+			"LDO11", "LDO12", "LDO13", "LDO14", "LDO15", "LDO16",
+			"LDO17", "LDO18", "LDO19", "LDO20"};
+	const char *cp;

drivers/mfd/max8925-i2c.c +41 -0

+	if (pdata->regulator[0] == NULL) {
+		kfree(pdata);
+		return NULL;
+	}
+	for (i = 1; i < MAX8925_MAX_REGULATOR; i++)
+		pdata->regulator[i] = pdata->regulator[i - 1] + 1;
+
+	ret = max8925_parse_irq(client, pdata);
+	if (ret < 0)
+		goto out;
+
+	for (; (np = of_get_next_child(of_node, pp)) != NULL; pp = np) {
+		cp = of_get_property(np, "compatible", NULL);
+		if (cp == NULL)
+			continue;
+		if (!strncmp(cp, "backlight", strlen("backlight")))
+			max8925_parse_backlight(np, pdata);
+		if (!strncmp(cp, "power", strlen("power")))
+			max8925_parse_power(np, pdata);
+		if (!strncmp(cp, "touch", strlen("touch")))
+			max8925_parse_touch(np, pdata);
+		cp = of_get_property(np, "device_type", NULL);
+		if (cp == NULL)
+			continue;
+		if (!strncmp(cp, "regulator", strlen("regulator")))
+			max8925_parse_regulator(np, pdata);
+	}
+	return pdata;
+out:
+	kfree(pdata->regulator[0]);
+	kfree(pdata);
+	return NULL;
+}
+#else
+static struct max8925_platform_data __devinit
+*max8925_get_alt_pdata(struct i2c_client *client)
+{
+	return NULL;
+}
+#endif
+
 static int __devinit max8925_probe(struct i2c_client *client,
 				   const struct i2c_device_id *id)
 {

@@ -142,8 +293,12 @@ static int __devinit max8925_probe(struct i2c_client *client,
 	static struct max8925_chip *chip;

drivers/mfd/max8925-i2c.c +0 -0

 	}
 
 	chip = kzalloc(sizeof(struct max8925_chip), GFP_KERNEL);

Signature · 1 line

1.5.6.5

drivers/mfd/max8925-i2c.c static const struct i2c_device_id max8925_id_table[] = { · line 247

Quoted 4 lines · Haojian Zhuang

drivers/mfd/max8925-i2c.c +4 -0

+	if (pdata == NULL)
+		return NULL;
+	pdata->regulator[0] = kzalloc(sizeof(struct regulator_init_data)
+			* MAX8925_MAX_REGULATOR, GFP_KERNEL);

ditto.

Is it appropriate to allocated the entire table of regulators? From the parse_regulator function above, it looks like only one of the regulators will actually get registered (I've not dug deeply into what the driver needs here though).

Quoted 8 lines · Grant Likely

Quoted 4 lines · Haojian Zhuang

+ ? if (pdata == NULL)
+ ? ? ? ? ? return NULL;
+ ? pdata->regulator[0] = kzalloc(sizeof(struct regulator_init_data)
+ ? ? ? ? ? ? ? ? ? * MAX8925_MAX_REGULATOR, GFP_KERNEL);

ditto.

Quoted 4 lines

Is it appropriate to allocated the entire table of regulators? ?From the parse_regulator function above, it looks like only one of the regulators will actually get registered (I've not dug deeply into what the driver needs here though).

If the code/binding doesn't allow the use of all the regulators on the device the code is probably wrong, it'd be very unusual to have hardware like that.

Signed-off-by Haojian Zhuang <[email protected]>

---

?drivers/of/Kconfig ? ? ? ? ? | ? ?4 +
?drivers/of/Makefile ? ? ? ? ?| ? ?1 +
?drivers/of/of_regulator.c ? ?| ?166 ++++++++++++++++++++++++++++++++++++++++++
?include/linux/of_regulator.h | ? 34 +++++++++

?4 files changed, 205 insertions(+), 0 deletions(-) ?create mode 100644 drivers/of/of_regulator.c ?create mode 100644 include/linux/of_regulator.h

drivers/of/Kconfig +0 -0

index d06a637..edb6601 100644
@@ -75,4 +75,8 @@ config OF_PCI

? ? ? ?help
? ? ? ? ?OpenFirmware PCI bus accessors

drivers/of/Kconfig +4 -0

+config OF_REGULATOR
+ ? ? ? def_tristate REGULATOR
+ ? ? ? depends on REGULATOR
+

?endmenu # OF

drivers/of/Makefile +0 -0

index f7861ed..83ca06f 100644
@@ -10,3 +10,4 @@ obj-$(CONFIG_OF_NET) ?+= of_net.o

?obj-$(CONFIG_OF_SPI) ? += of_spi.o
?obj-$(CONFIG_OF_MDIO) ?+= of_mdio.o
?obj-$(CONFIG_OF_PCI) ? += of_pci.o

drivers/of/Makefile +1 -0

+obj-$(CONFIG_OF_REGULATOR) ? ? += of_regulator.o

drivers/of/of_regulator.c new file +23 -0

new file mode 100644
index 0000000..d523302
@@ -0,0 +1,166 @@
+/*
+ * OF helpers for the Regulator API
+ *
+ * Copyright (c) 2011 Haojian Zhuang <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+#include <linux/kernel.h>
+#include <linux/of.h>
+#include <linux/regulator/machine.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/suspend.h>
+
+static int of_regulator_init_constraints(struct device_node *of_dev,
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? struct regulation_constraints *constraints)
+{
+ ? ? ? const __be32 *p;
+ ? ? ? const char *cp;
+ ? ? ? const char *ops[] = {"voltage", "current", "mode", "status",

drivers/of/of_regulator.c new file +66 -0

+ ? ? ? p = of_get_property(of_dev, "currents", &size);
+ ? ? ? if (p && size / sizeof(int) == 2) {
+ ? ? ? ? ? ? ? constraints->min_uA = be32_to_cpu(*p++);
+ ? ? ? ? ? ? ? constraints->max_uA = be32_to_cpu(*p);
+ ? ? ? }
+ ? ? ? p = of_get_property(of_dev, "modes-mask", NULL);
+ ? ? ? if (p)
+ ? ? ? ? ? ? ? constraints->valid_modes_mask = be32_to_cpu(*p);
+ ? ? ? cp = of_get_property(of_dev, "ops-mask", &size);
+ ? ? ? tmp = 0;
+ ? ? ? if (cp && size > 0) {
+ ? ? ? ? ? ? ? i = 0;
+ ? ? ? ? ? ? ? do {
+ ? ? ? ? ? ? ? ? ? ? ? len = strlen(ops[i]);
+ ? ? ? ? ? ? ? ? ? ? ? if (!strncmp(cp, ops[i], len)) {
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? constraints->valid_ops_mask |= 1 << i;
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* need to handle '\0' */
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? cp += len + 1;
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? size = size - len - 1;
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? i = 0;
+ ? ? ? ? ? ? ? ? ? ? ? } else
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? i++;
+ ? ? ? ? ? ? ? } while (i < ARRAY_SIZE(ops));
+ ? ? ? ? ? ? ? if (size > 0)
+ ? ? ? ? ? ? ? ? ? ? ? printk(KERN_WARNING "Invalid string:%s\n", cp);
+ ? ? ? }
+ ? ? ? p = of_get_property(of_dev, "input-uV", NULL);
+ ? ? ? if (p)
+ ? ? ? ? ? ? ? constraints->input_uV = be32_to_cpu(*p);
+ ? ? ? p = of_get_property(of_dev, "state-pm-disk", &size);
+ ? ? ? if (p && size / sizeof(int) == 3) {
+ ? ? ? ? ? ? ? constraints->state_disk.uV = be32_to_cpu(*p++);
+ ? ? ? ? ? ? ? constraints->state_disk.mode = be32_to_cpu(*p++);
+ ? ? ? ? ? ? ? tmp = be32_to_cpu(*p);
+ ? ? ? ? ? ? ? constraints->state_disk.enabled = (tmp) ? 1 : 0;
+ ? ? ? ? ? ? ? constraints->state_disk.disabled = (tmp) ? 0 : 1;
+ ? ? ? }
+ ? ? ? p = of_get_property(of_dev, "state-pm-mem", &size);
+ ? ? ? if (p && size / sizeof(int) == 3) {
+ ? ? ? ? ? ? ? constraints->state_mem.uV = be32_to_cpu(*p++);
+ ? ? ? ? ? ? ? constraints->state_mem.mode = be32_to_cpu(*p++);
+ ? ? ? ? ? ? ? tmp = be32_to_cpu(*p);
+ ? ? ? ? ? ? ? constraints->state_mem.enabled = (tmp) ? 1 : 0;
+ ? ? ? ? ? ? ? constraints->state_mem.disabled = (tmp) ? 0 : 1;
+ ? ? ? }
+ ? ? ? p = of_get_property(of_dev, "state-pm-standby", &size);
+ ? ? ? if (p && size / sizeof(int) == 3) {
+ ? ? ? ? ? ? ? constraints->state_standby.uV = be32_to_cpu(*p++);
+ ? ? ? ? ? ? ? constraints->state_standby.mode = be32_to_cpu(*p++);
+ ? ? ? ? ? ? ? tmp = be32_to_cpu(*p);
+ ? ? ? ? ? ? ? constraints->state_standby.enabled = (tmp) ? 1 : 0;
+ ? ? ? ? ? ? ? constraints->state_standby.disabled = (tmp) ? 0 : 1;
+ ? ? ? }
+ ? ? ? cp = of_get_property(of_dev, "initial-state", &size);
+ ? ? ? if (cp) {
+ ? ? ? ? ? ? ? if (!strncmp(cp, "pm-suspend-on", size))
+ ? ? ? ? ? ? ? ? ? ? ? constraints->initial_state = PM_SUSPEND_ON;
+ ? ? ? ? ? ? ? if (!strncmp(cp, "pm-suspend-mem", size))
+ ? ? ? ? ? ? ? ? ? ? ? constraints->initial_state = PM_SUSPEND_MEM;
+ ? ? ? ? ? ? ? if (!strncmp(cp, "pm-suspend-standby", size))
+ ? ? ? ? ? ? ? ? ? ? ? constraints->initial_state = PM_SUSPEND_STANDBY;
+ ? ? ? }
+ ? ? ? p = of_get_property(of_dev, "initial_mode", NULL);
+ ? ? ? if (p)
+ ? ? ? ? ? ? ? constraints->initial_mode = be32_to_cpu(*p);
+ ? ? ? p = of_get_property(of_dev, "always-on", NULL);

drivers/of/of_regulator.c new file +57 -0

+
+int of_regulator_init_data(struct device_node *of_dev,
+ ? ? ? ? ? ? ? ? ? ? ? struct regulator_init_data *data)
+{
+ ? ? ? struct regulator_consumer_supply *supply;
+ ? ? ? const char *p, *str;
+ ? ? ? int ret, i, size, calc_size, len, count = 0;
+
+ ? ? ? if (of_dev == NULL || data == NULL)
+ ? ? ? ? ? ? ? return -EINVAL;
+
+ ? ? ? p = of_get_property(of_dev, "device_type", &size);
+ ? ? ? if (p == NULL || strncmp(p, "regulator", size))
+ ? ? ? ? ? ? ? return -EINVAL;
+
+ ? ? ? ret = of_regulator_init_constraints(of_dev, &data->constraints);
+ ? ? ? if (ret)
+ ? ? ? ? ? ? ? return ret;
+ ? ? ? p = of_get_property(of_dev, "supply-name", &size);
+ ? ? ? str = p;
+ ? ? ? calc_size = size;
+ ? ? ? while (str && calc_size > 0) {
+ ? ? ? ? ? ? ? len = strlen(str);
+ ? ? ? ? ? ? ? if (len == 0)
+ ? ? ? ? ? ? ? ? ? ? ? break;
+ ? ? ? ? ? ? ? calc_size = calc_size - len - 1;
+ ? ? ? ? ? ? ? str += len + 1;
+ ? ? ? ? ? ? ? count++;
+ ? ? ? }
+ ? ? ? if (count == 0)
+ ? ? ? ? ? ? ? return -EINVAL;
+
+ ? ? ? supply = kzalloc(sizeof(struct regulator_consumer_supply) * count,
+ ? ? ? ? ? ? ? GFP_KERNEL);
+ ? ? ? if (supply == NULL)
+ ? ? ? ? ? ? ? return -EINVAL;
+ ? ? ? str = p;
+ ? ? ? calc_size = size;
+ ? ? ? i = 0;
+ ? ? ? while (str && calc_size > 0 && i < count) {
+ ? ? ? ? ? ? ? len = strlen(str);
+ ? ? ? ? ? ? ? if (len == 0)
+ ? ? ? ? ? ? ? ? ? ? ? break;
+ ? ? ? ? ? ? ? supply[i++].supply = str;
+ ? ? ? ? ? ? ? calc_size = calc_size - len - 1;
+ ? ? ? ? ? ? ? str += len + 1;
+ ? ? ? }
+ ? ? ? data->consumer_supplies = supply;
+ ? ? ? data->num_consumer_supplies = count;
+ ? ? ? return 0;
+}
+
+void of_regulator_deinit_data(struct regulator_init_data *data)
+{
+ ? ? ? if (data && data->consumer_supplies)
+ ? ? ? ? ? ? ? kfree(data->consumer_supplies);
+}

include/linux/of_regulator.h new file +34 -1

new file mode 100644
index 0000000..0155bd8
@@ -0,0 +1,34 @@
+/*
+ * Generic Regulator API implementation
+ *
+ * Copyright (c) 2011 Haojian Zhuang <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef __LINUX_OF_REGULATOR_H
+#define __LINUX_OF_REGULATOR_H
+
+#if defined(CONFIG_OF_REGULATOR) || defined(CONFIG_OF_REGULATOR_MODULE)
+#include <linux/regulator/machine.h>
+
+extern int of_regulator_init_data(struct device_node *of_node,
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? struct regulator_init_data *data);
+extern void of_regulator_deinit_data(struct regulator_init_data *data);
+
+#else
+static inline int of_regulator_init_data(struct device_node *of_node,
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? struct regulator_init_data *data)
+{
+ ? ? ? return 0;
+}
+
+static inline void of_regulator_deinit_data(struct regulator_init_data *data)
+{
+}
+#endif /* CONFIG_OF_REGULATOR */
+
+#endif /* __LINUX_OF_REGULATOR_H */
--

1.5.6.5

Hi Haojian,

Quoted 1 line · Haojian Zhuang

Signed-off-by Haojian Zhuang <[email protected]>

No commit description?

Signed-off-by Haojian Zhuang <[email protected]>

---
 drivers/of/Kconfig           |    4 +
 drivers/of/Makefile          |    1 +
 drivers/of/of_regulator.c    |  166 ++++++++++++++++++++++++++++++++++++++++++
 include/linux/of_regulator.h |   34 +++++++++
 4 files changed, 205 insertions(+), 0 deletions(-)
 create mode 100644 drivers/of/of_regulator.c
 create mode 100644 include/linux/of_regulator.h

drivers/of/Kconfig +4 -0

index d06a637..edb6601 100644
@@ -75,4 +75,8 @@ config OF_PCI
 	help
 	  OpenFirmware PCI bus accessors
 
+config OF_REGULATOR
+	def_tristate REGULATOR
+	depends on REGULATOR
+
 endmenu # OF

drivers/of/Makefile +1 -0

index f7861ed..83ca06f 100644
@@ -10,3 +10,4 @@ obj-$(CONFIG_OF_NET)	+= of_net.o
 obj-$(CONFIG_OF_SPI)	+= of_spi.o
 obj-$(CONFIG_OF_MDIO)	+= of_mdio.o
 obj-$(CONFIG_OF_PCI)	+= of_pci.o
+obj-$(CONFIG_OF_REGULATOR)	+= of_regulator.o

drivers/of/of_regulator.c new file +49 -0

new file mode 100644
index 0000000..d523302
@@ -0,0 +1,166 @@
+/*
+ * OF helpers for the Regulator API
+ *
+ * Copyright (c) 2011 Haojian Zhuang <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+#include <linux/kernel.h>
+#include <linux/of.h>
+#include <linux/regulator/machine.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/suspend.h>
+
+static int of_regulator_init_constraints(struct device_node *of_dev,
+				struct regulation_constraints *constraints)
+{
+	const __be32 *p;
+	const char *cp;
+	const char *ops[] = {"voltage", "current", "mode", "status",
+				"drms"};
+	int i, size, len = 0, tmp = 0;
+
+	memset(constraints, 0, sizeof(struct regulation_constraints));
+
+	p = of_get_property(of_dev, "voltages", &size);
+	if (p && size / sizeof(int) == 2) {
+		constraints->min_uV = be32_to_cpu(*p++);
+		constraints->max_uV = be32_to_cpu(*p);
+	}
+	p = of_get_property(of_dev, "currents", &size);
+	if (p && size / sizeof(int) == 2) {
+		constraints->min_uA = be32_to_cpu(*p++);
+		constraints->max_uA = be32_to_cpu(*p);
+	}
+	p = of_get_property(of_dev, "modes-mask", NULL);
+	if (p)
+		constraints->valid_modes_mask = be32_to_cpu(*p);
+	cp = of_get_property(of_dev, "ops-mask", &size);
+	tmp = 0;
+	if (cp && size > 0) {
+		i = 0;
+		do {
+			len = strlen(ops[i]);
+			if (!strncmp(cp, ops[i], len)) {
+				constraints->valid_ops_mask |= 1 << i;

Signed-off-by Haojian Zhuang <[email protected]>

---
 drivers/of/Kconfig           |    4 +
 drivers/of/Makefile          |    1 +
 drivers/of/of_regulator.c    |  166 ++++++++++++++++++++++++++++++++++++++++++

drivers/of/of_regulator.c new file +8 -0

+	cp = of_get_property(of_dev, "ops-mask", &size);
+	tmp = 0;
+	if (cp && size > 0) {
+		i = 0;
+		do {
+			len = strlen(ops[i]);
+			if (!strncmp(cp, ops[i], len)) {
+				constraints->valid_ops_mask |= 1 << i;

drivers/of/of_regulator.c new file +7 -0

+	supply = kzalloc(sizeof(struct regulator_consumer_supply) * count,
+		GFP_KERNEL);
+	if (supply == NULL)
+		return -EINVAL;
+	str = p;
+	calc_size = size;
+	i = 0;

Create two probe function to support both current platform device and created dynamic platform device from device tree. After moving to device tree, original implementation of platform device will be removed.

Use property to present polling mode and frequency mode.

Signed-off-by Haojian Zhuang <[email protected]>

---
 drivers/i2c/busses/i2c-pxa.c |  163 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 163 insertions(+), 0 deletions(-)

drivers/i2c/busses/i2c-pxa.c +1 -0

index d603646..7a6d774 100644
@@ -29,6 +29,7 @@
 #include <linux/errno.h>
 #include <linux/interrupt.h>
 #include <linux/i2c-pxa.h>
+#include <linux/of_device.h>
 #include <linux/of_i2c.h>
 #include <linux/platform_device.h>
 #include <linux/err.h>

drivers/i2c/busses/i2c-pxa.c +7 -0

+	struct device_node *np = of_dev->dev.of_node;
+	const struct of_device_id *match;
+	struct i2c_pxa_platform_data *plat = NULL;
+	struct pxa_i2c *i2c;
+	struct resource *res;
+	const __be32 *p;
+	int i2c_type, irq, data, ret;

drivers/i2c/busses/i2c-pxa.c +8 -0

+
+	p = of_get_property(np, "i2c-polling", &data);
+	if (p)
+		poll = be32_to_cpu(*p);
+
+	p = of_get_property(np, "i2c-frequency", &data);
+	if (p && !strncmp((char *)p, "fast", data))
+		fast = 1;

drivers/i2c/busses/i2c-pxa.c +117 -0

+	if (!i2c) {
+		ret = -ENOMEM;
+		goto emalloc;
+	}
+
+	i2c->adap.owner   = THIS_MODULE;
+	i2c->adap.retries = 5;
+
+	spin_lock_init(&i2c->lock);
+	init_waitqueue_head(&i2c->wait);
+
+	/*
+	 * adap.nr comes from cell-index in dts file
+	 */
+	i2c->adap.nr = id;
+	snprintf(i2c->adap.name, sizeof(i2c->adap.name), "pxa2xx-i2c.%u",
+		 i2c->adap.nr);
+
+	i2c->clk = clk_get_sys(i2c->adap.name, NULL);
+	if (IS_ERR(i2c->clk)) {
+		ret = PTR_ERR(i2c->clk);
+		goto eclk;
+	}
+
+	i2c->reg_base = ioremap(res->start, resource_size(res));
+	if (!i2c->reg_base) {
+		ret = -EIO;
+		goto eremap;
+	}
+
+	i2c->reg_ibmr = i2c->reg_base + pxa_reg_layout[i2c_type].ibmr;
+	i2c->reg_idbr = i2c->reg_base + pxa_reg_layout[i2c_type].idbr;
+	i2c->reg_icr = i2c->reg_base + pxa_reg_layout[i2c_type].icr;
+	i2c->reg_isr = i2c->reg_base + pxa_reg_layout[i2c_type].isr;
+	if (i2c_type != REGS_CE4100)
+		i2c->reg_isar = i2c->reg_base + pxa_reg_layout[i2c_type].isar;
+
+	i2c->iobase = res->start;
+	i2c->iosize = resource_size(res);
+
+	i2c->irq = irq;
+	i2c->use_pio = poll;
+	i2c->fast_mode = fast;
+
+	i2c->slave_addr = I2C_PXA_SLAVE_ADDR;
+
+#ifdef CONFIG_I2C_PXA_SLAVE
+	if (plat) {
+		i2c->slave_addr = plat->slave_addr;
+		i2c->slave = plat->slave;
+	}
+#endif
+
+	clk_enable(i2c->clk);
+
+	if (plat)
+		i2c->adap.class = plat->class;
+
+	if (i2c->use_pio) {
+		i2c->adap.algo = &i2c_pxa_pio_algorithm;
+	} else {
+		i2c->adap.algo = &i2c_pxa_algorithm;
+		ret = request_irq(irq, i2c_pxa_handler, IRQF_SHARED,
+				  i2c->adap.name, i2c);
+		if (ret)
+			goto ereqirq;
+	}
+
+	i2c_pxa_reset(i2c);
+
+	i2c->adap.algo_data = i2c;
+	i2c->adap.dev.parent = &of_dev->dev;
+	i2c->adap.dev.of_node = of_dev->dev.of_node;
+
+	if (i2c_type == REGS_CE4100)
+		ret = i2c_add_adapter(&i2c->adap);
+	else
+		ret = i2c_add_numbered_adapter(&i2c->adap);
+	if (ret < 0) {
+		printk(KERN_INFO "I2C: Failed to add bus\n");
+		goto eadapt;
+	}
+	of_i2c_register_devices(&i2c->adap);
+
+	platform_set_drvdata(of_dev, i2c);
+
+#ifdef CONFIG_I2C_PXA_SLAVE
+	printk(KERN_INFO "I2C: %s: PXA I2C adapter, slave address %d\n",
+	       dev_name(&i2c->adap.dev), i2c->slave_addr);
+#else
+	printk(KERN_INFO "I2C: %s: PXA I2C adapter\n",
+	       dev_name(&i2c->adap.dev));
+#endif
+	return 0;
+
+eadapt:
+	if (!i2c->use_pio)
+		free_irq(irq, i2c);
+ereqirq:
+	clk_disable(i2c->clk);
+	iounmap(i2c->reg_base);
+eremap:
+	clk_put(i2c->clk);
+eclk:
+	kfree(i2c);
+emalloc:
+	release_mem_region(res->start, resource_size(res));
+	return ret;
+}
+#else
+
 static int i2c_pxa_probe(struct platform_device *dev)
 {
 	struct pxa_i2c *i2c;

@@ -1174,6 +1331,7 @@ emalloc:
 	release_mem_region(res->start, resource_size(res));
 	return ret;
 }
+#endif
 
 static int __exit i2c_pxa_remove(struct platform_device *dev)
 {

@@ -1228,12 +1386,17 @@ static const struct dev_pm_ops i2c_pxa_dev_pm_ops = {
 #endif
 
 static struct platform_driver i2c_pxa_driver = {
+#ifdef CONFIG_OF
+	.probe		= i2c_pxa_of_probe,
+#else
 	.probe		= i2c_pxa_probe,
+#endif
 	.remove		= __exit_p(i2c_pxa_remove),
 	.driver		= {
 		.name	= "pxa2xx-i2c",
 		.owner	= THIS_MODULE,
 		.pm	= I2C_PXA_DEV_PM_OPS,
+		.of_match_table	= pxa_i2c_of_match,
 	},
 	.id_table	= i2c_pxa_id_table,
 };

Signature · 1 line

1.5.6.5

Support both normal platform driver and device tree driver in serial pxa.

Signed-off-by Haojian Zhuang <[email protected]>

---
 drivers/tty/serial/Kconfig     |    4 +-
 drivers/tty/serial/of_serial.c |   12 +++++
 drivers/tty/serial/pxa.c       |   91 ++++++++++++++++++++++++++++++++++------
 include/linux/serial_pxa.h     |   17 +++++++
 4 files changed, 110 insertions(+), 14 deletions(-)
 create mode 100644 include/linux/serial_pxa.h

drivers/tty/serial/Kconfig +3 -1

index 636144c..3f75e0d 100644
@@ -663,6 +663,8 @@ config SERIAL_MPSC_CONSOLE
 config SERIAL_PXA
 	bool "PXA serial port support"
 	depends on ARCH_PXA || ARCH_MMP
+	select SERIAL_OF_PLATFORM
+	select SERIAL_CORE_CONSOLE
 	select SERIAL_CORE
 	help
 	  If you have a machine based on an Intel XScale PXA2xx CPU you

@@ -1340,7 +1342,7 @@ config SERIAL_NETX_CONSOLE
 config SERIAL_OF_PLATFORM
 	tristate "Serial port on Open Firmware platform bus"
 	depends on OF
-	depends on SERIAL_8250 || SERIAL_OF_PLATFORM_NWPSERIAL
+	depends on SERIAL_8250 || SERIAL_OF_PLATFORM_NWPSERIAL || SERIAL_PXA
 	help
 	  If you have a PowerPC based system that has serial ports
 	  on a platform specific bus, you should enable this option.

drivers/tty/serial/of_serial.c +11 -0

index e65f1e8..383bff3 100644
@@ -14,6 +14,7 @@
 #include <linux/slab.h>
 #include <linux/serial_core.h>
 #include <linux/serial_8250.h>
+#include <linux/serial_pxa.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>

@@ -126,6 +127,11 @@ static int __devinit of_platform_serial_probe(struct platform_device *ofdev)
 		ret = nwpserial_register_port(&port);
 		break;
 #endif
+#ifdef CONFIG_SERIAL_PXA
+	case PORT_PXA:
+		ret = serial_pxa_register_port(&port);
+		break;
+#endif
 	default:
 		/* need to add code for these */
 	case PORT_UNKNOWN:

@@ -163,6 +169,11 @@ static int of_platform_serial_remove(struct platform_device *ofdev)
 		nwpserial_unregister_port(info->line);
 		break;
 #endif
+#ifdef CONFIG_SERIAL_PXA
+	case PORT_PXA:
+		serial_pxa_unregister_port(info->line);
+		break;
+#endif
 	default:
 		/* need to add code for these */
 		break;

drivers/tty/serial/of_serial.c +0 -0

 	{ .type = "serial",         .data = (void *)PORT_UNKNOWN, },
 	{ /* end of list */ },
 };

drivers/tty/serial/pxa.c +2 -0

index 4302e6e..fb80fb3 100644
@@ -36,10 +36,12 @@
 #include <linux/circ_buf.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
+#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
 #include <linux/serial_core.h>
+#include <linux/serial_pxa.h>
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/slab.h>

drivers/tty/serial/pxa.c +5 -2

+	int			id;
 };
 
+#define PXA_SERIAL_NR		4
+
+static DEFINE_MUTEX(serial_pxa_mutex);
+
 static inline unsigned int serial_in(struct uart_pxa_port *up, int offset)
 {
 	offset <<= 2;

@@ -346,8 +353,6 @@ static int serial_pxa_startup(struct uart_port *port)
 	else
 		up->mcr = 0;
 
-	up->port.uartclk = clk_get_rate(up->clk);
-
 	/*
 	 * Allocate the IRQ
 	 */

drivers/tty/serial/pxa.c +69 -9

 static struct uart_driver serial_pxa_reg;
 
 #ifdef CONFIG_SERIAL_PXA_CONSOLE

@@ -645,7 +650,7 @@ static void serial_pxa_console_putchar(struct uart_port *port, int ch)
 static void
 serial_pxa_console_write(struct console *co, const char *s, unsigned int count)
 {
-	struct uart_pxa_port *up = serial_pxa_ports[co->index];
+	struct uart_pxa_port *up = &serial_pxa_ports[co->index];
 	unsigned int ier;
 
 	clk_enable(up->clk);

@@ -679,7 +684,7 @@ serial_pxa_console_setup(struct console *co, char *options)
 
 	if (co->index == -1 || co->index >= serial_pxa_reg.nr)
 		co->index = 0;
-	up = serial_pxa_ports[co->index];
+	up = &serial_pxa_ports[co->index];
 	if (!up)
 		return -ENODEV;
 

@@ -761,6 +766,68 @@ static const struct dev_pm_ops serial_pxa_pm_ops = {
 };
 #endif
 
+static int serial_pxa_port_size(struct uart_pxa_port *sport)
+{
+	return 8 << sport->port.regshift;
+}
+
+int serial_pxa_register_port(struct uart_port *port)
+{
+	struct uart_pxa_port *sport = NULL;
+	char name[32];
+	int i, ret;
+
+	mutex_lock(&serial_pxa_mutex);
+	for (i = 0; i < PXA_SERIAL_NR; i++) {
+		if (serial_pxa_ports[i].id == 0) {
+			sport = &serial_pxa_ports[i];
+			sprintf(sport->name, "UART%d", i);
+			sport->id = i + 1;
+			break;
+		}
+	}
+	sprintf(name, "pxa2xx-uart.%d", i);
+	sport->clk = clk_get_sys(name, NULL);
+	if (IS_ERR(sport->clk)) {
+		ret = PTR_ERR(sport->clk);
+		goto out;
+	}
+	memcpy(&sport->port, port, sizeof(struct uart_port));
+	sport->port.line = i;
+	sport->port.fifosize = 64;
+	sport->port.ops = &serial_pxa_pops;
+
+	sport->port.membase = ioremap(sport->port.mapbase,
+				serial_pxa_port_size(sport));
+	if (!sport->port.membase) {
+		ret = -ENOMEM;
+		goto out_membase;
+	}
+
+	uart_add_one_port(&serial_pxa_reg, &sport->port);
+	mutex_unlock(&serial_pxa_mutex);
+
+	return sport->port.line;
+
+out_membase:
+	clk_put(sport->clk);
+out:
+	mutex_unlock(&serial_pxa_mutex);
+	return ret;
+}
+EXPORT_SYMBOL(serial_pxa_register_port);
+
+void serial_pxa_unregister_port(int line)
+{
+	struct uart_pxa_port *sport = &serial_pxa_ports[line];
+
+	mutex_lock(&serial_pxa_mutex);
+	uart_remove_one_port(&serial_pxa_reg, &sport->port);
+	sport->port.type = PORT_UNKNOWN;
+	clk_put(sport->clk);
+	mutex_unlock(&serial_pxa_mutex);
+}
+
 static int serial_pxa_probe(struct platform_device *dev)
 {
 	struct uart_pxa_port *sport;

@@ -794,12 +861,12 @@ static int serial_pxa_probe(struct platform_device *dev)
 	sport->port.uartclk = clk_get_rate(sport->clk);
 
 	switch (dev->id) {
-	case 0: sport->name = "FFUART"; break;
-	case 1: sport->name = "BTUART"; break;
-	case 2: sport->name = "STUART"; break;
-	case 3: sport->name = "HWUART"; break;
+	case 0: strcpy(sport->name, "FFUART"); break;
+	case 1: strcpy(sport->name, "BTUART"); break;
+	case 2: strcpy(sport->name, "STUART"); break;
+	case 3: strcpy(sport->name, "HWUART"); break;
 	default:
-		sport->name = "???";
+		strcpy(sport->name, "???");
 		break;
 	}
 

@@ -809,8 +876,6 @@ static int serial_pxa_probe(struct platform_device *dev)
 		goto err_clk;
 	}
 
-	serial_pxa_ports[dev->id] = sport;
-
 	uart_add_one_port(&serial_pxa_reg, &sport->port);
 	platform_set_drvdata(dev, sport);
 

include/linux/serial_pxa.h new file +17 -0

new file mode 100644
index 0000000..565e510
@@ -0,0 +1,17 @@
+/*
+ *  linux/include/linux/serial_8250.h
+ *
+ *  Marvell Semiconductor Inc.
+ *  Copyright (C) 2011
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+#ifndef _LINUX_SERIAL_PXA_H
+#define _LINUX_SERIAL_PXA_H
+
+extern int serial_pxa_register_port(struct uart_port *);
+extern void serial_pxa_unregister_port(int);
+#endif

Signature · 1 line

1.5.6.5

Parse irq sepcifier from DT and translate it to Linux irq number.

Signed-off-by Haojian Zhuang <[email protected]>

---
 arch/arm/mach-mmp/Makefile |    2 +
 arch/arm/mach-mmp/common.h |    1 +
 arch/arm/mach-mmp/intc.c   |  245 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 248 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-mmp/intc.c

arch/arm/mach-mmp/Makefile +2 -0

index 5c68382..e7862ea 100644
@@ -4,6 +4,8 @@
 
 obj-y				+= common.o clock.o devices.o time.o
 
+obj-$(CONFIG_OF_IRQ)		+= intc.o
+
 # SoC support
 obj-$(CONFIG_CPU_PXA168)	+= pxa168.o irq-pxa168.o
 obj-$(CONFIG_CPU_PXA910)	+= pxa910.o irq-pxa168.o

arch/arm/mach-mmp/common.h +1 -0

index ec8d65d..1c563c2 100644
@@ -6,3 +6,4 @@ extern void timer_init(int irq);
 
 extern void __init icu_init_irq(void);
 extern void __init mmp_map_io(void);
+extern void __init mmp_init_intc(void);

arch/arm/mach-mmp/intc.c new file +85 -0

new file mode 100644
index 0000000..48ad84b
@@ -0,0 +1,245 @@
+/*
+ *  linux/arch/arm/mach-mmp/intc.c
+ *
+ *  Generic IRQ handling
+ *
+ *  Author:	Haojian Zhuang <[email protected]>
+ *  Copyright:	Marvell International Ltd. 2011
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ */
+
+#include <linux/errno.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+#include <linux/slab.h>
+
+struct mmp_intc_info {
+	unsigned int		mask;
+	unsigned int		phy_base;
+	void __iomem		*virt_base;
+	void __iomem		*mux_status;
+	void __iomem		*mux_mask;
+	void __iomem		*mfp_edge;
+	unsigned int		mfp_edge_index;	/* index in irq domain */
+	unsigned int		irq_base;
+};
+
+static void mux_irq_unmask(struct irq_data *d)
+{
+	struct mmp_intc_info *info = irq_data_get_irq_chip_data(d);
+	unsigned int data, irq_offs;
+
+	irq_offs = d->irq - info->irq_base;
+	if (info->mfp_edge && (info->mfp_edge_index == irq_offs)) {
+		data = __raw_readl(info->mfp_edge);
+		__raw_writel(data | (1 << 6), info->mfp_edge);
+		__raw_writel(data, info->mfp_edge);
+	}
+	data = __raw_readl(info->mux_mask) & ~(1 << (d->irq - info->irq_base));
+	__raw_writel(data, info->mux_mask);
+}
+
+static void mux_irq_mask(struct irq_data *d)
+{
+	struct mmp_intc_info *info = irq_data_get_irq_chip_data(d);
+	unsigned int data;
+
+	data = __raw_readl(info->mux_mask) | (1 << (d->irq - info->irq_base));
+	__raw_writel(data, info->mux_mask);
+}
+
+static struct irq_chip mux_irq_chip = {
+	.name		= "mmp mux intc",
+	.irq_unmask	= mux_irq_unmask,
+	.irq_mask	= mux_irq_mask,
+	.irq_ack	= mux_irq_mask,
+};
+
+static void mmp_irq_demux_handler(unsigned int irq, struct irq_desc *desc)
+{
+	struct mmp_intc_info *info = irq_get_handler_data(irq);
+	unsigned long status, mask, n;
+
+	mask = __raw_readl(info->mux_mask);
+	while (1) {
+		status = __raw_readl(info->mux_status) & ~mask;
+		if (status == 0)
+			break;
+		n = find_first_bit(&status, BITS_PER_LONG);
+		while (n < BITS_PER_LONG) {
+			generic_handle_irq(info->irq_base + n);
+			n = find_next_bit(&status, BITS_PER_LONG, n + 1);
+		}
+	}
+}
+
+static void mux_init_intc(struct mmp_intc_info *mmp_info)
+{
+	struct device_node *np;
+	struct mmp_intc_info *mux_info;