Imre Kaloz
parent
aa5ff82553
commit
ea7aac7983
|
|
@ -0,0 +1,654 @@
|
|||
---
|
||||
drivers/rtc/rtc-isl1208.c | 357 +++++++++++++++++++++-------------------------
|
||||
1 file changed, 170 insertions(+), 187 deletions(-)
|
||||
|
||||
Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c
|
||||
===================================================================
|
||||
--- linux-2.6.25-rc6-armeb.orig/drivers/rtc/rtc-isl1208.c 2008-03-20 10:26:41.000000000 +1030
|
||||
+++ linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c 2008-03-20 10:26:53.000000000 +1030
|
||||
@@ -15,16 +15,15 @@
|
||||
#include <linux/bcd.h>
|
||||
#include <linux/rtc.h>
|
||||
|
||||
-#define DRV_NAME "isl1208"
|
||||
-#define DRV_VERSION "0.2"
|
||||
+#define DRV_VERSION "0.3"
|
||||
|
||||
/* Register map */
|
||||
/* rtc section */
|
||||
#define ISL1208_REG_SC 0x00
|
||||
#define ISL1208_REG_MN 0x01
|
||||
#define ISL1208_REG_HR 0x02
|
||||
-#define ISL1208_REG_HR_MIL (1<<7) /* 24h/12h mode */
|
||||
-#define ISL1208_REG_HR_PM (1<<5) /* PM/AM bit in 12h mode */
|
||||
+#define ISL1208_REG_HR_MIL (1<<7) /* 24h/12h mode */
|
||||
+#define ISL1208_REG_HR_PM (1<<5) /* PM/AM bit in 12h mode */
|
||||
#define ISL1208_REG_DT 0x03
|
||||
#define ISL1208_REG_MO 0x04
|
||||
#define ISL1208_REG_YR 0x05
|
||||
@@ -33,14 +32,14 @@
|
||||
|
||||
/* control/status section */
|
||||
#define ISL1208_REG_SR 0x07
|
||||
-#define ISL1208_REG_SR_ARST (1<<7) /* auto reset */
|
||||
-#define ISL1208_REG_SR_XTOSCB (1<<6) /* crystal oscillator */
|
||||
-#define ISL1208_REG_SR_WRTC (1<<4) /* write rtc */
|
||||
-#define ISL1208_REG_SR_ALM (1<<2) /* alarm */
|
||||
-#define ISL1208_REG_SR_BAT (1<<1) /* battery */
|
||||
-#define ISL1208_REG_SR_RTCF (1<<0) /* rtc fail */
|
||||
+#define ISL1208_REG_SR_ARST (1<<7) /* auto reset */
|
||||
+#define ISL1208_REG_SR_XTOSCB (1<<6) /* crystal oscillator */
|
||||
+#define ISL1208_REG_SR_WRTC (1<<4) /* write rtc */
|
||||
+#define ISL1208_REG_SR_ALM (1<<2) /* alarm */
|
||||
+#define ISL1208_REG_SR_BAT (1<<1) /* battery */
|
||||
+#define ISL1208_REG_SR_RTCF (1<<0) /* rtc fail */
|
||||
#define ISL1208_REG_INT 0x08
|
||||
-#define ISL1208_REG_09 0x09 /* reserved */
|
||||
+#define ISL1208_REG_09 0x09 /* reserved */
|
||||
#define ISL1208_REG_ATR 0x0a
|
||||
#define ISL1208_REG_DTR 0x0b
|
||||
|
||||
@@ -58,39 +57,21 @@
|
||||
#define ISL1208_REG_USR2 0x13
|
||||
#define ISL1208_USR_SECTION_LEN 2
|
||||
|
||||
-/* i2c configuration */
|
||||
-#define ISL1208_I2C_ADDR 0xde
|
||||
-
|
||||
-static const unsigned short normal_i2c[] = {
|
||||
- ISL1208_I2C_ADDR>>1, I2C_CLIENT_END
|
||||
-};
|
||||
-I2C_CLIENT_INSMOD; /* defines addr_data */
|
||||
-
|
||||
-static int isl1208_attach_adapter(struct i2c_adapter *adapter);
|
||||
-static int isl1208_detach_client(struct i2c_client *client);
|
||||
-
|
||||
-static struct i2c_driver isl1208_driver = {
|
||||
- .driver = {
|
||||
- .name = DRV_NAME,
|
||||
- },
|
||||
- .id = I2C_DRIVERID_ISL1208,
|
||||
- .attach_adapter = &isl1208_attach_adapter,
|
||||
- .detach_client = &isl1208_detach_client,
|
||||
-};
|
||||
+static struct i2c_driver isl1208_driver;
|
||||
|
||||
/* block read */
|
||||
static int
|
||||
isl1208_i2c_read_regs(struct i2c_client *client, u8 reg, u8 buf[],
|
||||
- unsigned len)
|
||||
+ unsigned len)
|
||||
{
|
||||
u8 reg_addr[1] = { reg };
|
||||
struct i2c_msg msgs[2] = {
|
||||
- { client->addr, client->flags, sizeof(reg_addr), reg_addr },
|
||||
- { client->addr, client->flags | I2C_M_RD, len, buf }
|
||||
+ {client->addr, client->flags, sizeof(reg_addr), reg_addr}
|
||||
+ ,
|
||||
+ {client->addr, client->flags | I2C_M_RD, len, buf}
|
||||
};
|
||||
int ret;
|
||||
|
||||
- BUG_ON(len == 0);
|
||||
BUG_ON(reg > ISL1208_REG_USR2);
|
||||
BUG_ON(reg + len > ISL1208_REG_USR2 + 1);
|
||||
|
||||
@@ -103,15 +84,14 @@
|
||||
/* block write */
|
||||
static int
|
||||
isl1208_i2c_set_regs(struct i2c_client *client, u8 reg, u8 const buf[],
|
||||
- unsigned len)
|
||||
+ unsigned len)
|
||||
{
|
||||
u8 i2c_buf[ISL1208_REG_USR2 + 2];
|
||||
struct i2c_msg msgs[1] = {
|
||||
- { client->addr, client->flags, len + 1, i2c_buf }
|
||||
+ {client->addr, client->flags, len + 1, i2c_buf}
|
||||
};
|
||||
int ret;
|
||||
|
||||
- BUG_ON(len == 0);
|
||||
BUG_ON(reg > ISL1208_REG_USR2);
|
||||
BUG_ON(reg + len > ISL1208_REG_USR2 + 1);
|
||||
|
||||
@@ -125,7 +105,8 @@
|
||||
}
|
||||
|
||||
/* simple check to see wether we have a isl1208 */
|
||||
-static int isl1208_i2c_validate_client(struct i2c_client *client)
|
||||
+static int
|
||||
+isl1208_i2c_validate_client(struct i2c_client *client)
|
||||
{
|
||||
u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, };
|
||||
u8 zero_mask[ISL1208_RTC_SECTION_LEN] = {
|
||||
@@ -139,24 +120,29 @@
|
||||
return ret;
|
||||
|
||||
for (i = 0; i < ISL1208_RTC_SECTION_LEN; ++i) {
|
||||
- if (regs[i] & zero_mask[i]) /* check if bits are cleared */
|
||||
+ if (regs[i] & zero_mask[i]) /* check if bits are cleared */
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
-static int isl1208_i2c_get_sr(struct i2c_client *client)
|
||||
+static int
|
||||
+isl1208_i2c_get_sr(struct i2c_client *client)
|
||||
{
|
||||
- return i2c_smbus_read_byte_data(client, ISL1208_REG_SR) == -1 ? -EIO:0;
|
||||
+ int sr = i2c_smbus_read_byte_data(client, ISL1208_REG_SR);
|
||||
+ if (sr < 0)
|
||||
+ return -EIO;
|
||||
+
|
||||
+ return sr;
|
||||
}
|
||||
|
||||
-static int isl1208_i2c_get_atr(struct i2c_client *client)
|
||||
+static int
|
||||
+isl1208_i2c_get_atr(struct i2c_client *client)
|
||||
{
|
||||
int atr = i2c_smbus_read_byte_data(client, ISL1208_REG_ATR);
|
||||
-
|
||||
if (atr < 0)
|
||||
- return -EIO;
|
||||
+ return atr;
|
||||
|
||||
/* The 6bit value in the ATR register controls the load
|
||||
* capacitance C_load * in steps of 0.25pF
|
||||
@@ -169,51 +155,54 @@
|
||||
*
|
||||
*/
|
||||
|
||||
- atr &= 0x3f; /* mask out lsb */
|
||||
- atr ^= 1<<5; /* invert 6th bit */
|
||||
- atr += 2*9; /* add offset of 4.5pF; unit[atr] = 0.25pF */
|
||||
+ atr &= 0x3f; /* mask out lsb */
|
||||
+ atr ^= 1 << 5; /* invert 6th bit */
|
||||
+ atr += 2 * 9; /* add offset of 4.5pF; unit[atr] = 0.25pF */
|
||||
|
||||
return atr;
|
||||
}
|
||||
|
||||
-static int isl1208_i2c_get_dtr(struct i2c_client *client)
|
||||
+static int
|
||||
+isl1208_i2c_get_dtr(struct i2c_client *client)
|
||||
{
|
||||
int dtr = i2c_smbus_read_byte_data(client, ISL1208_REG_DTR);
|
||||
-
|
||||
if (dtr < 0)
|
||||
return -EIO;
|
||||
|
||||
/* dtr encodes adjustments of {-60,-40,-20,0,20,40,60} ppm */
|
||||
- dtr = ((dtr & 0x3) * 20) * (dtr & (1<<2) ? -1 : 1);
|
||||
+ dtr = ((dtr & 0x3) * 20) * (dtr & (1 << 2) ? -1 : 1);
|
||||
|
||||
return dtr;
|
||||
}
|
||||
|
||||
-static int isl1208_i2c_get_usr(struct i2c_client *client)
|
||||
+static int
|
||||
+isl1208_i2c_get_usr(struct i2c_client *client)
|
||||
{
|
||||
u8 buf[ISL1208_USR_SECTION_LEN] = { 0, };
|
||||
int ret;
|
||||
|
||||
- ret = isl1208_i2c_read_regs (client, ISL1208_REG_USR1, buf,
|
||||
- ISL1208_USR_SECTION_LEN);
|
||||
+ ret = isl1208_i2c_read_regs(client, ISL1208_REG_USR1, buf,
|
||||
+ ISL1208_USR_SECTION_LEN);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
return (buf[1] << 8) | buf[0];
|
||||
}
|
||||
|
||||
-static int isl1208_i2c_set_usr(struct i2c_client *client, u16 usr)
|
||||
+static int
|
||||
+isl1208_i2c_set_usr(struct i2c_client *client, u16 usr)
|
||||
{
|
||||
u8 buf[ISL1208_USR_SECTION_LEN];
|
||||
|
||||
buf[0] = usr & 0xff;
|
||||
buf[1] = (usr >> 8) & 0xff;
|
||||
|
||||
- return isl1208_i2c_set_regs (client, ISL1208_REG_USR1, buf,
|
||||
- ISL1208_USR_SECTION_LEN);
|
||||
+ return isl1208_i2c_set_regs(client, ISL1208_REG_USR1, buf,
|
||||
+ ISL1208_USR_SECTION_LEN);
|
||||
}
|
||||
|
||||
-static int isl1208_rtc_proc(struct device *dev, struct seq_file *seq)
|
||||
+static int
|
||||
+isl1208_rtc_proc(struct device *dev, struct seq_file *seq)
|
||||
{
|
||||
struct i2c_client *const client = to_i2c_client(dev);
|
||||
int sr, dtr, atr, usr;
|
||||
@@ -230,20 +219,19 @@
|
||||
(sr & ISL1208_REG_SR_ALM) ? " ALM" : "",
|
||||
(sr & ISL1208_REG_SR_WRTC) ? " WRTC" : "",
|
||||
(sr & ISL1208_REG_SR_XTOSCB) ? " XTOSCB" : "",
|
||||
- (sr & ISL1208_REG_SR_ARST) ? " ARST" : "",
|
||||
- sr);
|
||||
+ (sr & ISL1208_REG_SR_ARST) ? " ARST" : "", sr);
|
||||
|
||||
seq_printf(seq, "batt_status\t: %s\n",
|
||||
(sr & ISL1208_REG_SR_RTCF) ? "bad" : "okay");
|
||||
|
||||
dtr = isl1208_i2c_get_dtr(client);
|
||||
- if (dtr >= 0 -1)
|
||||
+ if (dtr >= 0 - 1)
|
||||
seq_printf(seq, "digital_trim\t: %d ppm\n", dtr);
|
||||
|
||||
atr = isl1208_i2c_get_atr(client);
|
||||
if (atr >= 0)
|
||||
seq_printf(seq, "analog_trim\t: %d.%.2d pF\n",
|
||||
- atr>>2, (atr&0x3)*25);
|
||||
+ atr >> 2, (atr & 0x3) * 25);
|
||||
|
||||
usr = isl1208_i2c_get_usr(client);
|
||||
if (usr >= 0)
|
||||
@@ -252,9 +240,8 @@
|
||||
return 0;
|
||||
}
|
||||
|
||||
-
|
||||
-static int isl1208_i2c_read_time(struct i2c_client *client,
|
||||
- struct rtc_time *tm)
|
||||
+static int
|
||||
+isl1208_i2c_read_time(struct i2c_client *client, struct rtc_time *tm)
|
||||
{
|
||||
int sr;
|
||||
u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, };
|
||||
@@ -274,27 +261,30 @@
|
||||
|
||||
tm->tm_sec = BCD2BIN(regs[ISL1208_REG_SC]);
|
||||
tm->tm_min = BCD2BIN(regs[ISL1208_REG_MN]);
|
||||
- { /* HR field has a more complex interpretation */
|
||||
+
|
||||
+ /* HR field has a more complex interpretation */
|
||||
+ {
|
||||
const u8 _hr = regs[ISL1208_REG_HR];
|
||||
- if (_hr & ISL1208_REG_HR_MIL) /* 24h format */
|
||||
+ if (_hr & ISL1208_REG_HR_MIL) /* 24h format */
|
||||
tm->tm_hour = BCD2BIN(_hr & 0x3f);
|
||||
- else { // 12h format
|
||||
+ else {
|
||||
+ /* 12h format */
|
||||
tm->tm_hour = BCD2BIN(_hr & 0x1f);
|
||||
- if (_hr & ISL1208_REG_HR_PM) /* PM flag set */
|
||||
+ if (_hr & ISL1208_REG_HR_PM) /* PM flag set */
|
||||
tm->tm_hour += 12;
|
||||
}
|
||||
}
|
||||
|
||||
tm->tm_mday = BCD2BIN(regs[ISL1208_REG_DT]);
|
||||
- tm->tm_mon = BCD2BIN(regs[ISL1208_REG_MO]) - 1; /* rtc starts at 1 */
|
||||
+ tm->tm_mon = BCD2BIN(regs[ISL1208_REG_MO]) - 1; /* rtc starts at 1 */
|
||||
tm->tm_year = BCD2BIN(regs[ISL1208_REG_YR]) + 100;
|
||||
tm->tm_wday = BCD2BIN(regs[ISL1208_REG_DW]);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
-static int isl1208_i2c_read_alarm(struct i2c_client *client,
|
||||
- struct rtc_wkalrm *alarm)
|
||||
+static int
|
||||
+isl1208_i2c_read_alarm(struct i2c_client *client, struct rtc_wkalrm *alarm)
|
||||
{
|
||||
struct rtc_time *const tm = &alarm->time;
|
||||
u8 regs[ISL1208_ALARM_SECTION_LEN] = { 0, };
|
||||
@@ -307,7 +297,7 @@
|
||||
}
|
||||
|
||||
sr = isl1208_i2c_read_regs(client, ISL1208_REG_SCA, regs,
|
||||
- ISL1208_ALARM_SECTION_LEN);
|
||||
+ ISL1208_ALARM_SECTION_LEN);
|
||||
if (sr < 0) {
|
||||
dev_err(&client->dev, "%s: reading alarm section failed\n",
|
||||
__func__);
|
||||
@@ -315,23 +305,25 @@
|
||||
}
|
||||
|
||||
/* MSB of each alarm register is an enable bit */
|
||||
- tm->tm_sec = BCD2BIN(regs[ISL1208_REG_SCA-ISL1208_REG_SCA] & 0x7f);
|
||||
- tm->tm_min = BCD2BIN(regs[ISL1208_REG_MNA-ISL1208_REG_SCA] & 0x7f);
|
||||
- tm->tm_hour = BCD2BIN(regs[ISL1208_REG_HRA-ISL1208_REG_SCA] & 0x3f);
|
||||
- tm->tm_mday = BCD2BIN(regs[ISL1208_REG_DTA-ISL1208_REG_SCA] & 0x3f);
|
||||
- tm->tm_mon = BCD2BIN(regs[ISL1208_REG_MOA-ISL1208_REG_SCA] & 0x1f)-1;
|
||||
- tm->tm_wday = BCD2BIN(regs[ISL1208_REG_DWA-ISL1208_REG_SCA] & 0x03);
|
||||
+ tm->tm_sec = BCD2BIN(regs[ISL1208_REG_SCA - ISL1208_REG_SCA] & 0x7f);
|
||||
+ tm->tm_min = BCD2BIN(regs[ISL1208_REG_MNA - ISL1208_REG_SCA] & 0x7f);
|
||||
+ tm->tm_hour = BCD2BIN(regs[ISL1208_REG_HRA - ISL1208_REG_SCA] & 0x3f);
|
||||
+ tm->tm_mday = BCD2BIN(regs[ISL1208_REG_DTA - ISL1208_REG_SCA] & 0x3f);
|
||||
+ tm->tm_mon =
|
||||
+ BCD2BIN(regs[ISL1208_REG_MOA - ISL1208_REG_SCA] & 0x1f) - 1;
|
||||
+ tm->tm_wday = BCD2BIN(regs[ISL1208_REG_DWA - ISL1208_REG_SCA] & 0x03);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
-static int isl1208_rtc_read_time(struct device *dev, struct rtc_time *tm)
|
||||
+static int
|
||||
+isl1208_rtc_read_time(struct device *dev, struct rtc_time *tm)
|
||||
{
|
||||
return isl1208_i2c_read_time(to_i2c_client(dev), tm);
|
||||
}
|
||||
|
||||
-static int isl1208_i2c_set_time(struct i2c_client *client,
|
||||
- struct rtc_time const *tm)
|
||||
+static int
|
||||
+isl1208_i2c_set_time(struct i2c_client *client, struct rtc_time const *tm)
|
||||
{
|
||||
int sr;
|
||||
u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, };
|
||||
@@ -353,7 +345,7 @@
|
||||
}
|
||||
|
||||
/* set WRTC */
|
||||
- sr = i2c_smbus_write_byte_data (client, ISL1208_REG_SR,
|
||||
+ sr = i2c_smbus_write_byte_data(client, ISL1208_REG_SR,
|
||||
sr | ISL1208_REG_SR_WRTC);
|
||||
if (sr < 0) {
|
||||
dev_err(&client->dev, "%s: writing SR failed\n", __func__);
|
||||
@@ -369,7 +361,7 @@
|
||||
}
|
||||
|
||||
/* clear WRTC again */
|
||||
- sr = i2c_smbus_write_byte_data (client, ISL1208_REG_SR,
|
||||
+ sr = i2c_smbus_write_byte_data(client, ISL1208_REG_SR,
|
||||
sr & ~ISL1208_REG_SR_WRTC);
|
||||
if (sr < 0) {
|
||||
dev_err(&client->dev, "%s: writing SR failed\n", __func__);
|
||||
@@ -380,70 +372,69 @@
|
||||
}
|
||||
|
||||
|
||||
-static int isl1208_rtc_set_time(struct device *dev, struct rtc_time *tm)
|
||||
+static int
|
||||
+isl1208_rtc_set_time(struct device *dev, struct rtc_time *tm)
|
||||
{
|
||||
return isl1208_i2c_set_time(to_i2c_client(dev), tm);
|
||||
}
|
||||
|
||||
-static int isl1208_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
|
||||
+static int
|
||||
+isl1208_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
|
||||
{
|
||||
return isl1208_i2c_read_alarm(to_i2c_client(dev), alarm);
|
||||
}
|
||||
|
||||
static const struct rtc_class_ops isl1208_rtc_ops = {
|
||||
- .proc = isl1208_rtc_proc,
|
||||
- .read_time = isl1208_rtc_read_time,
|
||||
- .set_time = isl1208_rtc_set_time,
|
||||
- .read_alarm = isl1208_rtc_read_alarm,
|
||||
- //.set_alarm = isl1208_rtc_set_alarm,
|
||||
+ .proc = isl1208_rtc_proc,
|
||||
+ .read_time = isl1208_rtc_read_time,
|
||||
+ .set_time = isl1208_rtc_set_time,
|
||||
+ .read_alarm = isl1208_rtc_read_alarm,
|
||||
+ /*.set_alarm = isl1208_rtc_set_alarm, */
|
||||
};
|
||||
|
||||
/* sysfs interface */
|
||||
|
||||
-static ssize_t isl1208_sysfs_show_atrim(struct device *dev,
|
||||
- struct device_attribute *attr,
|
||||
- char *buf)
|
||||
+static ssize_t
|
||||
+isl1208_sysfs_show_atrim(struct device *dev,
|
||||
+ struct device_attribute *attr, char *buf)
|
||||
{
|
||||
- int atr;
|
||||
-
|
||||
- atr = isl1208_i2c_get_atr(to_i2c_client(dev));
|
||||
+ int atr = isl1208_i2c_get_atr(to_i2c_client(dev));
|
||||
if (atr < 0)
|
||||
return atr;
|
||||
|
||||
- return sprintf(buf, "%d.%.2d pF\n", atr>>2, (atr&0x3)*25);
|
||||
+ return sprintf(buf, "%d.%.2d pF\n", atr >> 2, (atr & 0x3) * 25);
|
||||
}
|
||||
+
|
||||
static DEVICE_ATTR(atrim, S_IRUGO, isl1208_sysfs_show_atrim, NULL);
|
||||
|
||||
-static ssize_t isl1208_sysfs_show_dtrim(struct device *dev,
|
||||
- struct device_attribute *attr,
|
||||
- char *buf)
|
||||
+static ssize_t
|
||||
+isl1208_sysfs_show_dtrim(struct device *dev,
|
||||
+ struct device_attribute *attr, char *buf)
|
||||
{
|
||||
- int dtr;
|
||||
-
|
||||
- dtr = isl1208_i2c_get_dtr(to_i2c_client(dev));
|
||||
+ int dtr = isl1208_i2c_get_dtr(to_i2c_client(dev));
|
||||
if (dtr < 0)
|
||||
return dtr;
|
||||
|
||||
return sprintf(buf, "%d ppm\n", dtr);
|
||||
}
|
||||
+
|
||||
static DEVICE_ATTR(dtrim, S_IRUGO, isl1208_sysfs_show_dtrim, NULL);
|
||||
|
||||
-static ssize_t isl1208_sysfs_show_usr(struct device *dev,
|
||||
- struct device_attribute *attr,
|
||||
- char *buf)
|
||||
+static ssize_t
|
||||
+isl1208_sysfs_show_usr(struct device *dev,
|
||||
+ struct device_attribute *attr, char *buf)
|
||||
{
|
||||
- int usr;
|
||||
-
|
||||
- usr = isl1208_i2c_get_usr(to_i2c_client(dev));
|
||||
+ int usr = isl1208_i2c_get_usr(to_i2c_client(dev));
|
||||
if (usr < 0)
|
||||
return usr;
|
||||
|
||||
return sprintf(buf, "0x%.4x\n", usr);
|
||||
}
|
||||
|
||||
-static ssize_t isl1208_sysfs_store_usr(struct device *dev,
|
||||
- struct device_attribute *attr,
|
||||
- const char *buf, size_t count)
|
||||
+static ssize_t
|
||||
+isl1208_sysfs_store_usr(struct device *dev,
|
||||
+ struct device_attribute *attr,
|
||||
+ const char *buf, size_t count)
|
||||
{
|
||||
int usr = -1;
|
||||
|
||||
@@ -460,124 +451,116 @@
|
||||
|
||||
return isl1208_i2c_set_usr(to_i2c_client(dev), usr) ? -EIO : count;
|
||||
}
|
||||
+
|
||||
static DEVICE_ATTR(usr, S_IRUGO | S_IWUSR, isl1208_sysfs_show_usr,
|
||||
isl1208_sysfs_store_usr);
|
||||
|
||||
static int
|
||||
-isl1208_probe(struct i2c_adapter *adapter, int addr, int kind)
|
||||
+isl1208_sysfs_register(struct device *dev)
|
||||
{
|
||||
- int rc = 0;
|
||||
- struct i2c_client *new_client = NULL;
|
||||
- struct rtc_device *rtc = NULL;
|
||||
+ int err;
|
||||
+
|
||||
+ err = device_create_file(dev, &dev_attr_atrim);
|
||||
+ if (err)
|
||||
+ return err;
|
||||
|
||||
- if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
|
||||
- rc = -ENODEV;
|
||||
- goto failout;
|
||||
+ err = device_create_file(dev, &dev_attr_dtrim);
|
||||
+ if (err) {
|
||||
+ device_remove_file(dev, &dev_attr_atrim);
|
||||
+ return err;
|
||||
}
|
||||
|
||||
- new_client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
|
||||
- if (new_client == NULL) {
|
||||
- rc = -ENOMEM;
|
||||
- goto failout;
|
||||
+ err = device_create_file(dev, &dev_attr_usr);
|
||||
+ if (err) {
|
||||
+ device_remove_file(dev, &dev_attr_atrim);
|
||||
+ device_remove_file(dev, &dev_attr_dtrim);
|
||||
}
|
||||
|
||||
- new_client->addr = addr;
|
||||
- new_client->adapter = adapter;
|
||||
- new_client->driver = &isl1208_driver;
|
||||
- new_client->flags = 0;
|
||||
- strcpy(new_client->name, DRV_NAME);
|
||||
+ return 0;
|
||||
+}
|
||||
|
||||
- if (kind < 0) {
|
||||
- rc = isl1208_i2c_validate_client(new_client);
|
||||
- if (rc < 0)
|
||||
- goto failout;
|
||||
- }
|
||||
+static int
|
||||
+isl1208_sysfs_unregister(struct device *dev)
|
||||
+{
|
||||
+ device_remove_file(dev, &dev_attr_atrim);
|
||||
+ device_remove_file(dev, &dev_attr_atrim);
|
||||
+ device_remove_file(dev, &dev_attr_usr);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int
|
||||
+isl1208_probe(struct i2c_client *client)
|
||||
+{
|
||||
+ int rc = 0;
|
||||
+ struct rtc_device *rtc;
|
||||
|
||||
- rc = i2c_attach_client(new_client);
|
||||
- if (rc < 0)
|
||||
- goto failout;
|
||||
+ if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C))
|
||||
+ return -ENODEV;
|
||||
|
||||
- dev_info(&new_client->dev,
|
||||
+ if (isl1208_i2c_validate_client(client) < 0)
|
||||
+ return -ENODEV;
|
||||
+
|
||||
+ dev_info(&client->dev,
|
||||
"chip found, driver version " DRV_VERSION "\n");
|
||||
|
||||
rtc = rtc_device_register(isl1208_driver.driver.name,
|
||||
- &new_client->dev,
|
||||
- &isl1208_rtc_ops, THIS_MODULE);
|
||||
-
|
||||
- if (IS_ERR(rtc)) {
|
||||
- rc = PTR_ERR(rtc);
|
||||
- goto failout_detach;
|
||||
- }
|
||||
+ &client->dev, &isl1208_rtc_ops,
|
||||
+ THIS_MODULE);
|
||||
+ if (IS_ERR(rtc))
|
||||
+ return PTR_ERR(rtc);
|
||||
|
||||
- i2c_set_clientdata(new_client, rtc);
|
||||
+ i2c_set_clientdata(client, rtc);
|
||||
|
||||
- rc = isl1208_i2c_get_sr(new_client);
|
||||
+ rc = isl1208_i2c_get_sr(client);
|
||||
if (rc < 0) {
|
||||
- dev_err(&new_client->dev, "reading status failed\n");
|
||||
- goto failout_unregister;
|
||||
+ dev_err(&client->dev, "reading status failed\n");
|
||||
+ goto exit_unregister;
|
||||
}
|
||||
|
||||
if (rc & ISL1208_REG_SR_RTCF)
|
||||
- dev_warn(&new_client->dev, "rtc power failure detected, "
|
||||
+ dev_warn(&client->dev, "rtc power failure detected, "
|
||||
"please set clock.\n");
|
||||
|
||||
- rc = device_create_file(&new_client->dev, &dev_attr_atrim);
|
||||
- if (rc < 0)
|
||||
- goto failout_unregister;
|
||||
- rc = device_create_file(&new_client->dev, &dev_attr_dtrim);
|
||||
- if (rc < 0)
|
||||
- goto failout_atrim;
|
||||
- rc = device_create_file(&new_client->dev, &dev_attr_usr);
|
||||
- if (rc < 0)
|
||||
- goto failout_dtrim;
|
||||
+ rc = isl1208_sysfs_register(&client->dev);
|
||||
+ if (rc)
|
||||
+ goto exit_unregister;
|
||||
|
||||
return 0;
|
||||
|
||||
- failout_dtrim:
|
||||
- device_remove_file(&new_client->dev, &dev_attr_dtrim);
|
||||
- failout_atrim:
|
||||
- device_remove_file(&new_client->dev, &dev_attr_atrim);
|
||||
- failout_unregister:
|
||||
+ exit_unregister:
|
||||
rtc_device_unregister(rtc);
|
||||
- failout_detach:
|
||||
- i2c_detach_client(new_client);
|
||||
- failout:
|
||||
- kfree(new_client);
|
||||
- return rc;
|
||||
-}
|
||||
|
||||
-static int
|
||||
-isl1208_attach_adapter (struct i2c_adapter *adapter)
|
||||
-{
|
||||
- return i2c_probe(adapter, &addr_data, isl1208_probe);
|
||||
+ return rc;
|
||||
}
|
||||
|
||||
static int
|
||||
-isl1208_detach_client(struct i2c_client *client)
|
||||
+isl1208_remove(struct i2c_client *client)
|
||||
{
|
||||
- int rc;
|
||||
- struct rtc_device *const rtc = i2c_get_clientdata(client);
|
||||
-
|
||||
- if (rtc)
|
||||
- rtc_device_unregister(rtc); /* do we need to kfree? */
|
||||
-
|
||||
- rc = i2c_detach_client(client);
|
||||
- if (rc)
|
||||
- return rc;
|
||||
+ struct rtc_device *rtc = i2c_get_clientdata(client);
|
||||
|
||||
- kfree(client);
|
||||
+ isl1208_sysfs_unregister(&client->dev);
|
||||
+ rtc_device_unregister(rtc);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
-/* module management */
|
||||
+static struct i2c_driver isl1208_driver = {
|
||||
+ .driver = {
|
||||
+ .name = "rtc-isl1208",
|
||||
+ },
|
||||
+ .probe = isl1208_probe,
|
||||
+ .remove = isl1208_remove,
|
||||
+};
|
||||
|
||||
-static int __init isl1208_init(void)
|
||||
+static int __init
|
||||
+isl1208_init(void)
|
||||
{
|
||||
return i2c_add_driver(&isl1208_driver);
|
||||
}
|
||||
|
||||
-static void __exit isl1208_exit(void)
|
||||
+static void __exit
|
||||
+isl1208_exit(void)
|
||||
{
|
||||
i2c_del_driver(&isl1208_driver);
|
||||
}
|
||||
|
|
@ -0,0 +1,193 @@
|
|||
---
|
||||
drivers/rtc/rtc-pcf8563.c | 109 +++++++++++++---------------------------------
|
||||
1 file changed, 32 insertions(+), 77 deletions(-)
|
||||
|
||||
Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-pcf8563.c
|
||||
===================================================================
|
||||
--- linux-2.6.25-rc6-armeb.orig/drivers/rtc/rtc-pcf8563.c 2008-03-20 10:26:43.000000000 +1030
|
||||
+++ linux-2.6.25-rc6-armeb/drivers/rtc/rtc-pcf8563.c 2008-03-20 10:26:51.000000000 +1030
|
||||
@@ -18,17 +18,7 @@
|
||||
#include <linux/bcd.h>
|
||||
#include <linux/rtc.h>
|
||||
|
||||
-#define DRV_VERSION "0.4.2"
|
||||
-
|
||||
-/* Addresses to scan: none
|
||||
- * This chip cannot be reliably autodetected. An empty eeprom
|
||||
- * located at 0x51 will pass the validation routine due to
|
||||
- * the way the registers are implemented.
|
||||
- */
|
||||
-static const unsigned short normal_i2c[] = { I2C_CLIENT_END };
|
||||
-
|
||||
-/* Module parameters */
|
||||
-I2C_CLIENT_INSMOD;
|
||||
+#define DRV_VERSION "0.4.3"
|
||||
|
||||
#define PCF8563_REG_ST1 0x00 /* status */
|
||||
#define PCF8563_REG_ST2 0x01
|
||||
@@ -53,8 +43,10 @@
|
||||
#define PCF8563_SC_LV 0x80 /* low voltage */
|
||||
#define PCF8563_MO_C 0x80 /* century */
|
||||
|
||||
+static struct i2c_driver pcf8563_driver;
|
||||
+
|
||||
struct pcf8563 {
|
||||
- struct i2c_client client;
|
||||
+ struct rtc_device *rtc;
|
||||
/*
|
||||
* The meaning of MO_C bit varies by the chip type.
|
||||
* From PCF8563 datasheet: this bit is toggled when the years
|
||||
@@ -72,16 +64,13 @@
|
||||
int c_polarity; /* 0: MO_C=1 means 19xx, otherwise MO_C=1 means 20xx */
|
||||
};
|
||||
|
||||
-static int pcf8563_probe(struct i2c_adapter *adapter, int address, int kind);
|
||||
-static int pcf8563_detach(struct i2c_client *client);
|
||||
-
|
||||
/*
|
||||
* In the routines that deal directly with the pcf8563 hardware, we use
|
||||
* rtc_time -- month 0-11, hour 0-23, yr = calendar year-epoch.
|
||||
*/
|
||||
static int pcf8563_get_datetime(struct i2c_client *client, struct rtc_time *tm)
|
||||
{
|
||||
- struct pcf8563 *pcf8563 = container_of(client, struct pcf8563, client);
|
||||
+ struct pcf8563 *pcf8563 = i2c_get_clientdata(client);
|
||||
unsigned char buf[13] = { PCF8563_REG_ST1 };
|
||||
|
||||
struct i2c_msg msgs[] = {
|
||||
@@ -138,7 +127,7 @@
|
||||
|
||||
static int pcf8563_set_datetime(struct i2c_client *client, struct rtc_time *tm)
|
||||
{
|
||||
- struct pcf8563 *pcf8563 = container_of(client, struct pcf8563, client);
|
||||
+ struct pcf8563 *pcf8563 = i2c_get_clientdata(client);
|
||||
int i, err;
|
||||
unsigned char buf[9];
|
||||
|
||||
@@ -257,100 +246,66 @@
|
||||
.set_time = pcf8563_rtc_set_time,
|
||||
};
|
||||
|
||||
-static int pcf8563_attach(struct i2c_adapter *adapter)
|
||||
-{
|
||||
- return i2c_probe(adapter, &addr_data, pcf8563_probe);
|
||||
-}
|
||||
-
|
||||
-static struct i2c_driver pcf8563_driver = {
|
||||
- .driver = {
|
||||
- .name = "pcf8563",
|
||||
- },
|
||||
- .id = I2C_DRIVERID_PCF8563,
|
||||
- .attach_adapter = &pcf8563_attach,
|
||||
- .detach_client = &pcf8563_detach,
|
||||
-};
|
||||
-
|
||||
-static int pcf8563_probe(struct i2c_adapter *adapter, int address, int kind)
|
||||
+static int pcf8563_probe(struct i2c_client *client)
|
||||
{
|
||||
struct pcf8563 *pcf8563;
|
||||
- struct i2c_client *client;
|
||||
- struct rtc_device *rtc;
|
||||
|
||||
int err = 0;
|
||||
|
||||
- dev_dbg(&adapter->dev, "%s\n", __FUNCTION__);
|
||||
+ dev_dbg(&client->dev, "%s\n", __FUNCTION__);
|
||||
|
||||
- if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
|
||||
- err = -ENODEV;
|
||||
- goto exit;
|
||||
- }
|
||||
+ if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C))
|
||||
+ return -ENODEV;
|
||||
|
||||
- if (!(pcf8563 = kzalloc(sizeof(struct pcf8563), GFP_KERNEL))) {
|
||||
- err = -ENOMEM;
|
||||
- goto exit;
|
||||
- }
|
||||
-
|
||||
- client = &pcf8563->client;
|
||||
- client->addr = address;
|
||||
- client->driver = &pcf8563_driver;
|
||||
- client->adapter = adapter;
|
||||
-
|
||||
- strlcpy(client->name, pcf8563_driver.driver.name, I2C_NAME_SIZE);
|
||||
+ if (!(pcf8563 = kzalloc(sizeof(struct pcf8563), GFP_KERNEL)))
|
||||
+ return -ENOMEM;
|
||||
|
||||
/* Verify the chip is really an PCF8563 */
|
||||
- if (kind < 0) {
|
||||
- if (pcf8563_validate_client(client) < 0) {
|
||||
- err = -ENODEV;
|
||||
- goto exit_kfree;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- /* Inform the i2c layer */
|
||||
- if ((err = i2c_attach_client(client)))
|
||||
+ if (pcf8563_validate_client(client) < 0) {
|
||||
+ err = -ENODEV;
|
||||
goto exit_kfree;
|
||||
+ }
|
||||
|
||||
dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n");
|
||||
|
||||
- rtc = rtc_device_register(pcf8563_driver.driver.name, &client->dev,
|
||||
+ pcf8563->rtc = rtc_device_register(pcf8563_driver.driver.name, &client->dev,
|
||||
&pcf8563_rtc_ops, THIS_MODULE);
|
||||
|
||||
- if (IS_ERR(rtc)) {
|
||||
- err = PTR_ERR(rtc);
|
||||
- goto exit_detach;
|
||||
+ if (IS_ERR(pcf8563->rtc)) {
|
||||
+ err = PTR_ERR(pcf8563->rtc);
|
||||
+ goto exit_kfree;
|
||||
}
|
||||
|
||||
- i2c_set_clientdata(client, rtc);
|
||||
+ i2c_set_clientdata(client, pcf8563);
|
||||
|
||||
return 0;
|
||||
|
||||
-exit_detach:
|
||||
- i2c_detach_client(client);
|
||||
-
|
||||
exit_kfree:
|
||||
kfree(pcf8563);
|
||||
|
||||
-exit:
|
||||
return err;
|
||||
}
|
||||
|
||||
-static int pcf8563_detach(struct i2c_client *client)
|
||||
+static int pcf8563_remove(struct i2c_client *client)
|
||||
{
|
||||
- struct pcf8563 *pcf8563 = container_of(client, struct pcf8563, client);
|
||||
- int err;
|
||||
- struct rtc_device *rtc = i2c_get_clientdata(client);
|
||||
+ struct pcf8563 *pcf8563 = i2c_get_clientdata(client);
|
||||
|
||||
- if (rtc)
|
||||
- rtc_device_unregister(rtc);
|
||||
-
|
||||
- if ((err = i2c_detach_client(client)))
|
||||
- return err;
|
||||
+ if (pcf8563->rtc)
|
||||
+ rtc_device_unregister(pcf8563->rtc);
|
||||
|
||||
kfree(pcf8563);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static struct i2c_driver pcf8563_driver = {
|
||||
+ .driver = {
|
||||
+ .name = "rtc-pcf8563",
|
||||
+ },
|
||||
+ .probe = pcf8563_probe,
|
||||
+ .remove = pcf8563_remove,
|
||||
+};
|
||||
+
|
||||
static int __init pcf8563_init(void)
|
||||
{
|
||||
return i2c_add_driver(&pcf8563_driver);
|
||||
|
|
@ -0,0 +1,197 @@
|
|||
---
|
||||
drivers/rtc/rtc-x1205.c | 128 ++++++++++++++++--------------------------------
|
||||
1 file changed, 43 insertions(+), 85 deletions(-)
|
||||
|
||||
Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-x1205.c
|
||||
===================================================================
|
||||
--- linux-2.6.25-rc6-armeb.orig/drivers/rtc/rtc-x1205.c 2008-03-20 10:24:13.000000000 +1030
|
||||
+++ linux-2.6.25-rc6-armeb/drivers/rtc/rtc-x1205.c 2008-03-20 10:24:23.000000000 +1030
|
||||
@@ -22,20 +22,7 @@
|
||||
#include <linux/rtc.h>
|
||||
#include <linux/delay.h>
|
||||
|
||||
-#define DRV_VERSION "1.0.7"
|
||||
-
|
||||
-/* Addresses to scan: none. This chip is located at
|
||||
- * 0x6f and uses a two bytes register addressing.
|
||||
- * Two bytes need to be written to read a single register,
|
||||
- * while most other chips just require one and take the second
|
||||
- * one as the data to be written. To prevent corrupting
|
||||
- * unknown chips, the user must explicitly set the probe parameter.
|
||||
- */
|
||||
-
|
||||
-static const unsigned short normal_i2c[] = { I2C_CLIENT_END };
|
||||
-
|
||||
-/* Insmod parameters */
|
||||
-I2C_CLIENT_INSMOD;
|
||||
+#define DRV_VERSION "1.0.8"
|
||||
|
||||
/* offsets into CCR area */
|
||||
|
||||
@@ -91,19 +78,7 @@
|
||||
|
||||
#define X1205_HR_MIL 0x80 /* Set in ccr.hour for 24 hr mode */
|
||||
|
||||
-/* Prototypes */
|
||||
-static int x1205_attach(struct i2c_adapter *adapter);
|
||||
-static int x1205_detach(struct i2c_client *client);
|
||||
-static int x1205_probe(struct i2c_adapter *adapter, int address, int kind);
|
||||
-
|
||||
-static struct i2c_driver x1205_driver = {
|
||||
- .driver = {
|
||||
- .name = "x1205",
|
||||
- },
|
||||
- .id = I2C_DRIVERID_X1205,
|
||||
- .attach_adapter = &x1205_attach,
|
||||
- .detach_client = &x1205_detach,
|
||||
-};
|
||||
+static struct i2c_driver x1205_driver;
|
||||
|
||||
/*
|
||||
* In the routines that deal directly with the x1205 hardware, we use
|
||||
@@ -497,58 +472,51 @@
|
||||
}
|
||||
static DEVICE_ATTR(dtrim, S_IRUGO, x1205_sysfs_show_dtrim, NULL);
|
||||
|
||||
-static int x1205_attach(struct i2c_adapter *adapter)
|
||||
+static int x1205_sysfs_register(struct device *dev)
|
||||
+{
|
||||
+ int err;
|
||||
+
|
||||
+ err = device_create_file(dev, &dev_attr_atrim);
|
||||
+ if (err)
|
||||
+ return err;
|
||||
+
|
||||
+ err = device_create_file(dev, &dev_attr_dtrim);
|
||||
+ if (err)
|
||||
+ device_remove_file(dev, &dev_attr_atrim);
|
||||
+
|
||||
+ return err;
|
||||
+}
|
||||
+
|
||||
+static void x1205_sysfs_unregister(struct device *dev)
|
||||
{
|
||||
- return i2c_probe(adapter, &addr_data, x1205_probe);
|
||||
+ device_remove_file(dev, &dev_attr_atrim);
|
||||
+ device_remove_file(dev, &dev_attr_dtrim);
|
||||
}
|
||||
|
||||
-static int x1205_probe(struct i2c_adapter *adapter, int address, int kind)
|
||||
+
|
||||
+static int x1205_probe(struct i2c_client *client)
|
||||
{
|
||||
int err = 0;
|
||||
unsigned char sr;
|
||||
- struct i2c_client *client;
|
||||
struct rtc_device *rtc;
|
||||
|
||||
- dev_dbg(&adapter->dev, "%s\n", __FUNCTION__);
|
||||
+ dev_dbg(&client->dev, "%s\n", __FUNCTION__);
|
||||
|
||||
- if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
|
||||
- err = -ENODEV;
|
||||
- goto exit;
|
||||
+ if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
|
||||
+ return -ENODEV;
|
||||
}
|
||||
|
||||
- if (!(client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL))) {
|
||||
- err = -ENOMEM;
|
||||
- goto exit;
|
||||
+ if (x1205_validate_client(client) < 0) {
|
||||
+ return -ENODEV;
|
||||
}
|
||||
|
||||
- /* I2C client */
|
||||
- client->addr = address;
|
||||
- client->driver = &x1205_driver;
|
||||
- client->adapter = adapter;
|
||||
-
|
||||
- strlcpy(client->name, x1205_driver.driver.name, I2C_NAME_SIZE);
|
||||
-
|
||||
- /* Verify the chip is really an X1205 */
|
||||
- if (kind < 0) {
|
||||
- if (x1205_validate_client(client) < 0) {
|
||||
- err = -ENODEV;
|
||||
- goto exit_kfree;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- /* Inform the i2c layer */
|
||||
- if ((err = i2c_attach_client(client)))
|
||||
- goto exit_kfree;
|
||||
-
|
||||
dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n");
|
||||
|
||||
rtc = rtc_device_register(x1205_driver.driver.name, &client->dev,
|
||||
&x1205_rtc_ops, THIS_MODULE);
|
||||
|
||||
- if (IS_ERR(rtc)) {
|
||||
- err = PTR_ERR(rtc);
|
||||
- goto exit_detach;
|
||||
- }
|
||||
+ if (IS_ERR(rtc))
|
||||
+ return PTR_ERR(rtc);
|
||||
|
||||
i2c_set_clientdata(client, rtc);
|
||||
|
||||
@@ -565,45 +533,35 @@
|
||||
else
|
||||
dev_err(&client->dev, "couldn't read status\n");
|
||||
|
||||
- err = device_create_file(&client->dev, &dev_attr_atrim);
|
||||
- if (err) goto exit_devreg;
|
||||
- err = device_create_file(&client->dev, &dev_attr_dtrim);
|
||||
- if (err) goto exit_atrim;
|
||||
+ err = x1205_sysfs_register(&client->dev);
|
||||
+ if (err)
|
||||
+ goto exit_devreg;
|
||||
|
||||
return 0;
|
||||
|
||||
-exit_atrim:
|
||||
- device_remove_file(&client->dev, &dev_attr_atrim);
|
||||
-
|
||||
exit_devreg:
|
||||
rtc_device_unregister(rtc);
|
||||
|
||||
-exit_detach:
|
||||
- i2c_detach_client(client);
|
||||
-
|
||||
-exit_kfree:
|
||||
- kfree(client);
|
||||
-
|
||||
-exit:
|
||||
return err;
|
||||
}
|
||||
|
||||
-static int x1205_detach(struct i2c_client *client)
|
||||
+static int x1205_remove(struct i2c_client *client)
|
||||
{
|
||||
- int err;
|
||||
struct rtc_device *rtc = i2c_get_clientdata(client);
|
||||
|
||||
- if (rtc)
|
||||
- rtc_device_unregister(rtc);
|
||||
-
|
||||
- if ((err = i2c_detach_client(client)))
|
||||
- return err;
|
||||
-
|
||||
- kfree(client);
|
||||
-
|
||||
+ rtc_device_unregister(rtc);
|
||||
+ x1205_sysfs_unregister(&client->dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static struct i2c_driver x1205_driver = {
|
||||
+ .driver = {
|
||||
+ .name = "rtc-x1205",
|
||||
+ },
|
||||
+ .probe = x1205_probe,
|
||||
+ .remove = x1205_remove,
|
||||
+};
|
||||
+
|
||||
static int __init x1205_init(void)
|
||||
{
|
||||
return i2c_add_driver(&x1205_driver);
|
||||
|
|
@ -0,0 +1,581 @@
|
|||
From: Rod Whitby <rod@whitby.id.au>
|
||||
Subject: [PATCH] ixp4xx: Add support for the Freecom FSG-3 board (Patch #4874)
|
||||
|
||||
The Freecom-FSG3 is a small network-attached-storage device with the
|
||||
following feature set:
|
||||
|
||||
* Intel IXP422
|
||||
* 4MB Flash (ixp4xx flash driver)
|
||||
* 64MB RAM
|
||||
* 4 USB 2.0 host ports (ehci and ohci drivers)
|
||||
* 1 WAN (eth1) and 3 LAN (eth0) ethernet ports
|
||||
* Supported by the open source ixp4xx ethernet driver
|
||||
* Via VT6421 disk controller (libata and sata-via drivers)
|
||||
* Internal hard disk (PATA supported, SATA not yet supported)
|
||||
* External SATA port (not yet supported)
|
||||
* ISL1208 RTC chip
|
||||
* Winbond 83782 temp sensor and fan controller
|
||||
* MiniPCI slot
|
||||
|
||||
The ixp4xx_defconfig is also updated to support this device (the
|
||||
leds-fsg driver is to be submitted separately via the leds tree after
|
||||
this initial support is merged, as it depends on header gpio defines).
|
||||
|
||||
Signed-off-by: Rod Whitby <rod@whitby.id.au>
|
||||
|
||||
PATCH FOLLOWS
|
||||
KernelVersion: v2.6.25-rc6-74-g264e3e8
|
||||
---
|
||||
|
||||
Updated to correct all issues found by RMK.
|
||||
|
||||
The front power button calls ctrl_alt_del() and the rear reset button
|
||||
now calls machine_restart() directly.
|
||||
|
||||
arch/arm/configs/ixp4xx_defconfig | 9 +-
|
||||
arch/arm/mach-ixp4xx/Kconfig | 9 +
|
||||
arch/arm/mach-ixp4xx/Makefile | 2 +
|
||||
arch/arm/mach-ixp4xx/fsg-pci.c | 71 ++++++++
|
||||
arch/arm/mach-ixp4xx/fsg-setup.c | 276 ++++++++++++++++++++++++++++++++
|
||||
include/asm-arm/arch-ixp4xx/fsg.h | 50 ++++++
|
||||
include/asm-arm/arch-ixp4xx/hardware.h | 1 +
|
||||
include/asm-arm/arch-ixp4xx/irqs.h | 7 +
|
||||
8 files changed, 421 insertions(+), 4 deletions(-)
|
||||
create mode 100644 arch/arm/mach-ixp4xx/fsg-pci.c
|
||||
create mode 100644 arch/arm/mach-ixp4xx/fsg-setup.c
|
||||
create mode 100644 include/asm-arm/arch-ixp4xx/fsg.h
|
||||
|
||||
diff --git a/arch/arm/configs/ixp4xx_defconfig b/arch/arm/configs/ixp4xx_defconfig
|
||||
index efa0485..fc14932 100644
|
||||
--- a/arch/arm/configs/ixp4xx_defconfig
|
||||
+++ b/arch/arm/configs/ixp4xx_defconfig
|
||||
@@ -165,6 +165,7 @@ CONFIG_ARCH_PRPMC1100=y
|
||||
CONFIG_MACH_NAS100D=y
|
||||
CONFIG_MACH_DSMG600=y
|
||||
CONFIG_ARCH_IXDP4XX=y
|
||||
+CONFIG_MACH_FSG=y
|
||||
CONFIG_CPU_IXP46X=y
|
||||
CONFIG_CPU_IXP43X=y
|
||||
CONFIG_MACH_GTWX5715=y
|
||||
@@ -770,7 +771,7 @@ CONFIG_ATA=y
|
||||
# CONFIG_SATA_SIL24 is not set
|
||||
# CONFIG_SATA_SIS is not set
|
||||
# CONFIG_SATA_ULI is not set
|
||||
-# CONFIG_SATA_VIA is not set
|
||||
+CONFIG_SATA_VIA=y
|
||||
# CONFIG_SATA_VITESSE is not set
|
||||
# CONFIG_SATA_INIC162X is not set
|
||||
# CONFIG_PATA_ALI is not set
|
||||
@@ -1143,7 +1144,7 @@ CONFIG_HWMON=y
|
||||
# CONFIG_SENSORS_VIA686A is not set
|
||||
# CONFIG_SENSORS_VT1211 is not set
|
||||
# CONFIG_SENSORS_VT8231 is not set
|
||||
-# CONFIG_SENSORS_W83781D is not set
|
||||
+CONFIG_SENSORS_W83781D=y
|
||||
# CONFIG_SENSORS_W83791D is not set
|
||||
# CONFIG_SENSORS_W83792D is not set
|
||||
# CONFIG_SENSORS_W83793 is not set
|
||||
@@ -1334,8 +1335,8 @@ CONFIG_LEDS_CLASS=y
|
||||
#
|
||||
# LED drivers
|
||||
#
|
||||
-# CONFIG_LEDS_IXP4XX is not set
|
||||
CONFIG_LEDS_GPIO=y
|
||||
+CONFIG_LEDS_FSG=y
|
||||
|
||||
#
|
||||
# LED Triggers
|
||||
@@ -1367,7 +1368,7 @@ CONFIG_RTC_INTF_DEV=y
|
||||
# CONFIG_RTC_DRV_DS1672 is not set
|
||||
# CONFIG_RTC_DRV_MAX6900 is not set
|
||||
# CONFIG_RTC_DRV_RS5C372 is not set
|
||||
-# CONFIG_RTC_DRV_ISL1208 is not set
|
||||
+CONFIG_RTC_DRV_ISL1208=y
|
||||
CONFIG_RTC_DRV_X1205=y
|
||||
CONFIG_RTC_DRV_PCF8563=y
|
||||
# CONFIG_RTC_DRV_PCF8583 is not set
|
||||
diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig
|
||||
index e774447..db8b5fe 100644
|
||||
--- a/arch/arm/mach-ixp4xx/Kconfig
|
||||
+++ b/arch/arm/mach-ixp4xx/Kconfig
|
||||
@@ -125,6 +125,15 @@ config ARCH_IXDP4XX
|
||||
depends on ARCH_IXDP425 || MACH_IXDP465 || MACH_KIXRP435
|
||||
default y
|
||||
|
||||
+config MACH_FSG
|
||||
+ bool
|
||||
+ prompt "Freecom FSG-3"
|
||||
+ select PCI
|
||||
+ help
|
||||
+ Say 'Y' here if you want your kernel to support Freecom's
|
||||
+ FSG-3 device. For more information on this platform,
|
||||
+ see http://www.nslu2-linux.org/wiki/FSG3/HomePage
|
||||
+
|
||||
#
|
||||
# Certain registers and IRQs are only enabled if supporting IXP465 CPUs
|
||||
#
|
||||
diff --git a/arch/arm/mach-ixp4xx/Makefile b/arch/arm/mach-ixp4xx/Makefile
|
||||
index c195688..2e6bbf9 100644
|
||||
--- a/arch/arm/mach-ixp4xx/Makefile
|
||||
+++ b/arch/arm/mach-ixp4xx/Makefile
|
||||
@@ -15,6 +15,7 @@ obj-pci-$(CONFIG_MACH_NAS100D) += nas100d-pci.o
|
||||
obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o
|
||||
obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o
|
||||
obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o
|
||||
+obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
|
||||
|
||||
obj-y += common.o
|
||||
|
||||
@@ -28,6 +29,7 @@ obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o
|
||||
obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o
|
||||
obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o
|
||||
obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o
|
||||
+obj-$(CONFIG_MACH_FSG) += fsg-setup.o
|
||||
|
||||
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
|
||||
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
|
||||
diff --git a/arch/arm/mach-ixp4xx/fsg-pci.c b/arch/arm/mach-ixp4xx/fsg-pci.c
|
||||
new file mode 100644
|
||||
index 0000000..f19f3f6
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/mach-ixp4xx/fsg-pci.c
|
||||
@@ -0,0 +1,71 @@
|
||||
+/*
|
||||
+ * arch/arch/mach-ixp4xx/fsg-pci.c
|
||||
+ *
|
||||
+ * FSG board-level PCI initialization
|
||||
+ *
|
||||
+ * Author: Rod Whitby <rod@whitby.id.au>
|
||||
+ * Maintainer: http://www.nslu2-linux.org/
|
||||
+ *
|
||||
+ * based on ixdp425-pci.c:
|
||||
+ * Copyright (C) 2002 Intel Corporation.
|
||||
+ * Copyright (C) 2003-2004 MontaVista Software, Inc.
|
||||
+ *
|
||||
+ * 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/pci.h>
|
||||
+#include <linux/init.h>
|
||||
+#include <linux/irq.h>
|
||||
+
|
||||
+#include <asm/mach/pci.h>
|
||||
+#include <asm/mach-types.h>
|
||||
+
|
||||
+void __init fsg_pci_preinit(void)
|
||||
+{
|
||||
+ set_irq_type(IRQ_FSG_PCI_INTA, IRQT_LOW);
|
||||
+ set_irq_type(IRQ_FSG_PCI_INTB, IRQT_LOW);
|
||||
+ set_irq_type(IRQ_FSG_PCI_INTC, IRQT_LOW);
|
||||
+
|
||||
+ ixp4xx_pci_preinit();
|
||||
+}
|
||||
+
|
||||
+static int __init fsg_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
+{
|
||||
+ static int pci_irq_table[FSG_PCI_IRQ_LINES] = {
|
||||
+ IRQ_FSG_PCI_INTC,
|
||||
+ IRQ_FSG_PCI_INTB,
|
||||
+ IRQ_FSG_PCI_INTA,
|
||||
+ };
|
||||
+
|
||||
+ int irq = -1;
|
||||
+ slot = slot - 11;
|
||||
+
|
||||
+ if (slot >= 1 && slot <= FSG_PCI_MAX_DEV &&
|
||||
+ pin >= 1 && pin <= FSG_PCI_IRQ_LINES)
|
||||
+ irq = pci_irq_table[(slot - 1)];
|
||||
+ printk(KERN_INFO "%s: Mapped slot %d pin %d to IRQ %d\n",
|
||||
+ __func__, slot, pin, irq);
|
||||
+
|
||||
+ return irq;
|
||||
+}
|
||||
+
|
||||
+struct hw_pci fsg_pci __initdata = {
|
||||
+ .nr_controllers = 1,
|
||||
+ .preinit = fsg_pci_preinit,
|
||||
+ .swizzle = pci_std_swizzle,
|
||||
+ .setup = ixp4xx_setup,
|
||||
+ .scan = ixp4xx_scan_bus,
|
||||
+ .map_irq = fsg_map_irq,
|
||||
+};
|
||||
+
|
||||
+int __init fsg_pci_init(void)
|
||||
+{
|
||||
+ if (machine_is_fsg())
|
||||
+ pci_common_init(&fsg_pci);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+subsys_initcall(fsg_pci_init);
|
||||
diff --git a/arch/arm/mach-ixp4xx/fsg-setup.c b/arch/arm/mach-ixp4xx/fsg-setup.c
|
||||
new file mode 100644
|
||||
index 0000000..0db3a90
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/mach-ixp4xx/fsg-setup.c
|
||||
@@ -0,0 +1,276 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-ixp4xx/fsg-setup.c
|
||||
+ *
|
||||
+ * FSG board-setup
|
||||
+ *
|
||||
+ * Copyright (C) 2008 Rod Whitby <rod@whitby.id.au>
|
||||
+ *
|
||||
+ * based on ixdp425-setup.c:
|
||||
+ * Copyright (C) 2003-2004 MontaVista Software, Inc.
|
||||
+ * based on nslu2-power.c
|
||||
+ * Copyright (C) 2005 Tower Technologies
|
||||
+ *
|
||||
+ * Author: Rod Whitby <rod@whitby.id.au>
|
||||
+ * Maintainers: http://www.nslu2-linux.org/
|
||||
+ *
|
||||
+ */
|
||||
+
|
||||
+#include <linux/if_ether.h>
|
||||
+#include <linux/irq.h>
|
||||
+#include <linux/serial.h>
|
||||
+#include <linux/serial_8250.h>
|
||||
+#include <linux/leds.h>
|
||||
+#include <linux/reboot.h>
|
||||
+#include <linux/i2c.h>
|
||||
+#include <linux/i2c-gpio.h>
|
||||
+
|
||||
+#include <asm/mach-types.h>
|
||||
+#include <asm/mach/arch.h>
|
||||
+#include <asm/mach/flash.h>
|
||||
+#include <asm/io.h>
|
||||
+#include <asm/gpio.h>
|
||||
+
|
||||
+static struct flash_platform_data fsg_flash_data = {
|
||||
+ .map_name = "cfi_probe",
|
||||
+ .width = 2,
|
||||
+};
|
||||
+
|
||||
+static struct resource fsg_flash_resource = {
|
||||
+ .flags = IORESOURCE_MEM,
|
||||
+};
|
||||
+
|
||||
+static struct platform_device fsg_flash = {
|
||||
+ .name = "IXP4XX-Flash",
|
||||
+ .id = 0,
|
||||
+ .dev = {
|
||||
+ .platform_data = &fsg_flash_data,
|
||||
+ },
|
||||
+ .num_resources = 1,
|
||||
+ .resource = &fsg_flash_resource,
|
||||
+};
|
||||
+
|
||||
+static struct i2c_gpio_platform_data fsg_i2c_gpio_data = {
|
||||
+ .sda_pin = FSG_SDA_PIN,
|
||||
+ .scl_pin = FSG_SCL_PIN,
|
||||
+};
|
||||
+
|
||||
+static struct platform_device fsg_i2c_gpio = {
|
||||
+ .name = "i2c-gpio",
|
||||
+ .id = 0,
|
||||
+ .dev = {
|
||||
+ .platform_data = &fsg_i2c_gpio_data,
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
+static struct i2c_board_info __initdata fsg_i2c_board_info [] = {
|
||||
+ {
|
||||
+ I2C_BOARD_INFO("rtc-isl1208", 0x6f),
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
+static struct resource fsg_uart_resources[] = {
|
||||
+ {
|
||||
+ .start = IXP4XX_UART1_BASE_PHYS,
|
||||
+ .end = IXP4XX_UART1_BASE_PHYS + 0x0fff,
|
||||
+ .flags = IORESOURCE_MEM,
|
||||
+ },
|
||||
+ {
|
||||
+ .start = IXP4XX_UART2_BASE_PHYS,
|
||||
+ .end = IXP4XX_UART2_BASE_PHYS + 0x0fff,
|
||||
+ .flags = IORESOURCE_MEM,
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
+static struct plat_serial8250_port fsg_uart_data[] = {
|
||||
+ {
|
||||
+ .mapbase = IXP4XX_UART1_BASE_PHYS,
|
||||
+ .membase = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET,
|
||||
+ .irq = IRQ_IXP4XX_UART1,
|
||||
+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
|
||||
+ .iotype = UPIO_MEM,
|
||||
+ .regshift = 2,
|
||||
+ .uartclk = IXP4XX_UART_XTAL,
|
||||
+ },
|
||||
+ {
|
||||
+ .mapbase = IXP4XX_UART2_BASE_PHYS,
|
||||
+ .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
|
||||
+ .irq = IRQ_IXP4XX_UART2,
|
||||
+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
|
||||
+ .iotype = UPIO_MEM,
|
||||
+ .regshift = 2,
|
||||
+ .uartclk = IXP4XX_UART_XTAL,
|
||||
+ },
|
||||
+ { }
|
||||
+};
|
||||
+
|
||||
+static struct platform_device fsg_uart = {
|
||||
+ .name = "serial8250",
|
||||
+ .id = PLAT8250_DEV_PLATFORM,
|
||||
+ .dev = {
|
||||
+ .platform_data = fsg_uart_data,
|
||||
+ },
|
||||
+ .num_resources = ARRAY_SIZE(fsg_uart_resources),
|
||||
+ .resource = fsg_uart_resources,
|
||||
+};
|
||||
+
|
||||
+static struct platform_device fsg_leds = {
|
||||
+ .name = "fsg-led",
|
||||
+ .id = -1,
|
||||
+};
|
||||
+
|
||||
+/* Built-in 10/100 Ethernet MAC interfaces */
|
||||
+static struct eth_plat_info fsg_plat_eth[] = {
|
||||
+ {
|
||||
+ .phy = 5,
|
||||
+ .rxq = 3,
|
||||
+ .txreadyq = 20,
|
||||
+ }, {
|
||||
+ .phy = 4,
|
||||
+ .rxq = 4,
|
||||
+ .txreadyq = 21,
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
+static struct platform_device fsg_eth[] = {
|
||||
+ {
|
||||
+ .name = "ixp4xx_eth",
|
||||
+ .id = IXP4XX_ETH_NPEB,
|
||||
+ .dev = {
|
||||
+ .platform_data = fsg_plat_eth,
|
||||
+ },
|
||||
+ }, {
|
||||
+ .name = "ixp4xx_eth",
|
||||
+ .id = IXP4XX_ETH_NPEC,
|
||||
+ .dev = {
|
||||
+ .platform_data = fsg_plat_eth + 1,
|
||||
+ },
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
+static struct platform_device *fsg_devices[] __initdata = {
|
||||
+ &fsg_i2c_gpio,
|
||||
+ &fsg_flash,
|
||||
+ &fsg_leds,
|
||||
+ &fsg_eth[0],
|
||||
+ &fsg_eth[1],
|
||||
+};
|
||||
+
|
||||
+static irqreturn_t fsg_power_handler(int irq, void *dev_id)
|
||||
+{
|
||||
+ /* Signal init to do the ctrlaltdel action, this will bypass init if
|
||||
+ * it hasn't started and do a kernel_restart.
|
||||
+ */
|
||||
+ ctrl_alt_del();
|
||||
+
|
||||
+ return IRQ_HANDLED;
|
||||
+}
|
||||
+
|
||||
+static irqreturn_t fsg_reset_handler(int irq, void *dev_id)
|
||||
+{
|
||||
+ /* This is the paper-clip reset which does an emergency reboot. */
|
||||
+ printk(KERN_INFO "Restarting system.\n");
|
||||
+ machine_restart(NULL);
|
||||
+
|
||||
+ /* This should never be reached. */
|
||||
+ return IRQ_HANDLED;
|
||||
+}
|
||||
+
|
||||
+static void __init fsg_init(void)
|
||||
+{
|
||||
+ DECLARE_MAC_BUF(mac_buf);
|
||||
+ uint8_t __iomem *f;
|
||||
+ int i;
|
||||
+
|
||||
+ ixp4xx_sys_init();
|
||||
+
|
||||
+ fsg_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
|
||||
+ fsg_flash_resource.end =
|
||||
+ IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;
|
||||
+
|
||||
+ *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE;
|
||||
+ *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
|
||||
+
|
||||
+ /* Configure CS2 for operation, 8bit and writable */
|
||||
+ *IXP4XX_EXP_CS2 = 0xbfff0002;
|
||||
+
|
||||
+ i2c_register_board_info(0, fsg_i2c_board_info,
|
||||
+ ARRAY_SIZE(fsg_i2c_board_info));
|
||||
+
|
||||
+ /* This is only useful on a modified machine, but it is valuable
|
||||
+ * to have it first in order to see debug messages, and so that
|
||||
+ * it does *not* get removed if platform_add_devices fails!
|
||||
+ */
|
||||
+ (void)platform_device_register(&fsg_uart);
|
||||
+
|
||||
+ platform_add_devices(fsg_devices, ARRAY_SIZE(fsg_devices));
|
||||
+
|
||||
+ if (request_irq(gpio_to_irq(FSG_RB_GPIO), &fsg_reset_handler,
|
||||
+ IRQF_DISABLED | IRQF_TRIGGER_LOW,
|
||||
+ "FSG reset button", NULL) < 0) {
|
||||
+
|
||||
+ printk(KERN_DEBUG "Reset Button IRQ %d not available\n",
|
||||
+ gpio_to_irq(FSG_RB_GPIO));
|
||||
+ }
|
||||
+
|
||||
+ if (request_irq(gpio_to_irq(FSG_SB_GPIO), &fsg_power_handler,
|
||||
+ IRQF_DISABLED | IRQF_TRIGGER_LOW,
|
||||
+ "FSG power button", NULL) < 0) {
|
||||
+
|
||||
+ printk(KERN_DEBUG "Power Button IRQ %d not available\n",
|
||||
+ gpio_to_irq(FSG_SB_GPIO));
|
||||
+ }
|
||||
+
|
||||
+ /*
|
||||
+ * Map in a portion of the flash and read the MAC addresses.
|
||||
+ * Since it is stored in BE in the flash itself, we need to
|
||||
+ * byteswap it if we're in LE mode.
|
||||
+ */
|
||||
+ f = ioremap(IXP4XX_EXP_BUS_BASE(0), 0x400000);
|
||||
+ if (f) {
|
||||
+#ifdef __ARMEB__
|
||||
+ for (i = 0; i < 6; i++) {
|
||||
+ fsg_plat_eth[0].hwaddr[i] = readb(f + 0x3C0422 + i);
|
||||
+ fsg_plat_eth[1].hwaddr[i] = readb(f + 0x3C043B + i);
|
||||
+ }
|
||||
+#else
|
||||
+
|
||||
+ /*
|
||||
+ Endian-swapped reads from unaligned addresses are
|
||||
+ required to extract the two MACs from the big-endian
|
||||
+ Redboot config area in flash.
|
||||
+ */
|
||||
+
|
||||
+ fsg_plat_eth[0].hwaddr[0] = readb(f + 0x3C0421);
|
||||
+ fsg_plat_eth[0].hwaddr[1] = readb(f + 0x3C0420);
|
||||
+ fsg_plat_eth[0].hwaddr[2] = readb(f + 0x3C0427);
|
||||
+ fsg_plat_eth[0].hwaddr[3] = readb(f + 0x3C0426);
|
||||
+ fsg_plat_eth[0].hwaddr[4] = readb(f + 0x3C0425);
|
||||
+ fsg_plat_eth[0].hwaddr[5] = readb(f + 0x3C0424);
|
||||
+
|
||||
+ fsg_plat_eth[1].hwaddr[0] = readb(f + 0x3C0439);
|
||||
+ fsg_plat_eth[1].hwaddr[1] = readb(f + 0x3C043F);
|
||||
+ fsg_plat_eth[1].hwaddr[2] = readb(f + 0x3C043E);
|
||||
+ fsg_plat_eth[1].hwaddr[3] = readb(f + 0x3C043D);
|
||||
+ fsg_plat_eth[1].hwaddr[4] = readb(f + 0x3C043C);
|
||||
+ fsg_plat_eth[1].hwaddr[5] = readb(f + 0x3C0443);
|
||||
+#endif
|
||||
+ iounmap(f);
|
||||
+ }
|
||||
+ printk(KERN_INFO "FSG: Using MAC address %s for port 0\n",
|
||||
+ print_mac(mac_buf, fsg_plat_eth[0].hwaddr));
|
||||
+ printk(KERN_INFO "FSG: Using MAC address %s for port 1\n",
|
||||
+ print_mac(mac_buf, fsg_plat_eth[1].hwaddr));
|
||||
+
|
||||
+}
|
||||
+
|
||||
+MACHINE_START(FSG, "Freecom FSG-3")
|
||||
+ /* Maintainer: www.nslu2-linux.org */
|
||||
+ .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
|
||||
+ .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
|
||||
+ .map_io = ixp4xx_map_io,
|
||||
+ .init_irq = ixp4xx_init_irq,
|
||||
+ .timer = &ixp4xx_timer,
|
||||
+ .boot_params = 0x0100,
|
||||
+ .init_machine = fsg_init,
|
||||
+MACHINE_END
|
||||
+
|
||||
diff --git a/include/asm-arm/arch-ixp4xx/fsg.h b/include/asm-arm/arch-ixp4xx/fsg.h
|
||||
new file mode 100644
|
||||
index 0000000..c0100cc
|
||||
--- /dev/null
|
||||
+++ b/include/asm-arm/arch-ixp4xx/fsg.h
|
||||
@@ -0,0 +1,50 @@
|
||||
+/*
|
||||
+ * include/asm-arm/arch-ixp4xx/fsg.h
|
||||
+ *
|
||||
+ * Freecom FSG-3 platform specific definitions
|
||||
+ *
|
||||
+ * Author: Rod Whitby <rod@whitby.id.au>
|
||||
+ * Author: Tomasz Chmielewski <mangoo@wpkg.org>
|
||||
+ * Maintainers: http://www.nslu2-linux.org
|
||||
+ *
|
||||
+ * Based on coyote.h by
|
||||
+ * Copyright 2004 (c) MontaVista, Software, Inc.
|
||||
+ *
|
||||
+ * This file is licensed under the terms of the GNU General Public
|
||||
+ * License version 2. This program is licensed "as is" without any
|
||||
+ * warranty of any kind, whether express or implied.
|
||||
+ */
|
||||
+
|
||||
+#ifndef __ASM_ARCH_HARDWARE_H__
|
||||
+#error "Do not include this directly, instead #include <asm/hardware.h>"
|
||||
+#endif
|
||||
+
|
||||
+#define FSG_SDA_PIN 12
|
||||
+#define FSG_SCL_PIN 13
|
||||
+
|
||||
+/*
|
||||
+ * FSG PCI IRQs
|
||||
+ */
|
||||
+#define FSG_PCI_MAX_DEV 3
|
||||
+#define FSG_PCI_IRQ_LINES 3
|
||||
+
|
||||
+
|
||||
+/* PCI controller GPIO to IRQ pin mappings */
|
||||
+#define FSG_PCI_INTA_PIN 6
|
||||
+#define FSG_PCI_INTB_PIN 7
|
||||
+#define FSG_PCI_INTC_PIN 5
|
||||
+
|
||||
+/* Buttons */
|
||||
+
|
||||
+#define FSG_SB_GPIO 4 /* sync button */
|
||||
+#define FSG_RB_GPIO 9 /* reset button */
|
||||
+#define FSG_UB_GPIO 10 /* usb button */
|
||||
+
|
||||
+/* LEDs */
|
||||
+
|
||||
+#define FSG_LED_WLAN_BIT 0
|
||||
+#define FSG_LED_WAN_BIT 1
|
||||
+#define FSG_LED_SATA_BIT 2
|
||||
+#define FSG_LED_USB_BIT 4
|
||||
+#define FSG_LED_RING_BIT 5
|
||||
+#define FSG_LED_SYNC_BIT 7
|
||||
diff --git a/include/asm-arm/arch-ixp4xx/hardware.h b/include/asm-arm/arch-ixp4xx/hardware.h
|
||||
index 73e8dc3..fa723a6 100644
|
||||
--- a/include/asm-arm/arch-ixp4xx/hardware.h
|
||||
+++ b/include/asm-arm/arch-ixp4xx/hardware.h
|
||||
@@ -45,5 +45,6 @@
|
||||
#include "nslu2.h"
|
||||
#include "nas100d.h"
|
||||
#include "dsmg600.h"
|
||||
+#include "fsg.h"
|
||||
|
||||
#endif /* _ASM_ARCH_HARDWARE_H */
|
||||
diff --git a/include/asm-arm/arch-ixp4xx/irqs.h b/include/asm-arm/arch-ixp4xx/irqs.h
|
||||
index 1180160..674af4a 100644
|
||||
--- a/include/asm-arm/arch-ixp4xx/irqs.h
|
||||
+++ b/include/asm-arm/arch-ixp4xx/irqs.h
|
||||
@@ -128,4 +128,11 @@
|
||||
#define IRQ_DSMG600_PCI_INTE IRQ_IXP4XX_GPIO7
|
||||
#define IRQ_DSMG600_PCI_INTF IRQ_IXP4XX_GPIO6
|
||||
|
||||
+/*
|
||||
+ * Freecom FSG-3 Board IRQs
|
||||
+ */
|
||||
+#define IRQ_FSG_PCI_INTA IRQ_IXP4XX_GPIO6
|
||||
+#define IRQ_FSG_PCI_INTB IRQ_IXP4XX_GPIO7
|
||||
+#define IRQ_FSG_PCI_INTC IRQ_IXP4XX_GPIO5
|
||||
+
|
||||
#endif
|
||||
--
|
||||
1.5.2.5
|
||||
|
||||
|
|
@ -0,0 +1,319 @@
|
|||
From a66e34fefb3f8142d7f16808563eb610225f6e77 Mon Sep 17 00:00:00 2001
|
||||
From: Rod Whitby <rod@whitby.id.au>
|
||||
Date: Tue, 29 Jan 2008 23:17:42 +1030
|
||||
Subject: [PATCH] leds: Add new driver for the LEDs on the Freecom FSG-3
|
||||
|
||||
The LEDs on the Freecom FSG-3 are connected to an external
|
||||
memory-mapped latch on the ixp4xx expansion bus, and therefore cannot
|
||||
be supported by any of the existing LEDs drivers.
|
||||
|
||||
Signed-off-by: Rod Whitby <rod@whitby.id.au>
|
||||
--
|
||||
PATCH FOLLOWS
|
||||
KernelVersion: v2.6.25-rc6-117-g457fb60
|
||||
---
|
||||
drivers/leds/Kconfig | 6 +
|
||||
drivers/leds/Makefile | 1 +
|
||||
drivers/leds/leds-fsg.c | 261 +++++++++++++++++++++++++++++++++++++++++++++++
|
||||
3 files changed, 268 insertions(+), 0 deletions(-)
|
||||
create mode 100644 drivers/leds/leds-fsg.c
|
||||
|
||||
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
|
||||
index 859814f..aefbe04 100644
|
||||
--- a/drivers/leds/Kconfig
|
||||
+++ b/drivers/leds/Kconfig
|
||||
@@ -46,6 +46,12 @@ config LEDS_SPITZ
|
||||
This option enables support for the LEDs on Sharp Zaurus
|
||||
SL-Cxx00 series (C1000, C3000, C3100).
|
||||
|
||||
+config LEDS_FSG
|
||||
+ tristate "LED Support for the Freecom FSG-3"
|
||||
+ depends on LEDS_CLASS && MACH_FSG
|
||||
+ help
|
||||
+ This option enables support for the LEDs on the Freecom FSG-3.
|
||||
+
|
||||
config LEDS_TOSA
|
||||
tristate "LED Support for the Sharp SL-6000 series"
|
||||
depends on LEDS_CLASS && PXA_SHARPSL
|
||||
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
|
||||
index 84ced3b..b17bd91 100644
|
||||
--- a/drivers/leds/Makefile
|
||||
+++ b/drivers/leds/Makefile
|
||||
@@ -21,6 +21,7 @@ obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o
|
||||
obj-$(CONFIG_LEDS_CM_X270) += leds-cm-x270.o
|
||||
obj-$(CONFIG_LEDS_CLEVO_MAIL) += leds-clevo-mail.o
|
||||
obj-$(CONFIG_LEDS_HP6XX) += leds-hp6xx.o
|
||||
+obj-$(CONFIG_LEDS_FSG) += leds-fsg.o
|
||||
|
||||
# LED Triggers
|
||||
obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o
|
||||
diff --git a/drivers/leds/leds-fsg.c b/drivers/leds/leds-fsg.c
|
||||
new file mode 100644
|
||||
index 0000000..a7421b8
|
||||
--- /dev/null
|
||||
+++ b/drivers/leds/leds-fsg.c
|
||||
@@ -0,0 +1,261 @@
|
||||
+/*
|
||||
+ * LED Driver for the Freecom FSG-3
|
||||
+ *
|
||||
+ * Copyright (c) 2008 Rod Whitby <rod@whitby.id.au>
|
||||
+ *
|
||||
+ * Author: Rod Whitby <rod@whitby.id.au>
|
||||
+ *
|
||||
+ * Based on leds-spitz.c
|
||||
+ * Copyright 2005-2006 Openedhand Ltd.
|
||||
+ * Author: Richard Purdie <rpurdie@openedhand.com>
|
||||
+ *
|
||||
+ * 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/kernel.h>
|
||||
+#include <linux/init.h>
|
||||
+#include <linux/platform_device.h>
|
||||
+#include <linux/leds.h>
|
||||
+#include <asm/arch/hardware.h>
|
||||
+#include <asm/io.h>
|
||||
+
|
||||
+static short __iomem *latch_address;
|
||||
+static unsigned short latch_value;
|
||||
+
|
||||
+
|
||||
+static void fsg_led_wlan_set(struct led_classdev *led_cdev,
|
||||
+ enum led_brightness value)
|
||||
+{
|
||||
+ if (value) {
|
||||
+ latch_value &= ~(1 << FSG_LED_WLAN_BIT);
|
||||
+ *latch_address = latch_value;
|
||||
+ } else {
|
||||
+ latch_value |= (1 << FSG_LED_WLAN_BIT);
|
||||
+ *latch_address = latch_value;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static void fsg_led_wan_set(struct led_classdev *led_cdev,
|
||||
+ enum led_brightness value)
|
||||
+{
|
||||
+ if (value) {
|
||||
+ latch_value &= ~(1 << FSG_LED_WAN_BIT);
|
||||
+ *latch_address = latch_value;
|
||||
+ } else {
|
||||
+ latch_value |= (1 << FSG_LED_WAN_BIT);
|
||||
+ *latch_address = latch_value;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static void fsg_led_sata_set(struct led_classdev *led_cdev,
|
||||
+ enum led_brightness value)
|
||||
+{
|
||||
+ if (value) {
|
||||
+ latch_value &= ~(1 << FSG_LED_SATA_BIT);
|
||||
+ *latch_address = latch_value;
|
||||
+ } else {
|
||||
+ latch_value |= (1 << FSG_LED_SATA_BIT);
|
||||
+ *latch_address = latch_value;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static void fsg_led_usb_set(struct led_classdev *led_cdev,
|
||||
+ enum led_brightness value)
|
||||
+{
|
||||
+ if (value) {
|
||||
+ latch_value &= ~(1 << FSG_LED_USB_BIT);
|
||||
+ *latch_address = latch_value;
|
||||
+ } else {
|
||||
+ latch_value |= (1 << FSG_LED_USB_BIT);
|
||||
+ *latch_address = latch_value;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static void fsg_led_sync_set(struct led_classdev *led_cdev,
|
||||
+ enum led_brightness value)
|
||||
+{
|
||||
+ if (value) {
|
||||
+ latch_value &= ~(1 << FSG_LED_SYNC_BIT);
|
||||
+ *latch_address = latch_value;
|
||||
+ } else {
|
||||
+ latch_value |= (1 << FSG_LED_SYNC_BIT);
|
||||
+ *latch_address = latch_value;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static void fsg_led_ring_set(struct led_classdev *led_cdev,
|
||||
+ enum led_brightness value)
|
||||
+{
|
||||
+ if (value) {
|
||||
+ latch_value &= ~(1 << FSG_LED_RING_BIT);
|
||||
+ *latch_address = latch_value;
|
||||
+ } else {
|
||||
+ latch_value |= (1 << FSG_LED_RING_BIT);
|
||||
+ *latch_address = latch_value;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+
|
||||
+
|
||||
+static struct led_classdev fsg_wlan_led = {
|
||||
+ .name = "fsg:blue:wlan",
|
||||
+ .brightness_set = fsg_led_wlan_set,
|
||||
+};
|
||||
+
|
||||
+static struct led_classdev fsg_wan_led = {
|
||||
+ .name = "fsg:blue:wan",
|
||||
+ .brightness_set = fsg_led_wan_set,
|
||||
+};
|
||||
+
|
||||
+static struct led_classdev fsg_sata_led = {
|
||||
+ .name = "fsg:blue:sata",
|
||||
+ .brightness_set = fsg_led_sata_set,
|
||||
+};
|
||||
+
|
||||
+static struct led_classdev fsg_usb_led = {
|
||||
+ .name = "fsg:blue:usb",
|
||||
+ .brightness_set = fsg_led_usb_set,
|
||||
+};
|
||||
+
|
||||
+static struct led_classdev fsg_sync_led = {
|
||||
+ .name = "fsg:blue:sync",
|
||||
+ .brightness_set = fsg_led_sync_set,
|
||||
+};
|
||||
+
|
||||
+static struct led_classdev fsg_ring_led = {
|
||||
+ .name = "fsg:blue:ring",
|
||||
+ .brightness_set = fsg_led_ring_set,
|
||||
+};
|
||||
+
|
||||
+
|
||||
+
|
||||
+#ifdef CONFIG_PM
|
||||
+static int fsg_led_suspend(struct platform_device *dev, pm_message_t state)
|
||||
+{
|
||||
+ led_classdev_suspend(&fsg_wlan_led);
|
||||
+ led_classdev_suspend(&fsg_wan_led);
|
||||
+ led_classdev_suspend(&fsg_sata_led);
|
||||
+ led_classdev_suspend(&fsg_usb_led);
|
||||
+ led_classdev_suspend(&fsg_sync_led);
|
||||
+ led_classdev_suspend(&fsg_ring_led);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int fsg_led_resume(struct platform_device *dev)
|
||||
+{
|
||||
+ led_classdev_resume(&fsg_wlan_led);
|
||||
+ led_classdev_resume(&fsg_wan_led);
|
||||
+ led_classdev_resume(&fsg_sata_led);
|
||||
+ led_classdev_resume(&fsg_usb_led);
|
||||
+ led_classdev_resume(&fsg_sync_led);
|
||||
+ led_classdev_resume(&fsg_ring_led);
|
||||
+ return 0;
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
+static int fsg_led_probe(struct platform_device *pdev)
|
||||
+{
|
||||
+ int ret;
|
||||
+
|
||||
+ ret = led_classdev_register(&pdev->dev, &fsg_wlan_led);
|
||||
+ if (ret < 0)
|
||||
+ goto failwlan;
|
||||
+
|
||||
+ ret = led_classdev_register(&pdev->dev, &fsg_wan_led);
|
||||
+ if (ret < 0)
|
||||
+ goto failwan;
|
||||
+
|
||||
+ ret = led_classdev_register(&pdev->dev, &fsg_sata_led);
|
||||
+ if (ret < 0)
|
||||
+ goto failsata;
|
||||
+
|
||||
+ ret = led_classdev_register(&pdev->dev, &fsg_usb_led);
|
||||
+ if (ret < 0)
|
||||
+ goto failusb;
|
||||
+
|
||||
+ ret = led_classdev_register(&pdev->dev, &fsg_sync_led);
|
||||
+ if (ret < 0)
|
||||
+ goto failsync;
|
||||
+
|
||||
+ ret = led_classdev_register(&pdev->dev, &fsg_ring_led);
|
||||
+ if (ret < 0)
|
||||
+ goto failring;
|
||||
+
|
||||
+ /* Map the LED chip select address space */
|
||||
+ latch_address = (unsigned short *) ioremap(IXP4XX_EXP_BUS_BASE(2), 512);
|
||||
+ if (!latch_address) {
|
||||
+ ret = -ENOMEM;
|
||||
+ goto failremap;
|
||||
+ }
|
||||
+
|
||||
+ latch_value = 0xffff;
|
||||
+ *latch_address = latch_value;
|
||||
+
|
||||
+ return ret;
|
||||
+
|
||||
+ failremap:
|
||||
+ led_classdev_unregister(&fsg_ring_led);
|
||||
+ failring:
|
||||
+ led_classdev_unregister(&fsg_sync_led);
|
||||
+ failsync:
|
||||
+ led_classdev_unregister(&fsg_usb_led);
|
||||
+ failusb:
|
||||
+ led_classdev_unregister(&fsg_sata_led);
|
||||
+ failsata:
|
||||
+ led_classdev_unregister(&fsg_wan_led);
|
||||
+ failwan:
|
||||
+ led_classdev_unregister(&fsg_wlan_led);
|
||||
+ failwlan:
|
||||
+
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+static int fsg_led_remove(struct platform_device *pdev)
|
||||
+{
|
||||
+ iounmap(latch_address);
|
||||
+
|
||||
+ led_classdev_unregister(&fsg_wlan_led);
|
||||
+ led_classdev_unregister(&fsg_wan_led);
|
||||
+ led_classdev_unregister(&fsg_sata_led);
|
||||
+ led_classdev_unregister(&fsg_usb_led);
|
||||
+ led_classdev_unregister(&fsg_sync_led);
|
||||
+ led_classdev_unregister(&fsg_ring_led);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static struct platform_driver fsg_led_driver = {
|
||||
+ .probe = fsg_led_probe,
|
||||
+ .remove = fsg_led_remove,
|
||||
+#ifdef CONFIG_PM
|
||||
+ .suspend = fsg_led_suspend,
|
||||
+ .resume = fsg_led_resume,
|
||||
+#endif
|
||||
+ .driver = {
|
||||
+ .name = "fsg-led",
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
+
|
||||
+static int __init fsg_led_init(void)
|
||||
+{
|
||||
+ return platform_driver_register(&fsg_led_driver);
|
||||
+}
|
||||
+
|
||||
+static void __exit fsg_led_exit(void)
|
||||
+{
|
||||
+ platform_driver_unregister(&fsg_led_driver);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+module_init(fsg_led_init);
|
||||
+module_exit(fsg_led_exit);
|
||||
+
|
||||
+MODULE_AUTHOR("Rod Whitby <rod@whitby.id.au>");
|
||||
+MODULE_DESCRIPTION("Freecom FSG-3 LED driver");
|
||||
+MODULE_LICENSE("GPL");
|
||||
--
|
||||
1.5.2.5
|
||||
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
Index: linux-2.6.19/drivers/char/random.c
|
||||
===================================================================
|
||||
--- linux-2.6.19.orig/drivers/char/random.c
|
||||
+++ linux-2.6.19/drivers/char/random.c
|
||||
@@ -248,9 +248,9 @@
|
||||
/*
|
||||
* Configuration information
|
||||
*/
|
||||
-#define INPUT_POOL_WORDS 128
|
||||
-#define OUTPUT_POOL_WORDS 32
|
||||
-#define SEC_XFER_SIZE 512
|
||||
+#define INPUT_POOL_WORDS 256
|
||||
+#define OUTPUT_POOL_WORDS 64
|
||||
+#define SEC_XFER_SIZE 1024
|
||||
|
||||
/*
|
||||
* The minimum number of bits of entropy before we wake up a read on
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/gateway7001-setup.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/gateway7001-setup.c
|
||||
--- linux-2.6.23/arch/arm/mach-ixp4xx/gateway7001-setup.c 2007-10-09 22:31:38.000000000 +0200
|
||||
+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/gateway7001-setup.c 2007-10-22 15:09:33.000000000 +0200
|
||||
@@ -76,9 +76,36 @@
|
||||
.resource = &gateway7001_uart_resource,
|
||||
};
|
||||
|
||||
+/* Built-in 10/100 Ethernet MAC interfaces */
|
||||
+static struct eth_plat_info gateway7001_plat_eth[] = {
|
||||
+ {
|
||||
+ .phy = 1,
|
||||
+ .rxq = 3,
|
||||
+ .txreadyq = 20,
|
||||
+ }, {
|
||||
+ .phy = 2,
|
||||
+ .rxq = 4,
|
||||
+ .txreadyq = 21,
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
+static struct platform_device gateway7001_eth[] = {
|
||||
+ {
|
||||
+ .name = "ixp4xx_eth",
|
||||
+ .id = IXP4XX_ETH_NPEB,
|
||||
+ .dev.platform_data = gateway7001_plat_eth,
|
||||
+ }, {
|
||||
+ .name = "ixp4xx_eth",
|
||||
+ .id = IXP4XX_ETH_NPEC,
|
||||
+ .dev.platform_data = gateway7001_plat_eth + 1,
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
static struct platform_device *gateway7001_devices[] __initdata = {
|
||||
&gateway7001_flash,
|
||||
- &gateway7001_uart
|
||||
+ &gateway7001_uart,
|
||||
+ &gateway7001_eth[0],
|
||||
+ &gateway7001_eth[1],
|
||||
};
|
||||
|
||||
static void __init gateway7001_init(void)
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/wg302v2-setup.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/wg302v2-setup.c
|
||||
--- linux-2.6.23/arch/arm/mach-ixp4xx/wg302v2-setup.c 2007-10-09 22:31:38.000000000 +0200
|
||||
+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/wg302v2-setup.c 2007-10-22 15:02:20.000000000 +0200
|
||||
@@ -77,9 +77,27 @@
|
||||
.resource = &wg302v2_uart_resource,
|
||||
};
|
||||
|
||||
+/* Built-in 10/100 Ethernet MAC interfaces */
|
||||
+static struct eth_plat_info wg302_plat_eth[] = {
|
||||
+ {
|
||||
+ .phy = 8,
|
||||
+ .rxq = 3,
|
||||
+ .txreadyq = 20,
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
+static struct platform_device wg302_eth[] = {
|
||||
+ {
|
||||
+ .name = "ixp4xx_eth",
|
||||
+ .id = IXP4XX_ETH_NPEB,
|
||||
+ .dev.platform_data = wg302_plat_eth,
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
static struct platform_device *wg302v2_devices[] __initdata = {
|
||||
&wg302v2_flash,
|
||||
&wg302v2_uart,
|
||||
+ &wg302_eth[0],
|
||||
};
|
||||
|
||||
static void __init wg302v2_init(void)
|
||||
|
|
@ -0,0 +1,297 @@
|
|||
Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Kconfig 2008-03-12 21:21:23.000000000 +1030
|
||||
+++ linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig 2008-03-12 21:21:26.000000000 +1030
|
||||
@@ -57,6 +57,14 @@
|
||||
WG302 v2 or WAG302 v2 Access Points. For more information
|
||||
on this platform, see http://openwrt.org
|
||||
|
||||
+config MACH_PRONGHORNMETRO
|
||||
+ bool "Pronghorn Metro"
|
||||
+ select PCI
|
||||
+ help
|
||||
+ Say 'Y' here if you want your kernel to support the ADI
|
||||
+ Engineering Pronghorn Metro Platform. For more
|
||||
+ information on this platform, see <file:Documentation/arm/IXP4xx>.
|
||||
+
|
||||
config ARCH_IXDP425
|
||||
bool "IXDP425"
|
||||
help
|
||||
Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:23.000000000 +1030
|
||||
+++ linux-2.6.24/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:26.000000000 +1030
|
||||
@@ -16,6 +16,7 @@
|
||||
obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o
|
||||
obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o
|
||||
obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
|
||||
+obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
|
||||
|
||||
obj-y += common.o
|
||||
|
||||
@@ -30,5 +31,6 @@
|
||||
obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o
|
||||
obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o
|
||||
obj-$(CONFIG_MACH_FSG) += fsg-setup.o
|
||||
+obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o
|
||||
|
||||
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
|
||||
Index: linux-2.6.24/arch/arm/mach-ixp4xx/pronghornmetro-pci.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.24/arch/arm/mach-ixp4xx/pronghornmetro-pci.c 2008-03-12 21:21:26.000000000 +1030
|
||||
@@ -0,0 +1,74 @@
|
||||
+/*
|
||||
+ * arch/arch/mach-ixp4xx/pronghornmetro-pci.c
|
||||
+ *
|
||||
+ * PCI setup routines for ADI Engineering Pronghorn Metro
|
||||
+ *
|
||||
+ * Copyright (C) 2007 Imre Kaloz <kaloz@openwrt.org>
|
||||
+ *
|
||||
+ * based on coyote-pci.c:
|
||||
+ * Copyright (C) 2002 Jungo Software Technologies.
|
||||
+ * Copyright (C) 2003 MontaVista Softwrae, Inc.
|
||||
+ *
|
||||
+ * Maintainer: Imre Kaloz <kaloz@openwrt.org>
|
||||
+ *
|
||||
+ * 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/kernel.h>
|
||||
+#include <linux/pci.h>
|
||||
+#include <linux/init.h>
|
||||
+#include <linux/irq.h>
|
||||
+
|
||||
+#include <asm/mach-types.h>
|
||||
+#include <asm/hardware.h>
|
||||
+#include <asm/irq.h>
|
||||
+
|
||||
+#include <asm/mach/pci.h>
|
||||
+
|
||||
+extern void ixp4xx_pci_preinit(void);
|
||||
+extern int ixp4xx_setup(int nr, struct pci_sys_data *sys);
|
||||
+extern struct pci_bus *ixp4xx_scan_bus(int nr, struct pci_sys_data *sys);
|
||||
+
|
||||
+void __init pronghornmetro_pci_preinit(void)
|
||||
+{
|
||||
+ set_irq_type(IRQ_IXP4XX_GPIO4, IRQT_LOW);
|
||||
+ set_irq_type(IRQ_IXP4XX_GPIO6, IRQT_LOW);
|
||||
+ set_irq_type(IRQ_IXP4XX_GPIO11, IRQT_LOW);
|
||||
+ set_irq_type(IRQ_IXP4XX_GPIO1, IRQT_LOW);
|
||||
+
|
||||
+ ixp4xx_pci_preinit();
|
||||
+}
|
||||
+
|
||||
+static int __init pronghornmetro_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
+{
|
||||
+ if (slot == 13)
|
||||
+ return IRQ_IXP4XX_GPIO4;
|
||||
+ else if (slot == 14)
|
||||
+ return IRQ_IXP4XX_GPIO6;
|
||||
+ else if (slot == 15)
|
||||
+ return IRQ_IXP4XX_GPIO11;
|
||||
+ else if (slot == 16)
|
||||
+ return IRQ_IXP4XX_GPIO1;
|
||||
+ else return -1;
|
||||
+}
|
||||
+
|
||||
+struct hw_pci pronghornmetro_pci __initdata = {
|
||||
+ .nr_controllers = 1,
|
||||
+ .preinit = pronghornmetro_pci_preinit,
|
||||
+ .swizzle = pci_std_swizzle,
|
||||
+ .setup = ixp4xx_setup,
|
||||
+ .scan = ixp4xx_scan_bus,
|
||||
+ .map_irq = pronghornmetro_map_irq,
|
||||
+};
|
||||
+
|
||||
+int __init pronghornmetro_pci_init(void)
|
||||
+{
|
||||
+ if (machine_is_pronghorn_metro())
|
||||
+ pci_common_init(&pronghornmetro_pci);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+subsys_initcall(pronghornmetro_pci_init);
|
||||
Index: linux-2.6.24/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.24/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2008-03-12 21:21:26.000000000 +1030
|
||||
@@ -0,0 +1,147 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-ixp4xx/pronghornmetro-setup.c
|
||||
+ *
|
||||
+ * Board setup for the ADI Engineering Pronghorn Metro
|
||||
+ *
|
||||
+ * Copyright (C) 2007 Imre Kaloz <Kaloz@openwrt.org>
|
||||
+ *
|
||||
+ * based on coyote-setup.c:
|
||||
+ * Copyright (C) 2003-2005 MontaVista Software, Inc.
|
||||
+ *
|
||||
+ * Author: Imre Kaloz <Kaloz@openwrt.org>
|
||||
+ */
|
||||
+
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/init.h>
|
||||
+#include <linux/device.h>
|
||||
+#include <linux/serial.h>
|
||||
+#include <linux/tty.h>
|
||||
+#include <linux/serial_8250.h>
|
||||
+#include <linux/slab.h>
|
||||
+
|
||||
+#include <asm/types.h>
|
||||
+#include <asm/setup.h>
|
||||
+#include <asm/memory.h>
|
||||
+#include <asm/hardware.h>
|
||||
+#include <asm/irq.h>
|
||||
+#include <asm/mach-types.h>
|
||||
+#include <asm/mach/arch.h>
|
||||
+#include <asm/mach/flash.h>
|
||||
+
|
||||
+static struct flash_platform_data pronghornmetro_flash_data = {
|
||||
+ .map_name = "cfi_probe",
|
||||
+ .width = 2,
|
||||
+};
|
||||
+
|
||||
+static struct resource pronghornmetro_flash_resource = {
|
||||
+ .flags = IORESOURCE_MEM,
|
||||
+};
|
||||
+
|
||||
+static struct platform_device pronghornmetro_flash = {
|
||||
+ .name = "IXP4XX-Flash",
|
||||
+ .id = 0,
|
||||
+ .dev = {
|
||||
+ .platform_data = &pronghornmetro_flash_data,
|
||||
+ },
|
||||
+ .num_resources = 1,
|
||||
+ .resource = &pronghornmetro_flash_resource,
|
||||
+};
|
||||
+
|
||||
+static struct resource pronghornmetro_uart_resource = {
|
||||
+ .start = IXP4XX_UART2_BASE_PHYS,
|
||||
+ .end = IXP4XX_UART2_BASE_PHYS + 0x0fff,
|
||||
+ .flags = IORESOURCE_MEM,
|
||||
+};
|
||||
+
|
||||
+static struct plat_serial8250_port pronghornmetro_uart_data[] = {
|
||||
+ {
|
||||
+ .mapbase = IXP4XX_UART2_BASE_PHYS,
|
||||
+ .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
|
||||
+ .irq = IRQ_IXP4XX_UART2,
|
||||
+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
|
||||
+ .iotype = UPIO_MEM,
|
||||
+ .regshift = 2,
|
||||
+ .uartclk = IXP4XX_UART_XTAL,
|
||||
+ },
|
||||
+ { },
|
||||
+};
|
||||
+
|
||||
+static struct platform_device pronghornmetro_uart = {
|
||||
+ .name = "serial8250",
|
||||
+ .id = PLAT8250_DEV_PLATFORM,
|
||||
+ .dev = {
|
||||
+ .platform_data = pronghornmetro_uart_data,
|
||||
+ },
|
||||
+ .num_resources = 1,
|
||||
+ .resource = &pronghornmetro_uart_resource,
|
||||
+};
|
||||
+
|
||||
+static struct resource pronghornmetro_pata_resources[] = {
|
||||
+ {
|
||||
+ .flags = IORESOURCE_MEM
|
||||
+ },
|
||||
+ {
|
||||
+ .flags = IORESOURCE_MEM,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "intrq",
|
||||
+ .start = IRQ_IXP4XX_GPIO0,
|
||||
+ .end = IRQ_IXP4XX_GPIO0,
|
||||
+ .flags = IORESOURCE_IRQ,
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
+static struct ixp4xx_pata_data pronghornmetro_pata_data = {
|
||||
+ .cs0_bits = 0xbfff0043,
|
||||
+ .cs1_bits = 0xbfff0043,
|
||||
+};
|
||||
+
|
||||
+static struct platform_device pronghornmetro_pata = {
|
||||
+ .name = "pata_ixp4xx_cf",
|
||||
+ .id = 0,
|
||||
+ .dev.platform_data = &pronghornmetro_pata_data,
|
||||
+ .num_resources = ARRAY_SIZE(pronghornmetro_pata_resources),
|
||||
+ .resource = pronghornmetro_pata_resources,
|
||||
+};
|
||||
+
|
||||
+static struct platform_device *pronghornmetro_devices[] __initdata = {
|
||||
+ &pronghornmetro_flash,
|
||||
+ &pronghornmetro_uart,
|
||||
+};
|
||||
+
|
||||
+static void __init pronghornmetro_init(void)
|
||||
+{
|
||||
+ ixp4xx_sys_init();
|
||||
+
|
||||
+ pronghornmetro_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
|
||||
+ pronghornmetro_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_16M - 1;
|
||||
+
|
||||
+ *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE;
|
||||
+ *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
|
||||
+
|
||||
+ platform_add_devices(pronghornmetro_devices, ARRAY_SIZE(pronghornmetro_devices));
|
||||
+
|
||||
+ pronghornmetro_pata_resources[0].start = IXP4XX_EXP_BUS_BASE(1);
|
||||
+ pronghornmetro_pata_resources[0].end = IXP4XX_EXP_BUS_END(1);
|
||||
+
|
||||
+ pronghornmetro_pata_resources[1].start = IXP4XX_EXP_BUS_BASE(2);
|
||||
+ pronghornmetro_pata_resources[1].end = IXP4XX_EXP_BUS_END(2);
|
||||
+
|
||||
+ pronghornmetro_pata_data.cs0_cfg = IXP4XX_EXP_CS1;
|
||||
+ pronghornmetro_pata_data.cs1_cfg = IXP4XX_EXP_CS2;
|
||||
+
|
||||
+ platform_device_register(&pronghornmetro_pata);
|
||||
+}
|
||||
+
|
||||
+#ifdef CONFIG_MACH_PRONGHORNMETRO
|
||||
+MACHINE_START(PRONGHORNMETRO, "ADI Engineering Pronghorn Metro")
|
||||
+ /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
|
||||
+ .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
|
||||
+ .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
|
||||
+ .map_io = ixp4xx_map_io,
|
||||
+ .init_irq = ixp4xx_init_irq,
|
||||
+ .timer = &ixp4xx_timer,
|
||||
+ .boot_params = 0x0100,
|
||||
+ .init_machine = pronghornmetro_init,
|
||||
+MACHINE_END
|
||||
+#endif
|
||||
Index: linux-2.6.24/Documentation/arm/IXP4xx
|
||||
===================================================================
|
||||
--- linux-2.6.24.orig/Documentation/arm/IXP4xx 2008-03-12 21:20:48.000000000 +1030
|
||||
+++ linux-2.6.24/Documentation/arm/IXP4xx 2008-03-12 21:21:26.000000000 +1030
|
||||
@@ -111,6 +111,9 @@
|
||||
the platform has two mini-PCI slots used for 802.11[bga] cards.
|
||||
Finally, there is an IDE port hanging off the expansion bus.
|
||||
|
||||
+ADI Engineering Pronghorn Metro Platform
|
||||
+http://www.adiengineering.com/php-bin/ecomm4/productDisplay.php?category_id=30&product_id=85
|
||||
+
|
||||
Gateworks Avila Network Platform
|
||||
http://www.gateworks.com/avila_sbc.htm
|
||||
|
||||
Index: linux-2.6.24/include/asm-arm/arch-ixp4xx/uncompress.h
|
||||
===================================================================
|
||||
--- linux-2.6.24.orig/include/asm-arm/arch-ixp4xx/uncompress.h 2008-03-12 21:20:48.000000000 +1030
|
||||
+++ linux-2.6.24/include/asm-arm/arch-ixp4xx/uncompress.h 2008-03-12 21:21:26.000000000 +1030
|
||||
@@ -41,7 +41,8 @@
|
||||
* Some boards are using UART2 as console
|
||||
*/
|
||||
if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
|
||||
- machine_is_gateway7001() || machine_is_wg302v2())
|
||||
+ machine_is_gateway7001() || machine_is_wg302v2() ||
|
||||
+ machine_is_pronghorn_metro())
|
||||
uart_base = (volatile u32*) IXP4XX_UART2_BASE_PHYS;
|
||||
else
|
||||
uart_base = (volatile u32*) IXP4XX_UART1_BASE_PHYS;
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/pronghornmetro-setup.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
|
||||
--- linux-2.6.23/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2007-10-22 15:41:27.000000000 +0200
|
||||
+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2007-10-22 15:43:30.000000000 +0200
|
||||
@@ -104,9 +104,36 @@
|
||||
.resource = pronghornmetro_pata_resources,
|
||||
};
|
||||
|
||||
+/* Built-in 10/100 Ethernet MAC interfaces */
|
||||
+static struct eth_plat_info pronghornmetro_plat_eth[] = {
|
||||
+ {
|
||||
+ .phy = 0,
|
||||
+ .rxq = 3,
|
||||
+ .txreadyq = 20,
|
||||
+ }, {
|
||||
+ .phy = 1,
|
||||
+ .rxq = 4,
|
||||
+ .txreadyq = 21,
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
+static struct platform_device pronghornmetro_eth[] = {
|
||||
+ {
|
||||
+ .name = "ixp4xx_eth",
|
||||
+ .id = IXP4XX_ETH_NPEB,
|
||||
+ .dev.platform_data = pronghornmetro_plat_eth,
|
||||
+ }, {
|
||||
+ .name = "ixp4xx_eth",
|
||||
+ .id = IXP4XX_ETH_NPEC,
|
||||
+ .dev.platform_data = pronghornmetro_plat_eth + 1,
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
static struct platform_device *pronghornmetro_devices[] __initdata = {
|
||||
&pronghornmetro_flash,
|
||||
&pronghornmetro_uart,
|
||||
+ &pronghornmetro_eth[0],
|
||||
+ &pronghornmetro_eth[1],
|
||||
};
|
||||
|
||||
static void __init pronghornmetro_init(void)
|
||||
|
|
@ -0,0 +1,189 @@
|
|||
Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Kconfig 2008-03-12 21:21:26.000000000 +1030
|
||||
+++ linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig 2008-03-12 21:21:26.000000000 +1030
|
||||
@@ -65,6 +65,14 @@
|
||||
Engineering Pronghorn Metro Platform. For more
|
||||
information on this platform, see <file:Documentation/arm/IXP4xx>.
|
||||
|
||||
+config MACH_COMPEX
|
||||
+ bool "Compex WP18 / NP18A"
|
||||
+ select PCI
|
||||
+ help
|
||||
+ Say 'Y' here if you want your kernel to support Compex'
|
||||
+ WP18 or NP18A boards. For more information on this
|
||||
+ platform, see http://openwrt.org
|
||||
+
|
||||
config ARCH_IXDP425
|
||||
bool "IXDP425"
|
||||
help
|
||||
Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:26.000000000 +1030
|
||||
+++ linux-2.6.24/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:26.000000000 +1030
|
||||
@@ -17,6 +17,7 @@
|
||||
obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o
|
||||
obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
|
||||
obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
|
||||
+obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o
|
||||
|
||||
obj-y += common.o
|
||||
|
||||
@@ -32,5 +33,6 @@
|
||||
obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o
|
||||
obj-$(CONFIG_MACH_FSG) += fsg-setup.o
|
||||
obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o
|
||||
+obj-$(CONFIG_MACH_COMPEX) += compex-setup.o
|
||||
|
||||
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
|
||||
Index: linux-2.6.24/arch/arm/mach-ixp4xx/compex-setup.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.24/arch/arm/mach-ixp4xx/compex-setup.c 2008-03-12 21:21:26.000000000 +1030
|
||||
@@ -0,0 +1,120 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-ixp4xx/compex-setup.c
|
||||
+ *
|
||||
+ * Ccompex WP18 / NP18A board-setup
|
||||
+ *
|
||||
+ * Copyright (C) 2007 Imre Kaloz <Kaloz@openwrt.org>
|
||||
+ *
|
||||
+ * based on ixdp425-setup.c:
|
||||
+ * Copyright (C) 2003-2005 MontaVista Software, Inc.
|
||||
+ *
|
||||
+ * Author: Imre Kaloz <Kaloz@openwrt.org>
|
||||
+ */
|
||||
+
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/init.h>
|
||||
+#include <linux/device.h>
|
||||
+#include <linux/serial.h>
|
||||
+#include <linux/tty.h>
|
||||
+#include <linux/serial_8250.h>
|
||||
+#include <linux/slab.h>
|
||||
+
|
||||
+#include <asm/types.h>
|
||||
+#include <asm/setup.h>
|
||||
+#include <asm/memory.h>
|
||||
+#include <asm/hardware.h>
|
||||
+#include <asm/mach-types.h>
|
||||
+#include <asm/irq.h>
|
||||
+#include <asm/mach/arch.h>
|
||||
+#include <asm/mach/flash.h>
|
||||
+
|
||||
+static struct flash_platform_data compex_flash_data = {
|
||||
+ .map_name = "cfi_probe",
|
||||
+ .width = 2,
|
||||
+};
|
||||
+
|
||||
+static struct resource compex_flash_resource = {
|
||||
+ .flags = IORESOURCE_MEM,
|
||||
+};
|
||||
+
|
||||
+static struct platform_device compex_flash = {
|
||||
+ .name = "IXP4XX-Flash",
|
||||
+ .id = 0,
|
||||
+ .dev = {
|
||||
+ .platform_data = &compex_flash_data,
|
||||
+ },
|
||||
+ .num_resources = 1,
|
||||
+ .resource = &compex_flash_resource,
|
||||
+};
|
||||
+
|
||||
+static struct resource compex_uart_resources[] = {
|
||||
+ {
|
||||
+ .start = IXP4XX_UART1_BASE_PHYS,
|
||||
+ .end = IXP4XX_UART1_BASE_PHYS + 0x0fff,
|
||||
+ .flags = IORESOURCE_MEM
|
||||
+ },
|
||||
+ {
|
||||
+ .start = IXP4XX_UART2_BASE_PHYS,
|
||||
+ .end = IXP4XX_UART2_BASE_PHYS + 0x0fff,
|
||||
+ .flags = IORESOURCE_MEM
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
+static struct plat_serial8250_port compex_uart_data[] = {
|
||||
+ {
|
||||
+ .mapbase = IXP4XX_UART1_BASE_PHYS,
|
||||
+ .membase = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET,
|
||||
+ .irq = IRQ_IXP4XX_UART1,
|
||||
+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
|
||||
+ .iotype = UPIO_MEM,
|
||||
+ .regshift = 2,
|
||||
+ .uartclk = IXP4XX_UART_XTAL,
|
||||
+ },
|
||||
+ {
|
||||
+ .mapbase = IXP4XX_UART2_BASE_PHYS,
|
||||
+ .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
|
||||
+ .irq = IRQ_IXP4XX_UART2,
|
||||
+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
|
||||
+ .iotype = UPIO_MEM,
|
||||
+ .regshift = 2,
|
||||
+ .uartclk = IXP4XX_UART_XTAL,
|
||||
+ },
|
||||
+ { },
|
||||
+};
|
||||
+
|
||||
+static struct platform_device compex_uart = {
|
||||
+ .name = "serial8250",
|
||||
+ .id = PLAT8250_DEV_PLATFORM,
|
||||
+ .dev.platform_data = compex_uart_data,
|
||||
+ .num_resources = 2,
|
||||
+ .resource = compex_uart_resources,
|
||||
+};
|
||||
+
|
||||
+static struct platform_device *compex_devices[] __initdata = {
|
||||
+ &compex_flash,
|
||||
+ &compex_uart
|
||||
+};
|
||||
+
|
||||
+static void __init compex_init(void)
|
||||
+{
|
||||
+ ixp4xx_sys_init();
|
||||
+
|
||||
+ compex_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
|
||||
+ compex_flash_resource.end =
|
||||
+ IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1;
|
||||
+
|
||||
+ platform_add_devices(compex_devices, ARRAY_SIZE(compex_devices));
|
||||
+}
|
||||
+
|
||||
+#ifdef CONFIG_MACH_COMPEX
|
||||
+MACHINE_START(COMPEX, "Compex WP18 / NP18A")
|
||||
+ /* Maintainer: Imre Kaloz <Kaloz@openwrt.org> */
|
||||
+ .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
|
||||
+ .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
|
||||
+ .map_io = ixp4xx_map_io,
|
||||
+ .init_irq = ixp4xx_init_irq,
|
||||
+ .timer = &ixp4xx_timer,
|
||||
+ .boot_params = 0x0100,
|
||||
+ .init_machine = compex_init,
|
||||
+MACHINE_END
|
||||
+#endif
|
||||
Index: linux-2.6.24/arch/arm/mach-ixp4xx/ixdp425-pci.c
|
||||
===================================================================
|
||||
--- linux-2.6.24.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c 2008-03-12 21:20:48.000000000 +1030
|
||||
+++ linux-2.6.24/arch/arm/mach-ixp4xx/ixdp425-pci.c 2008-03-12 21:21:26.000000000 +1030
|
||||
@@ -66,7 +66,7 @@
|
||||
int __init ixdp425_pci_init(void)
|
||||
{
|
||||
if (machine_is_ixdp425() || machine_is_ixcdp1100() ||
|
||||
- machine_is_ixdp465() || machine_is_kixrp435())
|
||||
+ machine_is_ixdp465() || machine_is_kixrp435() || machine_is_compex())
|
||||
pci_common_init(&ixdp425_pci);
|
||||
return 0;
|
||||
}
|
||||
Index: linux-2.6.24/arch/arm/tools/mach-types
|
||||
===================================================================
|
||||
--- linux-2.6.24.orig/arch/arm/tools/mach-types 2008-03-12 21:20:48.000000000 +1030
|
||||
+++ linux-2.6.24/arch/arm/tools/mach-types 2008-03-12 21:21:26.000000000 +1030
|
||||
@@ -1278,7 +1278,7 @@
|
||||
smdk6400 MACH_SMDK6400 SMDK6400 1270
|
||||
nokia_n800 MACH_NOKIA_N800 NOKIA_N800 1271
|
||||
greenphone MACH_GREENPHONE GREENPHONE 1272
|
||||
-compex42x MACH_COMPEXWP18 COMPEXWP18 1273
|
||||
+compex MACH_COMPEX COMPEX 1273
|
||||
xmate MACH_XMATE XMATE 1274
|
||||
energizer MACH_ENERGIZER ENERGIZER 1275
|
||||
ime1 MACH_IME1 IME1 1276
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/compex-setup.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/compex-setup.c
|
||||
--- linux-2.6.23/arch/arm/mach-ixp4xx/compex-setup.c 2007-10-23 18:39:29.000000000 +0200
|
||||
+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/compex-setup.c 2007-10-23 18:45:34.000000000 +0200
|
||||
@@ -90,9 +90,36 @@
|
||||
.resource = compex_uart_resources,
|
||||
};
|
||||
|
||||
+/* Built-in 10/100 Ethernet MAC interfaces */
|
||||
+static struct eth_plat_info compex_plat_eth[] = {
|
||||
+ {
|
||||
+ .phy = -1,
|
||||
+ .rxq = 3,
|
||||
+ .txreadyq = 20,
|
||||
+ }, {
|
||||
+ .phy = 3,
|
||||
+ .rxq = 4,
|
||||
+ .txreadyq = 21,
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
+static struct platform_device compex_eth[] = {
|
||||
+ {
|
||||
+ .name = "ixp4xx_eth",
|
||||
+ .id = IXP4XX_ETH_NPEB,
|
||||
+ .dev.platform_data = compex_plat_eth,
|
||||
+ }, {
|
||||
+ .name = "ixp4xx_eth",
|
||||
+ .id = IXP4XX_ETH_NPEC,
|
||||
+ .dev.platform_data = compex_plat_eth + 1,
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
static struct platform_device *compex_devices[] __initdata = {
|
||||
&compex_flash,
|
||||
- &compex_uart
|
||||
+ &compex_uart,
|
||||
+ &compex_eth[0],
|
||||
+ &compex_eth[1],
|
||||
};
|
||||
|
||||
static void __init compex_init(void)
|
||||
|
|
@ -0,0 +1,234 @@
|
|||
Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Kconfig 2008-03-12 21:21:26.000000000 +1030
|
||||
+++ linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig 2008-03-12 21:21:27.000000000 +1030
|
||||
@@ -73,6 +73,14 @@
|
||||
WP18 or NP18A boards. For more information on this
|
||||
platform, see http://openwrt.org
|
||||
|
||||
+config MACH_WRT300NV2
|
||||
+ bool "Linksys WRT300N v2"
|
||||
+ select PCI
|
||||
+ help
|
||||
+ Say 'Y' here if you want your kernel to support Linksys'
|
||||
+ WRT300N v2 router. For more information on this
|
||||
+ platform, see http://openwrt.org
|
||||
+
|
||||
config ARCH_IXDP425
|
||||
bool "IXDP425"
|
||||
help
|
||||
Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:26.000000000 +1030
|
||||
+++ linux-2.6.24/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:27.000000000 +1030
|
||||
@@ -18,6 +18,7 @@
|
||||
obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
|
||||
obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
|
||||
obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o
|
||||
+obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o
|
||||
|
||||
obj-y += common.o
|
||||
|
||||
@@ -34,5 +35,6 @@
|
||||
obj-$(CONFIG_MACH_FSG) += fsg-setup.o
|
||||
obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o
|
||||
obj-$(CONFIG_MACH_COMPEX) += compex-setup.o
|
||||
+obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o
|
||||
|
||||
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
|
||||
Index: linux-2.6.24/arch/arm/mach-ixp4xx/wrt300nv2-pci.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.24/arch/arm/mach-ixp4xx/wrt300nv2-pci.c 2008-03-12 21:21:27.000000000 +1030
|
||||
@@ -0,0 +1,65 @@
|
||||
+/*
|
||||
+ * arch/arch/mach-ixp4xx/wrt300nv2-pci.c
|
||||
+ *
|
||||
+ * PCI setup routines for Linksys WRT300N v2
|
||||
+ *
|
||||
+ * Copyright (C) 2007 Imre Kaloz <kaloz@openwrt.org>
|
||||
+ *
|
||||
+ * based on coyote-pci.c:
|
||||
+ * Copyright (C) 2002 Jungo Software Technologies.
|
||||
+ * Copyright (C) 2003 MontaVista Softwrae, Inc.
|
||||
+ *
|
||||
+ * Maintainer: Imre Kaloz <kaloz@openwrt.org>
|
||||
+ *
|
||||
+ * 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/kernel.h>
|
||||
+#include <linux/pci.h>
|
||||
+#include <linux/init.h>
|
||||
+#include <linux/irq.h>
|
||||
+
|
||||
+#include <asm/mach-types.h>
|
||||
+#include <asm/hardware.h>
|
||||
+#include <asm/irq.h>
|
||||
+
|
||||
+#include <asm/mach/pci.h>
|
||||
+
|
||||
+extern void ixp4xx_pci_preinit(void);
|
||||
+extern int ixp4xx_setup(int nr, struct pci_sys_data *sys);
|
||||
+extern struct pci_bus *ixp4xx_scan_bus(int nr, struct pci_sys_data *sys);
|
||||
+
|
||||
+void __init wrt300nv2_pci_preinit(void)
|
||||
+{
|
||||
+ set_irq_type(IRQ_IXP4XX_GPIO8, IRQT_LOW);
|
||||
+
|
||||
+ ixp4xx_pci_preinit();
|
||||
+}
|
||||
+
|
||||
+static int __init wrt300nv2_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
+{
|
||||
+ if (slot == 1)
|
||||
+ return IRQ_IXP4XX_GPIO8;
|
||||
+ else return -1;
|
||||
+}
|
||||
+
|
||||
+struct hw_pci wrt300nv2_pci __initdata = {
|
||||
+ .nr_controllers = 1,
|
||||
+ .preinit = wrt300nv2_pci_preinit,
|
||||
+ .swizzle = pci_std_swizzle,
|
||||
+ .setup = ixp4xx_setup,
|
||||
+ .scan = ixp4xx_scan_bus,
|
||||
+ .map_irq = wrt300nv2_map_irq,
|
||||
+};
|
||||
+
|
||||
+int __init wrt300nv2_pci_init(void)
|
||||
+{
|
||||
+ if (machine_is_wrt300nv2())
|
||||
+ pci_common_init(&wrt300nv2_pci);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+subsys_initcall(wrt300nv2_pci_init);
|
||||
Index: linux-2.6.24/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.24/arch/arm/mach-ixp4xx/wrt300nv2-setup.c 2008-03-12 21:21:27.000000000 +1030
|
||||
@@ -0,0 +1,108 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-ixp4xx/wrt300nv2-setup.c
|
||||
+ *
|
||||
+ * Board setup for the Linksys WRT300N v2
|
||||
+ *
|
||||
+ * Copyright (C) 2007 Imre Kaloz <Kaloz@openwrt.org>
|
||||
+ *
|
||||
+ * based on coyote-setup.c:
|
||||
+ * Copyright (C) 2003-2005 MontaVista Software, Inc.
|
||||
+ *
|
||||
+ * Author: Imre Kaloz <Kaloz@openwrt.org>
|
||||
+ */
|
||||
+
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/init.h>
|
||||
+#include <linux/device.h>
|
||||
+#include <linux/serial.h>
|
||||
+#include <linux/tty.h>
|
||||
+#include <linux/serial_8250.h>
|
||||
+#include <linux/slab.h>
|
||||
+
|
||||
+#include <asm/types.h>
|
||||
+#include <asm/setup.h>
|
||||
+#include <asm/memory.h>
|
||||
+#include <asm/hardware.h>
|
||||
+#include <asm/irq.h>
|
||||
+#include <asm/mach-types.h>
|
||||
+#include <asm/mach/arch.h>
|
||||
+#include <asm/mach/flash.h>
|
||||
+
|
||||
+static struct flash_platform_data wrt300nv2_flash_data = {
|
||||
+ .map_name = "cfi_probe",
|
||||
+ .width = 2,
|
||||
+};
|
||||
+
|
||||
+static struct resource wrt300nv2_flash_resource = {
|
||||
+ .flags = IORESOURCE_MEM,
|
||||
+};
|
||||
+
|
||||
+static struct platform_device wrt300nv2_flash = {
|
||||
+ .name = "IXP4XX-Flash",
|
||||
+ .id = 0,
|
||||
+ .dev = {
|
||||
+ .platform_data = &wrt300nv2_flash_data,
|
||||
+ },
|
||||
+ .num_resources = 1,
|
||||
+ .resource = &wrt300nv2_flash_resource,
|
||||
+};
|
||||
+
|
||||
+static struct resource wrt300nv2_uart_resource = {
|
||||
+ .start = IXP4XX_UART2_BASE_PHYS,
|
||||
+ .end = IXP4XX_UART2_BASE_PHYS + 0x0fff,
|
||||
+ .flags = IORESOURCE_MEM,
|
||||
+};
|
||||
+
|
||||
+static struct plat_serial8250_port wrt300nv2_uart_data[] = {
|
||||
+ {
|
||||
+ .mapbase = IXP4XX_UART2_BASE_PHYS,
|
||||
+ .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
|
||||
+ .irq = IRQ_IXP4XX_UART2,
|
||||
+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
|
||||
+ .iotype = UPIO_MEM,
|
||||
+ .regshift = 2,
|
||||
+ .uartclk = IXP4XX_UART_XTAL,
|
||||
+ },
|
||||
+ { },
|
||||
+};
|
||||
+
|
||||
+static struct platform_device wrt300nv2_uart = {
|
||||
+ .name = "serial8250",
|
||||
+ .id = PLAT8250_DEV_PLATFORM,
|
||||
+ .dev = {
|
||||
+ .platform_data = wrt300nv2_uart_data,
|
||||
+ },
|
||||
+ .num_resources = 1,
|
||||
+ .resource = &wrt300nv2_uart_resource,
|
||||
+};
|
||||
+
|
||||
+static struct platform_device *wrt300nv2_devices[] __initdata = {
|
||||
+ &wrt300nv2_flash,
|
||||
+ &wrt300nv2_uart
|
||||
+};
|
||||
+
|
||||
+static void __init wrt300nv2_init(void)
|
||||
+{
|
||||
+ ixp4xx_sys_init();
|
||||
+
|
||||
+ wrt300nv2_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
|
||||
+ wrt300nv2_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1;
|
||||
+
|
||||
+ *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE;
|
||||
+ *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
|
||||
+
|
||||
+ platform_add_devices(wrt300nv2_devices, ARRAY_SIZE(wrt300nv2_devices));
|
||||
+}
|
||||
+
|
||||
+#ifdef CONFIG_MACH_WRT300NV2
|
||||
+MACHINE_START(WRT300NV2, "Linksys WRT300N v2")
|
||||
+ /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
|
||||
+ .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
|
||||
+ .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
|
||||
+ .map_io = ixp4xx_map_io,
|
||||
+ .init_irq = ixp4xx_init_irq,
|
||||
+ .timer = &ixp4xx_timer,
|
||||
+ .boot_params = 0x0100,
|
||||
+ .init_machine = wrt300nv2_init,
|
||||
+MACHINE_END
|
||||
+#endif
|
||||
Index: linux-2.6.24/include/asm-arm/arch-ixp4xx/uncompress.h
|
||||
===================================================================
|
||||
--- linux-2.6.24.orig/include/asm-arm/arch-ixp4xx/uncompress.h 2008-03-12 21:21:26.000000000 +1030
|
||||
+++ linux-2.6.24/include/asm-arm/arch-ixp4xx/uncompress.h 2008-03-12 21:21:27.000000000 +1030
|
||||
@@ -42,7 +42,7 @@
|
||||
*/
|
||||
if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
|
||||
machine_is_gateway7001() || machine_is_wg302v2() ||
|
||||
- machine_is_pronghorn_metro())
|
||||
+ machine_is_pronghorn_metro() || machine_is_wrt300nv2())
|
||||
uart_base = (volatile u32*) IXP4XX_UART2_BASE_PHYS;
|
||||
else
|
||||
uart_base = (volatile u32*) IXP4XX_UART1_BASE_PHYS;
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/wrt300nv2-setup.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
|
||||
--- linux-2.6.23/arch/arm/mach-ixp4xx/wrt300nv2-setup.c 2007-10-23 19:20:08.000000000 +0200
|
||||
+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/wrt300nv2-setup.c 2007-10-23 19:22:19.000000000 +0200
|
||||
@@ -76,9 +76,36 @@
|
||||
.resource = &wrt300nv2_uart_resource,
|
||||
};
|
||||
|
||||
+/* Built-in 10/100 Ethernet MAC interfaces */
|
||||
+static struct eth_plat_info wrt300nv2_plat_eth[] = {
|
||||
+ {
|
||||
+ .phy = -1,
|
||||
+ .rxq = 3,
|
||||
+ .txreadyq = 20,
|
||||
+ }, {
|
||||
+ .phy = 1,
|
||||
+ .rxq = 4,
|
||||
+ .txreadyq = 21,
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
+static struct platform_device wrt300nv2_eth[] = {
|
||||
+ {
|
||||
+ .name = "ixp4xx_eth",
|
||||
+ .id = IXP4XX_ETH_NPEB,
|
||||
+ .dev.platform_data = wrt300nv2_plat_eth,
|
||||
+ }, {
|
||||
+ .name = "ixp4xx_eth",
|
||||
+ .id = IXP4XX_ETH_NPEC,
|
||||
+ .dev.platform_data = wrt300nv2_plat_eth + 1,
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
static struct platform_device *wrt300nv2_devices[] __initdata = {
|
||||
&wrt300nv2_flash,
|
||||
- &wrt300nv2_uart
|
||||
+ &wrt300nv2_uart,
|
||||
+ &wrt300nv2_eth[0],
|
||||
+ &wrt300nv2_eth[1],
|
||||
};
|
||||
|
||||
static void __init wrt300nv2_init(void)
|
||||
|
|
@ -0,0 +1,240 @@
|
|||
diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Kconfig linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Kconfig
|
||||
--- linux-2.6.23/arch/arm/mach-ixp4xx/Kconfig 2007-10-23 19:20:08.000000000 +0200
|
||||
+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Kconfig 2007-10-23 19:26:46.000000000 +0200
|
||||
@@ -65,6 +65,14 @@
|
||||
Engineering Pronghorn Metro Platform. For more
|
||||
information on this platform, see <file:Documentation/arm/IXP4xx>.
|
||||
|
||||
+config MACH_SIDEWINDER
|
||||
+ bool "Sidewinder"
|
||||
+ select PCI
|
||||
+ help
|
||||
+ Say 'Y' here if you want your kernel to support the ADI
|
||||
+ Engineering Sidewinder Platform. For more
|
||||
+ information on this platform, see <file:Documentation/arm/IXP4xx>.
|
||||
+
|
||||
config MACH_COMPEX
|
||||
bool "Compex WP18 / NP18A"
|
||||
select PCI
|
||||
@@ -163,7 +171,7 @@
|
||||
#
|
||||
config CPU_IXP46X
|
||||
bool
|
||||
- depends on MACH_IXDP465
|
||||
+ depends on MACH_IXDP465 || MACH_SIDEWINDER
|
||||
default y
|
||||
|
||||
config CPU_IXP43X
|
||||
diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Makefile linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Makefile
|
||||
--- linux-2.6.23/arch/arm/mach-ixp4xx/Makefile 2007-10-23 19:20:08.000000000 +0200
|
||||
+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Makefile 2007-10-23 19:23:52.000000000 +0200
|
||||
@@ -19,6 +19,7 @@
|
||||
obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
|
||||
obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o
|
||||
obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o
|
||||
+obj-pci-$(CONFIG_MACH_SIDEWINDER) += sidewinder-pci.o
|
||||
|
||||
obj-y += common.o
|
||||
|
||||
@@ -36,6 +37,7 @@
|
||||
obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o
|
||||
obj-$(CONFIG_MACH_COMPEX) += compex-setup.o
|
||||
obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o
|
||||
+obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
|
||||
|
||||
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
|
||||
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
|
||||
diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/sidewinder-pci.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/sidewinder-pci.c
|
||||
--- linux-2.6.23/arch/arm/mach-ixp4xx/sidewinder-pci.c 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/sidewinder-pci.c 2007-10-23 19:23:52.000000000 +0200
|
||||
@@ -0,0 +1,71 @@
|
||||
+/*
|
||||
+ * arch/arch/mach-ixp4xx/pronghornmetro-pci.c
|
||||
+ *
|
||||
+ * PCI setup routines for ADI Engineering Sidewinder
|
||||
+ *
|
||||
+ * Copyright (C) 2007 Imre Kaloz <kaloz@openwrt.org>
|
||||
+ *
|
||||
+ * based on coyote-pci.c:
|
||||
+ * Copyright (C) 2002 Jungo Software Technologies.
|
||||
+ * Copyright (C) 2003 MontaVista Softwrae, Inc.
|
||||
+ *
|
||||
+ * Maintainer: Imre Kaloz <kaloz@openwrt.org>
|
||||
+ *
|
||||
+ * 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/kernel.h>
|
||||
+#include <linux/pci.h>
|
||||
+#include <linux/init.h>
|
||||
+#include <linux/irq.h>
|
||||
+
|
||||
+#include <asm/mach-types.h>
|
||||
+#include <asm/hardware.h>
|
||||
+#include <asm/irq.h>
|
||||
+
|
||||
+#include <asm/mach/pci.h>
|
||||
+
|
||||
+extern void ixp4xx_pci_preinit(void);
|
||||
+extern int ixp4xx_setup(int nr, struct pci_sys_data *sys);
|
||||
+extern struct pci_bus *ixp4xx_scan_bus(int nr, struct pci_sys_data *sys);
|
||||
+
|
||||
+void __init sidewinder_pci_preinit(void)
|
||||
+{
|
||||
+ set_irq_type(IRQ_IXP4XX_GPIO11, IRQT_LOW);
|
||||
+ set_irq_type(IRQ_IXP4XX_GPIO10, IRQT_LOW);
|
||||
+ set_irq_type(IRQ_IXP4XX_GPIO9, IRQT_LOW);
|
||||
+
|
||||
+ ixp4xx_pci_preinit();
|
||||
+}
|
||||
+
|
||||
+static int __init sidewinder_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
+{
|
||||
+ if (slot == 1)
|
||||
+ return IRQ_IXP4XX_GPIO11;
|
||||
+ else if (slot == 2)
|
||||
+ return IRQ_IXP4XX_GPIO10;
|
||||
+ else if (slot == 3)
|
||||
+ return IRQ_IXP4XX_GPIO9;
|
||||
+ else return -1;
|
||||
+}
|
||||
+
|
||||
+struct hw_pci sidewinder_pci __initdata = {
|
||||
+ .nr_controllers = 1,
|
||||
+ .preinit = sidewinder_pci_preinit,
|
||||
+ .swizzle = pci_std_swizzle,
|
||||
+ .setup = ixp4xx_setup,
|
||||
+ .scan = ixp4xx_scan_bus,
|
||||
+ .map_irq = sidewinder_map_irq,
|
||||
+};
|
||||
+
|
||||
+int __init sidewinder_pci_init(void)
|
||||
+{
|
||||
+ if (machine_is_sidewinder())
|
||||
+ pci_common_init(&sidewinder_pci);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+subsys_initcall(sidewinder_pci_init);
|
||||
diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/sidewinder-setup.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/sidewinder-setup.c
|
||||
--- linux-2.6.23/arch/arm/mach-ixp4xx/sidewinder-setup.c 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/sidewinder-setup.c 2007-10-23 19:23:52.000000000 +0200
|
||||
@@ -0,0 +1,115 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-ixp4xx/sidewinder-setup.c
|
||||
+ *
|
||||
+ * Board setup for the ADI Engineering Sidewinder
|
||||
+ *
|
||||
+ * Copyright (C) 2007 Imre Kaloz <Kaloz@openwrt.org>
|
||||
+ *
|
||||
+ * based on coyote-setup.c:
|
||||
+ * Copyright (C) 2003-2005 MontaVista Software, Inc.
|
||||
+ *
|
||||
+ * Author: Imre Kaloz <Kaloz@openwrt.org>
|
||||
+ */
|
||||
+
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/serial.h>
|
||||
+#include <linux/serial_8250.h>
|
||||
+
|
||||
+#include <asm/mach-types.h>
|
||||
+#include <asm/mach/arch.h>
|
||||
+#include <asm/mach/flash.h>
|
||||
+
|
||||
+static struct flash_platform_data sidewinder_flash_data = {
|
||||
+ .map_name = "cfi_probe",
|
||||
+ .width = 2,
|
||||
+};
|
||||
+
|
||||
+static struct resource sidewinder_flash_resource = {
|
||||
+ .flags = IORESOURCE_MEM,
|
||||
+};
|
||||
+
|
||||
+static struct platform_device sidewinder_flash = {
|
||||
+ .name = "IXP4XX-Flash",
|
||||
+ .id = 0,
|
||||
+ .dev = {
|
||||
+ .platform_data = &sidewinder_flash_data,
|
||||
+ },
|
||||
+ .num_resources = 1,
|
||||
+ .resource = &sidewinder_flash_resource,
|
||||
+};
|
||||
+
|
||||
+static struct resource sidewinder_uart_resources[] = {
|
||||
+ {
|
||||
+ .start = IXP4XX_UART1_BASE_PHYS,
|
||||
+ .end = IXP4XX_UART1_BASE_PHYS + 0x0fff,
|
||||
+ .flags = IORESOURCE_MEM,
|
||||
+ },
|
||||
+ {
|
||||
+ .start = IXP4XX_UART2_BASE_PHYS,
|
||||
+ .end = IXP4XX_UART2_BASE_PHYS + 0x0fff,
|
||||
+ .flags = IORESOURCE_MEM,
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
+static struct plat_serial8250_port sidewinder_uart_data[] = {
|
||||
+ {
|
||||
+ .mapbase = IXP4XX_UART1_BASE_PHYS,
|
||||
+ .membase = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET,
|
||||
+ .irq = IRQ_IXP4XX_UART1,
|
||||
+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
|
||||
+ .iotype = UPIO_MEM,
|
||||
+ .regshift = 2,
|
||||
+ .uartclk = IXP4XX_UART_XTAL,
|
||||
+ },
|
||||
+ {
|
||||
+ .mapbase = IXP4XX_UART2_BASE_PHYS,
|
||||
+ .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
|
||||
+ .irq = IRQ_IXP4XX_UART2,
|
||||
+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
|
||||
+ .iotype = UPIO_MEM,
|
||||
+ .regshift = 2,
|
||||
+ .uartclk = IXP4XX_UART_XTAL,
|
||||
+ },
|
||||
+ { },
|
||||
+};
|
||||
+
|
||||
+static struct platform_device sidewinder_uart = {
|
||||
+ .name = "serial8250",
|
||||
+ .id = PLAT8250_DEV_PLATFORM,
|
||||
+ .dev = {
|
||||
+ .platform_data = sidewinder_uart_data,
|
||||
+ },
|
||||
+ .num_resources = 2,
|
||||
+ .resource = &sidewinder_uart_resources,
|
||||
+};
|
||||
+
|
||||
+static struct platform_device *sidewinder_devices[] __initdata = {
|
||||
+ &sidewinder_flash,
|
||||
+ &sidewinder_uart,
|
||||
+};
|
||||
+
|
||||
+static void __init sidewinder_init(void)
|
||||
+{
|
||||
+ ixp4xx_sys_init();
|
||||
+
|
||||
+ sidewinder_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
|
||||
+ sidewinder_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_64M - 1;
|
||||
+
|
||||
+ *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE;
|
||||
+ *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
|
||||
+
|
||||
+ platform_add_devices(sidewinder_devices, ARRAY_SIZE(sidewinder_devices));
|
||||
+}
|
||||
+
|
||||
+#ifdef CONFIG_MACH_SIDEWINDER
|
||||
+MACHINE_START(SIDEWINDER, "ADI Engineering Sidewinder")
|
||||
+ /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
|
||||
+ .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
|
||||
+ .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
|
||||
+ .map_io = ixp4xx_map_io,
|
||||
+ .init_irq = ixp4xx_init_irq,
|
||||
+ .timer = &ixp4xx_timer,
|
||||
+ .boot_params = 0x0100,
|
||||
+ .init_machine = sidewinder_init,
|
||||
+MACHINE_END
|
||||
+#endif
|
||||
|
|
@ -0,0 +1,204 @@
|
|||
diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/ap1000-setup.c linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/ap1000-setup.c
|
||||
--- linux-2.6.23.1/arch/arm/mach-ixp4xx/ap1000-setup.c 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/ap1000-setup.c 2007-11-14 13:58:58.000000000 +0100
|
||||
@@ -0,0 +1,151 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-ixp4xx/ap1000-setup.c
|
||||
+ *
|
||||
+ * Lanready AP-1000
|
||||
+ *
|
||||
+ * Copyright (C) 2007 Imre Kaloz <Kaloz@openwrt.org>
|
||||
+ *
|
||||
+ * based on ixdp425-setup.c:
|
||||
+ * Copyright (C) 2003-2005 MontaVista Software, Inc.
|
||||
+ *
|
||||
+ * Author: Imre Kaloz <Kaloz@openwrt.org>
|
||||
+ */
|
||||
+
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/init.h>
|
||||
+#include <linux/device.h>
|
||||
+#include <linux/serial.h>
|
||||
+#include <linux/tty.h>
|
||||
+#include <linux/serial_8250.h>
|
||||
+#include <linux/slab.h>
|
||||
+
|
||||
+#include <asm/types.h>
|
||||
+#include <asm/setup.h>
|
||||
+#include <asm/memory.h>
|
||||
+#include <asm/hardware.h>
|
||||
+#include <asm/mach-types.h>
|
||||
+#include <asm/irq.h>
|
||||
+#include <asm/mach/arch.h>
|
||||
+#include <asm/mach/flash.h>
|
||||
+
|
||||
+static struct flash_platform_data ap1000_flash_data = {
|
||||
+ .map_name = "cfi_probe",
|
||||
+ .width = 2,
|
||||
+};
|
||||
+
|
||||
+static struct resource ap1000_flash_resource = {
|
||||
+ .flags = IORESOURCE_MEM,
|
||||
+};
|
||||
+
|
||||
+static struct platform_device ap1000_flash = {
|
||||
+ .name = "IXP4XX-Flash",
|
||||
+ .id = 0,
|
||||
+ .dev = {
|
||||
+ .platform_data = &ap1000_flash_data,
|
||||
+ },
|
||||
+ .num_resources = 1,
|
||||
+ .resource = &ap1000_flash_resource,
|
||||
+};
|
||||
+
|
||||
+static struct resource ap1000_uart_resources[] = {
|
||||
+ {
|
||||
+ .start = IXP4XX_UART1_BASE_PHYS,
|
||||
+ .end = IXP4XX_UART1_BASE_PHYS + 0x0fff,
|
||||
+ .flags = IORESOURCE_MEM
|
||||
+ },
|
||||
+ {
|
||||
+ .start = IXP4XX_UART2_BASE_PHYS,
|
||||
+ .end = IXP4XX_UART2_BASE_PHYS + 0x0fff,
|
||||
+ .flags = IORESOURCE_MEM
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
+static struct plat_serial8250_port ap1000_uart_data[] = {
|
||||
+ {
|
||||
+ .mapbase = IXP4XX_UART1_BASE_PHYS,
|
||||
+ .membase = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET,
|
||||
+ .irq = IRQ_IXP4XX_UART1,
|
||||
+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
|
||||
+ .iotype = UPIO_MEM,
|
||||
+ .regshift = 2,
|
||||
+ .uartclk = IXP4XX_UART_XTAL,
|
||||
+ },
|
||||
+ {
|
||||
+ .mapbase = IXP4XX_UART2_BASE_PHYS,
|
||||
+ .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
|
||||
+ .irq = IRQ_IXP4XX_UART2,
|
||||
+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
|
||||
+ .iotype = UPIO_MEM,
|
||||
+ .regshift = 2,
|
||||
+ .uartclk = IXP4XX_UART_XTAL,
|
||||
+ },
|
||||
+ { },
|
||||
+};
|
||||
+
|
||||
+static struct platform_device ap1000_uart = {
|
||||
+ .name = "serial8250",
|
||||
+ .id = PLAT8250_DEV_PLATFORM,
|
||||
+ .dev.platform_data = ap1000_uart_data,
|
||||
+ .num_resources = 2,
|
||||
+ .resource = ap1000_uart_resources
|
||||
+};
|
||||
+
|
||||
+static struct platform_device *ap1000_devices[] __initdata = {
|
||||
+ &ap1000_flash,
|
||||
+ &ap1000_uart
|
||||
+};
|
||||
+
|
||||
+static char ap1000_mem_fixup[] __initdata = "mem=64M ";
|
||||
+
|
||||
+static void __init ap1000_fixup(struct machine_desc *desc,
|
||||
+ struct tag *tags, char **cmdline, struct meminfo *mi)
|
||||
+
|
||||
+{
|
||||
+ struct tag *t = tags;
|
||||
+ char *p = *cmdline;
|
||||
+
|
||||
+ /* Find the end of the tags table, taking note of any cmdline tag. */
|
||||
+ for (; t->hdr.size; t = tag_next(t)) {
|
||||
+ if (t->hdr.tag == ATAG_CMDLINE) {
|
||||
+ p = t->u.cmdline.cmdline;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ /* Overwrite the end of the table with a new cmdline tag. */
|
||||
+ t->hdr.tag = ATAG_CMDLINE;
|
||||
+ t->hdr.size = (sizeof (struct tag_header) +
|
||||
+ strlen(ap1000_mem_fixup) + strlen(p) + 1 + 4) >> 2;
|
||||
+ strlcpy(t->u.cmdline.cmdline, ap1000_mem_fixup, COMMAND_LINE_SIZE);
|
||||
+ strlcpy(t->u.cmdline.cmdline + strlen(ap1000_mem_fixup), p,
|
||||
+ COMMAND_LINE_SIZE - strlen(ap1000_mem_fixup));
|
||||
+
|
||||
+ /* Terminate the table. */
|
||||
+ t = tag_next(t);
|
||||
+ t->hdr.tag = ATAG_NONE;
|
||||
+ t->hdr.size = 0;
|
||||
+}
|
||||
+
|
||||
+static void __init ap1000_init(void)
|
||||
+{
|
||||
+ ixp4xx_sys_init();
|
||||
+
|
||||
+ ap1000_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
|
||||
+ ap1000_flash_resource.end =
|
||||
+ IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;
|
||||
+
|
||||
+ platform_add_devices(ap1000_devices, ARRAY_SIZE(ap1000_devices));
|
||||
+}
|
||||
+
|
||||
+#ifdef CONFIG_MACH_AP1000
|
||||
+MACHINE_START(AP1000, "Lanready AP-1000")
|
||||
+ /* Maintainer: Imre Kaloz <Kaloz@openwrt.org> */
|
||||
+ .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
|
||||
+ .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
|
||||
+ .fixup = ap1000_fixup,
|
||||
+ .map_io = ixp4xx_map_io,
|
||||
+ .init_irq = ixp4xx_init_irq,
|
||||
+ .timer = &ixp4xx_timer,
|
||||
+ .boot_params = 0x0100,
|
||||
+ .init_machine = ap1000_init,
|
||||
+MACHINE_END
|
||||
+#endif
|
||||
diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/ixdp425-pci.c linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/ixdp425-pci.c
|
||||
--- linux-2.6.23.1/arch/arm/mach-ixp4xx/ixdp425-pci.c 2007-11-14 13:15:50.000000000 +0100
|
||||
+++ linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/ixdp425-pci.c 2007-11-14 13:27:16.000000000 +0100
|
||||
@@ -66,7 +66,8 @@
|
||||
int __init ixdp425_pci_init(void)
|
||||
{
|
||||
if (machine_is_ixdp425() || machine_is_ixcdp1100() ||
|
||||
- machine_is_ixdp465() || machine_is_kixrp435() || machine_is_compex())
|
||||
+ machine_is_ixdp465() || machine_is_kixrp435() ||
|
||||
+ machine_is_compex() || machine_is_ap1000())
|
||||
pci_common_init(&ixdp425_pci);
|
||||
return 0;
|
||||
}
|
||||
diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/Kconfig linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/Kconfig
|
||||
--- linux-2.6.23.1/arch/arm/mach-ixp4xx/Kconfig 2007-11-14 13:15:50.000000000 +0100
|
||||
+++ linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/Kconfig 2007-11-14 13:25:07.000000000 +0100
|
||||
@@ -89,6 +89,14 @@
|
||||
WRT300N v2 router. For more information on this
|
||||
platform, see http://openwrt.org
|
||||
|
||||
+config MACH_AP1000
|
||||
+ bool "Lanready AP-1000"
|
||||
+ select PCI
|
||||
+ help
|
||||
+ Say 'Y' here if you want your kernel to support Lanready's
|
||||
+ AP1000 board. For more information on this
|
||||
+ platform, see http://openwrt.org
|
||||
+
|
||||
config ARCH_IXDP425
|
||||
bool "IXDP425"
|
||||
help
|
||||
diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/Makefile linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/Makefile
|
||||
--- linux-2.6.23.1/arch/arm/mach-ixp4xx/Makefile 2007-11-14 13:15:50.000000000 +0100
|
||||
+++ linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/Makefile 2007-11-14 13:31:29.000000000 +0100
|
||||
@@ -20,6 +20,7 @@
|
||||
obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o
|
||||
obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o
|
||||
obj-pci-$(CONFIG_MACH_SIDEWINDER) += sidewinder-pci.o
|
||||
+obj-pci-$(CONFIG_MACH_AP1000) += ixdp425-pci.o
|
||||
|
||||
obj-y += common.o
|
||||
|
||||
@@ -38,5 +39,6 @@
|
||||
obj-$(CONFIG_MACH_COMPEX) += compex-setup.o
|
||||
obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o
|
||||
obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
|
||||
+obj-$(CONFIG_MACH_AP1000) += ap1000-setup.o
|
||||
|
||||
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/ap1000-setup.c linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/ap1000-setup.c
|
||||
--- linux-2.6.23.1/arch/arm/mach-ixp4xx/ap1000-setup.c 2007-11-14 14:11:10.000000000 +0100
|
||||
+++ linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/ap1000-setup.c 2007-11-14 14:09:30.000000000 +0100
|
||||
@@ -90,9 +90,36 @@
|
||||
.resource = ap1000_uart_resources
|
||||
};
|
||||
|
||||
+/* Built-in 10/100 Ethernet MAC interfaces */
|
||||
+static struct eth_plat_info ap1000_plat_eth[] = {
|
||||
+ {
|
||||
+ .phy = 4,
|
||||
+ .rxq = 3,
|
||||
+ .txreadyq = 20,
|
||||
+ }, {
|
||||
+ .phy = 5,
|
||||
+ .rxq = 4,
|
||||
+ .txreadyq = 21,
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
+static struct platform_device ap1000_eth[] = {
|
||||
+ {
|
||||
+ .name = "ixp4xx_eth",
|
||||
+ .id = IXP4XX_ETH_NPEB,
|
||||
+ .dev.platform_data = ap1000_plat_eth,
|
||||
+ }, {
|
||||
+ .name = "ixp4xx_eth",
|
||||
+ .id = IXP4XX_ETH_NPEC,
|
||||
+ .dev.platform_data = ap1000_plat_eth + 1,
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
static struct platform_device *ap1000_devices[] __initdata = {
|
||||
&ap1000_flash,
|
||||
- &ap1000_uart
|
||||
+ &ap1000_uart,
|
||||
+ &ap1000_eth[0],
|
||||
+ &ap1000_eth[1],
|
||||
};
|
||||
|
||||
static char ap1000_mem_fixup[] __initdata = "mem=64M ";
|
||||
|
|
@ -0,0 +1,221 @@
|
|||
Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Kconfig 2008-03-12 21:21:28.000000000 +1030
|
||||
+++ linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig 2008-03-12 21:21:29.000000000 +1030
|
||||
@@ -49,6 +49,14 @@
|
||||
7001 Access Point. For more information on this platform,
|
||||
see http://openwrt.org
|
||||
|
||||
+config MACH_WG302V1
|
||||
+ bool "Netgear WG302 v1 / WAG302 v1"
|
||||
+ select PCI
|
||||
+ help
|
||||
+ Say 'Y' here if you want your kernel to support Netgear's
|
||||
+ WG302 v1 or WAG302 v1 Access Points. For more information
|
||||
+ on this platform, see http://openwrt.org
|
||||
+
|
||||
config MACH_WG302V2
|
||||
bool "Netgear WG302 v2 / WAG302 v2"
|
||||
select PCI
|
||||
Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:28.000000000 +1030
|
||||
+++ linux-2.6.24/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:29.000000000 +1030
|
||||
@@ -14,6 +14,7 @@
|
||||
obj-pci-$(CONFIG_MACH_NAS100D) += nas100d-pci.o
|
||||
obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o
|
||||
obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o
|
||||
+obj-pci-$(CONFIG_MACH_WG302V1) += wg302v1-pci.o
|
||||
obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o
|
||||
obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
|
||||
obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
|
||||
@@ -33,6 +34,7 @@
|
||||
obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o nas100d-power.o
|
||||
obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o dsmg600-power.o
|
||||
obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o
|
||||
+obj-$(CONFIG_MACH_WG302V1) += wg302v1-setup.o
|
||||
obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o
|
||||
obj-$(CONFIG_MACH_FSG) += fsg-setup.o
|
||||
obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o
|
||||
Index: linux-2.6.24/arch/arm/mach-ixp4xx/wg302v1-pci.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.24/arch/arm/mach-ixp4xx/wg302v1-pci.c 2008-03-12 21:21:29.000000000 +1030
|
||||
@@ -0,0 +1,63 @@
|
||||
+/*
|
||||
+ * arch/arch/mach-ixp4xx/wg302v1-pci.c
|
||||
+ *
|
||||
+ * PCI setup routines for the Netgear WG302 v1 and WAG302 v1
|
||||
+ *
|
||||
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
|
||||
+ *
|
||||
+ * based on coyote-pci.c:
|
||||
+ * Copyright (C) 2002 Jungo Software Technologies.
|
||||
+ * Copyright (C) 2003 MontaVista Software, Inc.
|
||||
+ *
|
||||
+ * Maintainer: Imre Kaloz <kaloz@openwrt.org>
|
||||
+ *
|
||||
+ * 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/kernel.h>
|
||||
+#include <linux/pci.h>
|
||||
+#include <linux/init.h>
|
||||
+#include <linux/irq.h>
|
||||
+
|
||||
+#include <asm/mach-types.h>
|
||||
+#include <asm/hardware.h>
|
||||
+
|
||||
+#include <asm/mach/pci.h>
|
||||
+
|
||||
+void __init wg302v1_pci_preinit(void)
|
||||
+{
|
||||
+ set_irq_type(IRQ_IXP4XX_GPIO8, IRQT_LOW);
|
||||
+ set_irq_type(IRQ_IXP4XX_GPIO10, IRQT_LOW);
|
||||
+
|
||||
+ ixp4xx_pci_preinit();
|
||||
+}
|
||||
+
|
||||
+static int __init wg302v1_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
+{
|
||||
+ if (slot == 1)
|
||||
+ return IRQ_IXP4XX_GPIO8;
|
||||
+ else if (slot == 2)
|
||||
+ return IRQ_IXP4XX_GPIO10;
|
||||
+ else return -1;
|
||||
+}
|
||||
+
|
||||
+struct hw_pci wg302v1_pci __initdata = {
|
||||
+ .nr_controllers = 1,
|
||||
+ .preinit = wg302v1_pci_preinit,
|
||||
+ .swizzle = pci_std_swizzle,
|
||||
+ .setup = ixp4xx_setup,
|
||||
+ .scan = ixp4xx_scan_bus,
|
||||
+ .map_irq = wg302v1_map_irq,
|
||||
+};
|
||||
+
|
||||
+int __init wg302v1_pci_init(void)
|
||||
+{
|
||||
+ if (machine_is_wg302v1())
|
||||
+ pci_common_init(&wg302v1_pci);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+subsys_initcall(wg302v1_pci_init);
|
||||
Index: linux-2.6.24/arch/arm/mach-ixp4xx/wg302v1-setup.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.24/arch/arm/mach-ixp4xx/wg302v1-setup.c 2008-03-12 21:21:29.000000000 +1030
|
||||
@@ -0,0 +1,109 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-ixp4xx/wg302v1-setup.c
|
||||
+ *
|
||||
+ * Board setup for the Netgear WG302 v1 and WAG302 v1
|
||||
+ *
|
||||
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
|
||||
+ *
|
||||
+ * based on coyote-setup.c:
|
||||
+ * Copyright (C) 2003-2005 MontaVista Software, Inc.
|
||||
+ *
|
||||
+ * Author: Imre Kaloz <kaloz@openwrt.org>
|
||||
+ *
|
||||
+ */
|
||||
+
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/init.h>
|
||||
+#include <linux/device.h>
|
||||
+#include <linux/serial.h>
|
||||
+#include <linux/tty.h>
|
||||
+#include <linux/serial_8250.h>
|
||||
+#include <linux/slab.h>
|
||||
+
|
||||
+#include <asm/types.h>
|
||||
+#include <asm/setup.h>
|
||||
+#include <asm/memory.h>
|
||||
+#include <asm/hardware.h>
|
||||
+#include <asm/irq.h>
|
||||
+#include <asm/mach-types.h>
|
||||
+#include <asm/mach/arch.h>
|
||||
+#include <asm/mach/flash.h>
|
||||
+
|
||||
+static struct flash_platform_data wg302v1_flash_data = {
|
||||
+ .map_name = "cfi_probe",
|
||||
+ .width = 2,
|
||||
+};
|
||||
+
|
||||
+static struct resource wg302v1_flash_resource = {
|
||||
+ .flags = IORESOURCE_MEM,
|
||||
+};
|
||||
+
|
||||
+static struct platform_device wg302v1_flash = {
|
||||
+ .name = "IXP4XX-Flash",
|
||||
+ .id = 0,
|
||||
+ .dev = {
|
||||
+ .platform_data = &wg302v1_flash_data,
|
||||
+ },
|
||||
+ .num_resources = 1,
|
||||
+ .resource = &wg302v1_flash_resource,
|
||||
+};
|
||||
+
|
||||
+static struct resource wg302v1_uart_resource = {
|
||||
+ .start = IXP4XX_UART1_BASE_PHYS,
|
||||
+ .end = IXP4XX_UART1_BASE_PHYS + 0x0fff,
|
||||
+ .flags = IORESOURCE_MEM,
|
||||
+};
|
||||
+
|
||||
+static struct plat_serial8250_port wg302v1_uart_data[] = {
|
||||
+ {
|
||||
+ .mapbase = IXP4XX_UART1_BASE_PHYS,
|
||||
+ .membase = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET,
|
||||
+ .irq = IRQ_IXP4XX_UART1,
|
||||
+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
|
||||
+ .iotype = UPIO_MEM,
|
||||
+ .regshift = 2,
|
||||
+ .uartclk = IXP4XX_UART_XTAL,
|
||||
+ },
|
||||
+ { },
|
||||
+};
|
||||
+
|
||||
+static struct platform_device wg302v1_uart = {
|
||||
+ .name = "serial8250",
|
||||
+ .id = PLAT8250_DEV_PLATFORM,
|
||||
+ .dev = {
|
||||
+ .platform_data = wg302v1_uart_data,
|
||||
+ },
|
||||
+ .num_resources = 1,
|
||||
+ .resource = &wg302v1_uart_resource,
|
||||
+};
|
||||
+
|
||||
+static struct platform_device *wg302v1_devices[] __initdata = {
|
||||
+ &wg302v1_flash,
|
||||
+ &wg302v1_uart,
|
||||
+};
|
||||
+
|
||||
+static void __init wg302v1_init(void)
|
||||
+{
|
||||
+ ixp4xx_sys_init();
|
||||
+
|
||||
+ wg302v1_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
|
||||
+ wg302v1_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1;
|
||||
+
|
||||
+ *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE;
|
||||
+ *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
|
||||
+
|
||||
+ platform_add_devices(wg302v1_devices, ARRAY_SIZE(wg302v1_devices));
|
||||
+}
|
||||
+
|
||||
+#ifdef CONFIG_MACH_WG302V1
|
||||
+MACHINE_START(WG302V1, "Netgear WG302 v1 / WAG302 v1")
|
||||
+ /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
|
||||
+ .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
|
||||
+ .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
|
||||
+ .map_io = ixp4xx_map_io,
|
||||
+ .init_irq = ixp4xx_init_irq,
|
||||
+ .timer = &ixp4xx_timer,
|
||||
+ .boot_params = 0x0100,
|
||||
+ .init_machine = wg302v1_init,
|
||||
+MACHINE_END
|
||||
+#endif
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
diff -Nur linux-2.6.23.12/arch/arm/mach-ixp4xx/wg302v1-setup.c linux-2.6.23.12-owrt/arch/arm/mach-ixp4xx/wg302v1-setup.c
|
||||
--- linux-2.6.23.12/arch/arm/mach-ixp4xx/wg302v1-setup.c 2008-01-14 23:06:42.000000000 +0100
|
||||
+++ linux-2.6.23.12-owrt/arch/arm/mach-ixp4xx/wg302v1-setup.c 2008-01-14 23:03:16.000000000 +0100
|
||||
@@ -77,9 +77,27 @@
|
||||
.resource = &wg302v1_uart_resource,
|
||||
};
|
||||
|
||||
+/* Built-in 10/100 Ethernet MAC interfaces */
|
||||
+static struct eth_plat_info wg302_plat_eth[] = {
|
||||
+ {
|
||||
+ .phy = 30,
|
||||
+ .rxq = 3,
|
||||
+ .txreadyq = 20,
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
+static struct platform_device wg302_eth[] = {
|
||||
+ {
|
||||
+ .name = "ixp4xx_eth",
|
||||
+ .id = IXP4XX_ETH_NPEB,
|
||||
+ .dev.platform_data = wg302_plat_eth,
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
static struct platform_device *wg302v1_devices[] __initdata = {
|
||||
&wg302v1_flash,
|
||||
&wg302v1_uart,
|
||||
+ &wg302_eth[0],
|
||||
};
|
||||
|
||||
static void __init wg302v1_init(void)
|
||||
|
|
@ -0,0 +1,48 @@
|
|||
diff -Nur linux-2.6.23.12/arch/arm/mach-ixp4xx/wg302v1-setup.c linux-2.6.23.12-owrt/arch/arm/mach-ixp4xx/wg302v1-setup.c
|
||||
--- linux-2.6.23.12/arch/arm/mach-ixp4xx/wg302v1-setup.c 2008-01-14 23:12:03.000000000 +0100
|
||||
+++ linux-2.6.23.12-owrt/arch/arm/mach-ixp4xx/wg302v1-setup.c 2008-01-14 23:11:34.000000000 +0100
|
||||
@@ -100,6 +100,36 @@
|
||||
&wg302_eth[0],
|
||||
};
|
||||
|
||||
+static char wg302v1_mem_fixup[] __initdata = "mem=32M ";
|
||||
+
|
||||
+static void __init wg302v1_fixup(struct machine_desc *desc,
|
||||
+ struct tag *tags, char **cmdline, struct meminfo *mi)
|
||||
+
|
||||
+{
|
||||
+ struct tag *t = tags;
|
||||
+ char *p = *cmdline;
|
||||
+
|
||||
+ /* Find the end of the tags table, taking note of any cmdline tag. */
|
||||
+ for (; t->hdr.size; t = tag_next(t)) {
|
||||
+ if (t->hdr.tag == ATAG_CMDLINE) {
|
||||
+ p = t->u.cmdline.cmdline;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ /* Overwrite the end of the table with a new cmdline tag. */
|
||||
+ t->hdr.tag = ATAG_CMDLINE;
|
||||
+ t->hdr.size = (sizeof (struct tag_header) +
|
||||
+ strlen(wg302v1_mem_fixup) + strlen(p) + 1 + 4) >> 2;
|
||||
+ strlcpy(t->u.cmdline.cmdline, wg302v1_mem_fixup, COMMAND_LINE_SIZE);
|
||||
+ strlcpy(t->u.cmdline.cmdline + strlen(wg302v1_mem_fixup), p,
|
||||
+ COMMAND_LINE_SIZE - strlen(wg302v1_mem_fixup));
|
||||
+
|
||||
+ /* Terminate the table. */
|
||||
+ t = tag_next(t);
|
||||
+ t->hdr.tag = ATAG_NONE;
|
||||
+ t->hdr.size = 0;
|
||||
+}
|
||||
+
|
||||
static void __init wg302v1_init(void)
|
||||
{
|
||||
ixp4xx_sys_init();
|
||||
@@ -118,6 +148,7 @@
|
||||
/* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
|
||||
.phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
|
||||
.io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
|
||||
+ .fixup = wg302v1_fixup,
|
||||
.map_io = ixp4xx_map_io,
|
||||
.init_irq = ixp4xx_init_irq,
|
||||
.timer = &ixp4xx_timer,
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
--- linux-2.6.24.2/arch/arm/mach-ixp4xx/coyote-setup.c 2008-02-11 06:51:11.000000000 +0100
|
||||
+++ linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/coyote-setup.c 2008-04-07 12:39:48.000000000 +0200
|
||||
@@ -73,9 +73,37 @@
|
||||
.resource = &coyote_uart_resource,
|
||||
};
|
||||
|
||||
+/* Built-in 10/100 Ethernet MAC interfaces */
|
||||
+static struct eth_plat_info ixdpg425_plat_eth[] = {
|
||||
+ {
|
||||
+ .phy = 5,
|
||||
+ .rxq = 3,
|
||||
+ .txreadyq = 20,
|
||||
+ }, {
|
||||
+ .phy = 4,
|
||||
+ .rxq = 4,
|
||||
+ .txreadyq = 21,
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
+static struct platform_device ixdpg425_eth[] = {
|
||||
+ {
|
||||
+ .name = "ixp4xx_eth",
|
||||
+ .id = IXP4XX_ETH_NPEB,
|
||||
+ .dev.platform_data = ixdpg425_plat_eth,
|
||||
+ }, {
|
||||
+ .name = "ixp4xx_eth",
|
||||
+ .id = IXP4XX_ETH_NPEC,
|
||||
+ .dev.platform_data = ixdpg425_plat_eth + 1,
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
+
|
||||
static struct platform_device *coyote_devices[] __initdata = {
|
||||
&coyote_flash,
|
||||
- &coyote_uart
|
||||
+ &coyote_uart,
|
||||
+ &ixdpg425_eth[0],
|
||||
+ &ixdpg425_eth[1],
|
||||
};
|
||||
|
||||
static void __init coyote_init(void)
|
||||
|
|
@ -0,0 +1,288 @@
|
|||
diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/Kconfig linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/Kconfig
|
||||
--- linux-2.6.24.2/arch/arm/mach-ixp4xx/Kconfig 2008-04-09 01:34:46.000000000 +0200
|
||||
+++ linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/Kconfig 2008-04-09 00:06:48.000000000 +0200
|
||||
@@ -150,6 +150,14 @@
|
||||
PrPCM1100 Processor Mezanine Module. For more information on
|
||||
this platform, see <file:Documentation/arm/IXP4xx>.
|
||||
|
||||
+config MACH_TW5334
|
||||
+ bool "Titan Wireless TW-533-4"
|
||||
+ select PCI
|
||||
+ help
|
||||
+ Say 'Y' here if you want your kernel to support the Titan
|
||||
+ Wireless TW533-4. For more information on this platform,
|
||||
+ see http://openwrt.org
|
||||
+
|
||||
config MACH_NAS100D
|
||||
bool
|
||||
prompt "NAS100D"
|
||||
diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/Makefile linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/Makefile
|
||||
--- linux-2.6.24.2/arch/arm/mach-ixp4xx/Makefile 2008-04-09 01:34:46.000000000 +0200
|
||||
+++ linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/Makefile 2008-04-09 00:07:45.000000000 +0200
|
||||
@@ -22,6 +22,7 @@
|
||||
obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o
|
||||
obj-pci-$(CONFIG_MACH_SIDEWINDER) += sidewinder-pci.o
|
||||
obj-pci-$(CONFIG_MACH_AP1000) += ixdp425-pci.o
|
||||
+obj-pci-$(CONFIG_MACH_TW5334) += tw5334-pci.o
|
||||
|
||||
obj-y += common.o
|
||||
|
||||
@@ -42,6 +43,7 @@
|
||||
obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o
|
||||
obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
|
||||
obj-$(CONFIG_MACH_AP1000) += ap1000-setup.o
|
||||
+obj-$(CONFIG_MACH_TW5334) += tw5334-setup.o
|
||||
|
||||
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
|
||||
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
|
||||
diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/tw5334-setup.c linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/tw5334-setup.c
|
||||
--- linux-2.6.24.2/arch/arm/mach-ixp4xx/tw5334-setup.c 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/tw5334-setup.c 2008-04-09 01:58:52.000000000 +0200
|
||||
@@ -0,0 +1,162 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-ixp4xx/tw5334-setup.c
|
||||
+ *
|
||||
+ * Board setup for the Titan Wireless TW-533-4
|
||||
+ *
|
||||
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
|
||||
+ *
|
||||
+ * based on coyote-setup.c:
|
||||
+ * Copyright (C) 2003-2005 MontaVista Software, Inc.
|
||||
+ *
|
||||
+ * Author: Imre Kaloz <Kaloz@openwrt.org>
|
||||
+ */
|
||||
+
|
||||
+#include <linux/if_ether.h>
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/init.h>
|
||||
+#include <linux/device.h>
|
||||
+#include <linux/serial.h>
|
||||
+#include <linux/tty.h>
|
||||
+#include <linux/serial_8250.h>
|
||||
+#include <linux/slab.h>
|
||||
+
|
||||
+#include <asm/types.h>
|
||||
+#include <asm/setup.h>
|
||||
+#include <asm/memory.h>
|
||||
+#include <asm/hardware.h>
|
||||
+#include <asm/irq.h>
|
||||
+#include <asm/mach-types.h>
|
||||
+#include <asm/mach/arch.h>
|
||||
+#include <asm/mach/flash.h>
|
||||
+
|
||||
+static struct flash_platform_data tw5334_flash_data = {
|
||||
+ .map_name = "cfi_probe",
|
||||
+ .width = 2,
|
||||
+};
|
||||
+
|
||||
+static struct resource tw5334_flash_resource = {
|
||||
+ .flags = IORESOURCE_MEM,
|
||||
+};
|
||||
+
|
||||
+static struct platform_device tw5334_flash = {
|
||||
+ .name = "IXP4XX-Flash",
|
||||
+ .id = 0,
|
||||
+ .dev = {
|
||||
+ .platform_data = &tw5334_flash_data,
|
||||
+ },
|
||||
+ .num_resources = 1,
|
||||
+ .resource = &tw5334_flash_resource,
|
||||
+};
|
||||
+
|
||||
+static struct resource tw5334_uart_resource = {
|
||||
+ .start = IXP4XX_UART2_BASE_PHYS,
|
||||
+ .end = IXP4XX_UART2_BASE_PHYS + 0x0fff,
|
||||
+ .flags = IORESOURCE_MEM,
|
||||
+};
|
||||
+
|
||||
+static struct plat_serial8250_port tw5334_uart_data[] = {
|
||||
+ {
|
||||
+ .mapbase = IXP4XX_UART2_BASE_PHYS,
|
||||
+ .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
|
||||
+ .irq = IRQ_IXP4XX_UART2,
|
||||
+ .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
|
||||
+ .iotype = UPIO_MEM,
|
||||
+ .regshift = 2,
|
||||
+ .uartclk = IXP4XX_UART_XTAL,
|
||||
+ },
|
||||
+ { },
|
||||
+};
|
||||
+
|
||||
+static struct platform_device tw5334_uart = {
|
||||
+ .name = "serial8250",
|
||||
+ .id = PLAT8250_DEV_PLATFORM,
|
||||
+ .dev = {
|
||||
+ .platform_data = tw5334_uart_data,
|
||||
+ },
|
||||
+ .num_resources = 1,
|
||||
+ .resource = &tw5334_uart_resource,
|
||||
+};
|
||||
+
|
||||
+/* Built-in 10/100 Ethernet MAC interfaces */
|
||||
+static struct eth_plat_info tw5334_plat_eth[] = {
|
||||
+ {
|
||||
+ .phy = 0,
|
||||
+ .rxq = 3,
|
||||
+ .txreadyq = 20,
|
||||
+ }, {
|
||||
+ .phy = 1,
|
||||
+ .rxq = 4,
|
||||
+ .txreadyq = 21,
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
+static struct platform_device tw5334_eth[] = {
|
||||
+ {
|
||||
+ .name = "ixp4xx_eth",
|
||||
+ .id = IXP4XX_ETH_NPEB,
|
||||
+ .dev.platform_data = tw5334_plat_eth,
|
||||
+ }, {
|
||||
+ .name = "ixp4xx_eth",
|
||||
+ .id = IXP4XX_ETH_NPEC,
|
||||
+ .dev.platform_data = tw5334_plat_eth + 1,
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
+static struct platform_device *tw5334_devices[] __initdata = {
|
||||
+ &tw5334_flash,
|
||||
+ &tw5334_uart,
|
||||
+ &tw5334_eth[0],
|
||||
+ &tw5334_eth[1],
|
||||
+};
|
||||
+
|
||||
+static void __init tw5334_init(void)
|
||||
+{
|
||||
+ DECLARE_MAC_BUF(mac_buf);
|
||||
+ uint8_t __iomem *f;
|
||||
+ int i;
|
||||
+
|
||||
+ ixp4xx_sys_init();
|
||||
+
|
||||
+ tw5334_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
|
||||
+ tw5334_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1;
|
||||
+
|
||||
+ *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE;
|
||||
+ *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
|
||||
+
|
||||
+ platform_add_devices(tw5334_devices, ARRAY_SIZE(tw5334_devices));
|
||||
+
|
||||
+ /*
|
||||
+ * Map in a portion of the flash and read the MAC addresses.
|
||||
+ * Since it is stored in BE in the flash itself, we need to
|
||||
+ * byteswap it if we're in LE mode.
|
||||
+ */
|
||||
+ f = ioremap(IXP4XX_EXP_BUS_BASE(0), 0x1000000);
|
||||
+ if (f) {
|
||||
+ for (i = 0; i < 6; i++)
|
||||
+#ifdef __ARMEB__
|
||||
+ tw5334_plat_eth[0].hwaddr[i] = readb(f + 0xFC0422 + i);
|
||||
+ tw5334_plat_eth[1].hwaddr[i] = readb(f + 0xFC043B + i);
|
||||
+#else
|
||||
+ tw5334_plat_eth[0].hwaddr[i] = readb(f + 0xFC0422 + (i^3));
|
||||
+ tw5334_plat_eth[1].hwaddr[i] = readb(f + 0xFC043B + (i^3));
|
||||
+#endif
|
||||
+ iounmap(f);
|
||||
+ }
|
||||
+ printk(KERN_INFO "TW-533-4: Using MAC address %s for port 0\n",
|
||||
+ print_mac(mac_buf, tw5334_plat_eth[0].hwaddr));
|
||||
+ printk(KERN_INFO "TW-533-4: Using MAC address %s for port 1\n",
|
||||
+ print_mac(mac_buf, tw5334_plat_eth[1].hwaddr));
|
||||
+}
|
||||
+
|
||||
+#ifdef CONFIG_MACH_TW5334
|
||||
+MACHINE_START(TW5334, "Titan Wireless TW-533-4")
|
||||
+ /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
|
||||
+ .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
|
||||
+ .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
|
||||
+ .map_io = ixp4xx_map_io,
|
||||
+ .init_irq = ixp4xx_init_irq,
|
||||
+ .timer = &ixp4xx_timer,
|
||||
+ .boot_params = 0x0100,
|
||||
+ .init_machine = tw5334_init,
|
||||
+MACHINE_END
|
||||
+#endif
|
||||
diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/tw5334-pci.c linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/tw5334-pci.c
|
||||
--- linux-2.6.24.2/arch/arm/mach-ixp4xx/tw5334-pci.c 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/tw5334-pci.c 2008-04-09 00:35:32.000000000 +0200
|
||||
@@ -0,0 +1,69 @@
|
||||
+/*
|
||||
+ * arch/arch/mach-ixp4xx/tw5334-pci.c
|
||||
+ *
|
||||
+ * PCI setup routines for the Titan Wireless TW-533-4
|
||||
+ *
|
||||
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
|
||||
+ *
|
||||
+ * based on coyote-pci.c:
|
||||
+ * Copyright (C) 2002 Jungo Software Technologies.
|
||||
+ * Copyright (C) 2003 MontaVista Softwrae, Inc.
|
||||
+ *
|
||||
+ * Maintainer: Imre Kaloz <kaloz@openwrt.org>
|
||||
+ *
|
||||
+ * 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/kernel.h>
|
||||
+#include <linux/pci.h>
|
||||
+#include <linux/init.h>
|
||||
+#include <linux/irq.h>
|
||||
+
|
||||
+#include <asm/mach-types.h>
|
||||
+#include <asm/hardware.h>
|
||||
+
|
||||
+#include <asm/mach/pci.h>
|
||||
+
|
||||
+void __init tw5334_pci_preinit(void)
|
||||
+{
|
||||
+ set_irq_type(IRQ_IXP4XX_GPIO6, IRQT_LOW);
|
||||
+ set_irq_type(IRQ_IXP4XX_GPIO2, IRQT_LOW);
|
||||
+ set_irq_type(IRQ_IXP4XX_GPIO1, IRQT_LOW);
|
||||
+ set_irq_type(IRQ_IXP4XX_GPIO0, IRQT_LOW);
|
||||
+
|
||||
+ ixp4xx_pci_preinit();
|
||||
+}
|
||||
+
|
||||
+static int __init tw5334_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
+{
|
||||
+ if (slot == 12)
|
||||
+ return IRQ_IXP4XX_GPIO6;
|
||||
+ else if (slot == 13)
|
||||
+ return IRQ_IXP4XX_GPIO2;
|
||||
+ else if (slot == 14)
|
||||
+ return IRQ_IXP4XX_GPIO1;
|
||||
+ else if (slot == 15)
|
||||
+ return IRQ_IXP4XX_GPIO0;
|
||||
+ else return -1;
|
||||
+}
|
||||
+
|
||||
+struct hw_pci tw5334_pci __initdata = {
|
||||
+ .nr_controllers = 1,
|
||||
+ .preinit = tw5334_pci_preinit,
|
||||
+ .swizzle = pci_std_swizzle,
|
||||
+ .setup = ixp4xx_setup,
|
||||
+ .scan = ixp4xx_scan_bus,
|
||||
+ .map_irq = tw5334_map_irq,
|
||||
+};
|
||||
+
|
||||
+int __init tw5334_pci_init(void)
|
||||
+{
|
||||
+ if (machine_is_tw5334())
|
||||
+ pci_common_init(&tw5334_pci);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+subsys_initcall(tw5334_pci_init);
|
||||
--- linux-2.6.24.2/include/asm-arm/arch-ixp4xx/uncompress.h 2008-04-07 08:59:19.000000000 +0200
|
||||
+++ linux-2.6.24.2-owrt/include/asm-arm/arch-ixp4xx/uncompress.h 2008-04-09 13:22:42.000000000 +0200
|
||||
@@ -42,7 +42,8 @@
|
||||
*/
|
||||
if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
|
||||
machine_is_gateway7001() || machine_is_wg302v2() ||
|
||||
- machine_is_pronghorn_metro() || machine_is_wrt300nv2())
|
||||
+ machine_is_pronghorn_metro() || machine_is_wrt300nv2() ||
|
||||
+ machine_is_tw5334())
|
||||
uart_base = (volatile u32*) IXP4XX_UART2_BASE_PHYS;
|
||||
else
|
||||
uart_base = (volatile u32*) IXP4XX_UART1_BASE_PHYS;
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,12 @@
|
|||
diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/ixp4xx_npe.c linux-2.6.23-openwrt/arch/arm/mach-ixp4xx/ixp4xx_npe.c
|
||||
--- linux-2.6.23/arch/arm/mach-ixp4xx/ixp4xx_npe.c 2007-10-22 22:18:15.000000000 +0200
|
||||
+++ linux-2.6.23-openwrt/arch/arm/mach-ixp4xx/ixp4xx_npe.c 2007-10-22 22:32:48.000000000 +0200
|
||||
@@ -585,6 +585,8 @@
|
||||
npe_reset(npe);
|
||||
#endif
|
||||
|
||||
+ print_npe(KERN_INFO, npe, "firmware's license can be found in /usr/share/doc/LICENSE.IPL\n");
|
||||
+
|
||||
print_npe(KERN_INFO, npe, "firmware functionality 0x%X, "
|
||||
"revision 0x%X:%X\n", (image->id >> 16) & 0xFF,
|
||||
(image->id >> 8) & 0xFF, image->id & 0xFF);
|
||||
|
|
@ -0,0 +1,187 @@
|
|||
diff -uprN linux-2.6.23.orig/drivers/i2c/chips/eeprom.c linux-2.6.23/drivers/i2c/chips/eeprom.c
|
||||
--- linux-2.6.23.orig/drivers/i2c/chips/eeprom.c 2007-10-09 15:31:38.000000000 -0500
|
||||
+++ linux-2.6.23/drivers/i2c/chips/eeprom.c 2007-10-11 00:57:25.000000000 -0500
|
||||
@@ -33,6 +33,8 @@
|
||||
#include <linux/jiffies.h>
|
||||
#include <linux/i2c.h>
|
||||
#include <linux/mutex.h>
|
||||
+#include <linux/notifier.h>
|
||||
+#include <linux/eeprom.h>
|
||||
|
||||
/* Addresses to scan */
|
||||
static unsigned short normal_i2c[] = { 0x50, 0x51, 0x52, 0x53, 0x54,
|
||||
@@ -41,26 +43,7 @@ static unsigned short normal_i2c[] = { 0
|
||||
/* Insmod parameters */
|
||||
I2C_CLIENT_INSMOD_1(eeprom);
|
||||
|
||||
-
|
||||
-/* Size of EEPROM in bytes */
|
||||
-#define EEPROM_SIZE 256
|
||||
-
|
||||
-/* possible types of eeprom devices */
|
||||
-enum eeprom_nature {
|
||||
- UNKNOWN,
|
||||
- VAIO,
|
||||
-};
|
||||
-
|
||||
-/* Each client has this additional data */
|
||||
-struct eeprom_data {
|
||||
- struct i2c_client client;
|
||||
- struct mutex update_lock;
|
||||
- u8 valid; /* bitfield, bit!=0 if slice is valid */
|
||||
- unsigned long last_updated[8]; /* In jiffies, 8 slices */
|
||||
- u8 data[EEPROM_SIZE]; /* Register values */
|
||||
- enum eeprom_nature nature;
|
||||
-};
|
||||
-
|
||||
+ATOMIC_NOTIFIER_HEAD(eeprom_chain);
|
||||
|
||||
static int eeprom_attach_adapter(struct i2c_adapter *adapter);
|
||||
static int eeprom_detect(struct i2c_adapter *adapter, int address, int kind);
|
||||
@@ -191,6 +174,7 @@ static int eeprom_detect(struct i2c_adap
|
||||
data->valid = 0;
|
||||
mutex_init(&data->update_lock);
|
||||
data->nature = UNKNOWN;
|
||||
+ data->attr = &eeprom_attr;
|
||||
|
||||
/* Tell the I2C layer a new client has arrived */
|
||||
if ((err = i2c_attach_client(new_client)))
|
||||
@@ -214,6 +198,9 @@ static int eeprom_detect(struct i2c_adap
|
||||
if (err)
|
||||
goto exit_detach;
|
||||
|
||||
+ /* call the notifier chain */
|
||||
+ atomic_notifier_call_chain(&eeprom_chain, EEPROM_REGISTER, data);
|
||||
+
|
||||
return 0;
|
||||
|
||||
exit_detach:
|
||||
@@ -239,6 +226,41 @@ static int eeprom_detach_client(struct i
|
||||
return 0;
|
||||
}
|
||||
|
||||
+/**
|
||||
+ * register_eeprom_notifier - register a 'user' of EEPROM devices.
|
||||
+ * @nb: pointer to notifier info structure
|
||||
+ *
|
||||
+ * Registers a callback function to be called upon detection
|
||||
+ * of an EEPROM device. Detection invokes the 'add' callback
|
||||
+ * with the kobj of the mutex and a bin_attribute which allows
|
||||
+ * read from the EEPROM. The intention is that the notifier
|
||||
+ * will be able to read system configuration from the notifier.
|
||||
+ *
|
||||
+ * Only EEPROMs detected *after* the addition of the notifier
|
||||
+ * are notified. I.e. EEPROMs already known to the system
|
||||
+ * will not be notified - add the notifier from board level
|
||||
+ * code!
|
||||
+ */
|
||||
+int register_eeprom_notifier(struct notifier_block *nb)
|
||||
+{
|
||||
+ return atomic_notifier_chain_register(&eeprom_chain, nb);
|
||||
+}
|
||||
+
|
||||
+/**
|
||||
+ * unregister_eeprom_notifier - unregister a 'user' of EEPROM devices.
|
||||
+ * @old: pointer to notifier info structure
|
||||
+ *
|
||||
+ * Removes a callback function from the list of 'users' to be
|
||||
+ * notified upon detection of EEPROM devices.
|
||||
+ */
|
||||
+int unregister_eeprom_notifier(struct notifier_block *nb)
|
||||
+{
|
||||
+ return atomic_notifier_chain_unregister(&eeprom_chain, nb);
|
||||
+}
|
||||
+
|
||||
+EXPORT_SYMBOL_GPL(register_eeprom_notifier);
|
||||
+EXPORT_SYMBOL_GPL(unregister_eeprom_notifier);
|
||||
+
|
||||
static int __init eeprom_init(void)
|
||||
{
|
||||
return i2c_add_driver(&eeprom_driver);
|
||||
diff -uprN linux-2.6.23.orig/include/linux/eeprom.h linux-2.6.23/include/linux/eeprom.h
|
||||
--- linux-2.6.23.orig/include/linux/eeprom.h 1969-12-31 18:00:00.000000000 -0600
|
||||
+++ linux-2.6.23/include/linux/eeprom.h 2007-10-11 00:57:25.000000000 -0500
|
||||
@@ -0,0 +1,71 @@
|
||||
+#ifndef _LINUX_EEPROM_H
|
||||
+#define _LINUX_EEPROM_H
|
||||
+/*
|
||||
+ * EEPROM notifier header
|
||||
+ *
|
||||
+ * Copyright (C) 2006 John Bowler
|
||||
+ */
|
||||
+
|
||||
+/*
|
||||
+ * 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.
|
||||
+ *
|
||||
+ * This program is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+ * GNU General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU General Public License
|
||||
+ * along with this program; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
+ */
|
||||
+
|
||||
+#ifndef __KERNEL__
|
||||
+#error This is a kernel header
|
||||
+#endif
|
||||
+
|
||||
+#include <linux/list.h>
|
||||
+#include <linux/kobject.h>
|
||||
+#include <linux/sysfs.h>
|
||||
+
|
||||
+/* Size of EEPROM in bytes */
|
||||
+#define EEPROM_SIZE 256
|
||||
+
|
||||
+/* possible types of eeprom devices */
|
||||
+enum eeprom_nature {
|
||||
+ UNKNOWN,
|
||||
+ VAIO,
|
||||
+};
|
||||
+
|
||||
+/* Each client has this additional data */
|
||||
+struct eeprom_data {
|
||||
+ struct i2c_client client;
|
||||
+ struct mutex update_lock;
|
||||
+ u8 valid; /* bitfield, bit!=0 if slice is valid */
|
||||
+ unsigned long last_updated[8]; /* In jiffies, 8 slices */
|
||||
+ u8 data[EEPROM_SIZE]; /* Register values */
|
||||
+ enum eeprom_nature nature;
|
||||
+ struct bin_attribute *attr;
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ * This is very basic.
|
||||
+ *
|
||||
+ * If an EEPROM is detected on the I2C bus (this only works for
|
||||
+ * I2C EEPROMs) the notifier chain is called with
|
||||
+ * both the I2C information and the kobject for the sysfs
|
||||
+ * device which has been registers. It is then possible to
|
||||
+ * read from the device via the bin_attribute::read method
|
||||
+ * to extract configuration information.
|
||||
+ *
|
||||
+ * Register the notifier in the board level code, there is no
|
||||
+ * need to unregister it but you can if you want (it will save
|
||||
+ * a little bit or kernel memory to do so).
|
||||
+ */
|
||||
+
|
||||
+extern int register_eeprom_notifier(struct notifier_block *nb);
|
||||
+extern int unregister_eeprom_notifier(struct notifier_block *nb);
|
||||
+
|
||||
+#endif /* _LINUX_EEPROM_H */
|
||||
diff -uprN linux-2.6.23.orig/include/linux/notifier.h linux-2.6.23/include/linux/notifier.h
|
||||
--- linux-2.6.23.orig/include/linux/notifier.h 2007-10-09 15:31:38.000000000 -0500
|
||||
+++ linux-2.6.23/include/linux/notifier.h 2007-10-11 00:57:25.000000000 -0500
|
||||
@@ -231,5 +231,8 @@ static inline int notifier_to_errno(int
|
||||
#define PM_SUSPEND_PREPARE 0x0003 /* Going to suspend the system */
|
||||
#define PM_POST_SUSPEND 0x0004 /* Suspend finished */
|
||||
|
||||
+/* eeprom notifier chain */
|
||||
+#define EEPROM_REGISTER 0x0001
|
||||
+
|
||||
#endif /* __KERNEL__ */
|
||||
#endif /* _LINUX_NOTIFIER_H */
|
||||
|
|
@ -0,0 +1,55 @@
|
|||
Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
|
||||
===================================================================
|
||||
--- linux-2.6.24.2.orig/arch/arm/mach-ixp4xx/avila-setup.c
|
||||
+++ linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
|
||||
@@ -132,12 +132,42 @@ static struct platform_device avila_pata
|
||||
.resource = avila_pata_resources,
|
||||
};
|
||||
|
||||
+/* Built-in 10/100 Ethernet MAC interfaces */
|
||||
+static struct eth_plat_info avila_plat_eth[] = {
|
||||
+ {
|
||||
+ .phy = 0,
|
||||
+ .rxq = 3,
|
||||
+ .txreadyq = 20,
|
||||
+ }, {
|
||||
+ .phy = 1,
|
||||
+ .rxq = 4,
|
||||
+ .txreadyq = 21,
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
+static struct platform_device avila_eth[] = {
|
||||
+ {
|
||||
+ .name = "ixp4xx_eth",
|
||||
+ .id = IXP4XX_ETH_NPEB,
|
||||
+ .dev.platform_data = avila_plat_eth,
|
||||
+ }, {
|
||||
+ .name = "ixp4xx_eth",
|
||||
+ .id = IXP4XX_ETH_NPEC,
|
||||
+ .dev.platform_data = avila_plat_eth + 1,
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
static struct platform_device *avila_devices[] __initdata = {
|
||||
&avila_i2c_gpio,
|
||||
&avila_flash,
|
||||
&avila_uart
|
||||
};
|
||||
|
||||
+static struct platform_device *avila_eth_devices[] = {
|
||||
+ &avila_eth[0],
|
||||
+ &avila_eth[1]
|
||||
+};
|
||||
+
|
||||
static void __init avila_init(void)
|
||||
{
|
||||
ixp4xx_sys_init();
|
||||
@@ -159,6 +189,7 @@ static void __init avila_init(void)
|
||||
|
||||
platform_device_register(&avila_pata);
|
||||
|
||||
+ platform_add_devices(avila_eth_devices, ARRAY_SIZE(avila_eth_devices));
|
||||
}
|
||||
|
||||
MACHINE_START(AVILA, "Gateworks Avila Network Platform")
|
||||
|
|
@ -0,0 +1,55 @@
|
|||
diff -uprN linux-2.6.23.orig/arch/arm/mach-ixp4xx/avila-setup.c linux-2.6.23/arch/arm/mach-ixp4xx/avila-setup.c
|
||||
--- linux-2.6.23.orig/arch/arm/mach-ixp4xx/avila-setup.c 2007-10-09 15:31:38.000000000 -0500
|
||||
+++ linux-2.6.23/arch/arm/mach-ixp4xx/avila-setup.c 2007-10-11 01:08:21.000000000 -0500
|
||||
@@ -138,6 +138,35 @@ static struct platform_device *avila_dev
|
||||
&avila_uart
|
||||
};
|
||||
|
||||
+static char avila_rtc_probe[] __initdata = "rtc-ds1672.probe=0,0x68 ";
|
||||
+
|
||||
+static void __init avila_fixup(struct machine_desc *desc,
|
||||
+ struct tag *tags, char **cmdline, struct meminfo *mi)
|
||||
+{
|
||||
+ struct tag *t = tags;
|
||||
+ char *p = *cmdline;
|
||||
+
|
||||
+ /* Find the end of the tags table, taking note of any cmdline tag. */
|
||||
+ for (; t->hdr.size; t = tag_next(t)) {
|
||||
+ if (t->hdr.tag == ATAG_CMDLINE) {
|
||||
+ p = t->u.cmdline.cmdline;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ /* Overwrite the end of the table with a new cmdline tag. */
|
||||
+ t->hdr.tag = ATAG_CMDLINE;
|
||||
+ t->hdr.size = (sizeof (struct tag_header) +
|
||||
+ strlen(avila_rtc_probe) + strlen(p) + 1 + 4) >> 2;
|
||||
+ strlcpy(t->u.cmdline.cmdline, avila_rtc_probe, COMMAND_LINE_SIZE);
|
||||
+ strlcpy(t->u.cmdline.cmdline + strlen(avila_rtc_probe), p,
|
||||
+ COMMAND_LINE_SIZE - strlen(avila_rtc_probe));
|
||||
+
|
||||
+ /* Terminate the table. */
|
||||
+ t = tag_next(t);
|
||||
+ t->hdr.tag = ATAG_NONE;
|
||||
+ t->hdr.size = 0;
|
||||
+}
|
||||
+
|
||||
static void __init avila_init(void)
|
||||
{
|
||||
ixp4xx_sys_init();
|
||||
@@ -165,6 +194,7 @@ MACHINE_START(AVILA, "Gateworks Avila Ne
|
||||
/* Maintainer: Deepak Saxena <dsaxena@plexity.net> */
|
||||
.phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
|
||||
.io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
|
||||
+ .fixup = avila_fixup,
|
||||
.map_io = ixp4xx_map_io,
|
||||
.init_irq = ixp4xx_init_irq,
|
||||
.timer = &ixp4xx_timer,
|
||||
@@ -182,6 +212,7 @@ MACHINE_START(LOFT, "Giant Shoulder Inc
|
||||
/* Maintainer: Tom Billman <kernel@giantshoulderinc.com> */
|
||||
.phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
|
||||
.io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
|
||||
+ .fixup = avila_fixup,
|
||||
.map_io = ixp4xx_map_io,
|
||||
.init_irq = ixp4xx_init_irq,
|
||||
.timer = &ixp4xx_timer,
|
||||
|
|
@ -0,0 +1,154 @@
|
|||
Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
|
||||
===================================================================
|
||||
--- linux-2.6.24.2.orig/arch/arm/mach-ixp4xx/avila-setup.c
|
||||
+++ linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
|
||||
@@ -14,10 +14,18 @@
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/device.h>
|
||||
+#include <linux/if_ether.h>
|
||||
+#include <linux/socket.h>
|
||||
+#include <linux/netdevice.h>
|
||||
#include <linux/serial.h>
|
||||
#include <linux/tty.h>
|
||||
#include <linux/serial_8250.h>
|
||||
#include <linux/slab.h>
|
||||
+#ifdef CONFIG_SENSORS_EEPROM
|
||||
+# include <linux/i2c.h>
|
||||
+# include <linux/eeprom.h>
|
||||
+#endif
|
||||
+
|
||||
#include <linux/i2c-gpio.h>
|
||||
|
||||
#include <asm/types.h>
|
||||
@@ -177,6 +185,118 @@ static struct platform_device *avila_eth
|
||||
&avila_eth[1]
|
||||
};
|
||||
|
||||
+#ifdef CONFIG_SENSORS_EEPROM
|
||||
+struct avila_board_info {
|
||||
+ unsigned char *model;
|
||||
+ int npes_used;
|
||||
+ int npeb_phy;
|
||||
+ int npec_phy;
|
||||
+};
|
||||
+
|
||||
+static struct avila_board_info avila_boards[] = {
|
||||
+ {
|
||||
+ .model = "GW2342",
|
||||
+ .npes_used = 2,
|
||||
+ .npeb_phy = 0,
|
||||
+ .npec_phy = 1,
|
||||
+ }, {
|
||||
+ .model = "GW2347",
|
||||
+ .npes_used = 1,
|
||||
+ .npeb_phy = 1,
|
||||
+ }, {
|
||||
+ .model = "GW2348-2",
|
||||
+ .npes_used = 2,
|
||||
+ .npeb_phy = 0,
|
||||
+ .npec_phy = 1,
|
||||
+ }, {
|
||||
+ .model = "GW2348-4",
|
||||
+ .npes_used = 2,
|
||||
+ .npeb_phy = 0,
|
||||
+ .npec_phy = 1,
|
||||
+ }, {
|
||||
+ .model = "GW2353",
|
||||
+ .npes_used = 1,
|
||||
+ .npeb_phy = 1,
|
||||
+ }, {
|
||||
+ .model = "GW2355",
|
||||
+ .npes_used = 2,
|
||||
+ .npeb_phy = -1,
|
||||
+ .npec_phy = 1,
|
||||
+ }, {
|
||||
+ .model = "GW2357",
|
||||
+ .npes_used = 1,
|
||||
+ .npeb_phy = 1,
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
+static struct avila_board_info *avila_find_board_info(char *model)
|
||||
+{
|
||||
+ int i;
|
||||
+
|
||||
+ for (i = 0; i < ARRAY_SIZE(avila_boards); i++) {
|
||||
+ struct avila_board_info *info = &avila_boards[i];
|
||||
+ if (strncmp(info->model, model, strlen(info->model)) == 0)
|
||||
+ return info;
|
||||
+ }
|
||||
+
|
||||
+ return NULL;
|
||||
+}
|
||||
+
|
||||
+struct avila_eeprom_header {
|
||||
+ unsigned char mac0[ETH_ALEN];
|
||||
+ unsigned char mac1[ETH_ALEN];
|
||||
+ unsigned char res0[4];
|
||||
+ unsigned char magic[2];
|
||||
+ unsigned char config[14];
|
||||
+ unsigned char model[16];
|
||||
+};
|
||||
+
|
||||
+static int avila_eeprom_notify(struct notifier_block *self,
|
||||
+ unsigned long event, void *t)
|
||||
+{
|
||||
+ struct eeprom_data *ee = t;
|
||||
+ struct avila_board_info *info = NULL;
|
||||
+ struct avila_eeprom_header hdr;
|
||||
+
|
||||
+ /* The eeprom is at address 0x51 */
|
||||
+ if (event != EEPROM_REGISTER || ee->client.addr != 0x51)
|
||||
+ return NOTIFY_DONE;
|
||||
+
|
||||
+ ee->attr->read(&ee->client.dev.kobj, ee->attr, (char *)&hdr,
|
||||
+ 0, sizeof(hdr));
|
||||
+
|
||||
+ if (hdr.magic[0] != 'G' || hdr.magic[1] != 'W')
|
||||
+ return NOTIFY_DONE;
|
||||
+
|
||||
+ memcpy(&avila_plat_eth[0].hwaddr, hdr.mac0, ETH_ALEN);
|
||||
+ memcpy(&avila_plat_eth[1].hwaddr, hdr.mac1, ETH_ALEN);
|
||||
+
|
||||
+ info = avila_find_board_info(hdr.model);
|
||||
+
|
||||
+ if (info) {
|
||||
+ printk(KERN_DEBUG "Running on Gateworks Avila %s\n",
|
||||
+ info->model);
|
||||
+ avila_plat_eth[0].phy = info->npeb_phy;
|
||||
+ avila_plat_eth[1].phy = info->npec_phy;
|
||||
+ platform_add_devices(avila_eth_devices,
|
||||
+ info->npes_used);
|
||||
+ } else {
|
||||
+ printk(KERN_INFO "Unknown/missing Avila model number"
|
||||
+ " -- defaults will be used\n");
|
||||
+ platform_add_devices(avila_eth_devices,
|
||||
+ ARRAY_SIZE(avila_eth_devices));
|
||||
+ }
|
||||
+
|
||||
+ unregister_eeprom_notifier(self);
|
||||
+
|
||||
+ return NOTIFY_OK;
|
||||
+}
|
||||
+
|
||||
+static struct notifier_block avila_eeprom_notifier = {
|
||||
+ .notifier_call = avila_eeprom_notify
|
||||
+};
|
||||
+#endif
|
||||
+
|
||||
static void __init avila_init(void)
|
||||
{
|
||||
ixp4xx_sys_init();
|
||||
@@ -201,7 +321,11 @@ static void __init avila_init(void)
|
||||
|
||||
platform_device_register(&avila_pata);
|
||||
|
||||
+#ifdef CONFIG_SENSORS_EEPROM
|
||||
+ register_eeprom_notifier(&avila_eeprom_notifier);
|
||||
+#else
|
||||
platform_add_devices(avila_eth_devices, ARRAY_SIZE(avila_eth_devices));
|
||||
+#endif
|
||||
}
|
||||
|
||||
MACHINE_START(AVILA, "Gateworks Avila Network Platform")
|
||||
|
|
@ -0,0 +1,48 @@
|
|||
Index: linux-2.6.24.2/include/asm-arm/arch-ixp4xx/avila.h
|
||||
===================================================================
|
||||
--- linux-2.6.24.2.orig/include/asm-arm/arch-ixp4xx/avila.h
|
||||
+++ linux-2.6.24.2/include/asm-arm/arch-ixp4xx/avila.h
|
||||
@@ -36,4 +36,5 @@
|
||||
#define AVILA_PCI_INTC_PIN 9
|
||||
#define AVILA_PCI_INTD_PIN 8
|
||||
|
||||
-
|
||||
+/* User LED */
|
||||
+#define AVILA_LED_USER_GPIO 3
|
||||
Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
|
||||
===================================================================
|
||||
--- linux-2.6.24.2.orig/arch/arm/mach-ixp4xx/avila-setup.c
|
||||
+++ linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
|
||||
@@ -174,10 +174,31 @@ static struct platform_device avila_eth[
|
||||
}
|
||||
};
|
||||
|
||||
+#ifdef CONFIG_LEDS_IXP4XX
|
||||
+static struct resource avila_led_resources[] = {
|
||||
+ {
|
||||
+ .name = "user",
|
||||
+ .start = AVILA_LED_USER_GPIO,
|
||||
+ .end = AVILA_LED_USER_GPIO,
|
||||
+ .flags = IXP4XX_GPIO_LOW,
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
+static struct platform_device avila_leds = {
|
||||
+ .name = "IXP4XX-GPIO-LED",
|
||||
+ .id = -1,
|
||||
+ .num_resources = ARRAY_SIZE(avila_led_resources),
|
||||
+ .resource = avila_led_resources,
|
||||
+};
|
||||
+#endif
|
||||
+
|
||||
static struct platform_device *avila_devices[] __initdata = {
|
||||
&avila_i2c_gpio,
|
||||
&avila_flash,
|
||||
- &avila_uart
|
||||
+ &avila_uart,
|
||||
+#ifdef CONFIG_LEDS_IXP4XX
|
||||
+ &avila_leds,
|
||||
+#endif
|
||||
};
|
||||
|
||||
static struct platform_device *avila_eth_devices[] = {
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
|
||||
===================================================================
|
||||
--- linux-2.6.24.2.orig/arch/arm/mach-ixp4xx/avila-setup.c
|
||||
+++ linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
|
||||
@@ -192,6 +192,24 @@ static struct platform_device avila_leds
|
||||
};
|
||||
#endif
|
||||
|
||||
+#ifdef CONFIG_GPIO_DEVICE
|
||||
+static struct resource avila_gpio_resources[] = {
|
||||
+ {
|
||||
+ .name = "gpio",
|
||||
+ .start = AVILA_GPIO_MASK,
|
||||
+ .end = AVILA_GPIO_MASK,
|
||||
+ .flags = 0,
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
+static struct platform_device avila_gpio = {
|
||||
+ .name = "GPIODEV",
|
||||
+ .id = -1,
|
||||
+ .num_resources = ARRAY_SIZE(avila_gpio_resources),
|
||||
+ .resource = avila_gpio_resources,
|
||||
+};
|
||||
+#endif
|
||||
+
|
||||
static struct platform_device *avila_devices[] __initdata = {
|
||||
&avila_i2c_gpio,
|
||||
&avila_flash,
|
||||
@@ -199,6 +217,9 @@ static struct platform_device *avila_dev
|
||||
#ifdef CONFIG_LEDS_IXP4XX
|
||||
&avila_leds,
|
||||
#endif
|
||||
+#ifdef CONFIG_GPIO_DEVICE
|
||||
+ &avila_gpio,
|
||||
+#endif
|
||||
};
|
||||
|
||||
static struct platform_device *avila_eth_devices[] = {
|
||||
Index: linux-2.6.24.2/include/asm-arm/arch-ixp4xx/avila.h
|
||||
===================================================================
|
||||
--- linux-2.6.24.2.orig/include/asm-arm/arch-ixp4xx/avila.h
|
||||
+++ linux-2.6.24.2/include/asm-arm/arch-ixp4xx/avila.h
|
||||
@@ -38,3 +38,6 @@
|
||||
|
||||
/* User LED */
|
||||
#define AVILA_LED_USER_GPIO 3
|
||||
+
|
||||
+/* gpio mask used by platform device */
|
||||
+#define AVILA_GPIO_MASK (1 << 1) | (1 << 3) | (1 << 5) | (1 << 7) | (1 << 9)
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
Index: linux-2.6.23.14/arch/arm/common/dmabounce.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.14.orig/arch/arm/common/dmabounce.c 2008-01-24 22:03:28.475500801 +0100
|
||||
+++ linux-2.6.23.14/arch/arm/common/dmabounce.c 2008-01-24 22:17:36.415822168 +0100
|
||||
@@ -116,6 +116,10 @@
|
||||
} else if (size <= device_info->large.size) {
|
||||
pool = &device_info->large;
|
||||
} else {
|
||||
+#ifdef CONFIG_DMABOUNCE_DEBUG
|
||||
+ printk(KERN_INFO "A dma bounce buffer outside the pool size was requested. Requested size was 0x%08X\nThe calling code was :\n", size);
|
||||
+ dump_stack();
|
||||
+#endif
|
||||
pool = NULL;
|
||||
}
|
||||
|
||||
Index: linux-2.6.23.14/arch/arm/mach-ixp4xx/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.23.14.orig/arch/arm/mach-ixp4xx/Kconfig 2008-01-24 22:10:29.331484012 +0100
|
||||
+++ linux-2.6.23.14/arch/arm/mach-ixp4xx/Kconfig 2008-01-24 22:11:42.891675973 +0100
|
||||
@@ -220,6 +220,11 @@
|
||||
default y
|
||||
depends on PCI
|
||||
|
||||
+config DMABOUNCE_DEBUG
|
||||
+ bool "Enable DMABounce debuging"
|
||||
+ default n
|
||||
+ depends on DMABOUNCE
|
||||
+
|
||||
config IXP4XX_INDIRECT_PCI
|
||||
bool "Use indirect PCI memory access"
|
||||
depends on PCI
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
Index: linux-2.6.23.14/include/asm-arm/arch-ixp4xx/avila.h
|
||||
===================================================================
|
||||
--- linux-2.6.23.14.orig/include/asm-arm/arch-ixp4xx/avila.h 2008-01-31 17:40:36.000000000 +0100
|
||||
+++ linux-2.6.23.14/include/asm-arm/arch-ixp4xx/avila.h 2008-01-31 17:40:42.000000000 +0100
|
||||
@@ -25,7 +25,7 @@
|
||||
/*
|
||||
* AVILA PCI IRQs
|
||||
*/
|
||||
-#define AVILA_PCI_MAX_DEV 4
|
||||
+#define AVILA_PCI_MAX_DEV 6
|
||||
#define LOFT_PCI_MAX_DEV 6
|
||||
#define AVILA_PCI_IRQ_LINES 4
|
||||
|
||||
Loading…
Reference in New Issue