Skip to content

L
linux
Commit 49010336 authored by Charles Keepax's avatar Charles Keepax Committed by Lee Jones
Browse files
Options

mfd: arizona: Move useful defines into a dt-binding include 

Move parts of linux/mfd/arizona/pdata.h and gpio.h into a new file in
the dt-binding directory for use by device tree bindings. This also
makes gpio.h redundant so remove it in the process.
Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Acked-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent fbf2c4a7
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 66 deletions
Documentation/devicetree/bindings/mfd/arizona.txt
View file @ 49010336
...@@ -43,11 +43,11 @@ Optional properties: ...@@ -43,11 +43,11 @@ Optional properties:
- wlf,reset : GPIO specifier for the GPIO controlling /RESET - wlf,reset : GPIO specifier for the GPIO controlling /RESET
- wlf,ldoena : GPIO specifier for the GPIO controlling LDOENA - wlf,ldoena : GPIO specifier for the GPIO controlling LDOENA
- wlf,gpio-defaults : A list of GPIO configuration register values. If - wlf,gpio-defaults : A list of GPIO configuration register values. Defines
absent, no configuration of these registers is performed. If any for the appropriate values can found in <dt-bindings/mfd/arizona.txt>. If
entry has a value that is out of range for a 16 bit register then absent, no configuration of these registers is performed. If any entry has
the chip default will be used. If present exactly five values must a value that is out of range for a 16 bit register then the chip default
be specified. will be used. If present exactly five values must be specified.
- wlf,inmode : A list of INn_MODE register values, where n is the number - wlf,inmode : A list of INn_MODE register values, where n is the number
of input signals. Valid values are 0 (Differential), 1 (Single-ended) and of input signals. Valid values are 0 (Differential), 1 (Single-ended) and
...@@ -80,10 +80,10 @@ codec: wm5102@1a { ...@@ -80,10 +80,10 @@ codec: wm5102@1a {
#gpio-cells = <2>; #gpio-cells = <2>;
wlf,gpio-defaults = < wlf,gpio-defaults = <
0x00000000 /* AIF1TXLRCLK */ ARIZONA_GP_FN_TXLRCLK
0xffffffff ARIZONA_GP_DEFAULT
0xffffffff ARIZONA_GP_DEFAULT
0xffffffff ARIZONA_GP_DEFAULT
0xffffffff ARIZONA_GP_DEFAULT
>; >;
}; };
include/linux/mfd/arizona/gpio.h → include/dt-bindings/mfd/arizona.h
View file @ 49010336
/* /*
* GPIO configuration for Arizona devices * Device Tree defines for Arizona devices
* *
* Copyright 2013 Wolfson Microelectronics. PLC. * Copyright 2015 Cirrus Logic Inc.
* *
* Author: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> * Author: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
* *
...@@ -10,9 +10,10 @@ ...@@ -10,9 +10,10 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#ifndef _ARIZONA_GPIO_H #ifndef _DT_BINDINGS_MFD_ARIZONA_H
#define _ARIZONA_GPIO_H #define _DT_BINDINGS_MFD_ARIZONA_H
/* GPIO Function Definitions */
#define ARIZONA_GP_FN_TXLRCLK 0x00 #define ARIZONA_GP_FN_TXLRCLK 0x00
#define ARIZONA_GP_FN_GPIO 0x01 #define ARIZONA_GP_FN_GPIO 0x01
#define ARIZONA_GP_FN_IRQ1 0x02 #define ARIZONA_GP_FN_IRQ1 0x02
...@@ -61,36 +62,32 @@ ...@@ -61,36 +62,32 @@
#define ARIZONA_GP_FN_SYSCLK_ENA_STATUS 0x4B #define ARIZONA_GP_FN_SYSCLK_ENA_STATUS 0x4B
#define ARIZONA_GP_FN_ASYNCCLK_ENA_STATUS 0x4C #define ARIZONA_GP_FN_ASYNCCLK_ENA_STATUS 0x4C
#define ARIZONA_GPN_DIR 0x8000 /* GPN_DIR */ /* GPIO Configuration Bits */
#define ARIZONA_GPN_DIR_MASK 0x8000 /* GPN_DIR */ #define ARIZONA_GPN_DIR 0x8000
#define ARIZONA_GPN_DIR_SHIFT 15 /* GPN_DIR */ #define ARIZONA_GPN_PU 0x4000
#define ARIZONA_GPN_DIR_WIDTH 1 /* GPN_DIR */ #define ARIZONA_GPN_PD 0x2000
#define ARIZONA_GPN_PU 0x4000 /* GPN_PU */ #define ARIZONA_GPN_LVL 0x0800
#define ARIZONA_GPN_PU_MASK 0x4000 /* GPN_PU */ #define ARIZONA_GPN_POL 0x0400
#define ARIZONA_GPN_PU_SHIFT 14 /* GPN_PU */ #define ARIZONA_GPN_OP_CFG 0x0200
#define ARIZONA_GPN_PU_WIDTH 1 /* GPN_PU */ #define ARIZONA_GPN_DB 0x0100
#define ARIZONA_GPN_PD 0x2000 /* GPN_PD */
#define ARIZONA_GPN_PD_MASK 0x2000 /* GPN_PD */ /* Provide some defines for the most common configs */
#define ARIZONA_GPN_PD_SHIFT 13 /* GPN_PD */ #define ARIZONA_GP_DEFAULT 0xffffffff
#define ARIZONA_GPN_PD_WIDTH 1 /* GPN_PD */ #define ARIZONA_GP_OUTPUT (ARIZONA_GP_FN_GPIO)
#define ARIZONA_GPN_LVL 0x0800 /* GPN_LVL */ #define ARIZONA_GP_INPUT (ARIZONA_GP_FN_GPIO | \
#define ARIZONA_GPN_LVL_MASK 0x0800 /* GPN_LVL */ ARIZONA_GPN_DIR)
#define ARIZONA_GPN_LVL_SHIFT 11 /* GPN_LVL */
#define ARIZONA_GPN_LVL_WIDTH 1 /* GPN_LVL */ #define ARIZONA_32KZ_MCLK1 1
#define ARIZONA_GPN_POL 0x0400 /* GPN_POL */ #define ARIZONA_32KZ_MCLK2 2
#define ARIZONA_GPN_POL_MASK 0x0400 /* GPN_POL */ #define ARIZONA_32KZ_NONE 3
#define ARIZONA_GPN_POL_SHIFT 10 /* GPN_POL */
#define ARIZONA_GPN_POL_WIDTH 1 /* GPN_POL */ #define ARIZONA_DMIC_MICVDD 0
#define ARIZONA_GPN_OP_CFG 0x0200 /* GPN_OP_CFG */ #define ARIZONA_DMIC_MICBIAS1 1
#define ARIZONA_GPN_OP_CFG_MASK 0x0200 /* GPN_OP_CFG */ #define ARIZONA_DMIC_MICBIAS2 2
#define ARIZONA_GPN_OP_CFG_SHIFT 9 /* GPN_OP_CFG */ #define ARIZONA_DMIC_MICBIAS3 3
#define ARIZONA_GPN_OP_CFG_WIDTH 1 /* GPN_OP_CFG */
#define ARIZONA_GPN_DB 0x0100 /* GPN_DB */ #define ARIZONA_INMODE_DIFF 0
#define ARIZONA_GPN_DB_MASK 0x0100 /* GPN_DB */ #define ARIZONA_INMODE_SE 1
#define ARIZONA_GPN_DB_SHIFT 8 /* GPN_DB */ #define ARIZONA_INMODE_DMIC 2
#define ARIZONA_GPN_DB_WIDTH 1 /* GPN_DB */
#define ARIZONA_GPN_FN_MASK 0x007F /* GPN_DB */
#define ARIZONA_GPN_FN_SHIFT 0 /* GPN_DB */
#define ARIZONA_GPN_FN_WIDTH 7 /* GPN_DB */
#endif #endif
include/linux/mfd/arizona/pdata.h
View file @ 49010336
...@@ -11,31 +11,26 @@ ...@@ -11,31 +11,26 @@
#ifndef _ARIZONA_PDATA_H #ifndef _ARIZONA_PDATA_H
#define _ARIZONA_PDATA_H #define _ARIZONA_PDATA_H
#define ARIZONA_GPN_DIR 0x8000 /* GPN_DIR */ #include <dt-bindings/mfd/arizona.h>
#define ARIZONA_GPN_DIR_MASK 0x8000 /* GPN_DIR */ #define ARIZONA_GPN_DIR_MASK 0x8000 /* GPN_DIR */
#define ARIZONA_GPN_DIR_SHIFT 15 /* GPN_DIR */ #define ARIZONA_GPN_DIR_SHIFT 15 /* GPN_DIR */
#define ARIZONA_GPN_DIR_WIDTH 1 /* GPN_DIR */ #define ARIZONA_GPN_DIR_WIDTH 1 /* GPN_DIR */
#define ARIZONA_GPN_PU 0x4000 /* GPN_PU */
#define ARIZONA_GPN_PU_MASK 0x4000 /* GPN_PU */ #define ARIZONA_GPN_PU_MASK 0x4000 /* GPN_PU */
#define ARIZONA_GPN_PU_SHIFT 14 /* GPN_PU */ #define ARIZONA_GPN_PU_SHIFT 14 /* GPN_PU */
#define ARIZONA_GPN_PU_WIDTH 1 /* GPN_PU */ #define ARIZONA_GPN_PU_WIDTH 1 /* GPN_PU */
#define ARIZONA_GPN_PD 0x2000 /* GPN_PD */
#define ARIZONA_GPN_PD_MASK 0x2000 /* GPN_PD */ #define ARIZONA_GPN_PD_MASK 0x2000 /* GPN_PD */
#define ARIZONA_GPN_PD_SHIFT 13 /* GPN_PD */ #define ARIZONA_GPN_PD_SHIFT 13 /* GPN_PD */
#define ARIZONA_GPN_PD_WIDTH 1 /* GPN_PD */ #define ARIZONA_GPN_PD_WIDTH 1 /* GPN_PD */
#define ARIZONA_GPN_LVL 0x0800 /* GPN_LVL */
#define ARIZONA_GPN_LVL_MASK 0x0800 /* GPN_LVL */ #define ARIZONA_GPN_LVL_MASK 0x0800 /* GPN_LVL */
#define ARIZONA_GPN_LVL_SHIFT 11 /* GPN_LVL */ #define ARIZONA_GPN_LVL_SHIFT 11 /* GPN_LVL */
#define ARIZONA_GPN_LVL_WIDTH 1 /* GPN_LVL */ #define ARIZONA_GPN_LVL_WIDTH 1 /* GPN_LVL */
#define ARIZONA_GPN_POL 0x0400 /* GPN_POL */
#define ARIZONA_GPN_POL_MASK 0x0400 /* GPN_POL */ #define ARIZONA_GPN_POL_MASK 0x0400 /* GPN_POL */
#define ARIZONA_GPN_POL_SHIFT 10 /* GPN_POL */ #define ARIZONA_GPN_POL_SHIFT 10 /* GPN_POL */
#define ARIZONA_GPN_POL_WIDTH 1 /* GPN_POL */ #define ARIZONA_GPN_POL_WIDTH 1 /* GPN_POL */
#define ARIZONA_GPN_OP_CFG 0x0200 /* GPN_OP_CFG */
#define ARIZONA_GPN_OP_CFG_MASK 0x0200 /* GPN_OP_CFG */ #define ARIZONA_GPN_OP_CFG_MASK 0x0200 /* GPN_OP_CFG */
#define ARIZONA_GPN_OP_CFG_SHIFT 9 /* GPN_OP_CFG */ #define ARIZONA_GPN_OP_CFG_SHIFT 9 /* GPN_OP_CFG */
#define ARIZONA_GPN_OP_CFG_WIDTH 1 /* GPN_OP_CFG */ #define ARIZONA_GPN_OP_CFG_WIDTH 1 /* GPN_OP_CFG */
#define ARIZONA_GPN_DB 0x0100 /* GPN_DB */
#define ARIZONA_GPN_DB_MASK 0x0100 /* GPN_DB */ #define ARIZONA_GPN_DB_MASK 0x0100 /* GPN_DB */
#define ARIZONA_GPN_DB_SHIFT 8 /* GPN_DB */ #define ARIZONA_GPN_DB_SHIFT 8 /* GPN_DB */
#define ARIZONA_GPN_DB_WIDTH 1 /* GPN_DB */ #define ARIZONA_GPN_DB_WIDTH 1 /* GPN_DB */
...@@ -45,23 +40,10 @@ ...@@ -45,23 +40,10 @@
#define ARIZONA_MAX_GPIO 5 #define ARIZONA_MAX_GPIO 5
#define ARIZONA_32KZ_MCLK1 1
#define ARIZONA_32KZ_MCLK2 2
#define ARIZONA_32KZ_NONE 3
#define ARIZONA_MAX_INPUT 4 #define ARIZONA_MAX_INPUT 4
#define ARIZONA_DMIC_MICVDD 0
#define ARIZONA_DMIC_MICBIAS1 1
#define ARIZONA_DMIC_MICBIAS2 2
#define ARIZONA_DMIC_MICBIAS3 3
#define ARIZONA_MAX_MICBIAS 3 #define ARIZONA_MAX_MICBIAS 3
#define ARIZONA_INMODE_DIFF 0
#define ARIZONA_INMODE_SE 1
#define ARIZONA_INMODE_DMIC 2
#define ARIZONA_MAX_OUTPUT 6 #define ARIZONA_MAX_OUTPUT 6
#define ARIZONA_MAX_AIF 3 #define ARIZONA_MAX_AIF 3
......
sound/soc/codecs/arizona.c
View file @ 49010336
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include <sound/tlv.h> #include <sound/tlv.h>
#include <linux/mfd/arizona/core.h> #include <linux/mfd/arizona/core.h>
#include <linux/mfd/arizona/gpio.h>
#include <linux/mfd/arizona/registers.h> #include <linux/mfd/arizona/registers.h>
#include "arizona.h" #include "arizona.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7