public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 1/2] power: axp152: Registers definitions in header
@ 2015-03-22 17:08 Paul Kocialkowski
  2015-03-22 17:08 ` [U-Boot] [PATCH 2/2] power: axp209: " Paul Kocialkowski
  2015-03-23 16:28 ` [U-Boot] [PATCH 1/2] power: axp152: " Hans de Goede
  0 siblings, 2 replies; 3+ messages in thread
From: Paul Kocialkowski @ 2015-03-22 17:08 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
---
 drivers/power/axp152.c | 11 -----------
 include/axp152.h       | 12 ++++++++++++
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/drivers/power/axp152.c b/drivers/power/axp152.c
index 27c2c4c..740a3b4 100644
--- a/drivers/power/axp152.c
+++ b/drivers/power/axp152.c
@@ -8,17 +8,6 @@
 #include <i2c.h>
 #include <axp152.h>
 
-enum axp152_reg {
-	AXP152_CHIP_VERSION = 0x3,
-	AXP152_DCDC2_VOLTAGE = 0x23,
-	AXP152_DCDC3_VOLTAGE = 0x27,
-	AXP152_DCDC4_VOLTAGE = 0x2B,
-	AXP152_LDO2_VOLTAGE = 0x2A,
-	AXP152_SHUTDOWN = 0x32,
-};
-
-#define AXP152_POWEROFF			(1 << 7)
-
 static int axp152_write(enum axp152_reg reg, u8 val)
 {
 	return i2c_write(0x30, reg, 1, &val, 1);
diff --git a/include/axp152.h b/include/axp152.h
index 3e5ccbd..9d205f8 100644
--- a/include/axp152.h
+++ b/include/axp152.h
@@ -3,6 +3,18 @@
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
+
+enum axp152_reg {
+	AXP152_CHIP_VERSION = 0x3,
+	AXP152_DCDC2_VOLTAGE = 0x23,
+	AXP152_DCDC3_VOLTAGE = 0x27,
+	AXP152_DCDC4_VOLTAGE = 0x2B,
+	AXP152_LDO2_VOLTAGE = 0x2A,
+	AXP152_SHUTDOWN = 0x32,
+};
+
+#define AXP152_POWEROFF			(1 << 7)
+
 int axp152_set_dcdc2(int mvolt);
 int axp152_set_dcdc3(int mvolt);
 int axp152_set_dcdc4(int mvolt);
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [U-Boot] [PATCH 2/2] power: axp209: Registers definitions in header
  2015-03-22 17:08 [U-Boot] [PATCH 1/2] power: axp152: Registers definitions in header Paul Kocialkowski
@ 2015-03-22 17:08 ` Paul Kocialkowski
  2015-03-23 16:28 ` [U-Boot] [PATCH 1/2] power: axp152: " Hans de Goede
  1 sibling, 0 replies; 3+ messages in thread
From: Paul Kocialkowski @ 2015-03-22 17:08 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
---
 drivers/power/axp209.c | 38 --------------------------------------
 include/axp209.h       | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/drivers/power/axp209.c b/drivers/power/axp209.c
index e1cbba9..ebb3822 100644
--- a/drivers/power/axp209.c
+++ b/drivers/power/axp209.c
@@ -10,44 +10,6 @@
 #include <asm/arch/gpio.h>
 #include <axp209.h>
 
-enum axp209_reg {
-	AXP209_POWER_STATUS = 0x00,
-	AXP209_CHIP_VERSION = 0x03,
-	AXP209_DCDC2_VOLTAGE = 0x23,
-	AXP209_DCDC3_VOLTAGE = 0x27,
-	AXP209_LDO24_VOLTAGE = 0x28,
-	AXP209_LDO3_VOLTAGE = 0x29,
-	AXP209_IRQ_ENABLE1 = 0x40,
-	AXP209_IRQ_ENABLE2 = 0x41,
-	AXP209_IRQ_ENABLE3 = 0x42,
-	AXP209_IRQ_ENABLE4 = 0x43,
-	AXP209_IRQ_ENABLE5 = 0x44,
-	AXP209_IRQ_STATUS5 = 0x4c,
-	AXP209_SHUTDOWN = 0x32,
-	AXP209_GPIO0_CTRL = 0x90,
-	AXP209_GPIO1_CTRL = 0x92,
-	AXP209_GPIO2_CTRL = 0x93,
-	AXP209_GPIO_STATE = 0x94,
-	AXP209_GPIO3_CTRL = 0x95,
-};
-
-#define AXP209_POWER_STATUS_ON_BY_DC	(1 << 0)
-#define AXP209_POWER_STATUS_VBUS_USABLE	(1 << 4)
-
-#define AXP209_IRQ5_PEK_UP		(1 << 6)
-#define AXP209_IRQ5_PEK_DOWN		(1 << 5)
-
-#define AXP209_POWEROFF			(1 << 7)
-
-#define AXP209_GPIO_OUTPUT_LOW		0x00 /* Drive pin low */
-#define AXP209_GPIO_OUTPUT_HIGH		0x01 /* Drive pin high */
-#define AXP209_GPIO_INPUT		0x02 /* Float pin */
-
-/* GPIO3 is different from the others */
-#define AXP209_GPIO3_OUTPUT_LOW		0x00 /* Drive pin low, Output mode */
-#define AXP209_GPIO3_OUTPUT_HIGH	0x02 /* Float pin, Output mode */
-#define AXP209_GPIO3_INPUT		0x06 /* Float pin, Input mode */
-
 static int axp209_write(enum axp209_reg reg, u8 val)
 {
 	return i2c_write(0x34, reg, 1, &val, 1);
diff --git a/include/axp209.h b/include/axp209.h
index 0436249..d36da41 100644
--- a/include/axp209.h
+++ b/include/axp209.h
@@ -4,6 +4,44 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
+enum axp209_reg {
+	AXP209_POWER_STATUS = 0x00,
+	AXP209_CHIP_VERSION = 0x03,
+	AXP209_DCDC2_VOLTAGE = 0x23,
+	AXP209_DCDC3_VOLTAGE = 0x27,
+	AXP209_LDO24_VOLTAGE = 0x28,
+	AXP209_LDO3_VOLTAGE = 0x29,
+	AXP209_IRQ_ENABLE1 = 0x40,
+	AXP209_IRQ_ENABLE2 = 0x41,
+	AXP209_IRQ_ENABLE3 = 0x42,
+	AXP209_IRQ_ENABLE4 = 0x43,
+	AXP209_IRQ_ENABLE5 = 0x44,
+	AXP209_IRQ_STATUS5 = 0x4c,
+	AXP209_SHUTDOWN = 0x32,
+	AXP209_GPIO0_CTRL = 0x90,
+	AXP209_GPIO1_CTRL = 0x92,
+	AXP209_GPIO2_CTRL = 0x93,
+	AXP209_GPIO_STATE = 0x94,
+	AXP209_GPIO3_CTRL = 0x95,
+};
+
+#define AXP209_POWER_STATUS_ON_BY_DC	(1 << 0)
+#define AXP209_POWER_STATUS_VBUS_USABLE	(1 << 4)
+
+#define AXP209_IRQ5_PEK_UP		(1 << 6)
+#define AXP209_IRQ5_PEK_DOWN		(1 << 5)
+
+#define AXP209_POWEROFF			(1 << 7)
+
+#define AXP209_GPIO_OUTPUT_LOW		0x00 /* Drive pin low */
+#define AXP209_GPIO_OUTPUT_HIGH		0x01 /* Drive pin high */
+#define AXP209_GPIO_INPUT		0x02 /* Float pin */
+
+/* GPIO3 is different from the others */
+#define AXP209_GPIO3_OUTPUT_LOW		0x00 /* Drive pin low, Output mode */
+#define AXP209_GPIO3_OUTPUT_HIGH	0x02 /* Float pin, Output mode */
+#define AXP209_GPIO3_INPUT		0x06 /* Float pin, Input mode */
+
 #define AXP_GPIO
 
 extern int axp209_set_dcdc2(int mvolt);
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [U-Boot] [PATCH 1/2] power: axp152: Registers definitions in header
  2015-03-22 17:08 [U-Boot] [PATCH 1/2] power: axp152: Registers definitions in header Paul Kocialkowski
  2015-03-22 17:08 ` [U-Boot] [PATCH 2/2] power: axp209: " Paul Kocialkowski
@ 2015-03-23 16:28 ` Hans de Goede
  1 sibling, 0 replies; 3+ messages in thread
From: Hans de Goede @ 2015-03-23 16:28 UTC (permalink / raw)
  To: u-boot

Hi,

Thanks, I've also queued these 2 up in u-boot-sunxi/next.

Regards,

Hans




On 22-03-15 18:08, Paul Kocialkowski wrote:
> Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
> ---
>   drivers/power/axp152.c | 11 -----------
>   include/axp152.h       | 12 ++++++++++++
>   2 files changed, 12 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/power/axp152.c b/drivers/power/axp152.c
> index 27c2c4c..740a3b4 100644
> --- a/drivers/power/axp152.c
> +++ b/drivers/power/axp152.c
> @@ -8,17 +8,6 @@
>   #include <i2c.h>
>   #include <axp152.h>
>
> -enum axp152_reg {
> -	AXP152_CHIP_VERSION = 0x3,
> -	AXP152_DCDC2_VOLTAGE = 0x23,
> -	AXP152_DCDC3_VOLTAGE = 0x27,
> -	AXP152_DCDC4_VOLTAGE = 0x2B,
> -	AXP152_LDO2_VOLTAGE = 0x2A,
> -	AXP152_SHUTDOWN = 0x32,
> -};
> -
> -#define AXP152_POWEROFF			(1 << 7)
> -
>   static int axp152_write(enum axp152_reg reg, u8 val)
>   {
>   	return i2c_write(0x30, reg, 1, &val, 1);
> diff --git a/include/axp152.h b/include/axp152.h
> index 3e5ccbd..9d205f8 100644
> --- a/include/axp152.h
> +++ b/include/axp152.h
> @@ -3,6 +3,18 @@
>    *
>    * SPDX-License-Identifier:	GPL-2.0+
>    */
> +
> +enum axp152_reg {
> +	AXP152_CHIP_VERSION = 0x3,
> +	AXP152_DCDC2_VOLTAGE = 0x23,
> +	AXP152_DCDC3_VOLTAGE = 0x27,
> +	AXP152_DCDC4_VOLTAGE = 0x2B,
> +	AXP152_LDO2_VOLTAGE = 0x2A,
> +	AXP152_SHUTDOWN = 0x32,
> +};
> +
> +#define AXP152_POWEROFF			(1 << 7)
> +
>   int axp152_set_dcdc2(int mvolt);
>   int axp152_set_dcdc3(int mvolt);
>   int axp152_set_dcdc4(int mvolt);
>

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-03-23 16:28 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-22 17:08 [U-Boot] [PATCH 1/2] power: axp152: Registers definitions in header Paul Kocialkowski
2015-03-22 17:08 ` [U-Boot] [PATCH 2/2] power: axp209: " Paul Kocialkowski
2015-03-23 16:28 ` [U-Boot] [PATCH 1/2] power: axp152: " Hans de Goede

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox