Skip to content

Commit 8005803

Browse files
committed
Merge tag 'arc-5.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC fixes from Vineet Gupta: "Small fixes for ARC: - perf fix for Big Endian build [Alexey] - hadk platform enable soem peripherals [Eugeniy]" * tag 'arc-5.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc: ARC: perf: Accommodate big-endian CPU ARC: [plat-hsdk]: Enable on-boardi SPI ADC IC ARC: [plat-hsdk]: Enable on-board SPI NOR flash IC
2 parents 0365fb6 + 5effc09 commit 8005803

File tree

3 files changed

+31
-2
lines changed

3 files changed

+31
-2
lines changed

arch/arc/boot/dts/hsdk.dts

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,14 @@
6565
clock-frequency = <33333333>;
6666
};
6767

68+
reg_5v0: regulator-5v0 {
69+
compatible = "regulator-fixed";
70+
71+
regulator-name = "5v0-supply";
72+
regulator-min-microvolt = <5000000>;
73+
regulator-max-microvolt = <5000000>;
74+
};
75+
6876
cpu_intc: cpu-interrupt-controller {
6977
compatible = "snps,archs-intc";
7078
interrupt-controller;
@@ -264,6 +272,21 @@
264272
clocks = <&input_clk>;
265273
cs-gpios = <&creg_gpio 0 GPIO_ACTIVE_LOW>,
266274
<&creg_gpio 1 GPIO_ACTIVE_LOW>;
275+
276+
spi-flash@0 {
277+
compatible = "sst26wf016b", "jedec,spi-nor";
278+
reg = <0>;
279+
#address-cells = <1>;
280+
#size-cells = <1>;
281+
spi-max-frequency = <4000000>;
282+
};
283+
284+
adc@1 {
285+
compatible = "ti,adc108s102";
286+
reg = <1>;
287+
vref-supply = <&reg_5v0>;
288+
spi-max-frequency = <1000000>;
289+
};
267290
};
268291

269292
creg_gpio: gpio@14b0 {

arch/arc/configs/hsdk_defconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ CONFIG_INET=y
3232
CONFIG_DEVTMPFS=y
3333
# CONFIG_STANDALONE is not set
3434
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
35+
CONFIG_MTD=y
36+
CONFIG_MTD_SPI_NOR=y
3537
CONFIG_SCSI=y
3638
CONFIG_BLK_DEV_SD=y
3739
CONFIG_NETDEVICES=y
@@ -55,6 +57,8 @@ CONFIG_GPIO_SYSFS=y
5557
CONFIG_GPIO_DWAPB=y
5658
CONFIG_GPIO_SNPS_CREG=y
5759
# CONFIG_HWMON is not set
60+
CONFIG_REGULATOR=y
61+
CONFIG_REGULATOR_FIXED_VOLTAGE=y
5862
CONFIG_DRM=y
5963
# CONFIG_DRM_FBDEV_EMULATION is not set
6064
CONFIG_DRM_UDL=y
@@ -72,6 +76,8 @@ CONFIG_MMC_SDHCI_PLTFM=y
7276
CONFIG_MMC_DW=y
7377
CONFIG_DMADEVICES=y
7478
CONFIG_DW_AXI_DMAC=y
79+
CONFIG_IIO=y
80+
CONFIG_TI_ADC108S102=y
7581
CONFIG_EXT3_FS=y
7682
CONFIG_VFAT_FS=y
7783
CONFIG_TMPFS=y

arch/arc/kernel/perf_event.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -614,8 +614,8 @@ static int arc_pmu_device_probe(struct platform_device *pdev)
614614
/* loop thru all available h/w condition indexes */
615615
for (i = 0; i < cc_bcr.c; i++) {
616616
write_aux_reg(ARC_REG_CC_INDEX, i);
617-
cc_name.indiv.word0 = read_aux_reg(ARC_REG_CC_NAME0);
618-
cc_name.indiv.word1 = read_aux_reg(ARC_REG_CC_NAME1);
617+
cc_name.indiv.word0 = le32_to_cpu(read_aux_reg(ARC_REG_CC_NAME0));
618+
cc_name.indiv.word1 = le32_to_cpu(read_aux_reg(ARC_REG_CC_NAME1));
619619

620620
arc_pmu_map_hw_event(i, cc_name.str);
621621
arc_pmu_add_raw_event_attr(i, cc_name.str);

0 commit comments

Comments
 (0)