lkml.org 
[lkml]   [2023]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v1 40/43] ARM: ep93xx: soc: drop defines
    Date
    Remove unnecessary defines, as we dropped board files.

    Signed-off-by: Nikita Shubin <nikita.shubin@maquefel.me>
    ---
    include/linux/platform_data/eth-ep93xx.h | 10 ------
    include/linux/platform_data/keypad-ep93xx.h | 32 -----------------
    include/linux/soc/cirrus/ep93xx.h | 38 ++++++++-------------
    3 files changed, 14 insertions(+), 66 deletions(-)
    delete mode 100644 include/linux/platform_data/eth-ep93xx.h
    delete mode 100644 include/linux/platform_data/keypad-ep93xx.h

    diff --git a/include/linux/platform_data/eth-ep93xx.h b/include/linux/platform_data/eth-ep93xx.h
    deleted file mode 100644
    index 8eef637a804d..000000000000
    --- a/include/linux/platform_data/eth-ep93xx.h
    +++ /dev/null
    @@ -1,10 +0,0 @@
    -/* SPDX-License-Identifier: GPL-2.0 */
    -#ifndef _LINUX_PLATFORM_DATA_ETH_EP93XX
    -#define _LINUX_PLATFORM_DATA_ETH_EP93XX
    -
    -struct ep93xx_eth_data {
    - unsigned char dev_addr[6];
    - unsigned char phy_id;
    -};
    -
    -#endif
    diff --git a/include/linux/platform_data/keypad-ep93xx.h b/include/linux/platform_data/keypad-ep93xx.h
    deleted file mode 100644
    index 3054fced8509..000000000000
    --- a/include/linux/platform_data/keypad-ep93xx.h
    +++ /dev/null
    @@ -1,32 +0,0 @@
    -/* SPDX-License-Identifier: GPL-2.0 */
    -#ifndef __KEYPAD_EP93XX_H
    -#define __KEYPAD_EP93XX_H
    -
    -struct matrix_keymap_data;
    -
    -/* flags for the ep93xx_keypad driver */
    -#define EP93XX_KEYPAD_DISABLE_3_KEY (1<<0) /* disable 3-key reset */
    -#define EP93XX_KEYPAD_DIAG_MODE (1<<1) /* diagnostic mode */
    -#define EP93XX_KEYPAD_BACK_DRIVE (1<<2) /* back driving mode */
    -#define EP93XX_KEYPAD_TEST_MODE (1<<3) /* scan only column 0 */
    -#define EP93XX_KEYPAD_AUTOREPEAT (1<<4) /* enable key autorepeat */
    -
    -/**
    - * struct ep93xx_keypad_platform_data - platform specific device structure
    - * @keymap_data: pointer to &matrix_keymap_data
    - * @debounce: debounce start count; terminal count is 0xff
    - * @prescale: row/column counter pre-scaler load value
    - * @flags: see above
    - */
    -struct ep93xx_keypad_platform_data {
    - struct matrix_keymap_data *keymap_data;
    - unsigned int debounce;
    - unsigned int prescale;
    - unsigned int flags;
    - unsigned int clk_rate;
    -};
    -
    -#define EP93XX_MATRIX_ROWS (8)
    -#define EP93XX_MATRIX_COLS (8)
    -
    -#endif /* __KEYPAD_EP93XX_H */
    diff --git a/include/linux/soc/cirrus/ep93xx.h b/include/linux/soc/cirrus/ep93xx.h
    index 37c0e17a45c0..2acce55692a4 100644
    --- a/include/linux/soc/cirrus/ep93xx.h
    +++ b/include/linux/soc/cirrus/ep93xx.h
    @@ -2,44 +2,34 @@
    #ifndef _SOC_EP93XX_H
    #define _SOC_EP93XX_H

    -struct platform_device;
    -
    #define EP93XX_CHIP_REV_D0 3
    #define EP93XX_CHIP_REV_D1 4
    #define EP93XX_CHIP_REV_E0 5
    #define EP93XX_CHIP_REV_E1 6
    #define EP93XX_CHIP_REV_E2 7

    -#if defined(CONFIG_EP93XX_SOC_COMMON)
    -int ep93xx_pwm_acquire_gpio(struct platform_device *pdev);
    -void ep93xx_pwm_release_gpio(struct platform_device *pdev);
    -int ep93xx_ide_acquire_gpio(struct platform_device *pdev);
    -void ep93xx_ide_release_gpio(struct platform_device *pdev);
    -int ep93xx_keypad_acquire_gpio(struct platform_device *pdev);
    -void ep93xx_keypad_release_gpio(struct platform_device *pdev);
    -int ep93xx_i2s_acquire(void);
    -void ep93xx_i2s_release(void);
    -#else
    -static inline int ep93xx_pwm_acquire_gpio(struct platform_device *pdev) { return 0; }
    -static inline void ep93xx_pwm_release_gpio(struct platform_device *pdev) {}
    -static inline int ep93xx_ide_acquire_gpio(struct platform_device *pdev) { return 0; }
    -static inline void ep93xx_ide_release_gpio(struct platform_device *pdev) {}
    -static inline int ep93xx_keypad_acquire_gpio(struct platform_device *pdev) { return 0; }
    -static inline void ep93xx_keypad_release_gpio(struct platform_device *pdev) {}
    -static inline int ep93xx_i2s_acquire(void) { return 0; }
    -static inline void ep93xx_i2s_release(void) {}
    -#endif
    -
    #if defined(CONFIG_ARCH_EP93XX)
    unsigned int ep93xx_chip_revision(void);
    -#if defined(CONFIG_EP93XX_SOC)
    void ep93xx_devcfg_set_clear(unsigned int set_bits, unsigned int clear_bits);
    void ep93xx_syscon_swlocked_write(unsigned int val, unsigned int reg);
    void ep93xx_swlocked_update_bits(unsigned int reg,
    unsigned int mask, unsigned int val);
    -#endif
    #else
    static inline unsigned int ep93xx_chip_revision(void) { return 0; }
    +static inline void ep93xx_devcfg_set_clear(unsigned int set_bits,
    + unsigned int clear_bits)
    +{
    + return 0;
    +}
    +void ep93xx_syscon_swlocked_write(unsigned int val, unsigned int reg)
    +{
    + return 0;
    +}
    +void ep93xx_swlocked_update_bits(unsigned int reg,
    + unsigned int mask, unsigned int val)
    +{
    + return 0;
    +}
    #endif

    #endif
    --
    2.37.4
    \
     
     \ /
      Last update: 2023-06-01 07:49    [W:2.332 / U:0.704 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site