Skip to contentSkip to conversation

staging: ath6kl: Replacing the symbolic link to the hw.0 directory with a new directory 'hw' while retaining the contents. This will help with the cases where the driver fails to compile if the link was not setup properly.

PATCH In review Vipin Mehta 3 participants 3 messages Sep 8, 2010 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: ath6kl: Replacing the symbolic link to the hw.0 directory with a new directory 'hw' while retaining the contents. This will help with the cases where the driver fails to compile if the link was not setup properly.

---
 .../include/common/AR6002/hw.0/analog_intf_reg.h   |   64 -
 .../ath6kl/include/common/AR6002/hw.0/analog_reg.h | 1932 --------------------
 .../ath6kl/include/common/AR6002/hw.0/apb_map.h    |   13 -
 .../ath6kl/include/common/AR6002/hw.0/gpio_reg.h   |  977 ----------
 .../include/common/AR6002/hw.0/mbox_host_reg.h     |  386 ----
 .../ath6kl/include/common/AR6002/hw.0/mbox_reg.h   |  481 -----
 .../ath6kl/include/common/AR6002/hw.0/rtc_reg.h    | 1163 ------------
 .../ath6kl/include/common/AR6002/hw.0/si_reg.h     |  186 --
 .../ath6kl/include/common/AR6002/hw.0/uart_reg.h   |  327 ----
 .../ath6kl/include/common/AR6002/hw.0/vmc_reg.h    |   76 -
 .../staging/ath6kl/include/common/AR6002/hw2.0/hw  |    1 -
 .../common/AR6002/hw2.0/hw/analog_intf_reg.h       |   64 +
 .../include/common/AR6002/hw2.0/hw/analog_reg.h    | 1932 ++++++++++++++++++++
 .../include/common/AR6002/hw2.0/hw/apb_map.h       |   13 +
 .../include/common/AR6002/hw2.0/hw/gpio_reg.h      |  977 ++++++++++
 .../include/common/AR6002/hw2.0/hw/mbox_host_reg.h |  386 ++++
 .../include/common/AR6002/hw2.0/hw/mbox_reg.h      |  481 +++++
 .../include/common/AR6002/hw2.0/hw/rtc_reg.h       | 1163 ++++++++++++
 .../ath6kl/include/common/AR6002/hw2.0/hw/si_reg.h |  186 ++
 .../include/common/AR6002/hw2.0/hw/uart_reg.h      |  327 ++++
 .../include/common/AR6002/hw2.0/hw/vmc_reg.h       |   76 +
 21 files changed, 5605 insertions(+), 5606 deletions(-)
 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw.0/analog_intf_reg.h
 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw.0/analog_reg.h
 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw.0/apb_map.h
 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw.0/gpio_reg.h
 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw.0/mbox_host_reg.h
 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw.0/mbox_reg.h
 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw.0/rtc_reg.h
 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw.0/si_reg.h
 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw.0/uart_reg.h
 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw.0/vmc_reg.h
 delete mode 120000 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw
 create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/analog_intf_reg.h
 create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/analog_reg.h
 create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/apb_map.h
 create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/gpio_reg.h
 create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/mbox_host_reg.h
 create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/mbox_reg.h
 create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/rtc_reg.h
 create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/si_reg.h
 create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/uart_reg.h
 create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/vmc_reg.h
drivers/staging/ath6kl/include/common/AR6002/hw.0/analog_intf_reg.h deleted +0 -64
deleted file mode 100644
index 9c82767..0000000
@@ -1,64 +0,0 @@
-#ifndef _ANALOG_INTF_REG_REG_H_
-#define _ANALOG_INTF_REG_REG_H_
-
-#define SW_OVERRIDE_ADDRESS                      0x00000080
-#define SW_OVERRIDE_OFFSET                       0x00000080
-#define SW_OVERRIDE_SUPDATE_DELAY_MSB            1
-#define SW_OVERRIDE_SUPDATE_DELAY_LSB            1
-#define SW_OVERRIDE_SUPDATE_DELAY_MASK           0x00000002
-#define SW_OVERRIDE_SUPDATE_DELAY_GET(x)         (((x) & SW_OVERRIDE_SUPDATE_DELAY_MASK) >> SW_OVERRIDE_SUPDATE_DELAY_LSB)
-#define SW_OVERRIDE_SUPDATE_DELAY_SET(x)         (((x) << SW_OVERRIDE_SUPDATE_DELAY_LSB) & SW_OVERRIDE_SUPDATE_DELAY_MASK)
-#define SW_OVERRIDE_ENABLE_MSB                   0
-#define SW_OVERRIDE_ENABLE_LSB                   0
-#define SW_OVERRIDE_ENABLE_MASK                  0x00000001
-#define SW_OVERRIDE_ENABLE_GET(x)                (((x) & SW_OVERRIDE_ENABLE_MASK) >> SW_OVERRIDE_ENABLE_LSB)
-#define SW_OVERRIDE_ENABLE_SET(x)                (((x) << SW_OVERRIDE_ENABLE_LSB) & SW_OVERRIDE_ENABLE_MASK)
-
-#define SIN_VAL_ADDRESS                          0x00000084
-#define SIN_VAL_OFFSET                           0x00000084
-#define SIN_VAL_SIN_MSB                          0
-#define SIN_VAL_SIN_LSB                          0
-#define SIN_VAL_SIN_MASK                         0x00000001
-#define SIN_VAL_SIN_GET(x)                       (((x) & SIN_VAL_SIN_MASK) >> SIN_VAL_SIN_LSB)
-#define SIN_VAL_SIN_SET(x)                       (((x) << SIN_VAL_SIN_LSB) & SIN_VAL_SIN_MASK)
-
-#define SW_SCLK_ADDRESS                          0x00000088
-#define SW_SCLK_OFFSET                           0x00000088
-#define SW_SCLK_SW_SCLK_MSB                      0
-#define SW_SCLK_SW_SCLK_LSB                      0
-#define SW_SCLK_SW_SCLK_MASK                     0x00000001
-#define SW_SCLK_SW_SCLK_GET(x)                   (((x) & SW_SCLK_SW_SCLK_MASK) >> SW_SCLK_SW_SCLK_LSB)
-#define SW_SCLK_SW_SCLK_SET(x)                   (((x) << SW_SCLK_SW_SCLK_LSB) & SW_SCLK_SW_SCLK_MASK)
-
-#define SW_CNTL_ADDRESS                          0x0000008c
-#define SW_CNTL_OFFSET                           0x0000008c
-#define SW_CNTL_SW_SCAPTURE_MSB                  2
-#define SW_CNTL_SW_SCAPTURE_LSB                  2
-#define SW_CNTL_SW_SCAPTURE_MASK                 0x00000004
-#define SW_CNTL_SW_SCAPTURE_GET(x)               (((x) & SW_CNTL_SW_SCAPTURE_MASK) >> SW_CNTL_SW_SCAPTURE_LSB)
-#define SW_CNTL_SW_SCAPTURE_SET(x)               (((x) << SW_CNTL_SW_SCAPTURE_LSB) & SW_CNTL_SW_SCAPTURE_MASK)
-#define SW_CNTL_SW_SUPDATE_MSB                   1
-#define SW_CNTL_SW_SUPDATE_LSB                   1
-#define SW_CNTL_SW_SUPDATE_MASK                  0x00000002
-#define SW_CNTL_SW_SUPDATE_GET(x)                (((x) & SW_CNTL_SW_SUPDATE_MASK) >> SW_CNTL_SW_SUPDATE_LSB)
-#define SW_CNTL_SW_SUPDATE_SET(x)                (((x) << SW_CNTL_SW_SUPDATE_LSB) & SW_CNTL_SW_SUPDATE_MASK)
-#define SW_CNTL_SW_SOUT_MSB                      0
-#define SW_CNTL_SW_SOUT_LSB                      0
-#define SW_CNTL_SW_SOUT_MASK                     0x00000001
-#define SW_CNTL_SW_SOUT_GET(x)                   (((x) & SW_CNTL_SW_SOUT_MASK) >> SW_CNTL_SW_SOUT_LSB)
-#define SW_CNTL_SW_SOUT_SET(x)                   (((x) << SW_CNTL_SW_SOUT_LSB) & SW_CNTL_SW_SOUT_MASK)
-
-
-#ifndef __ASSEMBLER__
-
-typedef struct analog_intf_reg_reg_s {
-  unsigned char pad0[128]; /* pad to 0x80 */
-  volatile unsigned int sw_override;
-  volatile unsigned int sin_val;
-  volatile unsigned int sw_sclk;
-  volatile unsigned int sw_cntl;
-} analog_intf_reg_reg_t;
-
-#endif /* __ASSEMBLER__ */
-
-#endif /* _ANALOG_INTF_REG_H_ */
drivers/staging/ath6kl/include/common/AR6002/hw.0/analog_reg.h deleted +0 -1932

1,932 lines not on this page · raw message

