|
@@ -43,17 +43,6 @@ struct sata_gemini {
|
|
|
struct clk *sata1_pclk;
|
|
|
};
|
|
|
|
|
|
-/* Global IDE PAD Skew Control Register */
|
|
|
-#define GEMINI_GLOBAL_IDE_SKEW_CTRL 0x18
|
|
|
-#define GEMINI_IDE1_HOST_STROBE_DELAY_SHIFT 28
|
|
|
-#define GEMINI_IDE1_DEVICE_STROBE_DELAY_SHIFT 24
|
|
|
-#define GEMINI_IDE1_OUTPUT_IO_SKEW_SHIFT 20
|
|
|
-#define GEMINI_IDE1_INPUT_IO_SKEW_SHIFT 16
|
|
|
-#define GEMINI_IDE0_HOST_STROBE_DELAY_SHIFT 12
|
|
|
-#define GEMINI_IDE0_DEVICE_STROBE_DELAY_SHIFT 8
|
|
|
-#define GEMINI_IDE0_OUTPUT_IO_SKEW_SHIFT 4
|
|
|
-#define GEMINI_IDE0_INPUT_IO_SKEW_SHIFT 0
|
|
|
-
|
|
|
/* Miscellaneous Control Register */
|
|
|
#define GEMINI_GLOBAL_MISC_CTRL 0x30
|
|
|
/*
|
|
@@ -91,8 +80,6 @@ struct sata_gemini {
|
|
|
#define GEMINI_IDE_IOMUX_MODE2 (2 << 24)
|
|
|
#define GEMINI_IDE_IOMUX_MODE3 (3 << 24)
|
|
|
#define GEMINI_IDE_IOMUX_SHIFT (24)
|
|
|
-#define GEMINI_IDE_PADS_ENABLE BIT(4)
|
|
|
-#define GEMINI_PFLASH_PADS_DISABLE BIT(1)
|
|
|
|
|
|
/*
|
|
|
* Registers directly controlling the PATA<->SATA adapters
|
|
@@ -310,7 +297,6 @@ static int gemini_sata_probe(struct platform_device *pdev)
|
|
|
enum gemini_muxmode muxmode;
|
|
|
u32 gmode;
|
|
|
u32 gmask;
|
|
|
- u32 val;
|
|
|
int ret;
|
|
|
|
|
|
sg = devm_kzalloc(dev, sizeof(*sg), GFP_KERNEL);
|
|
@@ -362,16 +348,6 @@ static int gemini_sata_probe(struct platform_device *pdev)
|
|
|
gmask = GEMINI_IDE_IOMUX_MASK;
|
|
|
gmode = (muxmode << GEMINI_IDE_IOMUX_SHIFT);
|
|
|
|
|
|
- /*
|
|
|
- * If we mux out the IDE, parallel flash must be disabled.
|
|
|
- * SATA0 and SATA1 have dedicated pins and may coexist with
|
|
|
- * parallel flash.
|
|
|
- */
|
|
|
- if (sg->ide_pins)
|
|
|
- gmode |= GEMINI_IDE_PADS_ENABLE | GEMINI_PFLASH_PADS_DISABLE;
|
|
|
- else
|
|
|
- gmask |= GEMINI_IDE_PADS_ENABLE;
|
|
|
-
|
|
|
ret = regmap_update_bits(map, GEMINI_GLOBAL_MISC_CTRL, gmask, gmode);
|
|
|
if (ret) {
|
|
|
dev_err(dev, "unable to set up IDE muxing\n");
|
|
@@ -379,16 +355,6 @@ static int gemini_sata_probe(struct platform_device *pdev)
|
|
|
goto out_unprep_clk;
|
|
|
}
|
|
|
|
|
|
- /* FIXME: add more elaborate IDE skew control handling */
|
|
|
- if (sg->ide_pins) {
|
|
|
- ret = regmap_read(map, GEMINI_GLOBAL_IDE_SKEW_CTRL, &val);
|
|
|
- if (ret) {
|
|
|
- dev_err(dev, "cannot read IDE skew control register\n");
|
|
|
- return ret;
|
|
|
- }
|
|
|
- dev_info(dev, "IDE skew control: %08x\n", val);
|
|
|
- }
|
|
|
-
|
|
|
dev_info(dev, "set up the Gemini IDE/SATA nexus\n");
|
|
|
platform_set_drvdata(pdev, sg);
|
|
|
sg_singleton = sg;
|