Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8005803a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 0365fb6b 5effc09c

arch/arc/boot/dts/hsdk.dts

+23 −0
Original line number Diff line number Diff line
@@ -65,6 +65,14 @@ 
		clock-frequency = <33333333>;

	};



	reg_5v0: regulator-5v0 {

		compatible = "regulator-fixed";



		regulator-name = "5v0-supply";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

	};



	cpu_intc: cpu-interrupt-controller {

		compatible = "snps,archs-intc";

		interrupt-controller;
@@ -264,6 +272,21 @@ 
			clocks = <&input_clk>;

			cs-gpios = <&creg_gpio 0 GPIO_ACTIVE_LOW>,

				   <&creg_gpio 1 GPIO_ACTIVE_LOW>;



			spi-flash@0 {

				compatible = "sst26wf016b", "jedec,spi-nor";

				reg = <0>;

				#address-cells = <1>;

				#size-cells = <1>;

				spi-max-frequency = <4000000>;

			};



			adc@1 {

				compatible = "ti,adc108s102";

				reg = <1>;

				vref-supply = <&reg_5v0>;

				spi-max-frequency = <1000000>;

			};

		};



		creg_gpio: gpio@14b0 {

arch/arc/configs/hsdk_defconfig

+6 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ CONFIG_INET=y 
CONFIG_DEVTMPFS=y

# CONFIG_STANDALONE is not set

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

CONFIG_MTD=y

CONFIG_MTD_SPI_NOR=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_NETDEVICES=y
@@ -55,6 +57,8 @@ CONFIG_GPIO_SYSFS=y 
CONFIG_GPIO_DWAPB=y

CONFIG_GPIO_SNPS_CREG=y

# CONFIG_HWMON is not set

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_DRM=y

# CONFIG_DRM_FBDEV_EMULATION is not set

CONFIG_DRM_UDL=y
@@ -72,6 +76,8 @@ CONFIG_MMC_SDHCI_PLTFM=y 
CONFIG_MMC_DW=y

CONFIG_DMADEVICES=y

CONFIG_DW_AXI_DMAC=y

CONFIG_IIO=y

CONFIG_TI_ADC108S102=y

CONFIG_EXT3_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

arch/arc/kernel/perf_event.c

+2 −2
Original line number Diff line number Diff line
@@ -614,8 +614,8 @@ static int arc_pmu_device_probe(struct platform_device *pdev) 
	/* loop thru all available h/w condition indexes */

	for (i = 0; i < cc_bcr.c; i++) {

		write_aux_reg(ARC_REG_CC_INDEX, i);

		cc_name.indiv.word0 = read_aux_reg(ARC_REG_CC_NAME0);

		cc_name.indiv.word1 = read_aux_reg(ARC_REG_CC_NAME1);

		cc_name.indiv.word0 = le32_to_cpu(read_aux_reg(ARC_REG_CC_NAME0));

		cc_name.indiv.word1 = le32_to_cpu(read_aux_reg(ARC_REG_CC_NAME1));



		arc_pmu_map_hw_event(i, cc_name.str);

		arc_pmu_add_raw_event_attr(i, cc_name.str);