drivers/staging/ath6kl/include/common/AR6002/hw.0/apb_map.h deleted +0 -13
deleted file mode 100644
index f3bf6d6..0000000
@@ -1,13 +0,0 @@
-#ifndef _APB_MAP_H_
-#define _APB_MAP_H_
-
-#define RTC_BASE_ADDRESS                         0x00004000
-#define VMC_BASE_ADDRESS                         0x00008000
-#define UART_BASE_ADDRESS                        0x0000c000
-#define SI_BASE_ADDRESS                          0x00010000
-#define GPIO_BASE_ADDRESS                        0x00014000
-#define MBOX_BASE_ADDRESS                        0x00018000
-#define ANALOG_INTF_BASE_ADDRESS                 0x0001c000
-#define MAC_BASE_ADDRESS                         0x00020000
-
-#endif /* _APB_MAP_REG_H_ */
drivers/staging/ath6kl/include/common/AR6002/hw.0/gpio_reg.h deleted +0 -977

977 lines not on this page · raw message

drivers/staging/ath6kl/include/common/AR6002/hw.0/mbox_host_reg.h deleted +0 -386

14 lines not on this page · raw message

drivers/staging/ath6kl/include/common/AR6002/hw.0/mbox_reg.h deleted +0 -481

481 lines not on this page · raw message

drivers/staging/ath6kl/include/common/AR6002/hw.0/rtc_reg.h deleted +0 -1163

1,163 lines not on this page · raw message

drivers/staging/ath6kl/include/common/AR6002/hw.0/si_reg.h deleted +0 -186

186 lines not on this page · raw message

drivers/staging/ath6kl/include/common/AR6002/hw.0/uart_reg.h deleted +0 -327

327 lines not on this page · raw message

drivers/staging/ath6kl/include/common/AR6002/hw.0/vmc_reg.h deleted +0 -76

76 lines not on this page · raw message

drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw deleted +0 -1
deleted file mode 120000
index 8fae5c6..0000000

Lines of this file are not shown. View the raw message.

drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/analog_intf_reg.h new file +64 -0

64 lines not on this page · raw message

drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/analog_reg.h new file +1932 -0

1,932 lines not on this page · raw message

drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/apb_map.h new file +13 -0
new file mode 100644
index 0000000..f3bf6d6

Lines of this file are not shown. View the raw message.

drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/gpio_reg.h new file +977 -0

977 lines not on this page · raw message

drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/mbox_host_reg.h new file +386 -0

386 lines not on this page · raw message

drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/mbox_reg.h new file +481 -0

481 lines not on this page · raw message

drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/rtc_reg.h new file +1163 -0

1,163 lines not on this page · raw message

drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/si_reg.h new file +186 -0

186 lines not on this page · raw message

drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/uart_reg.h new file +327 -0

327 lines not on this page · raw message

drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/vmc_reg.h new file +76 -0

76 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.6.3.3

Part of the diff is not shown here. View the raw message.

#1 lore raw
Quoted 1 line · Vipin Mehta

What's with the long Subject: ?

Anyway, this patch fails to apply, it seems you want to just delete the symlink, which you might need to tell git that you want to generate a patch that does this. For how you do that, I don't really know, sorry.

If you want, just send a patch that does the proper thing for the existing files to get everything to build correctly, and then tell me to remove the symlink by hand, which I can do. That might be the easiest thing to do here.

thanks,

greg k-h

#2 lore raw
Quoted 12 lines

-----Original Message-----
From: Greg KH [mailto:[email protected]]
Sent: Wednesday, September 08, 2010 2:06 AM
To: Vipin Mehta
Cc: [email protected]; [email protected]
Subject: Re: [PATCH] staging: ath6kl: Replacing the symbolic link to the hw.0 directory with a new directory 'hw' while retaining the contents. This will help with the cases where the driver fails to compile if the link was not setup properly.

Quoted 4 lines
Quoted 1 line · Vipin Mehta

What's with the long Subject: ?

Sorry. Still getting used to git.

Quoted 9 lines

Anyway, this patch fails to apply, it seems you want to just delete the symlink, which you might need to tell git that you want to generate a patch that does this. For how you do that, I don't really know, sorry.

If you want, just send a patch that does the proper thing for the existing files to get everything to build correctly, and then tell me to remove the symlink by hand, which I can do. That might be the easiest thing to do here.

I have sent you another patch that I generated using the option '-M'. the option allows git-format-patch to detect renames which is what I intended to do. The patch is much smaller and readable. Hopefully, it will apply this time. BTW, I usually test the patches before I send out. Not sure why the earlier one did not work as it works for me.

Quoted 4 lines

thanks,

greg k-h