Commit c98158ed authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Arnd Bergmann:
 "A nice small set of bug fixes for arm-soc:

   - two incorrect register addresses in DT files on shmobile and hisilicon
   - one revert for a regression on omap
   - one bug fix for a newly introduced pin controller binding
   - one regression fix for the memory controller on omap
   - one patch to avoid a harmless WARN_ON"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: dts: Revert enabling of twl configuration for n900
  ARM: dts: fix L2 address in Hi3620
  ARM: OMAP2+: gpmc: fix gpmc_hwecc_bch_capable()
  pinctrl: dra: dt-bindings: Fix pull enable/disable
  ARM: shmobile: r8a7791: Fix SD2CKCR register address
  ARM: OMAP2+: l2c: squelch warning dump on power control setting
parents 0ef13515 a1ae5b12
...@@ -73,7 +73,7 @@ amba { ...@@ -73,7 +73,7 @@ amba {
L2: l2-cache { L2: l2-cache {
compatible = "arm,pl310-cache"; compatible = "arm,pl310-cache";
reg = <0xfc10000 0x100000>; reg = <0x100000 0x100000>;
interrupts = <0 15 4>; interrupts = <0 15 4>;
cache-unified; cache-unified;
cache-level = <2>; cache-level = <2>;
......
...@@ -353,7 +353,7 @@ twl_audio: audio { ...@@ -353,7 +353,7 @@ twl_audio: audio {
}; };
twl_power: power { twl_power: power {
compatible = "ti,twl4030-power-n900", "ti,twl4030-power-idle-osc-off"; compatible = "ti,twl4030-power-n900";
ti,use_poweroff; ti,use_poweroff;
}; };
}; };
......
...@@ -540,9 +540,9 @@ sd1_clk: sd2_clk@e6150078 { ...@@ -540,9 +540,9 @@ sd1_clk: sd2_clk@e6150078 {
#clock-cells = <0>; #clock-cells = <0>;
clock-output-names = "sd1"; clock-output-names = "sd1";
}; };
sd2_clk: sd3_clk@e615007c { sd2_clk: sd3_clk@e615026c {
compatible = "renesas,r8a7791-div6-clock", "renesas,cpg-div6-clock"; compatible = "renesas,r8a7791-div6-clock", "renesas,cpg-div6-clock";
reg = <0 0xe615007c 0 4>; reg = <0 0xe615026c 0 4>;
clocks = <&pll1_div2_clk>; clocks = <&pll1_div2_clk>;
#clock-cells = <0>; #clock-cells = <0>;
clock-output-names = "sd2"; clock-output-names = "sd2";
......
...@@ -50,6 +50,16 @@ static bool gpmc_hwecc_bch_capable(enum omap_ecc ecc_opt) ...@@ -50,6 +50,16 @@ static bool gpmc_hwecc_bch_capable(enum omap_ecc ecc_opt)
soc_is_omap54xx() || soc_is_dra7xx()) soc_is_omap54xx() || soc_is_dra7xx())
return 1; return 1;
if (ecc_opt == OMAP_ECC_BCH4_CODE_HW_DETECTION_SW ||
ecc_opt == OMAP_ECC_BCH8_CODE_HW_DETECTION_SW) {
if (cpu_is_omap24xx())
return 0;
else if (cpu_is_omap3630() && (GET_OMAP_REVISION() == 0))
return 0;
else
return 1;
}
/* OMAP3xxx do not have ELM engine, so cannot support ECC schemes /* OMAP3xxx do not have ELM engine, so cannot support ECC schemes
* which require H/W based ECC error detection */ * which require H/W based ECC error detection */
if ((cpu_is_omap34xx() || cpu_is_omap3630()) && if ((cpu_is_omap34xx() || cpu_is_omap3630()) &&
...@@ -57,14 +67,6 @@ static bool gpmc_hwecc_bch_capable(enum omap_ecc ecc_opt) ...@@ -57,14 +67,6 @@ static bool gpmc_hwecc_bch_capable(enum omap_ecc ecc_opt)
(ecc_opt == OMAP_ECC_BCH8_CODE_HW))) (ecc_opt == OMAP_ECC_BCH8_CODE_HW)))
return 0; return 0;
/*
* For now, assume 4-bit mode is only supported on OMAP3630 ES1.x, x>=1
* and AM33xx derivates. Other chips may be added if confirmed to work.
*/
if ((ecc_opt == OMAP_ECC_BCH4_CODE_HW_DETECTION_SW) &&
(!cpu_is_omap3630() || (GET_OMAP_REVISION() == 0)))
return 0;
/* legacy platforms support only HAM1 (1-bit Hamming) ECC scheme */ /* legacy platforms support only HAM1 (1-bit Hamming) ECC scheme */
if (ecc_opt == OMAP_ECC_HAM1_CODE_HW) if (ecc_opt == OMAP_ECC_HAM1_CODE_HW)
return 1; return 1;
......
...@@ -168,6 +168,10 @@ static void omap4_l2c310_write_sec(unsigned long val, unsigned reg) ...@@ -168,6 +168,10 @@ static void omap4_l2c310_write_sec(unsigned long val, unsigned reg)
smc_op = OMAP4_MON_L2X0_PREFETCH_INDEX; smc_op = OMAP4_MON_L2X0_PREFETCH_INDEX;
break; break;
case L310_POWER_CTRL:
pr_info_once("OMAP L2C310: ROM does not support power control setting\n");
return;
default: default:
WARN_ONCE(1, "OMAP L2C310: ignoring write to reg 0x%x\n", reg); WARN_ONCE(1, "OMAP L2C310: ignoring write to reg 0x%x\n", reg);
return; return;
......
...@@ -30,7 +30,8 @@ ...@@ -30,7 +30,8 @@
#define MUX_MODE14 0xe #define MUX_MODE14 0xe
#define MUX_MODE15 0xf #define MUX_MODE15 0xf
#define PULL_ENA (1 << 16) #define PULL_ENA (0 << 16)
#define PULL_DIS (1 << 16)
#define PULL_UP (1 << 17) #define PULL_UP (1 << 17)
#define INPUT_EN (1 << 18) #define INPUT_EN (1 << 18)
#define SLEWCONTROL (1 << 19) #define SLEWCONTROL (1 << 19)
...@@ -38,10 +39,10 @@ ...@@ -38,10 +39,10 @@
#define WAKEUP_EVENT (1 << 25) #define WAKEUP_EVENT (1 << 25)
/* Active pin states */ /* Active pin states */
#define PIN_OUTPUT 0 #define PIN_OUTPUT (0 | PULL_DIS)
#define PIN_OUTPUT_PULLUP (PIN_OUTPUT | PULL_ENA | PULL_UP) #define PIN_OUTPUT_PULLUP (PIN_OUTPUT | PULL_ENA | PULL_UP)
#define PIN_OUTPUT_PULLDOWN (PIN_OUTPUT | PULL_ENA) #define PIN_OUTPUT_PULLDOWN (PIN_OUTPUT | PULL_ENA)
#define PIN_INPUT INPUT_EN #define PIN_INPUT (INPUT_EN | PULL_DIS)
#define PIN_INPUT_SLEW (INPUT_EN | SLEWCONTROL) #define PIN_INPUT_SLEW (INPUT_EN | SLEWCONTROL)
#define PIN_INPUT_PULLUP (PULL_ENA | INPUT_EN | PULL_UP) #define PIN_INPUT_PULLUP (PULL_ENA | INPUT_EN | PULL_UP)
#define PIN_INPUT_PULLDOWN (PULL_ENA | INPUT_EN) #define PIN_INPUT_PULLDOWN (PULL_ENA | INPUT_EN)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment