Commit d8491223 authored by Linus Torvalds's avatar Linus Torvalds

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

Pull ARM SoC fixes from Olof Johansson:
 "A collection of fixes from the last few weeks. Most of them are
  smaller tweaks and fixes to DT and hardware descriptions for boards.
  Some of the more significant ones are:

   - eMMC and RGMII stability tweaks for rk3288

   - DDC fixes for Rock PI 4

   - Audio fixes for two TI am335x eval boards

   - D_CAN clock fix for am335x

   - Compilation fixes for clang

   - !HOTPLUG_CPU compilation fix for one of the new platforms this
     release (milbeaut)

   - A revert of a gpio fix for nomadik that instead was fixed in the
     gpio subsystem

   - Whitespace fix for the DT JSON schema (no tabs allowed)"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (25 commits)
  ARM: milbeaut: fix build with !CONFIG_HOTPLUG_CPU
  ARM: iop: don't use using 64-bit DMA masks
  ARM: orion: don't use using 64-bit DMA masks
  Revert "ARM: dts: nomadik: Fix polarity of SPI CS"
  dt-bindings: cpu: Fix JSON schema
  arm/mach-at91/pm : fix possible object reference leak
  ARM: dts: at91: Fix typo in ISC_D0 on PC9
  ARM: dts: Fix dcan clkctrl clock for am3
  reset: meson-audio-arb: Fix missing .owner setting of reset_controller_dev
  dt-bindings: reset: meson-g12a: Add missing USB2 PHY resets
  ARM: dts: rockchip: Remove #address/#size-cells from rk3288-veyron gpio-keys
  ARM: dts: rockchip: Remove #address/#size-cells from rk3288 mipi_dsi
  ARM: dts: rockchip: Fix gpu opp node names for rk3288
  ARM: dts: am335x-evmsk: Correct the regulators for the audio codec
  ARM: dts: am335x-evm: Correct the regulators for the audio codec
  ARM: OMAP2+: add missing of_node_put after of_device_is_available
  ARM: OMAP1: ams-delta: Fix broken GPIO ID allocation
  arm64: dts: stratix10: add the sysmgr-syscon property from the gmac's
  arm64: dts: rockchip: fix rk3328 sdmmc0 write errors
  arm64: dts: rockchip: fix rk3328 rgmii high tx error rate
  ...
parents 429fba10 9a8f3203
...@@ -57,6 +57,24 @@ wlan_en_reg: fixedregulator2 { ...@@ -57,6 +57,24 @@ wlan_en_reg: fixedregulator2 {
enable-active-high; enable-active-high;
}; };
/* TPS79501 */
v1_8d_reg: fixedregulator-v1_8d {
compatible = "regulator-fixed";
regulator-name = "v1_8d";
vin-supply = <&vbat>;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
/* TPS79501 */
v3_3d_reg: fixedregulator-v3_3d {
compatible = "regulator-fixed";
regulator-name = "v3_3d";
vin-supply = <&vbat>;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
matrix_keypad: matrix_keypad0 { matrix_keypad: matrix_keypad0 {
compatible = "gpio-matrix-keypad"; compatible = "gpio-matrix-keypad";
debounce-delay-ms = <5>; debounce-delay-ms = <5>;
...@@ -499,10 +517,10 @@ tlv320aic3106: tlv320aic3106@1b { ...@@ -499,10 +517,10 @@ tlv320aic3106: tlv320aic3106@1b {
status = "okay"; status = "okay";
/* Regulators */ /* Regulators */
AVDD-supply = <&vaux2_reg>; AVDD-supply = <&v3_3d_reg>;
IOVDD-supply = <&vaux2_reg>; IOVDD-supply = <&v3_3d_reg>;
DRVDD-supply = <&vaux2_reg>; DRVDD-supply = <&v3_3d_reg>;
DVDD-supply = <&vbat>; DVDD-supply = <&v1_8d_reg>;
}; };
}; };
......
...@@ -73,6 +73,24 @@ vtt_fixed: fixedregulator3 { ...@@ -73,6 +73,24 @@ vtt_fixed: fixedregulator3 {
enable-active-high; enable-active-high;
}; };
/* TPS79518 */
v1_8d_reg: fixedregulator-v1_8d {
compatible = "regulator-fixed";
regulator-name = "v1_8d";
vin-supply = <&vbat>;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
/* TPS78633 */
v3_3d_reg: fixedregulator-v3_3d {
compatible = "regulator-fixed";
regulator-name = "v3_3d";
vin-supply = <&vbat>;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
leds { leds {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&user_leds_s0>; pinctrl-0 = <&user_leds_s0>;
...@@ -501,10 +519,10 @@ tlv320aic3106: tlv320aic3106@1b { ...@@ -501,10 +519,10 @@ tlv320aic3106: tlv320aic3106@1b {
status = "okay"; status = "okay";
/* Regulators */ /* Regulators */
AVDD-supply = <&vaux2_reg>; AVDD-supply = <&v3_3d_reg>;
IOVDD-supply = <&vaux2_reg>; IOVDD-supply = <&v3_3d_reg>;
DRVDD-supply = <&vaux2_reg>; DRVDD-supply = <&v3_3d_reg>;
DVDD-supply = <&vbat>; DVDD-supply = <&v1_8d_reg>;
}; };
}; };
......
...@@ -1762,7 +1762,7 @@ target-module@cc000 { /* 0x481cc000, ap 60 46.0 */ ...@@ -1762,7 +1762,7 @@ target-module@cc000 { /* 0x481cc000, ap 60 46.0 */
reg = <0xcc000 0x4>; reg = <0xcc000 0x4>;
reg-names = "rev"; reg-names = "rev";
/* Domains (P, C): per_pwrdm, l4ls_clkdm */ /* Domains (P, C): per_pwrdm, l4ls_clkdm */
clocks = <&l4ls_clkctrl AM3_D_CAN0_CLKCTRL 0>; clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN0_CLKCTRL 0>;
clock-names = "fck"; clock-names = "fck";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
...@@ -1785,7 +1785,7 @@ target-module@d0000 { /* 0x481d0000, ap 62 42.0 */ ...@@ -1785,7 +1785,7 @@ target-module@d0000 { /* 0x481d0000, ap 62 42.0 */
reg = <0xd0000 0x4>; reg = <0xd0000 0x4>;
reg-names = "rev"; reg-names = "rev";
/* Domains (P, C): per_pwrdm, l4ls_clkdm */ /* Domains (P, C): per_pwrdm, l4ls_clkdm */
clocks = <&l4ls_clkctrl AM3_D_CAN1_CLKCTRL 0>; clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN1_CLKCTRL 0>;
clock-names = "fck"; clock-names = "fck";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
......
...@@ -254,6 +254,7 @@ regulator-state-mem { ...@@ -254,6 +254,7 @@ regulator-state-mem {
}; };
vccio_sd: LDO_REG5 { vccio_sd: LDO_REG5 {
regulator-boot-on;
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-name = "vccio_sd"; regulator-name = "vccio_sd";
...@@ -430,7 +431,7 @@ &sdmmc { ...@@ -430,7 +431,7 @@ &sdmmc {
bus-width = <4>; bus-width = <4>;
cap-mmc-highspeed; cap-mmc-highspeed;
cap-sd-highspeed; cap-sd-highspeed;
card-detect-delay = <200>; broken-cd;
disable-wp; /* wp not hooked up */ disable-wp; /* wp not hooked up */
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
......
...@@ -25,8 +25,6 @@ memory { ...@@ -25,8 +25,6 @@ memory {
gpio_keys: gpio-keys { gpio_keys: gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwr_key_l>; pinctrl-0 = <&pwr_key_l>;
......
...@@ -70,7 +70,7 @@ cpu1: cpu@501 { ...@@ -70,7 +70,7 @@ cpu1: cpu@501 {
compatible = "arm,cortex-a12"; compatible = "arm,cortex-a12";
reg = <0x501>; reg = <0x501>;
resets = <&cru SRST_CORE1>; resets = <&cru SRST_CORE1>;
operating-points = <&cpu_opp_table>; operating-points-v2 = <&cpu_opp_table>;
#cooling-cells = <2>; /* min followed by max */ #cooling-cells = <2>; /* min followed by max */
clock-latency = <40000>; clock-latency = <40000>;
clocks = <&cru ARMCLK>; clocks = <&cru ARMCLK>;
...@@ -80,7 +80,7 @@ cpu2: cpu@502 { ...@@ -80,7 +80,7 @@ cpu2: cpu@502 {
compatible = "arm,cortex-a12"; compatible = "arm,cortex-a12";
reg = <0x502>; reg = <0x502>;
resets = <&cru SRST_CORE2>; resets = <&cru SRST_CORE2>;
operating-points = <&cpu_opp_table>; operating-points-v2 = <&cpu_opp_table>;
#cooling-cells = <2>; /* min followed by max */ #cooling-cells = <2>; /* min followed by max */
clock-latency = <40000>; clock-latency = <40000>;
clocks = <&cru ARMCLK>; clocks = <&cru ARMCLK>;
...@@ -90,7 +90,7 @@ cpu3: cpu@503 { ...@@ -90,7 +90,7 @@ cpu3: cpu@503 {
compatible = "arm,cortex-a12"; compatible = "arm,cortex-a12";
reg = <0x503>; reg = <0x503>;
resets = <&cru SRST_CORE3>; resets = <&cru SRST_CORE3>;
operating-points = <&cpu_opp_table>; operating-points-v2 = <&cpu_opp_table>;
#cooling-cells = <2>; /* min followed by max */ #cooling-cells = <2>; /* min followed by max */
clock-latency = <40000>; clock-latency = <40000>;
clocks = <&cru ARMCLK>; clocks = <&cru ARMCLK>;
...@@ -1119,8 +1119,6 @@ mipi_dsi: mipi@ff960000 { ...@@ -1119,8 +1119,6 @@ mipi_dsi: mipi@ff960000 {
clock-names = "ref", "pclk"; clock-names = "ref", "pclk";
power-domains = <&power RK3288_PD_VIO>; power-domains = <&power RK3288_PD_VIO>;
rockchip,grf = <&grf>; rockchip,grf = <&grf>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled"; status = "disabled";
ports { ports {
...@@ -1282,27 +1280,27 @@ gpu: gpu@ffa30000 { ...@@ -1282,27 +1280,27 @@ gpu: gpu@ffa30000 {
gpu_opp_table: gpu-opp-table { gpu_opp_table: gpu-opp-table {
compatible = "operating-points-v2"; compatible = "operating-points-v2";
opp@100000000 { opp-100000000 {
opp-hz = /bits/ 64 <100000000>; opp-hz = /bits/ 64 <100000000>;
opp-microvolt = <950000>; opp-microvolt = <950000>;
}; };
opp@200000000 { opp-200000000 {
opp-hz = /bits/ 64 <200000000>; opp-hz = /bits/ 64 <200000000>;
opp-microvolt = <950000>; opp-microvolt = <950000>;
}; };
opp@300000000 { opp-300000000 {
opp-hz = /bits/ 64 <300000000>; opp-hz = /bits/ 64 <300000000>;
opp-microvolt = <1000000>; opp-microvolt = <1000000>;
}; };
opp@400000000 { opp-400000000 {
opp-hz = /bits/ 64 <400000000>; opp-hz = /bits/ 64 <400000000>;
opp-microvolt = <1100000>; opp-microvolt = <1100000>;
}; };
opp@500000000 { opp-500000000 {
opp-hz = /bits/ 64 <500000000>; opp-hz = /bits/ 64 <500000000>;
opp-microvolt = <1200000>; opp-microvolt = <1200000>;
}; };
opp@600000000 { opp-600000000 {
opp-hz = /bits/ 64 <600000000>; opp-hz = /bits/ 64 <600000000>;
opp-microvolt = <1250000>; opp-microvolt = <1250000>;
}; };
......
...@@ -518,7 +518,7 @@ ...@@ -518,7 +518,7 @@
#define PIN_PC9__GPIO PINMUX_PIN(PIN_PC9, 0, 0) #define PIN_PC9__GPIO PINMUX_PIN(PIN_PC9, 0, 0)
#define PIN_PC9__FIQ PINMUX_PIN(PIN_PC9, 1, 3) #define PIN_PC9__FIQ PINMUX_PIN(PIN_PC9, 1, 3)
#define PIN_PC9__GTSUCOMP PINMUX_PIN(PIN_PC9, 2, 1) #define PIN_PC9__GTSUCOMP PINMUX_PIN(PIN_PC9, 2, 1)
#define PIN_PC9__ISC_D0 PINMUX_PIN(PIN_PC9, 2, 1) #define PIN_PC9__ISC_D0 PINMUX_PIN(PIN_PC9, 3, 1)
#define PIN_PC9__TIOA4 PINMUX_PIN(PIN_PC9, 4, 2) #define PIN_PC9__TIOA4 PINMUX_PIN(PIN_PC9, 4, 2)
#define PIN_PC10 74 #define PIN_PC10 74
#define PIN_PC10__GPIO PINMUX_PIN(PIN_PC10, 0, 0) #define PIN_PC10__GPIO PINMUX_PIN(PIN_PC10, 0, 0)
......
...@@ -213,13 +213,12 @@ spi { ...@@ -213,13 +213,12 @@ spi {
gpio-sck = <&gpio0 5 GPIO_ACTIVE_HIGH>; gpio-sck = <&gpio0 5 GPIO_ACTIVE_HIGH>;
gpio-mosi = <&gpio0 4 GPIO_ACTIVE_HIGH>; gpio-mosi = <&gpio0 4 GPIO_ACTIVE_HIGH>;
/* /*
* This chipselect is active high. Just setting the flags * It's not actually active high, but the frameworks assume
* to GPIO_ACTIVE_HIGH is not enough for the SPI DT bindings, * the polarity of the passed-in GPIO is "normal" (active
* it will be ignored, only the special "spi-cs-high" flag * high) then actively drives the line low to select the
* really counts. * chip.
*/ */
cs-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
spi-cs-high;
num-chipselects = <1>; num-chipselects = <1>;
/* /*
......
...@@ -591,13 +591,13 @@ static int __init at91_pm_backup_init(void) ...@@ -591,13 +591,13 @@ static int __init at91_pm_backup_init(void)
np = of_find_compatible_node(NULL, NULL, "atmel,sama5d2-securam"); np = of_find_compatible_node(NULL, NULL, "atmel,sama5d2-securam");
if (!np) if (!np)
goto securam_fail; goto securam_fail_no_ref_dev;
pdev = of_find_device_by_node(np); pdev = of_find_device_by_node(np);
of_node_put(np); of_node_put(np);
if (!pdev) { if (!pdev) {
pr_warn("%s: failed to find securam device!\n", __func__); pr_warn("%s: failed to find securam device!\n", __func__);
goto securam_fail; goto securam_fail_no_ref_dev;
} }
sram_pool = gen_pool_get(&pdev->dev, NULL); sram_pool = gen_pool_get(&pdev->dev, NULL);
...@@ -620,6 +620,8 @@ static int __init at91_pm_backup_init(void) ...@@ -620,6 +620,8 @@ static int __init at91_pm_backup_init(void)
return 0; return 0;
securam_fail: securam_fail:
put_device(&pdev->dev);
securam_fail_no_ref_dev:
iounmap(pm_data.sfrbu); iounmap(pm_data.sfrbu);
pm_data.sfrbu = NULL; pm_data.sfrbu = NULL;
return ret; return ret;
......
...@@ -300,7 +300,7 @@ static struct resource iop13xx_adma_2_resources[] = { ...@@ -300,7 +300,7 @@ static struct resource iop13xx_adma_2_resources[] = {
} }
}; };
static u64 iop13xx_adma_dmamask = DMA_BIT_MASK(64); static u64 iop13xx_adma_dmamask = DMA_BIT_MASK(32);
static struct iop_adma_platform_data iop13xx_adma_0_data = { static struct iop_adma_platform_data iop13xx_adma_0_data = {
.hw_id = 0, .hw_id = 0,
.pool_size = PAGE_SIZE, .pool_size = PAGE_SIZE,
...@@ -324,7 +324,7 @@ static struct platform_device iop13xx_adma_0_channel = { ...@@ -324,7 +324,7 @@ static struct platform_device iop13xx_adma_0_channel = {
.resource = iop13xx_adma_0_resources, .resource = iop13xx_adma_0_resources,
.dev = { .dev = {
.dma_mask = &iop13xx_adma_dmamask, .dma_mask = &iop13xx_adma_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(64), .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = (void *) &iop13xx_adma_0_data, .platform_data = (void *) &iop13xx_adma_0_data,
}, },
}; };
...@@ -336,7 +336,7 @@ static struct platform_device iop13xx_adma_1_channel = { ...@@ -336,7 +336,7 @@ static struct platform_device iop13xx_adma_1_channel = {
.resource = iop13xx_adma_1_resources, .resource = iop13xx_adma_1_resources,
.dev = { .dev = {
.dma_mask = &iop13xx_adma_dmamask, .dma_mask = &iop13xx_adma_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(64), .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = (void *) &iop13xx_adma_1_data, .platform_data = (void *) &iop13xx_adma_1_data,
}, },
}; };
...@@ -348,7 +348,7 @@ static struct platform_device iop13xx_adma_2_channel = { ...@@ -348,7 +348,7 @@ static struct platform_device iop13xx_adma_2_channel = {
.resource = iop13xx_adma_2_resources, .resource = iop13xx_adma_2_resources,
.dev = { .dev = {
.dma_mask = &iop13xx_adma_dmamask, .dma_mask = &iop13xx_adma_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(64), .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = (void *) &iop13xx_adma_2_data, .platform_data = (void *) &iop13xx_adma_2_data,
}, },
}; };
......
...@@ -152,7 +152,7 @@ static struct resource iop13xx_tpmi_3_resources[] = { ...@@ -152,7 +152,7 @@ static struct resource iop13xx_tpmi_3_resources[] = {
} }
}; };
u64 iop13xx_tpmi_mask = DMA_BIT_MASK(64); u64 iop13xx_tpmi_mask = DMA_BIT_MASK(32);
static struct platform_device iop13xx_tpmi_0_device = { static struct platform_device iop13xx_tpmi_0_device = {
.name = "iop-tpmi", .name = "iop-tpmi",
.id = 0, .id = 0,
...@@ -160,7 +160,7 @@ static struct platform_device iop13xx_tpmi_0_device = { ...@@ -160,7 +160,7 @@ static struct platform_device iop13xx_tpmi_0_device = {
.resource = iop13xx_tpmi_0_resources, .resource = iop13xx_tpmi_0_resources,
.dev = { .dev = {
.dma_mask = &iop13xx_tpmi_mask, .dma_mask = &iop13xx_tpmi_mask,
.coherent_dma_mask = DMA_BIT_MASK(64), .coherent_dma_mask = DMA_BIT_MASK(32),
}, },
}; };
...@@ -171,7 +171,7 @@ static struct platform_device iop13xx_tpmi_1_device = { ...@@ -171,7 +171,7 @@ static struct platform_device iop13xx_tpmi_1_device = {
.resource = iop13xx_tpmi_1_resources, .resource = iop13xx_tpmi_1_resources,
.dev = { .dev = {
.dma_mask = &iop13xx_tpmi_mask, .dma_mask = &iop13xx_tpmi_mask,
.coherent_dma_mask = DMA_BIT_MASK(64), .coherent_dma_mask = DMA_BIT_MASK(32),
}, },
}; };
...@@ -182,7 +182,7 @@ static struct platform_device iop13xx_tpmi_2_device = { ...@@ -182,7 +182,7 @@ static struct platform_device iop13xx_tpmi_2_device = {
.resource = iop13xx_tpmi_2_resources, .resource = iop13xx_tpmi_2_resources,
.dev = { .dev = {
.dma_mask = &iop13xx_tpmi_mask, .dma_mask = &iop13xx_tpmi_mask,
.coherent_dma_mask = DMA_BIT_MASK(64), .coherent_dma_mask = DMA_BIT_MASK(32),
}, },
}; };
...@@ -193,7 +193,7 @@ static struct platform_device iop13xx_tpmi_3_device = { ...@@ -193,7 +193,7 @@ static struct platform_device iop13xx_tpmi_3_device = {
.resource = iop13xx_tpmi_3_resources, .resource = iop13xx_tpmi_3_resources,
.dev = { .dev = {
.dma_mask = &iop13xx_tpmi_mask, .dma_mask = &iop13xx_tpmi_mask,
.coherent_dma_mask = DMA_BIT_MASK(64), .coherent_dma_mask = DMA_BIT_MASK(32),
}, },
}; };
......
...@@ -65,6 +65,7 @@ static void m10v_smp_init(unsigned int max_cpus) ...@@ -65,6 +65,7 @@ static void m10v_smp_init(unsigned int max_cpus)
writel(KERNEL_UNBOOT_FLAG, m10v_smp_base + cpu * 4); writel(KERNEL_UNBOOT_FLAG, m10v_smp_base + cpu * 4);
} }
#ifdef CONFIG_HOTPLUG_CPU
static void m10v_cpu_die(unsigned int l_cpu) static void m10v_cpu_die(unsigned int l_cpu)
{ {
gic_cpu_if_down(0); gic_cpu_if_down(0);
...@@ -83,12 +84,15 @@ static int m10v_cpu_kill(unsigned int l_cpu) ...@@ -83,12 +84,15 @@ static int m10v_cpu_kill(unsigned int l_cpu)
return 1; return 1;
} }
#endif
static struct smp_operations m10v_smp_ops __initdata = { static struct smp_operations m10v_smp_ops __initdata = {
.smp_prepare_cpus = m10v_smp_init, .smp_prepare_cpus = m10v_smp_init,
.smp_boot_secondary = m10v_boot_secondary, .smp_boot_secondary = m10v_boot_secondary,
#ifdef CONFIG_HOTPLUG_CPU
.cpu_die = m10v_cpu_die, .cpu_die = m10v_cpu_die,
.cpu_kill = m10v_cpu_kill, .cpu_kill = m10v_cpu_kill,
#endif
}; };
CPU_METHOD_OF_DECLARE(m10v_smp, "socionext,milbeaut-m10v-smp", &m10v_smp_ops); CPU_METHOD_OF_DECLARE(m10v_smp, "socionext,milbeaut-m10v-smp", &m10v_smp_ops);
......
...@@ -182,6 +182,7 @@ static struct resource latch1_resources[] = { ...@@ -182,6 +182,7 @@ static struct resource latch1_resources[] = {
static struct bgpio_pdata latch1_pdata = { static struct bgpio_pdata latch1_pdata = {
.label = LATCH1_LABEL, .label = LATCH1_LABEL,
.base = -1,
.ngpio = LATCH1_NGPIO, .ngpio = LATCH1_NGPIO,
}; };
...@@ -219,6 +220,7 @@ static struct resource latch2_resources[] = { ...@@ -219,6 +220,7 @@ static struct resource latch2_resources[] = {
static struct bgpio_pdata latch2_pdata = { static struct bgpio_pdata latch2_pdata = {
.label = LATCH2_LABEL, .label = LATCH2_LABEL,
.base = -1,
.ngpio = LATCH2_NGPIO, .ngpio = LATCH2_NGPIO,
}; };
......
...@@ -250,8 +250,10 @@ static int __init omapdss_init_of(void) ...@@ -250,8 +250,10 @@ static int __init omapdss_init_of(void)
if (!node) if (!node)
return 0; return 0;
if (!of_device_is_available(node)) if (!of_device_is_available(node)) {
of_node_put(node);
return 0; return 0;
}
pdev = of_find_device_by_node(node); pdev = of_find_device_by_node(node);
......
...@@ -143,7 +143,7 @@ struct platform_device iop3xx_dma_0_channel = { ...@@ -143,7 +143,7 @@ struct platform_device iop3xx_dma_0_channel = {
.resource = iop3xx_dma_0_resources, .resource = iop3xx_dma_0_resources,
.dev = { .dev = {
.dma_mask = &iop3xx_adma_dmamask, .dma_mask = &iop3xx_adma_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(64), .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = (void *) &iop3xx_dma_0_data, .platform_data = (void *) &iop3xx_dma_0_data,
}, },
}; };
...@@ -155,7 +155,7 @@ struct platform_device iop3xx_dma_1_channel = { ...@@ -155,7 +155,7 @@ struct platform_device iop3xx_dma_1_channel = {
.resource = iop3xx_dma_1_resources, .resource = iop3xx_dma_1_resources,
.dev = { .dev = {
.dma_mask = &iop3xx_adma_dmamask, .dma_mask = &iop3xx_adma_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(64), .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = (void *) &iop3xx_dma_1_data, .platform_data = (void *) &iop3xx_dma_1_data,
}, },
}; };
...@@ -167,7 +167,7 @@ struct platform_device iop3xx_aau_channel = { ...@@ -167,7 +167,7 @@ struct platform_device iop3xx_aau_channel = {
.resource = iop3xx_aau_resources, .resource = iop3xx_aau_resources,
.dev = { .dev = {
.dma_mask = &iop3xx_adma_dmamask, .dma_mask = &iop3xx_adma_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(64), .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = (void *) &iop3xx_aau_data, .platform_data = (void *) &iop3xx_aau_data,
}, },
}; };
......
...@@ -622,7 +622,7 @@ static struct platform_device orion_xor0_shared = { ...@@ -622,7 +622,7 @@ static struct platform_device orion_xor0_shared = {
.resource = orion_xor0_shared_resources, .resource = orion_xor0_shared_resources,
.dev = { .dev = {
.dma_mask = &orion_xor_dmamask, .dma_mask = &orion_xor_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(64), .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &orion_xor0_pdata, .platform_data = &orion_xor0_pdata,
}, },
}; };
...@@ -683,7 +683,7 @@ static struct platform_device orion_xor1_shared = { ...@@ -683,7 +683,7 @@ static struct platform_device orion_xor1_shared = {
.resource = orion_xor1_shared_resources, .resource = orion_xor1_shared_resources,
.dev = { .dev = {
.dma_mask = &orion_xor_dmamask, .dma_mask = &orion_xor_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(64), .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &orion_xor1_pdata, .platform_data = &orion_xor1_pdata,
}, },
}; };
......
...@@ -162,6 +162,7 @@ gmac0: ethernet@ff800000 { ...@@ -162,6 +162,7 @@ gmac0: ethernet@ff800000 {
rx-fifo-depth = <16384>; rx-fifo-depth = <16384>;
snps,multicast-filter-bins = <256>; snps,multicast-filter-bins = <256>;
iommus = <&smmu 1>; iommus = <&smmu 1>;
altr,sysmgr-syscon = <&sysmgr 0x44 0>;
status = "disabled"; status = "disabled";
}; };
...@@ -179,6 +180,7 @@ gmac1: ethernet@ff802000 { ...@@ -179,6 +180,7 @@ gmac1: ethernet@ff802000 {
rx-fifo-depth = <16384>; rx-fifo-depth = <16384>;
snps,multicast-filter-bins = <256>; snps,multicast-filter-bins = <256>;
iommus = <&smmu 2>; iommus = <&smmu 2>;
altr,sysmgr-syscon = <&sysmgr 0x48 0>;
status = "disabled"; status = "disabled";
}; };
...@@ -196,6 +198,7 @@ gmac2: ethernet@ff804000 { ...@@ -196,6 +198,7 @@ gmac2: ethernet@ff804000 {
rx-fifo-depth = <16384>; rx-fifo-depth = <16384>;
snps,multicast-filter-bins = <256>; snps,multicast-filter-bins = <256>;
iommus = <&smmu 3>; iommus = <&smmu 3>;
altr,sysmgr-syscon = <&sysmgr 0x4c 0>;
status = "disabled"; status = "disabled";
}; };
......
...@@ -108,8 +108,8 @@ &gmac2io { ...@@ -108,8 +108,8 @@ &gmac2io {
snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
snps,reset-active-low; snps,reset-active-low;
snps,reset-delays-us = <0 10000 50000>; snps,reset-delays-us = <0 10000 50000>;
tx_delay = <0x25>; tx_delay = <0x24>;
rx_delay = <0x11>; rx_delay = <0x18>;
status = "okay"; status = "okay";
}; };
......
...@@ -46,8 +46,7 @@ vcc_host_5v: vcc-host-5v-regulator { ...@@ -46,8 +46,7 @@ vcc_host_5v: vcc-host-5v-regulator {
vcc_host1_5v: vcc_otg_5v: vcc-host1-5v-regulator { vcc_host1_5v: vcc_otg_5v: vcc-host1-5v-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;
gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&usb20_host_drv>; pinctrl-0 = <&usb20_host_drv>;
regulator-name = "vcc_host1_5v"; regulator-name = "vcc_host1_5v";
......
...@@ -1445,11 +1445,11 @@ sdmmc0m1_gpio: sdmmc0m1-gpio { ...@@ -1445,11 +1445,11 @@ sdmmc0m1_gpio: sdmmc0m1-gpio {
sdmmc0 { sdmmc0 {
sdmmc0_clk: sdmmc0-clk { sdmmc0_clk: sdmmc0-clk {
rockchip,pins = <1 RK_PA6 1 &pcfg_pull_none_4ma>; rockchip,pins = <1 RK_PA6 1 &pcfg_pull_none_8ma>;
}; };
sdmmc0_cmd: sdmmc0-cmd { sdmmc0_cmd: sdmmc0-cmd {
rockchip,pins = <1 RK_PA4 1 &pcfg_pull_up_4ma>; rockchip,pins = <1 RK_PA4 1 &pcfg_pull_up_8ma>;
}; };
sdmmc0_dectn: sdmmc0-dectn { sdmmc0_dectn: sdmmc0-dectn {
...@@ -1461,14 +1461,14 @@ sdmmc0_wrprt: sdmmc0-wrprt { ...@@ -1461,14 +1461,14 @@ sdmmc0_wrprt: sdmmc0-wrprt {
}; };
sdmmc0_bus1: sdmmc0-bus1 { sdmmc0_bus1: sdmmc0-bus1 {
rockchip,pins = <1 RK_PA0 1 &pcfg_pull_up_4ma>; rockchip,pins = <1 RK_PA0 1 &pcfg_pull_up_8ma>;
}; };
sdmmc0_bus4: sdmmc0-bus4 { sdmmc0_bus4: sdmmc0-bus4 {
rockchip,pins = <1 RK_PA0 1 &pcfg_pull_up_4ma>, rockchip,pins = <1 RK_PA0 1 &pcfg_pull_up_8ma>,
<1 RK_PA1 1 &pcfg_pull_up_4ma>, <1 RK_PA1 1 &pcfg_pull_up_8ma>,
<1 RK_PA2 1 &pcfg_pull_up_4ma>, <1 RK_PA2 1 &pcfg_pull_up_8ma>,
<1 RK_PA3 1 &pcfg_pull_up_4ma>; <1 RK_PA3 1 &pcfg_pull_up_8ma>;
}; };
sdmmc0_gpio: sdmmc0-gpio { sdmmc0_gpio: sdmmc0-gpio {
...@@ -1642,50 +1642,50 @@ gmac-1 { ...@@ -1642,50 +1642,50 @@ gmac-1 {
rgmiim1_pins: rgmiim1-pins { rgmiim1_pins: rgmiim1-pins {
rockchip,pins = rockchip,pins =
/* mac_txclk */ /* mac_txclk */
<1 RK_PB4 2 &pcfg_pull_none_12ma>, <1 RK_PB4 2 &pcfg_pull_none_8ma>,
/* mac_rxclk */ /* mac_rxclk */
<1 RK_PB5 2 &pcfg_pull_none_2ma>, <1 RK_PB5 2 &pcfg_pull_none_4ma>,
/* mac_mdio */ /* mac_mdio */
<1 RK_PC3 2 &pcfg_pull_none_2ma>, <1 RK_PC3 2 &pcfg_pull_none_4ma>,
/* mac_txen */ /* mac_txen */
<1 RK_PD1 2 &pcfg_pull_none_12ma>, <1 RK_PD1 2 &pcfg_pull_none_8ma>,
/* mac_clk */ /* mac_clk */
<1 RK_PC5 2 &pcfg_pull_none_2ma>, <1 RK_PC5 2 &pcfg_pull_none_4ma>,
/* mac_rxdv */ /* mac_rxdv */
<1 RK_PC6 2 &pcfg_pull_none_2ma>, <1 RK_PC6 2 &pcfg_pull_none_4ma>,
/* mac_mdc */ /* mac_mdc */
<1 RK_PC7 2 &pcfg_pull_none_2ma>, <1 RK_PC7 2 &pcfg_pull_none_4ma>,
/* mac_rxd1 */ /* mac_rxd1 */
<1 RK_PB2 2 &pcfg_pull_none_2ma>, <1 RK_PB2 2 &pcfg_pull_none_4ma>,
/* mac_rxd0 */ /* mac_rxd0 */
<1 RK_PB3 2 &pcfg_pull_none_2ma>, <1 RK_PB3 2 &pcfg_pull_none_4ma>,
/* mac_txd1 */ /* mac_txd1 */
<1 RK_PB0 2 &pcfg_pull_none_12ma>, <1 RK_PB0 2 &pcfg_pull_none_8ma>,
/* mac_txd0 */ /* mac_txd0 */
<1 RK_PB1 2 &pcfg_pull_none_12ma>, <1 RK_PB1 2 &pcfg_pull_none_8ma>,
/* mac_rxd3 */ /* mac_rxd3 */
<1 RK_PB6 2 &pcfg_pull_none_2ma>, <1 RK_PB6 2 &pcfg_pull_none_4ma>,
/* mac_rxd2 */ /* mac_rxd2 */
<1 RK_PB7 2 &pcfg_pull_none_2ma>, <1 RK_PB7 2 &pcfg_pull_none_4ma>,
/* mac_txd3 */ /* mac_txd3 */
<1 RK_PC0 2 &pcfg_pull_none_12ma>, <1 RK_PC0 2 &pcfg_pull_none_8ma>,
/* mac_txd2 */ /* mac_txd2 */
<1 RK_PC1 2 &pcfg_pull_none_12ma>, <1 RK_PC1 2 &pcfg_pull_none_8ma>,
/* mac_txclk */ /* mac_txclk */
<0 RK_PB0 1 &pcfg_pull_none>, <0 RK_PB0 1 &pcfg_pull_none_8ma>,
/* mac_txen */ /* mac_txen */
<0 RK_PB4 1 &pcfg_pull_none>, <0 RK_PB4 1 &pcfg_pull_none_8ma>,
/* mac_clk */ /* mac_clk */
<0 RK_PD0 1 &pcfg_pull_none>, <0 RK_PD0 1 &pcfg_pull_none_4ma>,
/* mac_txd1 */ /* mac_txd1 */
<0 RK_PC0 1 &pcfg_pull_none>, <0 RK_PC0 1 &pcfg_pull_none_8ma>,
/* mac_txd0 */ /* mac_txd0 */
<0 RK_PC1 1 &pcfg_pull_none>, <0 RK_PC1 1 &pcfg_pull_none_8ma>,
/* mac_txd3 */ /* mac_txd3 */
<0 RK_PC7 1 &pcfg_pull_none>, <0 RK_PC7 1 &pcfg_pull_none_8ma>,
/* mac_txd2 */ /* mac_txd2 */
<0 RK_PC6 1 &pcfg_pull_none>; <0 RK_PC6 1 &pcfg_pull_none_8ma>;
}; };
rmiim1_pins: rmiim1-pins { rmiim1_pins: rmiim1-pins {
......
...@@ -158,6 +158,7 @@ &gmac { ...@@ -158,6 +158,7 @@ &gmac {
}; };
&hdmi { &hdmi {
ddc-i2c-bus = <&i2c3>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&hdmi_cec>; pinctrl-0 = <&hdmi_cec>;
status = "okay"; status = "okay";
......
...@@ -130,6 +130,7 @@ static int meson_audio_arb_probe(struct platform_device *pdev) ...@@ -130,6 +130,7 @@ static int meson_audio_arb_probe(struct platform_device *pdev)
arb->rstc.nr_resets = ARRAY_SIZE(axg_audio_arb_reset_bits); arb->rstc.nr_resets = ARRAY_SIZE(axg_audio_arb_reset_bits);
arb->rstc.ops = &meson_audio_arb_rstc_ops; arb->rstc.ops = &meson_audio_arb_rstc_ops;
arb->rstc.of_node = dev->of_node; arb->rstc.of_node = dev->of_node;
arb->rstc.owner = THIS_MODULE;
/* /*
* Enable general : * Enable general :
......
...@@ -51,7 +51,10 @@ ...@@ -51,7 +51,10 @@
#define RESET_SD_EMMC_A 44 #define RESET_SD_EMMC_A 44
#define RESET_SD_EMMC_B 45 #define RESET_SD_EMMC_B 45
#define RESET_SD_EMMC_C 46 #define RESET_SD_EMMC_C 46
/* 47-60 */ /* 47 */
#define RESET_USB_PHY20 48
#define RESET_USB_PHY21 49
/* 50-60 */
#define RESET_AUDIO_CODEC 61 #define RESET_AUDIO_CODEC 61
/* 62-63 */ /* 62-63 */
/* RESET2 */ /* RESET2 */
......
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